Fix namespaces for code moved to separate class libraries (#263)

* Create ServiceHost a service-specific class

* Renaming hosting namespace

* Rename credentials namespace

* Fix namespaces

src/Microsoft.SqlTools.Hosting/Extensibility/ExtensionServiceProvider.cs

@@ -13,9 +13,9 @@ using System.Linq;
 using System.Reflection;
 using System.Runtime.Loader;
 using Microsoft.Extensions.DependencyModel;
-using Microsoft.SqlTools.ServiceLayer.Utility;
+using Microsoft.SqlTools.Utility;
 
-namespace Microsoft.SqlTools.ServiceLayer.Extensibility
+namespace Microsoft.SqlTools.Extensibility
 {
     public class ExtensionServiceProvider : RegisteredServiceProvider
     {

src/Microsoft.SqlTools.Hosting/Extensibility/IComposableService.cs

@@ -4,7 +4,7 @@
 //
 
 
-namespace Microsoft.SqlTools.ServiceLayer.Extensibility
+namespace Microsoft.SqlTools.Extensibility
 {
     /// <summary>
     /// A Service that expects to lookup other services. Using this interface on an exported service

src/Microsoft.SqlTools.Hosting/Extensibility/IEnumerableExt.cs

@@ -5,7 +5,7 @@
 
 using System.Collections.Generic;
 
-namespace Microsoft.SqlTools.ServiceLayer.Extensibility
+namespace Microsoft.SqlTools.Extensibility
 {
 
     internal static class IEnumerableExt

src/Microsoft.SqlTools.Hosting/Extensibility/IMultiServiceProvider.cs

@@ -6,9 +6,9 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Microsoft.SqlTools.ServiceLayer.Utility;
+using Microsoft.SqlTools.Utility;
 
-namespace Microsoft.SqlTools.ServiceLayer.Extensibility
+namespace Microsoft.SqlTools.Extensibility
 {
     public interface IMultiServiceProvider
     {

src/Microsoft.SqlTools.Hosting/Extensibility/RegisteredServiceProvider.cs

@@ -10,9 +10,9 @@ using System.Globalization;
 using System.Linq;
 using System.Reflection;
 using Microsoft.SqlTools.Hosting;
-using Microsoft.SqlTools.ServiceLayer.Utility;
+using Microsoft.SqlTools.Utility;
 
-namespace Microsoft.SqlTools.ServiceLayer.Extensibility
+namespace Microsoft.SqlTools.Extensibility
 {
 
     /// <summary>

src/Microsoft.SqlTools.Hosting/Hosting/Contracts/ClientCapabilities.cs

@@ -4,7 +4,7 @@
 //
 
 
-namespace Microsoft.SqlTools.ServiceLayer.Hosting.Contracts
+namespace Microsoft.SqlTools.Hosting.Contracts
 {
     /// <summary>
     /// Defines a class that describes the capabilities of a language

src/Microsoft.SqlTools.Hosting/Hosting/Contracts/DmpServerCapabilities.cs

@@ -0,0 +1,15 @@
+//
+// Copyright (c) Microsoft. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+//
+
+namespace Microsoft.SqlTools.Hosting.Contracts
+{
+    public class DmpServerCapabilities
+    {
+        public string ProviderName { get; set; 
+        }
+        public bool? HoverProvider { get; set; }
+    }
+}
+

src/Microsoft.SqlTools.Hosting/Hosting/Contracts/HostingErrorEvent.cs

@@ -3,9 +3,9 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts;
+using Microsoft.SqlTools.Hosting.Protocol.Contracts;
 
-namespace Microsoft.SqlTools.ServiceLayer.Hosting.Contracts
+namespace Microsoft.SqlTools.Hosting.Contracts
 {
     /// <summary>
     /// Parameters to be used for reporting hosting-level errors, such as protocol violations

src/Microsoft.SqlTools.Hosting/Hosting/Contracts/Initialize.cs

@@ -3,9 +3,9 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts;
+using Microsoft.SqlTools.Hosting.Protocol.Contracts;
 
-namespace Microsoft.SqlTools.ServiceLayer.Hosting.Contracts
+namespace Microsoft.SqlTools.Hosting.Contracts
 {
     public class InitializeRequest
     {

src/Microsoft.SqlTools.Hosting/Hosting/Contracts/ServerCapabilities.cs

@@ -3,7 +3,7 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-namespace Microsoft.SqlTools.ServiceLayer.Hosting.Contracts
+namespace Microsoft.SqlTools.Hosting.Contracts
 {
     public class ServerCapabilities
     {

src/Microsoft.SqlTools.Hosting/Hosting/Contracts/Shutdown.cs

@@ -3,9 +3,9 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts;
+using Microsoft.SqlTools.Hosting.Protocol.Contracts;
 
-namespace Microsoft.SqlTools.ServiceLayer.Hosting.Contracts
+namespace Microsoft.SqlTools.Hosting.Contracts
 {
     /// <summary>
     /// Defines a message that is sent from the client to request

src/Microsoft.SqlTools.Hosting/Hosting/Contracts/VersionRequest.cs

@@ -3,9 +3,9 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts;
+using Microsoft.SqlTools.Hosting.Protocol.Contracts;
 
-namespace Microsoft.SqlTools.ServiceLayer.Hosting.Contracts
+namespace Microsoft.SqlTools.Hosting.Contracts
 {
     /// <summary>
     /// Defines a message that is sent from the client to request

src/Microsoft.SqlTools.Hosting/Hosting/IHostedService.cs

@@ -4,10 +4,10 @@
 //
 
 using System;
-using Microsoft.SqlTools.ServiceLayer.Extensibility;
-using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol;
+using Microsoft.SqlTools.Extensibility;
+using Microsoft.SqlTools.Hosting.Protocol;
 
-namespace Microsoft.SqlTools.ServiceLayer.Hosting
+namespace Microsoft.SqlTools.Hosting
 {
     /// <summary>
     /// Defines a hosted service that communicates with external processes via

src/Microsoft.SqlTools.Hosting/Hosting/Protocol/Channel/ChannelBase.cs

@@ -4,9 +4,9 @@
 //
 
 using System.Threading.Tasks;
-using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Serializers;
+using Microsoft.SqlTools.Hosting.Protocol.Serializers;
 
-namespace Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Channel
+namespace Microsoft.SqlTools.Hosting.Protocol.Channel
 {
     /// <summary>
     /// Defines a base implementation for servers and their clients over a

src/Microsoft.SqlTools.Hosting/Hosting/Protocol/Channel/StdioClientChannel.cs

@@ -7,9 +7,9 @@ using System.Diagnostics;
 using System.IO;
 using System.Text;
 using System.Threading.Tasks;
-using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Serializers;
+using Microsoft.SqlTools.Hosting.Protocol.Serializers;
 
-namespace Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Channel
+namespace Microsoft.SqlTools.Hosting.Protocol.Channel
 {
     /// <summary>
     /// Provides a client implementation for the standard I/O channel.

src/Microsoft.SqlTools.Hosting/Hosting/Protocol/Channel/StdioServerChannel.cs

@@ -6,9 +6,9 @@
 using System.IO;
 using System.Text;
 using System.Threading.Tasks;
-using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Serializers;
+using Microsoft.SqlTools.Hosting.Protocol.Serializers;
 
-namespace Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Channel
+namespace Microsoft.SqlTools.Hosting.Protocol.Channel
 {
     /// <summary>
     /// Provides a server implementation for the standard I/O channel.

src/Microsoft.SqlTools.Hosting/Hosting/Protocol/Constants.cs

@@ -6,7 +6,7 @@
 using Newtonsoft.Json;
 using Newtonsoft.Json.Serialization;
 
-namespace Microsoft.SqlTools.ServiceLayer.Hosting.Protocol
+namespace Microsoft.SqlTools.Hosting.Protocol
 {
     public static class Constants
     {

src/Microsoft.SqlTools.Hosting/Hosting/Protocol/Contracts/EventType.cs

@@ -3,7 +3,7 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-namespace Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts
+namespace Microsoft.SqlTools.Hosting.Protocol.Contracts
 {
     /// <summary>
     /// Defines an event type with a particular method name.

src/Microsoft.SqlTools.Hosting/Hosting/Protocol/Contracts/Message.cs

@@ -6,7 +6,7 @@
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
 
-namespace Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts
+namespace Microsoft.SqlTools.Hosting.Protocol.Contracts
 {
     /// <summary>
     /// Defines all possible message types.

src/Microsoft.SqlTools.Hosting/Hosting/Protocol/Contracts/RequestType.cs

@@ -5,7 +5,7 @@
 
 using System.Diagnostics;
 
-namespace Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts
+namespace Microsoft.SqlTools.Hosting.Protocol.Contracts
 {
     [DebuggerDisplay("RequestType MethodName = {MethodName}")]
     public class RequestType<TParams, TResult>

src/Microsoft.SqlTools.Hosting/Hosting/Protocol/EventContext.cs

@@ -4,9 +4,9 @@
 //
 
 using System.Threading.Tasks;
-using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts;
+using Microsoft.SqlTools.Hosting.Protocol.Contracts;
 
-namespace Microsoft.SqlTools.ServiceLayer.Hosting.Protocol
+namespace Microsoft.SqlTools.Hosting.Protocol
 {
     /// <summary>
     /// Provides context for a received event so that handlers

src/Microsoft.SqlTools.Hosting/Hosting/Protocol/IEventSender.cs

@@ -4,9 +4,9 @@
 //
 
 using System.Threading.Tasks;
-using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts;
+using Microsoft.SqlTools.Hosting.Protocol.Contracts;
 
-namespace Microsoft.SqlTools.ServiceLayer.Hosting.Protocol
+namespace Microsoft.SqlTools.Hosting.Protocol
 {
     public interface IEventSender
     {

src/Microsoft.SqlTools.Hosting/Hosting/Protocol/IProtocolEndpoint.cs

@@ -5,9 +5,9 @@
 
 using System;
 using System.Threading.Tasks;
-using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts;
+using Microsoft.SqlTools.Hosting.Protocol.Contracts;
 
-namespace Microsoft.SqlTools.ServiceLayer.Hosting.Protocol
+namespace Microsoft.SqlTools.Hosting.Protocol
 {
     /// <summary>
     /// A ProtocolEndpoint is used for inter-process communication. Services can register to

src/Microsoft.SqlTools.Hosting/Hosting/Protocol/IRequestSender.cs

@@ -4,9 +4,9 @@
 //
 
 using System.Threading.Tasks;
-using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts;
+using Microsoft.SqlTools.Hosting.Protocol.Contracts;
 
-namespace Microsoft.SqlTools.ServiceLayer.Hosting.Protocol
+namespace Microsoft.SqlTools.Hosting.Protocol
 {
     public interface IRequestSender
     {

src/Microsoft.SqlTools.Hosting/Hosting/Protocol/MessageDispatcher.cs

@@ -8,12 +8,12 @@ using System.Collections.Generic;
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.SqlTools.ServiceLayer.Hosting.Contracts;
-using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Channel;
-using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts;
-using Microsoft.SqlTools.ServiceLayer.Utility;
+using Microsoft.SqlTools.Hosting.Contracts;
+using Microsoft.SqlTools.Hosting.Protocol.Channel;
+using Microsoft.SqlTools.Hosting.Protocol.Contracts;
+using Microsoft.SqlTools.Utility;
 
-namespace Microsoft.SqlTools.ServiceLayer.Hosting.Protocol
+namespace Microsoft.SqlTools.Hosting.Protocol
 {
     public class MessageDispatcher
     {

src/Microsoft.SqlTools.Hosting/Hosting/Protocol/MessageParseException.cs

@@ -5,7 +5,7 @@
 
 using System;
 
-namespace Microsoft.SqlTools.ServiceLayer.Hosting.Protocol
+namespace Microsoft.SqlTools.Hosting.Protocol
 {
     public class MessageParseException : Exception
     {

src/Microsoft.SqlTools.Hosting/Hosting/Protocol/MessageProtocolType.cs

@@ -3,7 +3,7 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-namespace Microsoft.SqlTools.ServiceLayer.Hosting.Protocol
+namespace Microsoft.SqlTools.Hosting.Protocol
 {
     /// <summary>
     /// Defines the possible message protocol types.

src/Microsoft.SqlTools.Hosting/Hosting/Protocol/MessageReader.cs

@@ -9,12 +9,12 @@ using System.IO;
 using System.Text;
 using System.Threading.Tasks;
 using Microsoft.SqlTools.Hosting;
-using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts;
-using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Serializers;
-using Microsoft.SqlTools.ServiceLayer.Utility;
+using Microsoft.SqlTools.Hosting.Protocol.Contracts;
+using Microsoft.SqlTools.Hosting.Protocol.Serializers;
+using Microsoft.SqlTools.Utility;
 using Newtonsoft.Json.Linq;
 
-namespace Microsoft.SqlTools.ServiceLayer.Hosting.Protocol
+namespace Microsoft.SqlTools.Hosting.Protocol
 {
     public class MessageReader
     {

src/Microsoft.SqlTools.Hosting/Hosting/Protocol/MessageWriter.cs

@@ -6,13 +6,13 @@
 using System.IO;
 using System.Text;
 using System.Threading.Tasks;
-using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts;
-using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Serializers;
-using Microsoft.SqlTools.ServiceLayer.Utility;
+using Microsoft.SqlTools.Hosting.Protocol.Contracts;
+using Microsoft.SqlTools.Hosting.Protocol.Serializers;
+using Microsoft.SqlTools.Utility;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
-namespace Microsoft.SqlTools.ServiceLayer.Hosting.Protocol
+namespace Microsoft.SqlTools.Hosting.Protocol
 {
     public class MessageWriter
     {

src/Microsoft.SqlTools.Hosting/Hosting/Protocol/ProtocolEndpoint.cs

@@ -7,11 +7,11 @@ using System;
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Channel;
-using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts;
-using Microsoft.SqlTools.ServiceLayer.Utility;
+using Microsoft.SqlTools.Hosting.Protocol.Channel;
+using Microsoft.SqlTools.Hosting.Protocol.Contracts;
+using Microsoft.SqlTools.Utility;
 
-namespace Microsoft.SqlTools.ServiceLayer.Hosting.Protocol
+namespace Microsoft.SqlTools.Hosting.Protocol
 {
     /// <summary>
     /// Provides behavior for a client or server endpoint that

src/Microsoft.SqlTools.Hosting/Hosting/Protocol/RequestContext.cs

@@ -4,10 +4,10 @@
 //
 
 using System.Threading.Tasks;
-using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts;
+using Microsoft.SqlTools.Hosting.Protocol.Contracts;
 using Newtonsoft.Json.Linq;
 
-namespace Microsoft.SqlTools.ServiceLayer.Hosting.Protocol
+namespace Microsoft.SqlTools.Hosting.Protocol
 {
     public class RequestContext<TResult> : IEventSender
     {

src/Microsoft.SqlTools.Hosting/Hosting/Protocol/Serializers/IMessageSerializer.cs

@@ -3,10 +3,10 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts;
+using Microsoft.SqlTools.Hosting.Protocol.Contracts;
 using Newtonsoft.Json.Linq;
 
-namespace Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Serializers
+namespace Microsoft.SqlTools.Hosting.Protocol.Serializers
 {
     /// <summary>
     /// Defines a common interface for message serializers.

src/Microsoft.SqlTools.Hosting/Hosting/Protocol/Serializers/JsonRpcMessageSerializer.cs

@@ -3,10 +3,10 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts;
+using Microsoft.SqlTools.Hosting.Protocol.Contracts;
 using Newtonsoft.Json.Linq;
 
-namespace Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Serializers
+namespace Microsoft.SqlTools.Hosting.Protocol.Serializers
 {
     /// <summary>
     /// Serializes messages in the JSON RPC format.  Used primarily

src/Microsoft.SqlTools.Hosting/Hosting/Protocol/Serializers/V8MessageSerializer.cs

@@ -5,9 +5,9 @@
 
 using Newtonsoft.Json.Linq;
 using System;
-using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts;
+using Microsoft.SqlTools.Hosting.Protocol.Contracts;
 
-namespace Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Serializers
+namespace Microsoft.SqlTools.Hosting.Protocol.Serializers
 {
     /// <summary>
     /// Serializes messages in the V8 format.  Used primarily for debug adapters.

src/Microsoft.SqlTools.Hosting/Hosting/ServiceHost.cs

@@ -1,185 +0,0 @@
-//
-// Copyright (c) Microsoft. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-//
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using System.Threading.Tasks;
-using Microsoft.SqlTools.ServiceLayer.Hosting.Contracts;
-using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol;
-using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Channel;
-using Microsoft.SqlTools.ServiceLayer.Utility;
-
-namespace Microsoft.SqlTools.ServiceLayer.Hosting
-{
-    /// <summary>
-    /// SQL Tools VS Code Language Server request handler. Provides the entire JSON RPC
-    /// implementation for sending/receiving JSON requests and dispatching the requests to
-    /// handlers that are registered prior to startup.
-    /// </summary>
-    public sealed class ServiceHost : ServiceHostBase
-    {
-        /// <summary>
-        /// This timeout limits the amount of time that shutdown tasks can take to complete
-        /// prior to the process shutting down.
-        /// </summary>
-        private const int ShutdownTimeoutInSeconds = 120;
-        public static readonly string[] CompletionTriggerCharacters = new string[] { ".", "-", ":", "\\", "[", "\"" };
-
-        #region Singleton Instance Code
-
-        /// <summary>
-        /// Singleton instance of the service host for internal storage
-        /// </summary>
-        private static readonly Lazy<ServiceHost> instance = new Lazy<ServiceHost>(() => new ServiceHost());
-
-        /// <summary>
-        /// Current instance of the ServiceHost
-        /// </summary>
-        public static ServiceHost Instance
-        {
-            get { return instance.Value; }
-        }
-
-        /// <summary>
-        /// Constructs new instance of ServiceHost using the host and profile details provided.
-        /// Access is private to ensure only one instance exists at a time.
-        /// </summary>
-        private ServiceHost() : base(new StdioServerChannel())
-        {
-            // Initialize the shutdown activities
-            shutdownCallbacks = new List<ShutdownCallback>();
-            initializeCallbacks = new List<InitializeCallback>();
-        }
-
-        /// <summary>
-        /// Provide initialization that must occur after the service host is started
-        /// </summary>
-        public void InitializeRequestHandlers()
-        {
-            // Register the requests that this service host will handle
-            this.SetRequestHandler(InitializeRequest.Type, this.HandleInitializeRequest);
-            this.SetRequestHandler(ShutdownRequest.Type, this.HandleShutdownRequest);
-            this.SetRequestHandler(VersionRequest.Type, HandleVersionRequest);
-        }
-
-        #endregion
-
-        #region Member Variables
-
-        /// <summary>
-        /// Delegate definition for the host shutdown event
-        /// </summary>
-        /// <param name="shutdownParams"></param>
-        /// <param name="shutdownRequestContext"></param>
-        public delegate Task ShutdownCallback(object shutdownParams, RequestContext<object> shutdownRequestContext);
-
-        /// <summary>
-        /// Delegate definition for the host initialization event
-        /// </summary>
-        /// <param name="startupParams"></param>
-        /// <param name="requestContext"></param>
-        public delegate Task InitializeCallback(InitializeRequest startupParams, RequestContext<InitializeResult> requestContext);
-
-        private readonly List<ShutdownCallback> shutdownCallbacks;
-
-        private readonly List<InitializeCallback> initializeCallbacks;
-
-        private static readonly Version serviceVersion = Assembly.GetEntryAssembly().GetName().Version;
-
-        #endregion
-
-        #region Public Methods
-
-        /// <summary>
-        /// Adds a new callback to be called when the shutdown request is submitted
-        /// </summary>
-        /// <param name="callback">Callback to perform when a shutdown request is submitted</param>
-        public void RegisterShutdownTask(ShutdownCallback callback)
-        {
-            shutdownCallbacks.Add(callback);
-        }
-
-        /// <summary>
-        /// Add a new method to be called when the initialize request is submitted
-        /// </summary>
-        /// <param name="callback">Callback to perform when an initialize request is submitted</param>
-        public void RegisterInitializeTask(InitializeCallback callback)
-        {
-            initializeCallbacks.Add(callback);
-        }
-
-        #endregion
-
-        #region Request Handlers
-
-        /// <summary>
-        /// Handles the shutdown event for the Language Server
-        /// </summary>
-        private async Task HandleShutdownRequest(object shutdownParams, RequestContext<object> requestContext)
-        {
-            Logger.Write(LogLevel.Normal, "Service host is shutting down...");
-
-            // Call all the shutdown methods provided by the service components
-            Task[] shutdownTasks = shutdownCallbacks.Select(t => t(shutdownParams, requestContext)).ToArray();
-            TimeSpan shutdownTimeout = TimeSpan.FromSeconds(ShutdownTimeoutInSeconds);
-            // shut down once all tasks are completed, or after the timeout expires, whichever comes first.
-            await Task.WhenAny(Task.WhenAll(shutdownTasks), Task.Delay(shutdownTimeout)).ContinueWith(t => Environment.Exit(0));
-        }
-
-        /// <summary>
-        /// Handles the initialization request
-        /// </summary>
-        /// <param name="initializeParams"></param>
-        /// <param name="requestContext"></param>
-        /// <returns></returns>
-        internal async Task HandleInitializeRequest(InitializeRequest initializeParams, RequestContext<InitializeResult> requestContext)
-        {
-            // Call all tasks that registered on the initialize request
-            var initializeTasks = initializeCallbacks.Select(t => t(initializeParams, requestContext));
-            await Task.WhenAll(initializeTasks);
-
-            // TODO: Figure out where this needs to go to be agnostic of the language
-
-            // Send back what this server can do
-            await requestContext.SendResult(
-                new InitializeResult
-                {
-                    Capabilities = new ServerCapabilities
-                    {
-                        TextDocumentSync = TextDocumentSyncKind.Incremental,
-                        DefinitionProvider = true,
-                        ReferencesProvider = false,
-                        DocumentFormattingProvider = true,
-                        DocumentRangeFormattingProvider = true,
-                        DocumentHighlightProvider = false,
-                        HoverProvider = true,
-                        CompletionProvider = new CompletionOptions
-                        {
-                            ResolveProvider = true,
-                            TriggerCharacters = CompletionTriggerCharacters
-                        },
-                        SignatureHelpProvider = new SignatureHelpOptions
-                        {
-                            TriggerCharacters = new string[] { " ", "," }
-                        }
-                    }
-                });
-        }
-
-        /// <summary>
-        /// Handles the version request. Sends back the server version as result.
-        /// </summary>
-        private static async Task HandleVersionRequest(
-          object versionRequestParams,
-          RequestContext<string> requestContext)
-        {
-            await requestContext.SendResult(serviceVersion.ToString());
-        }
-
-        #endregion
-    }
-}

src/Microsoft.SqlTools.Hosting/Hosting/ServiceHostBase.cs

@@ -4,11 +4,11 @@
 //
 
 using System.Threading.Tasks;
-using Microsoft.SqlTools.ServiceLayer.Hosting.Contracts;
-using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol;
-using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Channel;
+using Microsoft.SqlTools.Hosting.Contracts;
+using Microsoft.SqlTools.Hosting.Protocol;
+using Microsoft.SqlTools.Hosting.Protocol.Channel;
 
-namespace Microsoft.SqlTools.ServiceLayer.Hosting
+namespace Microsoft.SqlTools.Hosting
 {
     public abstract class ServiceHostBase : ProtocolEndpoint
     {

src/Microsoft.SqlTools.Hosting/Hosting/ServiceHostEditorOperations.cs

@@ -3,12 +3,12 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 #if false
-using Microsoft.SqlTools.EditorServices.Extensions;
-using Microsoft.SqlTools.EditorServices.Protocol.LanguageServer;
-using Microsoft.SqlTools.EditorServices.Protocol.MessageProtocol;
+using Microsoft.SqlTools.Extensions;
+using Microsoft.SqlTools.Protocol.LanguageServer;
+using Microsoft.SqlTools.Protocol.MessageProtocol;
 using System.Threading.Tasks;
 
-namespace Microsoft.SqlTools.EditorServices.Protocol.Server
+namespace Microsoft.SqlTools.Protocol.Server
 {
     internal class LanguageServerEditorOperations : IEditorOperations
     {

src/Microsoft.SqlTools.Hosting/Utility/AsyncContext.cs

@@ -7,7 +7,7 @@ using System;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace Microsoft.SqlTools.ServiceLayer.Utility
+namespace Microsoft.SqlTools.Utility
 {
     /// <summary>
     /// Simplifies the setup of a SynchronizationContext for the use

src/Microsoft.SqlTools.Hosting/Utility/AsyncContextThread.cs

@@ -7,7 +7,7 @@ using System;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace Microsoft.SqlTools.ServiceLayer.Utility
+namespace Microsoft.SqlTools.Utility
 {
     /// <summary>
     /// Provides a simplified interface for creating a new thread

src/Microsoft.SqlTools.Hosting/Utility/AsyncLock.cs

@@ -7,7 +7,7 @@ using System;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace Microsoft.SqlTools.ServiceLayer.Utility
+namespace Microsoft.SqlTools.Utility
 {
     /// <summary>
     /// Provides a simple wrapper over a SemaphoreSlim to allow

src/Microsoft.SqlTools.Hosting/Utility/AsyncQueue.cs

@@ -8,7 +8,7 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace Microsoft.SqlTools.ServiceLayer.Utility
+namespace Microsoft.SqlTools.Utility
 {
     /// <summary>
     /// Provides a synchronized queue which can be used from within async

src/Microsoft.SqlTools.Hosting/Utility/Extensions.cs

@@ -5,7 +5,7 @@
 
 using System;
 
-namespace Microsoft.SqlTools.ServiceLayer.Utility
+namespace Microsoft.SqlTools.Utility
 {
     public static class ObjectExtensions
     {

src/Microsoft.SqlTools.Hosting/Utility/Logger.cs

@@ -9,7 +9,7 @@ using System.IO;
 using System.Runtime.CompilerServices;
 using System.Text;
 
-namespace Microsoft.SqlTools.ServiceLayer.Utility
+namespace Microsoft.SqlTools.Utility
 {
     /// <summary>
     /// Defines the level indicators for log messages.

src/Microsoft.SqlTools.Hosting/Utility/LongList.cs

@@ -7,7 +7,7 @@ using System;
 using System.Collections;
 using System.Collections.Generic;
 
-namespace Microsoft.SqlTools.ServiceLayer.Utility
+namespace Microsoft.SqlTools.Utility
 {
     /// <summary>
     /// Collection class that permits storage of over <c>int.MaxValue</c> items. This is performed

src/Microsoft.SqlTools.Hosting/Utility/TextUtilities.cs

@@ -3,7 +3,7 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-namespace Microsoft.SqlTools.ServiceLayer.Utility
+namespace Microsoft.SqlTools.Utility
 {
     public static class TextUtilities
     {   

src/Microsoft.SqlTools.Hosting/Utility/ThreadSynchronizationContext.cs

@@ -7,7 +7,7 @@ using System;
 using System.Collections.Concurrent;
 using System.Threading;
 
-namespace Microsoft.SqlTools.ServiceLayer.Utility
+namespace Microsoft.SqlTools.Utility
 {
     /// <summary>
     /// Provides a SynchronizationContext implementation that can be used

src/Microsoft.SqlTools.Hosting/Utility/Validate.cs

@@ -6,7 +6,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace Microsoft.SqlTools.ServiceLayer.Utility
+namespace Microsoft.SqlTools.Utility
 {
     /// <summary>
     /// Provides common validation methods to simplify method