diff --git a/src/ServiceHost/ServiceHost/Contracts/ClientCapabilities.cs b/src/ServiceHost/Hosting/Contracts/ClientCapabilities.cs
similarity index 86%
rename from src/ServiceHost/ServiceHost/Contracts/ClientCapabilities.cs
rename to src/ServiceHost/Hosting/Contracts/ClientCapabilities.cs
index e8b084e7..397deceb 100644
--- a/src/ServiceHost/ServiceHost/Contracts/ClientCapabilities.cs
+++ b/src/ServiceHost/Hosting/Contracts/ClientCapabilities.cs
@@ -4,7 +4,7 @@
 //
 
 
-namespace Microsoft.SqlTools.ServiceLayer.ServiceHost.Contracts
+namespace Microsoft.SqlTools.ServiceLayer.Hosting.Contracts
 {
     /// <summary>
     /// Defines a class that describes the capabilities of a language
diff --git a/src/ServiceHost/ServiceHost/Contracts/Initialize.cs b/src/ServiceHost/Hosting/Contracts/Initialize.cs
similarity index 91%
rename from src/ServiceHost/ServiceHost/Contracts/Initialize.cs
rename to src/ServiceHost/Hosting/Contracts/Initialize.cs
index a5dc1eff..215edf87 100644
--- a/src/ServiceHost/ServiceHost/Contracts/Initialize.cs
+++ b/src/ServiceHost/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.ServiceHost.Protocol.Contracts;
+using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts;
 
-namespace Microsoft.SqlTools.ServiceLayer.ServiceHost.Contracts
+namespace Microsoft.SqlTools.ServiceLayer.Hosting.Contracts
 {
     public class InitializeRequest
     {
diff --git a/src/ServiceHost/ServiceHost/Contracts/ServerCapabilities.cs b/src/ServiceHost/Hosting/Contracts/ServerCapabilities.cs
similarity index 96%
rename from src/ServiceHost/ServiceHost/Contracts/ServerCapabilities.cs
rename to src/ServiceHost/Hosting/Contracts/ServerCapabilities.cs
index f378aa9e..32f0e736 100644
--- a/src/ServiceHost/ServiceHost/Contracts/ServerCapabilities.cs
+++ b/src/ServiceHost/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.ServiceHost.Contracts
+namespace Microsoft.SqlTools.ServiceLayer.Hosting.Contracts
 {
     public class ServerCapabilities
     {
diff --git a/src/ServiceHost/ServiceHost/Contracts/Shutdown.cs b/src/ServiceHost/Hosting/Contracts/Shutdown.cs
similarity index 85%
rename from src/ServiceHost/ServiceHost/Contracts/Shutdown.cs
rename to src/ServiceHost/Hosting/Contracts/Shutdown.cs
index 395aaef0..1ccb9cfc 100644
--- a/src/ServiceHost/ServiceHost/Contracts/Shutdown.cs
+++ b/src/ServiceHost/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.ServiceHost.Protocol.Contracts;
+using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts;
 
-namespace Microsoft.SqlTools.ServiceLayer.ServiceHost.Contracts
+namespace Microsoft.SqlTools.ServiceLayer.Hosting.Contracts
 {
     /// <summary>
     /// Defines a message that is sent from the client to request
diff --git a/src/ServiceHost/ServiceHost/Protocol/Channel/ChannelBase.cs b/src/ServiceHost/Hosting/Protocol/Channel/ChannelBase.cs
similarity index 95%
rename from src/ServiceHost/ServiceHost/Protocol/Channel/ChannelBase.cs
rename to src/ServiceHost/Hosting/Protocol/Channel/ChannelBase.cs
index 3d55ace4..48cd66aa 100644
--- a/src/ServiceHost/ServiceHost/Protocol/Channel/ChannelBase.cs
+++ b/src/ServiceHost/Hosting/Protocol/Channel/ChannelBase.cs
@@ -4,9 +4,9 @@
 //
 
 using System.Threading.Tasks;
-using Microsoft.SqlTools.ServiceLayer.ServiceHost.Protocol.Serializers;
+using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Serializers;
 
-namespace Microsoft.SqlTools.ServiceLayer.ServiceHost.Protocol.Channel
+namespace Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Channel
 {
     /// <summary>
     /// Defines a base implementation for servers and their clients over a
diff --git a/src/ServiceHost/ServiceHost/Protocol/Channel/StdioClientChannel.cs b/src/ServiceHost/Hosting/Protocol/Channel/StdioClientChannel.cs
similarity index 96%
rename from src/ServiceHost/ServiceHost/Protocol/Channel/StdioClientChannel.cs
rename to src/ServiceHost/Hosting/Protocol/Channel/StdioClientChannel.cs
index 83bf5c38..02b79c6b 100644
--- a/src/ServiceHost/ServiceHost/Protocol/Channel/StdioClientChannel.cs
+++ b/src/ServiceHost/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.ServiceHost.Protocol.Serializers;
+using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Serializers;
 
-namespace Microsoft.SqlTools.ServiceLayer.ServiceHost.Protocol.Channel
+namespace Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Channel
 {
     /// <summary>
     /// Provides a client implementation for the standard I/O channel.
diff --git a/src/ServiceHost/ServiceHost/Protocol/Channel/StdioServerChannel.cs b/src/ServiceHost/Hosting/Protocol/Channel/StdioServerChannel.cs
similarity index 92%
rename from src/ServiceHost/ServiceHost/Protocol/Channel/StdioServerChannel.cs
rename to src/ServiceHost/Hosting/Protocol/Channel/StdioServerChannel.cs
index 9aa164e2..204a9908 100644
--- a/src/ServiceHost/ServiceHost/Protocol/Channel/StdioServerChannel.cs
+++ b/src/ServiceHost/Hosting/Protocol/Channel/StdioServerChannel.cs
@@ -6,9 +6,9 @@
 using System.IO;
 using System.Text;
 using System.Threading.Tasks;
-using Microsoft.SqlTools.ServiceLayer.ServiceHost.Protocol.Serializers;
+using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Serializers;
 
-namespace Microsoft.SqlTools.ServiceLayer.ServiceHost.Protocol.Channel
+namespace Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Channel
 {
     /// <summary>
     /// Provides a server implementation for the standard I/O channel.
diff --git a/src/ServiceHost/ServiceHost/Protocol/Constants.cs b/src/ServiceHost/Hosting/Protocol/Constants.cs
similarity index 91%
rename from src/ServiceHost/ServiceHost/Protocol/Constants.cs
rename to src/ServiceHost/Hosting/Protocol/Constants.cs
index 81dd58ea..14f3d762 100644
--- a/src/ServiceHost/ServiceHost/Protocol/Constants.cs
+++ b/src/ServiceHost/Hosting/Protocol/Constants.cs
@@ -6,7 +6,7 @@
 using Newtonsoft.Json;
 using Newtonsoft.Json.Serialization;
 
-namespace Microsoft.SqlTools.ServiceLayer.ServiceHost.Protocol
+namespace Microsoft.SqlTools.ServiceLayer.Hosting.Protocol
 {
     public static class Constants
     {
diff --git a/src/ServiceHost/ServiceHost/Protocol/Contracts/EventType.cs b/src/ServiceHost/Hosting/Protocol/Contracts/EventType.cs
similarity index 93%
rename from src/ServiceHost/ServiceHost/Protocol/Contracts/EventType.cs
rename to src/ServiceHost/Hosting/Protocol/Contracts/EventType.cs
index 94612af8..4d9a251b 100644
--- a/src/ServiceHost/ServiceHost/Protocol/Contracts/EventType.cs
+++ b/src/ServiceHost/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.ServiceHost.Protocol.Contracts
+namespace Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts
 {
     /// <summary>
     /// Defines an event type with a particular method name.
diff --git a/src/ServiceHost/ServiceHost/Protocol/Contracts/Message.cs b/src/ServiceHost/Hosting/Protocol/Contracts/Message.cs
similarity index 98%
rename from src/ServiceHost/ServiceHost/Protocol/Contracts/Message.cs
rename to src/ServiceHost/Hosting/Protocol/Contracts/Message.cs
index 2474b094..6af6a101 100644
--- a/src/ServiceHost/ServiceHost/Protocol/Contracts/Message.cs
+++ b/src/ServiceHost/Hosting/Protocol/Contracts/Message.cs
@@ -6,7 +6,7 @@
 using System.Diagnostics;
 using Newtonsoft.Json.Linq;
 
-namespace Microsoft.SqlTools.ServiceLayer.ServiceHost.Protocol.Contracts
+namespace Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts
 {
     /// <summary>
     /// Defines all possible message types.
diff --git a/src/ServiceHost/ServiceHost/Protocol/Contracts/RequestType.cs b/src/ServiceHost/Hosting/Protocol/Contracts/RequestType.cs
similarity index 88%
rename from src/ServiceHost/ServiceHost/Protocol/Contracts/RequestType.cs
rename to src/ServiceHost/Hosting/Protocol/Contracts/RequestType.cs
index 9206cb66..67676259 100644
--- a/src/ServiceHost/ServiceHost/Protocol/Contracts/RequestType.cs
+++ b/src/ServiceHost/Hosting/Protocol/Contracts/RequestType.cs
@@ -5,7 +5,7 @@
 
 using System.Diagnostics;
 
-namespace Microsoft.SqlTools.ServiceLayer.ServiceHost.Protocol.Contracts
+namespace Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts
 {
     [DebuggerDisplay("RequestType MethodName = {MethodName}")]
     public class RequestType<TParams, TResult>
diff --git a/src/ServiceHost/ServiceHost/Protocol/EventContext.cs b/src/ServiceHost/Hosting/Protocol/EventContext.cs
similarity index 85%
rename from src/ServiceHost/ServiceHost/Protocol/EventContext.cs
rename to src/ServiceHost/Hosting/Protocol/EventContext.cs
index 8754351c..4a1bc40e 100644
--- a/src/ServiceHost/ServiceHost/Protocol/EventContext.cs
+++ b/src/ServiceHost/Hosting/Protocol/EventContext.cs
@@ -4,9 +4,9 @@
 //
 
 using System.Threading.Tasks;
-using Microsoft.SqlTools.ServiceLayer.ServiceHost.Protocol.Contracts;
+using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts;
 
-namespace Microsoft.SqlTools.ServiceLayer.ServiceHost.Protocol
+namespace Microsoft.SqlTools.ServiceLayer.Hosting.Protocol
 {
     /// <summary>
     /// Provides context for a received event so that handlers
diff --git a/src/ServiceHost/ServiceHost/Protocol/IMessageSender.cs b/src/ServiceHost/Hosting/Protocol/IMessageSender.cs
similarity index 80%
rename from src/ServiceHost/ServiceHost/Protocol/IMessageSender.cs
rename to src/ServiceHost/Hosting/Protocol/IMessageSender.cs
index 2e0e461e..ba42d1b9 100644
--- a/src/ServiceHost/ServiceHost/Protocol/IMessageSender.cs
+++ b/src/ServiceHost/Hosting/Protocol/IMessageSender.cs
@@ -4,9 +4,9 @@
 //
 
 using System.Threading.Tasks;
-using Microsoft.SqlTools.ServiceLayer.ServiceHost.Protocol.Contracts;
+using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts;
 
-namespace Microsoft.SqlTools.ServiceLayer.ServiceHost.Protocol
+namespace Microsoft.SqlTools.ServiceLayer.Hosting.Protocol
 {
     internal interface IMessageSender
     {
diff --git a/src/ServiceHost/ServiceHost/Protocol/MessageDispatcher.cs b/src/ServiceHost/Hosting/Protocol/MessageDispatcher.cs
similarity index 98%
rename from src/ServiceHost/ServiceHost/Protocol/MessageDispatcher.cs
rename to src/ServiceHost/Hosting/Protocol/MessageDispatcher.cs
index fe4ccdff..a18fa806 100644
--- a/src/ServiceHost/ServiceHost/Protocol/MessageDispatcher.cs
+++ b/src/ServiceHost/Hosting/Protocol/MessageDispatcher.cs
@@ -8,11 +8,11 @@ using System.Collections.Generic;
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.SqlTools.ServiceLayer.ServiceHost.Protocol.Channel;
+using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Channel;
+using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts;
 using Microsoft.SqlTools.EditorServices.Utility;
-using Microsoft.SqlTools.ServiceLayer.ServiceHost.Protocol.Contracts;
 
-namespace Microsoft.SqlTools.ServiceLayer.ServiceHost.Protocol
+namespace Microsoft.SqlTools.ServiceLayer.Hosting.Protocol
 {
     public class MessageDispatcher
     {
diff --git a/src/ServiceHost/ServiceHost/Protocol/MessageParseException.cs b/src/ServiceHost/Hosting/Protocol/MessageParseException.cs
similarity index 90%
rename from src/ServiceHost/ServiceHost/Protocol/MessageParseException.cs
rename to src/ServiceHost/Hosting/Protocol/MessageParseException.cs
index 76db24d3..b4ef94c2 100644
--- a/src/ServiceHost/ServiceHost/Protocol/MessageParseException.cs
+++ b/src/ServiceHost/Hosting/Protocol/MessageParseException.cs
@@ -5,7 +5,7 @@
 
 using System;
 
-namespace Microsoft.SqlTools.ServiceLayer.ServiceHost.Protocol
+namespace Microsoft.SqlTools.ServiceLayer.Hosting.Protocol
 {
     public class MessageParseException : Exception
     {
diff --git a/src/ServiceHost/ServiceHost/Protocol/MessageProtocolType.cs b/src/ServiceHost/Hosting/Protocol/MessageProtocolType.cs
similarity index 89%
rename from src/ServiceHost/ServiceHost/Protocol/MessageProtocolType.cs
rename to src/ServiceHost/Hosting/Protocol/MessageProtocolType.cs
index 09655481..480332fa 100644
--- a/src/ServiceHost/ServiceHost/Protocol/MessageProtocolType.cs
+++ b/src/ServiceHost/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.ServiceHost.Protocol
+namespace Microsoft.SqlTools.ServiceLayer.Hosting.Protocol
 {
     /// <summary>
     /// Defines the possible message protocol types.
diff --git a/src/ServiceHost/ServiceHost/Protocol/MessageReader.cs b/src/ServiceHost/Hosting/Protocol/MessageReader.cs
similarity index 97%
rename from src/ServiceHost/ServiceHost/Protocol/MessageReader.cs
rename to src/ServiceHost/Hosting/Protocol/MessageReader.cs
index 7722a426..f3857710 100644
--- a/src/ServiceHost/ServiceHost/Protocol/MessageReader.cs
+++ b/src/ServiceHost/Hosting/Protocol/MessageReader.cs
@@ -9,12 +9,12 @@ using System.IO;
 using System.Text;
 using System.Threading.Tasks;
 using Microsoft.SqlTools.EditorServices.Utility;
-using Microsoft.SqlTools.ServiceLayer.ServiceHost.Protocol.Contracts;
-using Microsoft.SqlTools.ServiceLayer.ServiceHost.Protocol.Serializers;
+using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts;
+using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Serializers;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
-namespace Microsoft.SqlTools.ServiceLayer.ServiceHost.Protocol
+namespace Microsoft.SqlTools.ServiceLayer.Hosting.Protocol
 {
     public class MessageReader
     {
diff --git a/src/ServiceHost/ServiceHost/Protocol/MessageWriter.cs b/src/ServiceHost/Hosting/Protocol/MessageWriter.cs
similarity index 95%
rename from src/ServiceHost/ServiceHost/Protocol/MessageWriter.cs
rename to src/ServiceHost/Hosting/Protocol/MessageWriter.cs
index 4098d181..b269f750 100644
--- a/src/ServiceHost/ServiceHost/Protocol/MessageWriter.cs
+++ b/src/ServiceHost/Hosting/Protocol/MessageWriter.cs
@@ -7,12 +7,12 @@ using System.IO;
 using System.Text;
 using System.Threading.Tasks;
 using Microsoft.SqlTools.EditorServices.Utility;
-using Microsoft.SqlTools.ServiceLayer.ServiceHost.Protocol.Contracts;
-using Microsoft.SqlTools.ServiceLayer.ServiceHost.Protocol.Serializers;
+using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts;
+using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Serializers;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
-namespace Microsoft.SqlTools.ServiceLayer.ServiceHost.Protocol
+namespace Microsoft.SqlTools.ServiceLayer.Hosting.Protocol
 {
     public class MessageWriter
     {
diff --git a/src/ServiceHost/ServiceHost/Protocol/ProtocolEndpoint.cs b/src/ServiceHost/Hosting/Protocol/ProtocolEndpoint.cs
similarity index 98%
rename from src/ServiceHost/ServiceHost/Protocol/ProtocolEndpoint.cs
rename to src/ServiceHost/Hosting/Protocol/ProtocolEndpoint.cs
index 27601412..2068f5c8 100644
--- a/src/ServiceHost/ServiceHost/Protocol/ProtocolEndpoint.cs
+++ b/src/ServiceHost/Hosting/Protocol/ProtocolEndpoint.cs
@@ -7,10 +7,10 @@ using System;
 using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.SqlTools.ServiceLayer.ServiceHost.Protocol.Channel;
-using Microsoft.SqlTools.ServiceLayer.ServiceHost.Protocol.Contracts;
+using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Channel;
+using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts;
 
-namespace Microsoft.SqlTools.ServiceLayer.ServiceHost.Protocol
+namespace Microsoft.SqlTools.ServiceLayer.Hosting.Protocol
 {
     /// <summary>
     /// Provides behavior for a client or server endpoint that
diff --git a/src/ServiceHost/ServiceHost/Protocol/RequestContext.cs b/src/ServiceHost/Hosting/Protocol/RequestContext.cs
similarity index 90%
rename from src/ServiceHost/ServiceHost/Protocol/RequestContext.cs
rename to src/ServiceHost/Hosting/Protocol/RequestContext.cs
index 6d09294e..153e46d6 100644
--- a/src/ServiceHost/ServiceHost/Protocol/RequestContext.cs
+++ b/src/ServiceHost/Hosting/Protocol/RequestContext.cs
@@ -4,10 +4,10 @@
 //
 
 using System.Threading.Tasks;
-using Microsoft.SqlTools.ServiceLayer.ServiceHost.Protocol.Contracts;
+using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts;
 using Newtonsoft.Json.Linq;
 
-namespace Microsoft.SqlTools.ServiceLayer.ServiceHost.Protocol
+namespace Microsoft.SqlTools.ServiceLayer.Hosting.Protocol
 {
     public class RequestContext<TResult>
     {
diff --git a/src/ServiceHost/ServiceHost/Protocol/Serializers/IMessageSerializer.cs b/src/ServiceHost/Hosting/Protocol/Serializers/IMessageSerializer.cs
similarity index 87%
rename from src/ServiceHost/ServiceHost/Protocol/Serializers/IMessageSerializer.cs
rename to src/ServiceHost/Hosting/Protocol/Serializers/IMessageSerializer.cs
index de537b1d..6a1133ff 100644
--- a/src/ServiceHost/ServiceHost/Protocol/Serializers/IMessageSerializer.cs
+++ b/src/ServiceHost/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.ServiceHost.Protocol.Contracts;
+using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts;
 using Newtonsoft.Json.Linq;
 
-namespace Microsoft.SqlTools.ServiceLayer.ServiceHost.Protocol.Serializers
+namespace Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Serializers
 {
     /// <summary>
     /// Defines a common interface for message serializers.
diff --git a/src/ServiceHost/ServiceHost/Protocol/Serializers/JsonRpcMessageSerializer.cs b/src/ServiceHost/Hosting/Protocol/Serializers/JsonRpcMessageSerializer.cs
similarity index 95%
rename from src/ServiceHost/ServiceHost/Protocol/Serializers/JsonRpcMessageSerializer.cs
rename to src/ServiceHost/Hosting/Protocol/Serializers/JsonRpcMessageSerializer.cs
index bf29a530..0ccca078 100644
--- a/src/ServiceHost/ServiceHost/Protocol/Serializers/JsonRpcMessageSerializer.cs
+++ b/src/ServiceHost/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.ServiceHost.Protocol.Contracts;
+using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts;
 using Newtonsoft.Json.Linq;
 
-namespace Microsoft.SqlTools.ServiceLayer.ServiceHost.Protocol.Serializers
+namespace Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Serializers
 {
     /// <summary>
     /// Serializes messages in the JSON RPC format.  Used primarily
diff --git a/src/ServiceHost/ServiceHost/Protocol/Serializers/V8MessageSerializer.cs b/src/ServiceHost/Hosting/Protocol/Serializers/V8MessageSerializer.cs
similarity index 96%
rename from src/ServiceHost/ServiceHost/Protocol/Serializers/V8MessageSerializer.cs
rename to src/ServiceHost/Hosting/Protocol/Serializers/V8MessageSerializer.cs
index 7ac68143..f1385e00 100644
--- a/src/ServiceHost/ServiceHost/Protocol/Serializers/V8MessageSerializer.cs
+++ b/src/ServiceHost/Hosting/Protocol/Serializers/V8MessageSerializer.cs
@@ -5,9 +5,9 @@
 
 using Newtonsoft.Json.Linq;
 using System;
-using Microsoft.SqlTools.ServiceLayer.ServiceHost.Protocol.Contracts;
+using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts;
 
-namespace Microsoft.SqlTools.ServiceLayer.ServiceHost.Protocol.Serializers
+namespace Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Serializers
 {
     /// <summary>
     /// Serializes messages in the V8 format.  Used primarily for debug adapters.
diff --git a/src/ServiceHost/ServiceHost/ServiceHost.cs b/src/ServiceHost/Hosting/ServiceHost.cs
similarity index 95%
rename from src/ServiceHost/ServiceHost/ServiceHost.cs
rename to src/ServiceHost/Hosting/ServiceHost.cs
index 1e433b91..1a499ea6 100644
--- a/src/ServiceHost/ServiceHost/ServiceHost.cs
+++ b/src/ServiceHost/Hosting/ServiceHost.cs
@@ -7,11 +7,11 @@ using System.Threading.Tasks;
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.SqlTools.EditorServices.Utility;
-using Microsoft.SqlTools.ServiceLayer.ServiceHost.Contracts;
-using Microsoft.SqlTools.ServiceLayer.ServiceHost.Protocol;
-using Microsoft.SqlTools.ServiceLayer.ServiceHost.Protocol.Channel;
+using Microsoft.SqlTools.ServiceLayer.Hosting.Contracts;
+using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol;
+using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Channel;
 
-namespace Microsoft.SqlTools.ServiceLayer.ServiceHost
+namespace Microsoft.SqlTools.ServiceLayer.Hosting
 {
     /// <summary>
     /// SQL Tools VS Code Language Server request handler
diff --git a/src/ServiceHost/ServiceHost/ServiceHostBase.cs b/src/ServiceHost/Hosting/ServiceHostBase.cs
similarity index 78%
rename from src/ServiceHost/ServiceHost/ServiceHostBase.cs
rename to src/ServiceHost/Hosting/ServiceHostBase.cs
index eb6ec946..8158822b 100644
--- a/src/ServiceHost/ServiceHost/ServiceHostBase.cs
+++ b/src/ServiceHost/Hosting/ServiceHostBase.cs
@@ -4,18 +4,18 @@
 //
 
 using System.Threading.Tasks;
-using Microsoft.SqlTools.ServiceLayer.ServiceHost.Contracts;
-using Microsoft.SqlTools.ServiceLayer.ServiceHost.Protocol;
-using Microsoft.SqlTools.ServiceLayer.ServiceHost.Protocol.Channel;
+using Microsoft.SqlTools.ServiceLayer.Hosting.Contracts;
+using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol;
+using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Channel;
 
-namespace Microsoft.SqlTools.ServiceLayer.ServiceHost
+namespace Microsoft.SqlTools.ServiceLayer.Hosting
 {
     public abstract class ServiceHostBase : ProtocolEndpoint
     {
         private bool isStarted;
         private TaskCompletionSource<bool> serverExitedTask;
 
-        public ServiceHostBase(ChannelBase serverChannel) : 
+        protected ServiceHostBase(ChannelBase serverChannel) : 
             base(serverChannel, MessageProtocolType.LanguageServer)
         {
         }
diff --git a/src/ServiceHost/ServiceHost/ServiceHostEditorOperations.cs b/src/ServiceHost/Hosting/ServiceHostEditorOperations.cs
similarity index 100%
rename from src/ServiceHost/ServiceHost/ServiceHostEditorOperations.cs
rename to src/ServiceHost/Hosting/ServiceHostEditorOperations.cs
diff --git a/src/ServiceHost/LanguageService/Contracts/Completion.cs b/src/ServiceHost/LanguageServices/Contracts/Completion.cs
similarity index 92%
rename from src/ServiceHost/LanguageService/Contracts/Completion.cs
rename to src/ServiceHost/LanguageServices/Contracts/Completion.cs
index ef78330d..6dc41130 100644
--- a/src/ServiceHost/LanguageService/Contracts/Completion.cs
+++ b/src/ServiceHost/LanguageServices/Contracts/Completion.cs
@@ -4,10 +4,10 @@
 //
 
 using System.Diagnostics;
-using Microsoft.SqlTools.ServiceLayer.ServiceHost.Protocol.Contracts;
-using Microsoft.SqlTools.ServiceLayer.WorkspaceService.Contracts;
+using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts;
+using Microsoft.SqlTools.ServiceLayer.WorkspaceServices.Contracts;
 
-namespace Microsoft.SqlTools.ServiceLayer.LanguageService.Contracts
+namespace Microsoft.SqlTools.ServiceLayer.LanguageServices.Contracts
 {
     public class CompletionRequest
     {
diff --git a/src/ServiceHost/LanguageService/Contracts/Definition.cs b/src/ServiceHost/LanguageServices/Contracts/Definition.cs
similarity index 66%
rename from src/ServiceHost/LanguageService/Contracts/Definition.cs
rename to src/ServiceHost/LanguageServices/Contracts/Definition.cs
index b6a211e6..1c40996f 100644
--- a/src/ServiceHost/LanguageService/Contracts/Definition.cs
+++ b/src/ServiceHost/LanguageServices/Contracts/Definition.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.ServiceHost.Protocol.Contracts;
-using Microsoft.SqlTools.ServiceLayer.WorkspaceService.Contracts;
+using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts;
+using Microsoft.SqlTools.ServiceLayer.WorkspaceServices.Contracts;
 
-namespace Microsoft.SqlTools.ServiceLayer.LanguageService.Contracts
+namespace Microsoft.SqlTools.ServiceLayer.LanguageServices.Contracts
 {
     public class DefinitionRequest
     {
diff --git a/src/ServiceHost/LanguageService/Contracts/Diagnostics.cs b/src/ServiceHost/LanguageServices/Contracts/Diagnostics.cs
similarity index 90%
rename from src/ServiceHost/LanguageService/Contracts/Diagnostics.cs
rename to src/ServiceHost/LanguageServices/Contracts/Diagnostics.cs
index c1895bdf..a591b925 100644
--- a/src/ServiceHost/LanguageService/Contracts/Diagnostics.cs
+++ b/src/ServiceHost/LanguageServices/Contracts/Diagnostics.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.ServiceHost.Protocol.Contracts;
-using Microsoft.SqlTools.ServiceLayer.WorkspaceService.Contracts;
+using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts;
+using Microsoft.SqlTools.ServiceLayer.WorkspaceServices.Contracts;
 
-namespace Microsoft.SqlTools.ServiceLayer.LanguageService.Contracts
+namespace Microsoft.SqlTools.ServiceLayer.LanguageServices.Contracts
 {
     public class PublishDiagnosticsNotification
     {
diff --git a/src/ServiceHost/LanguageService/Contracts/DocumentHighlight.cs b/src/ServiceHost/LanguageServices/Contracts/DocumentHighlight.cs
similarity index 77%
rename from src/ServiceHost/LanguageService/Contracts/DocumentHighlight.cs
rename to src/ServiceHost/LanguageServices/Contracts/DocumentHighlight.cs
index db459eb4..f266801f 100644
--- a/src/ServiceHost/LanguageService/Contracts/DocumentHighlight.cs
+++ b/src/ServiceHost/LanguageServices/Contracts/DocumentHighlight.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.ServiceHost.Protocol.Contracts;
-using Microsoft.SqlTools.ServiceLayer.WorkspaceService.Contracts;
+using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts;
+using Microsoft.SqlTools.ServiceLayer.WorkspaceServices.Contracts;
 
-namespace Microsoft.SqlTools.ServiceLayer.LanguageService.Contracts
+namespace Microsoft.SqlTools.ServiceLayer.LanguageServices.Contracts
 {
     public enum DocumentHighlightKind 
     {
diff --git a/src/ServiceHost/LanguageService/Contracts/ExpandAliasRequest.cs b/src/ServiceHost/LanguageServices/Contracts/ExpandAliasRequest.cs
similarity index 72%
rename from src/ServiceHost/LanguageService/Contracts/ExpandAliasRequest.cs
rename to src/ServiceHost/LanguageServices/Contracts/ExpandAliasRequest.cs
index 7a970db5..e758aa3d 100644
--- a/src/ServiceHost/LanguageService/Contracts/ExpandAliasRequest.cs
+++ b/src/ServiceHost/LanguageServices/Contracts/ExpandAliasRequest.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.ServiceHost.Protocol.Contracts;
+using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts;
 
-namespace Microsoft.SqlTools.ServiceLayer.LanguageService.Contracts
+namespace Microsoft.SqlTools.ServiceLayer.LanguageServices.Contracts
 {
     public class ExpandAliasRequest
     {
diff --git a/src/ServiceHost/LanguageService/Contracts/FindModuleRequest.cs b/src/ServiceHost/LanguageServices/Contracts/FindModuleRequest.cs
similarity index 80%
rename from src/ServiceHost/LanguageService/Contracts/FindModuleRequest.cs
rename to src/ServiceHost/LanguageServices/Contracts/FindModuleRequest.cs
index dff3939c..5de004d5 100644
--- a/src/ServiceHost/LanguageService/Contracts/FindModuleRequest.cs
+++ b/src/ServiceHost/LanguageServices/Contracts/FindModuleRequest.cs
@@ -4,9 +4,9 @@
 //
 
 using System.Collections.Generic;
-using Microsoft.SqlTools.ServiceLayer.ServiceHost.Protocol.Contracts;
+using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts;
 
-namespace Microsoft.SqlTools.ServiceLayer.LanguageService.Contracts
+namespace Microsoft.SqlTools.ServiceLayer.LanguageServices.Contracts
 {
     public class FindModuleRequest
     {
diff --git a/src/ServiceHost/LanguageService/Contracts/Hover.cs b/src/ServiceHost/LanguageServices/Contracts/Hover.cs
similarity index 76%
rename from src/ServiceHost/LanguageService/Contracts/Hover.cs
rename to src/ServiceHost/LanguageServices/Contracts/Hover.cs
index dd7f05c0..04c27d33 100644
--- a/src/ServiceHost/LanguageService/Contracts/Hover.cs
+++ b/src/ServiceHost/LanguageServices/Contracts/Hover.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.ServiceHost.Protocol.Contracts;
-using Microsoft.SqlTools.ServiceLayer.WorkspaceService.Contracts;
+using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts;
+using Microsoft.SqlTools.ServiceLayer.WorkspaceServices.Contracts;
 
-namespace Microsoft.SqlTools.ServiceLayer.LanguageService.Contracts
+namespace Microsoft.SqlTools.ServiceLayer.LanguageServices.Contracts
 {
     public class MarkedString
     {
diff --git a/src/ServiceHost/LanguageService/Contracts/InstallModuleRequest.cs b/src/ServiceHost/LanguageServices/Contracts/InstallModuleRequest.cs
similarity index 72%
rename from src/ServiceHost/LanguageService/Contracts/InstallModuleRequest.cs
rename to src/ServiceHost/LanguageServices/Contracts/InstallModuleRequest.cs
index 361bb60f..fc5bc289 100644
--- a/src/ServiceHost/LanguageService/Contracts/InstallModuleRequest.cs
+++ b/src/ServiceHost/LanguageServices/Contracts/InstallModuleRequest.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.ServiceHost.Protocol.Contracts;
+using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts;
 
-namespace Microsoft.SqlTools.ServiceLayer.LanguageService.Contracts
+namespace Microsoft.SqlTools.ServiceLayer.LanguageServices.Contracts
 {
     class InstallModuleRequest
     {
diff --git a/src/ServiceHost/LanguageService/Contracts/References.cs b/src/ServiceHost/LanguageServices/Contracts/References.cs
similarity index 75%
rename from src/ServiceHost/LanguageService/Contracts/References.cs
rename to src/ServiceHost/LanguageServices/Contracts/References.cs
index d2e12ccd..ad2f23bd 100644
--- a/src/ServiceHost/LanguageService/Contracts/References.cs
+++ b/src/ServiceHost/LanguageServices/Contracts/References.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.ServiceHost.Protocol.Contracts;
-using Microsoft.SqlTools.ServiceLayer.WorkspaceService.Contracts;
+using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts;
+using Microsoft.SqlTools.ServiceLayer.WorkspaceServices.Contracts;
 
-namespace Microsoft.SqlTools.ServiceLayer.LanguageService.Contracts
+namespace Microsoft.SqlTools.ServiceLayer.LanguageServices.Contracts
 {
     public class ReferencesRequest
     {
diff --git a/src/ServiceHost/LanguageService/Contracts/ShowOnlineHelpRequest.cs b/src/ServiceHost/LanguageServices/Contracts/ShowOnlineHelpRequest.cs
similarity index 72%
rename from src/ServiceHost/LanguageService/Contracts/ShowOnlineHelpRequest.cs
rename to src/ServiceHost/LanguageServices/Contracts/ShowOnlineHelpRequest.cs
index d77eeafa..d8cf3f48 100644
--- a/src/ServiceHost/LanguageService/Contracts/ShowOnlineHelpRequest.cs
+++ b/src/ServiceHost/LanguageServices/Contracts/ShowOnlineHelpRequest.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.ServiceHost.Protocol.Contracts;
+using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts;
 
-namespace Microsoft.SqlTools.ServiceLayer.LanguageService.Contracts
+namespace Microsoft.SqlTools.ServiceLayer.LanguageServices.Contracts
 {
     public class ShowOnlineHelpRequest
     {
diff --git a/src/ServiceHost/LanguageService/Contracts/SignatureHelp.cs b/src/ServiceHost/LanguageServices/Contracts/SignatureHelp.cs
similarity index 82%
rename from src/ServiceHost/LanguageService/Contracts/SignatureHelp.cs
rename to src/ServiceHost/LanguageServices/Contracts/SignatureHelp.cs
index 26e62b21..bd1103c9 100644
--- a/src/ServiceHost/LanguageService/Contracts/SignatureHelp.cs
+++ b/src/ServiceHost/LanguageServices/Contracts/SignatureHelp.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.ServiceHost.Protocol.Contracts;
-using Microsoft.SqlTools.ServiceLayer.WorkspaceService.Contracts;
+using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts;
+using Microsoft.SqlTools.ServiceLayer.WorkspaceServices.Contracts;
 
-namespace Microsoft.SqlTools.ServiceLayer.LanguageService.Contracts
+namespace Microsoft.SqlTools.ServiceLayer.LanguageServices.Contracts
 {
     public class SignatureHelpRequest
     {
diff --git a/src/ServiceHost/LanguageService/LanguageService.cs b/src/ServiceHost/LanguageServices/LanguageService.cs
similarity index 97%
rename from src/ServiceHost/LanguageService/LanguageService.cs
rename to src/ServiceHost/LanguageServices/LanguageService.cs
index 05cc90c5..51edcad4 100644
--- a/src/ServiceHost/LanguageService/LanguageService.cs
+++ b/src/ServiceHost/LanguageServices/LanguageService.cs
@@ -7,14 +7,15 @@ using System;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.SqlTools.EditorServices.Utility;
-using Microsoft.SqlTools.ServiceLayer.LanguageService.Contracts;
-using Microsoft.SqlTools.ServiceLayer.ServiceHost.Protocol;
+using Microsoft.SqlTools.ServiceLayer.Hosting;
+using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol;
+using Microsoft.SqlTools.ServiceLayer.LanguageServices.Contracts;
 using Microsoft.SqlTools.ServiceLayer.SqlContext;
-using Microsoft.SqlTools.ServiceLayer.WorkspaceService;
-using Microsoft.SqlTools.ServiceLayer.WorkspaceService.Contracts;
+using Microsoft.SqlTools.ServiceLayer.WorkspaceServices;
+using Microsoft.SqlTools.ServiceLayer.WorkspaceServices.Contracts;
 using System.Linq;
 
-namespace Microsoft.SqlTools.ServiceLayer.LanguageService
+namespace Microsoft.SqlTools.ServiceLayer.LanguageServices
 {
     /// <summary>
     /// Main class for Language Service functionality
@@ -71,7 +72,7 @@ namespace Microsoft.SqlTools.ServiceLayer.LanguageService
 
         #endregion
 
-        public void InitializeService(ServiceHost.ServiceHost serviceHost, SqlToolsContext context)
+        public void InitializeService(ServiceHost serviceHost, SqlToolsContext context)
         {
             // Register the requests that this service will handle
             serviceHost.SetRequestHandler(DefinitionRequest.Type, HandleDefinitionRequest);
diff --git a/src/ServiceHost/Program.cs b/src/ServiceHost/Program.cs
index 9717feb3..6879aabb 100644
--- a/src/ServiceHost/Program.cs
+++ b/src/ServiceHost/Program.cs
@@ -3,7 +3,10 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 using System;
 using Microsoft.SqlTools.EditorServices.Utility;
+using Microsoft.SqlTools.ServiceLayer.Hosting;
 using Microsoft.SqlTools.ServiceLayer.SqlContext;
+using Microsoft.SqlTools.ServiceLayer.WorkspaceServices;
+using Microsoft.SqlTools.ServiceLayer.LanguageServices;
 
 namespace Microsoft.SqlTools.ServiceLayer
 {     
@@ -32,11 +35,11 @@ namespace Microsoft.SqlTools.ServiceLayer
             SqlToolsContext sqlToolsContext = new SqlToolsContext(hostDetails, profilePaths);
 
             // Create the service host
-            ServiceHost.ServiceHost serviceHost = ServiceHost.ServiceHost.Create();
+            ServiceHost serviceHost = ServiceHost.Create();
 
             // Initialize the services that will be hosted here
-            WorkspaceService.WorkspaceService<SqlToolsSettings>.Instance.InitializeService(serviceHost);
-            LanguageService.LanguageService.Instance.InitializeService(serviceHost, sqlToolsContext);
+            WorkspaceService<SqlToolsSettings>.Instance.InitializeService(serviceHost);
+            LanguageService.Instance.InitializeService(serviceHost, sqlToolsContext);
 
             // Start the service
             serviceHost.Start().Wait();
diff --git a/src/ServiceHost/WorkspaceService/Contracts/BufferPosition.cs b/src/ServiceHost/WorkspaceServices/Contracts/BufferPosition.cs
similarity index 98%
rename from src/ServiceHost/WorkspaceService/Contracts/BufferPosition.cs
rename to src/ServiceHost/WorkspaceServices/Contracts/BufferPosition.cs
index 020548f6..f74ade68 100644
--- a/src/ServiceHost/WorkspaceService/Contracts/BufferPosition.cs
+++ b/src/ServiceHost/WorkspaceServices/Contracts/BufferPosition.cs
@@ -5,7 +5,7 @@
 
 using System.Diagnostics;
 
-namespace Microsoft.SqlTools.ServiceLayer.WorkspaceService.Contracts
+namespace Microsoft.SqlTools.ServiceLayer.WorkspaceServices.Contracts
 {
     /// <summary>
     /// Provides details about a position in a file buffer.  All
diff --git a/src/ServiceHost/WorkspaceService/Contracts/BufferRange.cs b/src/ServiceHost/WorkspaceServices/Contracts/BufferRange.cs
similarity index 98%
rename from src/ServiceHost/WorkspaceService/Contracts/BufferRange.cs
rename to src/ServiceHost/WorkspaceServices/Contracts/BufferRange.cs
index f46abb96..99316fe5 100644
--- a/src/ServiceHost/WorkspaceService/Contracts/BufferRange.cs
+++ b/src/ServiceHost/WorkspaceServices/Contracts/BufferRange.cs
@@ -6,7 +6,7 @@
 using System;
 using System.Diagnostics;
 
-namespace Microsoft.SqlTools.ServiceLayer.WorkspaceService.Contracts
+namespace Microsoft.SqlTools.ServiceLayer.WorkspaceServices.Contracts
 {
     /// <summary>
     /// Provides details about a range between two positions in
diff --git a/src/ServiceHost/WorkspaceService/Contracts/Configuration.cs b/src/ServiceHost/WorkspaceServices/Contracts/Configuration.cs
similarity index 80%
rename from src/ServiceHost/WorkspaceService/Contracts/Configuration.cs
rename to src/ServiceHost/WorkspaceServices/Contracts/Configuration.cs
index 45697554..ff1e5096 100644
--- a/src/ServiceHost/WorkspaceService/Contracts/Configuration.cs
+++ b/src/ServiceHost/WorkspaceServices/Contracts/Configuration.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.ServiceHost.Protocol.Contracts;
+using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts;
 
-namespace Microsoft.SqlTools.ServiceLayer.WorkspaceService.Contracts
+namespace Microsoft.SqlTools.ServiceLayer.WorkspaceServices.Contracts
 {
     public class DidChangeConfigurationNotification<TConfig> 
     {
diff --git a/src/ServiceHost/WorkspaceService/Contracts/FileChange.cs b/src/ServiceHost/WorkspaceServices/Contracts/FileChange.cs
similarity index 93%
rename from src/ServiceHost/WorkspaceService/Contracts/FileChange.cs
rename to src/ServiceHost/WorkspaceServices/Contracts/FileChange.cs
index a4398afe..7e1af148 100644
--- a/src/ServiceHost/WorkspaceService/Contracts/FileChange.cs
+++ b/src/ServiceHost/WorkspaceServices/Contracts/FileChange.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.WorkspaceService.Contracts
+namespace Microsoft.SqlTools.ServiceLayer.WorkspaceServices.Contracts
 {
     /// <summary>
     /// Contains details relating to a content change in an open file.
diff --git a/src/ServiceHost/WorkspaceService/Contracts/FilePosition.cs b/src/ServiceHost/WorkspaceServices/Contracts/FilePosition.cs
similarity index 98%
rename from src/ServiceHost/WorkspaceService/Contracts/FilePosition.cs
rename to src/ServiceHost/WorkspaceServices/Contracts/FilePosition.cs
index 13e205ca..01ed012d 100644
--- a/src/ServiceHost/WorkspaceService/Contracts/FilePosition.cs
+++ b/src/ServiceHost/WorkspaceServices/Contracts/FilePosition.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.WorkspaceService.Contracts
+namespace Microsoft.SqlTools.ServiceLayer.WorkspaceServices.Contracts
 {
     /// <summary>
     /// Provides details and operations for a buffer position in a
diff --git a/src/ServiceHost/WorkspaceService/Contracts/ScriptFile.cs b/src/ServiceHost/WorkspaceServices/Contracts/ScriptFile.cs
similarity index 99%
rename from src/ServiceHost/WorkspaceService/Contracts/ScriptFile.cs
rename to src/ServiceHost/WorkspaceServices/Contracts/ScriptFile.cs
index 134cdb9b..b28a88db 100644
--- a/src/ServiceHost/WorkspaceService/Contracts/ScriptFile.cs
+++ b/src/ServiceHost/WorkspaceServices/Contracts/ScriptFile.cs
@@ -9,7 +9,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 
-namespace Microsoft.SqlTools.ServiceLayer.WorkspaceService.Contracts
+namespace Microsoft.SqlTools.ServiceLayer.WorkspaceServices.Contracts
 {
     /// <summary>
     /// Contains the details and contents of an open script file.
diff --git a/src/ServiceHost/WorkspaceService/Contracts/ScriptFileMarker.cs b/src/ServiceHost/WorkspaceServices/Contracts/ScriptFileMarker.cs
similarity index 95%
rename from src/ServiceHost/WorkspaceService/Contracts/ScriptFileMarker.cs
rename to src/ServiceHost/WorkspaceServices/Contracts/ScriptFileMarker.cs
index a43de169..35ba21fa 100644
--- a/src/ServiceHost/WorkspaceService/Contracts/ScriptFileMarker.cs
+++ b/src/ServiceHost/WorkspaceServices/Contracts/ScriptFileMarker.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.WorkspaceService.Contracts
+namespace Microsoft.SqlTools.ServiceLayer.WorkspaceServices.Contracts
 {
     /// <summary>
     /// Defines the message level of a script file marker.
diff --git a/src/ServiceHost/WorkspaceService/Contracts/ScriptRegion.cs b/src/ServiceHost/WorkspaceServices/Contracts/ScriptRegion.cs
similarity index 97%
rename from src/ServiceHost/WorkspaceService/Contracts/ScriptRegion.cs
rename to src/ServiceHost/WorkspaceServices/Contracts/ScriptRegion.cs
index 943e2252..1ac56d01 100644
--- a/src/ServiceHost/WorkspaceService/Contracts/ScriptRegion.cs
+++ b/src/ServiceHost/WorkspaceServices/Contracts/ScriptRegion.cs
@@ -5,7 +5,7 @@
 
 //using System.Management.Automation.Language;
 
-namespace Microsoft.SqlTools.ServiceLayer.WorkspaceService.Contracts
+namespace Microsoft.SqlTools.ServiceLayer.WorkspaceServices.Contracts
 {
     /// <summary>
     /// Contains details about a specific region of text in script file.
diff --git a/src/ServiceHost/WorkspaceService/Contracts/TextDocument.cs b/src/ServiceHost/WorkspaceServices/Contracts/TextDocument.cs
similarity index 97%
rename from src/ServiceHost/WorkspaceService/Contracts/TextDocument.cs
rename to src/ServiceHost/WorkspaceServices/Contracts/TextDocument.cs
index e091b315..0708316d 100644
--- a/src/ServiceHost/WorkspaceService/Contracts/TextDocument.cs
+++ b/src/ServiceHost/WorkspaceServices/Contracts/TextDocument.cs
@@ -4,9 +4,9 @@
 //
 
 using System.Diagnostics;
-using Microsoft.SqlTools.ServiceLayer.ServiceHost.Protocol.Contracts;
+using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts;
 
-namespace Microsoft.SqlTools.ServiceLayer.WorkspaceService.Contracts
+namespace Microsoft.SqlTools.ServiceLayer.WorkspaceServices.Contracts
 {
     /// <summary>
     /// Defines a base parameter class for identifying a text document.
diff --git a/src/ServiceHost/WorkspaceService/Contracts/WorkspaceSymbols.cs b/src/ServiceHost/WorkspaceServices/Contracts/WorkspaceSymbols.cs
similarity index 91%
rename from src/ServiceHost/WorkspaceService/Contracts/WorkspaceSymbols.cs
rename to src/ServiceHost/WorkspaceServices/Contracts/WorkspaceSymbols.cs
index 347a9468..1b7731eb 100644
--- a/src/ServiceHost/WorkspaceService/Contracts/WorkspaceSymbols.cs
+++ b/src/ServiceHost/WorkspaceServices/Contracts/WorkspaceSymbols.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.ServiceHost.Protocol.Contracts;
+using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts;
 
-namespace Microsoft.SqlTools.ServiceLayer.WorkspaceService.Contracts
+namespace Microsoft.SqlTools.ServiceLayer.WorkspaceServices.Contracts
 {
     public enum SymbolKind 
     {
diff --git a/src/ServiceHost/WorkspaceService/Workspace.cs b/src/ServiceHost/WorkspaceServices/Workspace.cs
similarity index 98%
rename from src/ServiceHost/WorkspaceService/Workspace.cs
rename to src/ServiceHost/WorkspaceServices/Workspace.cs
index 6aa8f479..921ecc7c 100644
--- a/src/ServiceHost/WorkspaceService/Workspace.cs
+++ b/src/ServiceHost/WorkspaceServices/Workspace.cs
@@ -10,9 +10,9 @@ using System.Text;
 using System.Text.RegularExpressions;
 using System.Linq;
 using Microsoft.SqlTools.EditorServices.Utility;
-using Microsoft.SqlTools.ServiceLayer.WorkspaceService.Contracts;
+using Microsoft.SqlTools.ServiceLayer.WorkspaceServices.Contracts;
 
-namespace Microsoft.SqlTools.ServiceLayer.WorkspaceService
+namespace Microsoft.SqlTools.ServiceLayer.WorkspaceServices
 {
     /// <summary>
     /// Manages a "workspace" of script files that are open for a particular
diff --git a/src/ServiceHost/WorkspaceService/WorkspaceService.cs b/src/ServiceHost/WorkspaceServices/WorkspaceService.cs
similarity index 96%
rename from src/ServiceHost/WorkspaceService/WorkspaceService.cs
rename to src/ServiceHost/WorkspaceServices/WorkspaceService.cs
index fa92997f..2fd3e48c 100644
--- a/src/ServiceHost/WorkspaceService/WorkspaceService.cs
+++ b/src/ServiceHost/WorkspaceServices/WorkspaceService.cs
@@ -8,11 +8,12 @@ using System.Collections.Generic;
 using System.Text;
 using System.Threading.Tasks;
 using Microsoft.SqlTools.EditorServices.Utility;
-using Microsoft.SqlTools.ServiceLayer.ServiceHost.Protocol;
-using Microsoft.SqlTools.ServiceLayer.WorkspaceService.Contracts;
+using Microsoft.SqlTools.ServiceLayer.Hosting;
+using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol;
+using Microsoft.SqlTools.ServiceLayer.WorkspaceServices.Contracts;
 using System.Linq;
 
-namespace Microsoft.SqlTools.ServiceLayer.WorkspaceService
+namespace Microsoft.SqlTools.ServiceLayer.WorkspaceServices
 {
     public class WorkspaceService<TConfig> where TConfig : new()
     {
@@ -59,7 +60,7 @@ namespace Microsoft.SqlTools.ServiceLayer.WorkspaceService
 
         #region Public Methods
 
-        public void InitializeService(ServiceHost.ServiceHost serviceHost)
+        public void InitializeService(ServiceHost serviceHost)
         {
             // Create a workspace that will handle state for the session
             Workspace = new Workspace();
diff --git a/test/ServiceHost.Test/Message/MessageReaderWriterTests.cs b/test/ServiceHost.Test/Message/MessageReaderWriterTests.cs
index 087c63c4..54fbf01f 100644
--- a/test/ServiceHost.Test/Message/MessageReaderWriterTests.cs
+++ b/test/ServiceHost.Test/Message/MessageReaderWriterTests.cs
@@ -7,8 +7,9 @@ using System;
 using System.IO;
 using System.Text;
 using System.Threading.Tasks;
-using Microsoft.SqlTools.ServiceLayer.ServiceHost.Protocol;
-using Microsoft.SqlTools.ServiceLayer.ServiceHost.Protocol.Serializers;
+using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol;
+using HostingMessage = Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts.Message;
+using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Serializers;
 using Xunit;
 
 namespace Microsoft.SqlTools.ServiceLayer.Test.Message
@@ -38,7 +39,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Test.Message
 
             // Write the message and then roll back the stream to be read
             // TODO: This will need to be redone!
-            await messageWriter.WriteMessage(ServiceLayer.ServiceHost.Protocol.Contracts.Message.Event("testEvent", null));
+            await messageWriter.WriteMessage(HostingMessage.Event("testEvent", null));
             outputStream.Seek(0, SeekOrigin.Begin);
 
             string expectedHeaderString =
@@ -82,7 +83,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Test.Message
             inputStream.Flush();
             inputStream.Seek(0, SeekOrigin.Begin);
 
-            ServiceLayer.ServiceHost.Protocol.Contracts.Message messageResult = messageReader.ReadMessage().Result;
+            HostingMessage messageResult = messageReader.ReadMessage().Result;
             Assert.Equal("testEvent", messageResult.Method);
 
             inputStream.Dispose();
@@ -117,7 +118,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Test.Message
             // Read the written messages from the stream
             for (int i = 0; i < overflowMessageCount; i++)
             {
-                ServiceLayer.ServiceHost.Protocol.Contracts.Message messageResult = messageReader.ReadMessage().Result;
+                HostingMessage messageResult = messageReader.ReadMessage().Result;
                 Assert.Equal("testEvent", messageResult.Method);
             }
 
@@ -145,7 +146,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Test.Message
             inputStream.Flush();
             inputStream.Seek(0, SeekOrigin.Begin);
 
-            ServiceLayer.ServiceHost.Protocol.Contracts.Message messageResult = messageReader.ReadMessage().Result;
+            HostingMessage messageResult = messageReader.ReadMessage().Result;
             Assert.Equal("testEvent", messageResult.Method);
 
             inputStream.Dispose();
diff --git a/test/ServiceHost.Test/Message/TestMessageTypes.cs b/test/ServiceHost.Test/Message/TestMessageTypes.cs
index f0819449..0ba08056 100644
--- a/test/ServiceHost.Test/Message/TestMessageTypes.cs
+++ b/test/ServiceHost.Test/Message/TestMessageTypes.cs
@@ -4,7 +4,7 @@
 //
 
 using System.Threading.Tasks;
-using Microsoft.SqlTools.ServiceLayer.ServiceHost.Protocol;
+using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol;
 
 namespace Microsoft.SqlTools.ServiceLayer.Test.Message
 {
diff --git a/test/ServiceHost.Test/ServiceHost.Test.xproj b/test/ServiceHost.Test/ServiceHost.Test.xproj
index 5e9d1a09..cb4c13ed 100644
--- a/test/ServiceHost.Test/ServiceHost.Test.xproj
+++ b/test/ServiceHost.Test/ServiceHost.Test.xproj
@@ -15,5 +15,8 @@
   <PropertyGroup>
     <SchemaVersion>2.0</SchemaVersion>
   </PropertyGroup>
+  <ItemGroup>
+    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
+  </ItemGroup>
   <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
 </Project>
\ No newline at end of file
diff --git a/test/ServiceHost.Test/ServiceHost/JsonRpcMessageSerializerTests.cs b/test/ServiceHost.Test/ServiceHost/JsonRpcMessageSerializerTests.cs
index 9b9c3bf5..d50f02da 100644
--- a/test/ServiceHost.Test/ServiceHost/JsonRpcMessageSerializerTests.cs
+++ b/test/ServiceHost.Test/ServiceHost/JsonRpcMessageSerializerTests.cs
@@ -3,7 +3,8 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-using Microsoft.SqlTools.ServiceLayer.ServiceHost.Protocol.Serializers;
+using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Serializers;
+using HostingMessage = Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts.Message;
 using Newtonsoft.Json.Linq;
 using Xunit;
 
@@ -43,7 +44,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Test.ServiceHost
         {
             var messageObj =
                 this.messageSerializer.SerializeMessage(
-                    ServiceLayer.ServiceHost.Protocol.Contracts.Message.Request(
+                    HostingMessage.Request(
                         MessageId, 
                         MethodName, 
                         MessageContent));
@@ -60,7 +61,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Test.ServiceHost
         {
             var messageObj =
                 this.messageSerializer.SerializeMessage(
-                    ServiceLayer.ServiceHost.Protocol.Contracts.Message.Event(
+                    HostingMessage.Event(
                         MethodName, 
                         MessageContent));
 
@@ -75,7 +76,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Test.ServiceHost
         {
             var messageObj =
                 this.messageSerializer.SerializeMessage(
-                    ServiceLayer.ServiceHost.Protocol.Contracts.Message.Response(
+                    HostingMessage.Response(
                         MessageId,
                         null,
                         MessageContent));
@@ -91,7 +92,7 @@ namespace Microsoft.SqlTools.ServiceLayer.Test.ServiceHost
         {
             var messageObj =
                 this.messageSerializer.SerializeMessage(
-                    ServiceLayer.ServiceHost.Protocol.Contracts.Message.ResponseError(
+                   HostingMessage.ResponseError(
                         MessageId,
                         null,
                         MessageContent));