From 465f0cc1e2e4fc50a0adbef79a4a317eec5eb454 Mon Sep 17 00:00:00 2001
From: LukePulverenti <luke.pulverenti@gmail.com>
Date: Sat, 23 Feb 2013 12:54:51 -0500
Subject: moved some network code to the networking assembly

---
 BDInfo/BDInfo.csproj                               |  11 +-
 BDInfo/BdInfoExaminer.cs                           | 169 ++++++
 MediaBrowser.Api/EnvironmentService.cs             |  29 +-
 MediaBrowser.Api/MediaBrowser.Api.csproj           |   2 -
 .../MediaBrowser.ApiInteraction.Javascript.csproj  |  12 -
 .../MediaBrowser.ClickOnce.csproj                  |   4 -
 MediaBrowser.Common/Extensions/BaseExtensions.cs   |  19 -
 MediaBrowser.Common/Kernel/BaseKernel.cs           |   3 +-
 MediaBrowser.Common/Kernel/BaseManager.cs          |  49 --
 MediaBrowser.Common/Kernel/IApplicationHost.cs     |   7 +
 MediaBrowser.Common/Kernel/TcpManager.cs           |  78 ++-
 MediaBrowser.Common/MediaBrowser.Common.csproj     |  10 +-
 MediaBrowser.Common/Net/HttpManager.cs             |  33 +-
 MediaBrowser.Common/Net/INetworkManager.cs         |  72 +++
 MediaBrowser.Common/Net/NetUtils.cs                | 219 -------
 MediaBrowser.Common/Win32/NativeMethods.cs         | 631 --------------------
 MediaBrowser.Controller/BaseManager.cs             |  50 ++
 MediaBrowser.Controller/Entities/BaseItem.cs       |   2 -
 MediaBrowser.Controller/Entities/Folder.cs         |   3 +-
 MediaBrowser.Controller/Entities/Movies/Movie.cs   |   2 -
 MediaBrowser.Controller/Entities/TV/Season.cs      |   2 -
 MediaBrowser.Controller/Entities/TV/Series.cs      |   2 +-
 MediaBrowser.Controller/IO/FileData.cs             |   4 +-
 MediaBrowser.Controller/IO/FileSystem.cs           |   3 +-
 MediaBrowser.Controller/IO/NativeMethods.cs        | 631 ++++++++++++++++++++
 MediaBrowser.Controller/IO/NetworkShares.cs        | 644 ---------------------
 MediaBrowser.Controller/Library/ItemResolveArgs.cs |   4 +-
 MediaBrowser.Controller/Library/LibraryManager.cs  |   4 -
 .../MediaBrowser.Controller.csproj                 |   3 +-
 MediaBrowser.Controller/MediaInfo/FFMpegManager.cs |  23 +-
 .../Plugins/PluginSecurityManager.cs               |   1 -
 .../Providers/ImageFromMediaLocationProvider.cs    |   4 +-
 .../Providers/ImagesByNameProvider.cs              |   3 +-
 .../Resolvers/EntityResolutionHelper.cs            |   4 +-
 MediaBrowser.Controller/Resolvers/TV/TVUtils.cs    |   2 +-
 .../Updates/InstallationManager.cs                 |  19 +-
 MediaBrowser.Model/MediaBrowser.Model.csproj       |   2 +
 MediaBrowser.Model/Net/NetworkShare.cs             |  31 +
 MediaBrowser.Model/Net/NetworkShareType.cs         |  30 +
 .../Management/NativeMethods.cs                    |  72 +++
 .../Management/NetworkManager.cs                   | 265 +++++++++
 .../Management/NetworkShares.cs                    | 638 ++++++++++++++++++++
 .../MediaBrowser.Networking.csproj                 |  14 +
 .../MediaBrowser.Server.Sqlite.csproj              |   3 -
 .../MediaBrowser.Server.WorldWeatherOnline.csproj  |   4 -
 MediaBrowser.ServerApplication/App.xaml.cs         |  18 +-
 .../Implementations/BdInfoExaminer.cs              | 170 ------
 .../MediaBrowser.ServerApplication.csproj          |   5 +-
 48 files changed, 2168 insertions(+), 1842 deletions(-)
 create mode 100644 BDInfo/BdInfoExaminer.cs
 delete mode 100644 MediaBrowser.Common/Kernel/BaseManager.cs
 create mode 100644 MediaBrowser.Common/Net/INetworkManager.cs
 delete mode 100644 MediaBrowser.Common/Net/NetUtils.cs
 delete mode 100644 MediaBrowser.Common/Win32/NativeMethods.cs
 create mode 100644 MediaBrowser.Controller/BaseManager.cs
 create mode 100644 MediaBrowser.Controller/IO/NativeMethods.cs
 delete mode 100644 MediaBrowser.Controller/IO/NetworkShares.cs
 create mode 100644 MediaBrowser.Model/Net/NetworkShare.cs
 create mode 100644 MediaBrowser.Model/Net/NetworkShareType.cs
 create mode 100644 MediaBrowser.Networking/Management/NativeMethods.cs
 create mode 100644 MediaBrowser.Networking/Management/NetworkManager.cs
 create mode 100644 MediaBrowser.Networking/Management/NetworkShares.cs
 delete mode 100644 MediaBrowser.ServerApplication/Implementations/BdInfoExaminer.cs

diff --git a/BDInfo/BDInfo.csproj b/BDInfo/BDInfo.csproj
index 4e57d9e08d..234050ed30 100644
--- a/BDInfo/BDInfo.csproj
+++ b/BDInfo/BDInfo.csproj
@@ -32,13 +32,10 @@
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="BdInfoExaminer.cs" />
     <Compile Include="BDInfoSettings.cs" />
     <Compile Include="BDROM.cs" />
     <Compile Include="LanguageCodes.cs" />
@@ -63,6 +60,12 @@
   <ItemGroup>
     <Content Include="ReadMe.txt" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj">
+      <Project>{7eeeb4bb-f3e8-48fc-b4c5-70f0fff8329b}</Project>
+      <Name>MediaBrowser.Model</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/BDInfo/BdInfoExaminer.cs b/BDInfo/BdInfoExaminer.cs
new file mode 100644
index 0000000000..cfa9a946bb
--- /dev/null
+++ b/BDInfo/BdInfoExaminer.cs
@@ -0,0 +1,169 @@
+using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.MediaInfo;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace BDInfo
+{
+    /// <summary>
+    /// Class BdInfoExaminer
+    /// </summary>
+    public class BdInfoExaminer : IBlurayExaminer
+    {
+        /// <summary>
+        /// Gets the disc info.
+        /// </summary>
+        /// <param name="path">The path.</param>
+        /// <returns>BlurayDiscInfo.</returns>
+        public BlurayDiscInfo GetDiscInfo(string path)
+        {
+            var bdrom = new BDROM(path);
+
+            bdrom.Scan();
+
+            // Get the longest playlist
+            var playlist = bdrom.PlaylistFiles.Values.OrderByDescending(p => p.TotalLength).FirstOrDefault(p => p.IsValid);
+
+            var outputStream = new BlurayDiscInfo
+            {
+                MediaStreams = new List<MediaStream>()
+            };
+
+            if (playlist == null)
+            {
+                return outputStream;
+            }
+
+            outputStream.Chapters = playlist.Chapters;
+
+            outputStream.RunTimeTicks = TimeSpan.FromSeconds(playlist.TotalLength).Ticks;
+
+            var mediaStreams = new List<MediaStream> { };
+
+            foreach (var stream in playlist.SortedStreams)
+            {
+                var videoStream = stream as TSVideoStream;
+
+                if (videoStream != null)
+                {
+                    AddVideoStream(mediaStreams, videoStream);
+                    continue;
+                }
+
+                var audioStream = stream as TSAudioStream;
+
+                if (audioStream != null)
+                {
+                    AddAudioStream(mediaStreams, audioStream);
+                    continue;
+                }
+
+                var textStream = stream as TSTextStream;
+
+                if (textStream != null)
+                {
+                    AddSubtitleStream(mediaStreams, textStream);
+                    continue;
+                }
+
+                var graphicsStream = stream as TSGraphicsStream;
+
+                if (graphicsStream != null)
+                {
+                    AddSubtitleStream(mediaStreams, graphicsStream);
+                }
+            }
+
+            outputStream.MediaStreams = mediaStreams;
+
+            if (playlist.StreamClips != null && playlist.StreamClips.Any())
+            {
+                // Get the files in the playlist
+                outputStream.Files = playlist.StreamClips.Select(i => i.StreamFile.Name).ToList();
+            }
+
+            return outputStream;
+        }
+
+        /// <summary>
+        /// Adds the video stream.
+        /// </summary>
+        /// <param name="streams">The streams.</param>
+        /// <param name="videoStream">The video stream.</param>
+        private void AddVideoStream(List<MediaStream> streams, TSVideoStream videoStream)
+        {
+            var mediaStream = new MediaStream
+                {
+                    BitRate = Convert.ToInt32(videoStream.BitRate),
+                    Width = videoStream.Width,
+                    Height = videoStream.Height,
+                    Codec = videoStream.CodecShortName,
+                    ScanType = videoStream.IsInterlaced ? "interlaced" : "progressive",
+                    Type = MediaStreamType.Video,
+                    Index = streams.Count
+                };
+
+            if (videoStream.FrameRateDenominator > 0)
+            {
+                float frameRateEnumerator = videoStream.FrameRateEnumerator;
+                float frameRateDenominator = videoStream.FrameRateDenominator;
+
+                mediaStream.AverageFrameRate = mediaStream.RealFrameRate = frameRateEnumerator / frameRateDenominator;
+            }
+
+            streams.Add(mediaStream);
+        }
+
+        /// <summary>
+        /// Adds the audio stream.
+        /// </summary>
+        /// <param name="streams">The streams.</param>
+        /// <param name="audioStream">The audio stream.</param>
+        private void AddAudioStream(List<MediaStream> streams, TSAudioStream audioStream)
+        {
+            streams.Add(new MediaStream
+                {
+                    BitRate = Convert.ToInt32(audioStream.BitRate),
+                    Codec = audioStream.CodecShortName,
+                    Language = audioStream.LanguageCode,
+                    Channels = audioStream.ChannelCount,
+                    SampleRate = audioStream.SampleRate,
+                    Type = MediaStreamType.Audio,
+                    Index = streams.Count
+                });
+        }
+
+        /// <summary>
+        /// Adds the subtitle stream.
+        /// </summary>
+        /// <param name="streams">The streams.</param>
+        /// <param name="textStream">The text stream.</param>
+        private void AddSubtitleStream(List<MediaStream> streams, TSTextStream textStream)
+        {
+            streams.Add(new MediaStream
+                {
+                    Language = textStream.LanguageCode,
+                    Codec = textStream.CodecShortName,
+                    Type = MediaStreamType.Subtitle,
+                    Index = streams.Count
+                });
+        }
+
+        /// <summary>
+        /// Adds the subtitle stream.
+        /// </summary>
+        /// <param name="streams">The streams.</param>
+        /// <param name="textStream">The text stream.</param>
+        private void AddSubtitleStream(List<MediaStream> streams, TSGraphicsStream textStream)
+        {
+            streams.Add(new MediaStream
+                {
+                    Language = textStream.LanguageCode,
+                    Codec = textStream.CodecShortName,
+                    Type = MediaStreamType.Subtitle,
+                    Index = streams.Count
+                });
+        }
+    }
+}
diff --git a/MediaBrowser.Api/EnvironmentService.cs b/MediaBrowser.Api/EnvironmentService.cs
index 83678c3f2b..618eeae5df 100644
--- a/MediaBrowser.Api/EnvironmentService.cs
+++ b/MediaBrowser.Api/EnvironmentService.cs
@@ -1,6 +1,7 @@
 using MediaBrowser.Common.Net;
 using MediaBrowser.Controller.IO;
 using MediaBrowser.Model.IO;
+using MediaBrowser.Model.Net;
 using ServiceStack.ServiceHost;
 using System;
 using System.Collections.Generic;
@@ -59,6 +60,26 @@ namespace MediaBrowser.Api
     /// </summary>
     public class EnvironmentService : BaseRestService
     {
+        /// <summary>
+        /// The _network manager
+        /// </summary>
+        private readonly INetworkManager _networkManager;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="EnvironmentService" /> class.
+        /// </summary>
+        /// <param name="networkManager">The network manager.</param>
+        /// <exception cref="System.ArgumentNullException">networkManager</exception>
+        public EnvironmentService(INetworkManager networkManager)
+        {
+            if (networkManager == null)
+            {
+                throw new ArgumentNullException("networkManager");
+            }
+
+            _networkManager = networkManager;
+        }
+
         /// <summary>
         /// Gets the specified request.
         /// </summary>
@@ -131,7 +152,7 @@ namespace MediaBrowser.Api
         /// <returns>IEnumerable{FileSystemEntryInfo}.</returns>
         private IEnumerable<FileSystemEntryInfo> GetNetworkComputers()
         {
-            return NetUtils.GetNetworkComputers().Select(c => new FileSystemEntryInfo
+            return _networkManager.GetNetworkDevices().Select(c => new FileSystemEntryInfo
             {
                 Name = c,
                 Path = NetworkPrefix + c,
@@ -156,10 +177,10 @@ namespace MediaBrowser.Api
         /// <returns>IEnumerable{FileSystemEntryInfo}.</returns>
         private IEnumerable<FileSystemEntryInfo> GetNetworkShares(string path)
         {
-            return new ShareCollection(path).OfType<Share>().Where(s => s.ShareType == ShareType.Disk).Select(c => new FileSystemEntryInfo
+            return _networkManager.GetNetworkShares(path).Where(s => s.ShareType == NetworkShareType.Disk).Select(c => new FileSystemEntryInfo
             {
-                Name = c.NetName,
-                Path = Path.Combine(path, c.NetName),
+                Name = c.Name,
+                Path = Path.Combine(path, c.Name),
                 Type = FileSystemEntryType.NetworkShare
             });
         }
diff --git a/MediaBrowser.Api/MediaBrowser.Api.csproj b/MediaBrowser.Api/MediaBrowser.Api.csproj
index f6045ddd1d..9bdcdb6506 100644
--- a/MediaBrowser.Api/MediaBrowser.Api.csproj
+++ b/MediaBrowser.Api/MediaBrowser.Api.csproj
@@ -65,8 +65,6 @@
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Runtime.Serialization" />
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
     <Reference Include="System.XML" />
diff --git a/MediaBrowser.ApiInteraction.Javascript/MediaBrowser.ApiInteraction.Javascript.csproj b/MediaBrowser.ApiInteraction.Javascript/MediaBrowser.ApiInteraction.Javascript.csproj
index 3e8ed6c389..68e8c880d4 100644
--- a/MediaBrowser.ApiInteraction.Javascript/MediaBrowser.ApiInteraction.Javascript.csproj
+++ b/MediaBrowser.ApiInteraction.Javascript/MediaBrowser.ApiInteraction.Javascript.csproj
@@ -69,11 +69,7 @@
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\SharedVersion.cs">
@@ -87,14 +83,6 @@
       <Project>{9142eefa-7570-41e1-bfcc-468bb571af2f}</Project>
       <Name>MediaBrowser.Common</Name>
     </ProjectReference>
-    <ProjectReference Include="..\MediaBrowser.Controller\MediaBrowser.Controller.csproj">
-      <Project>{17e1f4e6-8abd-4fe5-9ecf-43d4b6087ba2}</Project>
-      <Name>MediaBrowser.Controller</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj">
-      <Project>{7eeeb4bb-f3e8-48fc-b4c5-70f0fff8329b}</Project>
-      <Name>MediaBrowser.Model</Name>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="ApiClient.js" />
diff --git a/MediaBrowser.ClickOnce/MediaBrowser.ClickOnce.csproj b/MediaBrowser.ClickOnce/MediaBrowser.ClickOnce.csproj
index e6496eae88..6043df0eb2 100644
--- a/MediaBrowser.ClickOnce/MediaBrowser.ClickOnce.csproj
+++ b/MediaBrowser.ClickOnce/MediaBrowser.ClickOnce.csproj
@@ -33,11 +33,7 @@
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Deployment" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\SharedVersion.cs">
diff --git a/MediaBrowser.Common/Extensions/BaseExtensions.cs b/MediaBrowser.Common/Extensions/BaseExtensions.cs
index 6abe6d4e04..5342cff4be 100644
--- a/MediaBrowser.Common/Extensions/BaseExtensions.cs
+++ b/MediaBrowser.Common/Extensions/BaseExtensions.cs
@@ -1,10 +1,8 @@
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Linq;
 using System.Security.Cryptography;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace MediaBrowser.Common.Extensions
 {
@@ -45,23 +43,6 @@ namespace MediaBrowser.Common.Extensions
             return val.Split(new[] { separator }, options);
         }
 
-        /// <summary>
-        /// Provides a non-blocking method to start a process and wait asynchronously for it to exit
-        /// </summary>
-        /// <param name="process">The process.</param>
-        /// <returns>Task{System.Boolean}.</returns>
-        public static Task<bool> RunAsync(this Process process)
-        {
-            var tcs = new TaskCompletionSource<bool>();
-
-            process.EnableRaisingEvents = true;
-            process.Exited += (sender, args) => tcs.SetResult(true);
-
-            process.Start();
-
-            return tcs.Task;
-        }
-
         /// <summary>
         /// Shuffles an IEnumerable
         /// </summary>
diff --git a/MediaBrowser.Common/Kernel/BaseKernel.cs b/MediaBrowser.Common/Kernel/BaseKernel.cs
index 2b9550496b..08e8c3e75f 100644
--- a/MediaBrowser.Common/Kernel/BaseKernel.cs
+++ b/MediaBrowser.Common/Kernel/BaseKernel.cs
@@ -1,5 +1,4 @@
 using MediaBrowser.Common.Events;
-using MediaBrowser.Common.IO;
 using MediaBrowser.Common.Net;
 using MediaBrowser.Common.Plugins;
 using MediaBrowser.Common.ScheduledTasks;
@@ -396,7 +395,7 @@ namespace MediaBrowser.Common.Kernel
             await ReloadComposableParts().ConfigureAwait(false);
 
             DisposeTcpManager();
-            TcpManager = new TcpManager(ApplicationHost, this, Logger);
+            TcpManager = new TcpManager(ApplicationHost, this, ApplicationHost.Resolve<INetworkManager>(), Logger);
         }
 
         /// <summary>
diff --git a/MediaBrowser.Common/Kernel/BaseManager.cs b/MediaBrowser.Common/Kernel/BaseManager.cs
deleted file mode 100644
index 3d830caef5..0000000000
--- a/MediaBrowser.Common/Kernel/BaseManager.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-using System;
-
-namespace MediaBrowser.Common.Kernel
-{
-    /// <summary>
-    /// Class BaseManager
-    /// </summary>
-    /// <typeparam name="TKernelType">The type of the T kernel type.</typeparam>
-    public abstract class BaseManager<TKernelType> : IDisposable
-        where TKernelType : class, IKernel
-    {
-        /// <summary>
-        /// The _kernel
-        /// </summary>
-        protected readonly TKernelType Kernel;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="BaseManager" /> class.
-        /// </summary>
-        /// <param name="kernel">The kernel.</param>
-        /// <exception cref="System.ArgumentNullException">kernel</exception>
-        protected BaseManager(TKernelType kernel)
-        {
-            if (kernel == null)
-            {
-                throw new ArgumentNullException("kernel");
-            }
-   
-            Kernel = kernel;
-        }
-
-        /// <summary>
-        /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
-        /// </summary>
-        public void Dispose()
-        {
-            Dispose(true);
-            GC.SuppressFinalize(this);
-        }
-
-        /// <summary>
-        /// Releases unmanaged and - optionally - managed resources.
-        /// </summary>
-        /// <param name="dispose"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged resources.</param>
-        protected virtual void Dispose(bool dispose)
-        {
-        }
-    }
-}
diff --git a/MediaBrowser.Common/Kernel/IApplicationHost.cs b/MediaBrowser.Common/Kernel/IApplicationHost.cs
index ae2e716670..dccb65b2aa 100644
--- a/MediaBrowser.Common/Kernel/IApplicationHost.cs
+++ b/MediaBrowser.Common/Kernel/IApplicationHost.cs
@@ -58,6 +58,13 @@ namespace MediaBrowser.Common.Kernel
         /// <param name="obj">The obj.</param>
         void Register<T>(T obj) where T : class;
 
+        /// <summary>
+        /// Registers the specified service type.
+        /// </summary>
+        /// <param name="serviceType">Type of the service.</param>
+        /// <param name="implementation">Type of the implementation.</param>
+        void Register(Type serviceType, Type implementation);
+
         /// <summary>
         /// Resolves this instance.
         /// </summary>
diff --git a/MediaBrowser.Common/Kernel/TcpManager.cs b/MediaBrowser.Common/Kernel/TcpManager.cs
index 086815cbfd..0b171c4929 100644
--- a/MediaBrowser.Common/Kernel/TcpManager.cs
+++ b/MediaBrowser.Common/Kernel/TcpManager.cs
@@ -22,7 +22,7 @@ namespace MediaBrowser.Common.Kernel
     /// <summary>
     /// Manages the Http Server, Udp Server and WebSocket connections
     /// </summary>
-    public class TcpManager : BaseManager<IKernel>
+    public class TcpManager : IDisposable
     {
         /// <summary>
         /// This is the udp server used for server discovery by clients
@@ -65,6 +65,11 @@ namespace MediaBrowser.Common.Kernel
         /// </summary>
         private readonly ILogger _logger;
 
+        /// <summary>
+        /// The _network manager
+        /// </summary>
+        private readonly INetworkManager _networkManager;
+        
         /// <summary>
         /// The _application host
         /// </summary>
@@ -75,6 +80,11 @@ namespace MediaBrowser.Common.Kernel
         /// </summary>
         private bool? _supportsNativeWebSocket;
 
+        /// <summary>
+        /// The _kernel
+        /// </summary>
+        private readonly IKernel _kernel;
+        
         /// <summary>
         /// Gets a value indicating whether [supports web socket].
         /// </summary>
@@ -107,7 +117,7 @@ namespace MediaBrowser.Common.Kernel
         /// <value>The web socket port number.</value>
         public int WebSocketPortNumber
         {
-            get { return SupportsNativeWebSocket ? Kernel.Configuration.HttpServerPortNumber : Kernel.Configuration.LegacyWebSocketPortNumber; }
+            get { return SupportsNativeWebSocket ? _kernel.Configuration.HttpServerPortNumber : _kernel.Configuration.LegacyWebSocketPortNumber; }
         }
 
         /// <summary>
@@ -115,12 +125,31 @@ namespace MediaBrowser.Common.Kernel
         /// </summary>
         /// <param name="applicationHost">The application host.</param>
         /// <param name="kernel">The kernel.</param>
+        /// <param name="networkManager">The network manager.</param>
         /// <param name="logger">The logger.</param>
-        public TcpManager(IApplicationHost applicationHost, IKernel kernel, ILogger logger)
-            : base(kernel)
+        public TcpManager(IApplicationHost applicationHost, IKernel kernel, INetworkManager networkManager, ILogger logger)
         {
+            if (applicationHost == null)
+            {
+                throw new ArgumentNullException("applicationHost");
+            }
+            if (kernel == null)
+            {
+                throw new ArgumentNullException("kernel");
+            }
+            if (networkManager == null)
+            {
+                throw new ArgumentNullException("networkManager");
+            }
+            if (logger == null)
+            {
+                throw new ArgumentNullException("logger");
+            }
+            
             _logger = logger;
+            _kernel = kernel;
             _applicationHost = applicationHost;
+            _networkManager = networkManager;
 
             if (kernel.IsFirstRun)
             {
@@ -142,14 +171,14 @@ namespace MediaBrowser.Common.Kernel
         private void ReloadExternalWebSocketServer()
         {
             // Avoid windows firewall prompts in the ui
-            if (Kernel.KernelContext != KernelContext.Server)
+            if (_kernel.KernelContext != KernelContext.Server)
             {
                 return;
             }
 
             DisposeExternalWebSocketServer();
 
-            ExternalWebSocketServer = new WebSocketServer(Kernel.Configuration.LegacyWebSocketPortNumber, IPAddress.Any)
+            ExternalWebSocketServer = new WebSocketServer(_kernel.Configuration.LegacyWebSocketPortNumber, IPAddress.Any)
             {
                 OnConnected = OnAlchemyWebSocketClientConnected,
                 TimeOut = TimeSpan.FromMinutes(60)
@@ -178,7 +207,7 @@ namespace MediaBrowser.Common.Kernel
         public void ReloadHttpServer(bool registerServerOnFailure = true)
         {
             // Only reload if the port has changed, so that we don't disconnect any active users
-            if (HttpServer != null && HttpServer.UrlPrefix.Equals(Kernel.HttpServerUrlPrefix, StringComparison.OrdinalIgnoreCase))
+            if (HttpServer != null && HttpServer.UrlPrefix.Equals(_kernel.HttpServerUrlPrefix, StringComparison.OrdinalIgnoreCase))
             {
                 return;
             }
@@ -189,7 +218,7 @@ namespace MediaBrowser.Common.Kernel
 
             try
             {
-                HttpServer = new HttpServer(Kernel.HttpServerUrlPrefix, "Media Browser", _applicationHost, Kernel, _logger);
+                HttpServer = new HttpServer(_kernel.HttpServerUrlPrefix, "Media Browser", _applicationHost, _kernel, _logger);
             }
             catch (HttpListenerException ex)
             {
@@ -229,7 +258,7 @@ namespace MediaBrowser.Common.Kernel
         /// <param name="result">The result.</param>
         private async void ProcessWebSocketMessageReceived(WebSocketMessageInfo result)
         {
-            var tasks = Kernel.WebSocketListeners.Select(i => Task.Run(async () =>
+            var tasks = _kernel.WebSocketListeners.Select(i => Task.Run(async () =>
             {
                 try
                 {
@@ -256,7 +285,7 @@ namespace MediaBrowser.Common.Kernel
             }
 
             // Avoid windows firewall prompts in the ui
-            if (Kernel.KernelContext != KernelContext.Server)
+            if (_kernel.KernelContext != KernelContext.Server)
             {
                 return;
             }
@@ -266,7 +295,7 @@ namespace MediaBrowser.Common.Kernel
             try
             {
                 // The port number can't be in configuration because we don't want it to ever change
-                UdpServer = new UdpServer(new IPEndPoint(IPAddress.Any, Kernel.UdpServerPortNumber));
+                UdpServer = new UdpServer(new IPEndPoint(IPAddress.Any, _kernel.UdpServerPortNumber));
             }
             catch (SocketException ex)
             {
@@ -276,7 +305,7 @@ namespace MediaBrowser.Common.Kernel
 
             UdpListener = UdpServer.Subscribe(async res =>
             {
-                var expectedMessage = String.Format("who is MediaBrowser{0}?", Kernel.KernelContext);
+                var expectedMessage = String.Format("who is MediaBrowser{0}?", _kernel.KernelContext);
                 var expectedMessageBytes = Encoding.UTF8.GetBytes(expectedMessage);
 
                 if (expectedMessageBytes.SequenceEqual(res.Buffer))
@@ -284,7 +313,7 @@ namespace MediaBrowser.Common.Kernel
                     _logger.Info("Received UDP server request from " + res.RemoteEndPoint.ToString());
 
                     // Send a response back with our ip address and port
-                    var response = String.Format("MediaBrowser{0}|{1}:{2}", Kernel.KernelContext, NetUtils.GetLocalIpAddress(), Kernel.UdpServerPortNumber);
+                    var response = String.Format("MediaBrowser{0}|{1}:{2}", _kernel.KernelContext, _networkManager.GetLocalIpAddress(), _kernel.UdpServerPortNumber);
 
                     await UdpServer.SendAsync(response, res.RemoteEndPoint);
                 }
@@ -422,7 +451,7 @@ namespace MediaBrowser.Common.Kernel
         private void RegisterServerWithAdministratorAccess()
         {
             // Create a temp file path to extract the bat file to
-            var tmpFile = Path.Combine(Kernel.ApplicationPaths.TempDirectory, Guid.NewGuid() + ".bat");
+            var tmpFile = Path.Combine(_kernel.ApplicationPaths.TempDirectory, Guid.NewGuid() + ".bat");
 
             // Extract the bat file
             using (var stream = Assembly.GetExecutingAssembly().GetManifestResourceStream("MediaBrowser.Common.Kernel.RegisterServer.bat"))
@@ -437,10 +466,10 @@ namespace MediaBrowser.Common.Kernel
             {
                 FileName = tmpFile,
 
-                Arguments = string.Format("{0} {1} {2} {3}", Kernel.Configuration.HttpServerPortNumber,
-                Kernel.HttpServerUrlPrefix,
-                Kernel.UdpServerPortNumber,
-                Kernel.Configuration.LegacyWebSocketPortNumber),
+                Arguments = string.Format("{0} {1} {2} {3}", _kernel.Configuration.HttpServerPortNumber,
+                _kernel.HttpServerUrlPrefix,
+                _kernel.UdpServerPortNumber,
+                _kernel.Configuration.LegacyWebSocketPortNumber),
 
                 CreateNoWindow = true,
                 WindowStyle = ProcessWindowStyle.Hidden,
@@ -454,19 +483,26 @@ namespace MediaBrowser.Common.Kernel
             }
         }
 
+        /// <summary>
+        /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
+        /// </summary>
+        public void Dispose()
+        {
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+
         /// <summary>
         /// Releases unmanaged and - optionally - managed resources.
         /// </summary>
         /// <param name="dispose"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged resources.</param>
-        protected override void Dispose(bool dispose)
+        protected virtual void Dispose(bool dispose)
         {
             if (dispose)
             {
                 DisposeUdpServer();
                 DisposeHttpServer();
             }
-
-            base.Dispose(dispose);
         }
 
         /// <summary>
diff --git a/MediaBrowser.Common/MediaBrowser.Common.csproj b/MediaBrowser.Common/MediaBrowser.Common.csproj
index 6542ab81d2..57b30eedce 100644
--- a/MediaBrowser.Common/MediaBrowser.Common.csproj
+++ b/MediaBrowser.Common/MediaBrowser.Common.csproj
@@ -45,7 +45,6 @@
       <HintPath>..\packages\NLog.2.0.0.2000\lib\net40\NLog.dll</HintPath>
     </Reference>
     <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
     <Reference Include="protobuf-net, Version=2.0.0.621, Culture=neutral, PublicKeyToken=257b51d87d2e4d67, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\protobuf-net.2.0.0.621\lib\net40\protobuf-net.dll</HintPath>
@@ -91,7 +90,6 @@
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
-    <Reference Include="System.Management" />
     <Reference Include="System.Net" />
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Net.Http.WebRequest" />
@@ -107,12 +105,8 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\Rx-Linq.2.0.21114\lib\Net45\System.Reactive.Linq.dll</HintPath>
     </Reference>
-    <Reference Include="System.Runtime.Remoting" />
-    <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.Web" />
-    <Reference Include="System.Xml.Linq" />
     <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
@@ -130,7 +124,6 @@
     <Compile Include="IO\ProgressStream.cs" />
     <Compile Include="IO\StreamDefaults.cs" />
     <Compile Include="Kernel\BaseApplicationPaths.cs" />
-    <Compile Include="Kernel\BaseManager.cs" />
     <Compile Include="Kernel\BasePeriodicWebSocketListener.cs" />
     <Compile Include="Kernel\IWebSocketListener.cs" />
     <Compile Include="Kernel\IApplicationHost.cs" />
@@ -142,12 +135,12 @@
     <Compile Include="Net\Handlers\IHttpServerHandler.cs" />
     <Compile Include="Net\Handlers\StaticFileHandler.cs" />
     <Compile Include="Net\HttpManager.cs" />
+    <Compile Include="Net\INetworkManager.cs" />
     <Compile Include="Net\IRestfulService.cs" />
     <Compile Include="Net\IUdpServer.cs" />
     <Compile Include="Net\IWebSocket.cs" />
     <Compile Include="Net\MimeTypes.cs" />
     <Compile Include="Net\NativeWebSocket.cs" />
-    <Compile Include="Net\NetUtils.cs" />
     <Compile Include="Net\UdpServer.cs" />
     <Compile Include="Net\WebSocketConnection.cs" />
     <Compile Include="Plugins\BaseUiPlugin.cs" />
@@ -184,7 +177,6 @@
     <Compile Include="ScheduledTasks\IntervalTrigger.cs" />
     <Compile Include="ScheduledTasks\IScheduledTask.cs" />
     <Compile Include="ScheduledTasks\WeeklyTrigger.cs" />
-    <Compile Include="Win32\NativeMethods.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
diff --git a/MediaBrowser.Common/Net/HttpManager.cs b/MediaBrowser.Common/Net/HttpManager.cs
index 1deffba697..180843e0fd 100644
--- a/MediaBrowser.Common/Net/HttpManager.cs
+++ b/MediaBrowser.Common/Net/HttpManager.cs
@@ -19,22 +19,36 @@ namespace MediaBrowser.Common.Net
     /// <summary>
     /// Class HttpManager
     /// </summary>
-    public class HttpManager : BaseManager<IKernel>
+    public class HttpManager : IDisposable
     {
         /// <summary>
         /// The _logger
         /// </summary>
         private readonly ILogger _logger;
 
+        /// <summary>
+        /// The _kernel
+        /// </summary>
+        private readonly IKernel _kernel;
+        
         /// <summary>
         /// Initializes a new instance of the <see cref="HttpManager" /> class.
         /// </summary>
         /// <param name="kernel">The kernel.</param>
         /// <param name="logger">The logger.</param>
         public HttpManager(IKernel kernel, ILogger logger)
-            : base(kernel)
         {
+            if (kernel == null)
+            {
+                throw new ArgumentNullException("kernel");
+            }
+            if (logger == null)
+            {
+                throw new ArgumentNullException("logger");
+            }
+            
             _logger = logger;
+            _kernel = kernel;
         }
 
         /// <summary>
@@ -196,7 +210,7 @@ namespace MediaBrowser.Common.Net
 
             cancellationToken.ThrowIfCancellationRequested();
 
-            var tempFile = Path.Combine(Kernel.ApplicationPaths.TempDirectory, Guid.NewGuid() + ".tmp");
+            var tempFile = Path.Combine(_kernel.ApplicationPaths.TempDirectory, Guid.NewGuid() + ".tmp");
 
             var message = new HttpRequestMessage(HttpMethod.Get, url);
 
@@ -402,11 +416,20 @@ namespace MediaBrowser.Common.Net
             return url.Substring(start, len);
         }
 
+        /// <summary>
+        /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
+        /// </summary>
+        public void Dispose()
+        {
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+
         /// <summary>
         /// Releases unmanaged and - optionally - managed resources.
         /// </summary>
         /// <param name="dispose"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged resources.</param>
-        protected override void Dispose(bool dispose)
+        protected virtual void Dispose(bool dispose)
         {
             if (dispose)
             {
@@ -417,8 +440,6 @@ namespace MediaBrowser.Common.Net
 
                 _httpClients.Clear();
             }
-
-            base.Dispose(dispose);
         }
 
         /// <summary>
diff --git a/MediaBrowser.Common/Net/INetworkManager.cs b/MediaBrowser.Common/Net/INetworkManager.cs
new file mode 100644
index 0000000000..7f6bfe1524
--- /dev/null
+++ b/MediaBrowser.Common/Net/INetworkManager.cs
@@ -0,0 +1,72 @@
+using System.Collections.Generic;
+using MediaBrowser.Model.Net;
+
+namespace MediaBrowser.Common.Net
+{
+    public interface INetworkManager
+    {
+        /// <summary>
+        /// Gets the machine's local ip address
+        /// </summary>
+        /// <returns>IPAddress.</returns>
+        string GetLocalIpAddress();
+
+        /// <summary>
+        /// Gets a random port number that is currently available
+        /// </summary>
+        /// <returns>System.Int32.</returns>
+        int GetRandomUnusedPort();
+
+        /// <summary>
+        /// Creates the netsh URL registration.
+        /// </summary>
+        void AuthorizeHttpListening(string url);
+
+        /// <summary>
+        /// Adds the windows firewall rule.
+        /// </summary>
+        /// <param name="port">The port.</param>
+        /// <param name="protocol">The protocol.</param>
+        void AddSystemFirewallRule(int port, NetworkProtocol protocol);
+
+        /// <summary>
+        /// Removes the windows firewall rule.
+        /// </summary>
+        /// <param name="port">The port.</param>
+        /// <param name="protocol">The protocol.</param>
+        void RemoveSystemFirewallRule(int port, NetworkProtocol protocol);
+
+        /// <summary>
+        /// Returns MAC Address from first Network Card in Computer
+        /// </summary>
+        /// <returns>[string] MAC Address</returns>
+        string GetMacAddress();
+
+        /// <summary>
+        /// Gets available devices within the domain
+        /// </summary>
+        /// <returns>PC's in the Domain</returns>
+        IEnumerable<string> GetNetworkDevices();
+
+        /// <summary>
+        /// Gets the network shares.
+        /// </summary>
+        /// <param name="path">The path.</param>
+        /// <returns>IEnumerable{NetworkShare}.</returns>
+        IEnumerable<NetworkShare> GetNetworkShares(string path);
+    }
+    /// <summary>
+    /// Enum NetworkProtocol
+    /// </summary>
+    public enum NetworkProtocol
+    {
+        /// <summary>
+        /// The TCP
+        /// </summary>
+        Tcp,
+        /// <summary>
+        /// The UDP
+        /// </summary>
+        Udp
+    }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Common/Net/NetUtils.cs b/MediaBrowser.Common/Net/NetUtils.cs
deleted file mode 100644
index eb50a879d6..0000000000
--- a/MediaBrowser.Common/Net/NetUtils.cs
+++ /dev/null
@@ -1,219 +0,0 @@
-using MediaBrowser.Common.Win32;
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Management;
-using System.Net;
-using System.Net.Sockets;
-using System.Runtime.InteropServices;
-
-namespace MediaBrowser.Common.Net
-{
-    /// <summary>
-    /// Class NetUtils
-    /// </summary>
-    public static class NetUtils
-    {
-        /// <summary>
-        /// Gets the machine's local ip address
-        /// </summary>
-        /// <returns>IPAddress.</returns>
-        public static IPAddress GetLocalIpAddress()
-        {
-            var host = Dns.GetHostEntry(Dns.GetHostName());
-
-            return host.AddressList.FirstOrDefault(i => i.AddressFamily == AddressFamily.InterNetwork);
-        }
-
-        /// <summary>
-        /// Gets a random port number that is currently available
-        /// </summary>
-        /// <returns>System.Int32.</returns>
-        public static int GetRandomUnusedPort()
-        {
-            var listener = new TcpListener(IPAddress.Any, 0);
-            listener.Start();
-            var port = ((IPEndPoint)listener.LocalEndpoint).Port;
-            listener.Stop();
-            return port;
-        }
-
-        /// <summary>
-        /// Creates the netsh URL registration.
-        /// </summary>
-        /// <param name="urlPrefix">The URL prefix.</param>
-        public static void CreateNetshUrlRegistration(string urlPrefix)
-        {
-            var startInfo = new ProcessStartInfo
-            {
-                FileName = "netsh",
-                Arguments = string.Format("http add urlacl url={0} user=\"NT AUTHORITY\\Authenticated Users\"", urlPrefix),
-                CreateNoWindow = true,
-                WindowStyle = ProcessWindowStyle.Hidden,
-                Verb = "runas",
-                ErrorDialog = false
-            };
-
-            using (var process = Process.Start(startInfo))
-            {
-                process.WaitForExit();
-            }
-        }
-
-        /// <summary>
-        /// Adds the windows firewall rule.
-        /// </summary>
-        /// <param name="port">The port.</param>
-        /// <param name="protocol">The protocol.</param>
-        public static void AddWindowsFirewallRule(int port, NetworkProtocol protocol)
-        {
-            // First try to remove it so we don't end up creating duplicates
-            RemoveWindowsFirewallRule(port, protocol);
-
-            var args = string.Format("advfirewall firewall add rule name=\"Port {0}\" dir=in action=allow protocol={1} localport={0}", port, protocol);
-
-            RunNetsh(args);
-        }
-
-        /// <summary>
-        /// Removes the windows firewall rule.
-        /// </summary>
-        /// <param name="port">The port.</param>
-        /// <param name="protocol">The protocol.</param>
-        public static void RemoveWindowsFirewallRule(int port, NetworkProtocol protocol)
-        {
-            var args = string.Format("advfirewall firewall delete rule name=\"Port {0}\" protocol={1} localport={0}", port, protocol);
-
-            RunNetsh(args);
-        }
-
-        /// <summary>
-        /// Runs the netsh.
-        /// </summary>
-        /// <param name="args">The args.</param>
-        private static void RunNetsh(string args)
-        {
-            var startInfo = new ProcessStartInfo
-            {
-                FileName = "netsh",
-                Arguments = args,
-                CreateNoWindow = true,
-                WindowStyle = ProcessWindowStyle.Hidden,
-                Verb = "runas",
-                ErrorDialog = false
-            };
-
-            using (var process = new Process { StartInfo = startInfo })
-            {
-                process.Start();
-                process.WaitForExit();
-            }
-        }
-
-        /// <summary>
-        /// Returns MAC Address from first Network Card in Computer
-        /// </summary>
-        /// <returns>[string] MAC Address</returns>
-        public static string GetMacAddress()
-        {
-            var mc = new ManagementClass("Win32_NetworkAdapterConfiguration");
-            var moc = mc.GetInstances();
-            var macAddress = String.Empty;
-            foreach (ManagementObject mo in moc)
-            {
-                if (macAddress == String.Empty)  // only return MAC Address from first card
-                {
-                    try
-                    {
-                        if ((bool)mo["IPEnabled"]) macAddress = mo["MacAddress"].ToString();
-                    }
-                    catch
-                    {
-                        mo.Dispose();
-                        return "";
-                    }
-                }
-                mo.Dispose();
-            }
-
-            return macAddress.Replace(":", "");
-        }
-
-        /// <summary>
-        /// Uses the DllImport : NetServerEnum with all its required parameters
-        /// (see http://msdn.microsoft.com/library/default.asp?url=/library/en-us/netmgmt/netmgmt/netserverenum.asp
-        /// for full details or method signature) to retrieve a list of domain SV_TYPE_WORKSTATION
-        /// and SV_TYPE_SERVER PC's
-        /// </summary>
-        /// <returns>Arraylist that represents all the SV_TYPE_WORKSTATION and SV_TYPE_SERVER
-        /// PC's in the Domain</returns>
-        public static IEnumerable<string> GetNetworkComputers()
-        {
-            //local fields
-            const int MAX_PREFERRED_LENGTH = -1;
-            var SV_TYPE_WORKSTATION = 1;
-            var SV_TYPE_SERVER = 2;
-            var buffer = IntPtr.Zero;
-            var tmpBuffer = IntPtr.Zero;
-            var entriesRead = 0;
-            var totalEntries = 0;
-            var resHandle = 0;
-            var sizeofINFO = Marshal.SizeOf(typeof(_SERVER_INFO_100));
-
-            try
-            {
-                //call the DllImport : NetServerEnum with all its required parameters
-                //see http://msdn.microsoft.com/library/default.asp?url=/library/en-us/netmgmt/netmgmt/netserverenum.asp
-                //for full details of method signature
-                var ret = NativeMethods.NetServerEnum(null, 100, ref buffer, MAX_PREFERRED_LENGTH, out entriesRead, out totalEntries, SV_TYPE_WORKSTATION | SV_TYPE_SERVER, null, out resHandle);
-
-                //if the returned with a NERR_Success (C++ term), =0 for C#
-                if (ret == 0)
-                {
-                    //loop through all SV_TYPE_WORKSTATION and SV_TYPE_SERVER PC's
-                    for (var i = 0; i < totalEntries; i++)
-                    {
-                        //get pointer to, Pointer to the buffer that received the data from
-                        //the call to NetServerEnum. Must ensure to use correct size of 
-                        //STRUCTURE to ensure correct location in memory is pointed to
-                        tmpBuffer = new IntPtr((int)buffer + (i * sizeofINFO));
-                        //Have now got a pointer to the list of SV_TYPE_WORKSTATION and 
-                        //SV_TYPE_SERVER PC's, which is unmanaged memory
-                        //Needs to Marshal data from an unmanaged block of memory to a 
-                        //managed object, again using STRUCTURE to ensure the correct data
-                        //is marshalled 
-                        var svrInfo = (_SERVER_INFO_100)Marshal.PtrToStructure(tmpBuffer, typeof(_SERVER_INFO_100));
-
-                        //add the PC names to the ArrayList
-                        if (!string.IsNullOrEmpty(svrInfo.sv100_name))
-                        {
-                            yield return svrInfo.sv100_name;
-                        }
-                    }
-                }
-            }
-            finally
-            {
-                //The NetApiBufferFree function frees 
-                //the memory that the NetApiBufferAllocate function allocates
-                NativeMethods.NetApiBufferFree(buffer);
-            }
-        }
-    }
-
-    /// <summary>
-    /// Enum NetworkProtocol
-    /// </summary>
-    public enum NetworkProtocol
-    {
-        /// <summary>
-        /// The TCP
-        /// </summary>
-        Tcp,
-        /// <summary>
-        /// The UDP
-        /// </summary>
-        Udp
-    }
-}
diff --git a/MediaBrowser.Common/Win32/NativeMethods.cs b/MediaBrowser.Common/Win32/NativeMethods.cs
deleted file mode 100644
index a0462fb461..0000000000
--- a/MediaBrowser.Common/Win32/NativeMethods.cs
+++ /dev/null
@@ -1,631 +0,0 @@
-using System;
-using System.IO;
-using System.Runtime.InteropServices;
-using System.Security;
-using System.Text;
-
-namespace MediaBrowser.Common.Win32
-{
-    /// <summary>
-    /// Class NativeMethods
-    /// </summary>
-    [SuppressUnmanagedCodeSecurity]
-    public static class NativeMethods
-    {
-        //declare the Netapi32 : NetServerEnum method import
-        /// <summary>
-        /// Nets the server enum.
-        /// </summary>
-        /// <param name="ServerName">Name of the server.</param>
-        /// <param name="dwLevel">The dw level.</param>
-        /// <param name="pBuf">The p buf.</param>
-        /// <param name="dwPrefMaxLen">The dw pref max len.</param>
-        /// <param name="dwEntriesRead">The dw entries read.</param>
-        /// <param name="dwTotalEntries">The dw total entries.</param>
-        /// <param name="dwServerType">Type of the dw server.</param>
-        /// <param name="domain">The domain.</param>
-        /// <param name="dwResumeHandle">The dw resume handle.</param>
-        /// <returns>System.Int32.</returns>
-        [DllImport("Netapi32", CharSet = CharSet.Auto, SetLastError = true),
-        SuppressUnmanagedCodeSecurityAttribute]
-
-        public static extern int NetServerEnum(
-            string ServerName, // must be null
-            int dwLevel,
-            ref IntPtr pBuf,
-            int dwPrefMaxLen,
-            out int dwEntriesRead,
-            out int dwTotalEntries,
-            int dwServerType,
-            string domain, // null for login domain
-            out int dwResumeHandle
-            );
-
-        //declare the Netapi32 : NetApiBufferFree method import
-        /// <summary>
-        /// Nets the API buffer free.
-        /// </summary>
-        /// <param name="pBuf">The p buf.</param>
-        /// <returns>System.Int32.</returns>
-        [DllImport("Netapi32", SetLastError = true),
-        SuppressUnmanagedCodeSecurityAttribute]
-
-        public static extern int NetApiBufferFree(
-            IntPtr pBuf);
-
-        /// <summary>
-        /// The MA x_ PATH
-        /// </summary>
-        public const int MAX_PATH = 260;
-        /// <summary>
-        /// The MA x_ ALTERNATE
-        /// </summary>
-        public const int MAX_ALTERNATE = 14;
-        /// <summary>
-        /// The INVALI d_ HANDL e_ VALUE
-        /// </summary>
-        public static IntPtr INVALID_HANDLE_VALUE = new IntPtr(-1);
-        /// <summary>
-        /// The STG m_ READ
-        /// </summary>
-        public const uint STGM_READ = 0;
-
-        /// <summary>
-        /// Finds the first file ex.
-        /// </summary>
-        /// <param name="lpFileName">Name of the lp file.</param>
-        /// <param name="fInfoLevelId">The f info level id.</param>
-        /// <param name="lpFindFileData">The lp find file data.</param>
-        /// <param name="fSearchOp">The f search op.</param>
-        /// <param name="lpSearchFilter">The lp search filter.</param>
-        /// <param name="dwAdditionalFlags">The dw additional flags.</param>
-        /// <returns>IntPtr.</returns>
-        [DllImport("kernel32.dll", CharSet = CharSet.Auto, SetLastError = true)]
-        public static extern IntPtr FindFirstFileEx(string lpFileName, FINDEX_INFO_LEVELS fInfoLevelId, out WIN32_FIND_DATA lpFindFileData, FINDEX_SEARCH_OPS fSearchOp, IntPtr lpSearchFilter, int dwAdditionalFlags);
-
-        /// <summary>
-        /// Finds the first file.
-        /// </summary>
-        /// <param name="fileName">Name of the file.</param>
-        /// <param name="lpFindFileData">The lp find file data.</param>
-        /// <returns>IntPtr.</returns>
-        [DllImport("kernel32.dll", CharSet = CharSet.Auto, SetLastError = true)]
-        public static extern IntPtr FindFirstFile(string fileName, out WIN32_FIND_DATA lpFindFileData);
-
-        /// <summary>
-        /// Finds the next file.
-        /// </summary>
-        /// <param name="hFindFile">The h find file.</param>
-        /// <param name="lpFindFileData">The lp find file data.</param>
-        /// <returns>IntPtr.</returns>
-        [DllImport("kernel32.dll", CharSet = CharSet.Auto, SetLastError = true)]
-        public static extern IntPtr FindNextFile(IntPtr hFindFile, out WIN32_FIND_DATA lpFindFileData);
-
-        /// <summary>
-        /// Finds the close.
-        /// </summary>
-        /// <param name="hFindFile">The h find file.</param>
-        /// <returns><c>true</c> if XXXX, <c>false</c> otherwise</returns>
-        [DllImport("kernel32")]
-        public static extern bool FindClose(IntPtr hFindFile);
-    }
-
-    //create a _SERVER_INFO_100 STRUCTURE
-    /// <summary>
-    /// Struct _SERVER_INFO_100
-    /// </summary>
-    [StructLayout(LayoutKind.Sequential)]
-    public struct _SERVER_INFO_100
-    {
-        /// <summary>
-        /// The sv100_platform_id
-        /// </summary>
-        internal int sv100_platform_id;
-        /// <summary>
-        /// The sv100_name
-        /// </summary>
-        [MarshalAs(UnmanagedType.LPWStr)]
-        internal string sv100_name;
-    }
-
-    /// <summary>
-    /// Class FindFirstFileExFlags
-    /// </summary>
-    public class FindFirstFileExFlags
-    {
-        /// <summary>
-        /// The NONE
-        /// </summary>
-        public const int NONE = 0;
-
-        /// <summary>
-        /// Searches are case-sensitive.Searches are case-sensitive.
-        /// </summary>
-        public const int FIND_FIRST_EX_CASE_SENSITIVE = 1;
-
-        /// <summary>
-        /// Uses a larger buffer for directory queries, which can increase performance of the find operation.
-        /// </summary>
-        public const int FIND_FIRST_EX_LARGE_FETCH = 2;
-    }
-
-    /// <summary>
-    /// Enum FINDEX_INFO_LEVELS
-    /// </summary>
-    public enum FINDEX_INFO_LEVELS
-    {
-        /// <summary>
-        /// The FindFirstFileEx function retrieves a standard set of attribute information. The data is returned in a WIN32_FIND_DATA structure.
-        /// </summary>
-        FindExInfoStandard = 0,
-
-        /// <summary>
-        /// The FindFirstFileEx function does not query the short file name, improving overall enumeration speed. The data is returned in a WIN32_FIND_DATA structure, and the cAlternateFileName member is always a NULL string.
-        /// </summary>
-        FindExInfoBasic = 1
-    }
-
-    /// <summary>
-    /// Enum FINDEX_SEARCH_OPS
-    /// </summary>
-    public enum FINDEX_SEARCH_OPS
-    {
-        /// <summary>
-        /// The search for a file that matches a specified file name.
-        /// The lpSearchFilter parameter of FindFirstFileEx must be NULL when this search operation is used.
-        /// </summary>
-        FindExSearchNameMatch = 0,
-
-        /// <summary>
-        /// The find ex search limit to directories
-        /// </summary>
-        FindExSearchLimitToDirectories = 1,
-
-        /// <summary>
-        /// This filtering type is not available.
-        /// </summary>
-        FindExSearchLimitToDevices = 2
-    }
-
-    /// <summary>
-    /// Struct FILETIME
-    /// </summary>
-    [StructLayout(LayoutKind.Sequential)]
-    public struct FILETIME
-    {
-        /// <summary>
-        /// The dw low date time
-        /// </summary>
-        public uint dwLowDateTime;
-        /// <summary>
-        /// The dw high date time
-        /// </summary>
-        public uint dwHighDateTime;
-    }
-
-
-    /// <summary>
-    /// Struct WIN32_FIND_DATA
-    /// </summary>
-    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
-    public struct WIN32_FIND_DATA
-    {
-        /// <summary>
-        /// The dw file attributes
-        /// </summary>
-        public FileAttributes dwFileAttributes;
-        /// <summary>
-        /// The ft creation time
-        /// </summary>
-        public FILETIME ftCreationTime;
-        /// <summary>
-        /// The ft last access time
-        /// </summary>
-        public FILETIME ftLastAccessTime;
-        /// <summary>
-        /// The ft last write time
-        /// </summary>
-        public FILETIME ftLastWriteTime;
-        /// <summary>
-        /// The n file size high
-        /// </summary>
-        public int nFileSizeHigh;
-        /// <summary>
-        /// The n file size low
-        /// </summary>
-        public int nFileSizeLow;
-        /// <summary>
-        /// The dw reserved0
-        /// </summary>
-        public int dwReserved0;
-        /// <summary>
-        /// The dw reserved1
-        /// </summary>
-        public int dwReserved1;
-
-        /// <summary>
-        /// The c file name
-        /// </summary>
-        [MarshalAs(UnmanagedType.ByValTStr, SizeConst = NativeMethods.MAX_PATH)]
-        public string cFileName;
-
-        /// <summary>
-        /// This will always be null when FINDEX_INFO_LEVELS = basic
-        /// </summary>
-        [MarshalAs(UnmanagedType.ByValTStr, SizeConst = NativeMethods.MAX_ALTERNATE)]
-        public string cAlternate;
-
-        /// <summary>
-        /// Gets a value indicating whether this instance is hidden.
-        /// </summary>
-        /// <value><c>true</c> if this instance is hidden; otherwise, <c>false</c>.</value>
-        public bool IsHidden
-        {
-            get
-            {
-                return dwFileAttributes.HasFlag(FileAttributes.Hidden);
-            }
-        }
-
-        /// <summary>
-        /// Gets a value indicating whether this instance is system file.
-        /// </summary>
-        /// <value><c>true</c> if this instance is system file; otherwise, <c>false</c>.</value>
-        public bool IsSystemFile
-        {
-            get
-            {
-                return dwFileAttributes.HasFlag(FileAttributes.System);
-            }
-        }
-
-        /// <summary>
-        /// Gets a value indicating whether this instance is directory.
-        /// </summary>
-        /// <value><c>true</c> if this instance is directory; otherwise, <c>false</c>.</value>
-        public bool IsDirectory
-        {
-            get
-            {
-                return dwFileAttributes.HasFlag(FileAttributes.Directory);
-            }
-        }
-
-        /// <summary>
-        /// Gets the creation time UTC.
-        /// </summary>
-        /// <value>The creation time UTC.</value>
-        public DateTime CreationTimeUtc
-        {
-            get
-            {
-                return ParseFileTime(ftCreationTime);
-            }
-        }
-
-        /// <summary>
-        /// Gets the last access time UTC.
-        /// </summary>
-        /// <value>The last access time UTC.</value>
-        public DateTime LastAccessTimeUtc
-        {
-            get
-            {
-                return ParseFileTime(ftLastAccessTime);
-            }
-        }
-
-        /// <summary>
-        /// Gets the last write time UTC.
-        /// </summary>
-        /// <value>The last write time UTC.</value>
-        public DateTime LastWriteTimeUtc
-        {
-            get
-            {
-                return ParseFileTime(ftLastWriteTime);
-            }
-        }
-
-        /// <summary>
-        /// Parses the file time.
-        /// </summary>
-        /// <param name="filetime">The filetime.</param>
-        /// <returns>DateTime.</returns>
-        private DateTime ParseFileTime(FILETIME filetime)
-        {
-            long highBits = filetime.dwHighDateTime;
-            highBits = highBits << 32;
-
-            var val = highBits + (long) filetime.dwLowDateTime;
-
-            if (val < 0L)
-            {
-                return DateTime.MinValue;
-            }
-
-            if (val > 2650467743999999999L)
-            {
-                return DateTime.MaxValue;
-            }
-
-            return DateTime.FromFileTimeUtc(val);
-        }
-
-        /// <summary>
-        /// Gets or sets the path.
-        /// </summary>
-        /// <value>The path.</value>
-        public string Path { get; set; }
-
-        /// <summary>
-        /// Returns a <see cref="System.String" /> that represents this instance.
-        /// </summary>
-        /// <returns>A <see cref="System.String" /> that represents this instance.</returns>
-        public override string ToString()
-        {
-            return Path ?? string.Empty;
-        }
-    }
-
-    /// <summary>
-    /// Enum SLGP_FLAGS
-    /// </summary>
-    [Flags]
-    public enum SLGP_FLAGS
-    {
-        /// <summary>
-        /// Retrieves the standard short (8.3 format) file name
-        /// </summary>
-        SLGP_SHORTPATH = 0x1,
-        /// <summary>
-        /// Retrieves the Universal Naming Convention (UNC) path name of the file
-        /// </summary>
-        SLGP_UNCPRIORITY = 0x2,
-        /// <summary>
-        /// Retrieves the raw path name. A raw path is something that might not exist and may include environment variables that need to be expanded
-        /// </summary>
-        SLGP_RAWPATH = 0x4
-    }
-    /// <summary>
-    /// Enum SLR_FLAGS
-    /// </summary>
-    [Flags]
-    public enum SLR_FLAGS
-    {
-        /// <summary>
-        /// Do not display a dialog box if the link cannot be resolved. When SLR_NO_UI is set,
-        /// the high-order word of fFlags can be set to a time-out value that specifies the
-        /// maximum amount of time to be spent resolving the link. The function returns if the
-        /// link cannot be resolved within the time-out duration. If the high-order word is set
-        /// to zero, the time-out duration will be set to the default value of 3,000 milliseconds
-        /// (3 seconds). To specify a value, set the high word of fFlags to the desired time-out
-        /// duration, in milliseconds.
-        /// </summary>
-        SLR_NO_UI = 0x1,
-        /// <summary>
-        /// Obsolete and no longer used
-        /// </summary>
-        SLR_ANY_MATCH = 0x2,
-        /// <summary>
-        /// If the link object has changed, update its path and list of identifiers.
-        /// If SLR_UPDATE is set, you do not need to call IPersistFile::IsDirty to determine
-        /// whether or not the link object has changed.
-        /// </summary>
-        SLR_UPDATE = 0x4,
-        /// <summary>
-        /// Do not update the link information
-        /// </summary>
-        SLR_NOUPDATE = 0x8,
-        /// <summary>
-        /// Do not execute the search heuristics
-        /// </summary>
-        SLR_NOSEARCH = 0x10,
-        /// <summary>
-        /// Do not use distributed link tracking
-        /// </summary>
-        SLR_NOTRACK = 0x20,
-        /// <summary>
-        /// Disable distributed link tracking. By default, distributed link tracking tracks
-        /// removable media across multiple devices based on the volume name. It also uses the
-        /// Universal Naming Convention (UNC) path to track remote file systems whose drive letter
-        /// has changed. Setting SLR_NOLINKINFO disables both types of tracking.
-        /// </summary>
-        SLR_NOLINKINFO = 0x40,
-        /// <summary>
-        /// Call the Microsoft Windows Installer
-        /// </summary>
-        SLR_INVOKE_MSI = 0x80
-    }
-
-
-    /// <summary>
-    /// The IShellLink interface allows Shell links to be created, modified, and resolved
-    /// </summary>
-    [ComImport, InterfaceType(ComInterfaceType.InterfaceIsIUnknown), Guid("000214F9-0000-0000-C000-000000000046")]
-    public interface IShellLinkW
-    {
-        /// <summary>
-        /// Retrieves the path and file name of a Shell link object
-        /// </summary>
-        /// <param name="pszFile">The PSZ file.</param>
-        /// <param name="cchMaxPath">The CCH max path.</param>
-        /// <param name="pfd">The PFD.</param>
-        /// <param name="fFlags">The f flags.</param>
-        void GetPath([Out, MarshalAs(UnmanagedType.LPWStr)] StringBuilder pszFile, int cchMaxPath, out WIN32_FIND_DATA pfd, SLGP_FLAGS fFlags);
-        /// <summary>
-        /// Retrieves the list of item identifiers for a Shell link object
-        /// </summary>
-        /// <param name="ppidl">The ppidl.</param>
-        void GetIDList(out IntPtr ppidl);
-        /// <summary>
-        /// Sets the pointer to an item identifier list (PIDL) for a Shell link object.
-        /// </summary>
-        /// <param name="pidl">The pidl.</param>
-        void SetIDList(IntPtr pidl);
-        /// <summary>
-        /// Retrieves the description string for a Shell link object
-        /// </summary>
-        /// <param name="pszName">Name of the PSZ.</param>
-        /// <param name="cchMaxName">Name of the CCH max.</param>
-        void GetDescription([Out, MarshalAs(UnmanagedType.LPWStr)] StringBuilder pszName, int cchMaxName);
-        /// <summary>
-        /// Sets the description for a Shell link object. The description can be any application-defined string
-        /// </summary>
-        /// <param name="pszName">Name of the PSZ.</param>
-        void SetDescription([MarshalAs(UnmanagedType.LPWStr)] string pszName);
-        /// <summary>
-        /// Retrieves the name of the working directory for a Shell link object
-        /// </summary>
-        /// <param name="pszDir">The PSZ dir.</param>
-        /// <param name="cchMaxPath">The CCH max path.</param>
-        void GetWorkingDirectory([Out, MarshalAs(UnmanagedType.LPWStr)] StringBuilder pszDir, int cchMaxPath);
-        /// <summary>
-        /// Sets the name of the working directory for a Shell link object
-        /// </summary>
-        /// <param name="pszDir">The PSZ dir.</param>
-        void SetWorkingDirectory([MarshalAs(UnmanagedType.LPWStr)] string pszDir);
-        /// <summary>
-        /// Retrieves the command-line arguments associated with a Shell link object
-        /// </summary>
-        /// <param name="pszArgs">The PSZ args.</param>
-        /// <param name="cchMaxPath">The CCH max path.</param>
-        void GetArguments([Out, MarshalAs(UnmanagedType.LPWStr)] StringBuilder pszArgs, int cchMaxPath);
-        /// <summary>
-        /// Sets the command-line arguments for a Shell link object
-        /// </summary>
-        /// <param name="pszArgs">The PSZ args.</param>
-        void SetArguments([MarshalAs(UnmanagedType.LPWStr)] string pszArgs);
-        /// <summary>
-        /// Retrieves the hot key for a Shell link object
-        /// </summary>
-        /// <param name="pwHotkey">The pw hotkey.</param>
-        void GetHotkey(out short pwHotkey);
-        /// <summary>
-        /// Sets a hot key for a Shell link object
-        /// </summary>
-        /// <param name="wHotkey">The w hotkey.</param>
-        void SetHotkey(short wHotkey);
-        /// <summary>
-        /// Retrieves the show command for a Shell link object
-        /// </summary>
-        /// <param name="piShowCmd">The pi show CMD.</param>
-        void GetShowCmd(out int piShowCmd);
-        /// <summary>
-        /// Sets the show command for a Shell link object. The show command sets the initial show state of the window.
-        /// </summary>
-        /// <param name="iShowCmd">The i show CMD.</param>
-        void SetShowCmd(int iShowCmd);
-        /// <summary>
-        /// Retrieves the location (path and index) of the icon for a Shell link object
-        /// </summary>
-        /// <param name="pszIconPath">The PSZ icon path.</param>
-        /// <param name="cchIconPath">The CCH icon path.</param>
-        /// <param name="piIcon">The pi icon.</param>
-        void GetIconLocation([Out, MarshalAs(UnmanagedType.LPWStr)] StringBuilder pszIconPath,
-            int cchIconPath, out int piIcon);
-        /// <summary>
-        /// Sets the location (path and index) of the icon for a Shell link object
-        /// </summary>
-        /// <param name="pszIconPath">The PSZ icon path.</param>
-        /// <param name="iIcon">The i icon.</param>
-        void SetIconLocation([MarshalAs(UnmanagedType.LPWStr)] string pszIconPath, int iIcon);
-        /// <summary>
-        /// Sets the relative path to the Shell link object
-        /// </summary>
-        /// <param name="pszPathRel">The PSZ path rel.</param>
-        /// <param name="dwReserved">The dw reserved.</param>
-        void SetRelativePath([MarshalAs(UnmanagedType.LPWStr)] string pszPathRel, int dwReserved);
-        /// <summary>
-        /// Attempts to find the target of a Shell link, even if it has been moved or renamed
-        /// </summary>
-        /// <param name="hwnd">The HWND.</param>
-        /// <param name="fFlags">The f flags.</param>
-        void Resolve(IntPtr hwnd, SLR_FLAGS fFlags);
-        /// <summary>
-        /// Sets the path and file name of a Shell link object
-        /// </summary>
-        /// <param name="pszFile">The PSZ file.</param>
-        void SetPath([MarshalAs(UnmanagedType.LPWStr)] string pszFile);
-
-    }
-
-    /// <summary>
-    /// Interface IPersist
-    /// </summary>
-    [ComImport, Guid("0000010c-0000-0000-c000-000000000046"),
-    InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
-    public interface IPersist
-    {
-        /// <summary>
-        /// Gets the class ID.
-        /// </summary>
-        /// <param name="pClassID">The p class ID.</param>
-        [PreserveSig]
-        void GetClassID(out Guid pClassID);
-    }
-
-
-    /// <summary>
-    /// Interface IPersistFile
-    /// </summary>
-    [ComImport, Guid("0000010b-0000-0000-C000-000000000046"),
-    InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
-    public interface IPersistFile : IPersist
-    {
-        /// <summary>
-        /// Gets the class ID.
-        /// </summary>
-        /// <param name="pClassID">The p class ID.</param>
-        new void GetClassID(out Guid pClassID);
-        /// <summary>
-        /// Determines whether this instance is dirty.
-        /// </summary>
-        [PreserveSig]
-        int IsDirty();
-
-        /// <summary>
-        /// Loads the specified PSZ file name.
-        /// </summary>
-        /// <param name="pszFileName">Name of the PSZ file.</param>
-        /// <param name="dwMode">The dw mode.</param>
-        [PreserveSig]
-        void Load([In, MarshalAs(UnmanagedType.LPWStr)]
-            string pszFileName, uint dwMode);
-
-        /// <summary>
-        /// Saves the specified PSZ file name.
-        /// </summary>
-        /// <param name="pszFileName">Name of the PSZ file.</param>
-        /// <param name="remember">if set to <c>true</c> [remember].</param>
-        [PreserveSig]
-        void Save([In, MarshalAs(UnmanagedType.LPWStr)] string pszFileName,
-            [In, MarshalAs(UnmanagedType.Bool)] bool remember);
-
-        /// <summary>
-        /// Saves the completed.
-        /// </summary>
-        /// <param name="pszFileName">Name of the PSZ file.</param>
-        [PreserveSig]
-        void SaveCompleted([In, MarshalAs(UnmanagedType.LPWStr)] string pszFileName);
-
-        /// <summary>
-        /// Gets the cur file.
-        /// </summary>
-        /// <param name="ppszFileName">Name of the PPSZ file.</param>
-        [PreserveSig]
-        void GetCurFile([In, MarshalAs(UnmanagedType.LPWStr)] string ppszFileName);
-    }
-
-    // CLSID_ShellLink from ShlGuid.h 
-    /// <summary>
-    /// Class ShellLink
-    /// </summary>
-    [
-        ComImport,
-        Guid("00021401-0000-0000-C000-000000000046")
-    ]
-    public class ShellLink
-    {
-    }
-}
diff --git a/MediaBrowser.Controller/BaseManager.cs b/MediaBrowser.Controller/BaseManager.cs
new file mode 100644
index 0000000000..99395a50e1
--- /dev/null
+++ b/MediaBrowser.Controller/BaseManager.cs
@@ -0,0 +1,50 @@
+using MediaBrowser.Common.Kernel;
+using System;
+
+namespace MediaBrowser.Controller
+{
+    /// <summary>
+    /// Class BaseManager
+    /// </summary>
+    /// <typeparam name="TKernelType">The type of the T kernel type.</typeparam>
+    public abstract class BaseManager<TKernelType> : IDisposable
+        where TKernelType : class, IKernel
+    {
+        /// <summary>
+        /// The _kernel
+        /// </summary>
+        protected readonly TKernelType Kernel;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="BaseManager" /> class.
+        /// </summary>
+        /// <param name="kernel">The kernel.</param>
+        /// <exception cref="System.ArgumentNullException">kernel</exception>
+        protected BaseManager(TKernelType kernel)
+        {
+            if (kernel == null)
+            {
+                throw new ArgumentNullException("kernel");
+            }
+   
+            Kernel = kernel;
+        }
+
+        /// <summary>
+        /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
+        /// </summary>
+        public void Dispose()
+        {
+            Dispose(true);
+            GC.SuppressFinalize(this);
+        }
+
+        /// <summary>
+        /// Releases unmanaged and - optionally - managed resources.
+        /// </summary>
+        /// <param name="dispose"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged resources.</param>
+        protected virtual void Dispose(bool dispose)
+        {
+        }
+    }
+}
diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs
index 023a79ee95..8535f85c2c 100644
--- a/MediaBrowser.Controller/Entities/BaseItem.cs
+++ b/MediaBrowser.Controller/Entities/BaseItem.cs
@@ -1,6 +1,4 @@
 using MediaBrowser.Common.Extensions;
-using MediaBrowser.Common.IO;
-using MediaBrowser.Common.Win32;
 using MediaBrowser.Controller.IO;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Localization;
diff --git a/MediaBrowser.Controller/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs
index bcb0b26be6..b2be96b71a 100644
--- a/MediaBrowser.Controller/Entities/Folder.cs
+++ b/MediaBrowser.Controller/Entities/Folder.cs
@@ -1,11 +1,10 @@
 using MediaBrowser.Common.Extensions;
-using MediaBrowser.Common.Win32;
+using MediaBrowser.Controller.IO;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Localization;
 using MediaBrowser.Controller.Resolvers;
 using MediaBrowser.Controller.Sorting;
 using MediaBrowser.Model.Entities;
-using MediaBrowser.Model.Tasks;
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
diff --git a/MediaBrowser.Controller/Entities/Movies/Movie.cs b/MediaBrowser.Controller/Entities/Movies/Movie.cs
index 5b7661dcf0..92177f9162 100644
--- a/MediaBrowser.Controller/Entities/Movies/Movie.cs
+++ b/MediaBrowser.Controller/Entities/Movies/Movie.cs
@@ -1,6 +1,4 @@
 using MediaBrowser.Common.Extensions;
-using MediaBrowser.Common.IO;
-using MediaBrowser.Common.Win32;
 using MediaBrowser.Controller.IO;
 using MediaBrowser.Model.Entities;
 using System;
diff --git a/MediaBrowser.Controller/Entities/TV/Season.cs b/MediaBrowser.Controller/Entities/TV/Season.cs
index c80c59eafa..09b1cec0f0 100644
--- a/MediaBrowser.Controller/Entities/TV/Season.cs
+++ b/MediaBrowser.Controller/Entities/TV/Season.cs
@@ -1,7 +1,5 @@
 using System.Collections.Generic;
 using MediaBrowser.Common.Extensions;
-using MediaBrowser.Common.IO;
-using MediaBrowser.Common.Win32;
 using MediaBrowser.Controller.IO;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Localization;
diff --git a/MediaBrowser.Controller/Entities/TV/Series.cs b/MediaBrowser.Controller/Entities/TV/Series.cs
index 152dcbac87..8a56e45cdc 100644
--- a/MediaBrowser.Controller/Entities/TV/Series.cs
+++ b/MediaBrowser.Controller/Entities/TV/Series.cs
@@ -1,5 +1,5 @@
 using MediaBrowser.Common.Extensions;
-using MediaBrowser.Common.Win32;
+using MediaBrowser.Controller.IO;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Controller.Localization;
 using MediaBrowser.Model.Entities;
diff --git a/MediaBrowser.Controller/IO/FileData.cs b/MediaBrowser.Controller/IO/FileData.cs
index 130f08625b..7cefcd71ad 100644
--- a/MediaBrowser.Controller/IO/FileData.cs
+++ b/MediaBrowser.Controller/IO/FileData.cs
@@ -1,6 +1,4 @@
-using MediaBrowser.Common.IO;
-using MediaBrowser.Common.Win32;
-using MediaBrowser.Controller.Library;
+using MediaBrowser.Controller.Library;
 using MediaBrowser.Model.Logging;
 using System;
 using System.Collections.Generic;
diff --git a/MediaBrowser.Controller/IO/FileSystem.cs b/MediaBrowser.Controller/IO/FileSystem.cs
index c7b7c660bc..28deca1009 100644
--- a/MediaBrowser.Controller/IO/FileSystem.cs
+++ b/MediaBrowser.Controller/IO/FileSystem.cs
@@ -1,5 +1,4 @@
-using MediaBrowser.Common.Win32;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Collections.Specialized;
 using System.IO;
diff --git a/MediaBrowser.Controller/IO/NativeMethods.cs b/MediaBrowser.Controller/IO/NativeMethods.cs
new file mode 100644
index 0000000000..632ef02166
--- /dev/null
+++ b/MediaBrowser.Controller/IO/NativeMethods.cs
@@ -0,0 +1,631 @@
+using System;
+using System.IO;
+using System.Runtime.InteropServices;
+using System.Security;
+using System.Text;
+
+namespace MediaBrowser.Controller.IO
+{
+    /// <summary>
+    /// Class NativeMethods
+    /// </summary>
+    [SuppressUnmanagedCodeSecurity]
+    public static class NativeMethods
+    {
+        //declare the Netapi32 : NetServerEnum method import
+        /// <summary>
+        /// Nets the server enum.
+        /// </summary>
+        /// <param name="ServerName">Name of the server.</param>
+        /// <param name="dwLevel">The dw level.</param>
+        /// <param name="pBuf">The p buf.</param>
+        /// <param name="dwPrefMaxLen">The dw pref max len.</param>
+        /// <param name="dwEntriesRead">The dw entries read.</param>
+        /// <param name="dwTotalEntries">The dw total entries.</param>
+        /// <param name="dwServerType">Type of the dw server.</param>
+        /// <param name="domain">The domain.</param>
+        /// <param name="dwResumeHandle">The dw resume handle.</param>
+        /// <returns>System.Int32.</returns>
+        [DllImport("Netapi32", CharSet = CharSet.Auto, SetLastError = true),
+        SuppressUnmanagedCodeSecurityAttribute]
+
+        public static extern int NetServerEnum(
+            string ServerName, // must be null
+            int dwLevel,
+            ref IntPtr pBuf,
+            int dwPrefMaxLen,
+            out int dwEntriesRead,
+            out int dwTotalEntries,
+            int dwServerType,
+            string domain, // null for login domain
+            out int dwResumeHandle
+            );
+
+        //declare the Netapi32 : NetApiBufferFree method import
+        /// <summary>
+        /// Nets the API buffer free.
+        /// </summary>
+        /// <param name="pBuf">The p buf.</param>
+        /// <returns>System.Int32.</returns>
+        [DllImport("Netapi32", SetLastError = true),
+        SuppressUnmanagedCodeSecurityAttribute]
+
+        public static extern int NetApiBufferFree(
+            IntPtr pBuf);
+
+        /// <summary>
+        /// The MA x_ PATH
+        /// </summary>
+        public const int MAX_PATH = 260;
+        /// <summary>
+        /// The MA x_ ALTERNATE
+        /// </summary>
+        public const int MAX_ALTERNATE = 14;
+        /// <summary>
+        /// The INVALI d_ HANDL e_ VALUE
+        /// </summary>
+        public static IntPtr INVALID_HANDLE_VALUE = new IntPtr(-1);
+        /// <summary>
+        /// The STG m_ READ
+        /// </summary>
+        public const uint STGM_READ = 0;
+
+        /// <summary>
+        /// Finds the first file ex.
+        /// </summary>
+        /// <param name="lpFileName">Name of the lp file.</param>
+        /// <param name="fInfoLevelId">The f info level id.</param>
+        /// <param name="lpFindFileData">The lp find file data.</param>
+        /// <param name="fSearchOp">The f search op.</param>
+        /// <param name="lpSearchFilter">The lp search filter.</param>
+        /// <param name="dwAdditionalFlags">The dw additional flags.</param>
+        /// <returns>IntPtr.</returns>
+        [DllImport("kernel32.dll", CharSet = CharSet.Auto, SetLastError = true)]
+        public static extern IntPtr FindFirstFileEx(string lpFileName, FINDEX_INFO_LEVELS fInfoLevelId, out WIN32_FIND_DATA lpFindFileData, FINDEX_SEARCH_OPS fSearchOp, IntPtr lpSearchFilter, int dwAdditionalFlags);
+
+        /// <summary>
+        /// Finds the first file.
+        /// </summary>
+        /// <param name="fileName">Name of the file.</param>
+        /// <param name="lpFindFileData">The lp find file data.</param>
+        /// <returns>IntPtr.</returns>
+        [DllImport("kernel32.dll", CharSet = CharSet.Auto, SetLastError = true)]
+        public static extern IntPtr FindFirstFile(string fileName, out WIN32_FIND_DATA lpFindFileData);
+
+        /// <summary>
+        /// Finds the next file.
+        /// </summary>
+        /// <param name="hFindFile">The h find file.</param>
+        /// <param name="lpFindFileData">The lp find file data.</param>
+        /// <returns>IntPtr.</returns>
+        [DllImport("kernel32.dll", CharSet = CharSet.Auto, SetLastError = true)]
+        public static extern IntPtr FindNextFile(IntPtr hFindFile, out WIN32_FIND_DATA lpFindFileData);
+
+        /// <summary>
+        /// Finds the close.
+        /// </summary>
+        /// <param name="hFindFile">The h find file.</param>
+        /// <returns><c>true</c> if XXXX, <c>false</c> otherwise</returns>
+        [DllImport("kernel32")]
+        public static extern bool FindClose(IntPtr hFindFile);
+    }
+
+    //create a _SERVER_INFO_100 STRUCTURE
+    /// <summary>
+    /// Struct _SERVER_INFO_100
+    /// </summary>
+    [StructLayout(LayoutKind.Sequential)]
+    public struct _SERVER_INFO_100
+    {
+        /// <summary>
+        /// The sv100_platform_id
+        /// </summary>
+        internal int sv100_platform_id;
+        /// <summary>
+        /// The sv100_name
+        /// </summary>
+        [MarshalAs(UnmanagedType.LPWStr)]
+        internal string sv100_name;
+    }
+
+    /// <summary>
+    /// Class FindFirstFileExFlags
+    /// </summary>
+    public class FindFirstFileExFlags
+    {
+        /// <summary>
+        /// The NONE
+        /// </summary>
+        public const int NONE = 0;
+
+        /// <summary>
+        /// Searches are case-sensitive.Searches are case-sensitive.
+        /// </summary>
+        public const int FIND_FIRST_EX_CASE_SENSITIVE = 1;
+
+        /// <summary>
+        /// Uses a larger buffer for directory queries, which can increase performance of the find operation.
+        /// </summary>
+        public const int FIND_FIRST_EX_LARGE_FETCH = 2;
+    }
+
+    /// <summary>
+    /// Enum FINDEX_INFO_LEVELS
+    /// </summary>
+    public enum FINDEX_INFO_LEVELS
+    {
+        /// <summary>
+        /// The FindFirstFileEx function retrieves a standard set of attribute information. The data is returned in a WIN32_FIND_DATA structure.
+        /// </summary>
+        FindExInfoStandard = 0,
+
+        /// <summary>
+        /// The FindFirstFileEx function does not query the short file name, improving overall enumeration speed. The data is returned in a WIN32_FIND_DATA structure, and the cAlternateFileName member is always a NULL string.
+        /// </summary>
+        FindExInfoBasic = 1
+    }
+
+    /// <summary>
+    /// Enum FINDEX_SEARCH_OPS
+    /// </summary>
+    public enum FINDEX_SEARCH_OPS
+    {
+        /// <summary>
+        /// The search for a file that matches a specified file name.
+        /// The lpSearchFilter parameter of FindFirstFileEx must be NULL when this search operation is used.
+        /// </summary>
+        FindExSearchNameMatch = 0,
+
+        /// <summary>
+        /// The find ex search limit to directories
+        /// </summary>
+        FindExSearchLimitToDirectories = 1,
+
+        /// <summary>
+        /// This filtering type is not available.
+        /// </summary>
+        FindExSearchLimitToDevices = 2
+    }
+
+    /// <summary>
+    /// Struct FILETIME
+    /// </summary>
+    [StructLayout(LayoutKind.Sequential)]
+    public struct FILETIME
+    {
+        /// <summary>
+        /// The dw low date time
+        /// </summary>
+        public uint dwLowDateTime;
+        /// <summary>
+        /// The dw high date time
+        /// </summary>
+        public uint dwHighDateTime;
+    }
+
+
+    /// <summary>
+    /// Struct WIN32_FIND_DATA
+    /// </summary>
+    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
+    public struct WIN32_FIND_DATA
+    {
+        /// <summary>
+        /// The dw file attributes
+        /// </summary>
+        public FileAttributes dwFileAttributes;
+        /// <summary>
+        /// The ft creation time
+        /// </summary>
+        public FILETIME ftCreationTime;
+        /// <summary>
+        /// The ft last access time
+        /// </summary>
+        public FILETIME ftLastAccessTime;
+        /// <summary>
+        /// The ft last write time
+        /// </summary>
+        public FILETIME ftLastWriteTime;
+        /// <summary>
+        /// The n file size high
+        /// </summary>
+        public int nFileSizeHigh;
+        /// <summary>
+        /// The n file size low
+        /// </summary>
+        public int nFileSizeLow;
+        /// <summary>
+        /// The dw reserved0
+        /// </summary>
+        public int dwReserved0;
+        /// <summary>
+        /// The dw reserved1
+        /// </summary>
+        public int dwReserved1;
+
+        /// <summary>
+        /// The c file name
+        /// </summary>
+        [MarshalAs(UnmanagedType.ByValTStr, SizeConst = NativeMethods.MAX_PATH)]
+        public string cFileName;
+
+        /// <summary>
+        /// This will always be null when FINDEX_INFO_LEVELS = basic
+        /// </summary>
+        [MarshalAs(UnmanagedType.ByValTStr, SizeConst = NativeMethods.MAX_ALTERNATE)]
+        public string cAlternate;
+
+        /// <summary>
+        /// Gets a value indicating whether this instance is hidden.
+        /// </summary>
+        /// <value><c>true</c> if this instance is hidden; otherwise, <c>false</c>.</value>
+        public bool IsHidden
+        {
+            get
+            {
+                return dwFileAttributes.HasFlag(FileAttributes.Hidden);
+            }
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether this instance is system file.
+        /// </summary>
+        /// <value><c>true</c> if this instance is system file; otherwise, <c>false</c>.</value>
+        public bool IsSystemFile
+        {
+            get
+            {
+                return dwFileAttributes.HasFlag(FileAttributes.System);
+            }
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether this instance is directory.
+        /// </summary>
+        /// <value><c>true</c> if this instance is directory; otherwise, <c>false</c>.</value>
+        public bool IsDirectory
+        {
+            get
+            {
+                return dwFileAttributes.HasFlag(FileAttributes.Directory);
+            }
+        }
+
+        /// <summary>
+        /// Gets the creation time UTC.
+        /// </summary>
+        /// <value>The creation time UTC.</value>
+        public DateTime CreationTimeUtc
+        {
+            get
+            {
+                return ParseFileTime(ftCreationTime);
+            }
+        }
+
+        /// <summary>
+        /// Gets the last access time UTC.
+        /// </summary>
+        /// <value>The last access time UTC.</value>
+        public DateTime LastAccessTimeUtc
+        {
+            get
+            {
+                return ParseFileTime(ftLastAccessTime);
+            }
+        }
+
+        /// <summary>
+        /// Gets the last write time UTC.
+        /// </summary>
+        /// <value>The last write time UTC.</value>
+        public DateTime LastWriteTimeUtc
+        {
+            get
+            {
+                return ParseFileTime(ftLastWriteTime);
+            }
+        }
+
+        /// <summary>
+        /// Parses the file time.
+        /// </summary>
+        /// <param name="filetime">The filetime.</param>
+        /// <returns>DateTime.</returns>
+        private DateTime ParseFileTime(FILETIME filetime)
+        {
+            long highBits = filetime.dwHighDateTime;
+            highBits = highBits << 32;
+
+            var val = highBits + (long) filetime.dwLowDateTime;
+
+            if (val < 0L)
+            {
+                return DateTime.MinValue;
+            }
+
+            if (val > 2650467743999999999L)
+            {
+                return DateTime.MaxValue;
+            }
+
+            return DateTime.FromFileTimeUtc(val);
+        }
+
+        /// <summary>
+        /// Gets or sets the path.
+        /// </summary>
+        /// <value>The path.</value>
+        public string Path { get; set; }
+
+        /// <summary>
+        /// Returns a <see cref="System.String" /> that represents this instance.
+        /// </summary>
+        /// <returns>A <see cref="System.String" /> that represents this instance.</returns>
+        public override string ToString()
+        {
+            return Path ?? string.Empty;
+        }
+    }
+
+    /// <summary>
+    /// Enum SLGP_FLAGS
+    /// </summary>
+    [Flags]
+    public enum SLGP_FLAGS
+    {
+        /// <summary>
+        /// Retrieves the standard short (8.3 format) file name
+        /// </summary>
+        SLGP_SHORTPATH = 0x1,
+        /// <summary>
+        /// Retrieves the Universal Naming Convention (UNC) path name of the file
+        /// </summary>
+        SLGP_UNCPRIORITY = 0x2,
+        /// <summary>
+        /// Retrieves the raw path name. A raw path is something that might not exist and may include environment variables that need to be expanded
+        /// </summary>
+        SLGP_RAWPATH = 0x4
+    }
+    /// <summary>
+    /// Enum SLR_FLAGS
+    /// </summary>
+    [Flags]
+    public enum SLR_FLAGS
+    {
+        /// <summary>
+        /// Do not display a dialog box if the link cannot be resolved. When SLR_NO_UI is set,
+        /// the high-order word of fFlags can be set to a time-out value that specifies the
+        /// maximum amount of time to be spent resolving the link. The function returns if the
+        /// link cannot be resolved within the time-out duration. If the high-order word is set
+        /// to zero, the time-out duration will be set to the default value of 3,000 milliseconds
+        /// (3 seconds). To specify a value, set the high word of fFlags to the desired time-out
+        /// duration, in milliseconds.
+        /// </summary>
+        SLR_NO_UI = 0x1,
+        /// <summary>
+        /// Obsolete and no longer used
+        /// </summary>
+        SLR_ANY_MATCH = 0x2,
+        /// <summary>
+        /// If the link object has changed, update its path and list of identifiers.
+        /// If SLR_UPDATE is set, you do not need to call IPersistFile::IsDirty to determine
+        /// whether or not the link object has changed.
+        /// </summary>
+        SLR_UPDATE = 0x4,
+        /// <summary>
+        /// Do not update the link information
+        /// </summary>
+        SLR_NOUPDATE = 0x8,
+        /// <summary>
+        /// Do not execute the search heuristics
+        /// </summary>
+        SLR_NOSEARCH = 0x10,
+        /// <summary>
+        /// Do not use distributed link tracking
+        /// </summary>
+        SLR_NOTRACK = 0x20,
+        /// <summary>
+        /// Disable distributed link tracking. By default, distributed link tracking tracks
+        /// removable media across multiple devices based on the volume name. It also uses the
+        /// Universal Naming Convention (UNC) path to track remote file systems whose drive letter
+        /// has changed. Setting SLR_NOLINKINFO disables both types of tracking.
+        /// </summary>
+        SLR_NOLINKINFO = 0x40,
+        /// <summary>
+        /// Call the Microsoft Windows Installer
+        /// </summary>
+        SLR_INVOKE_MSI = 0x80
+    }
+
+
+    /// <summary>
+    /// The IShellLink interface allows Shell links to be created, modified, and resolved
+    /// </summary>
+    [ComImport, InterfaceType(ComInterfaceType.InterfaceIsIUnknown), Guid("000214F9-0000-0000-C000-000000000046")]
+    public interface IShellLinkW
+    {
+        /// <summary>
+        /// Retrieves the path and file name of a Shell link object
+        /// </summary>
+        /// <param name="pszFile">The PSZ file.</param>
+        /// <param name="cchMaxPath">The CCH max path.</param>
+        /// <param name="pfd">The PFD.</param>
+        /// <param name="fFlags">The f flags.</param>
+        void GetPath([Out, MarshalAs(UnmanagedType.LPWStr)] StringBuilder pszFile, int cchMaxPath, out WIN32_FIND_DATA pfd, SLGP_FLAGS fFlags);
+        /// <summary>
+        /// Retrieves the list of item identifiers for a Shell link object
+        /// </summary>
+        /// <param name="ppidl">The ppidl.</param>
+        void GetIDList(out IntPtr ppidl);
+        /// <summary>
+        /// Sets the pointer to an item identifier list (PIDL) for a Shell link object.
+        /// </summary>
+        /// <param name="pidl">The pidl.</param>
+        void SetIDList(IntPtr pidl);
+        /// <summary>
+        /// Retrieves the description string for a Shell link object
+        /// </summary>
+        /// <param name="pszName">Name of the PSZ.</param>
+        /// <param name="cchMaxName">Name of the CCH max.</param>
+        void GetDescription([Out, MarshalAs(UnmanagedType.LPWStr)] StringBuilder pszName, int cchMaxName);
+        /// <summary>
+        /// Sets the description for a Shell link object. The description can be any application-defined string
+        /// </summary>
+        /// <param name="pszName">Name of the PSZ.</param>
+        void SetDescription([MarshalAs(UnmanagedType.LPWStr)] string pszName);
+        /// <summary>
+        /// Retrieves the name of the working directory for a Shell link object
+        /// </summary>
+        /// <param name="pszDir">The PSZ dir.</param>
+        /// <param name="cchMaxPath">The CCH max path.</param>
+        void GetWorkingDirectory([Out, MarshalAs(UnmanagedType.LPWStr)] StringBuilder pszDir, int cchMaxPath);
+        /// <summary>
+        /// Sets the name of the working directory for a Shell link object
+        /// </summary>
+        /// <param name="pszDir">The PSZ dir.</param>
+        void SetWorkingDirectory([MarshalAs(UnmanagedType.LPWStr)] string pszDir);
+        /// <summary>
+        /// Retrieves the command-line arguments associated with a Shell link object
+        /// </summary>
+        /// <param name="pszArgs">The PSZ args.</param>
+        /// <param name="cchMaxPath">The CCH max path.</param>
+        void GetArguments([Out, MarshalAs(UnmanagedType.LPWStr)] StringBuilder pszArgs, int cchMaxPath);
+        /// <summary>
+        /// Sets the command-line arguments for a Shell link object
+        /// </summary>
+        /// <param name="pszArgs">The PSZ args.</param>
+        void SetArguments([MarshalAs(UnmanagedType.LPWStr)] string pszArgs);
+        /// <summary>
+        /// Retrieves the hot key for a Shell link object
+        /// </summary>
+        /// <param name="pwHotkey">The pw hotkey.</param>
+        void GetHotkey(out short pwHotkey);
+        /// <summary>
+        /// Sets a hot key for a Shell link object
+        /// </summary>
+        /// <param name="wHotkey">The w hotkey.</param>
+        void SetHotkey(short wHotkey);
+        /// <summary>
+        /// Retrieves the show command for a Shell link object
+        /// </summary>
+        /// <param name="piShowCmd">The pi show CMD.</param>
+        void GetShowCmd(out int piShowCmd);
+        /// <summary>
+        /// Sets the show command for a Shell link object. The show command sets the initial show state of the window.
+        /// </summary>
+        /// <param name="iShowCmd">The i show CMD.</param>
+        void SetShowCmd(int iShowCmd);
+        /// <summary>
+        /// Retrieves the location (path and index) of the icon for a Shell link object
+        /// </summary>
+        /// <param name="pszIconPath">The PSZ icon path.</param>
+        /// <param name="cchIconPath">The CCH icon path.</param>
+        /// <param name="piIcon">The pi icon.</param>
+        void GetIconLocation([Out, MarshalAs(UnmanagedType.LPWStr)] StringBuilder pszIconPath,
+            int cchIconPath, out int piIcon);
+        /// <summary>
+        /// Sets the location (path and index) of the icon for a Shell link object
+        /// </summary>
+        /// <param name="pszIconPath">The PSZ icon path.</param>
+        /// <param name="iIcon">The i icon.</param>
+        void SetIconLocation([MarshalAs(UnmanagedType.LPWStr)] string pszIconPath, int iIcon);
+        /// <summary>
+        /// Sets the relative path to the Shell link object
+        /// </summary>
+        /// <param name="pszPathRel">The PSZ path rel.</param>
+        /// <param name="dwReserved">The dw reserved.</param>
+        void SetRelativePath([MarshalAs(UnmanagedType.LPWStr)] string pszPathRel, int dwReserved);
+        /// <summary>
+        /// Attempts to find the target of a Shell link, even if it has been moved or renamed
+        /// </summary>
+        /// <param name="hwnd">The HWND.</param>
+        /// <param name="fFlags">The f flags.</param>
+        void Resolve(IntPtr hwnd, SLR_FLAGS fFlags);
+        /// <summary>
+        /// Sets the path and file name of a Shell link object
+        /// </summary>
+        /// <param name="pszFile">The PSZ file.</param>
+        void SetPath([MarshalAs(UnmanagedType.LPWStr)] string pszFile);
+
+    }
+
+    /// <summary>
+    /// Interface IPersist
+    /// </summary>
+    [ComImport, Guid("0000010c-0000-0000-c000-000000000046"),
+    InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+    public interface IPersist
+    {
+        /// <summary>
+        /// Gets the class ID.
+        /// </summary>
+        /// <param name="pClassID">The p class ID.</param>
+        [PreserveSig]
+        void GetClassID(out Guid pClassID);
+    }
+
+
+    /// <summary>
+    /// Interface IPersistFile
+    /// </summary>
+    [ComImport, Guid("0000010b-0000-0000-C000-000000000046"),
+    InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+    public interface IPersistFile : IPersist
+    {
+        /// <summary>
+        /// Gets the class ID.
+        /// </summary>
+        /// <param name="pClassID">The p class ID.</param>
+        new void GetClassID(out Guid pClassID);
+        /// <summary>
+        /// Determines whether this instance is dirty.
+        /// </summary>
+        [PreserveSig]
+        int IsDirty();
+
+        /// <summary>
+        /// Loads the specified PSZ file name.
+        /// </summary>
+        /// <param name="pszFileName">Name of the PSZ file.</param>
+        /// <param name="dwMode">The dw mode.</param>
+        [PreserveSig]
+        void Load([In, MarshalAs(UnmanagedType.LPWStr)]
+            string pszFileName, uint dwMode);
+
+        /// <summary>
+        /// Saves the specified PSZ file name.
+        /// </summary>
+        /// <param name="pszFileName">Name of the PSZ file.</param>
+        /// <param name="remember">if set to <c>true</c> [remember].</param>
+        [PreserveSig]
+        void Save([In, MarshalAs(UnmanagedType.LPWStr)] string pszFileName,
+            [In, MarshalAs(UnmanagedType.Bool)] bool remember);
+
+        /// <summary>
+        /// Saves the completed.
+        /// </summary>
+        /// <param name="pszFileName">Name of the PSZ file.</param>
+        [PreserveSig]
+        void SaveCompleted([In, MarshalAs(UnmanagedType.LPWStr)] string pszFileName);
+
+        /// <summary>
+        /// Gets the cur file.
+        /// </summary>
+        /// <param name="ppszFileName">Name of the PPSZ file.</param>
+        [PreserveSig]
+        void GetCurFile([In, MarshalAs(UnmanagedType.LPWStr)] string ppszFileName);
+    }
+
+    // CLSID_ShellLink from ShlGuid.h 
+    /// <summary>
+    /// Class ShellLink
+    /// </summary>
+    [
+        ComImport,
+        Guid("00021401-0000-0000-C000-000000000046")
+    ]
+    public class ShellLink
+    {
+    }
+}
diff --git a/MediaBrowser.Controller/IO/NetworkShares.cs b/MediaBrowser.Controller/IO/NetworkShares.cs
deleted file mode 100644
index 93edc64471..0000000000
--- a/MediaBrowser.Controller/IO/NetworkShares.cs
+++ /dev/null
@@ -1,644 +0,0 @@
-using System;
-using System.IO;
-using System.Collections;
-using System.Runtime.InteropServices;
-
-namespace MediaBrowser.Controller.IO
-{
-    /// <summary>
-    /// Type of share
-    /// </summary>
-    [Flags]
-    public enum ShareType
-    {
-        /// <summary>Disk share</summary>
-        Disk = 0,
-        /// <summary>Printer share</summary>
-        Printer = 1,
-        /// <summary>Device share</summary>
-        Device = 2,
-        /// <summary>IPC share</summary>
-        IPC = 3,
-        /// <summary>Special share</summary>
-        Special = -2147483648, // 0x80000000,
-    }
-
-    #region Share
-
-    /// <summary>
-    /// Information about a local share
-    /// </summary>
-    public class Share
-    {
-        #region Private data
-
-        private string _server;
-        private string _netName;
-        private string _path;
-        private ShareType _shareType;
-        private string _remark;
-
-        #endregion
-
-        #region Constructor
-
-        /// <summary>
-        /// Constructor
-        /// </summary>
-        /// <param name="Server"></param>
-        /// <param name="shi"></param>
-        public Share(string server, string netName, string path, ShareType shareType, string remark)
-        {
-            if (ShareType.Special == shareType && "IPC$" == netName)
-            {
-                shareType |= ShareType.IPC;
-            }
-
-            _server = server;
-            _netName = netName;
-            _path = path;
-            _shareType = shareType;
-            _remark = remark;
-        }
-
-        #endregion
-
-        #region Properties
-
-        /// <summary>
-        /// The name of the computer that this share belongs to
-        /// </summary>
-        public string Server
-        {
-            get { return _server; }
-        }
-
-        /// <summary>
-        /// Share name
-        /// </summary>
-        public string NetName
-        {
-            get { return _netName; }
-        }
-
-        /// <summary>
-        /// Local path
-        /// </summary>
-        public string Path
-        {
-            get { return _path; }
-        }
-
-        /// <summary>
-        /// Share type
-        /// </summary>
-        public ShareType ShareType
-        {
-            get { return _shareType; }
-        }
-
-        /// <summary>
-        /// Comment
-        /// </summary>
-        public string Remark
-        {
-            get { return _remark; }
-        }
-
-        /// <summary>
-        /// Returns true if this is a file system share
-        /// </summary>
-        public bool IsFileSystem
-        {
-            get
-            {
-                // Shared device
-                if (0 != (_shareType & ShareType.Device)) return false;
-                // IPC share
-                if (0 != (_shareType & ShareType.IPC)) return false;
-                // Shared printer
-                if (0 != (_shareType & ShareType.Printer)) return false;
-
-                // Standard disk share
-                if (0 == (_shareType & ShareType.Special)) return true;
-
-                // Special disk share (e.g. C$)
-                if (ShareType.Special == _shareType && null != _netName && 0 != _netName.Length)
-                    return true;
-                else
-                    return false;
-            }
-        }
-
-        /// <summary>
-        /// Get the root of a disk-based share
-        /// </summary>
-        public DirectoryInfo Root
-        {
-            get
-            {
-                if (IsFileSystem)
-                {
-                    if (null == _server || 0 == _server.Length)
-                        if (null == _path || 0 == _path.Length)
-                            return new DirectoryInfo(ToString());
-                        else
-                            return new DirectoryInfo(_path);
-                    else
-                        return new DirectoryInfo(ToString());
-                }
-                else
-                    return null;
-            }
-        }
-
-        #endregion
-
-        /// <summary>
-        /// Returns the path to this share
-        /// </summary>
-        /// <returns></returns>
-        public override string ToString()
-        {
-            if (null == _server || 0 == _server.Length)
-            {
-                return string.Format(@"\\{0}\{1}", Environment.MachineName, _netName);
-            }
-            else
-                return string.Format(@"\\{0}\{1}", _server, _netName);
-        }
-
-        /// <summary>
-        /// Returns true if this share matches the local path
-        /// </summary>
-        /// <param name="path"></param>
-        /// <returns></returns>
-        public bool MatchesPath(string path)
-        {
-            if (!IsFileSystem) return false;
-            if (null == path || 0 == path.Length) return true;
-
-            return path.ToLower().StartsWith(_path.ToLower());
-        }
-    }
-
-    #endregion
-
-    /// <summary>
-    /// A collection of shares
-    /// </summary>
-    public class ShareCollection : ReadOnlyCollectionBase
-    {
-        #region Platform
-
-        /// <summary>
-        /// Is this an NT platform?
-        /// </summary>
-        protected static bool IsNT
-        {
-            get { return (PlatformID.Win32NT == Environment.OSVersion.Platform); }
-        }
-
-        /// <summary>
-        /// Returns true if this is Windows 2000 or higher
-        /// </summary>
-        protected static bool IsW2KUp
-        {
-            get
-            {
-                OperatingSystem os = Environment.OSVersion;
-                if (PlatformID.Win32NT == os.Platform && os.Version.Major >= 5)
-                    return true;
-                else
-                    return false;
-            }
-        }
-
-        #endregion
-
-        #region Interop
-
-        #region Constants
-
-        /// <summary>Maximum path length</summary>
-        protected const int MAX_PATH = 260;
-        /// <summary>No error</summary>
-        protected const int NO_ERROR = 0;
-        /// <summary>Access denied</summary>
-        protected const int ERROR_ACCESS_DENIED = 5;
-        /// <summary>Access denied</summary>
-        protected const int ERROR_WRONG_LEVEL = 124;
-        /// <summary>More data available</summary>
-        protected const int ERROR_MORE_DATA = 234;
-        /// <summary>Not connected</summary>
-        protected const int ERROR_NOT_CONNECTED = 2250;
-        /// <summary>Level 1</summary>
-        protected const int UNIVERSAL_NAME_INFO_LEVEL = 1;
-        /// <summary>Max extries (9x)</summary>
-        protected const int MAX_SI50_ENTRIES = 20;
-
-        #endregion
-
-        #region Structures
-
-        /// <summary>Unc name</summary>
-        [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Auto)]
-        protected struct UNIVERSAL_NAME_INFO
-        {
-            [MarshalAs(UnmanagedType.LPTStr)]
-            public string lpUniversalName;
-        }
-
-        /// <summary>Share information, NT, level 2</summary>
-        /// <remarks>
-        /// Requires admin rights to work. 
-        /// </remarks>
-        [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
-        protected struct SHARE_INFO_2
-        {
-            [MarshalAs(UnmanagedType.LPWStr)]
-            public string NetName;
-            public ShareType ShareType;
-            [MarshalAs(UnmanagedType.LPWStr)]
-            public string Remark;
-            public int Permissions;
-            public int MaxUsers;
-            public int CurrentUsers;
-            [MarshalAs(UnmanagedType.LPWStr)]
-            public string Path;
-            [MarshalAs(UnmanagedType.LPWStr)]
-            public string Password;
-        }
-
-        /// <summary>Share information, NT, level 1</summary>
-        /// <remarks>
-        /// Fallback when no admin rights.
-        /// </remarks>
-        [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
-        protected struct SHARE_INFO_1
-        {
-            [MarshalAs(UnmanagedType.LPWStr)]
-            public string NetName;
-            public ShareType ShareType;
-            [MarshalAs(UnmanagedType.LPWStr)]
-            public string Remark;
-        }
-
-        /// <summary>Share information, Win9x</summary>
-        [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi, Pack = 1)]
-        protected struct SHARE_INFO_50
-        {
-            [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 13)]
-            public string NetName;
-
-            public byte bShareType;
-            public ushort Flags;
-
-            [MarshalAs(UnmanagedType.LPTStr)]
-            public string Remark;
-            [MarshalAs(UnmanagedType.LPTStr)]
-            public string Path;
-
-            [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 9)]
-            public string PasswordRW;
-            [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 9)]
-            public string PasswordRO;
-
-            public ShareType ShareType
-            {
-                get { return (ShareType)((int)bShareType & 0x7F); }
-            }
-        }
-
-        /// <summary>Share information level 1, Win9x</summary>
-        [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi, Pack = 1)]
-        protected struct SHARE_INFO_1_9x
-        {
-            [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 13)]
-            public string NetName;
-            public byte Padding;
-
-            public ushort bShareType;
-
-            [MarshalAs(UnmanagedType.LPTStr)]
-            public string Remark;
-
-            public ShareType ShareType
-            {
-                get { return (ShareType)((int)bShareType & 0x7FFF); }
-            }
-        }
-
-        #endregion
-
-        #region Functions
-
-        /// <summary>Get a UNC name</summary>
-        [DllImport("mpr", CharSet = CharSet.Auto)]
-        protected static extern int WNetGetUniversalName(string lpLocalPath,
-            int dwInfoLevel, ref UNIVERSAL_NAME_INFO lpBuffer, ref int lpBufferSize);
-
-        /// <summary>Get a UNC name</summary>
-        [DllImport("mpr", CharSet = CharSet.Auto)]
-        protected static extern int WNetGetUniversalName(string lpLocalPath,
-            int dwInfoLevel, IntPtr lpBuffer, ref int lpBufferSize);
-
-        /// <summary>Enumerate shares (NT)</summary>
-        [DllImport("netapi32", CharSet = CharSet.Unicode)]
-        protected static extern int NetShareEnum(string lpServerName, int dwLevel,
-            out IntPtr lpBuffer, int dwPrefMaxLen, out int entriesRead,
-            out int totalEntries, ref int hResume);
-
-        /// <summary>Enumerate shares (9x)</summary>
-        [DllImport("svrapi", CharSet = CharSet.Ansi)]
-        protected static extern int NetShareEnum(
-            [MarshalAs(UnmanagedType.LPTStr)] string lpServerName, int dwLevel,
-            IntPtr lpBuffer, ushort cbBuffer, out ushort entriesRead,
-            out ushort totalEntries);
-
-        /// <summary>Free the buffer (NT)</summary>
-        [DllImport("netapi32")]
-        protected static extern int NetApiBufferFree(IntPtr lpBuffer);
-
-        #endregion
-
-        #region Enumerate shares
-
-        /// <summary>
-        /// Enumerates the shares on Windows NT
-        /// </summary>
-        /// <param name="server">The server name</param>
-        /// <param name="shares">The ShareCollection</param>
-        protected static void EnumerateSharesNT(string server, ShareCollection shares)
-        {
-            int level = 2;
-            int entriesRead, totalEntries, nRet, hResume = 0;
-            IntPtr pBuffer = IntPtr.Zero;
-
-            try
-            {
-                nRet = NetShareEnum(server, level, out pBuffer, -1,
-                    out entriesRead, out totalEntries, ref hResume);
-
-                if (ERROR_ACCESS_DENIED == nRet)
-                {
-                    //Need admin for level 2, drop to level 1
-                    level = 1;
-                    nRet = NetShareEnum(server, level, out pBuffer, -1,
-                        out entriesRead, out totalEntries, ref hResume);
-                }
-
-                if (NO_ERROR == nRet && entriesRead > 0)
-                {
-                    Type t = (2 == level) ? typeof(SHARE_INFO_2) : typeof(SHARE_INFO_1);
-                    int offset = Marshal.SizeOf(t);
-
-                    for (int i = 0, lpItem = pBuffer.ToInt32(); i < entriesRead; i++, lpItem += offset)
-                    {
-                        IntPtr pItem = new IntPtr(lpItem);
-                        if (1 == level)
-                        {
-                            SHARE_INFO_1 si = (SHARE_INFO_1)Marshal.PtrToStructure(pItem, t);
-                            shares.Add(si.NetName, string.Empty, si.ShareType, si.Remark);
-                        }
-                        else
-                        {
-                            SHARE_INFO_2 si = (SHARE_INFO_2)Marshal.PtrToStructure(pItem, t);
-                            shares.Add(si.NetName, si.Path, si.ShareType, si.Remark);
-                        }
-                    }
-                }
-
-            }
-            finally
-            {
-                // Clean up buffer allocated by system
-                if (IntPtr.Zero != pBuffer)
-                    NetApiBufferFree(pBuffer);
-            }
-        }
-
-        /// <summary>
-        /// Enumerates the shares on Windows 9x
-        /// </summary>
-        /// <param name="server">The server name</param>
-        /// <param name="shares">The ShareCollection</param>
-        protected static void EnumerateShares9x(string server, ShareCollection shares)
-        {
-            int level = 50;
-            int nRet = 0;
-            ushort entriesRead, totalEntries;
-
-            Type t = typeof(SHARE_INFO_50);
-            int size = Marshal.SizeOf(t);
-            ushort cbBuffer = (ushort)(MAX_SI50_ENTRIES * size);
-            //On Win9x, must allocate buffer before calling API
-            IntPtr pBuffer = Marshal.AllocHGlobal(cbBuffer);
-
-            try
-            {
-                nRet = NetShareEnum(server, level, pBuffer, cbBuffer,
-                    out entriesRead, out totalEntries);
-
-                if (ERROR_WRONG_LEVEL == nRet)
-                {
-                    level = 1;
-                    t = typeof(SHARE_INFO_1_9x);
-                    size = Marshal.SizeOf(t);
-
-                    nRet = NetShareEnum(server, level, pBuffer, cbBuffer,
-                        out entriesRead, out totalEntries);
-                }
-
-                if (NO_ERROR == nRet || ERROR_MORE_DATA == nRet)
-                {
-                    for (int i = 0, lpItem = pBuffer.ToInt32(); i < entriesRead; i++, lpItem += size)
-                    {
-                        IntPtr pItem = new IntPtr(lpItem);
-
-                        if (1 == level)
-                        {
-                            SHARE_INFO_1_9x si = (SHARE_INFO_1_9x)Marshal.PtrToStructure(pItem, t);
-                            shares.Add(si.NetName, string.Empty, si.ShareType, si.Remark);
-                        }
-                        else
-                        {
-                            SHARE_INFO_50 si = (SHARE_INFO_50)Marshal.PtrToStructure(pItem, t);
-                            shares.Add(si.NetName, si.Path, si.ShareType, si.Remark);
-                        }
-                    }
-                }
-                else
-                    Console.WriteLine(nRet);
-
-            }
-            finally
-            {
-                //Clean up buffer
-                Marshal.FreeHGlobal(pBuffer);
-            }
-        }
-
-        /// <summary>
-        /// Enumerates the shares
-        /// </summary>
-        /// <param name="server">The server name</param>
-        /// <param name="shares">The ShareCollection</param>
-        protected static void EnumerateShares(string server, ShareCollection shares)
-        {
-            if (null != server && 0 != server.Length && !IsW2KUp)
-            {
-                server = server.ToUpper();
-
-                // On NT4, 9x and Me, server has to start with "\\"
-                if (!('\\' == server[0] && '\\' == server[1]))
-                    server = @"\\" + server;
-            }
-
-            if (IsNT)
-                EnumerateSharesNT(server, shares);
-            else
-                EnumerateShares9x(server, shares);
-        }
-
-        #endregion
-
-        #endregion
-
-        #region Static methods
-
-        /// <summary>
-        /// Returns true if fileName is a valid local file-name of the form:
-        /// X:\, where X is a drive letter from A-Z
-        /// </summary>
-        /// <param name="fileName">The filename to check</param>
-        /// <returns></returns>
-        public static bool IsValidFilePath(string fileName)
-        {
-            if (null == fileName || 0 == fileName.Length) return false;
-
-            char drive = char.ToUpper(fileName[0]);
-            if ('A' > drive || drive > 'Z')
-                return false;
-
-            else if (Path.VolumeSeparatorChar != fileName[1])
-                return false;
-            else if (Path.DirectorySeparatorChar != fileName[2])
-                return false;
-            else
-                return true;
-        }
-
-        #endregion
-
-        /// <summary>The name of the server this collection represents</summary>
-        private string _server;
-
-        #region Constructor
-
-        /// <summary>
-        /// Default constructor - local machine
-        /// </summary>
-        public ShareCollection()
-        {
-            _server = string.Empty;
-            EnumerateShares(_server, this);
-        }
-
-        /// <summary>
-        /// Constructor
-        /// </summary>
-        /// <param name="Server"></param>
-        public ShareCollection(string server)
-        {
-            _server = server;
-            EnumerateShares(_server, this);
-        }
-
-        #endregion
-
-        #region Add
-
-        protected void Add(Share share)
-        {
-            InnerList.Add(share);
-        }
-
-        protected void Add(string netName, string path, ShareType shareType, string remark)
-        {
-            InnerList.Add(new Share(_server, netName, path, shareType, remark));
-        }
-
-        #endregion
-
-        #region Properties
-
-        /// <summary>
-        /// Returns the name of the server this collection represents
-        /// </summary>
-        public string Server
-        {
-            get { return _server; }
-        }
-
-        /// <summary>
-        /// Returns the <see cref="Share"/> at the specified index.
-        /// </summary>
-        public Share this[int index]
-        {
-            get { return (Share)InnerList[index]; }
-        }
-
-        /// <summary>
-        /// Returns the <see cref="Share"/> which matches a given local path
-        /// </summary>
-        /// <param name="path">The path to match</param>
-        public Share this[string path]
-        {
-            get
-            {
-                if (null == path || 0 == path.Length) return null;
-
-                path = Path.GetFullPath(path);
-                if (!IsValidFilePath(path)) return null;
-
-                Share match = null;
-
-                for (int i = 0; i < InnerList.Count; i++)
-                {
-                    Share s = (Share)InnerList[i];
-
-                    if (s.IsFileSystem && s.MatchesPath(path))
-                    {
-                        //Store first match
-                        if (null == match)
-                            match = s;
-
-                        // If this has a longer path,
-                        // and this is a disk share or match is a special share, 
-                        // then this is a better match
-                        else if (match.Path.Length < s.Path.Length)
-                        {
-                            if (ShareType.Disk == s.ShareType || ShareType.Disk != match.ShareType)
-                                match = s;
-                        }
-                    }
-                }
-
-                return match;
-            }
-        }
-
-        #endregion
-
-        /// <summary>
-        /// Copy this collection to an array
-        /// </summary>
-        /// <param name="array"></param>
-        /// <param name="index"></param>
-        public void CopyTo(Share[] array, int index)
-        {
-            InnerList.CopyTo(array, index);
-        }
-    }
-}
\ No newline at end of file
diff --git a/MediaBrowser.Controller/Library/ItemResolveArgs.cs b/MediaBrowser.Controller/Library/ItemResolveArgs.cs
index 4d58af4370..0979c6845c 100644
--- a/MediaBrowser.Controller/Library/ItemResolveArgs.cs
+++ b/MediaBrowser.Controller/Library/ItemResolveArgs.cs
@@ -1,6 +1,4 @@
-using MediaBrowser.Common.IO;
-using MediaBrowser.Common.Win32;
-using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Entities;
 using System;
 using System.Collections.Generic;
 using System.IO;
diff --git a/MediaBrowser.Controller/Library/LibraryManager.cs b/MediaBrowser.Controller/Library/LibraryManager.cs
index dfaef12cbf..c0c1fe1d6e 100644
--- a/MediaBrowser.Controller/Library/LibraryManager.cs
+++ b/MediaBrowser.Controller/Library/LibraryManager.cs
@@ -1,14 +1,10 @@
 using MediaBrowser.Common.Events;
 using MediaBrowser.Common.Extensions;
-using MediaBrowser.Common.IO;
-using MediaBrowser.Common.Kernel;
-using MediaBrowser.Common.Win32;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.IO;
 using MediaBrowser.Controller.Resolvers;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Logging;
-using MediaBrowser.Model.Tasks;
 using MoreLinq;
 using System;
 using System.Collections.Concurrent;
diff --git a/MediaBrowser.Controller/MediaBrowser.Controller.csproj b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
index 213c30bac5..0701205631 100644
--- a/MediaBrowser.Controller/MediaBrowser.Controller.csproj
+++ b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
@@ -77,6 +77,7 @@
     <Compile Include="..\SharedVersion.cs">
       <Link>Properties\SharedVersion.cs</Link>
     </Compile>
+    <Compile Include="BaseManager.cs" />
     <Compile Include="Drawing\ImageExtensions.cs" />
     <Compile Include="Drawing\ImageHeader.cs" />
     <Compile Include="Drawing\ImageManager.cs" />
@@ -109,7 +110,7 @@
     <Compile Include="Extensions\XmlExtensions.cs" />
     <Compile Include="IO\FileSystem.cs" />
     <Compile Include="IO\FileSystemManager.cs" />
-    <Compile Include="IO\NetworkShares.cs" />
+    <Compile Include="IO\NativeMethods.cs" />
     <Compile Include="Library\ChildrenChangedEventArgs.cs" />
     <Compile Include="Library\DtoBuilder.cs" />
     <Compile Include="Library\Profiler.cs" />
diff --git a/MediaBrowser.Controller/MediaInfo/FFMpegManager.cs b/MediaBrowser.Controller/MediaInfo/FFMpegManager.cs
index 7ef70ea420..9c9b0e9f2d 100644
--- a/MediaBrowser.Controller/MediaInfo/FFMpegManager.cs
+++ b/MediaBrowser.Controller/MediaInfo/FFMpegManager.cs
@@ -634,7 +634,7 @@ namespace MediaBrowser.Controller.MediaInfo
 
             await AudioImageResourcePool.WaitAsync(cancellationToken).ConfigureAwait(false);
 
-            await process.RunAsync().ConfigureAwait(false);
+            await RunAsync(process).ConfigureAwait(false);
 
             AudioImageResourcePool.Release();
 
@@ -713,7 +713,7 @@ namespace MediaBrowser.Controller.MediaInfo
 
             await AudioImageResourcePool.WaitAsync(cancellationToken).ConfigureAwait(false);
 
-            await process.RunAsync().ConfigureAwait(false);
+            await RunAsync(process).ConfigureAwait(false);
 
             AudioImageResourcePool.Release();
 
@@ -768,7 +768,7 @@ namespace MediaBrowser.Controller.MediaInfo
 
             await AudioImageResourcePool.WaitAsync(cancellationToken).ConfigureAwait(false);
 
-            await process.RunAsync().ConfigureAwait(false);
+            await RunAsync(process).ConfigureAwait(false);
 
             AudioImageResourcePool.Release();
 
@@ -971,6 +971,23 @@ namespace MediaBrowser.Controller.MediaInfo
             ((Process)sender).Dispose();
         }
 
+        /// <summary>
+        /// Provides a non-blocking method to start a process and wait asynchronously for it to exit
+        /// </summary>
+        /// <param name="process">The process.</param>
+        /// <returns>Task{System.Boolean}.</returns>
+        private static Task<bool> RunAsync(Process process)
+        {
+            var tcs = new TaskCompletionSource<bool>();
+
+            process.EnableRaisingEvents = true;
+            process.Exited += (sender, args) => tcs.SetResult(true);
+
+            process.Start();
+
+            return tcs.Task;
+        }
+
         /// <summary>
         /// Sets the error mode.
         /// </summary>
diff --git a/MediaBrowser.Controller/Plugins/PluginSecurityManager.cs b/MediaBrowser.Controller/Plugins/PluginSecurityManager.cs
index 5dbd6cbc62..f559d1fd04 100644
--- a/MediaBrowser.Controller/Plugins/PluginSecurityManager.cs
+++ b/MediaBrowser.Controller/Plugins/PluginSecurityManager.cs
@@ -1,6 +1,5 @@
 using Mediabrowser.Model.Entities;
 using Mediabrowser.PluginSecurity;
-using MediaBrowser.Common.Kernel;
 using System.Threading;
 using System.Threading.Tasks;
 
diff --git a/MediaBrowser.Controller/Providers/ImageFromMediaLocationProvider.cs b/MediaBrowser.Controller/Providers/ImageFromMediaLocationProvider.cs
index 4c3250ff40..b992c35d95 100644
--- a/MediaBrowser.Controller/Providers/ImageFromMediaLocationProvider.cs
+++ b/MediaBrowser.Controller/Providers/ImageFromMediaLocationProvider.cs
@@ -1,5 +1,5 @@
-using MediaBrowser.Common.Win32;
-using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.IO;
 using MediaBrowser.Model.Entities;
 using System;
 using System.Collections.Generic;
diff --git a/MediaBrowser.Controller/Providers/ImagesByNameProvider.cs b/MediaBrowser.Controller/Providers/ImagesByNameProvider.cs
index fcc31a75e8..fa1fb2a9c4 100644
--- a/MediaBrowser.Controller/Providers/ImagesByNameProvider.cs
+++ b/MediaBrowser.Controller/Providers/ImagesByNameProvider.cs
@@ -1,5 +1,4 @@
-using MediaBrowser.Common.Win32;
-using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.IO;
 using System;
 using System.Globalization;
diff --git a/MediaBrowser.Controller/Resolvers/EntityResolutionHelper.cs b/MediaBrowser.Controller/Resolvers/EntityResolutionHelper.cs
index f406cb1851..6488d5ef84 100644
--- a/MediaBrowser.Controller/Resolvers/EntityResolutionHelper.cs
+++ b/MediaBrowser.Controller/Resolvers/EntityResolutionHelper.cs
@@ -1,6 +1,4 @@
-using MediaBrowser.Common.IO;
-using MediaBrowser.Common.Win32;
-using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.IO;
 using MediaBrowser.Controller.Library;
 using System;
diff --git a/MediaBrowser.Controller/Resolvers/TV/TVUtils.cs b/MediaBrowser.Controller/Resolvers/TV/TVUtils.cs
index cfb402456e..dddccaff9c 100644
--- a/MediaBrowser.Controller/Resolvers/TV/TVUtils.cs
+++ b/MediaBrowser.Controller/Resolvers/TV/TVUtils.cs
@@ -1,4 +1,4 @@
-using MediaBrowser.Common.Win32;
+using MediaBrowser.Controller.IO;
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/MediaBrowser.Controller/Updates/InstallationManager.cs b/MediaBrowser.Controller/Updates/InstallationManager.cs
index 71a5f487bb..bef5a64724 100644
--- a/MediaBrowser.Controller/Updates/InstallationManager.cs
+++ b/MediaBrowser.Controller/Updates/InstallationManager.cs
@@ -103,21 +103,36 @@ namespace MediaBrowser.Controller.Updates
         /// </summary>
         private readonly ILogger _logger;
 
+        /// <summary>
+        /// The _network manager
+        /// </summary>
+        private readonly INetworkManager _networkManager;
+
         /// <summary>
         /// Initializes a new instance of the <see cref="InstallationManager" /> class.
         /// </summary>
         /// <param name="kernel">The kernel.</param>
         /// <param name="zipClient">The zip client.</param>
+        /// <param name="networkManager">The network manager.</param>
         /// <param name="logger">The logger.</param>
         /// <exception cref="System.ArgumentNullException">zipClient</exception>
-        public InstallationManager(Kernel kernel, IZipClient zipClient, ILogger logger)
+        public InstallationManager(Kernel kernel, IZipClient zipClient, INetworkManager networkManager, ILogger logger)
             : base(kernel)
         {
             if (zipClient == null)
             {
                 throw new ArgumentNullException("zipClient");
             }
+            if (networkManager == null)
+            {
+                throw new ArgumentNullException("networkManager");
+            }
+            if (logger == null)
+            {
+                throw new ArgumentNullException("logger");
+            }
 
+            _networkManager = networkManager;
             _logger = logger;
             ZipClient = zipClient;
         }
@@ -133,7 +148,7 @@ namespace MediaBrowser.Controller.Updates
             PackageType? packageType = null,
             Version applicationVersion = null)
         {
-            var data = new Dictionary<string, string> { { "key", Kernel.PluginSecurityManager.SupporterKey }, { "mac", NetUtils.GetMacAddress() } };
+            var data = new Dictionary<string, string> { { "key", Kernel.PluginSecurityManager.SupporterKey }, { "mac", _networkManager.GetMacAddress() } };
 
             using (var json = await Kernel.HttpManager.Post(Controller.Kernel.MBAdminUrl + "service/package/retrieveall", data, Kernel.ResourcePools.Mb, cancellationToken).ConfigureAwait(false))
             {
diff --git a/MediaBrowser.Model/MediaBrowser.Model.csproj b/MediaBrowser.Model/MediaBrowser.Model.csproj
index c4010e1d9b..372aefdc6d 100644
--- a/MediaBrowser.Model/MediaBrowser.Model.csproj
+++ b/MediaBrowser.Model/MediaBrowser.Model.csproj
@@ -73,6 +73,8 @@
     <Compile Include="Logging\LogSeverity.cs" />
     <Compile Include="MediaInfo\IBlurayExaminer.cs" />
     <Compile Include="Net\HttpException.cs" />
+    <Compile Include="Net\NetworkShare.cs" />
+    <Compile Include="Net\NetworkShareType.cs" />
     <Compile Include="Updates\CheckForUpdateResult.cs" />
     <Compile Include="Updates\InstallationInfo.cs" />
     <Compile Include="Updates\PackageType.cs" />
diff --git a/MediaBrowser.Model/Net/NetworkShare.cs b/MediaBrowser.Model/Net/NetworkShare.cs
new file mode 100644
index 0000000000..5ce84eeedd
--- /dev/null
+++ b/MediaBrowser.Model/Net/NetworkShare.cs
@@ -0,0 +1,31 @@
+
+namespace MediaBrowser.Model.Net
+{
+    public class NetworkShare
+    {
+        /// <summary>
+        /// The name of the computer that this share belongs to
+        /// </summary>
+        public string Server { get; set; }
+
+        /// <summary>
+        /// Share name
+        /// </summary>
+        public string Name { get; set; }
+
+        /// <summary>
+        /// Local path
+        /// </summary>
+        public string Path { get; set; }
+
+        /// <summary>
+        /// Share type
+        /// </summary>
+        public NetworkShareType ShareType { get; set; }
+
+        /// <summary>
+        /// Comment
+        /// </summary>
+        public string Remark { get; set; }
+    }
+}
diff --git a/MediaBrowser.Model/Net/NetworkShareType.cs b/MediaBrowser.Model/Net/NetworkShareType.cs
new file mode 100644
index 0000000000..41dc9003ee
--- /dev/null
+++ b/MediaBrowser.Model/Net/NetworkShareType.cs
@@ -0,0 +1,30 @@
+
+namespace MediaBrowser.Model.Net
+{
+    /// <summary>
+    /// Enum NetworkShareType
+    /// </summary>
+    public enum NetworkShareType
+    {
+        /// <summary>
+        /// Disk share
+        /// </summary>
+        Disk,
+        /// <summary>
+        /// Printer share
+        /// </summary>
+        Printer,
+        /// <summary>
+        /// Device share
+        /// </summary>
+        Device,
+        /// <summary>
+        /// IPC share
+        /// </summary>
+        Ipc,
+        /// <summary>
+        /// Special share
+        /// </summary>
+        Special
+    }
+}
diff --git a/MediaBrowser.Networking/Management/NativeMethods.cs b/MediaBrowser.Networking/Management/NativeMethods.cs
new file mode 100644
index 0000000000..9a888fab2b
--- /dev/null
+++ b/MediaBrowser.Networking/Management/NativeMethods.cs
@@ -0,0 +1,72 @@
+using System;
+using System.Runtime.InteropServices;
+using System.Security;
+
+namespace MediaBrowser.Networking.Management
+{
+    /// <summary>
+    /// Class NativeMethods
+    /// </summary>
+    [SuppressUnmanagedCodeSecurity]
+    public static class NativeMethods
+    {
+        //declare the Netapi32 : NetServerEnum method import
+        /// <summary>
+        /// Nets the server enum.
+        /// </summary>
+        /// <param name="ServerName">Name of the server.</param>
+        /// <param name="dwLevel">The dw level.</param>
+        /// <param name="pBuf">The p buf.</param>
+        /// <param name="dwPrefMaxLen">The dw pref max len.</param>
+        /// <param name="dwEntriesRead">The dw entries read.</param>
+        /// <param name="dwTotalEntries">The dw total entries.</param>
+        /// <param name="dwServerType">Type of the dw server.</param>
+        /// <param name="domain">The domain.</param>
+        /// <param name="dwResumeHandle">The dw resume handle.</param>
+        /// <returns>System.Int32.</returns>
+        [DllImport("Netapi32", CharSet = CharSet.Auto, SetLastError = true),
+        SuppressUnmanagedCodeSecurityAttribute]
+
+        public static extern int NetServerEnum(
+            string ServerName, // must be null
+            int dwLevel,
+            ref IntPtr pBuf,
+            int dwPrefMaxLen,
+            out int dwEntriesRead,
+            out int dwTotalEntries,
+            int dwServerType,
+            string domain, // null for login domain
+            out int dwResumeHandle
+            );
+
+        //declare the Netapi32 : NetApiBufferFree method import
+        /// <summary>
+        /// Nets the API buffer free.
+        /// </summary>
+        /// <param name="pBuf">The p buf.</param>
+        /// <returns>System.Int32.</returns>
+        [DllImport("Netapi32", SetLastError = true),
+        SuppressUnmanagedCodeSecurityAttribute]
+
+        public static extern int NetApiBufferFree(
+            IntPtr pBuf);
+    }
+
+    //create a _SERVER_INFO_100 STRUCTURE
+    /// <summary>
+    /// Struct _SERVER_INFO_100
+    /// </summary>
+    [StructLayout(LayoutKind.Sequential)]
+    public struct _SERVER_INFO_100
+    {
+        /// <summary>
+        /// The sv100_platform_id
+        /// </summary>
+        internal int sv100_platform_id;
+        /// <summary>
+        /// The sv100_name
+        /// </summary>
+        [MarshalAs(UnmanagedType.LPWStr)]
+        internal string sv100_name;
+    }
+}
diff --git a/MediaBrowser.Networking/Management/NetworkManager.cs b/MediaBrowser.Networking/Management/NetworkManager.cs
new file mode 100644
index 0000000000..fcead43d3d
--- /dev/null
+++ b/MediaBrowser.Networking/Management/NetworkManager.cs
@@ -0,0 +1,265 @@
+using MediaBrowser.Common.Net;
+using MediaBrowser.Model.Net;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Management;
+using System.Net;
+using System.Net.Sockets;
+using System.Runtime.InteropServices;
+
+namespace MediaBrowser.Networking.Management
+{
+    /// <summary>
+    /// Class NetUtils
+    /// </summary>
+    public class NetworkManager : INetworkManager
+    {
+        /// <summary>
+        /// Gets the machine's local ip address
+        /// </summary>
+        /// <returns>IPAddress.</returns>
+        public string GetLocalIpAddress()
+        {
+            var host = Dns.GetHostEntry(Dns.GetHostName());
+
+            var ip = host.AddressList.FirstOrDefault(i => i.AddressFamily == AddressFamily.InterNetwork);
+
+            if (ip == null)
+            {
+                return null;
+            }
+
+            return ip.ToString();
+        }
+
+        /// <summary>
+        /// Gets a random port number that is currently available
+        /// </summary>
+        /// <returns>System.Int32.</returns>
+        public int GetRandomUnusedPort()
+        {
+            var listener = new TcpListener(IPAddress.Any, 0);
+            listener.Start();
+            var port = ((IPEndPoint)listener.LocalEndpoint).Port;
+            listener.Stop();
+            return port;
+        }
+
+        /// <summary>
+        /// Creates the netsh URL registration.
+        /// </summary>
+        public void AuthorizeHttpListening(string url)
+        {
+            var startInfo = new ProcessStartInfo
+            {
+                FileName = "netsh",
+                Arguments = string.Format("http add urlacl url={0} user=\"NT AUTHORITY\\Authenticated Users\"", url),
+                CreateNoWindow = true,
+                WindowStyle = ProcessWindowStyle.Hidden,
+                Verb = "runas",
+                ErrorDialog = false
+            };
+
+            using (var process = Process.Start(startInfo))
+            {
+                process.WaitForExit();
+            }
+        }
+
+        /// <summary>
+        /// Adds the windows firewall rule.
+        /// </summary>
+        /// <param name="port">The port.</param>
+        /// <param name="protocol">The protocol.</param>
+        public void AddSystemFirewallRule(int port, NetworkProtocol protocol)
+        {
+            // First try to remove it so we don't end up creating duplicates
+            RemoveSystemFirewallRule(port, protocol);
+
+            var args = string.Format("advfirewall firewall add rule name=\"Port {0}\" dir=in action=allow protocol={1} localport={0}", port, protocol);
+
+            RunNetsh(args);
+        }
+
+        /// <summary>
+        /// Removes the windows firewall rule.
+        /// </summary>
+        /// <param name="port">The port.</param>
+        /// <param name="protocol">The protocol.</param>
+        public void RemoveSystemFirewallRule(int port, NetworkProtocol protocol)
+        {
+            var args = string.Format("advfirewall firewall delete rule name=\"Port {0}\" protocol={1} localport={0}", port, protocol);
+
+            RunNetsh(args);
+        }
+
+        /// <summary>
+        /// Runs the netsh.
+        /// </summary>
+        /// <param name="args">The args.</param>
+        private void RunNetsh(string args)
+        {
+            var startInfo = new ProcessStartInfo
+            {
+                FileName = "netsh",
+                Arguments = args,
+                CreateNoWindow = true,
+                WindowStyle = ProcessWindowStyle.Hidden,
+                Verb = "runas",
+                ErrorDialog = false
+            };
+
+            using (var process = new Process { StartInfo = startInfo })
+            {
+                process.Start();
+                process.WaitForExit();
+            }
+        }
+
+        /// <summary>
+        /// Returns MAC Address from first Network Card in Computer
+        /// </summary>
+        /// <returns>[string] MAC Address</returns>
+        public string GetMacAddress()
+        {
+            var mc = new ManagementClass("Win32_NetworkAdapterConfiguration");
+            var moc = mc.GetInstances();
+            var macAddress = String.Empty;
+            foreach (ManagementObject mo in moc)
+            {
+                if (macAddress == String.Empty)  // only return MAC Address from first card
+                {
+                    try
+                    {
+                        if ((bool)mo["IPEnabled"]) macAddress = mo["MacAddress"].ToString();
+                    }
+                    catch
+                    {
+                        mo.Dispose();
+                        return "";
+                    }
+                }
+                mo.Dispose();
+            }
+
+            return macAddress.Replace(":", "");
+        }
+
+        /// <summary>
+        /// Uses the DllImport : NetServerEnum with all its required parameters
+        /// (see http://msdn.microsoft.com/library/default.asp?url=/library/en-us/netmgmt/netmgmt/netserverenum.asp
+        /// for full details or method signature) to retrieve a list of domain SV_TYPE_WORKSTATION
+        /// and SV_TYPE_SERVER PC's
+        /// </summary>
+        /// <returns>Arraylist that represents all the SV_TYPE_WORKSTATION and SV_TYPE_SERVER
+        /// PC's in the Domain</returns>
+        public IEnumerable<string> GetNetworkDevices()
+        {
+            //local fields
+            const int MAX_PREFERRED_LENGTH = -1;
+            var SV_TYPE_WORKSTATION = 1;
+            var SV_TYPE_SERVER = 2;
+            var buffer = IntPtr.Zero;
+            var tmpBuffer = IntPtr.Zero;
+            var entriesRead = 0;
+            var totalEntries = 0;
+            var resHandle = 0;
+            var sizeofINFO = Marshal.SizeOf(typeof(_SERVER_INFO_100));
+
+            try
+            {
+                //call the DllImport : NetServerEnum with all its required parameters
+                //see http://msdn.microsoft.com/library/default.asp?url=/library/en-us/netmgmt/netmgmt/netserverenum.asp
+                //for full details of method signature
+                var ret = NativeMethods.NetServerEnum(null, 100, ref buffer, MAX_PREFERRED_LENGTH, out entriesRead, out totalEntries, SV_TYPE_WORKSTATION | SV_TYPE_SERVER, null, out resHandle);
+
+                //if the returned with a NERR_Success (C++ term), =0 for C#
+                if (ret == 0)
+                {
+                    //loop through all SV_TYPE_WORKSTATION and SV_TYPE_SERVER PC's
+                    for (var i = 0; i < totalEntries; i++)
+                    {
+                        //get pointer to, Pointer to the buffer that received the data from
+                        //the call to NetServerEnum. Must ensure to use correct size of 
+                        //STRUCTURE to ensure correct location in memory is pointed to
+                        tmpBuffer = new IntPtr((int)buffer + (i * sizeofINFO));
+                        //Have now got a pointer to the list of SV_TYPE_WORKSTATION and 
+                        //SV_TYPE_SERVER PC's, which is unmanaged memory
+                        //Needs to Marshal data from an unmanaged block of memory to a 
+                        //managed object, again using STRUCTURE to ensure the correct data
+                        //is marshalled 
+                        var svrInfo = (_SERVER_INFO_100)Marshal.PtrToStructure(tmpBuffer, typeof(_SERVER_INFO_100));
+
+                        //add the PC names to the ArrayList
+                        if (!string.IsNullOrEmpty(svrInfo.sv100_name))
+                        {
+                            yield return svrInfo.sv100_name;
+                        }
+                    }
+                }
+            }
+            finally
+            {
+                //The NetApiBufferFree function frees 
+                //the memory that the NetApiBufferAllocate function allocates
+                NativeMethods.NetApiBufferFree(buffer);
+            }
+        }
+
+
+        /// <summary>
+        /// Gets the network shares.
+        /// </summary>
+        /// <param name="path">The path.</param>
+        /// <returns>IEnumerable{NetworkShare}.</returns>
+        public IEnumerable<NetworkShare> GetNetworkShares(string path)
+        {
+            return new ShareCollection(path).OfType<Share>().Select(ToNetworkShare);
+        }
+
+        /// <summary>
+        /// To the network share.
+        /// </summary>
+        /// <param name="share">The share.</param>
+        /// <returns>NetworkShare.</returns>
+        private NetworkShare ToNetworkShare(Share share)
+        {
+            return new NetworkShare
+            {
+                Name = share.NetName,
+                Path = share.Path,
+                Remark = share.Remark,
+                Server = share.Server,
+                ShareType = ToNetworkShareType(share.ShareType)
+            };
+        }
+
+        /// <summary>
+        /// To the type of the network share.
+        /// </summary>
+        /// <param name="shareType">Type of the share.</param>
+        /// <returns>NetworkShareType.</returns>
+        /// <exception cref="System.ArgumentException">Unknown share type</exception>
+        private NetworkShareType ToNetworkShareType(ShareType shareType)
+        {
+            switch (shareType)
+            {
+                case ShareType.Device:
+                    return NetworkShareType.Device;
+                case ShareType.Disk :
+                    return NetworkShareType.Disk;
+                case ShareType.IPC :
+                    return NetworkShareType.Ipc;
+                case ShareType.Printer :
+                    return NetworkShareType.Printer;
+                case ShareType.Special:
+                    return NetworkShareType.Special;
+                default:
+                    throw new ArgumentException("Unknown share type");
+            }
+        }
+    }
+
+}
diff --git a/MediaBrowser.Networking/Management/NetworkShares.cs b/MediaBrowser.Networking/Management/NetworkShares.cs
new file mode 100644
index 0000000000..0239ddead8
--- /dev/null
+++ b/MediaBrowser.Networking/Management/NetworkShares.cs
@@ -0,0 +1,638 @@
+using System;
+using System.IO;
+using System.Collections;
+using System.Runtime.InteropServices;
+
+namespace MediaBrowser.Networking.Management
+{
+    /// <summary>
+    /// Type of share
+    /// </summary>
+    [Flags]
+    public enum ShareType
+    {
+        /// <summary>Disk share</summary>
+        Disk = 0,
+        /// <summary>Printer share</summary>
+        Printer = 1,
+        /// <summary>Device share</summary>
+        Device = 2,
+        /// <summary>IPC share</summary>
+        IPC = 3,
+        /// <summary>Special share</summary>
+        Special = -2147483648, // 0x80000000,
+    }
+
+    #region Share
+
+    /// <summary>
+    /// Information about a local share
+    /// </summary>
+    public class Share
+    {
+        #region Private data
+
+        private string _server;
+        private string _netName;
+        private string _path;
+        private ShareType _shareType;
+        private string _remark;
+
+        #endregion
+
+        #region Constructor
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="Server"></param>
+        /// <param name="shi"></param>
+        public Share(string server, string netName, string path, ShareType shareType, string remark)
+        {
+            if (ShareType.Special == shareType && "IPC$" == netName)
+            {
+                shareType |= ShareType.IPC;
+            }
+
+            _server = server;
+            _netName = netName;
+            _path = path;
+            _shareType = shareType;
+            _remark = remark;
+        }
+
+        #endregion
+
+        #region Properties
+
+        /// <summary>
+        /// The name of the computer that this share belongs to
+        /// </summary>
+        public string Server
+        {
+            get { return _server; }
+        }
+
+        /// <summary>
+        /// Share name
+        /// </summary>
+        public string NetName
+        {
+            get { return _netName; }
+        }
+
+        /// <summary>
+        /// Local path
+        /// </summary>
+        public string Path
+        {
+            get { return _path; }
+        }
+
+        /// <summary>
+        /// Share type
+        /// </summary>
+        public ShareType ShareType
+        {
+            get { return _shareType; }
+        }
+
+        /// <summary>
+        /// Comment
+        /// </summary>
+        public string Remark
+        {
+            get { return _remark; }
+        }
+
+        /// <summary>
+        /// Returns true if this is a file system share
+        /// </summary>
+        public bool IsFileSystem
+        {
+            get
+            {
+                // Shared device
+                if (0 != (_shareType & ShareType.Device)) return false;
+                // IPC share
+                if (0 != (_shareType & ShareType.IPC)) return false;
+                // Shared printer
+                if (0 != (_shareType & ShareType.Printer)) return false;
+
+                // Standard disk share
+                if (0 == (_shareType & ShareType.Special)) return true;
+
+                // Special disk share (e.g. C$)
+                return ShareType.Special == _shareType && !string.IsNullOrEmpty(_netName);
+            }
+        }
+
+        /// <summary>
+        /// Get the root of a disk-based share
+        /// </summary>
+        public DirectoryInfo Root
+        {
+            get
+            {
+                if (IsFileSystem)
+                {
+                    if (string.IsNullOrEmpty(_server))
+                        if (string.IsNullOrEmpty(_path))
+                            return new DirectoryInfo(ToString());
+                        else
+                            return new DirectoryInfo(_path);
+                    return new DirectoryInfo(ToString());
+                }
+                return null;
+            }
+        }
+
+        #endregion
+
+        /// <summary>
+        /// Returns the path to this share
+        /// </summary>
+        /// <returns></returns>
+        public override string ToString()
+        {
+            if (string.IsNullOrEmpty(_server))
+            {
+                return string.Format(@"\\{0}\{1}", Environment.MachineName, _netName);
+            }
+            return string.Format(@"\\{0}\{1}", _server, _netName);
+        }
+
+        /// <summary>
+        /// Returns true if this share matches the local path
+        /// </summary>
+        /// <param name="path"></param>
+        /// <returns></returns>
+        public bool MatchesPath(string path)
+        {
+            if (!IsFileSystem) return false;
+            if (string.IsNullOrEmpty(path)) return true;
+
+            return path.ToLower().StartsWith(_path.ToLower());
+        }
+    }
+
+    #endregion
+
+    /// <summary>
+    /// A collection of shares
+    /// </summary>
+    public class ShareCollection : ReadOnlyCollectionBase
+    {
+        #region Platform
+
+        /// <summary>
+        /// Is this an NT platform?
+        /// </summary>
+        protected static bool IsNT
+        {
+            get { return (PlatformID.Win32NT == Environment.OSVersion.Platform); }
+        }
+
+        /// <summary>
+        /// Returns true if this is Windows 2000 or higher
+        /// </summary>
+        protected static bool IsW2KUp
+        {
+            get
+            {
+                OperatingSystem os = Environment.OSVersion;
+                if (PlatformID.Win32NT == os.Platform && os.Version.Major >= 5)
+                    return true;
+                else
+                    return false;
+            }
+        }
+
+        #endregion
+
+        #region Interop
+
+        #region Constants
+
+        /// <summary>Maximum path length</summary>
+        protected const int MAX_PATH = 260;
+        /// <summary>No error</summary>
+        protected const int NO_ERROR = 0;
+        /// <summary>Access denied</summary>
+        protected const int ERROR_ACCESS_DENIED = 5;
+        /// <summary>Access denied</summary>
+        protected const int ERROR_WRONG_LEVEL = 124;
+        /// <summary>More data available</summary>
+        protected const int ERROR_MORE_DATA = 234;
+        /// <summary>Not connected</summary>
+        protected const int ERROR_NOT_CONNECTED = 2250;
+        /// <summary>Level 1</summary>
+        protected const int UNIVERSAL_NAME_INFO_LEVEL = 1;
+        /// <summary>Max extries (9x)</summary>
+        protected const int MAX_SI50_ENTRIES = 20;
+
+        #endregion
+
+        #region Structures
+
+        /// <summary>Unc name</summary>
+        [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Auto)]
+        protected struct UNIVERSAL_NAME_INFO
+        {
+            [MarshalAs(UnmanagedType.LPTStr)]
+            public string lpUniversalName;
+        }
+
+        /// <summary>Share information, NT, level 2</summary>
+        /// <remarks>
+        /// Requires admin rights to work. 
+        /// </remarks>
+        [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
+        protected struct SHARE_INFO_2
+        {
+            [MarshalAs(UnmanagedType.LPWStr)]
+            public string NetName;
+            public ShareType ShareType;
+            [MarshalAs(UnmanagedType.LPWStr)]
+            public string Remark;
+            public int Permissions;
+            public int MaxUsers;
+            public int CurrentUsers;
+            [MarshalAs(UnmanagedType.LPWStr)]
+            public string Path;
+            [MarshalAs(UnmanagedType.LPWStr)]
+            public string Password;
+        }
+
+        /// <summary>Share information, NT, level 1</summary>
+        /// <remarks>
+        /// Fallback when no admin rights.
+        /// </remarks>
+        [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Unicode)]
+        protected struct SHARE_INFO_1
+        {
+            [MarshalAs(UnmanagedType.LPWStr)]
+            public string NetName;
+            public ShareType ShareType;
+            [MarshalAs(UnmanagedType.LPWStr)]
+            public string Remark;
+        }
+
+        /// <summary>Share information, Win9x</summary>
+        [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi, Pack = 1)]
+        protected struct SHARE_INFO_50
+        {
+            [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 13)]
+            public string NetName;
+
+            public byte bShareType;
+            public ushort Flags;
+
+            [MarshalAs(UnmanagedType.LPTStr)]
+            public string Remark;
+            [MarshalAs(UnmanagedType.LPTStr)]
+            public string Path;
+
+            [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 9)]
+            public string PasswordRW;
+            [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 9)]
+            public string PasswordRO;
+
+            public ShareType ShareType
+            {
+                get { return (ShareType)((int)bShareType & 0x7F); }
+            }
+        }
+
+        /// <summary>Share information level 1, Win9x</summary>
+        [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi, Pack = 1)]
+        protected struct SHARE_INFO_1_9x
+        {
+            [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 13)]
+            public string NetName;
+            public byte Padding;
+
+            public ushort bShareType;
+
+            [MarshalAs(UnmanagedType.LPTStr)]
+            public string Remark;
+
+            public ShareType ShareType
+            {
+                get { return (ShareType)((int)bShareType & 0x7FFF); }
+            }
+        }
+
+        #endregion
+
+        #region Functions
+
+        /// <summary>Get a UNC name</summary>
+        [DllImport("mpr", CharSet = CharSet.Auto)]
+        protected static extern int WNetGetUniversalName(string lpLocalPath,
+            int dwInfoLevel, ref UNIVERSAL_NAME_INFO lpBuffer, ref int lpBufferSize);
+
+        /// <summary>Get a UNC name</summary>
+        [DllImport("mpr", CharSet = CharSet.Auto)]
+        protected static extern int WNetGetUniversalName(string lpLocalPath,
+            int dwInfoLevel, IntPtr lpBuffer, ref int lpBufferSize);
+
+        /// <summary>Enumerate shares (NT)</summary>
+        [DllImport("netapi32", CharSet = CharSet.Unicode)]
+        protected static extern int NetShareEnum(string lpServerName, int dwLevel,
+            out IntPtr lpBuffer, int dwPrefMaxLen, out int entriesRead,
+            out int totalEntries, ref int hResume);
+
+        /// <summary>Enumerate shares (9x)</summary>
+        [DllImport("svrapi", CharSet = CharSet.Ansi)]
+        protected static extern int NetShareEnum(
+            [MarshalAs(UnmanagedType.LPTStr)] string lpServerName, int dwLevel,
+            IntPtr lpBuffer, ushort cbBuffer, out ushort entriesRead,
+            out ushort totalEntries);
+
+        /// <summary>Free the buffer (NT)</summary>
+        [DllImport("netapi32")]
+        protected static extern int NetApiBufferFree(IntPtr lpBuffer);
+
+        #endregion
+
+        #region Enumerate shares
+
+        /// <summary>
+        /// Enumerates the shares on Windows NT
+        /// </summary>
+        /// <param name="server">The server name</param>
+        /// <param name="shares">The ShareCollection</param>
+        protected static void EnumerateSharesNT(string server, ShareCollection shares)
+        {
+            int level = 2;
+            int entriesRead, totalEntries, nRet, hResume = 0;
+            IntPtr pBuffer = IntPtr.Zero;
+
+            try
+            {
+                nRet = NetShareEnum(server, level, out pBuffer, -1,
+                    out entriesRead, out totalEntries, ref hResume);
+
+                if (ERROR_ACCESS_DENIED == nRet)
+                {
+                    //Need admin for level 2, drop to level 1
+                    level = 1;
+                    nRet = NetShareEnum(server, level, out pBuffer, -1,
+                        out entriesRead, out totalEntries, ref hResume);
+                }
+
+                if (NO_ERROR == nRet && entriesRead > 0)
+                {
+                    Type t = (2 == level) ? typeof(SHARE_INFO_2) : typeof(SHARE_INFO_1);
+                    int offset = Marshal.SizeOf(t);
+
+                    for (int i = 0, lpItem = pBuffer.ToInt32(); i < entriesRead; i++, lpItem += offset)
+                    {
+                        IntPtr pItem = new IntPtr(lpItem);
+                        if (1 == level)
+                        {
+                            SHARE_INFO_1 si = (SHARE_INFO_1)Marshal.PtrToStructure(pItem, t);
+                            shares.Add(si.NetName, string.Empty, si.ShareType, si.Remark);
+                        }
+                        else
+                        {
+                            SHARE_INFO_2 si = (SHARE_INFO_2)Marshal.PtrToStructure(pItem, t);
+                            shares.Add(si.NetName, si.Path, si.ShareType, si.Remark);
+                        }
+                    }
+                }
+
+            }
+            finally
+            {
+                // Clean up buffer allocated by system
+                if (IntPtr.Zero != pBuffer)
+                    NetApiBufferFree(pBuffer);
+            }
+        }
+
+        /// <summary>
+        /// Enumerates the shares on Windows 9x
+        /// </summary>
+        /// <param name="server">The server name</param>
+        /// <param name="shares">The ShareCollection</param>
+        protected static void EnumerateShares9x(string server, ShareCollection shares)
+        {
+            int level = 50;
+            int nRet = 0;
+            ushort entriesRead, totalEntries;
+
+            Type t = typeof(SHARE_INFO_50);
+            int size = Marshal.SizeOf(t);
+            ushort cbBuffer = (ushort)(MAX_SI50_ENTRIES * size);
+            //On Win9x, must allocate buffer before calling API
+            IntPtr pBuffer = Marshal.AllocHGlobal(cbBuffer);
+
+            try
+            {
+                nRet = NetShareEnum(server, level, pBuffer, cbBuffer,
+                    out entriesRead, out totalEntries);
+
+                if (ERROR_WRONG_LEVEL == nRet)
+                {
+                    level = 1;
+                    t = typeof(SHARE_INFO_1_9x);
+                    size = Marshal.SizeOf(t);
+
+                    nRet = NetShareEnum(server, level, pBuffer, cbBuffer,
+                        out entriesRead, out totalEntries);
+                }
+
+                if (NO_ERROR == nRet || ERROR_MORE_DATA == nRet)
+                {
+                    for (int i = 0, lpItem = pBuffer.ToInt32(); i < entriesRead; i++, lpItem += size)
+                    {
+                        IntPtr pItem = new IntPtr(lpItem);
+
+                        if (1 == level)
+                        {
+                            SHARE_INFO_1_9x si = (SHARE_INFO_1_9x)Marshal.PtrToStructure(pItem, t);
+                            shares.Add(si.NetName, string.Empty, si.ShareType, si.Remark);
+                        }
+                        else
+                        {
+                            SHARE_INFO_50 si = (SHARE_INFO_50)Marshal.PtrToStructure(pItem, t);
+                            shares.Add(si.NetName, si.Path, si.ShareType, si.Remark);
+                        }
+                    }
+                }
+                else
+                    Console.WriteLine(nRet);
+
+            }
+            finally
+            {
+                //Clean up buffer
+                Marshal.FreeHGlobal(pBuffer);
+            }
+        }
+
+        /// <summary>
+        /// Enumerates the shares
+        /// </summary>
+        /// <param name="server">The server name</param>
+        /// <param name="shares">The ShareCollection</param>
+        protected static void EnumerateShares(string server, ShareCollection shares)
+        {
+            if (null != server && 0 != server.Length && !IsW2KUp)
+            {
+                server = server.ToUpper();
+
+                // On NT4, 9x and Me, server has to start with "\\"
+                if (!('\\' == server[0] && '\\' == server[1]))
+                    server = @"\\" + server;
+            }
+
+            if (IsNT)
+                EnumerateSharesNT(server, shares);
+            else
+                EnumerateShares9x(server, shares);
+        }
+
+        #endregion
+
+        #endregion
+
+        #region Static methods
+
+        /// <summary>
+        /// Returns true if fileName is a valid local file-name of the form:
+        /// X:\, where X is a drive letter from A-Z
+        /// </summary>
+        /// <param name="fileName">The filename to check</param>
+        /// <returns></returns>
+        public static bool IsValidFilePath(string fileName)
+        {
+            if (null == fileName || 0 == fileName.Length) return false;
+
+            char drive = char.ToUpper(fileName[0]);
+            if ('A' > drive || drive > 'Z')
+                return false;
+
+            else if (Path.VolumeSeparatorChar != fileName[1])
+                return false;
+            else if (Path.DirectorySeparatorChar != fileName[2])
+                return false;
+            else
+                return true;
+        }
+
+        #endregion
+
+        /// <summary>The name of the server this collection represents</summary>
+        private string _server;
+
+        #region Constructor
+
+        /// <summary>
+        /// Default constructor - local machine
+        /// </summary>
+        public ShareCollection()
+        {
+            _server = string.Empty;
+            EnumerateShares(_server, this);
+        }
+
+        /// <summary>
+        /// Constructor
+        /// </summary>
+        /// <param name="Server"></param>
+        public ShareCollection(string server)
+        {
+            _server = server;
+            EnumerateShares(_server, this);
+        }
+
+        #endregion
+
+        #region Add
+
+        protected void Add(Share share)
+        {
+            InnerList.Add(share);
+        }
+
+        protected void Add(string netName, string path, ShareType shareType, string remark)
+        {
+            InnerList.Add(new Share(_server, netName, path, shareType, remark));
+        }
+
+        #endregion
+
+        #region Properties
+
+        /// <summary>
+        /// Returns the name of the server this collection represents
+        /// </summary>
+        public string Server
+        {
+            get { return _server; }
+        }
+
+        /// <summary>
+        /// Returns the <see cref="Share"/> at the specified index.
+        /// </summary>
+        public Share this[int index]
+        {
+            get { return (Share)InnerList[index]; }
+        }
+
+        /// <summary>
+        /// Returns the <see cref="Share"/> which matches a given local path
+        /// </summary>
+        /// <param name="path">The path to match</param>
+        public Share this[string path]
+        {
+            get
+            {
+                if (null == path || 0 == path.Length) return null;
+
+                path = Path.GetFullPath(path);
+                if (!IsValidFilePath(path)) return null;
+
+                Share match = null;
+
+                for (int i = 0; i < InnerList.Count; i++)
+                {
+                    Share s = (Share)InnerList[i];
+
+                    if (s.IsFileSystem && s.MatchesPath(path))
+                    {
+                        //Store first match
+                        if (null == match)
+                            match = s;
+
+                        // If this has a longer path,
+                        // and this is a disk share or match is a special share, 
+                        // then this is a better match
+                        else if (match.Path.Length < s.Path.Length)
+                        {
+                            if (ShareType.Disk == s.ShareType || ShareType.Disk != match.ShareType)
+                                match = s;
+                        }
+                    }
+                }
+
+                return match;
+            }
+        }
+
+        #endregion
+
+        /// <summary>
+        /// Copy this collection to an array
+        /// </summary>
+        /// <param name="array"></param>
+        /// <param name="index"></param>
+        public void CopyTo(Share[] array, int index)
+        {
+            InnerList.CopyTo(array, index);
+        }
+    }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Networking/MediaBrowser.Networking.csproj b/MediaBrowser.Networking/MediaBrowser.Networking.csproj
index acd0d01462..cd66fd1844 100644
--- a/MediaBrowser.Networking/MediaBrowser.Networking.csproj
+++ b/MediaBrowser.Networking/MediaBrowser.Networking.csproj
@@ -32,6 +32,7 @@
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Management" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
@@ -42,8 +43,21 @@
     <Compile Include="..\SharedVersion.cs">
       <Link>Properties\SharedVersion.cs</Link>
     </Compile>
+    <Compile Include="Management\NativeMethods.cs" />
+    <Compile Include="Management\NetworkManager.cs" />
+    <Compile Include="Management\NetworkShares.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\MediaBrowser.Common\MediaBrowser.Common.csproj">
+      <Project>{9142eefa-7570-41e1-bfcc-468bb571af2f}</Project>
+      <Name>MediaBrowser.Common</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj">
+      <Project>{7eeeb4bb-f3e8-48fc-b4c5-70f0fff8329b}</Project>
+      <Name>MediaBrowser.Model</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/MediaBrowser.Server.Sqlite/MediaBrowser.Server.Sqlite.csproj b/MediaBrowser.Server.Sqlite/MediaBrowser.Server.Sqlite.csproj
index 22e552f8ae..78ea39dd87 100644
--- a/MediaBrowser.Server.Sqlite/MediaBrowser.Server.Sqlite.csproj
+++ b/MediaBrowser.Server.Sqlite/MediaBrowser.Server.Sqlite.csproj
@@ -43,11 +43,8 @@
     <Reference Include="System.Data.SQLite.Linq">
       <HintPath>..\packages\System.Data.SQLite.1.0.84.0\lib\net45\System.Data.SQLite.Linq.dll</HintPath>
     </Reference>
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\SharedVersion.cs">
diff --git a/MediaBrowser.Server.WorldWeatherOnline/MediaBrowser.Server.WorldWeatherOnline.csproj b/MediaBrowser.Server.WorldWeatherOnline/MediaBrowser.Server.WorldWeatherOnline.csproj
index 0d47febed1..1e97a482ed 100644
--- a/MediaBrowser.Server.WorldWeatherOnline/MediaBrowser.Server.WorldWeatherOnline.csproj
+++ b/MediaBrowser.Server.WorldWeatherOnline/MediaBrowser.Server.WorldWeatherOnline.csproj
@@ -35,11 +35,7 @@
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\SharedVersion.cs">
diff --git a/MediaBrowser.ServerApplication/App.xaml.cs b/MediaBrowser.ServerApplication/App.xaml.cs
index 492fef2429..4aa3cdbb46 100644
--- a/MediaBrowser.ServerApplication/App.xaml.cs
+++ b/MediaBrowser.ServerApplication/App.xaml.cs
@@ -1,6 +1,8 @@
-using MediaBrowser.ClickOnce;
+using BDInfo;
+using MediaBrowser.ClickOnce;
 using MediaBrowser.Common.IO;
 using MediaBrowser.Common.Kernel;
+using MediaBrowser.Common.Net;
 using MediaBrowser.Controller;
 using MediaBrowser.IsoMounter;
 using MediaBrowser.Logging.Nlog;
@@ -8,6 +10,7 @@ using MediaBrowser.Model.IO;
 using MediaBrowser.Model.Logging;
 using MediaBrowser.Model.MediaInfo;
 using MediaBrowser.Model.Updates;
+using MediaBrowser.Networking.Management;
 using MediaBrowser.Server.Uninstall;
 using MediaBrowser.ServerApplication.Implementations;
 using Microsoft.Win32;
@@ -513,9 +516,10 @@ namespace MediaBrowser.ServerApplication
 
             IsoManager = new PismoIsoManager(Logger);
 
-            Register<IIsoManager>(IsoManager);
+            Register(IsoManager);
             Register<IBlurayExaminer>(new BdInfoExaminer());
             Register<IZipClient>(new DotNetZipClient());
+            Register(typeof (INetworkManager), typeof (NetworkManager));
         }
 
         /// <summary>
@@ -573,5 +577,15 @@ namespace MediaBrowser.ServerApplication
             }
             return (T)result.GetInstance();
         }
+
+        /// <summary>
+        /// Registers the specified service type.
+        /// </summary>
+        /// <param name="serviceType">Type of the service.</param>
+        /// <param name="implementation">Type of the concrete.</param>
+        public void Register(Type serviceType, Type implementation)
+        {
+            _container.Register(serviceType, implementation);
+        }
     }
 }
diff --git a/MediaBrowser.ServerApplication/Implementations/BdInfoExaminer.cs b/MediaBrowser.ServerApplication/Implementations/BdInfoExaminer.cs
deleted file mode 100644
index dbde630bed..0000000000
--- a/MediaBrowser.ServerApplication/Implementations/BdInfoExaminer.cs
+++ /dev/null
@@ -1,170 +0,0 @@
-using BDInfo;
-using MediaBrowser.Model.Entities;
-using MediaBrowser.Model.MediaInfo;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-
-namespace MediaBrowser.ServerApplication.Implementations
-{
-    /// <summary>
-    /// Class BdInfoExaminer
-    /// </summary>
-    public class BdInfoExaminer : IBlurayExaminer
-    {
-        /// <summary>
-        /// Gets the disc info.
-        /// </summary>
-        /// <param name="path">The path.</param>
-        /// <returns>BlurayDiscInfo.</returns>
-        public BlurayDiscInfo GetDiscInfo(string path)
-        {
-            var bdrom = new BDROM(path);
-
-            bdrom.Scan();
-
-            // Get the longest playlist
-            var playlist = bdrom.PlaylistFiles.Values.OrderByDescending(p => p.TotalLength).FirstOrDefault(p => p.IsValid);
-
-            var outputStream = new BlurayDiscInfo
-            {
-                MediaStreams = new List<MediaStream>()
-            };
-
-            if (playlist == null)
-            {
-                return outputStream;
-            }
-
-            outputStream.Chapters = playlist.Chapters;
-
-            outputStream.RunTimeTicks = TimeSpan.FromSeconds(playlist.TotalLength).Ticks;
-
-            var mediaStreams = new List<MediaStream> { };
-
-            foreach (var stream in playlist.SortedStreams)
-            {
-                var videoStream = stream as TSVideoStream;
-
-                if (videoStream != null)
-                {
-                    AddVideoStream(mediaStreams, videoStream);
-                    continue;
-                }
-
-                var audioStream = stream as TSAudioStream;
-
-                if (audioStream != null)
-                {
-                    AddAudioStream(mediaStreams, audioStream);
-                    continue;
-                }
-
-                var textStream = stream as TSTextStream;
-
-                if (textStream != null)
-                {
-                    AddSubtitleStream(mediaStreams, textStream);
-                    continue;
-                }
-
-                var graphicsStream = stream as TSGraphicsStream;
-
-                if (graphicsStream != null)
-                {
-                    AddSubtitleStream(mediaStreams, graphicsStream);
-                }
-            }
-
-            outputStream.MediaStreams = mediaStreams;
-
-            if (playlist.StreamClips != null && playlist.StreamClips.Any())
-            {
-                // Get the files in the playlist
-                outputStream.Files = playlist.StreamClips.Select(i => i.StreamFile.Name).ToList();
-            }
-
-            return outputStream;
-        }
-
-        /// <summary>
-        /// Adds the video stream.
-        /// </summary>
-        /// <param name="streams">The streams.</param>
-        /// <param name="videoStream">The video stream.</param>
-        private void AddVideoStream(List<MediaStream> streams, TSVideoStream videoStream)
-        {
-            var mediaStream = new MediaStream
-                {
-                    BitRate = Convert.ToInt32(videoStream.BitRate),
-                    Width = videoStream.Width,
-                    Height = videoStream.Height,
-                    Codec = videoStream.CodecShortName,
-                    ScanType = videoStream.IsInterlaced ? "interlaced" : "progressive",
-                    Type = MediaStreamType.Video,
-                    Index = streams.Count
-                };
-
-            if (videoStream.FrameRateDenominator > 0)
-            {
-                float frameRateEnumerator = videoStream.FrameRateEnumerator;
-                float frameRateDenominator = videoStream.FrameRateDenominator;
-
-                mediaStream.AverageFrameRate = mediaStream.RealFrameRate = frameRateEnumerator / frameRateDenominator;
-            }
-
-            streams.Add(mediaStream);
-        }
-
-        /// <summary>
-        /// Adds the audio stream.
-        /// </summary>
-        /// <param name="streams">The streams.</param>
-        /// <param name="audioStream">The audio stream.</param>
-        private void AddAudioStream(List<MediaStream> streams, TSAudioStream audioStream)
-        {
-            streams.Add(new MediaStream
-                {
-                    BitRate = Convert.ToInt32(audioStream.BitRate),
-                    Codec = audioStream.CodecShortName,
-                    Language = audioStream.LanguageCode,
-                    Channels = audioStream.ChannelCount,
-                    SampleRate = audioStream.SampleRate,
-                    Type = MediaStreamType.Audio,
-                    Index = streams.Count
-                });
-        }
-
-        /// <summary>
-        /// Adds the subtitle stream.
-        /// </summary>
-        /// <param name="streams">The streams.</param>
-        /// <param name="textStream">The text stream.</param>
-        private void AddSubtitleStream(List<MediaStream> streams, TSTextStream textStream)
-        {
-            streams.Add(new MediaStream
-                {
-                    Language = textStream.LanguageCode,
-                    Codec = textStream.CodecShortName,
-                    Type = MediaStreamType.Subtitle,
-                    Index = streams.Count
-                });
-        }
-
-        /// <summary>
-        /// Adds the subtitle stream.
-        /// </summary>
-        /// <param name="streams">The streams.</param>
-        /// <param name="textStream">The text stream.</param>
-        private void AddSubtitleStream(List<MediaStream> streams, TSGraphicsStream textStream)
-        {
-            streams.Add(new MediaStream
-                {
-                    Language = textStream.LanguageCode,
-                    Codec = textStream.CodecShortName,
-                    Type = MediaStreamType.Subtitle,
-                    Index = streams.Count
-                });
-        }
-    }
-}
diff --git a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj
index 9f9b87b052..9b27351a16 100644
--- a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj
+++ b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj
@@ -196,7 +196,6 @@
     <Compile Include="Controls\MultiItemUpdateNotification.xaml.cs">
       <DependentUpon>MultiItemUpdateNotification.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Implementations\BdInfoExaminer.cs" />
     <Compile Include="Implementations\DotNetZipClient.cs" />
     <Compile Include="LibraryExplorer.xaml.cs">
       <DependentUpon>LibraryExplorer.xaml</DependentUpon>
@@ -270,6 +269,10 @@
       <Project>{7eeeb4bb-f3e8-48fc-b4c5-70f0fff8329b}</Project>
       <Name>MediaBrowser.Model</Name>
     </ProjectReference>
+    <ProjectReference Include="..\MediaBrowser.Networking\MediaBrowser.Networking.csproj">
+      <Project>{7c11010e-179a-49b7-bfb2-f1656f5e71ad}</Project>
+      <Name>MediaBrowser.Networking</Name>
+    </ProjectReference>
     <ProjectReference Include="..\MediaBrowser.Server.Uninstall\MediaBrowser.Server.Uninstall.csproj">
       <Project>{5443422f-9548-417a-90dd-2fc91f2b5999}</Project>
       <Name>MediaBrowser.Server.Uninstall</Name>
-- 
cgit v1.2.3