update portable projects

9 files changed, 3 insertions, 1420 deletions

diff --git a/MediaBrowser.Server.Implementations/Configuration/ServerConfigurationManager.cs b/MediaBrowser.Server.Implementations/Configuration/ServerConfigurationManager.cs
deleted file mode 100644
index 4b6195192..000000000
--- a/MediaBrowser.Server.Implementations/Configuration/ServerConfigurationManager.cs
+++ /dev/null
@@ -1,259 +0,0 @@
-using System.Collections.Generic;
-using MediaBrowser.Common.Configuration;
-using MediaBrowser.Common.Events;
-using Emby.Common.Implementations.Configuration;
-using MediaBrowser.Controller;
-using MediaBrowser.Controller.Configuration;
-using MediaBrowser.Controller.Entities;
-using MediaBrowser.Controller.Entities.Audio;
-using MediaBrowser.Controller.Entities.Movies;
-using MediaBrowser.Controller.Entities.TV;
-using MediaBrowser.Model.Configuration;
-using MediaBrowser.Model.Events;
-using MediaBrowser.Model.Logging;
-using MediaBrowser.Model.Serialization;
-using System;
-using System.IO;
-using System.Linq;
-using MediaBrowser.Common.IO;
-using MediaBrowser.Controller.IO;
-using MediaBrowser.Model.IO;
-
-namespace MediaBrowser.Server.Implementations.Configuration
-{
-    /// <summary>
-    /// Class ServerConfigurationManager
-    /// </summary>
-    public class ServerConfigurationManager : BaseConfigurationManager, IServerConfigurationManager
-    {
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ServerConfigurationManager" /> class.
-        /// </summary>
-        /// <param name="applicationPaths">The application paths.</param>
-        /// <param name="logManager">The log manager.</param>
-        /// <param name="xmlSerializer">The XML serializer.</param>
-        /// <param name="fileSystem">The file system.</param>
-        public ServerConfigurationManager(IApplicationPaths applicationPaths, ILogManager logManager, IXmlSerializer xmlSerializer, IFileSystem fileSystem)
-            : base(applicationPaths, logManager, xmlSerializer, fileSystem)
-        {
-            UpdateMetadataPath();
-        }
-
-        public event EventHandler<GenericEventArgs<ServerConfiguration>> ConfigurationUpdating;
-
-        /// <summary>
-        /// Gets the type of the configuration.
-        /// </summary>
-        /// <value>The type of the configuration.</value>
-        protected override Type ConfigurationType
-        {
-            get { return typeof(ServerConfiguration); }
-        }
-
-        /// <summary>
-        /// Gets the application paths.
-        /// </summary>
-        /// <value>The application paths.</value>
-        public IServerApplicationPaths ApplicationPaths
-        {
-            get { return (IServerApplicationPaths)CommonApplicationPaths; }
-        }
-
-        /// <summary>
-        /// Gets the configuration.
-        /// </summary>
-        /// <value>The configuration.</value>
-        public ServerConfiguration Configuration
-        {
-            get { return (ServerConfiguration)CommonConfiguration; }
-        }
-
-        /// <summary>
-        /// Called when [configuration updated].
-        /// </summary>
-        protected override void OnConfigurationUpdated()
-        {
-            UpdateMetadataPath();
-
-            base.OnConfigurationUpdated();
-        }
-
-        public override void AddParts(IEnumerable<IConfigurationFactory> factories)
-        {
-            base.AddParts(factories);
-
-            UpdateTranscodingTempPath();
-        }
-
-        /// <summary>
-        /// Updates the metadata path.
-        /// </summary>
-        private void UpdateMetadataPath()
-        {
-            string metadataPath;
-
-            if (string.IsNullOrWhiteSpace(Configuration.MetadataPath))
-            {
-                metadataPath = GetInternalMetadataPath();
-            }
-            else
-            {
-                metadataPath = Path.Combine(Configuration.MetadataPath, "metadata");
-            }
-
-            ((ServerApplicationPaths)ApplicationPaths).InternalMetadataPath = metadataPath;
-
-            ((ServerApplicationPaths)ApplicationPaths).ItemsByNamePath = ((ServerApplicationPaths)ApplicationPaths).InternalMetadataPath;
-        }
-
-        private string GetInternalMetadataPath()
-        {
-            return Path.Combine(ApplicationPaths.ProgramDataPath, "metadata");
-        }
-
-        /// <summary>
-        /// Updates the transcoding temporary path.
-        /// </summary>
-        private void UpdateTranscodingTempPath()
-        {
-            var encodingConfig = this.GetConfiguration<EncodingOptions>("encoding");
-
-            ((ServerApplicationPaths)ApplicationPaths).TranscodingTempPath = string.IsNullOrEmpty(encodingConfig.TranscodingTempPath) ?
-                null :
-                Path.Combine(encodingConfig.TranscodingTempPath, "transcoding-temp");
-        }
-
-        protected override void OnNamedConfigurationUpdated(string key, object configuration)
-        {
-            base.OnNamedConfigurationUpdated(key, configuration);
-
-            if (string.Equals(key, "encoding", StringComparison.OrdinalIgnoreCase))
-            {
-                UpdateTranscodingTempPath();
-            }
-        }
-
-        /// <summary>
-        /// Replaces the configuration.
-        /// </summary>
-        /// <param name="newConfiguration">The new configuration.</param>
-        /// <exception cref="System.IO.DirectoryNotFoundException"></exception>
-        public override void ReplaceConfiguration(BaseApplicationConfiguration newConfiguration)
-        {
-            var newConfig = (ServerConfiguration)newConfiguration;
-
-            ValidatePathSubstitutions(newConfig);
-            ValidateMetadataPath(newConfig);
-            ValidateSslCertificate(newConfig);
-
-            EventHelper.FireEventIfNotNull(ConfigurationUpdating, this, new GenericEventArgs<ServerConfiguration> { Argument = newConfig }, Logger);
-
-            base.ReplaceConfiguration(newConfiguration);
-        }
-
-
-        /// <summary>
-        /// Validates the SSL certificate.
-        /// </summary>
-        /// <param name="newConfig">The new configuration.</param>
-        /// <exception cref="System.IO.DirectoryNotFoundException"></exception>
-        private void ValidateSslCertificate(BaseApplicationConfiguration newConfig)
-        {
-            var serverConfig = (ServerConfiguration)newConfig;
-
-            var newPath = serverConfig.CertificatePath;
-
-            if (!string.IsNullOrWhiteSpace(newPath)
-                && !string.Equals(Configuration.CertificatePath ?? string.Empty, newPath))
-            {
-                // Validate
-                if (!FileSystem.FileExists(newPath))
-                {
-                    throw new FileNotFoundException(string.Format("Certificate file '{0}' does not exist.", newPath));
-                }
-            }
-        }
-
-        private void ValidatePathSubstitutions(ServerConfiguration newConfig)
-        {
-            foreach (var map in newConfig.PathSubstitutions)
-            {
-                if (string.IsNullOrWhiteSpace(map.From) || string.IsNullOrWhiteSpace(map.To))
-                {
-                    throw new ArgumentException("Invalid path substitution");
-                }
-            }
-        }
-
-        /// <summary>
-        /// Validates the metadata path.
-        /// </summary>
-        /// <param name="newConfig">The new configuration.</param>
-        /// <exception cref="System.IO.DirectoryNotFoundException"></exception>
-        private void ValidateMetadataPath(ServerConfiguration newConfig)
-        {
-            var newPath = newConfig.MetadataPath;
-
-            if (!string.IsNullOrWhiteSpace(newPath)
-                && !string.Equals(Configuration.MetadataPath ?? string.Empty, newPath))
-            {
-                // Validate
-                if (!FileSystem.DirectoryExists(newPath))
-                {
-                    throw new DirectoryNotFoundException(string.Format("{0} does not exist.", newPath));
-                }
-
-                EnsureWriteAccess(newPath);
-            }
-        }
-
-        public void DisableMetadataService(string service)
-        {
-            DisableMetadataService(typeof(Movie), Configuration, service);
-            DisableMetadataService(typeof(Episode), Configuration, service);
-            DisableMetadataService(typeof(Series), Configuration, service);
-            DisableMetadataService(typeof(Season), Configuration, service);
-            DisableMetadataService(typeof(MusicArtist), Configuration, service);
-            DisableMetadataService(typeof(MusicAlbum), Configuration, service);
-            DisableMetadataService(typeof(MusicVideo), Configuration, service);
-            DisableMetadataService(typeof(Video), Configuration, service);
-        }
-
-        private void DisableMetadataService(Type type, ServerConfiguration config, string service)
-        {
-            var options = GetMetadataOptions(type, config);
-
-            if (!options.DisabledMetadataSavers.Contains(service, StringComparer.OrdinalIgnoreCase))
-            {
-                var list = options.DisabledMetadataSavers.ToList();
-
-                list.Add(service);
-
-                options.DisabledMetadataSavers = list.ToArray();
-            }
-        }
-
-        private MetadataOptions GetMetadataOptions(Type type, ServerConfiguration config)
-        {
-            var options = config.MetadataOptions
-                .FirstOrDefault(i => string.Equals(i.ItemType, type.Name, StringComparison.OrdinalIgnoreCase));
-
-            if (options == null)
-            {
-                var list = config.MetadataOptions.ToList();
-
-                options = new MetadataOptions
-                {
-                    ItemType = type.Name
-                };
-
-                list.Add(options);
-
-                config.MetadataOptions = list.ToArray();
-            }
-
-            return options;
-        }
-    }
-}
diff --git a/MediaBrowser.Server.Implementations/Devices/CameraUploadsFolder.cs b/MediaBrowser.Server.Implementations/Devices/CameraUploadsFolder.cs
index 19a0593e3..882701885 100644
--- a/MediaBrowser.Server.Implementations/Devices/CameraUploadsFolder.cs
+++ b/MediaBrowser.Server.Implementations/Devices/CameraUploadsFolder.cs
@@ -10,6 +10,7 @@ using MediaBrowser.Common.IO;
 using MediaBrowser.Controller.IO;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Controller.Providers;
+using MediaBrowser.Model.Serialization;
 
 namespace MediaBrowser.Server.Implementations.Devices
 {
diff --git a/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs b/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs
deleted file mode 100644
index f0a9c5ca3..000000000
--- a/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs
+++ /dev/null
@@ -1,764 +0,0 @@
-using MediaBrowser.Common.Extensions;
-using MediaBrowser.Controller.Configuration;
-using MediaBrowser.Controller.Net;
-using MediaBrowser.Model.Logging;
-using ServiceStack;
-using ServiceStack.Host;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Net.Security;
-using System.Net.Sockets;
-using System.Reflection;
-using System.Security.Cryptography.X509Certificates;
-using System.Threading.Tasks;
-using Emby.Common.Implementations.Net;
-using Emby.Server.Implementations.HttpServer;
-using Emby.Server.Implementations.HttpServer.SocketSharp;
-using MediaBrowser.Common.Net;
-using MediaBrowser.Common.Security;
-using MediaBrowser.Controller;
-using MediaBrowser.Model.Cryptography;
-using MediaBrowser.Model.Extensions;
-using MediaBrowser.Model.IO;
-using MediaBrowser.Model.Net;
-using MediaBrowser.Model.Serialization;
-using MediaBrowser.Model.Services;
-using MediaBrowser.Model.Text;
-using ServiceStack.Text.Jsv;
-using SocketHttpListener.Net;
-using SocketHttpListener.Primitives;
-
-namespace MediaBrowser.Server.Implementations.HttpServer
-{
-    public class HttpListenerHost : ServiceStackHost, IHttpServer
-    {
-        private string DefaultRedirectPath { get; set; }
-
-        private readonly ILogger _logger;
-        public IEnumerable<string> UrlPrefixes { get; private set; }
-
-        private readonly List<IService> _restServices = new List<IService>();
-
-        private IHttpListener _listener;
-
-        public event EventHandler<WebSocketConnectEventArgs> WebSocketConnected;
-        public event EventHandler<WebSocketConnectingEventArgs> WebSocketConnecting;
-
-        public string CertificatePath { get; private set; }
-
-        private readonly IServerConfigurationManager _config;
-        private readonly INetworkManager _networkManager;
-        private readonly IMemoryStreamFactory _memoryStreamProvider;
-
-        private readonly IServerApplicationHost _appHost;
-
-        private readonly ITextEncoding _textEncoding;
-        private readonly ISocketFactory _socketFactory;
-        private readonly ICryptoProvider _cryptoProvider;
-
-        private readonly IJsonSerializer _jsonSerializer;
-        private readonly IXmlSerializer _xmlSerializer;
-
-        public HttpListenerHost(IServerApplicationHost applicationHost,
-            ILogManager logManager,
-            IServerConfigurationManager config,
-            string serviceName,
-            string defaultRedirectPath, INetworkManager networkManager, IMemoryStreamFactory memoryStreamProvider, ITextEncoding textEncoding, ISocketFactory socketFactory, ICryptoProvider cryptoProvider, IJsonSerializer jsonSerializer, IXmlSerializer xmlSerializer)
-            : base(serviceName, new Assembly[] { })
-        {
-            _appHost = applicationHost;
-            DefaultRedirectPath = defaultRedirectPath;
-            _networkManager = networkManager;
-            _memoryStreamProvider = memoryStreamProvider;
-            _textEncoding = textEncoding;
-            _socketFactory = socketFactory;
-            _cryptoProvider = cryptoProvider;
-            _jsonSerializer = jsonSerializer;
-            _xmlSerializer = xmlSerializer;
-            _config = config;
-
-            _logger = logManager.GetLogger("HttpServer");
-        }
-
-        public string GlobalResponse { get; set; }
-
-        public override void Configure()
-        {
-            var mapExceptionToStatusCode = new Dictionary<Type, int>
-            {
-                {typeof (InvalidOperationException), 500},
-                {typeof (NotImplementedException), 500},
-                {typeof (ResourceNotFoundException), 404},
-                {typeof (FileNotFoundException), 404},
-                {typeof (DirectoryNotFoundException), 404},
-                {typeof (SecurityException), 401},
-                {typeof (PaymentRequiredException), 402},
-                {typeof (UnauthorizedAccessException), 500},
-                {typeof (ApplicationException), 500},
-                {typeof (PlatformNotSupportedException), 500},
-                {typeof (NotSupportedException), 500}
-            };
-
-            var requestFilters = _appHost.GetExports<IRequestFilter>().ToList();
-            foreach (var filter in requestFilters)
-            {
-                GlobalRequestFilters.Add(filter.Filter);
-            }
-
-            GlobalResponseFilters.Add(new ResponseFilter(_logger).FilterResponse);
-        }
-
-        protected override ILogger Logger
-        {
-            get
-            {
-                return _logger;
-            }
-        }
-
-        public override T Resolve<T>()
-        {
-            return _appHost.Resolve<T>();
-        }
-
-        public override Type[] GetGenericArguments(Type type)
-        {
-            return type.GetGenericArguments();
-        }
-
-        public override bool IsAssignableFrom(Type type1, Type type2)
-        {
-            return type1.IsAssignableFrom(type2);
-        }
-
-        public override T TryResolve<T>()
-        {
-            return _appHost.TryResolve<T>();
-        }
-
-        public override object CreateInstance(Type type)
-        {
-            return _appHost.CreateInstance(type);
-        }
-
-        protected override ServiceController CreateServiceController(params Assembly[] assembliesWithServices)
-        {
-            var types = _restServices.Select(r => r.GetType()).ToArray();
-
-            return new ServiceController(this, () => types);
-        }
-
-        public override ServiceStackHost Start(string listeningAtUrlBase)
-        {
-            StartListener();
-            return this;
-        }
-
-        /// <summary>
-        /// Starts the Web Service
-        /// </summary>
-        private void StartListener()
-        {
-            WebSocketSharpRequest.HandlerFactoryPath = GetHandlerPathIfAny(UrlPrefixes.First());
-
-            _listener = GetListener();
-
-            _listener.WebSocketConnected = OnWebSocketConnected;
-            _listener.WebSocketConnecting = OnWebSocketConnecting;
-            _listener.ErrorHandler = ErrorHandler;
-            _listener.RequestHandler = RequestHandler;
-
-            _listener.Start(UrlPrefixes);
-        }
-
-        public static string GetHandlerPathIfAny(string listenerUrl)
-        {
-            if (listenerUrl == null) return null;
-            var pos = listenerUrl.IndexOf("://", StringComparison.OrdinalIgnoreCase);
-            if (pos == -1) return null;
-            var startHostUrl = listenerUrl.Substring(pos + "://".Length);
-            var endPos = startHostUrl.IndexOf('/');
-            if (endPos == -1) return null;
-            var endHostUrl = startHostUrl.Substring(endPos + 1);
-            return string.IsNullOrEmpty(endHostUrl) ? null : endHostUrl.TrimEnd('/');
-        }
-
-        private IHttpListener GetListener()
-        {
-            var cert = !string.IsNullOrWhiteSpace(CertificatePath) && File.Exists(CertificatePath)
-                ? GetCert(CertificatePath) :
-                null;
-
-            var enableDualMode = Environment.OSVersion.Platform == PlatformID.Win32NT;
-
-            return new WebSocketSharpListener(_logger, cert, _memoryStreamProvider, _textEncoding, _networkManager, _socketFactory, _cryptoProvider, new StreamFactory(), enableDualMode, GetRequest);
-        }
-
-        public ICertificate GetCert(string certificateLocation)
-        {
-            try
-            {
-                X509Certificate2 localCert = new X509Certificate2(certificateLocation);
-                //localCert.PrivateKey = PrivateKey.CreateFromFile(pvk_file).RSA;
-                if (localCert.PrivateKey == null)
-                {
-                    //throw new FileNotFoundException("Secure requested, no private key included", certificateLocation);
-                    return null;
-                }
-
-                return new Certificate(localCert);
-            }
-            catch (Exception ex)
-            {
-                Logger.ErrorException("Error loading cert from {0}", ex, certificateLocation);
-                return null;
-            }
-        }
-
-        private IHttpRequest GetRequest(HttpListenerContext httpContext)
-        {
-            var operationName = httpContext.Request.GetOperationName();
-
-            var req = new WebSocketSharpRequest(httpContext, operationName, _logger, _memoryStreamProvider);
-
-            return req;
-        }
-
-        private void OnWebSocketConnecting(WebSocketConnectingEventArgs args)
-        {
-            if (_disposed)
-            {
-                return;
-            }
-
-            if (WebSocketConnecting != null)
-            {
-                WebSocketConnecting(this, args);
-            }
-        }
-
-        private void OnWebSocketConnected(WebSocketConnectEventArgs args)
-        {
-            if (_disposed)
-            {
-                return;
-            }
-
-            if (WebSocketConnected != null)
-            {
-                WebSocketConnected(this, args);
-            }
-        }
-
-        private void ErrorHandler(Exception ex, IRequest httpReq)
-        {
-            try
-            {
-                _logger.ErrorException("Error processing request", ex);
-
-                var httpRes = httpReq.Response;
-
-                if (httpRes.IsClosed)
-                {
-                    return;
-                }
-
-                httpRes.StatusCode = 500;
-
-                httpRes.ContentType = "text/html";
-                httpRes.Write(ex.Message);
-
-                httpRes.Close();
-            }
-            catch
-            {
-                //_logger.ErrorException("Error this.ProcessRequest(context)(Exception while writing error to the response)", errorEx);
-            }
-        }
-
-        /// <summary>
-        /// Shut down the Web Service
-        /// </summary>
-        public void Stop()
-        {
-            if (_listener != null)
-            {
-                _listener.Stop();
-            }
-        }
-
-        private readonly Dictionary<string, int> _skipLogExtensions = new Dictionary<string, int>(StringComparer.OrdinalIgnoreCase)
-        {
-            {".js", 0},
-            {".css", 0},
-            {".woff", 0},
-            {".woff2", 0},
-            {".ttf", 0},
-            {".html", 0}
-        };
-
-        private bool EnableLogging(string url, string localPath)
-        {
-            var extension = GetExtension(url);
-
-            if (string.IsNullOrWhiteSpace(extension) || !_skipLogExtensions.ContainsKey(extension))
-            {
-                if (string.IsNullOrWhiteSpace(localPath) || localPath.IndexOf("system/ping", StringComparison.OrdinalIgnoreCase) == -1)
-                {
-                    return true;
-                }
-            }
-
-            return false;
-        }
-
-        private string GetExtension(string url)
-        {
-            var parts = url.Split(new[] { '?' }, 2);
-
-            return Path.GetExtension(parts[0]);
-        }
-
-        public static string RemoveQueryStringByKey(string url, string key)
-        {
-            var uri = new Uri(url);
-
-            // this gets all the query string key value pairs as a collection
-            var newQueryString = MyHttpUtility.ParseQueryString(uri.Query);
-
-            if (newQueryString.Count == 0)
-            {
-                return url;
-            }
-
-            // this removes the key if exists
-            newQueryString.Remove(key);
-
-            // this gets the page path from root without QueryString
-            string pagePathWithoutQueryString = uri.GetLeftPart(UriPartial.Path);
-
-            return newQueryString.Count > 0
-                ? String.Format("{0}?{1}", pagePathWithoutQueryString, newQueryString)
-                : pagePathWithoutQueryString;
-        }
-
-        private string GetUrlToLog(string url)
-        {
-            url = RemoveQueryStringByKey(url, "api_key");
-
-            return url;
-        }
-
-        private string NormalizeConfiguredLocalAddress(string address)
-        {
-            var index = address.Trim('/').IndexOf('/');
-
-            if (index != -1)
-            {
-                address = address.Substring(index + 1);
-            }
-
-            return address.Trim('/');
-        }
-
-        private bool ValidateHost(Uri url)
-        {
-            var hosts = _config
-                .Configuration
-                .LocalNetworkAddresses
-                .Select(NormalizeConfiguredLocalAddress)
-                .ToList();
-
-            if (hosts.Count == 0)
-            {
-                return true;
-            }
-
-            var host = url.Host ?? string.Empty;
-
-            _logger.Debug("Validating host {0}", host);
-
-            if (_networkManager.IsInPrivateAddressSpace(host))
-            {
-                hosts.Add("localhost");
-                hosts.Add("127.0.0.1");
-
-                return hosts.Any(i => host.IndexOf(i, StringComparison.OrdinalIgnoreCase) != -1);
-            }
-
-            return true;
-        }
-
-        /// <summary>
-        /// Overridable method that can be used to implement a custom hnandler
-        /// </summary>
-        /// <param name="httpReq">The HTTP req.</param>
-        /// <param name="url">The URL.</param>
-        /// <returns>Task.</returns>
-        protected async Task RequestHandler(IHttpRequest httpReq, Uri url)
-        {
-            var date = DateTime.Now;
-            var httpRes = httpReq.Response;
-            bool enableLog = false;
-            string urlToLog = null;
-            string remoteIp = null;
-
-            try
-            {
-                if (_disposed)
-                {
-                    httpRes.StatusCode = 503;
-                    return;
-                }
-
-                if (!ValidateHost(url))
-                {
-                    httpRes.StatusCode = 400;
-                    httpRes.ContentType = "text/plain";
-                    httpRes.Write("Invalid host");
-                    return;
-                }
-
-                if (string.Equals(httpReq.Verb, "OPTIONS", StringComparison.OrdinalIgnoreCase))
-                {
-                    httpRes.StatusCode = 200;
-                    httpRes.AddHeader("Access-Control-Allow-Origin", "*");
-                    httpRes.AddHeader("Access-Control-Allow-Methods", "GET, POST, PUT, DELETE, PATCH, OPTIONS");
-                    httpRes.AddHeader("Access-Control-Allow-Headers",
-                        "Content-Type, Authorization, Range, X-MediaBrowser-Token, X-Emby-Authorization");
-                    httpRes.ContentType = "text/html";
-                    return;
-                }
-
-                var operationName = httpReq.OperationName;
-                var localPath = url.LocalPath;
-
-                var urlString = url.OriginalString;
-                enableLog = EnableLogging(urlString, localPath);
-                urlToLog = urlString;
-
-                if (enableLog)
-                {
-                    urlToLog = GetUrlToLog(urlString);
-                    remoteIp = httpReq.RemoteIp;
-
-                    LoggerUtils.LogRequest(_logger, urlToLog, httpReq.HttpMethod, httpReq.UserAgent);
-                }
-
-                if (string.Equals(localPath, "/emby/", StringComparison.OrdinalIgnoreCase) ||
-                    string.Equals(localPath, "/mediabrowser/", StringComparison.OrdinalIgnoreCase))
-                {
-                    RedirectToUrl(httpRes, DefaultRedirectPath);
-                    return;
-                }
-                if (string.Equals(localPath, "/emby", StringComparison.OrdinalIgnoreCase) ||
-                    string.Equals(localPath, "/mediabrowser", StringComparison.OrdinalIgnoreCase))
-                {
-                    RedirectToUrl(httpRes, "emby/" + DefaultRedirectPath);
-                    return;
-                }
-
-                if (string.Equals(localPath, "/mediabrowser/", StringComparison.OrdinalIgnoreCase) ||
-                    string.Equals(localPath, "/mediabrowser", StringComparison.OrdinalIgnoreCase) ||
-                    localPath.IndexOf("mediabrowser/web", StringComparison.OrdinalIgnoreCase) != -1)
-                {
-                    httpRes.StatusCode = 200;
-                    httpRes.ContentType = "text/html";
-                    var newUrl = urlString.Replace("mediabrowser", "emby", StringComparison.OrdinalIgnoreCase)
-                        .Replace("/dashboard/", "/web/", StringComparison.OrdinalIgnoreCase);
-
-                    if (!string.Equals(newUrl, urlString, StringComparison.OrdinalIgnoreCase))
-                    {
-                        httpRes.Write(
-                            "<!doctype html><html><head><title>Emby</title></head><body>Please update your Emby bookmark to <a href=\"" +
-                            newUrl + "\">" + newUrl + "</a></body></html>");
-                        return;
-                    }
-                }
-
-                if (localPath.IndexOf("dashboard/", StringComparison.OrdinalIgnoreCase) != -1 &&
-                    localPath.IndexOf("web/dashboard", StringComparison.OrdinalIgnoreCase) == -1)
-                {
-                    httpRes.StatusCode = 200;
-                    httpRes.ContentType = "text/html";
-                    var newUrl = urlString.Replace("mediabrowser", "emby", StringComparison.OrdinalIgnoreCase)
-                        .Replace("/dashboard/", "/web/", StringComparison.OrdinalIgnoreCase);
-
-                    if (!string.Equals(newUrl, urlString, StringComparison.OrdinalIgnoreCase))
-                    {
-                        httpRes.Write(
-                            "<!doctype html><html><head><title>Emby</title></head><body>Please update your Emby bookmark to <a href=\"" +
-                            newUrl + "\">" + newUrl + "</a></body></html>");
-                        return;
-                    }
-                }
-
-                if (string.Equals(localPath, "/web", StringComparison.OrdinalIgnoreCase))
-                {
-                    RedirectToUrl(httpRes, DefaultRedirectPath);
-                    return;
-                }
-                if (string.Equals(localPath, "/web/", StringComparison.OrdinalIgnoreCase))
-                {
-                    RedirectToUrl(httpRes, "../" + DefaultRedirectPath);
-                    return;
-                }
-                if (string.Equals(localPath, "/", StringComparison.OrdinalIgnoreCase))
-                {
-                    RedirectToUrl(httpRes, DefaultRedirectPath);
-                    return;
-                }
-                if (string.IsNullOrEmpty(localPath))
-                {
-                    RedirectToUrl(httpRes, "/" + DefaultRedirectPath);
-                    return;
-                }
-
-                if (string.Equals(localPath, "/emby/pin", StringComparison.OrdinalIgnoreCase))
-                {
-                    RedirectToUrl(httpRes, "web/pin.html");
-                    return;
-                }
-
-                if (!string.IsNullOrWhiteSpace(GlobalResponse))
-                {
-                    httpRes.StatusCode = 503;
-                    httpRes.ContentType = "text/html";
-                    httpRes.Write(GlobalResponse);
-                    return;
-                }
-
-                var handler = HttpHandlerFactory.GetHandler(httpReq);
-
-                if (handler != null)
-                {
-                    await handler.ProcessRequestAsync(httpReq, httpRes, operationName).ConfigureAwait(false);
-                }
-            }
-            catch (Exception ex)
-            {
-                ErrorHandler(ex, httpReq);
-            }
-            finally
-            {
-                httpRes.Close();
-
-                if (enableLog)
-                {
-                    var statusCode = httpRes.StatusCode;
-
-                    var duration = DateTime.Now - date;
-
-                    LoggerUtils.LogResponse(_logger, statusCode, urlToLog, remoteIp, duration);
-                }
-            }
-        }
-
-        public static void RedirectToUrl(IResponse httpRes, string url)
-        {
-            httpRes.StatusCode = 302;
-            httpRes.AddHeader("Location", url);
-        }
-
-
-        /// <summary>
-        /// Adds the rest handlers.
-        /// </summary>
-        /// <param name="services">The services.</param>
-        public void Init(IEnumerable<IService> services)
-        {
-            _restServices.AddRange(services);
-
-            ServiceController = CreateServiceController();
-
-            _logger.Info("Calling ServiceStack AppHost.Init");
-
-            base.Init();
-        }
-
-        public override Model.Services.RouteAttribute[] GetRouteAttributes(Type requestType)
-        {
-            var routes = base.GetRouteAttributes(requestType).ToList();
-            var clone = routes.ToList();
-
-            foreach (var route in clone)
-            {
-                routes.Add(new Model.Services.RouteAttribute(NormalizeEmbyRoutePath(route.Path), route.Verbs)
-                {
-                    Notes = route.Notes,
-                    Priority = route.Priority,
-                    Summary = route.Summary
-                });
-
-                routes.Add(new Model.Services.RouteAttribute(NormalizeRoutePath(route.Path), route.Verbs)
-                {
-                    Notes = route.Notes,
-                    Priority = route.Priority,
-                    Summary = route.Summary
-                });
-
-                routes.Add(new Model.Services.RouteAttribute(DoubleNormalizeEmbyRoutePath(route.Path), route.Verbs)
-                {
-                    Notes = route.Notes,
-                    Priority = route.Priority,
-                    Summary = route.Summary
-                });
-            }
-
-            return routes.ToArray();
-        }
-
-        public override object GetTaskResult(Task task, string requestName)
-        {
-            try
-            {
-                var taskObject = task as Task<object>;
-                if (taskObject != null)
-                {
-                    return taskObject.Result;
-                }
-
-                task.Wait();
-
-                var type = task.GetType();
-                if (!type.IsGenericType)
-                {
-                    return null;
-                }
-
-                Logger.Warn("Getting task result from " + requestName + " using reflection. For better performance have your api return Task<object>");
-                return type.GetProperty("Result").GetValue(task);
-            }
-            catch (TypeAccessException)
-            {
-                return null; //return null for void Task's
-            }
-        }
-
-        public override Func<string, object> GetParseFn(Type propertyType)
-        {
-            var fn = JsvReader.GetParseFn(propertyType);
-
-            return s => fn(s);
-        }
-
-        public override void SerializeToJson(object o, Stream stream)
-        {
-            _jsonSerializer.SerializeToStream(o, stream);
-        }
-
-        public override void SerializeToXml(object o, Stream stream)
-        {
-            _xmlSerializer.SerializeToStream(o, stream);
-        }
-
-        public override object DeserializeXml(Type type, Stream stream)
-        {
-            return _xmlSerializer.DeserializeFromStream(type, stream);
-        }
-
-        public override object DeserializeJson(Type type, Stream stream)
-        {
-            return _jsonSerializer.DeserializeFromStream(stream, type);
-        }
-
-        private string NormalizeEmbyRoutePath(string path)
-        {
-            if (path.StartsWith("/", StringComparison.OrdinalIgnoreCase))
-            {
-                return "/emby" + path;
-            }
-
-            return "emby/" + path;
-        }
-
-        private string DoubleNormalizeEmbyRoutePath(string path)
-        {
-            if (path.StartsWith("/", StringComparison.OrdinalIgnoreCase))
-            {
-                return "/emby/emby" + path;
-            }
-
-            return "emby/emby/" + path;
-        }
-
-        private string NormalizeRoutePath(string path)
-        {
-            if (path.StartsWith("/", StringComparison.OrdinalIgnoreCase))
-            {
-                return "/mediabrowser" + path;
-            }
-
-            return "mediabrowser/" + path;
-        }
-
-        private bool _disposed;
-        private readonly object _disposeLock = new object();
-        protected virtual void Dispose(bool disposing)
-        {
-            if (_disposed) return;
-            base.Dispose();
-
-            lock (_disposeLock)
-            {
-                if (_disposed) return;
-
-                if (disposing)
-                {
-                    Stop();
-                }
-
-                //release unmanaged resources here...
-                _disposed = true;
-            }
-        }
-
-        public override void Dispose()
-        {
-            Dispose(true);
-            GC.SuppressFinalize(this);
-        }
-
-        public void StartServer(IEnumerable<string> urlPrefixes, string certificatePath)
-        {
-            CertificatePath = certificatePath;
-            UrlPrefixes = urlPrefixes.ToList();
-            Start(UrlPrefixes.First());
-        }
-    }
-
-    public class StreamFactory : IStreamFactory
-    {
-        public Stream CreateNetworkStream(ISocket socket, bool ownsSocket)
-        {
-            var netSocket = (NetSocket)socket;
-
-            return new NetworkStream(netSocket.Socket, ownsSocket);
-        }
-
-        public Task AuthenticateSslStreamAsServer(Stream stream, ICertificate certificate)
-        {
-            var sslStream = (SslStream)stream;
-            var cert = (Certificate)certificate;
-
-            return sslStream.AuthenticateAsServerAsync(cert.X509Certificate);
-        }
-
-        public Stream CreateSslStream(Stream innerStream, bool leaveInnerStreamOpen)
-        {
-            return new SslStream(innerStream, leaveInnerStreamOpen);
-        }
-    }
-
-    public class Certificate : ICertificate
-    {
-        public Certificate(X509Certificate x509Certificate)
-        {
-            X509Certificate = x509Certificate;
-        }
-
-        public X509Certificate X509Certificate { get; private set; }
-    }
-}
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/HttpServer/ServerFactory.cs b/MediaBrowser.Server.Implementations/HttpServer/ServerFactory.cs
deleted file mode 100644
index abcf84abd..000000000
--- a/MediaBrowser.Server.Implementations/HttpServer/ServerFactory.cs
+++ /dev/null
@@ -1,39 +0,0 @@
-using MediaBrowser.Common.Net;
-using MediaBrowser.Controller;
-using MediaBrowser.Controller.Configuration;
-using MediaBrowser.Controller.Net;
-using MediaBrowser.Model.Cryptography;
-using MediaBrowser.Model.IO;
-using MediaBrowser.Model.Logging;
-using MediaBrowser.Model.Net;
-using MediaBrowser.Model.Serialization;
-using MediaBrowser.Model.Text;
-
-namespace MediaBrowser.Server.Implementations.HttpServer
-{
-    /// <summary>
-    /// Class ServerFactory
-    /// </summary>
-    public static class ServerFactory
-    {
-        /// <summary>
-        /// Creates the server.
-        /// </summary>
-        /// <returns>IHttpServer.</returns>
-        public static IHttpServer CreateServer(IServerApplicationHost applicationHost,
-            ILogManager logManager,
-            IServerConfigurationManager config, 
-            INetworkManager networkmanager,
-            IMemoryStreamFactory streamProvider,
-            string serverName, 
-            string defaultRedirectpath,
-            ITextEncoding textEncoding,
-            ISocketFactory socketFactory,
-            ICryptoProvider cryptoProvider,
-            IJsonSerializer json,
-            IXmlSerializer xml)
-        {
-            return new HttpListenerHost(applicationHost, logManager, config, serverName, defaultRedirectpath, networkmanager, streamProvider, textEncoding, socketFactory, cryptoProvider, json, xml);
-        }
-    }
-}
diff --git a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
index 6fb4f9e36..8d5697c49 100644
--- a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
+++ b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
@@ -42,21 +42,10 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Emby.Common.Implementations">
-      <HintPath>..\ThirdParty\emby\Emby.Common.Implementations.dll</HintPath>
-    </Reference>
-    <Reference Include="Emby.XmlTv, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Emby.XmlTv.1.0.0.63\lib\portable-net45+win8\Emby.XmlTv.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="INIFileParser, Version=2.3.0.0, Culture=neutral, PublicKeyToken=79af7b307b65cf3c, processorArchitecture=MSIL">
       <HintPath>..\packages\ini-parser.2.3.0\lib\net20\INIFileParser.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="MediaBrowser.Naming, Version=1.0.6151.30291, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\MediaBrowser.Naming.1.0.0.59\lib\portable-net45+win8\MediaBrowser.Naming.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="Microsoft.IO.RecyclableMemoryStream, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.IO.RecyclableMemoryStream.1.1.0.0\lib\net45\Microsoft.IO.RecyclableMemoryStream.dll</HintPath>
       <Private>True</Private>
@@ -65,38 +54,18 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\ThirdParty\emby\Mono.Nat.dll</HintPath>
     </Reference>
-    <Reference Include="Patterns.Logging, Version=1.0.6151.30227, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Patterns.Logging.1.0.0.6\lib\portable-net45+win8\Patterns.Logging.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="ServiceStack.Text, Version=4.5.4.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\ServiceStack.Text.4.5.4\lib\net45\ServiceStack.Text.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="SharpCompress, Version=0.10.3.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\ThirdParty\SharpCompress\SharpCompress.dll</HintPath>
     </Reference>
-    <Reference Include="SocketHttpListener.Portable">
-      <HintPath>..\ThirdParty\emby\SocketHttpListener.Portable.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
     <Reference Include="System.IO.Compression" />
     <Reference Include="System.Net" />
-    <Reference Include="System.Runtime.Serialization" />
-    <Reference Include="System.Security" />
     <Reference Include="System.Xml" />
-    <Reference Include="ServiceStack">
-      <HintPath>..\ThirdParty\ServiceStack\ServiceStack.dll</HintPath>
-    </Reference>
     <Reference Include="System.Xml.Linq" />
-    <Reference Include="UniversalDetector, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\UniversalDetector.1.0.1\lib\portable-net45+sl4+wp71+win8+wpa81\UniversalDetector.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\SharedVersion.cs">
@@ -105,12 +74,9 @@
     <Compile Include="Activity\ActivityRepository.cs" />
     <Compile Include="Archiving\ZipClient.cs" />
     <Compile Include="Collections\CollectionsDynamicFolder.cs" />
-    <Compile Include="Configuration\ServerConfigurationManager.cs" />
     <Compile Include="Devices\DeviceRepository.cs" />
     <Compile Include="Devices\CameraUploadsFolder.cs" />
     <Compile Include="EntryPoints\ExternalPortForwarding.cs" />
-    <Compile Include="HttpServer\HttpListenerHost.cs" />
-    <Compile Include="HttpServer\ServerFactory.cs" />
     <Compile Include="IO\LibraryMonitor.cs" />
     <Compile Include="IO\MemoryStreamProvider.cs" />
     <Compile Include="LiveTv\TunerHosts\SatIp\ChannelScan.cs" />
@@ -143,10 +109,8 @@
     <Compile Include="Persistence\SqliteFileOrganizationRepository.cs" />
     <Compile Include="Notifications\SqliteNotificationsRepository.cs" />
     <Compile Include="Persistence\TypeMapper.cs" />
-    <Compile Include="Playlists\ManualPlaylistsFolder.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Security\AuthenticationRepository.cs" />
-    <Compile Include="ServerApplicationPaths.cs" />
     <Compile Include="Persistence\SqliteDisplayPreferencesRepository.cs" />
     <Compile Include="Persistence\SqliteItemRepository.cs" />
     <Compile Include="Persistence\SqliteUserDataRepository.cs" />
@@ -170,10 +134,6 @@
       <Project>{7EEEB4BB-F3E8-48FC-B4C5-70F0FFF8329B}</Project>
       <Name>MediaBrowser.Model</Name>
     </ProjectReference>
-    <ProjectReference Include="..\MediaBrowser.Providers\MediaBrowser.Providers.csproj">
-      <Project>{442b5058-dcaf-4263-bb6a-f21e31120a1b}</Project>
-      <Name>MediaBrowser.Providers</Name>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
@@ -348,9 +308,7 @@
     <None Include="LiveTv\TunerHosts\SatIp\ini\satellite\3594.ini" />
     <None Include="packages.config" />
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Serialization\" />
-  </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs b/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs
index 3577d1883..3dcd83da0 100644
--- a/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs
+++ b/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs
@@ -18,6 +18,7 @@ using System.Runtime.Serialization;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
+using Emby.Server.Implementations.Playlists;
 using MediaBrowser.Common.Extensions;
 using MediaBrowser.Common.IO;
 using MediaBrowser.Controller.Channels;
@@ -30,7 +31,6 @@ using MediaBrowser.Model.Extensions;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Model.LiveTv;
 using MediaBrowser.Server.Implementations.Devices;
-using MediaBrowser.Server.Implementations.Playlists;
 
 namespace MediaBrowser.Server.Implementations.Persistence
 {
diff --git a/MediaBrowser.Server.Implementations/Playlists/ManualPlaylistsFolder.cs b/MediaBrowser.Server.Implementations/Playlists/ManualPlaylistsFolder.cs
deleted file mode 100644
index eff77574d..000000000
--- a/MediaBrowser.Server.Implementations/Playlists/ManualPlaylistsFolder.cs
+++ /dev/null
@@ -1,76 +0,0 @@
-using MediaBrowser.Common.Configuration;
-using MediaBrowser.Controller.Entities;
-using MediaBrowser.Controller.Playlists;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using MediaBrowser.Model.IO;
-using MediaBrowser.Model.Querying;
-using System.Threading.Tasks;
-using MediaBrowser.Common.IO;
-using MediaBrowser.Controller.IO;
-
-namespace MediaBrowser.Server.Implementations.Playlists
-{
-    public class PlaylistsFolder : BasePluginFolder
-    {
-        public PlaylistsFolder()
-        {
-            Name = "Playlists";
-        }
-
-        public override bool IsVisible(User user)
-        {
-            return base.IsVisible(user) && GetChildren(user, true).Any();
-        }
-
-        protected override IEnumerable<BaseItem> GetEligibleChildrenForRecursiveChildren(User user)
-        {
-            return base.GetEligibleChildrenForRecursiveChildren(user).OfType<Playlist>();
-        }
-
-        public override bool IsHidden
-        {
-            get
-            {
-                return true;
-            }
-        }
-
-        public override string CollectionType
-        {
-            get { return Model.Entities.CollectionType.Playlists; }
-        }
-
-        protected override Task<QueryResult<BaseItem>> GetItemsInternal(InternalItemsQuery query)
-        {
-            query.Recursive = false;
-            return base.GetItemsInternal(query);
-        }
-    }
-
-    public class PlaylistsDynamicFolder : IVirtualFolderCreator
-    {
-        private readonly IApplicationPaths _appPaths;
-        private readonly IFileSystem _fileSystem;
-
-        public PlaylistsDynamicFolder(IApplicationPaths appPaths, IFileSystem fileSystem)
-        {
-            _appPaths = appPaths;
-            _fileSystem = fileSystem;
-        }
-
-        public BasePluginFolder GetFolder()
-        {
-            var path = Path.Combine(_appPaths.DataPath, "playlists");
-
-			_fileSystem.CreateDirectory(path);
-
-            return new PlaylistsFolder
-            {
-                Path = path
-            };
-        }
-    }
-}
-
diff --git a/MediaBrowser.Server.Implementations/ServerApplicationPaths.cs b/MediaBrowser.Server.Implementations/ServerApplicationPaths.cs
deleted file mode 100644
index c8dea9005..000000000
--- a/MediaBrowser.Server.Implementations/ServerApplicationPaths.cs
+++ /dev/null
@@ -1,233 +0,0 @@
-using Emby.Common.Implementations;
-using MediaBrowser.Controller;
-using System.IO;
-
-namespace MediaBrowser.Server.Implementations
-{
-    /// <summary>
-    /// Extends BaseApplicationPaths to add paths that are only applicable on the server
-    /// </summary>
-    public class ServerApplicationPaths : BaseApplicationPaths, IServerApplicationPaths
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="BaseApplicationPaths" /> class.
-        /// </summary>
-        public ServerApplicationPaths(string programDataPath, string applicationPath, string applicationResourcesPath)
-            : base(programDataPath, applicationPath)
-        {
-            ApplicationResourcesPath = applicationResourcesPath;
-        }
-
-        public string ApplicationResourcesPath { get; private set; }
-
-        /// <summary>
-        /// Gets the path to the base root media directory
-        /// </summary>
-        /// <value>The root folder path.</value>
-        public string RootFolderPath
-        {
-            get
-            {
-                return Path.Combine(ProgramDataPath, "root");
-            }
-        }
-
-        /// <summary>
-        /// Gets the path to the default user view directory.  Used if no specific user view is defined.
-        /// </summary>
-        /// <value>The default user views path.</value>
-        public string DefaultUserViewsPath
-        {
-            get
-            {
-                return Path.Combine(RootFolderPath, "default");
-            }
-        }
-
-        /// <summary>
-        /// Gets the path to localization data.
-        /// </summary>
-        /// <value>The localization path.</value>
-        public string LocalizationPath
-        {
-            get
-            {
-                return Path.Combine(ProgramDataPath, "localization");
-            }
-        }
-
-        /// <summary>
-        /// The _ibn path
-        /// </summary>
-        private string _ibnPath;
-        /// <summary>
-        /// Gets the path to the Images By Name directory
-        /// </summary>
-        /// <value>The images by name path.</value>
-        public string ItemsByNamePath
-        {
-            get
-            {
-                return _ibnPath ?? (_ibnPath = Path.Combine(ProgramDataPath, "ImagesByName"));
-            }
-            set
-            {
-                _ibnPath = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets the path to the People directory
-        /// </summary>
-        /// <value>The people path.</value>
-        public string PeoplePath
-        {
-            get
-            {
-                return Path.Combine(ItemsByNamePath, "People");
-            }
-        }
-
-        public string ArtistsPath
-        {
-            get
-            {
-                return Path.Combine(ItemsByNamePath, "artists");
-            }
-        }
-
-        /// <summary>
-        /// Gets the path to the Genre directory
-        /// </summary>
-        /// <value>The genre path.</value>
-        public string GenrePath
-        {
-            get
-            {
-                return Path.Combine(ItemsByNamePath, "Genre");
-            }
-        }
-
-        /// <summary>
-        /// Gets the path to the Genre directory
-        /// </summary>
-        /// <value>The genre path.</value>
-        public string MusicGenrePath
-        {
-            get
-            {
-                return Path.Combine(ItemsByNamePath, "MusicGenre");
-            }
-        }
-
-        /// <summary>
-        /// Gets the path to the Studio directory
-        /// </summary>
-        /// <value>The studio path.</value>
-        public string StudioPath
-        {
-            get
-            {
-                return Path.Combine(ItemsByNamePath, "Studio");
-            }
-        }
-
-        /// <summary>
-        /// Gets the path to the Year directory
-        /// </summary>
-        /// <value>The year path.</value>
-        public string YearPath
-        {
-            get
-            {
-                return Path.Combine(ItemsByNamePath, "Year");
-            }
-        }
-
-        /// <summary>
-        /// Gets the path to the General IBN directory
-        /// </summary>
-        /// <value>The general path.</value>
-        public string GeneralPath
-        {
-            get
-            {
-                return Path.Combine(ItemsByNamePath, "general");
-            }
-        }
-
-        /// <summary>
-        /// Gets the path to the Ratings IBN directory
-        /// </summary>
-        /// <value>The ratings path.</value>
-        public string RatingsPath
-        {
-            get
-            {
-                return Path.Combine(ItemsByNamePath, "ratings");
-            }
-        }
-
-        /// <summary>
-        /// Gets the media info images path.
-        /// </summary>
-        /// <value>The media info images path.</value>
-        public string MediaInfoImagesPath
-        {
-            get
-            {
-                return Path.Combine(ItemsByNamePath, "mediainfo");
-            }
-        }
-
-        /// <summary>
-        /// Gets the path to the user configuration directory
-        /// </summary>
-        /// <value>The user configuration directory path.</value>
-        public string UserConfigurationDirectoryPath
-        {
-            get
-            {
-                return Path.Combine(ConfigurationDirectoryPath, "users");
-            }
-        }
-
-        private string _transcodingTempPath;
-        public string TranscodingTempPath
-        {
-            get
-            {
-                return _transcodingTempPath ?? (_transcodingTempPath = Path.Combine(ProgramDataPath, "transcoding-temp"));
-            }
-            set
-            {
-                _transcodingTempPath = value;
-            }
-        }
-
-        /// <summary>
-        /// Gets the game genre path.
-        /// </summary>
-        /// <value>The game genre path.</value>
-        public string GameGenrePath
-        {
-            get
-            {
-                return Path.Combine(ItemsByNamePath, "GameGenre");
-            }
-        }
-
-        private string _internalMetadataPath;
-        public string InternalMetadataPath
-        {
-            get
-            {
-                return _internalMetadataPath ?? (_internalMetadataPath = Path.Combine(DataPath, "metadata"));
-            }
-            set
-            {
-                _internalMetadataPath = value;
-            }
-        }
-    }
-}
diff --git a/MediaBrowser.Server.Implementations/packages.config b/MediaBrowser.Server.Implementations/packages.config
index 16ac6faf3..c224c3d38 100644
--- a/MediaBrowser.Server.Implementations/packages.config
+++ b/MediaBrowser.Server.Implementations/packages.config
@@ -1,10 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>

 <packages>

-  <package id="Emby.XmlTv" version="1.0.0.63" targetFramework="net46" />

   <package id="ini-parser" version="2.3.0" targetFramework="net45" />

-  <package id="MediaBrowser.Naming" version="1.0.0.59" targetFramework="net46" />

   <package id="Microsoft.IO.RecyclableMemoryStream" version="1.1.0.0" targetFramework="net46" />

-  <package id="Patterns.Logging" version="1.0.0.6" targetFramework="net46" />

-  <package id="ServiceStack.Text" version="4.5.4" targetFramework="net46" />

-  <package id="UniversalDetector" version="1.0.1" targetFramework="net46" />

 </packages>
\ No newline at end of file