From 28ccfb1bd17eceb683d428d1c0e2d2ea52a2f7ff Mon Sep 17 00:00:00 2001
From: LukePulverenti <luke.pulverenti@gmail.com>
Date: Sun, 24 Feb 2013 19:13:45 -0500
Subject: extracted httpclient dependancy

---
 .../BaseApplicationPaths.cs                        |   5 +-
 .../MediaBrowser.Common.Implementations.csproj     |   6 +
 MediaBrowser.Common/Kernel/BaseKernel.cs           |  22 -
 .../Kernel/BasePeriodicWebSocketListener.cs        |   1 -
 MediaBrowser.Common/Kernel/TcpManager.cs           |   3 +-
 MediaBrowser.Common/MediaBrowser.Common.csproj     |   7 +-
 MediaBrowser.Common/Net/HttpManager.cs             | 481 ------------------
 MediaBrowser.Common/Net/IHttpClient.cs             |  61 +++
 MediaBrowser.Common/Net/INetworkManager.cs         |   2 +-
 MediaBrowser.Common/Net/IWebSocket.cs              |   1 -
 MediaBrowser.Common/Net/MimeTypes.cs               |   2 +-
 .../Net/WebSocketConnectEventArgs.cs               |   1 -
 MediaBrowser.Common/Net/WebSocketConnection.cs     |   5 +-
 MediaBrowser.Common/Net/WebSocketMessageType.cs    |  22 +
 MediaBrowser.Common/Net/WebSocketState.cs          |  38 ++
 .../ScheduledTasks/ScheduledTaskHelpers.cs         |   3 +-
 .../Plugins/PluginSecurityManager.cs               |   5 +-
 .../Providers/Movies/FanArtMovieProvider.cs        |  27 +-
 .../Providers/Movies/MovieDbProvider.cs            |  45 +-
 .../Providers/Movies/MovieProviderFromJson.cs      |   5 +-
 .../Providers/Movies/PersonProviderFromJson.cs     |   6 +-
 .../Providers/Movies/TmdbPersonProvider.cs         |  27 +-
 .../Providers/ProviderManager.cs                   |  15 +-
 .../Providers/TV/FanArtTVProvider.cs               |  27 +-
 .../Providers/TV/RemoteEpisodeProvider.cs          |  22 +-
 .../Providers/TV/RemoteSeasonProvider.cs           |  22 +-
 .../Providers/TV/RemoteSeriesProvider.cs           |  24 +-
 .../Updates/InstallationManager.cs                 |  25 +-
 MediaBrowser.Networking/HttpManager/HttpManager.cs | 482 ++++++++++++++++++
 MediaBrowser.Networking/HttpServer/HttpServer.cs   | 554 +++++++++++++++++++++
 .../HttpServer/NativeWebSocket.cs                  | 165 ++++++
 .../HttpServer/ServerFactory.cs                    |  28 ++
 .../MediaBrowser.Networking.csproj                 |  11 +-
 MediaBrowser.Networking/Web/HttpServer.cs          | 554 ---------------------
 MediaBrowser.Networking/Web/NativeWebSocket.cs     | 145 ------
 MediaBrowser.Networking/Web/ServerFactory.cs       |  28 --
 .../WebSocket/AlchemyWebSocket.cs                  |   1 -
 .../WorldWeatherOnline/WeatherProvider.cs          |  18 +-
 MediaBrowser.ServerApplication/ApplicationHost.cs  |  25 +-
 .../MediaBrowser.ServerApplication.csproj          |   9 -
 Nuget/MediaBrowser.ApiClient.nuspec                |   6 +-
 Nuget/MediaBrowser.Common.Internal.nuspec          |  13 +-
 Nuget/MediaBrowser.Common.nuspec                   |   2 +-
 Nuget/MediaBrowser.Server.Core.nuspec              |   4 +-
 44 files changed, 1598 insertions(+), 1357 deletions(-)
 delete mode 100644 MediaBrowser.Common/Net/HttpManager.cs
 create mode 100644 MediaBrowser.Common/Net/IHttpClient.cs
 create mode 100644 MediaBrowser.Common/Net/WebSocketMessageType.cs
 create mode 100644 MediaBrowser.Common/Net/WebSocketState.cs
 create mode 100644 MediaBrowser.Networking/HttpManager/HttpManager.cs
 create mode 100644 MediaBrowser.Networking/HttpServer/HttpServer.cs
 create mode 100644 MediaBrowser.Networking/HttpServer/NativeWebSocket.cs
 create mode 100644 MediaBrowser.Networking/HttpServer/ServerFactory.cs
 delete mode 100644 MediaBrowser.Networking/Web/HttpServer.cs
 delete mode 100644 MediaBrowser.Networking/Web/NativeWebSocket.cs
 delete mode 100644 MediaBrowser.Networking/Web/ServerFactory.cs

diff --git a/MediaBrowser.Common.Implementations/BaseApplicationPaths.cs b/MediaBrowser.Common.Implementations/BaseApplicationPaths.cs
index 93478b22c..f38013d00 100644
--- a/MediaBrowser.Common.Implementations/BaseApplicationPaths.cs
+++ b/MediaBrowser.Common.Implementations/BaseApplicationPaths.cs
@@ -1,4 +1,5 @@
-using System;
+using MediaBrowser.Common.Kernel;
+using System;
 using System.Configuration;
 using System.IO;
 using System.Reflection;
@@ -9,7 +10,7 @@ namespace MediaBrowser.Common.Implementations
     /// Provides a base class to hold common application paths used by both the Ui and Server.
     /// This can be subclassed to add application-specific paths.
     /// </summary>
-    public abstract class BaseApplicationPaths
+    public abstract class BaseApplicationPaths : IApplicationPaths
     {
         /// <summary>
         /// The _program data path
diff --git a/MediaBrowser.Common.Implementations/MediaBrowser.Common.Implementations.csproj b/MediaBrowser.Common.Implementations/MediaBrowser.Common.Implementations.csproj
index d271db060..736a15d42 100644
--- a/MediaBrowser.Common.Implementations/MediaBrowser.Common.Implementations.csproj
+++ b/MediaBrowser.Common.Implementations/MediaBrowser.Common.Implementations.csproj
@@ -31,6 +31,9 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup>
+    <RunPostBuildEvent>Always</RunPostBuildEvent>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="protobuf-net">
       <HintPath>..\packages\protobuf-net.2.0.0.621\lib\net40\protobuf-net.dll</HintPath>
@@ -77,6 +80,9 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
+  <PropertyGroup>
+    <PostBuildEvent>xcopy "$(TargetPath)" "$(SolutionDir)\Nuget\dlls\" /y /d /r /i</PostBuildEvent>
+  </PropertyGroup>
   <!-- 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.
   <Target Name="BeforeBuild">
diff --git a/MediaBrowser.Common/Kernel/BaseKernel.cs b/MediaBrowser.Common/Kernel/BaseKernel.cs
index a5a9b46ec..50dca1e4c 100644
--- a/MediaBrowser.Common/Kernel/BaseKernel.cs
+++ b/MediaBrowser.Common/Kernel/BaseKernel.cs
@@ -171,12 +171,6 @@ namespace MediaBrowser.Common.Kernel
         /// <value>The web socket listeners.</value>
         public IEnumerable<IWebSocketListener> WebSocketListeners { get; private set; }
 
-        /// <summary>
-        /// The _HTTP manager
-        /// </summary>
-        /// <value>The HTTP manager.</value>
-        public HttpManager HttpManager { get; private set; }
-
         /// <summary>
         /// Gets or sets the TCP manager.
         /// </summary>
@@ -323,9 +317,6 @@ namespace MediaBrowser.Common.Kernel
 
             Logger.Info("Version {0} initializing", ApplicationVersion);
 
-            DisposeHttpManager();
-            HttpManager = new HttpManager(this, Logger);
-
             await OnConfigurationLoaded().ConfigureAwait(false);
 
             FindParts();
@@ -422,7 +413,6 @@ namespace MediaBrowser.Common.Kernel
             if (dispose)
             {
                 DisposeTcpManager();
-                DisposeHttpManager();
             }
         }
 
@@ -438,18 +428,6 @@ namespace MediaBrowser.Common.Kernel
             }
         }
 
-        /// <summary>
-        /// Disposes the HTTP manager.
-        /// </summary>
-        private void DisposeHttpManager()
-        {
-            if (HttpManager != null)
-            {
-                HttpManager.Dispose();
-                HttpManager = null;
-            }
-        }
-
         /// <summary>
         /// Gets the current application version
         /// </summary>
diff --git a/MediaBrowser.Common/Kernel/BasePeriodicWebSocketListener.cs b/MediaBrowser.Common/Kernel/BasePeriodicWebSocketListener.cs
index 0f20758d4..5374bb714 100644
--- a/MediaBrowser.Common/Kernel/BasePeriodicWebSocketListener.cs
+++ b/MediaBrowser.Common/Kernel/BasePeriodicWebSocketListener.cs
@@ -3,7 +3,6 @@ using MediaBrowser.Model.Logging;
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Net.WebSockets;
 using System.Threading;
 using System.Threading.Tasks;
 
diff --git a/MediaBrowser.Common/Kernel/TcpManager.cs b/MediaBrowser.Common/Kernel/TcpManager.cs
index c04b77599..6ea390904 100644
--- a/MediaBrowser.Common/Kernel/TcpManager.cs
+++ b/MediaBrowser.Common/Kernel/TcpManager.cs
@@ -8,7 +8,6 @@ using System.IO;
 using System.Linq;
 using System.Net;
 using System.Net.Sockets;
-using System.Net.WebSockets;
 using System.Reflection;
 using System.Text;
 using System.Threading;
@@ -39,7 +38,7 @@ namespace MediaBrowser.Common.Kernel
         /// Gets or sets the json serializer.
         /// </summary>
         /// <value>The json serializer.</value>
-        private IJsonSerializer _jsonSerializer;
+        private readonly IJsonSerializer _jsonSerializer;
         
         /// <summary>
         /// This subscribes to HttpListener requests and finds the appropriate BaseHandler to process it
diff --git a/MediaBrowser.Common/MediaBrowser.Common.csproj b/MediaBrowser.Common/MediaBrowser.Common.csproj
index f9147141d..dd73e8877 100644
--- a/MediaBrowser.Common/MediaBrowser.Common.csproj
+++ b/MediaBrowser.Common/MediaBrowser.Common.csproj
@@ -72,9 +72,6 @@
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="System.Net" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Net.Http.WebRequest" />
     <Reference Include="System.Web" />
     <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
@@ -102,7 +99,7 @@
     <Compile Include="Net\Handlers\BaseActionHandler.cs" />
     <Compile Include="Net\Handlers\IHttpServerHandler.cs" />
     <Compile Include="Net\Handlers\StaticFileHandler.cs" />
-    <Compile Include="Net\HttpManager.cs" />
+    <Compile Include="Net\IHttpClient.cs" />
     <Compile Include="Net\IHttpServer.cs" />
     <Compile Include="Net\INetworkManager.cs" />
     <Compile Include="Net\IRestfulService.cs" />
@@ -113,6 +110,8 @@
     <Compile Include="Net\UdpMessageReceivedEventArgs.cs" />
     <Compile Include="Net\WebSocketConnectEventArgs.cs" />
     <Compile Include="Net\WebSocketConnection.cs" />
+    <Compile Include="Net\WebSocketMessageType.cs" />
+    <Compile Include="Net\WebSocketState.cs" />
     <Compile Include="Plugins\BaseUiPlugin.cs" />
     <Compile Include="Plugins\IPlugin.cs" />
     <Compile Include="Plugins\IUIPlugin.cs" />
diff --git a/MediaBrowser.Common/Net/HttpManager.cs b/MediaBrowser.Common/Net/HttpManager.cs
deleted file mode 100644
index 180843e0f..000000000
--- a/MediaBrowser.Common/Net/HttpManager.cs
+++ /dev/null
@@ -1,481 +0,0 @@
-using MediaBrowser.Common.IO;
-using MediaBrowser.Common.Kernel;
-using MediaBrowser.Model.Logging;
-using MediaBrowser.Model.Net;
-using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Net;
-using System.Net.Cache;
-using System.Net.Http;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace MediaBrowser.Common.Net
-{
-    /// <summary>
-    /// Class HttpManager
-    /// </summary>
-    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)
-        {
-            if (kernel == null)
-            {
-                throw new ArgumentNullException("kernel");
-            }
-            if (logger == null)
-            {
-                throw new ArgumentNullException("logger");
-            }
-            
-            _logger = logger;
-            _kernel = kernel;
-        }
-
-        /// <summary>
-        /// Holds a dictionary of http clients by host.  Use GetHttpClient(host) to retrieve or create a client for web requests.
-        /// DON'T dispose it after use.
-        /// </summary>
-        /// <value>The HTTP clients.</value>
-        private readonly ConcurrentDictionary<string, HttpClient> _httpClients = new ConcurrentDictionary<string, HttpClient>();
-
-        /// <summary>
-        /// Gets
-        /// </summary>
-        /// <param name="host">The host.</param>
-        /// <returns>HttpClient.</returns>
-        /// <exception cref="System.ArgumentNullException">host</exception>
-        private HttpClient GetHttpClient(string host)
-        {
-            if (string.IsNullOrEmpty(host))
-            {
-                throw new ArgumentNullException("host");
-            }
-
-            HttpClient client;
-            if (!_httpClients.TryGetValue(host, out client))
-            {
-                var handler = new WebRequestHandler
-                {
-                    AutomaticDecompression = DecompressionMethods.Deflate,
-                    CachePolicy = new RequestCachePolicy(RequestCacheLevel.Revalidate)
-                };
-
-                client = new HttpClient(handler);
-                client.DefaultRequestHeaders.Add("Accept", "application/json,image/*");
-                client.Timeout = TimeSpan.FromSeconds(15);
-                _httpClients.TryAdd(host, client);
-            }
-
-            return client;
-        }
-
-        /// <summary>
-        /// Performs a GET request and returns the resulting stream
-        /// </summary>
-        /// <param name="url">The URL.</param>
-        /// <param name="resourcePool">The resource pool.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        /// <returns>Task{Stream}.</returns>
-        /// <exception cref="MediaBrowser.Model.Net.HttpException"></exception>
-        public async Task<Stream> Get(string url, SemaphoreSlim resourcePool, CancellationToken cancellationToken)
-        {
-            ValidateParams(url, resourcePool, cancellationToken);
-
-            cancellationToken.ThrowIfCancellationRequested();
-
-            await resourcePool.WaitAsync(cancellationToken).ConfigureAwait(false);
-
-            _logger.Info("HttpManager.Get url: {0}", url);
-
-            try
-            {
-                cancellationToken.ThrowIfCancellationRequested();
-
-                var msg = await GetHttpClient(GetHostFromUrl(url)).GetAsync(url, cancellationToken).ConfigureAwait(false);
-
-                EnsureSuccessStatusCode(msg);
-
-                return await msg.Content.ReadAsStreamAsync().ConfigureAwait(false);
-            }
-            catch (OperationCanceledException ex)
-            {
-                throw GetCancellationException(url, cancellationToken, ex);
-            }
-            catch (HttpRequestException ex)
-            {
-                _logger.ErrorException("Error getting response from " + url, ex);
-
-                throw new HttpException(ex.Message, ex);
-            }
-            finally
-            {
-                resourcePool.Release();
-            }
-        }
-
-        /// <summary>
-        /// Performs a POST request
-        /// </summary>
-        /// <param name="url">The URL.</param>
-        /// <param name="postData">Params to add to the POST data.</param>
-        /// <param name="resourcePool">The resource pool.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        /// <returns>stream on success, null on failure</returns>
-        /// <exception cref="System.ArgumentNullException">postData</exception>
-        /// <exception cref="MediaBrowser.Model.Net.HttpException"></exception>
-        public async Task<Stream> Post(string url, Dictionary<string, string> postData, SemaphoreSlim resourcePool, CancellationToken cancellationToken)
-        {
-            ValidateParams(url, resourcePool, cancellationToken);
-
-            if (postData == null)
-            {
-                throw new ArgumentNullException("postData");
-            }
-
-            cancellationToken.ThrowIfCancellationRequested();
-
-            var strings = postData.Keys.Select(key => string.Format("{0}={1}", key, postData[key]));
-            var postContent = string.Join("&", strings.ToArray());
-            var content = new StringContent(postContent, Encoding.UTF8, "application/x-www-form-urlencoded");
-
-            await resourcePool.WaitAsync(cancellationToken).ConfigureAwait(false);
-
-            _logger.Info("HttpManager.Post url: {0}", url);
-
-            try
-            {
-                cancellationToken.ThrowIfCancellationRequested();
-
-                var msg = await GetHttpClient(GetHostFromUrl(url)).PostAsync(url, content, cancellationToken).ConfigureAwait(false);
-
-                EnsureSuccessStatusCode(msg);
-
-                return await msg.Content.ReadAsStreamAsync().ConfigureAwait(false);
-            }
-            catch (OperationCanceledException ex)
-            {
-                throw GetCancellationException(url, cancellationToken, ex);
-            }
-            catch (HttpRequestException ex)
-            {
-                _logger.ErrorException("Error getting response from " + url, ex);
-
-                throw new HttpException(ex.Message, ex);
-            }
-            finally
-            {
-                resourcePool.Release();
-            }
-        }
-
-        /// <summary>
-        /// Downloads the contents of a given url into a temporary location
-        /// </summary>
-        /// <param name="url">The URL.</param>
-        /// <param name="resourcePool">The resource pool.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        /// <param name="progress">The progress.</param>
-        /// <param name="userAgent">The user agent.</param>
-        /// <returns>Task{System.String}.</returns>
-        /// <exception cref="System.ArgumentNullException">progress</exception>
-        /// <exception cref="MediaBrowser.Model.Net.HttpException"></exception>
-        public async Task<string> FetchToTempFile(string url, SemaphoreSlim resourcePool, CancellationToken cancellationToken, IProgress<double> progress, string userAgent = null)
-        {
-            ValidateParams(url, resourcePool, cancellationToken);
-
-            if (progress == null)
-            {
-                throw new ArgumentNullException("progress");
-            }
-
-            cancellationToken.ThrowIfCancellationRequested();
-
-            var tempFile = Path.Combine(_kernel.ApplicationPaths.TempDirectory, Guid.NewGuid() + ".tmp");
-
-            var message = new HttpRequestMessage(HttpMethod.Get, url);
-
-            if (!string.IsNullOrEmpty(userAgent))
-            {
-                message.Headers.Add("User-Agent", userAgent);
-            }
-
-            await resourcePool.WaitAsync(cancellationToken).ConfigureAwait(false);
-
-            _logger.Info("HttpManager.FetchToTempFile url: {0}, temp file: {1}", url, tempFile);
-
-            try
-            {
-                cancellationToken.ThrowIfCancellationRequested();
-
-                using (var response = await GetHttpClient(GetHostFromUrl(url)).SendAsync(message, HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false))
-                {
-                    EnsureSuccessStatusCode(response);
-
-                    cancellationToken.ThrowIfCancellationRequested();
-
-                    IEnumerable<string> lengthValues;
-
-                    if (!response.Headers.TryGetValues("content-length", out lengthValues) &&
-                        !response.Content.Headers.TryGetValues("content-length", out lengthValues))
-                    {
-                        // We're not able to track progress
-                        using (var stream = await response.Content.ReadAsStreamAsync().ConfigureAwait(false))
-                        {
-                            using (var fs = new FileStream(tempFile, FileMode.Create, FileAccess.Write, FileShare.Read, StreamDefaults.DefaultFileStreamBufferSize, FileOptions.Asynchronous))
-                            {
-                                await stream.CopyToAsync(fs, StreamDefaults.DefaultCopyToBufferSize, cancellationToken).ConfigureAwait(false);
-                            }
-                        }
-                    }
-                    else
-                    {
-                        var length = long.Parse(string.Join(string.Empty, lengthValues.ToArray()));
-
-                        using (var stream = ProgressStream.CreateReadProgressStream(await response.Content.ReadAsStreamAsync().ConfigureAwait(false), progress.Report, length))
-                        {
-                            using (var fs = new FileStream(tempFile, FileMode.Create, FileAccess.Write, FileShare.Read, StreamDefaults.DefaultFileStreamBufferSize, FileOptions.Asynchronous))
-                            {
-                                await stream.CopyToAsync(fs, StreamDefaults.DefaultCopyToBufferSize, cancellationToken).ConfigureAwait(false);
-                            }
-                        }
-                    }
-
-                    progress.Report(100);
-
-                    cancellationToken.ThrowIfCancellationRequested();
-                }
-
-                return tempFile;
-            }
-            catch (OperationCanceledException ex)
-            {
-                // Cleanup
-                if (File.Exists(tempFile))
-                {
-                    File.Delete(tempFile);
-                }
-
-                throw GetCancellationException(url, cancellationToken, ex);
-            }
-            catch (HttpRequestException ex)
-            {
-                _logger.ErrorException("Error getting response from " + url, ex);
-
-                // Cleanup
-                if (File.Exists(tempFile))
-                {
-                    File.Delete(tempFile);
-                }
-
-                throw new HttpException(ex.Message, ex);
-            }
-            catch (Exception ex)
-            {
-                _logger.ErrorException("Error getting response from " + url, ex);
-
-                // Cleanup
-                if (File.Exists(tempFile))
-                {
-                    File.Delete(tempFile);
-                }
-
-                throw;
-            }
-            finally
-            {
-                resourcePool.Release();
-            }
-        }
-
-        /// <summary>
-        /// Downloads the contents of a given url into a MemoryStream
-        /// </summary>
-        /// <param name="url">The URL.</param>
-        /// <param name="resourcePool">The resource pool.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        /// <returns>Task{MemoryStream}.</returns>
-        /// <exception cref="MediaBrowser.Model.Net.HttpException"></exception>
-        public async Task<MemoryStream> FetchToMemoryStream(string url, SemaphoreSlim resourcePool, CancellationToken cancellationToken)
-        {
-            ValidateParams(url, resourcePool, cancellationToken);
-
-            cancellationToken.ThrowIfCancellationRequested();
-
-            var message = new HttpRequestMessage(HttpMethod.Get, url);
-
-            await resourcePool.WaitAsync(cancellationToken).ConfigureAwait(false);
-
-            var ms = new MemoryStream();
-
-            _logger.Info("HttpManager.FetchToMemoryStream url: {0}", url);
-
-            try
-            {
-                cancellationToken.ThrowIfCancellationRequested();
-
-                using (var response = await GetHttpClient(GetHostFromUrl(url)).SendAsync(message, HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false))
-                {
-                    EnsureSuccessStatusCode(response);
-
-                    cancellationToken.ThrowIfCancellationRequested();
-
-                    using (var stream = await response.Content.ReadAsStreamAsync().ConfigureAwait(false))
-                    {
-                        await stream.CopyToAsync(ms, StreamDefaults.DefaultCopyToBufferSize, cancellationToken).ConfigureAwait(false);
-                    }
-
-                    cancellationToken.ThrowIfCancellationRequested();
-                }
-
-                ms.Position = 0;
-
-                return ms;
-            }
-            catch (OperationCanceledException ex)
-            {
-                ms.Dispose();
-
-                throw GetCancellationException(url, cancellationToken, ex);
-            }
-            catch (HttpRequestException ex)
-            {
-                _logger.ErrorException("Error getting response from " + url, ex);
-
-                ms.Dispose();
-
-                throw new HttpException(ex.Message, ex);
-            }
-            catch (Exception ex)
-            {
-                _logger.ErrorException("Error getting response from " + url, ex);
-
-                ms.Dispose();
-
-                throw;
-            }
-            finally
-            {
-                resourcePool.Release();
-            }
-        }
-
-        /// <summary>
-        /// Validates the params.
-        /// </summary>
-        /// <param name="url">The URL.</param>
-        /// <param name="resourcePool">The resource pool.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        /// <exception cref="System.ArgumentNullException">url</exception>
-        private void ValidateParams(string url, SemaphoreSlim resourcePool, CancellationToken cancellationToken)
-        {
-            if (string.IsNullOrEmpty(url))
-            {
-                throw new ArgumentNullException("url");
-            }
-
-            if (resourcePool == null)
-            {
-                throw new ArgumentNullException("resourcePool");
-            }
-
-            if (cancellationToken == null)
-            {
-                throw new ArgumentNullException("cancellationToken");
-            }
-        }
-
-        /// <summary>
-        /// Gets the host from URL.
-        /// </summary>
-        /// <param name="url">The URL.</param>
-        /// <returns>System.String.</returns>
-        private string GetHostFromUrl(string url)
-        {
-            var start = url.IndexOf("://", StringComparison.OrdinalIgnoreCase) + 3;
-            var len = url.IndexOf('/', start) - start;
-            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 virtual void Dispose(bool dispose)
-        {
-            if (dispose)
-            {
-                foreach (var client in _httpClients.Values.ToList())
-                {
-                    client.Dispose();
-                }
-
-                _httpClients.Clear();
-            }
-        }
-
-        /// <summary>
-        /// Throws the cancellation exception.
-        /// </summary>
-        /// <param name="url">The URL.</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        /// <param name="exception">The exception.</param>
-        /// <returns>Exception.</returns>
-        private Exception GetCancellationException(string url, CancellationToken cancellationToken, OperationCanceledException exception)
-        {
-            // If the HttpClient's timeout is reached, it will cancel the Task internally
-            if (!cancellationToken.IsCancellationRequested)
-            {
-                var msg = string.Format("Connection to {0} timed out", url);
-
-                _logger.Error(msg);
-
-                // Throw an HttpException so that the caller doesn't think it was cancelled by user code
-                return new HttpException(msg, exception) { IsTimedOut = true };
-            }
-
-            return exception;
-        }
-
-        /// <summary>
-        /// Ensures the success status code.
-        /// </summary>
-        /// <param name="response">The response.</param>
-        /// <exception cref="MediaBrowser.Model.Net.HttpException"></exception>
-        private void EnsureSuccessStatusCode(HttpResponseMessage response)
-        {
-            if (!response.IsSuccessStatusCode)
-            {
-                throw new HttpException(response.ReasonPhrase) { StatusCode = response.StatusCode };
-            }
-        }
-    }
-}
diff --git a/MediaBrowser.Common/Net/IHttpClient.cs b/MediaBrowser.Common/Net/IHttpClient.cs
new file mode 100644
index 000000000..ef0dd69b7
--- /dev/null
+++ b/MediaBrowser.Common/Net/IHttpClient.cs
@@ -0,0 +1,61 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace MediaBrowser.Common.Net
+{
+    public interface IHttpClient : IDisposable
+    {
+        /// <summary>
+        /// Performs a GET request and returns the resulting stream
+        /// </summary>
+        /// <param name="url">The URL.</param>
+        /// <param name="resourcePool">The resource pool.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        /// <returns>Task{Stream}.</returns>
+        /// <exception cref="MediaBrowser.Model.Net.HttpException"></exception>
+        Task<Stream> Get(string url, SemaphoreSlim resourcePool, CancellationToken cancellationToken);
+
+        /// <summary>
+        /// Performs a POST request
+        /// </summary>
+        /// <param name="url">The URL.</param>
+        /// <param name="postData">Params to add to the POST data.</param>
+        /// <param name="resourcePool">The resource pool.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        /// <returns>stream on success, null on failure</returns>
+        /// <exception cref="System.ArgumentNullException">postData</exception>
+        /// <exception cref="MediaBrowser.Model.Net.HttpException"></exception>
+        Task<Stream> Post(string url, Dictionary<string, string> postData, SemaphoreSlim resourcePool, CancellationToken cancellationToken);
+
+        /// <summary>
+        /// Downloads the contents of a given url into a temporary location
+        /// </summary>
+        /// <param name="url">The URL.</param>
+        /// <param name="resourcePool">The resource pool.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        /// <param name="progress">The progress.</param>
+        /// <param name="userAgent">The user agent.</param>
+        /// <returns>Task{System.String}.</returns>
+        /// <exception cref="System.ArgumentNullException">progress</exception>
+        /// <exception cref="MediaBrowser.Model.Net.HttpException"></exception>
+        Task<string> GetTempFile(string url, SemaphoreSlim resourcePool, CancellationToken cancellationToken, IProgress<double> progress, string userAgent = null);
+
+        /// <summary>
+        /// Downloads the contents of a given url into a MemoryStream
+        /// </summary>
+        /// <param name="url">The URL.</param>
+        /// <param name="resourcePool">The resource pool.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        /// <returns>Task{MemoryStream}.</returns>
+        /// <exception cref="MediaBrowser.Model.Net.HttpException"></exception>
+        Task<MemoryStream> GetMemoryStream(string url, SemaphoreSlim resourcePool, CancellationToken cancellationToken);
+
+        /// <summary>
+        /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
+        /// </summary>
+        void Dispose();
+    }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Common/Net/INetworkManager.cs b/MediaBrowser.Common/Net/INetworkManager.cs
index 7f6bfe152..782855cd1 100644
--- a/MediaBrowser.Common/Net/INetworkManager.cs
+++ b/MediaBrowser.Common/Net/INetworkManager.cs
@@ -1,5 +1,5 @@
-using System.Collections.Generic;
 using MediaBrowser.Model.Net;
+using System.Collections.Generic;
 
 namespace MediaBrowser.Common.Net
 {
diff --git a/MediaBrowser.Common/Net/IWebSocket.cs b/MediaBrowser.Common/Net/IWebSocket.cs
index 3fd4b1241..9c9bcb41d 100644
--- a/MediaBrowser.Common/Net/IWebSocket.cs
+++ b/MediaBrowser.Common/Net/IWebSocket.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Net.WebSockets;
 using System.Threading;
 using System.Threading.Tasks;
 
diff --git a/MediaBrowser.Common/Net/MimeTypes.cs b/MediaBrowser.Common/Net/MimeTypes.cs
index 8f980200e..b9d0347d7 100644
--- a/MediaBrowser.Common/Net/MimeTypes.cs
+++ b/MediaBrowser.Common/Net/MimeTypes.cs
@@ -200,7 +200,7 @@ namespace MediaBrowser.Common.Net
                 return "image/svg+xml";
             }
 
-            throw new InvalidOperationException("Argument not supported: " + path);
+            throw new ArgumentException("Argument not supported: " + path);
         }
     }
 }
diff --git a/MediaBrowser.Common/Net/WebSocketConnectEventArgs.cs b/MediaBrowser.Common/Net/WebSocketConnectEventArgs.cs
index 711da7a50..ce22c9520 100644
--- a/MediaBrowser.Common/Net/WebSocketConnectEventArgs.cs
+++ b/MediaBrowser.Common/Net/WebSocketConnectEventArgs.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Net;
 
 namespace MediaBrowser.Common.Net
 {
diff --git a/MediaBrowser.Common/Net/WebSocketConnection.cs b/MediaBrowser.Common/Net/WebSocketConnection.cs
index 6b22ef78e..36d649e3b 100644
--- a/MediaBrowser.Common/Net/WebSocketConnection.cs
+++ b/MediaBrowser.Common/Net/WebSocketConnection.cs
@@ -1,8 +1,7 @@
-using System.IO;
-using MediaBrowser.Model.Logging;
+using MediaBrowser.Model.Logging;
 using MediaBrowser.Model.Serialization;
 using System;
-using System.Net.WebSockets;
+using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
 
diff --git a/MediaBrowser.Common/Net/WebSocketMessageType.cs b/MediaBrowser.Common/Net/WebSocketMessageType.cs
new file mode 100644
index 000000000..3b12bc2b2
--- /dev/null
+++ b/MediaBrowser.Common/Net/WebSocketMessageType.cs
@@ -0,0 +1,22 @@
+
+namespace MediaBrowser.Common.Net
+{
+    /// <summary>
+    /// Enum WebSocketMessageType
+    /// </summary>
+    public enum WebSocketMessageType
+    {
+        /// <summary>
+        /// The text
+        /// </summary>
+        Text,
+        /// <summary>
+        /// The binary
+        /// </summary>
+        Binary,
+        /// <summary>
+        /// The close
+        /// </summary>
+        Close,
+    }
+}
diff --git a/MediaBrowser.Common/Net/WebSocketState.cs b/MediaBrowser.Common/Net/WebSocketState.cs
new file mode 100644
index 000000000..7f8ac3cbe
--- /dev/null
+++ b/MediaBrowser.Common/Net/WebSocketState.cs
@@ -0,0 +1,38 @@
+
+namespace MediaBrowser.Common.Net
+{
+    /// <summary>
+    /// Enum WebSocketState
+    /// </summary>
+    public enum WebSocketState
+    {
+        /// <summary>
+        /// The none
+        /// </summary>
+        None,
+        /// <summary>
+        /// The connecting
+        /// </summary>
+        Connecting,
+        /// <summary>
+        /// The open
+        /// </summary>
+        Open,
+        /// <summary>
+        /// The close sent
+        /// </summary>
+        CloseSent,
+        /// <summary>
+        /// The close received
+        /// </summary>
+        CloseReceived,
+        /// <summary>
+        /// The closed
+        /// </summary>
+        Closed,
+        /// <summary>
+        /// The aborted
+        /// </summary>
+        Aborted
+    }
+}
diff --git a/MediaBrowser.Common/ScheduledTasks/ScheduledTaskHelpers.cs b/MediaBrowser.Common/ScheduledTasks/ScheduledTaskHelpers.cs
index e67eb3626..2c3d21a4b 100644
--- a/MediaBrowser.Common/ScheduledTasks/ScheduledTaskHelpers.cs
+++ b/MediaBrowser.Common/ScheduledTasks/ScheduledTaskHelpers.cs
@@ -1,5 +1,4 @@
-using MediaBrowser.Common.Kernel;
-using MediaBrowser.Model.Tasks;
+using MediaBrowser.Model.Tasks;
 using System;
 using System.Linq;
 
diff --git a/MediaBrowser.Controller/Plugins/PluginSecurityManager.cs b/MediaBrowser.Controller/Plugins/PluginSecurityManager.cs
index 9accef621..a08eb457d 100644
--- a/MediaBrowser.Controller/Plugins/PluginSecurityManager.cs
+++ b/MediaBrowser.Controller/Plugins/PluginSecurityManager.cs
@@ -44,7 +44,10 @@ namespace MediaBrowser.Controller.Plugins
         /// </summary>
         private INetworkManager _networkManager;
 
-        private IKernel _kernel;
+        /// <summary>
+        /// The _kernel
+        /// </summary>
+        private readonly IKernel _kernel;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="PluginSecurityManager" /> class.
diff --git a/MediaBrowser.Controller/Providers/Movies/FanArtMovieProvider.cs b/MediaBrowser.Controller/Providers/Movies/FanArtMovieProvider.cs
index e833e4931..0a0b1110a 100644
--- a/MediaBrowser.Controller/Providers/Movies/FanArtMovieProvider.cs
+++ b/MediaBrowser.Controller/Providers/Movies/FanArtMovieProvider.cs
@@ -1,4 +1,5 @@
 using MediaBrowser.Common.Extensions;
+using MediaBrowser.Common.Net;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.Movies;
 using MediaBrowser.Model.Entities;
@@ -16,6 +17,22 @@ namespace MediaBrowser.Controller.Providers.Movies
     /// </summary>
     class FanArtMovieProvider : FanartBaseProvider
     {
+        /// <summary>
+        /// Gets the HTTP client.
+        /// </summary>
+        /// <value>The HTTP client.</value>
+        protected IHttpClient HttpClient { get; private set; }
+
+        public FanArtMovieProvider(IHttpClient httpClient)
+            : base()
+        {
+            if (httpClient == null)
+            {
+                throw new ArgumentNullException("httpClient");
+            }
+            HttpClient = httpClient;
+        }
+
         /// <summary>
         /// The fan art base URL
         /// </summary>
@@ -70,7 +87,7 @@ namespace MediaBrowser.Controller.Providers.Movies
 
                 try
                 {
-                    using (var xml = await Kernel.Instance.HttpManager.Get(url, Kernel.Instance.ResourcePools.FanArt, cancellationToken).ConfigureAwait(false))
+                    using (var xml = await HttpClient.Get(url, Kernel.Instance.ResourcePools.FanArt, cancellationToken).ConfigureAwait(false))
                     {
                         doc.Load(xml);
                     }
@@ -113,7 +130,7 @@ namespace MediaBrowser.Controller.Providers.Movies
                         }
                     }
                     cancellationToken.ThrowIfCancellationRequested();
-                    
+
                     if (Kernel.Instance.Configuration.DownloadMovieArt && !item.ResolveArgs.ContainsMetaFileByName(ART_FILE))
                     {
                         var node =
@@ -139,7 +156,7 @@ namespace MediaBrowser.Controller.Providers.Movies
                         }
                     }
                     cancellationToken.ThrowIfCancellationRequested();
-                    
+
                     if (Kernel.Instance.Configuration.DownloadMovieDisc && !item.ResolveArgs.ContainsMetaFileByName(DISC_FILE))
                     {
                         var node = doc.SelectSingleNode("//fanart/movie/moviediscs/moviedisc[@lang = \"" + language + "\"]/@url") ??
@@ -163,7 +180,7 @@ namespace MediaBrowser.Controller.Providers.Movies
                     }
 
                     cancellationToken.ThrowIfCancellationRequested();
-                    
+
                     if (Kernel.Instance.Configuration.DownloadMovieBanner && !item.ResolveArgs.ContainsMetaFileByName(BANNER_FILE))
                     {
                         var node = doc.SelectSingleNode("//fanart/movie/moviebanners/moviebanner[@lang = \"" + language + "\"]/@url") ??
@@ -187,7 +204,7 @@ namespace MediaBrowser.Controller.Providers.Movies
                     }
 
                     cancellationToken.ThrowIfCancellationRequested();
-                    
+
                     if (Kernel.Instance.Configuration.DownloadMovieThumb && !item.ResolveArgs.ContainsMetaFileByName(THUMB_FILE))
                     {
                         var node = doc.SelectSingleNode("//fanart/movie/moviethumbs/moviethumb[@lang = \"" + language + "\"]/@url") ??
diff --git a/MediaBrowser.Controller/Providers/Movies/MovieDbProvider.cs b/MediaBrowser.Controller/Providers/Movies/MovieDbProvider.cs
index bc261de6d..9bd28d1ad 100644
--- a/MediaBrowser.Controller/Providers/Movies/MovieDbProvider.cs
+++ b/MediaBrowser.Controller/Providers/Movies/MovieDbProvider.cs
@@ -1,4 +1,6 @@
-using MediaBrowser.Common.Extensions;
+using System.Net;
+using MediaBrowser.Common.Extensions;
+using MediaBrowser.Common.Net;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.Movies;
 using MediaBrowser.Model.Entities;
@@ -9,7 +11,6 @@ using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
 using System.Linq;
-using System.Net;
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading;
@@ -36,19 +37,31 @@ namespace MediaBrowser.Controller.Providers.Movies
         /// <value>The json serializer.</value>
         protected IJsonSerializer JsonSerializer { get; private set; }
 
+        /// <summary>
+        /// Gets the HTTP client.
+        /// </summary>
+        /// <value>The HTTP client.</value>
+        protected IHttpClient HttpClient { get; private set; }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="MovieDbProvider" /> class.
         /// </summary>
         /// <param name="jsonSerializer">The json serializer.</param>
+        /// <param name="httpClient">The HTTP client.</param>
         /// <exception cref="System.ArgumentNullException">jsonSerializer</exception>
-        public MovieDbProvider(IJsonSerializer jsonSerializer)
+        public MovieDbProvider(IJsonSerializer jsonSerializer, IHttpClient httpClient)
             : base()
         {
             if (jsonSerializer == null)
             {
                 throw new ArgumentNullException("jsonSerializer");
             }
+            if (httpClient == null)
+            {
+                throw new ArgumentNullException("httpClient");
+            }
             JsonSerializer = jsonSerializer;
+            HttpClient = httpClient;
         }
 
         /// <summary>
@@ -114,7 +127,7 @@ namespace MediaBrowser.Controller.Providers.Movies
         {
             get
             {
-                LazyInitializer.EnsureInitialized(ref _tmdbSettingsTask, ref _tmdbSettingsTaskInitialized, ref _tmdbSettingsTaskSyncLock, () => GetTmdbSettings(JsonSerializer));
+                LazyInitializer.EnsureInitialized(ref _tmdbSettingsTask, ref _tmdbSettingsTaskInitialized, ref _tmdbSettingsTaskSyncLock, () => GetTmdbSettings(JsonSerializer, HttpClient));
                 return _tmdbSettingsTask;
             }
         }
@@ -123,11 +136,11 @@ namespace MediaBrowser.Controller.Providers.Movies
         /// Gets the TMDB settings.
         /// </summary>
         /// <returns>Task{TmdbSettingsResult}.</returns>
-        private static async Task<TmdbSettingsResult> GetTmdbSettings(IJsonSerializer jsonSerializer)
+        private static async Task<TmdbSettingsResult> GetTmdbSettings(IJsonSerializer jsonSerializer, IHttpClient httpClient)
         {
             try
             {
-                using (var json = await Kernel.Instance.HttpManager.Get(String.Format(TmdbConfigUrl, ApiKey), Kernel.Instance.ResourcePools.MovieDb, CancellationToken.None).ConfigureAwait(false))
+                using (var json = await httpClient.Get(String.Format(TmdbConfigUrl, ApiKey), Kernel.Instance.ResourcePools.MovieDb, CancellationToken.None).ConfigureAwait(false))
                 {
                     return jsonSerializer.DeserializeFromStream<TmdbSettingsResult>(json);
                 }
@@ -189,7 +202,7 @@ namespace MediaBrowser.Controller.Providers.Movies
             {
                 //in addition to ours, we need to set the last refreshed time for the local data provider
                 //so it won't see the new files we download and process them all over again
-                if (JsonProvider == null) JsonProvider = new MovieProviderFromJson(JsonSerializer);
+                if (JsonProvider == null) JsonProvider = new MovieProviderFromJson(HttpClient, JsonSerializer);
                 var data = item.ProviderData.GetValueOrDefault(JsonProvider.Id, new BaseProviderInfo { ProviderId = JsonProvider.Id });
                 data.LastRefreshed = value;
                 item.ProviderData[JsonProvider.Id] = data;
@@ -460,7 +473,7 @@ namespace MediaBrowser.Controller.Providers.Movies
 
             try
             {
-                using (Stream json = await Kernel.Instance.HttpManager.Get(url3, Kernel.Instance.ResourcePools.MovieDb, cancellationToken).ConfigureAwait(false))
+                using (Stream json = await HttpClient.Get(url3, Kernel.Instance.ResourcePools.MovieDb, cancellationToken).ConfigureAwait(false))
                 {
                     searchResult = JsonSerializer.DeserializeFromStream<TmdbMovieSearchResults>(json);
                 }
@@ -492,7 +505,7 @@ namespace MediaBrowser.Controller.Providers.Movies
 
                 try
                 {
-                    using (Stream json = await Kernel.Instance.HttpManager.Get(url3, Kernel.Instance.ResourcePools.MovieDb, cancellationToken).ConfigureAwait(false))
+                    using (Stream json = await HttpClient.Get(url3, Kernel.Instance.ResourcePools.MovieDb, cancellationToken).ConfigureAwait(false))
                     {
                         searchResult = JsonSerializer.DeserializeFromStream<TmdbMovieSearchResults>(json);
                     }
@@ -531,7 +544,7 @@ namespace MediaBrowser.Controller.Providers.Movies
 
                         try
                         {
-                            using (Stream json = await Kernel.Instance.HttpManager.Get(url3, Kernel.Instance.ResourcePools.MovieDb, cancellationToken).ConfigureAwait(false))
+                            using (Stream json = await HttpClient.Get(url3, Kernel.Instance.ResourcePools.MovieDb, cancellationToken).ConfigureAwait(false))
                             {
                                 var response = JsonSerializer.DeserializeFromStream<TmdbAltTitleResults>(json);
 
@@ -611,7 +624,7 @@ namespace MediaBrowser.Controller.Providers.Movies
 
                 try
                 {
-                    using (Stream json = await Kernel.Instance.HttpManager.Get(url, Kernel.Instance.ResourcePools.MovieDb, cancellationToken).ConfigureAwait(false))
+                    using (Stream json = await HttpClient.Get(url, Kernel.Instance.ResourcePools.MovieDb, cancellationToken).ConfigureAwait(false))
                     {
                         var movieResult = JsonSerializer.DeserializeFromStream<CompleteMovieData>(json);
 
@@ -710,7 +723,7 @@ namespace MediaBrowser.Controller.Providers.Movies
 
             try
             {
-                using (var json = await Kernel.Instance.HttpManager.Get(url, Kernel.Instance.ResourcePools.MovieDb, cancellationToken).ConfigureAwait(false))
+                using (var json = await HttpClient.Get(url, Kernel.Instance.ResourcePools.MovieDb, cancellationToken).ConfigureAwait(false))
                 {
                     mainResult = JsonSerializer.DeserializeFromStream<CompleteMovieData>(json);
                 }
@@ -742,7 +755,7 @@ namespace MediaBrowser.Controller.Providers.Movies
 
                     try
                     {
-                        using (Stream json = await Kernel.Instance.HttpManager.Get(url, Kernel.Instance.ResourcePools.MovieDb, cancellationToken).ConfigureAwait(false))
+                        using (Stream json = await HttpClient.Get(url, Kernel.Instance.ResourcePools.MovieDb, cancellationToken).ConfigureAwait(false))
                         {
                             mainResult = JsonSerializer.DeserializeFromStream<CompleteMovieData>(json);
                         }
@@ -777,7 +790,7 @@ namespace MediaBrowser.Controller.Providers.Movies
 
             try
             {
-                using (Stream json = await Kernel.Instance.HttpManager.Get(url, Kernel.Instance.ResourcePools.MovieDb, cancellationToken).ConfigureAwait(false))
+                using (Stream json = await HttpClient.Get(url, Kernel.Instance.ResourcePools.MovieDb, cancellationToken).ConfigureAwait(false))
                 {
                     cast = JsonSerializer.DeserializeFromStream<TmdbCastResult>(json);
                 }
@@ -803,7 +816,7 @@ namespace MediaBrowser.Controller.Providers.Movies
 
             try
             {
-                using (Stream json = await Kernel.Instance.HttpManager.Get(url, Kernel.Instance.ResourcePools.MovieDb, cancellationToken).ConfigureAwait(false))
+                using (Stream json = await HttpClient.Get(url, Kernel.Instance.ResourcePools.MovieDb, cancellationToken).ConfigureAwait(false))
                 {
                     releases = JsonSerializer.DeserializeFromStream<TmdbReleasesResult>(json);
                 }
@@ -831,7 +844,7 @@ namespace MediaBrowser.Controller.Providers.Movies
 
             try
             {
-                using (Stream json = await Kernel.Instance.HttpManager.Get(url, Kernel.Instance.ResourcePools.MovieDb, cancellationToken).ConfigureAwait(false))
+                using (Stream json = await HttpClient.Get(url, Kernel.Instance.ResourcePools.MovieDb, cancellationToken).ConfigureAwait(false))
                 {
                     images = JsonSerializer.DeserializeFromStream<TmdbImages>(json);
                 }
diff --git a/MediaBrowser.Controller/Providers/Movies/MovieProviderFromJson.cs b/MediaBrowser.Controller/Providers/Movies/MovieProviderFromJson.cs
index 5de17aab0..6b83c861e 100644
--- a/MediaBrowser.Controller/Providers/Movies/MovieProviderFromJson.cs
+++ b/MediaBrowser.Controller/Providers/Movies/MovieProviderFromJson.cs
@@ -1,4 +1,5 @@
-using MediaBrowser.Controller.Entities;
+using MediaBrowser.Common.Net;
+using MediaBrowser.Controller.Entities;
 using MediaBrowser.Model.Serialization;
 using System;
 using System.IO;
@@ -12,7 +13,7 @@ namespace MediaBrowser.Controller.Providers.Movies
     /// </summary>
     public class MovieProviderFromJson : MovieDbProvider
     {
-        public MovieProviderFromJson(IJsonSerializer jsonSerializer) : base(jsonSerializer)
+        public MovieProviderFromJson(IHttpClient httpClient, IJsonSerializer jsonSerializer) : base(jsonSerializer, httpClient)
         {
         }
 
diff --git a/MediaBrowser.Controller/Providers/Movies/PersonProviderFromJson.cs b/MediaBrowser.Controller/Providers/Movies/PersonProviderFromJson.cs
index 7517ec65c..f87af5a1f 100644
--- a/MediaBrowser.Controller/Providers/Movies/PersonProviderFromJson.cs
+++ b/MediaBrowser.Controller/Providers/Movies/PersonProviderFromJson.cs
@@ -1,4 +1,5 @@
-using MediaBrowser.Controller.Entities;
+using MediaBrowser.Common.Net;
+using MediaBrowser.Controller.Entities;
 using MediaBrowser.Model.Serialization;
 using System;
 using System.IO;
@@ -12,7 +13,8 @@ namespace MediaBrowser.Controller.Providers.Movies
     /// </summary>
     class PersonProviderFromJson : TmdbPersonProvider
     {
-        public PersonProviderFromJson(IJsonSerializer jsonSerializer) : base(jsonSerializer)
+        public PersonProviderFromJson(IHttpClient httpClient, IJsonSerializer jsonSerializer)
+            : base(httpClient, jsonSerializer)
         {
         }
 
diff --git a/MediaBrowser.Controller/Providers/Movies/TmdbPersonProvider.cs b/MediaBrowser.Controller/Providers/Movies/TmdbPersonProvider.cs
index 32013614c..2e1ca8d04 100644
--- a/MediaBrowser.Controller/Providers/Movies/TmdbPersonProvider.cs
+++ b/MediaBrowser.Controller/Providers/Movies/TmdbPersonProvider.cs
@@ -1,6 +1,8 @@
-using MediaBrowser.Controller.Entities;
+using MediaBrowser.Common.Net;
+using MediaBrowser.Controller.Entities;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Net;
+using MediaBrowser.Model.Serialization;
 using System;
 using System.Collections.Generic;
 using System.Globalization;
@@ -9,7 +11,6 @@ using System.Linq;
 using System.Net;
 using System.Threading;
 using System.Threading.Tasks;
-using MediaBrowser.Model.Serialization;
 
 namespace MediaBrowser.Controller.Providers.Movies
 {
@@ -29,18 +30,30 @@ namespace MediaBrowser.Controller.Providers.Movies
         /// <value>The json serializer.</value>
         protected IJsonSerializer JsonSerializer { get; private set; }
 
+        /// <summary>
+        /// Gets the HTTP client.
+        /// </summary>
+        /// <value>The HTTP client.</value>
+        protected IHttpClient HttpClient { get; private set; }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="MovieDbProvider" /> class.
         /// </summary>
+        /// <param name="httpClient">The HTTP client.</param>
         /// <param name="jsonSerializer">The json serializer.</param>
         /// <exception cref="System.ArgumentNullException">jsonSerializer</exception>
-        public TmdbPersonProvider(IJsonSerializer jsonSerializer)
+        public TmdbPersonProvider(IHttpClient httpClient, IJsonSerializer jsonSerializer)
             : base()
         {
             if (jsonSerializer == null)
             {
                 throw new ArgumentNullException("jsonSerializer");
             }
+            if (httpClient == null)
+            {
+                throw new ArgumentNullException("httpClient");
+            }
+            HttpClient = httpClient;
             JsonSerializer = jsonSerializer;
         }
 
@@ -151,7 +164,7 @@ namespace MediaBrowser.Controller.Providers.Movies
 
             try
             {
-                using (Stream json = await Kernel.Instance.HttpManager.Get(url, Kernel.Instance.ResourcePools.MovieDb, cancellationToken).ConfigureAwait(false))
+                using (Stream json = await HttpClient.Get(url, Kernel.Instance.ResourcePools.MovieDb, cancellationToken).ConfigureAwait(false))
                 {
                     searchResult = JsonSerializer.DeserializeFromStream<PersonSearchResults>(json);
                 }
@@ -177,7 +190,7 @@ namespace MediaBrowser.Controller.Providers.Movies
 
             try
             {
-                using (Stream json = await Kernel.Instance.HttpManager.Get(url, Kernel.Instance.ResourcePools.MovieDb, cancellationToken).ConfigureAwait(false))
+                using (Stream json = await HttpClient.Get(url, Kernel.Instance.ResourcePools.MovieDb, cancellationToken).ConfigureAwait(false))
                 {
                     if (json != null)
                     {
@@ -240,7 +253,7 @@ namespace MediaBrowser.Controller.Providers.Movies
 
             try
             {
-                using (Stream json = await Kernel.Instance.HttpManager.Get(url, Kernel.Instance.ResourcePools.MovieDb, cancellationToken).ConfigureAwait(false))
+                using (Stream json = await HttpClient.Get(url, Kernel.Instance.ResourcePools.MovieDb, cancellationToken).ConfigureAwait(false))
                 {
                     if (json != null)
                     {
@@ -308,7 +321,7 @@ namespace MediaBrowser.Controller.Providers.Movies
             var localPath = Path.Combine(item.MetaLocation, targetName);
             if (!item.ResolveArgs.ContainsMetaFileByName(targetName))
             {
-                using (var sourceStream = await Kernel.Instance.HttpManager.FetchToMemoryStream(source, Kernel.Instance.ResourcePools.MovieDb, cancellationToken).ConfigureAwait(false))
+                using (var sourceStream = await HttpClient.GetMemoryStream(source, Kernel.Instance.ResourcePools.MovieDb, cancellationToken).ConfigureAwait(false))
                 {
                     await Kernel.Instance.FileSystemManager.SaveToLibraryFilesystem(item, localPath, sourceStream, cancellationToken).ConfigureAwait(false);
 
diff --git a/MediaBrowser.Controller/Providers/ProviderManager.cs b/MediaBrowser.Controller/Providers/ProviderManager.cs
index c5e70dfae..0f7198756 100644
--- a/MediaBrowser.Controller/Providers/ProviderManager.cs
+++ b/MediaBrowser.Controller/Providers/ProviderManager.cs
@@ -1,6 +1,6 @@
 using MediaBrowser.Common.Extensions;
 using MediaBrowser.Common.IO;
-using MediaBrowser.Common.Kernel;
+using MediaBrowser.Common.Net;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Model.Logging;
 using System;
@@ -33,16 +33,23 @@ namespace MediaBrowser.Controller.Providers
         /// The _logger
         /// </summary>
         private readonly ILogger _logger;
-        
+
+        /// <summary>
+        /// The _HTTP client
+        /// </summary>
+        private readonly IHttpClient _httpClient;
+
         /// <summary>
         /// Initializes a new instance of the <see cref="ProviderManager" /> class.
         /// </summary>
         /// <param name="kernel">The kernel.</param>
+        /// <param name="httpClient">The HTTP client.</param>
         /// <param name="logger">The logger.</param>
-        public ProviderManager(Kernel kernel, ILogger logger)
+        public ProviderManager(Kernel kernel, IHttpClient httpClient, ILogger logger)
             : base(kernel)
         {
             _logger = logger;
+            _httpClient = httpClient;
             _remoteImageCache = new FileSystemRepository(ImagesDataPath);
         }
 
@@ -287,7 +294,7 @@ namespace MediaBrowser.Controller.Providers
                 Path.Combine(item.MetaLocation, targetName) :
                 _remoteImageCache.GetResourcePath(item.GetType().FullName + item.Path.ToLower(), targetName);
 
-            var img = await Kernel.HttpManager.FetchToMemoryStream(source, resourcePool, cancellationToken).ConfigureAwait(false);
+            var img = await _httpClient.GetMemoryStream(source, resourcePool, cancellationToken).ConfigureAwait(false);
 
             if (Kernel.Configuration.SaveLocalMeta) // queue to media directories
             {
diff --git a/MediaBrowser.Controller/Providers/TV/FanArtTVProvider.cs b/MediaBrowser.Controller/Providers/TV/FanArtTVProvider.cs
index 05ab172a8..8d5c2e0c7 100644
--- a/MediaBrowser.Controller/Providers/TV/FanArtTVProvider.cs
+++ b/MediaBrowser.Controller/Providers/TV/FanArtTVProvider.cs
@@ -1,4 +1,5 @@
 using MediaBrowser.Common.Extensions;
+using MediaBrowser.Common.Net;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.TV;
 using MediaBrowser.Model.Entities;
@@ -15,6 +16,22 @@ namespace MediaBrowser.Controller.Providers.TV
     {
         protected string FanArtBaseUrl = "http://api.fanart.tv/webservice/series/{0}/{1}/xml/all/1/1";
 
+        /// <summary>
+        /// Gets the HTTP client.
+        /// </summary>
+        /// <value>The HTTP client.</value>
+        protected IHttpClient HttpClient { get; private set; }
+
+        public FanArtTVProvider(IHttpClient httpClient)
+            : base()
+        {
+            if (httpClient == null)
+            {
+                throw new ArgumentNullException("httpClient");
+            }
+            HttpClient = httpClient;
+        }
+
         public override bool Supports(BaseItem item)
         {
             return item is Series;
@@ -36,7 +53,7 @@ namespace MediaBrowser.Controller.Providers.TV
         protected override async Task<bool> FetchAsyncInternal(BaseItem item, bool force, CancellationToken cancellationToken)
         {
             cancellationToken.ThrowIfCancellationRequested();
-            
+
             var series = (Series)item;
             if (ShouldFetch(series, series.ProviderData.GetValueOrDefault(Id, new BaseProviderInfo { ProviderId = Id })))
             {
@@ -46,7 +63,7 @@ namespace MediaBrowser.Controller.Providers.TV
 
                 try
                 {
-                    using (var xml = await Kernel.Instance.HttpManager.Get(url, Kernel.Instance.ResourcePools.FanArt, cancellationToken).ConfigureAwait(false))
+                    using (var xml = await HttpClient.Get(url, Kernel.Instance.ResourcePools.FanArt, cancellationToken).ConfigureAwait(false))
                     {
                         doc.Load(xml);
                     }
@@ -56,7 +73,7 @@ namespace MediaBrowser.Controller.Providers.TV
                 }
 
                 cancellationToken.ThrowIfCancellationRequested();
-                
+
                 if (doc.HasChildNodes)
                 {
                     string path;
@@ -83,7 +100,7 @@ namespace MediaBrowser.Controller.Providers.TV
                     }
 
                     cancellationToken.ThrowIfCancellationRequested();
-                    
+
                     if (Kernel.Instance.Configuration.DownloadTVArt && !series.ResolveArgs.ContainsMetaFileByName(ART_FILE))
                     {
                         var node = doc.SelectSingleNode("//fanart/series/cleararts/clearart[@lang = \"" + language + "\"]/@url") ??
@@ -107,7 +124,7 @@ namespace MediaBrowser.Controller.Providers.TV
                     }
 
                     cancellationToken.ThrowIfCancellationRequested();
-                    
+
                     if (Kernel.Instance.Configuration.DownloadTVThumb && !series.ResolveArgs.ContainsMetaFileByName(THUMB_FILE))
                     {
                         var node = doc.SelectSingleNode("//fanart/series/tvthumbs/tvthumb[@lang = \"" + language + "\"]/@url") ??
diff --git a/MediaBrowser.Controller/Providers/TV/RemoteEpisodeProvider.cs b/MediaBrowser.Controller/Providers/TV/RemoteEpisodeProvider.cs
index b06598114..a31520c9d 100644
--- a/MediaBrowser.Controller/Providers/TV/RemoteEpisodeProvider.cs
+++ b/MediaBrowser.Controller/Providers/TV/RemoteEpisodeProvider.cs
@@ -1,4 +1,5 @@
-using MediaBrowser.Controller.Entities;
+using MediaBrowser.Common.Net;
+using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.TV;
 using MediaBrowser.Controller.Extensions;
 using MediaBrowser.Controller.Resolvers.TV;
@@ -19,6 +20,21 @@ namespace MediaBrowser.Controller.Providers.TV
     /// </summary>
     class RemoteEpisodeProvider : BaseMetadataProvider
     {
+        /// <summary>
+        /// Gets the HTTP client.
+        /// </summary>
+        /// <value>The HTTP client.</value>
+        protected IHttpClient HttpClient { get; private set; }
+
+        public RemoteEpisodeProvider(IHttpClient httpClient)
+            : base()
+        {
+            if (httpClient == null)
+            {
+                throw new ArgumentNullException("httpClient");
+            }
+            HttpClient = httpClient;
+        }
 
         /// <summary>
         /// The episode query
@@ -171,7 +187,7 @@ namespace MediaBrowser.Controller.Providers.TV
 
                 try
                 {
-                    using (var result = await Kernel.Instance.HttpManager.Get(url, Kernel.Instance.ResourcePools.TvDb, cancellationToken).ConfigureAwait(false))
+                    using (var result = await HttpClient.Get(url, Kernel.Instance.ResourcePools.TvDb, cancellationToken).ConfigureAwait(false))
                     {
                         doc.Load(result);
                     }
@@ -189,7 +205,7 @@ namespace MediaBrowser.Controller.Providers.TV
 
                     try
                     {
-                        using (var result = await Kernel.Instance.HttpManager.Get(url, Kernel.Instance.ResourcePools.TvDb, cancellationToken).ConfigureAwait(false))
+                        using (var result = await HttpClient.Get(url, Kernel.Instance.ResourcePools.TvDb, cancellationToken).ConfigureAwait(false))
                         {
                             if (result != null) doc.Load(result);
                             usingAbsoluteData = true;
diff --git a/MediaBrowser.Controller/Providers/TV/RemoteSeasonProvider.cs b/MediaBrowser.Controller/Providers/TV/RemoteSeasonProvider.cs
index 3e7f6b1a2..72468c24a 100644
--- a/MediaBrowser.Controller/Providers/TV/RemoteSeasonProvider.cs
+++ b/MediaBrowser.Controller/Providers/TV/RemoteSeasonProvider.cs
@@ -1,4 +1,5 @@
-using MediaBrowser.Controller.Entities;
+using MediaBrowser.Common.Net;
+using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.TV;
 using MediaBrowser.Controller.Resolvers.TV;
 using MediaBrowser.Model.Entities;
@@ -17,6 +18,21 @@ namespace MediaBrowser.Controller.Providers.TV
     /// </summary>
     class RemoteSeasonProvider : BaseMetadataProvider
     {
+        /// <summary>
+        /// Gets the HTTP client.
+        /// </summary>
+        /// <value>The HTTP client.</value>
+        protected IHttpClient HttpClient { get; private set; }
+
+        public RemoteSeasonProvider(IHttpClient httpClient)
+            : base()
+        {
+            if (httpClient == null)
+            {
+                throw new ArgumentNullException("httpClient");
+            }
+            HttpClient = httpClient;
+        }
 
         /// <summary>
         /// Supportses the specified item.
@@ -82,7 +98,7 @@ namespace MediaBrowser.Controller.Providers.TV
         protected override async Task<bool> FetchAsyncInternal(BaseItem item, bool force, CancellationToken cancellationToken)
         {
             cancellationToken.ThrowIfCancellationRequested();
-            
+
             var season = (Season)item;
 
             if (!HasLocalMeta(item))
@@ -135,7 +151,7 @@ namespace MediaBrowser.Controller.Providers.TV
 
                     try
                     {
-                        using (var imgs = await Kernel.Instance.HttpManager.Get(url, Kernel.Instance.ResourcePools.TvDb, cancellationToken).ConfigureAwait(false))
+                        using (var imgs = await HttpClient.Get(url, Kernel.Instance.ResourcePools.TvDb, cancellationToken).ConfigureAwait(false))
                         {
                             images.Load(imgs);
                         }
diff --git a/MediaBrowser.Controller/Providers/TV/RemoteSeriesProvider.cs b/MediaBrowser.Controller/Providers/TV/RemoteSeriesProvider.cs
index b8941dbba..c05e9c5e6 100644
--- a/MediaBrowser.Controller/Providers/TV/RemoteSeriesProvider.cs
+++ b/MediaBrowser.Controller/Providers/TV/RemoteSeriesProvider.cs
@@ -1,4 +1,5 @@
 using MediaBrowser.Common.Extensions;
+using MediaBrowser.Common.Net;
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Entities.TV;
 using MediaBrowser.Controller.Extensions;
@@ -21,6 +22,21 @@ namespace MediaBrowser.Controller.Providers.TV
     /// </summary>
     class RemoteSeriesProvider : BaseMetadataProvider
     {
+        /// <summary>
+        /// Gets the HTTP client.
+        /// </summary>
+        /// <value>The HTTP client.</value>
+        protected IHttpClient HttpClient { get; private set; }
+
+        public RemoteSeriesProvider(IHttpClient httpClient)
+            : base()
+        {
+            if (httpClient == null)
+            {
+                throw new ArgumentNullException("httpClient");
+            }
+            HttpClient = httpClient;
+        }
 
         /// <summary>
         /// The root URL
@@ -153,7 +169,7 @@ namespace MediaBrowser.Controller.Providers.TV
 
                 try
                 {
-                    using (var xml = await Kernel.Instance.HttpManager.Get(url, Kernel.Instance.ResourcePools.TvDb, cancellationToken).ConfigureAwait(false))
+                    using (var xml = await HttpClient.Get(url, Kernel.Instance.ResourcePools.TvDb, cancellationToken).ConfigureAwait(false))
                     {
                         doc.Load(xml);
                     }
@@ -232,7 +248,7 @@ namespace MediaBrowser.Controller.Providers.TV
 
             try
             {
-                using (var actors = await Kernel.Instance.HttpManager.Get(urlActors, Kernel.Instance.ResourcePools.TvDb, cancellationToken).ConfigureAwait(false))
+                using (var actors = await HttpClient.Get(urlActors, Kernel.Instance.ResourcePools.TvDb, cancellationToken).ConfigureAwait(false))
                 {
                     docActors.Load(actors);
                 }
@@ -299,7 +315,7 @@ namespace MediaBrowser.Controller.Providers.TV
 
                 try
                 {
-                    using (var imgs = await Kernel.Instance.HttpManager.Get(url, Kernel.Instance.ResourcePools.TvDb, cancellationToken).ConfigureAwait(false))
+                    using (var imgs = await HttpClient.Get(url, Kernel.Instance.ResourcePools.TvDb, cancellationToken).ConfigureAwait(false))
                     {
                         images.Load(imgs);
                     }
@@ -446,7 +462,7 @@ namespace MediaBrowser.Controller.Providers.TV
 
             try
             {
-                using (var results = await Kernel.Instance.HttpManager.Get(url, Kernel.Instance.ResourcePools.TvDb, cancellationToken).ConfigureAwait(false))
+                using (var results = await HttpClient.Get(url, Kernel.Instance.ResourcePools.TvDb, cancellationToken).ConfigureAwait(false))
                 {
                     doc.Load(results);
                 }
diff --git a/MediaBrowser.Controller/Updates/InstallationManager.cs b/MediaBrowser.Controller/Updates/InstallationManager.cs
index af544dd51..15d626b2f 100644
--- a/MediaBrowser.Controller/Updates/InstallationManager.cs
+++ b/MediaBrowser.Controller/Updates/InstallationManager.cs
@@ -113,16 +113,23 @@ namespace MediaBrowser.Controller.Updates
         /// <value>The json serializer.</value>
         protected IJsonSerializer JsonSerializer { get; private set; }
 
+        /// <summary>
+        /// Gets the HTTP client.
+        /// </summary>
+        /// <value>The HTTP client.</value>
+        protected IHttpClient HttpClient { get; private set; }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="InstallationManager" /> class.
         /// </summary>
         /// <param name="kernel">The kernel.</param>
+        /// <param name="httpClient">The HTTP client.</param>
         /// <param name="zipClient">The zip client.</param>
         /// <param name="networkManager">The network manager.</param>
-        /// <param name="jsonSerializer"></param>
+        /// <param name="jsonSerializer">The json serializer.</param>
         /// <param name="logger">The logger.</param>
         /// <exception cref="System.ArgumentNullException">zipClient</exception>
-        public InstallationManager(Kernel kernel, IZipClient zipClient, INetworkManager networkManager, IJsonSerializer jsonSerializer, ILogger logger)
+        public InstallationManager(Kernel kernel, IHttpClient httpClient, IZipClient zipClient, INetworkManager networkManager, IJsonSerializer jsonSerializer, ILogger logger)
             : base(kernel)
         {
             if (zipClient == null)
@@ -141,9 +148,13 @@ namespace MediaBrowser.Controller.Updates
             {
                 throw new ArgumentNullException("jsonSerializer");
             }
+            if (httpClient == null)
+            {
+                throw new ArgumentNullException("httpClient");
+            }
 
             JsonSerializer = jsonSerializer;
-
+            HttpClient = httpClient;
             _networkManager = networkManager;
             _logger = logger;
             ZipClient = zipClient;
@@ -162,7 +173,7 @@ namespace MediaBrowser.Controller.Updates
         {
             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))
+            using (var json = await HttpClient.Post(Controller.Kernel.MBAdminUrl + "service/package/retrieveall", data, Kernel.ResourcePools.Mb, cancellationToken).ConfigureAwait(false))
             {
                 cancellationToken.ThrowIfCancellationRequested();
 
@@ -276,7 +287,7 @@ namespace MediaBrowser.Controller.Updates
         /// <returns>Task{IEnumerable{PackageVersionInfo}}.</returns>
         public async Task<IEnumerable<PackageVersionInfo>> GetAvailablePluginUpdates(bool withAutoUpdateEnabled, CancellationToken cancellationToken)
         {
-            var catalog = await Kernel.InstallationManager.GetAvailablePackages(cancellationToken).ConfigureAwait(false);
+            var catalog = await GetAvailablePackages(cancellationToken).ConfigureAwait(false);
 
             var plugins = Kernel.Plugins;
 
@@ -288,7 +299,7 @@ namespace MediaBrowser.Controller.Updates
             // Figure out what needs to be installed
             return plugins.Select(p =>
             {
-                var latestPluginInfo = Kernel.InstallationManager.GetLatestCompatibleVersion(catalog, p.Name, p.Configuration.UpdateClass);
+                var latestPluginInfo = GetLatestCompatibleVersion(catalog, p.Name, p.Configuration.UpdateClass);
 
                 return latestPluginInfo != null && latestPluginInfo.version > p.Version ? latestPluginInfo : null;
 
@@ -414,7 +425,7 @@ namespace MediaBrowser.Controller.Updates
             var target = isArchive ? Kernel.ApplicationPaths.ProgramDataPath : Path.Combine(Kernel.ApplicationPaths.PluginsPath, package.targetFilename);
 
             // Download to temporary file so that, if interrupted, it won't destroy the existing installation
-            var tempFile = await Kernel.HttpManager.FetchToTempFile(package.sourceUrl, Kernel.ResourcePools.Mb, cancellationToken, progress).ConfigureAwait(false);
+            var tempFile = await HttpClient.GetTempFile(package.sourceUrl, Kernel.ResourcePools.Mb, cancellationToken, progress).ConfigureAwait(false);
 
             cancellationToken.ThrowIfCancellationRequested();
 
diff --git a/MediaBrowser.Networking/HttpManager/HttpManager.cs b/MediaBrowser.Networking/HttpManager/HttpManager.cs
new file mode 100644
index 000000000..2f44fa74b
--- /dev/null
+++ b/MediaBrowser.Networking/HttpManager/HttpManager.cs
@@ -0,0 +1,482 @@
+using MediaBrowser.Common.IO;
+using MediaBrowser.Common.Kernel;
+using MediaBrowser.Common.Net;
+using MediaBrowser.Model.Logging;
+using MediaBrowser.Model.Net;
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Net;
+using System.Net.Cache;
+using System.Net.Http;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+
+namespace MediaBrowser.Networking.HttpManager
+{
+    /// <summary>
+    /// Class HttpManager
+    /// </summary>
+    public class HttpManager : IHttpClient
+    {
+        /// <summary>
+        /// The _logger
+        /// </summary>
+        private readonly ILogger _logger;
+
+        /// <summary>
+        /// The _app paths
+        /// </summary>
+        private readonly IApplicationPaths _appPaths;
+        
+        /// <summary>
+        /// Initializes a new instance of the <see cref="HttpManager" /> class.
+        /// </summary>
+        /// <param name="appPaths">The kernel.</param>
+        /// <param name="logger">The logger.</param>
+        public HttpManager(IApplicationPaths appPaths, ILogger logger)
+        {
+            if (appPaths == null)
+            {
+                throw new ArgumentNullException("appPaths");
+            }
+            if (logger == null)
+            {
+                throw new ArgumentNullException("logger");
+            }
+            
+            _logger = logger;
+            _appPaths = appPaths;
+        }
+
+        /// <summary>
+        /// Holds a dictionary of http clients by host.  Use GetHttpClient(host) to retrieve or create a client for web requests.
+        /// DON'T dispose it after use.
+        /// </summary>
+        /// <value>The HTTP clients.</value>
+        private readonly ConcurrentDictionary<string, HttpClient> _httpClients = new ConcurrentDictionary<string, HttpClient>();
+
+        /// <summary>
+        /// Gets
+        /// </summary>
+        /// <param name="host">The host.</param>
+        /// <returns>HttpClient.</returns>
+        /// <exception cref="System.ArgumentNullException">host</exception>
+        private HttpClient GetHttpClient(string host)
+        {
+            if (string.IsNullOrEmpty(host))
+            {
+                throw new ArgumentNullException("host");
+            }
+
+            HttpClient client;
+            if (!_httpClients.TryGetValue(host, out client))
+            {
+                var handler = new WebRequestHandler
+                {
+                    AutomaticDecompression = DecompressionMethods.Deflate,
+                    CachePolicy = new RequestCachePolicy(RequestCacheLevel.Revalidate)
+                };
+
+                client = new HttpClient(handler);
+                client.DefaultRequestHeaders.Add("Accept", "application/json,image/*");
+                client.Timeout = TimeSpan.FromSeconds(15);
+                _httpClients.TryAdd(host, client);
+            }
+
+            return client;
+        }
+
+        /// <summary>
+        /// Performs a GET request and returns the resulting stream
+        /// </summary>
+        /// <param name="url">The URL.</param>
+        /// <param name="resourcePool">The resource pool.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        /// <returns>Task{Stream}.</returns>
+        /// <exception cref="MediaBrowser.Model.Net.HttpException"></exception>
+        public async Task<Stream> Get(string url, SemaphoreSlim resourcePool, CancellationToken cancellationToken)
+        {
+            ValidateParams(url, resourcePool, cancellationToken);
+
+            cancellationToken.ThrowIfCancellationRequested();
+
+            await resourcePool.WaitAsync(cancellationToken).ConfigureAwait(false);
+
+            _logger.Info("HttpManager.Get url: {0}", url);
+
+            try
+            {
+                cancellationToken.ThrowIfCancellationRequested();
+
+                var msg = await GetHttpClient(GetHostFromUrl(url)).GetAsync(url, cancellationToken).ConfigureAwait(false);
+
+                EnsureSuccessStatusCode(msg);
+
+                return await msg.Content.ReadAsStreamAsync().ConfigureAwait(false);
+            }
+            catch (OperationCanceledException ex)
+            {
+                throw GetCancellationException(url, cancellationToken, ex);
+            }
+            catch (HttpRequestException ex)
+            {
+                _logger.ErrorException("Error getting response from " + url, ex);
+
+                throw new HttpException(ex.Message, ex);
+            }
+            finally
+            {
+                resourcePool.Release();
+            }
+        }
+
+        /// <summary>
+        /// Performs a POST request
+        /// </summary>
+        /// <param name="url">The URL.</param>
+        /// <param name="postData">Params to add to the POST data.</param>
+        /// <param name="resourcePool">The resource pool.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        /// <returns>stream on success, null on failure</returns>
+        /// <exception cref="System.ArgumentNullException">postData</exception>
+        /// <exception cref="MediaBrowser.Model.Net.HttpException"></exception>
+        public async Task<Stream> Post(string url, Dictionary<string, string> postData, SemaphoreSlim resourcePool, CancellationToken cancellationToken)
+        {
+            ValidateParams(url, resourcePool, cancellationToken);
+
+            if (postData == null)
+            {
+                throw new ArgumentNullException("postData");
+            }
+
+            cancellationToken.ThrowIfCancellationRequested();
+
+            var strings = postData.Keys.Select(key => string.Format("{0}={1}", key, postData[key]));
+            var postContent = string.Join("&", strings.ToArray());
+            var content = new StringContent(postContent, Encoding.UTF8, "application/x-www-form-urlencoded");
+
+            await resourcePool.WaitAsync(cancellationToken).ConfigureAwait(false);
+
+            _logger.Info("HttpManager.Post url: {0}", url);
+
+            try
+            {
+                cancellationToken.ThrowIfCancellationRequested();
+
+                var msg = await GetHttpClient(GetHostFromUrl(url)).PostAsync(url, content, cancellationToken).ConfigureAwait(false);
+
+                EnsureSuccessStatusCode(msg);
+
+                return await msg.Content.ReadAsStreamAsync().ConfigureAwait(false);
+            }
+            catch (OperationCanceledException ex)
+            {
+                throw GetCancellationException(url, cancellationToken, ex);
+            }
+            catch (HttpRequestException ex)
+            {
+                _logger.ErrorException("Error getting response from " + url, ex);
+
+                throw new HttpException(ex.Message, ex);
+            }
+            finally
+            {
+                resourcePool.Release();
+            }
+        }
+
+        /// <summary>
+        /// Downloads the contents of a given url into a temporary location
+        /// </summary>
+        /// <param name="url">The URL.</param>
+        /// <param name="resourcePool">The resource pool.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        /// <param name="progress">The progress.</param>
+        /// <param name="userAgent">The user agent.</param>
+        /// <returns>Task{System.String}.</returns>
+        /// <exception cref="System.ArgumentNullException">progress</exception>
+        /// <exception cref="MediaBrowser.Model.Net.HttpException"></exception>
+        public async Task<string> GetTempFile(string url, SemaphoreSlim resourcePool, CancellationToken cancellationToken, IProgress<double> progress, string userAgent = null)
+        {
+            ValidateParams(url, resourcePool, cancellationToken);
+
+            if (progress == null)
+            {
+                throw new ArgumentNullException("progress");
+            }
+
+            cancellationToken.ThrowIfCancellationRequested();
+
+            var tempFile = Path.Combine(_appPaths.TempDirectory, Guid.NewGuid() + ".tmp");
+
+            var message = new HttpRequestMessage(HttpMethod.Get, url);
+
+            if (!string.IsNullOrEmpty(userAgent))
+            {
+                message.Headers.Add("User-Agent", userAgent);
+            }
+
+            await resourcePool.WaitAsync(cancellationToken).ConfigureAwait(false);
+
+            _logger.Info("HttpManager.GetTempFile url: {0}, temp file: {1}", url, tempFile);
+
+            try
+            {
+                cancellationToken.ThrowIfCancellationRequested();
+
+                using (var response = await GetHttpClient(GetHostFromUrl(url)).SendAsync(message, HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false))
+                {
+                    EnsureSuccessStatusCode(response);
+
+                    cancellationToken.ThrowIfCancellationRequested();
+
+                    IEnumerable<string> lengthValues;
+
+                    if (!response.Headers.TryGetValues("content-length", out lengthValues) &&
+                        !response.Content.Headers.TryGetValues("content-length", out lengthValues))
+                    {
+                        // We're not able to track progress
+                        using (var stream = await response.Content.ReadAsStreamAsync().ConfigureAwait(false))
+                        {
+                            using (var fs = new FileStream(tempFile, FileMode.Create, FileAccess.Write, FileShare.Read, StreamDefaults.DefaultFileStreamBufferSize, FileOptions.Asynchronous))
+                            {
+                                await stream.CopyToAsync(fs, StreamDefaults.DefaultCopyToBufferSize, cancellationToken).ConfigureAwait(false);
+                            }
+                        }
+                    }
+                    else
+                    {
+                        var length = long.Parse(string.Join(string.Empty, lengthValues.ToArray()));
+
+                        using (var stream = ProgressStream.CreateReadProgressStream(await response.Content.ReadAsStreamAsync().ConfigureAwait(false), progress.Report, length))
+                        {
+                            using (var fs = new FileStream(tempFile, FileMode.Create, FileAccess.Write, FileShare.Read, StreamDefaults.DefaultFileStreamBufferSize, FileOptions.Asynchronous))
+                            {
+                                await stream.CopyToAsync(fs, StreamDefaults.DefaultCopyToBufferSize, cancellationToken).ConfigureAwait(false);
+                            }
+                        }
+                    }
+
+                    progress.Report(100);
+
+                    cancellationToken.ThrowIfCancellationRequested();
+                }
+
+                return tempFile;
+            }
+            catch (OperationCanceledException ex)
+            {
+                // Cleanup
+                if (File.Exists(tempFile))
+                {
+                    File.Delete(tempFile);
+                }
+
+                throw GetCancellationException(url, cancellationToken, ex);
+            }
+            catch (HttpRequestException ex)
+            {
+                _logger.ErrorException("Error getting response from " + url, ex);
+
+                // Cleanup
+                if (File.Exists(tempFile))
+                {
+                    File.Delete(tempFile);
+                }
+
+                throw new HttpException(ex.Message, ex);
+            }
+            catch (Exception ex)
+            {
+                _logger.ErrorException("Error getting response from " + url, ex);
+
+                // Cleanup
+                if (File.Exists(tempFile))
+                {
+                    File.Delete(tempFile);
+                }
+
+                throw;
+            }
+            finally
+            {
+                resourcePool.Release();
+            }
+        }
+
+        /// <summary>
+        /// Downloads the contents of a given url into a MemoryStream
+        /// </summary>
+        /// <param name="url">The URL.</param>
+        /// <param name="resourcePool">The resource pool.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        /// <returns>Task{MemoryStream}.</returns>
+        /// <exception cref="MediaBrowser.Model.Net.HttpException"></exception>
+        public async Task<MemoryStream> GetMemoryStream(string url, SemaphoreSlim resourcePool, CancellationToken cancellationToken)
+        {
+            ValidateParams(url, resourcePool, cancellationToken);
+
+            cancellationToken.ThrowIfCancellationRequested();
+
+            var message = new HttpRequestMessage(HttpMethod.Get, url);
+
+            await resourcePool.WaitAsync(cancellationToken).ConfigureAwait(false);
+
+            var ms = new MemoryStream();
+
+            _logger.Info("HttpManager.GetMemoryStream url: {0}", url);
+
+            try
+            {
+                cancellationToken.ThrowIfCancellationRequested();
+
+                using (var response = await GetHttpClient(GetHostFromUrl(url)).SendAsync(message, HttpCompletionOption.ResponseHeadersRead, cancellationToken).ConfigureAwait(false))
+                {
+                    EnsureSuccessStatusCode(response);
+
+                    cancellationToken.ThrowIfCancellationRequested();
+
+                    using (var stream = await response.Content.ReadAsStreamAsync().ConfigureAwait(false))
+                    {
+                        await stream.CopyToAsync(ms, StreamDefaults.DefaultCopyToBufferSize, cancellationToken).ConfigureAwait(false);
+                    }
+
+                    cancellationToken.ThrowIfCancellationRequested();
+                }
+
+                ms.Position = 0;
+
+                return ms;
+            }
+            catch (OperationCanceledException ex)
+            {
+                ms.Dispose();
+
+                throw GetCancellationException(url, cancellationToken, ex);
+            }
+            catch (HttpRequestException ex)
+            {
+                _logger.ErrorException("Error getting response from " + url, ex);
+
+                ms.Dispose();
+
+                throw new HttpException(ex.Message, ex);
+            }
+            catch (Exception ex)
+            {
+                _logger.ErrorException("Error getting response from " + url, ex);
+
+                ms.Dispose();
+
+                throw;
+            }
+            finally
+            {
+                resourcePool.Release();
+            }
+        }
+
+        /// <summary>
+        /// Validates the params.
+        /// </summary>
+        /// <param name="url">The URL.</param>
+        /// <param name="resourcePool">The resource pool.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        /// <exception cref="System.ArgumentNullException">url</exception>
+        private void ValidateParams(string url, SemaphoreSlim resourcePool, CancellationToken cancellationToken)
+        {
+            if (string.IsNullOrEmpty(url))
+            {
+                throw new ArgumentNullException("url");
+            }
+
+            if (resourcePool == null)
+            {
+                throw new ArgumentNullException("resourcePool");
+            }
+
+            if (cancellationToken == null)
+            {
+                throw new ArgumentNullException("cancellationToken");
+            }
+        }
+
+        /// <summary>
+        /// Gets the host from URL.
+        /// </summary>
+        /// <param name="url">The URL.</param>
+        /// <returns>System.String.</returns>
+        private string GetHostFromUrl(string url)
+        {
+            var start = url.IndexOf("://", StringComparison.OrdinalIgnoreCase) + 3;
+            var len = url.IndexOf('/', start) - start;
+            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 virtual void Dispose(bool dispose)
+        {
+            if (dispose)
+            {
+                foreach (var client in _httpClients.Values.ToList())
+                {
+                    client.Dispose();
+                }
+
+                _httpClients.Clear();
+            }
+        }
+
+        /// <summary>
+        /// Throws the cancellation exception.
+        /// </summary>
+        /// <param name="url">The URL.</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        /// <param name="exception">The exception.</param>
+        /// <returns>Exception.</returns>
+        private Exception GetCancellationException(string url, CancellationToken cancellationToken, OperationCanceledException exception)
+        {
+            // If the HttpClient's timeout is reached, it will cancel the Task internally
+            if (!cancellationToken.IsCancellationRequested)
+            {
+                var msg = string.Format("Connection to {0} timed out", url);
+
+                _logger.Error(msg);
+
+                // Throw an HttpException so that the caller doesn't think it was cancelled by user code
+                return new HttpException(msg, exception) { IsTimedOut = true };
+            }
+
+            return exception;
+        }
+
+        /// <summary>
+        /// Ensures the success status code.
+        /// </summary>
+        /// <param name="response">The response.</param>
+        /// <exception cref="MediaBrowser.Model.Net.HttpException"></exception>
+        private void EnsureSuccessStatusCode(HttpResponseMessage response)
+        {
+            if (!response.IsSuccessStatusCode)
+            {
+                throw new HttpException(response.ReasonPhrase) { StatusCode = response.StatusCode };
+            }
+        }
+    }
+}
diff --git a/MediaBrowser.Networking/HttpServer/HttpServer.cs b/MediaBrowser.Networking/HttpServer/HttpServer.cs
new file mode 100644
index 000000000..b6250527d
--- /dev/null
+++ b/MediaBrowser.Networking/HttpServer/HttpServer.cs
@@ -0,0 +1,554 @@
+using System.Net.WebSockets;
+using Funq;
+using MediaBrowser.Common.Extensions;
+using MediaBrowser.Common.Kernel;
+using MediaBrowser.Common.Net;
+using MediaBrowser.Model.Logging;
+using MediaBrowser.Model.Serialization;
+using ServiceStack.Api.Swagger;
+using ServiceStack.Common.Web;
+using ServiceStack.Configuration;
+using ServiceStack.Logging.NLogger;
+using ServiceStack.ServiceHost;
+using ServiceStack.ServiceInterface.Cors;
+using ServiceStack.Text;
+using ServiceStack.WebHost.Endpoints;
+using ServiceStack.WebHost.Endpoints.Extensions;
+using ServiceStack.WebHost.Endpoints.Support;
+using System;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using System.Net;
+using System.Reactive.Linq;
+using System.Reflection;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MediaBrowser.Networking.HttpServer
+{
+    /// <summary>
+    /// Class HttpServer
+    /// </summary>
+    public class HttpServer : HttpListenerBase, IHttpServer
+    {
+        /// <summary>
+        /// The logger
+        /// </summary>
+        private readonly ILogger _logger;
+
+        /// <summary>
+        /// Gets the URL prefix.
+        /// </summary>
+        /// <value>The URL prefix.</value>
+        public string UrlPrefix { get; private set; }
+
+        /// <summary>
+        /// Gets or sets the kernel.
+        /// </summary>
+        /// <value>The kernel.</value>
+        private IKernel Kernel { get; set; }
+
+        /// <summary>
+        /// Gets or sets the application host.
+        /// </summary>
+        /// <value>The application host.</value>
+        private IApplicationHost ApplicationHost { get; set; }
+
+        /// <summary>
+        /// This subscribes to HttpListener requests and finds the appropriate BaseHandler to process it
+        /// </summary>
+        /// <value>The HTTP listener.</value>
+        private IDisposable HttpListener { get; set; }
+
+        /// <summary>
+        /// Gets or sets the protobuf serializer.
+        /// </summary>
+        /// <value>The protobuf serializer.</value>
+        private IProtobufSerializer ProtobufSerializer { get; set; }
+        
+        /// <summary>
+        /// Occurs when [web socket connected].
+        /// </summary>
+        public event EventHandler<WebSocketConnectEventArgs> WebSocketConnected;
+
+        /// <summary>
+        /// Gets the default redirect path.
+        /// </summary>
+        /// <value>The default redirect path.</value>
+        private string DefaultRedirectPath { get; set; }
+
+        /// <summary>
+        /// Gets or sets the name of the server.
+        /// </summary>
+        /// <value>The name of the server.</value>
+        private string ServerName { get; set; }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="HttpServer" /> class.
+        /// </summary>
+        /// <param name="applicationHost">The application host.</param>
+        /// <param name="kernel">The kernel.</param>
+        /// <param name="protobufSerializer">The protobuf serializer.</param>
+        /// <param name="logger">The logger.</param>
+        /// <param name="serverName">Name of the server.</param>
+        /// <param name="defaultRedirectpath">The default redirectpath.</param>
+        /// <exception cref="System.ArgumentNullException">urlPrefix</exception>
+        public HttpServer(IApplicationHost applicationHost, IKernel kernel, IProtobufSerializer protobufSerializer, ILogger logger, string serverName, string defaultRedirectpath)
+            : base()
+        {
+            if (kernel == null)
+            {
+                throw new ArgumentNullException("kernel");
+            }
+            if (protobufSerializer == null)
+            {
+                throw new ArgumentNullException("protobufSerializer");
+            }
+            if (logger == null)
+            {
+                throw new ArgumentNullException("logger");
+            }
+            if (applicationHost == null)
+            {
+                throw new ArgumentNullException("applicationHost");
+            }
+            if (string.IsNullOrEmpty(serverName))
+            {
+                throw new ArgumentNullException("serverName");
+            }
+            if (string.IsNullOrEmpty(defaultRedirectpath))
+            {
+                throw new ArgumentNullException("defaultRedirectpath");
+            }
+
+            ServerName = serverName;
+            DefaultRedirectPath = defaultRedirectpath;
+            ProtobufSerializer = protobufSerializer;
+            _logger = logger;
+            ApplicationHost = applicationHost;
+
+            EndpointHostConfig.Instance.ServiceStackHandlerFactoryPath = null;
+            EndpointHostConfig.Instance.MetadataRedirectPath = "metadata";
+
+            Kernel = kernel;
+
+            EndpointHost.ConfigureHost(this, ServerName, CreateServiceManager());
+            ContentTypeFilters.Register(ContentType.ProtoBuf, (reqCtx, res, stream) => ProtobufSerializer.SerializeToStream(res, stream), (type, stream) => ProtobufSerializer.DeserializeFromStream(stream, type));
+
+            Init();
+        }
+
+        /// <summary>
+        /// Configures the specified container.
+        /// </summary>
+        /// <param name="container">The container.</param>
+        public override void Configure(Container container)
+        {
+            JsConfig.DateHandler = JsonDateHandler.ISO8601;
+            JsConfig.ExcludeTypeInfo = true;
+            JsConfig.IncludeNullValues = false;
+            
+            SetConfig(new EndpointHostConfig
+            {
+                DefaultRedirectPath = DefaultRedirectPath,
+
+                // Tell SS to bubble exceptions up to here
+                WriteErrorsToResponse = false,
+
+                DebugMode = true
+            });
+
+            container.Adapter = new ContainerAdapter(ApplicationHost);
+
+            foreach (var service in Kernel.RestServices)
+            {
+                service.Configure(this);
+            }
+
+            Plugins.Add(new SwaggerFeature());
+            Plugins.Add(new CorsFeature());
+
+            ServiceStack.Logging.LogManager.LogFactory = new NLogFactory();
+        }
+
+        /// <summary>
+        /// Starts the Web Service
+        /// </summary>
+        /// <param name="urlBase">A Uri that acts as the base that the server is listening on.
+        /// Format should be: http://127.0.0.1:8080/ or http://127.0.0.1:8080/somevirtual/
+        /// Note: the trailing slash is required! For more info see the
+        /// HttpListener.Prefixes property on MSDN.</param>
+        public override void Start(string urlBase)
+        {
+            if (string.IsNullOrEmpty(urlBase))
+            {
+                throw new ArgumentNullException("urlBase");
+            }
+
+            // *** Already running - just leave it in place
+            if (IsStarted)
+            {
+                return;
+            }
+
+            if (Listener == null)
+            {
+                Listener = new HttpListener();
+            }
+
+            EndpointHost.Config.ServiceStackHandlerFactoryPath = HttpListenerRequestWrapper.GetHandlerPathIfAny(urlBase);
+
+            UrlPrefix = urlBase;
+
+            Listener.Prefixes.Add(urlBase);
+
+            IsStarted = true;
+            Listener.Start();
+
+            HttpListener = CreateObservableStream().Subscribe(ProcessHttpRequestAsync);
+        }
+
+        /// <summary>
+        /// Creates the observable stream.
+        /// </summary>
+        /// <returns>IObservable{HttpListenerContext}.</returns>
+        private IObservable<HttpListenerContext> CreateObservableStream()
+        {
+            return Observable.Create<HttpListenerContext>(obs =>
+                                Observable.FromAsync(() => Listener.GetContextAsync())
+                                          .Subscribe(obs))
+                             .Repeat()
+                             .Retry()
+                             .Publish()
+                             .RefCount();
+        }
+
+        /// <summary>
+        /// Processes incoming http requests by routing them to the appropiate handler
+        /// </summary>
+        /// <param name="context">The CTX.</param>
+        private async void ProcessHttpRequestAsync(HttpListenerContext context)
+        {
+            LogHttpRequest(context);
+
+            if (context.Request.IsWebSocketRequest)
+            {
+                await ProcessWebSocketRequest(context).ConfigureAwait(false);
+                return;
+            }
+
+
+            Task.Run(() =>
+            {
+                RaiseReceiveWebRequest(context);
+
+                try
+                {
+                    ProcessRequest(context);
+                }
+                catch (InvalidOperationException ex)
+                {
+                    HandleException(context.Response, ex, 422);
+
+                    throw;
+                }
+                catch (ResourceNotFoundException ex)
+                {
+                    HandleException(context.Response, ex, 404);
+
+                    throw;
+                }
+                catch (FileNotFoundException ex)
+                {
+                    HandleException(context.Response, ex, 404);
+
+                    throw;
+                }
+                catch (DirectoryNotFoundException ex)
+                {
+                    HandleException(context.Response, ex, 404);
+
+                    throw;
+                }
+                catch (UnauthorizedAccessException ex)
+                {
+                    HandleException(context.Response, ex, 401);
+
+                    throw;
+                }
+                catch (ArgumentException ex)
+                {
+                    HandleException(context.Response, ex, 400);
+
+                    throw;
+                }
+                catch (Exception ex)
+                {
+                    HandleException(context.Response, ex, 500);
+
+                    throw;
+                }
+            });
+        }
+
+        /// <summary>
+        /// Processes the web socket request.
+        /// </summary>
+        /// <param name="ctx">The CTX.</param>
+        /// <returns>Task.</returns>
+        private async Task ProcessWebSocketRequest(HttpListenerContext ctx)
+        {
+            try
+            {
+                var webSocketContext = await ctx.AcceptWebSocketAsync(null).ConfigureAwait(false);
+
+                if (WebSocketConnected != null)
+                {
+                    WebSocketConnected(this, new WebSocketConnectEventArgs { WebSocket = new NativeWebSocket(webSocketContext.WebSocket, _logger), Endpoint = ctx.Request.RemoteEndPoint.ToString() });
+                }
+            }
+            catch (Exception ex)
+            {
+                _logger.ErrorException("AcceptWebSocketAsync error", ex);
+
+                ctx.Response.StatusCode = 500;
+                ctx.Response.Close();
+            }
+        }
+
+        /// <summary>
+        /// Logs the HTTP request.
+        /// </summary>
+        /// <param name="ctx">The CTX.</param>
+        private void LogHttpRequest(HttpListenerContext ctx)
+        {
+            var log = new StringBuilder();
+
+            log.AppendLine("Url: " + ctx.Request.Url);
+            log.AppendLine("Headers: " + string.Join(",", ctx.Request.Headers.AllKeys.Select(k => k + "=" + ctx.Request.Headers[k])));
+
+            var type = ctx.Request.IsWebSocketRequest ? "Web Socket" : "HTTP " + ctx.Request.HttpMethod;
+
+            if (EnableHttpRequestLogging)
+            {
+                _logger.LogMultiline(type + " request received from " + ctx.Request.RemoteEndPoint, LogSeverity.Debug, log);
+            }
+        }
+
+        /// <summary>
+        /// Appends the error message.
+        /// </summary>
+        /// <param name="response">The response.</param>
+        /// <param name="ex">The ex.</param>
+        /// <param name="statusCode">The status code.</param>
+        private void HandleException(HttpListenerResponse response, Exception ex, int statusCode)
+        {
+            _logger.ErrorException("Error processing request", ex);
+
+            response.StatusCode = statusCode;
+
+            response.Headers.Add("Status", statusCode.ToString(new CultureInfo("en-US")));
+
+            response.Headers.Remove("Age");
+            response.Headers.Remove("Expires");
+            response.Headers.Remove("Cache-Control");
+            response.Headers.Remove("Etag");
+            response.Headers.Remove("Last-Modified");
+
+            response.ContentType = "text/plain";
+
+            if (!string.IsNullOrEmpty(ex.Message))
+            {
+                response.AddHeader("X-Application-Error-Code", ex.Message);
+            }
+
+            // This could fail, but try to add the stack trace as the body content
+            try
+            {
+                var sb = new StringBuilder();
+                sb.AppendLine("{");
+                sb.AppendLine("\"ResponseStatus\":{");
+                sb.AppendFormat(" \"ErrorCode\":{0},\n", ex.GetType().Name.EncodeJson());
+                sb.AppendFormat(" \"Message\":{0},\n", ex.Message.EncodeJson());
+                sb.AppendFormat(" \"StackTrace\":{0}\n", ex.StackTrace.EncodeJson());
+                sb.AppendLine("}");
+                sb.AppendLine("}");
+
+                response.StatusCode = 500;
+                response.ContentType = ContentType.Json;
+                var sbBytes = sb.ToString().ToUtf8Bytes();
+                response.OutputStream.Write(sbBytes, 0, sbBytes.Length);
+                response.Close();
+            }
+            catch (Exception errorEx)
+            {
+                _logger.ErrorException("Error processing failed request", errorEx);
+            }
+        }
+
+
+        /// <summary>
+        /// Overridable method that can be used to implement a custom hnandler
+        /// </summary>
+        /// <param name="context">The context.</param>
+        /// <exception cref="System.NotImplementedException">Cannot execute handler:  + handler +  at PathInfo:  + httpReq.PathInfo</exception>
+        protected override void ProcessRequest(HttpListenerContext context)
+        {
+            if (string.IsNullOrEmpty(context.Request.RawUrl)) return;
+
+            var operationName = context.Request.GetOperationName();
+
+            var httpReq = new HttpListenerRequestWrapper(operationName, context.Request);
+            var httpRes = new HttpListenerResponseWrapper(context.Response);
+            var handler = ServiceStackHttpHandlerFactory.GetHandler(httpReq);
+
+            var serviceStackHandler = handler as IServiceStackHttpHandler;
+
+            if (serviceStackHandler != null)
+            {
+                var restHandler = serviceStackHandler as RestHandler;
+                if (restHandler != null)
+                {
+                    httpReq.OperationName = operationName = restHandler.RestPath.RequestType.Name;
+                }
+                serviceStackHandler.ProcessRequest(httpReq, httpRes, operationName);
+                LogResponse(context);
+                httpRes.Close();
+                return;
+            }
+
+            throw new NotImplementedException("Cannot execute handler: " + handler + " at PathInfo: " + httpReq.PathInfo);
+        }
+
+        /// <summary>
+        /// Logs the response.
+        /// </summary>
+        /// <param name="ctx">The CTX.</param>
+        private void LogResponse(HttpListenerContext ctx)
+        {
+            var statusode = ctx.Response.StatusCode;
+
+            var log = new StringBuilder();
+
+            log.AppendLine(string.Format("Url: {0}", ctx.Request.Url));
+
+            log.AppendLine("Headers: " + string.Join(",", ctx.Response.Headers.AllKeys.Select(k => k + "=" + ctx.Response.Headers[k])));
+
+            var msg = "Http Response Sent (" + statusode + ") to " + ctx.Request.RemoteEndPoint;
+
+            if (EnableHttpRequestLogging)
+            {
+                _logger.LogMultiline(msg, LogSeverity.Debug, log);
+            }
+        }
+
+        /// <summary>
+        /// Creates the service manager.
+        /// </summary>
+        /// <param name="assembliesWithServices">The assemblies with services.</param>
+        /// <returns>ServiceManager.</returns>
+        protected override ServiceManager CreateServiceManager(params Assembly[] assembliesWithServices)
+        {
+            var types = Kernel.RestServices.Select(r => r.GetType()).ToArray();
+
+            return new ServiceManager(new Container(), new ServiceController(() => types));
+        }
+
+        /// <summary>
+        /// Shut down the Web Service
+        /// </summary>
+        public override void Stop()
+        {
+            if (HttpListener != null)
+            {
+                HttpListener.Dispose();
+                HttpListener = null;
+            }
+
+            if (Listener != null)
+            {
+                Listener.Prefixes.Remove(UrlPrefix);
+            }
+
+            base.Stop();
+        }
+
+        /// <summary>
+        /// The _supports native web socket
+        /// </summary>
+        private bool? _supportsNativeWebSocket;
+
+        /// <summary>
+        /// Gets a value indicating whether [supports web sockets].
+        /// </summary>
+        /// <value><c>true</c> if [supports web sockets]; otherwise, <c>false</c>.</value>
+        public bool SupportsWebSockets
+        {
+            get
+            {
+                if (!_supportsNativeWebSocket.HasValue)
+                {
+                    try
+                    {
+                        new ClientWebSocket();
+
+                        _supportsNativeWebSocket = true;
+                    }
+                    catch (PlatformNotSupportedException)
+                    {
+                        _supportsNativeWebSocket = false;
+                    }
+                }
+
+                return _supportsNativeWebSocket.Value;
+            }
+        }
+
+
+        /// <summary>
+        /// Gets or sets a value indicating whether [enable HTTP request logging].
+        /// </summary>
+        /// <value><c>true</c> if [enable HTTP request logging]; otherwise, <c>false</c>.</value>
+        public bool EnableHttpRequestLogging { get; set; }
+    }
+
+    /// <summary>
+    /// Class ContainerAdapter
+    /// </summary>
+    class ContainerAdapter : IContainerAdapter
+    {
+        /// <summary>
+        /// The _app host
+        /// </summary>
+        private readonly IApplicationHost _appHost;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ContainerAdapter" /> class.
+        /// </summary>
+        /// <param name="appHost">The app host.</param>
+        public ContainerAdapter(IApplicationHost appHost)
+        {
+            _appHost = appHost;
+        }
+        /// <summary>
+        /// Resolves this instance.
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <returns>``0.</returns>
+        public T Resolve<T>()
+        {
+            return _appHost.Resolve<T>();
+        }
+
+        /// <summary>
+        /// Tries the resolve.
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <returns>``0.</returns>
+        public T TryResolve<T>()
+        {
+            return _appHost.TryResolve<T>();
+        }
+    }
+}
\ No newline at end of file
diff --git a/MediaBrowser.Networking/HttpServer/NativeWebSocket.cs b/MediaBrowser.Networking/HttpServer/NativeWebSocket.cs
new file mode 100644
index 000000000..84d163be8
--- /dev/null
+++ b/MediaBrowser.Networking/HttpServer/NativeWebSocket.cs
@@ -0,0 +1,165 @@
+using MediaBrowser.Common.Net;
+using MediaBrowser.Model.Logging;
+using System;
+using System.Net.WebSockets;
+using System.Threading;
+using System.Threading.Tasks;
+using WebSocketMessageType = MediaBrowser.Common.Net.WebSocketMessageType;
+using WebSocketState = MediaBrowser.Common.Net.WebSocketState;
+
+namespace MediaBrowser.Networking.HttpServer
+{
+    /// <summary>
+    /// Class NativeWebSocket
+    /// </summary>
+    public class NativeWebSocket : IWebSocket
+    {
+        /// <summary>
+        /// The logger
+        /// </summary>
+        private readonly ILogger _logger;
+
+        /// <summary>
+        /// Gets or sets the web socket.
+        /// </summary>
+        /// <value>The web socket.</value>
+        private System.Net.WebSockets.WebSocket WebSocket { get; set; }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="NativeWebSocket" /> class.
+        /// </summary>
+        /// <param name="socket">The socket.</param>
+        /// <param name="logger">The logger.</param>
+        /// <exception cref="System.ArgumentNullException">socket</exception>
+        public NativeWebSocket(System.Net.WebSockets.WebSocket socket, ILogger logger)
+        {
+            if (socket == null)
+            {
+                throw new ArgumentNullException("socket");
+            }
+
+            if (logger == null)
+            {
+                throw new ArgumentNullException("logger");
+            }
+
+            _logger = logger;
+            WebSocket = socket;
+
+            Receive();
+        }
+
+        /// <summary>
+        /// Gets or sets the state.
+        /// </summary>
+        /// <value>The state.</value>
+        public WebSocketState State
+        {
+            get
+            {
+                WebSocketState commonState;
+
+                if (!Enum.TryParse(WebSocket.State.ToString(), true, out commonState))
+                {
+                    _logger.Warn("Unrecognized WebSocketState: {0}", WebSocket.State.ToString());
+                }
+
+                return commonState;
+            }
+        }
+
+        /// <summary>
+        /// Receives this instance.
+        /// </summary>
+        private async void Receive()
+        {
+            while (true)
+            {
+                byte[] bytes;
+
+                try
+                {
+                    bytes = await ReceiveBytesAsync(CancellationToken.None).ConfigureAwait(false);
+                }
+                catch (WebSocketException ex)
+                {
+                    _logger.ErrorException("Error reveiving web socket message", ex);
+
+                    break;
+                }
+
+                if (OnReceiveDelegate != null)
+                {
+                    OnReceiveDelegate(bytes);
+                }
+            }
+        }
+
+        /// <summary>
+        /// Receives the async.
+        /// </summary>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        /// <returns>Task{WebSocketMessageInfo}.</returns>
+        /// <exception cref="System.Net.WebSockets.WebSocketException">Connection closed</exception>
+        private async Task<byte[]> ReceiveBytesAsync(CancellationToken cancellationToken)
+        {
+            var bytes = new byte[4096];
+            var buffer = new ArraySegment<byte>(bytes);
+
+            var result = await WebSocket.ReceiveAsync(buffer, cancellationToken).ConfigureAwait(false);
+
+            if (result.CloseStatus.HasValue)
+            {
+                throw new WebSocketException("Connection closed");
+            }
+
+            return buffer.Array;
+        }
+
+        /// <summary>
+        /// Sends the async.
+        /// </summary>
+        /// <param name="bytes">The bytes.</param>
+        /// <param name="type">The type.</param>
+        /// <param name="endOfMessage">if set to <c>true</c> [end of message].</param>
+        /// <param name="cancellationToken">The cancellation token.</param>
+        /// <returns>Task.</returns>
+        public Task SendAsync(byte[] bytes, WebSocketMessageType type, bool endOfMessage, CancellationToken cancellationToken)
+        {
+            System.Net.WebSockets.WebSocketMessageType nativeType;
+
+            if (!Enum.TryParse(type.ToString(), true, out nativeType))
+            {
+                _logger.Warn("Unrecognized WebSocketMessageType: {0}", type.ToString());
+            }
+
+            return WebSocket.SendAsync(new ArraySegment<byte>(bytes), nativeType, true, cancellationToken);
+        }
+
+        /// <summary>
+        /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
+        /// </summary>
+        public void Dispose()
+        {
+            Dispose(true);
+        }
+
+        /// <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)
+        {
+            if (dispose)
+            {
+                WebSocket.Dispose();
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the receive action.
+        /// </summary>
+        /// <value>The receive action.</value>
+        public Action<byte[]> OnReceiveDelegate { get; set; }
+    }
+}
diff --git a/MediaBrowser.Networking/HttpServer/ServerFactory.cs b/MediaBrowser.Networking/HttpServer/ServerFactory.cs
new file mode 100644
index 000000000..e853a6ec2
--- /dev/null
+++ b/MediaBrowser.Networking/HttpServer/ServerFactory.cs
@@ -0,0 +1,28 @@
+using MediaBrowser.Common.Kernel;
+using MediaBrowser.Common.Net;
+using MediaBrowser.Model.Logging;
+using MediaBrowser.Model.Serialization;
+
+namespace MediaBrowser.Networking.HttpServer
+{
+    /// <summary>
+    /// Class ServerFactory
+    /// </summary>
+    public static class ServerFactory
+    {
+        /// <summary>
+        /// Creates the server.
+        /// </summary>
+        /// <param name="applicationHost">The application host.</param>
+        /// <param name="kernel">The kernel.</param>
+        /// <param name="protobufSerializer">The protobuf serializer.</param>
+        /// <param name="logger">The logger.</param>
+        /// <param name="serverName">Name of the server.</param>
+        /// <param name="defaultRedirectpath">The default redirectpath.</param>
+        /// <returns>IHttpServer.</returns>
+        public static IHttpServer CreateServer(IApplicationHost applicationHost, IKernel kernel, IProtobufSerializer protobufSerializer, ILogger logger, string serverName, string defaultRedirectpath)
+        {
+            return new HttpServer(applicationHost, kernel, protobufSerializer, logger, serverName, defaultRedirectpath);
+        }
+    }
+}
diff --git a/MediaBrowser.Networking/MediaBrowser.Networking.csproj b/MediaBrowser.Networking/MediaBrowser.Networking.csproj
index 41fd6ceab..cf5da4659 100644
--- a/MediaBrowser.Networking/MediaBrowser.Networking.csproj
+++ b/MediaBrowser.Networking/MediaBrowser.Networking.csproj
@@ -81,6 +81,9 @@
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Management" />
+    <Reference Include="System.Net" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Net.Http.WebRequest" />
     <Reference Include="System.Reactive.Core, Version=2.0.20823.0, Culture=neutral, PublicKeyToken=f300afd708cefcd3, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\Rx-Core.2.0.21114\lib\Net45\System.Reactive.Core.dll</HintPath>
@@ -104,16 +107,17 @@
     <Compile Include="..\SharedVersion.cs">
       <Link>Properties\SharedVersion.cs</Link>
     </Compile>
+    <Compile Include="HttpManager\HttpManager.cs" />
     <Compile Include="Udp\UdpServer.cs" />
     <Compile Include="WebSocket\AlchemyServer.cs" />
     <Compile Include="WebSocket\AlchemyWebSocket.cs" />
-    <Compile Include="Web\HttpServer.cs" />
+    <Compile Include="HttpServer\HttpServer.cs" />
     <Compile Include="Management\NativeMethods.cs" />
     <Compile Include="Management\NetworkManager.cs" />
     <Compile Include="Management\NetworkShares.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Web\ServerFactory.cs" />
-    <Compile Include="Web\NativeWebSocket.cs" />
+    <Compile Include="HttpServer\ServerFactory.cs" />
+    <Compile Include="HttpServer\NativeWebSocket.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\MediaBrowser.Common\MediaBrowser.Common.csproj">
@@ -145,6 +149,7 @@
     <Content Include="swagger-ui\swagger-ui.js" />
     <Content Include="swagger-ui\swagger-ui.min.js" />
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PostBuildEvent>xcopy "$(TargetPath)" "$(SolutionDir)\Nuget\dlls\" /y /d /r /i</PostBuildEvent>
diff --git a/MediaBrowser.Networking/Web/HttpServer.cs b/MediaBrowser.Networking/Web/HttpServer.cs
deleted file mode 100644
index ab4b8558f..000000000
--- a/MediaBrowser.Networking/Web/HttpServer.cs
+++ /dev/null
@@ -1,554 +0,0 @@
-using System.Net.WebSockets;
-using Funq;
-using MediaBrowser.Common.Extensions;
-using MediaBrowser.Common.Kernel;
-using MediaBrowser.Common.Net;
-using MediaBrowser.Model.Logging;
-using MediaBrowser.Model.Serialization;
-using ServiceStack.Api.Swagger;
-using ServiceStack.Common.Web;
-using ServiceStack.Configuration;
-using ServiceStack.Logging.NLogger;
-using ServiceStack.ServiceHost;
-using ServiceStack.ServiceInterface.Cors;
-using ServiceStack.Text;
-using ServiceStack.WebHost.Endpoints;
-using ServiceStack.WebHost.Endpoints.Extensions;
-using ServiceStack.WebHost.Endpoints.Support;
-using System;
-using System.Globalization;
-using System.IO;
-using System.Linq;
-using System.Net;
-using System.Reactive.Linq;
-using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace MediaBrowser.Networking.Web
-{
-    /// <summary>
-    /// Class HttpServer
-    /// </summary>
-    public class HttpServer : HttpListenerBase, IHttpServer
-    {
-        /// <summary>
-        /// The logger
-        /// </summary>
-        private readonly ILogger _logger;
-
-        /// <summary>
-        /// Gets the URL prefix.
-        /// </summary>
-        /// <value>The URL prefix.</value>
-        public string UrlPrefix { get; private set; }
-
-        /// <summary>
-        /// Gets or sets the kernel.
-        /// </summary>
-        /// <value>The kernel.</value>
-        private IKernel Kernel { get; set; }
-
-        /// <summary>
-        /// Gets or sets the application host.
-        /// </summary>
-        /// <value>The application host.</value>
-        private IApplicationHost ApplicationHost { get; set; }
-
-        /// <summary>
-        /// This subscribes to HttpListener requests and finds the appropriate BaseHandler to process it
-        /// </summary>
-        /// <value>The HTTP listener.</value>
-        private IDisposable HttpListener { get; set; }
-
-        /// <summary>
-        /// Gets or sets the protobuf serializer.
-        /// </summary>
-        /// <value>The protobuf serializer.</value>
-        private IProtobufSerializer ProtobufSerializer { get; set; }
-        
-        /// <summary>
-        /// Occurs when [web socket connected].
-        /// </summary>
-        public event EventHandler<WebSocketConnectEventArgs> WebSocketConnected;
-
-        /// <summary>
-        /// Gets the default redirect path.
-        /// </summary>
-        /// <value>The default redirect path.</value>
-        private string DefaultRedirectPath { get; set; }
-
-        /// <summary>
-        /// Gets or sets the name of the server.
-        /// </summary>
-        /// <value>The name of the server.</value>
-        private string ServerName { get; set; }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="HttpServer" /> class.
-        /// </summary>
-        /// <param name="applicationHost">The application host.</param>
-        /// <param name="kernel">The kernel.</param>
-        /// <param name="protobufSerializer">The protobuf serializer.</param>
-        /// <param name="logger">The logger.</param>
-        /// <param name="serverName">Name of the server.</param>
-        /// <param name="defaultRedirectpath">The default redirectpath.</param>
-        /// <exception cref="System.ArgumentNullException">urlPrefix</exception>
-        public HttpServer(IApplicationHost applicationHost, IKernel kernel, IProtobufSerializer protobufSerializer, ILogger logger, string serverName, string defaultRedirectpath)
-            : base()
-        {
-            if (kernel == null)
-            {
-                throw new ArgumentNullException("kernel");
-            }
-            if (protobufSerializer == null)
-            {
-                throw new ArgumentNullException("protobufSerializer");
-            }
-            if (logger == null)
-            {
-                throw new ArgumentNullException("logger");
-            }
-            if (applicationHost == null)
-            {
-                throw new ArgumentNullException("applicationHost");
-            }
-            if (string.IsNullOrEmpty(serverName))
-            {
-                throw new ArgumentNullException("serverName");
-            }
-            if (string.IsNullOrEmpty(defaultRedirectpath))
-            {
-                throw new ArgumentNullException("defaultRedirectpath");
-            }
-
-            ServerName = serverName;
-            DefaultRedirectPath = defaultRedirectpath;
-            ProtobufSerializer = protobufSerializer;
-            _logger = logger;
-            ApplicationHost = applicationHost;
-
-            EndpointHostConfig.Instance.ServiceStackHandlerFactoryPath = null;
-            EndpointHostConfig.Instance.MetadataRedirectPath = "metadata";
-
-            Kernel = kernel;
-
-            EndpointHost.ConfigureHost(this, ServerName, CreateServiceManager());
-            ContentTypeFilters.Register(ContentType.ProtoBuf, (reqCtx, res, stream) => ProtobufSerializer.SerializeToStream(res, stream), (type, stream) => ProtobufSerializer.DeserializeFromStream(stream, type));
-
-            Init();
-        }
-
-        /// <summary>
-        /// Configures the specified container.
-        /// </summary>
-        /// <param name="container">The container.</param>
-        public override void Configure(Container container)
-        {
-            JsConfig.DateHandler = JsonDateHandler.ISO8601;
-            JsConfig.ExcludeTypeInfo = true;
-            JsConfig.IncludeNullValues = false;
-            
-            SetConfig(new EndpointHostConfig
-            {
-                DefaultRedirectPath = DefaultRedirectPath,
-
-                // Tell SS to bubble exceptions up to here
-                WriteErrorsToResponse = false,
-
-                DebugMode = true
-            });
-
-            container.Adapter = new ContainerAdapter(ApplicationHost);
-
-            foreach (var service in Kernel.RestServices)
-            {
-                service.Configure(this);
-            }
-
-            Plugins.Add(new SwaggerFeature());
-            Plugins.Add(new CorsFeature());
-
-            ServiceStack.Logging.LogManager.LogFactory = new NLogFactory();
-        }
-
-        /// <summary>
-        /// Starts the Web Service
-        /// </summary>
-        /// <param name="urlBase">A Uri that acts as the base that the server is listening on.
-        /// Format should be: http://127.0.0.1:8080/ or http://127.0.0.1:8080/somevirtual/
-        /// Note: the trailing slash is required! For more info see the
-        /// HttpListener.Prefixes property on MSDN.</param>
-        public override void Start(string urlBase)
-        {
-            if (string.IsNullOrEmpty(urlBase))
-            {
-                throw new ArgumentNullException("urlBase");
-            }
-
-            // *** Already running - just leave it in place
-            if (IsStarted)
-            {
-                return;
-            }
-
-            if (Listener == null)
-            {
-                Listener = new HttpListener();
-            }
-
-            EndpointHost.Config.ServiceStackHandlerFactoryPath = HttpListenerRequestWrapper.GetHandlerPathIfAny(urlBase);
-
-            UrlPrefix = urlBase;
-
-            Listener.Prefixes.Add(urlBase);
-
-            IsStarted = true;
-            Listener.Start();
-
-            HttpListener = CreateObservableStream().Subscribe(ProcessHttpRequestAsync);
-        }
-
-        /// <summary>
-        /// Creates the observable stream.
-        /// </summary>
-        /// <returns>IObservable{HttpListenerContext}.</returns>
-        private IObservable<HttpListenerContext> CreateObservableStream()
-        {
-            return Observable.Create<HttpListenerContext>(obs =>
-                                Observable.FromAsync(() => Listener.GetContextAsync())
-                                          .Subscribe(obs))
-                             .Repeat()
-                             .Retry()
-                             .Publish()
-                             .RefCount();
-        }
-
-        /// <summary>
-        /// Processes incoming http requests by routing them to the appropiate handler
-        /// </summary>
-        /// <param name="context">The CTX.</param>
-        private async void ProcessHttpRequestAsync(HttpListenerContext context)
-        {
-            LogHttpRequest(context);
-
-            if (context.Request.IsWebSocketRequest)
-            {
-                await ProcessWebSocketRequest(context).ConfigureAwait(false);
-                return;
-            }
-
-
-            Task.Run(() =>
-            {
-                RaiseReceiveWebRequest(context);
-
-                try
-                {
-                    ProcessRequest(context);
-                }
-                catch (InvalidOperationException ex)
-                {
-                    HandleException(context.Response, ex, 422);
-
-                    throw;
-                }
-                catch (ResourceNotFoundException ex)
-                {
-                    HandleException(context.Response, ex, 404);
-
-                    throw;
-                }
-                catch (FileNotFoundException ex)
-                {
-                    HandleException(context.Response, ex, 404);
-
-                    throw;
-                }
-                catch (DirectoryNotFoundException ex)
-                {
-                    HandleException(context.Response, ex, 404);
-
-                    throw;
-                }
-                catch (UnauthorizedAccessException ex)
-                {
-                    HandleException(context.Response, ex, 401);
-
-                    throw;
-                }
-                catch (ArgumentException ex)
-                {
-                    HandleException(context.Response, ex, 400);
-
-                    throw;
-                }
-                catch (Exception ex)
-                {
-                    HandleException(context.Response, ex, 500);
-
-                    throw;
-                }
-            });
-        }
-
-        /// <summary>
-        /// Processes the web socket request.
-        /// </summary>
-        /// <param name="ctx">The CTX.</param>
-        /// <returns>Task.</returns>
-        private async Task ProcessWebSocketRequest(HttpListenerContext ctx)
-        {
-            try
-            {
-                var webSocketContext = await ctx.AcceptWebSocketAsync(null).ConfigureAwait(false);
-
-                if (WebSocketConnected != null)
-                {
-                    WebSocketConnected(this, new WebSocketConnectEventArgs { WebSocket = new NativeWebSocket(webSocketContext.WebSocket, _logger), Endpoint = ctx.Request.RemoteEndPoint.ToString() });
-                }
-            }
-            catch (Exception ex)
-            {
-                _logger.ErrorException("AcceptWebSocketAsync error", ex);
-
-                ctx.Response.StatusCode = 500;
-                ctx.Response.Close();
-            }
-        }
-
-        /// <summary>
-        /// Logs the HTTP request.
-        /// </summary>
-        /// <param name="ctx">The CTX.</param>
-        private void LogHttpRequest(HttpListenerContext ctx)
-        {
-            var log = new StringBuilder();
-
-            log.AppendLine("Url: " + ctx.Request.Url);
-            log.AppendLine("Headers: " + string.Join(",", ctx.Request.Headers.AllKeys.Select(k => k + "=" + ctx.Request.Headers[k])));
-
-            var type = ctx.Request.IsWebSocketRequest ? "Web Socket" : "HTTP " + ctx.Request.HttpMethod;
-
-            if (EnableHttpRequestLogging)
-            {
-                _logger.LogMultiline(type + " request received from " + ctx.Request.RemoteEndPoint, LogSeverity.Debug, log);
-            }
-        }
-
-        /// <summary>
-        /// Appends the error message.
-        /// </summary>
-        /// <param name="response">The response.</param>
-        /// <param name="ex">The ex.</param>
-        /// <param name="statusCode">The status code.</param>
-        private void HandleException(HttpListenerResponse response, Exception ex, int statusCode)
-        {
-            _logger.ErrorException("Error processing request", ex);
-
-            response.StatusCode = statusCode;
-
-            response.Headers.Add("Status", statusCode.ToString(new CultureInfo("en-US")));
-
-            response.Headers.Remove("Age");
-            response.Headers.Remove("Expires");
-            response.Headers.Remove("Cache-Control");
-            response.Headers.Remove("Etag");
-            response.Headers.Remove("Last-Modified");
-
-            response.ContentType = "text/plain";
-
-            if (!string.IsNullOrEmpty(ex.Message))
-            {
-                response.AddHeader("X-Application-Error-Code", ex.Message);
-            }
-
-            // This could fail, but try to add the stack trace as the body content
-            try
-            {
-                var sb = new StringBuilder();
-                sb.AppendLine("{");
-                sb.AppendLine("\"ResponseStatus\":{");
-                sb.AppendFormat(" \"ErrorCode\":{0},\n", ex.GetType().Name.EncodeJson());
-                sb.AppendFormat(" \"Message\":{0},\n", ex.Message.EncodeJson());
-                sb.AppendFormat(" \"StackTrace\":{0}\n", ex.StackTrace.EncodeJson());
-                sb.AppendLine("}");
-                sb.AppendLine("}");
-
-                response.StatusCode = 500;
-                response.ContentType = ContentType.Json;
-                var sbBytes = sb.ToString().ToUtf8Bytes();
-                response.OutputStream.Write(sbBytes, 0, sbBytes.Length);
-                response.Close();
-            }
-            catch (Exception errorEx)
-            {
-                _logger.ErrorException("Error processing failed request", errorEx);
-            }
-        }
-
-
-        /// <summary>
-        /// Overridable method that can be used to implement a custom hnandler
-        /// </summary>
-        /// <param name="context">The context.</param>
-        /// <exception cref="System.NotImplementedException">Cannot execute handler:  + handler +  at PathInfo:  + httpReq.PathInfo</exception>
-        protected override void ProcessRequest(HttpListenerContext context)
-        {
-            if (string.IsNullOrEmpty(context.Request.RawUrl)) return;
-
-            var operationName = context.Request.GetOperationName();
-
-            var httpReq = new HttpListenerRequestWrapper(operationName, context.Request);
-            var httpRes = new HttpListenerResponseWrapper(context.Response);
-            var handler = ServiceStackHttpHandlerFactory.GetHandler(httpReq);
-
-            var serviceStackHandler = handler as IServiceStackHttpHandler;
-
-            if (serviceStackHandler != null)
-            {
-                var restHandler = serviceStackHandler as RestHandler;
-                if (restHandler != null)
-                {
-                    httpReq.OperationName = operationName = restHandler.RestPath.RequestType.Name;
-                }
-                serviceStackHandler.ProcessRequest(httpReq, httpRes, operationName);
-                LogResponse(context);
-                httpRes.Close();
-                return;
-            }
-
-            throw new NotImplementedException("Cannot execute handler: " + handler + " at PathInfo: " + httpReq.PathInfo);
-        }
-
-        /// <summary>
-        /// Logs the response.
-        /// </summary>
-        /// <param name="ctx">The CTX.</param>
-        private void LogResponse(HttpListenerContext ctx)
-        {
-            var statusode = ctx.Response.StatusCode;
-
-            var log = new StringBuilder();
-
-            log.AppendLine(string.Format("Url: {0}", ctx.Request.Url));
-
-            log.AppendLine("Headers: " + string.Join(",", ctx.Response.Headers.AllKeys.Select(k => k + "=" + ctx.Response.Headers[k])));
-
-            var msg = "Http Response Sent (" + statusode + ") to " + ctx.Request.RemoteEndPoint;
-
-            if (EnableHttpRequestLogging)
-            {
-                _logger.LogMultiline(msg, LogSeverity.Debug, log);
-            }
-        }
-
-        /// <summary>
-        /// Creates the service manager.
-        /// </summary>
-        /// <param name="assembliesWithServices">The assemblies with services.</param>
-        /// <returns>ServiceManager.</returns>
-        protected override ServiceManager CreateServiceManager(params Assembly[] assembliesWithServices)
-        {
-            var types = Kernel.RestServices.Select(r => r.GetType()).ToArray();
-
-            return new ServiceManager(new Container(), new ServiceController(() => types));
-        }
-
-        /// <summary>
-        /// Shut down the Web Service
-        /// </summary>
-        public override void Stop()
-        {
-            if (HttpListener != null)
-            {
-                HttpListener.Dispose();
-                HttpListener = null;
-            }
-
-            if (Listener != null)
-            {
-                Listener.Prefixes.Remove(UrlPrefix);
-            }
-
-            base.Stop();
-        }
-
-        /// <summary>
-        /// The _supports native web socket
-        /// </summary>
-        private bool? _supportsNativeWebSocket;
-
-        /// <summary>
-        /// Gets a value indicating whether [supports web sockets].
-        /// </summary>
-        /// <value><c>true</c> if [supports web sockets]; otherwise, <c>false</c>.</value>
-        public bool SupportsWebSockets
-        {
-            get
-            {
-                if (!_supportsNativeWebSocket.HasValue)
-                {
-                    try
-                    {
-                        new ClientWebSocket();
-
-                        _supportsNativeWebSocket = true;
-                    }
-                    catch (PlatformNotSupportedException)
-                    {
-                        _supportsNativeWebSocket = false;
-                    }
-                }
-
-                return _supportsNativeWebSocket.Value;
-            }
-        }
-
-
-        /// <summary>
-        /// Gets or sets a value indicating whether [enable HTTP request logging].
-        /// </summary>
-        /// <value><c>true</c> if [enable HTTP request logging]; otherwise, <c>false</c>.</value>
-        public bool EnableHttpRequestLogging { get; set; }
-    }
-
-    /// <summary>
-    /// Class ContainerAdapter
-    /// </summary>
-    class ContainerAdapter : IContainerAdapter
-    {
-        /// <summary>
-        /// The _app host
-        /// </summary>
-        private readonly IApplicationHost _appHost;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ContainerAdapter" /> class.
-        /// </summary>
-        /// <param name="appHost">The app host.</param>
-        public ContainerAdapter(IApplicationHost appHost)
-        {
-            _appHost = appHost;
-        }
-        /// <summary>
-        /// Resolves this instance.
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <returns>``0.</returns>
-        public T Resolve<T>()
-        {
-            return _appHost.Resolve<T>();
-        }
-
-        /// <summary>
-        /// Tries the resolve.
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <returns>``0.</returns>
-        public T TryResolve<T>()
-        {
-            return _appHost.TryResolve<T>();
-        }
-    }
-}
\ No newline at end of file
diff --git a/MediaBrowser.Networking/Web/NativeWebSocket.cs b/MediaBrowser.Networking/Web/NativeWebSocket.cs
deleted file mode 100644
index ad28d1a7f..000000000
--- a/MediaBrowser.Networking/Web/NativeWebSocket.cs
+++ /dev/null
@@ -1,145 +0,0 @@
-using MediaBrowser.Model.Logging;
-using System;
-using System.Net.WebSockets;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace MediaBrowser.Common.Net
-{
-    /// <summary>
-    /// Class NativeWebSocket
-    /// </summary>
-    public class NativeWebSocket : IWebSocket
-    {
-        /// <summary>
-        /// The logger
-        /// </summary>
-        private readonly ILogger _logger;
-
-        /// <summary>
-        /// Gets or sets the web socket.
-        /// </summary>
-        /// <value>The web socket.</value>
-        private WebSocket WebSocket { get; set; }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="NativeWebSocket" /> class.
-        /// </summary>
-        /// <param name="socket">The socket.</param>
-        /// <param name="logger">The logger.</param>
-        /// <exception cref="System.ArgumentNullException">socket</exception>
-        public NativeWebSocket(WebSocket socket, ILogger logger)
-        {
-            if (socket == null)
-            {
-                throw new ArgumentNullException("socket");
-            }
-
-            if (logger == null)
-            {
-                throw new ArgumentNullException("logger");
-            }
-
-            _logger = logger;
-            WebSocket = socket;
-
-            Receive();
-        }
-
-        /// <summary>
-        /// Gets or sets the state.
-        /// </summary>
-        /// <value>The state.</value>
-        public WebSocketState State
-        {
-            get { return WebSocket.State; }
-        }
-
-        /// <summary>
-        /// Receives this instance.
-        /// </summary>
-        private async void Receive()
-        {
-            while (true)
-            {
-                byte[] bytes;
-
-                try
-                {
-                    bytes = await ReceiveBytesAsync(CancellationToken.None).ConfigureAwait(false);
-                }
-                catch (WebSocketException ex)
-                {
-                    _logger.ErrorException("Error reveiving web socket message", ex);
-
-                    break;
-                }
-
-                if (OnReceiveDelegate != null)
-                {
-                    OnReceiveDelegate(bytes);
-                }
-            }
-        }
-
-        /// <summary>
-        /// Receives the async.
-        /// </summary>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        /// <returns>Task{WebSocketMessageInfo}.</returns>
-        /// <exception cref="System.Net.WebSockets.WebSocketException">Connection closed</exception>
-        private async Task<byte[]> ReceiveBytesAsync(CancellationToken cancellationToken)
-        {
-            var bytes = new byte[4096];
-            var buffer = new ArraySegment<byte>(bytes);
-
-            var result = await WebSocket.ReceiveAsync(buffer, cancellationToken).ConfigureAwait(false);
-
-            if (result.CloseStatus.HasValue)
-            {
-                throw new WebSocketException("Connection closed");
-            }
-
-            return buffer.Array;
-        }
-
-        /// <summary>
-        /// Sends the async.
-        /// </summary>
-        /// <param name="bytes">The bytes.</param>
-        /// <param name="type">The type.</param>
-        /// <param name="endOfMessage">if set to <c>true</c> [end of message].</param>
-        /// <param name="cancellationToken">The cancellation token.</param>
-        /// <returns>Task.</returns>
-        public Task SendAsync(byte[] bytes, WebSocketMessageType type, bool endOfMessage, CancellationToken cancellationToken)
-        {
-            return WebSocket.SendAsync(new ArraySegment<byte>(bytes), type, true, cancellationToken);
-        }
-
-        /// <summary>
-        /// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.
-        /// </summary>
-        public void Dispose()
-        {
-            Dispose(true);
-        }
-
-        /// <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)
-        {
-            if (dispose)
-            {
-                WebSocket.Dispose();
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the receive action.
-        /// </summary>
-        /// <value>The receive action.</value>
-        public Action<byte[]> OnReceiveDelegate { get; set; }
-    }
-}
diff --git a/MediaBrowser.Networking/Web/ServerFactory.cs b/MediaBrowser.Networking/Web/ServerFactory.cs
deleted file mode 100644
index b93f2ca1c..000000000
--- a/MediaBrowser.Networking/Web/ServerFactory.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using MediaBrowser.Common.Kernel;
-using MediaBrowser.Common.Net;
-using MediaBrowser.Model.Logging;
-using MediaBrowser.Model.Serialization;
-
-namespace MediaBrowser.Networking.Web
-{
-    /// <summary>
-    /// Class ServerFactory
-    /// </summary>
-    public static class ServerFactory
-    {
-        /// <summary>
-        /// Creates the server.
-        /// </summary>
-        /// <param name="applicationHost">The application host.</param>
-        /// <param name="kernel">The kernel.</param>
-        /// <param name="protobufSerializer">The protobuf serializer.</param>
-        /// <param name="logger">The logger.</param>
-        /// <param name="serverName">Name of the server.</param>
-        /// <param name="defaultRedirectpath">The default redirectpath.</param>
-        /// <returns>IHttpServer.</returns>
-        public static IHttpServer CreateServer(IApplicationHost applicationHost, IKernel kernel, IProtobufSerializer protobufSerializer, ILogger logger, string serverName, string defaultRedirectpath)
-        {
-            return new HttpServer(applicationHost, kernel, protobufSerializer, logger, serverName, defaultRedirectpath);
-        }
-    }
-}
diff --git a/MediaBrowser.Networking/WebSocket/AlchemyWebSocket.cs b/MediaBrowser.Networking/WebSocket/AlchemyWebSocket.cs
index 5eca1a78c..c8ab58ca4 100644
--- a/MediaBrowser.Networking/WebSocket/AlchemyWebSocket.cs
+++ b/MediaBrowser.Networking/WebSocket/AlchemyWebSocket.cs
@@ -2,7 +2,6 @@
 using MediaBrowser.Common.Net;
 using MediaBrowser.Model.Logging;
 using System;
-using System.Net.WebSockets;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
diff --git a/MediaBrowser.Server.Implementations/WorldWeatherOnline/WeatherProvider.cs b/MediaBrowser.Server.Implementations/WorldWeatherOnline/WeatherProvider.cs
index 1b75a58b8..39ac203fc 100644
--- a/MediaBrowser.Server.Implementations/WorldWeatherOnline/WeatherProvider.cs
+++ b/MediaBrowser.Server.Implementations/WorldWeatherOnline/WeatherProvider.cs
@@ -1,4 +1,5 @@
-using MediaBrowser.Controller;
+using MediaBrowser.Common.Net;
+using MediaBrowser.Controller;
 using MediaBrowser.Controller.Weather;
 using MediaBrowser.Model.Logging;
 using MediaBrowser.Model.Serialization;
@@ -28,25 +29,34 @@ namespace MediaBrowser.Server.Implementations.WorldWeatherOnline
         /// <value>The json serializer.</value>
         protected IJsonSerializer JsonSerializer { get; private set; }
 
+        /// <summary>
+        /// The _HTTP client
+        /// </summary>
+        private IHttpClient HttpClient { get; set; }
+        
         /// <summary>
         /// Initializes a new instance of the <see cref="WeatherProvider" /> class.
         /// </summary>
         /// <param name="jsonSerializer">The json serializer.</param>
         /// <param name="logger">The logger.</param>
         /// <exception cref="System.ArgumentNullException">logger</exception>
-        public WeatherProvider(IJsonSerializer jsonSerializer, ILogger logger)
+        public WeatherProvider(IJsonSerializer jsonSerializer, IHttpClient httpClient, ILogger logger)
         {
             if (logger == null)
             {
                 throw new ArgumentNullException("logger");
             }
-
+            if (httpClient == null)
+            {
+                throw new ArgumentNullException("httpClient");
+            }
             if (jsonSerializer == null)
             {
                 throw new ArgumentNullException("jsonSerializer");
             }
 
             JsonSerializer = jsonSerializer;
+            HttpClient = httpClient;
             Logger = logger;
         }
 
@@ -81,7 +91,7 @@ namespace MediaBrowser.Server.Implementations.WorldWeatherOnline
 
             Logger.Info("Accessing weather from " + url);
 
-            using (var stream = await Kernel.Instance.HttpManager.Get(url, _weatherSemaphore, cancellationToken).ConfigureAwait(false))
+            using (var stream = await HttpClient.Get(url, _weatherSemaphore, cancellationToken).ConfigureAwait(false))
             {
                 var data = JsonSerializer.DeserializeFromStream<WeatherResult>(stream).data;
 
diff --git a/MediaBrowser.ServerApplication/ApplicationHost.cs b/MediaBrowser.ServerApplication/ApplicationHost.cs
index 40e190756..88eb1c7e1 100644
--- a/MediaBrowser.ServerApplication/ApplicationHost.cs
+++ b/MediaBrowser.ServerApplication/ApplicationHost.cs
@@ -15,9 +15,10 @@ using MediaBrowser.Model.MediaInfo;
 using MediaBrowser.Model.Serialization;
 using MediaBrowser.Model.System;
 using MediaBrowser.Model.Updates;
+using MediaBrowser.Networking.HttpManager;
+using MediaBrowser.Networking.HttpServer;
 using MediaBrowser.Networking.Management;
 using MediaBrowser.Networking.Udp;
-using MediaBrowser.Networking.Web;
 using MediaBrowser.Networking.WebSocket;
 using MediaBrowser.Server.Implementations;
 using MediaBrowser.ServerApplication.Implementations;
@@ -44,12 +45,6 @@ namespace MediaBrowser.ServerApplication
         /// <value>The logger.</value>
         private ILogger Logger { get; set; }
 
-        /// <summary>
-        /// Gets or sets the iso manager.
-        /// </summary>
-        /// <value>The iso manager.</value>
-        private IIsoManager IsoManager { get; set; }
-
         /// <summary>
         /// Gets or sets the log file path.
         /// </summary>
@@ -143,14 +138,12 @@ namespace MediaBrowser.ServerApplication
             RegisterSingleInstance<IApplicationHost>(this);
             RegisterSingleInstance(Logger);
 
-            IsoManager = new PismoIsoManager(Logger);
-
             RegisterSingleInstance(_applicationPaths);
             RegisterSingleInstance<IApplicationPaths>(_applicationPaths);
-
-            RegisterSingleInstance(IsoManager);
             RegisterSingleInstance(_taskManager);
+            RegisterSingleInstance<IIsoManager>(() => new PismoIsoManager(Logger));
             RegisterSingleInstance<IBlurayExaminer>(() => new BdInfoExaminer());
+            RegisterSingleInstance<IHttpClient>(() => new HttpManager(_applicationPaths, Logger));
             RegisterSingleInstance<INetworkManager>(() => new NetworkManager());
             RegisterSingleInstance<IZipClient>(() => new DotNetZipClient());
             RegisterSingleInstance<IWebSocketServer>(() => new AlchemyServer(Logger));
@@ -477,8 +470,6 @@ namespace MediaBrowser.ServerApplication
         /// <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)
         {
-            IsoManager.Dispose();
-
             foreach (var part in _disposableParts)
             {
                 part.Dispose();
@@ -487,12 +478,4 @@ namespace MediaBrowser.ServerApplication
             _disposableParts.Clear();
         }
     }
-
-    public class MyClass
-    {
-        public MyClass()
-        {
-            
-        }
-    }
 }
diff --git a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj
index 8a3a0b7af..c843242c3 100644
--- a/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj
+++ b/MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj
@@ -367,15 +367,6 @@
     <Content Include="CorePlugins\MediaBrowser.Api.dll">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="CorePlugins\MediaBrowser.ApiInteraction.Javascript.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="CorePlugins\MediaBrowser.Server.Sqlite.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="CorePlugins\MediaBrowser.Server.WorldWeatherOnline.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
     <Content Include="CorePlugins\MediaBrowser.WebDashboard.dll">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
diff --git a/Nuget/MediaBrowser.ApiClient.nuspec b/Nuget/MediaBrowser.ApiClient.nuspec
index bcb9a7d07..f889230a5 100644
--- a/Nuget/MediaBrowser.ApiClient.nuspec
+++ b/Nuget/MediaBrowser.ApiClient.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
     <metadata>
         <id>MediaBrowser.ApiClient</id>
-        <version>3.0.0.2-beta</version>
+        <version>3.0.0.4-beta</version>
         <title>MediaBrowser.ApiClient</title>
         <authors>Media Browser Team</authors>
         <owners>scottisafool,Luke</owners>
@@ -12,13 +12,13 @@
         <dependencies>
             <group targetFramework=".NETFramework4.5">
                 <dependency id="ServiceStack.Text" version="3.9.37" />
-				<dependency id="protobuf-net" version="2.0.0.621" />
+                <dependency id="protobuf-net" version="2.0.0.621" />
             </group>
             <group targetFramework=".NETPortable0.0-net45+sl4+wp71+win8">
                 <dependency id="Newtonsoft.Json" version="4.5.11" />
                 <dependency id="Microsoft.Bcl.Async" version="1.0.14-rc" />
                 <dependency id="Microsoft.Net.Http" version="2.1.3-beta" />
-				<dependency id="protobuf-net" version="2.0.0.621" />
+                <dependency id="protobuf-net" version="2.0.0.621" />
             </group>
         </dependencies>
     </metadata>
diff --git a/Nuget/MediaBrowser.Common.Internal.nuspec b/Nuget/MediaBrowser.Common.Internal.nuspec
index 9e431b767..8f1d5f259 100644
--- a/Nuget/MediaBrowser.Common.Internal.nuspec
+++ b/Nuget/MediaBrowser.Common.Internal.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <metadata>
         <id>MediaBrowser.Common.Internal</id>
-        <version>3.0.1</version>
+        <version>3.0.4</version>
         <title />
         <authors>Luke</authors>
         <owners>Media Browser Team</owners>
@@ -15,10 +15,11 @@
         </dependencies>
     </metadata>
     <files>
-        <file src="lib\net45\MediaBrowser.ClickOnce.dll" target="lib\net45\MediaBrowser.ClickOnce.dll" />
-        <file src="lib\net45\MediaBrowser.IsoMounter.dll" target="lib\net45\MediaBrowser.IsoMounter.dll" />
-        <file src="lib\net45\MediaBrowser.Logging.NLog.dll" target="lib\net45\MediaBrowser.Logging.NLog.dll" />
-        <file src="lib\net45\MediaBrowser.Networking.dll" target="lib\net45\MediaBrowser.Networking.dll" />
-        <file src="lib\net45\pfmclrapi.dll" target="lib\net45\pfmclrapi.dll" />
+        <file src="dlls\MediaBrowser.ClickOnce.dll" target="lib\net45\MediaBrowser.ClickOnce.dll" />
+        <file src="dlls\MediaBrowser.Common.Implementations.dll" target="lib\net45\MediaBrowser.Common.Implementations.dll" />
+        <file src="dlls\MediaBrowser.IsoMounter.dll" target="lib\net45\MediaBrowser.IsoMounter.dll" />
+        <file src="dlls\MediaBrowser.Logging.NLog.dll" target="lib\net45\MediaBrowser.Logging.NLog.dll" />
+        <file src="dlls\MediaBrowser.Networking.dll" target="lib\net45\MediaBrowser.Networking.dll" />
+        <file src="dlls\pfmclrapi.dll" target="lib\net45\pfmclrapi.dll" />
     </files>
 </package>
\ No newline at end of file
diff --git a/Nuget/MediaBrowser.Common.nuspec b/Nuget/MediaBrowser.Common.nuspec
index b6ca6ae02..dc8a10b9d 100644
--- a/Nuget/MediaBrowser.Common.nuspec
+++ b/Nuget/MediaBrowser.Common.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <metadata>
         <id>MediaBrowser.Common</id>
-        <version>1.0.1</version>
+        <version>3.0.4</version>
         <title>MediaBrowser.Common</title>
         <authors>Media Browser Team</authors>
         <owners />
diff --git a/Nuget/MediaBrowser.Server.Core.nuspec b/Nuget/MediaBrowser.Server.Core.nuspec
index 82fb2c531..80d0b82a0 100644
--- a/Nuget/MediaBrowser.Server.Core.nuspec
+++ b/Nuget/MediaBrowser.Server.Core.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <metadata>
         <id>MediaBrowser.Server.Core</id>
-        <version>1.0.0</version>
+        <version>3.0.4</version>
         <title>Media Browser.Server.Core</title>
         <authors>Media Browser Team</authors>
         <owners />
@@ -10,7 +10,7 @@
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
         <description>Contains core components required to build plugins for Media Browser Server.</description>
         <dependencies>
-            <dependency id="MediaBrowser.Common" version="1.0.1" />
+            <dependency id="MediaBrowser.Common" version="3.0.2" />
         </dependencies>
     </metadata>
     <files>
-- 
cgit v1.2.3