diff --git a/src/Microsoft.SqlTools.ServiceLayer/ConnectionServices/ConnectionService.cs b/src/Microsoft.SqlTools.ServiceLayer/Connection/ConnectionService.cs
similarity index 98%
rename from src/Microsoft.SqlTools.ServiceLayer/ConnectionServices/ConnectionService.cs
rename to src/Microsoft.SqlTools.ServiceLayer/Connection/ConnectionService.cs
index 32ff5720..dec645d6 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/ConnectionServices/ConnectionService.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Connection/ConnectionService.cs
@@ -9,13 +9,13 @@ using System.Data.Common;
 using System.Data.SqlClient;
 using System.Threading.Tasks;
 using Microsoft.SqlTools.EditorServices.Utility;
-using Microsoft.SqlTools.ServiceLayer.ConnectionServices.Contracts;
+using Microsoft.SqlTools.ServiceLayer.Connection.Contracts;
 using Microsoft.SqlTools.ServiceLayer.Hosting;
 using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol;
 using Microsoft.SqlTools.ServiceLayer.SqlContext;
 using Microsoft.SqlTools.ServiceLayer.WorkspaceServices;
 
-namespace Microsoft.SqlTools.ServiceLayer.ConnectionServices
+namespace Microsoft.SqlTools.ServiceLayer.Connection
 {
     /// <summary>
     /// Main class for the Connection Management services
diff --git a/src/Microsoft.SqlTools.ServiceLayer/ConnectionServices/Contracts/ConnectionMessages.cs b/src/Microsoft.SqlTools.ServiceLayer/Connection/Contracts/ConnectionMessages.cs
similarity index 96%
rename from src/Microsoft.SqlTools.ServiceLayer/ConnectionServices/Contracts/ConnectionMessages.cs
rename to src/Microsoft.SqlTools.ServiceLayer/Connection/Contracts/ConnectionMessages.cs
index 7f5c6492..0ade2b39 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/ConnectionServices/Contracts/ConnectionMessages.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Connection/Contracts/ConnectionMessages.cs
@@ -5,7 +5,7 @@
 
 using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts;
 
-namespace Microsoft.SqlTools.ServiceLayer.ConnectionServices
+namespace Microsoft.SqlTools.ServiceLayer.Connection.Contracts
 {
     /// <summary>
     /// Message format for the initial connection request
diff --git a/src/Microsoft.SqlTools.ServiceLayer/ConnectionServices/Contracts/ISqlConnectionFactory.cs b/src/Microsoft.SqlTools.ServiceLayer/Connection/ISqlConnectionFactory.cs
similarity index 87%
rename from src/Microsoft.SqlTools.ServiceLayer/ConnectionServices/Contracts/ISqlConnectionFactory.cs
rename to src/Microsoft.SqlTools.ServiceLayer/Connection/ISqlConnectionFactory.cs
index 1edb6501..ed0cc01b 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/ConnectionServices/Contracts/ISqlConnectionFactory.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Connection/ISqlConnectionFactory.cs
@@ -5,7 +5,7 @@
 
 using System.Data.Common;
 
-namespace Microsoft.SqlTools.ServiceLayer.ConnectionServices.Contracts
+namespace Microsoft.SqlTools.ServiceLayer.Connection
 {
     /// <summary>
     /// Interface for the SQL Connection factory
diff --git a/src/Microsoft.SqlTools.ServiceLayer/ConnectionServices/Contracts/SqlConnectionFactory.cs b/src/Microsoft.SqlTools.ServiceLayer/Connection/SqlConnectionFactory.cs
similarity index 84%
rename from src/Microsoft.SqlTools.ServiceLayer/ConnectionServices/Contracts/SqlConnectionFactory.cs
rename to src/Microsoft.SqlTools.ServiceLayer/Connection/SqlConnectionFactory.cs
index 8d7b0dd4..cffb690d 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/ConnectionServices/Contracts/SqlConnectionFactory.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Connection/SqlConnectionFactory.cs
@@ -6,7 +6,7 @@
 using System.Data.Common;
 using System.Data.SqlClient;
 
-namespace Microsoft.SqlTools.ServiceLayer.ConnectionServices.Contracts
+namespace Microsoft.SqlTools.ServiceLayer.Connection
 {
     /// <summary>
     /// Factory class to create SqlClientConnections
@@ -16,7 +16,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ConnectionServices.Contracts
     public class SqlConnectionFactory : ISqlConnectionFactory
     {
         /// <summary>
-        /// Creates a new SqlClientConnection object
+        /// Creates a new SqlConnection object
         /// </summary>
         public DbConnection CreateSqlConnection(string connectionString)
         {
diff --git a/src/Microsoft.SqlTools.ServiceLayer/WorkspaceServices/Contracts/BufferPosition.cs b/src/Microsoft.SqlTools.ServiceLayer/Workspace/Contracts/BufferPosition.cs
similarity index 98%
rename from src/Microsoft.SqlTools.ServiceLayer/WorkspaceServices/Contracts/BufferPosition.cs
rename to src/Microsoft.SqlTools.ServiceLayer/Workspace/Contracts/BufferPosition.cs
index f74ade68..713736a7 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/WorkspaceServices/Contracts/BufferPosition.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Workspace/Contracts/BufferPosition.cs
@@ -5,7 +5,7 @@
 
 using System.Diagnostics;
 
-namespace Microsoft.SqlTools.ServiceLayer.WorkspaceServices.Contracts
+namespace Microsoft.SqlTools.ServiceLayer.Workspace.Contracts
 {
     /// <summary>
     /// Provides details about a position in a file buffer.  All
diff --git a/src/Microsoft.SqlTools.ServiceLayer/WorkspaceServices/Contracts/BufferRange.cs b/src/Microsoft.SqlTools.ServiceLayer/Workspace/Contracts/BufferRange.cs
similarity index 98%
rename from src/Microsoft.SqlTools.ServiceLayer/WorkspaceServices/Contracts/BufferRange.cs
rename to src/Microsoft.SqlTools.ServiceLayer/Workspace/Contracts/BufferRange.cs
index 99316fe5..f8253d02 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/WorkspaceServices/Contracts/BufferRange.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Workspace/Contracts/BufferRange.cs
@@ -6,7 +6,7 @@
 using System;
 using System.Diagnostics;
 
-namespace Microsoft.SqlTools.ServiceLayer.WorkspaceServices.Contracts
+namespace Microsoft.SqlTools.ServiceLayer.Workspace.Contracts
 {
     /// <summary>
     /// Provides details about a range between two positions in
diff --git a/src/Microsoft.SqlTools.ServiceLayer/WorkspaceServices/Contracts/Configuration.cs b/src/Microsoft.SqlTools.ServiceLayer/Workspace/Contracts/Configuration.cs
similarity index 89%
rename from src/Microsoft.SqlTools.ServiceLayer/WorkspaceServices/Contracts/Configuration.cs
rename to src/Microsoft.SqlTools.ServiceLayer/Workspace/Contracts/Configuration.cs
index ff1e5096..af50835f 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/WorkspaceServices/Contracts/Configuration.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Workspace/Contracts/Configuration.cs
@@ -5,7 +5,7 @@
 
 using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts;
 
-namespace Microsoft.SqlTools.ServiceLayer.WorkspaceServices.Contracts
+namespace Microsoft.SqlTools.ServiceLayer.Workspace.Contracts
 {
     public class DidChangeConfigurationNotification<TConfig> 
     {
diff --git a/src/Microsoft.SqlTools.ServiceLayer/WorkspaceServices/Contracts/FileChange.cs b/src/Microsoft.SqlTools.ServiceLayer/Workspace/Contracts/FileChange.cs
similarity index 93%
rename from src/Microsoft.SqlTools.ServiceLayer/WorkspaceServices/Contracts/FileChange.cs
rename to src/Microsoft.SqlTools.ServiceLayer/Workspace/Contracts/FileChange.cs
index 7e1af148..e3d49471 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/WorkspaceServices/Contracts/FileChange.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Workspace/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.WorkspaceServices.Contracts
+namespace Microsoft.SqlTools.ServiceLayer.Workspace.Contracts
 {
     /// <summary>
     /// Contains details relating to a content change in an open file.
diff --git a/src/Microsoft.SqlTools.ServiceLayer/WorkspaceServices/Contracts/FilePosition.cs b/src/Microsoft.SqlTools.ServiceLayer/Workspace/Contracts/FilePosition.cs
similarity index 98%
rename from src/Microsoft.SqlTools.ServiceLayer/WorkspaceServices/Contracts/FilePosition.cs
rename to src/Microsoft.SqlTools.ServiceLayer/Workspace/Contracts/FilePosition.cs
index 01ed012d..65fe268a 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/WorkspaceServices/Contracts/FilePosition.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Workspace/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.WorkspaceServices.Contracts
+namespace Microsoft.SqlTools.ServiceLayer.Workspace.Contracts
 {
     /// <summary>
     /// Provides details and operations for a buffer position in a
diff --git a/src/Microsoft.SqlTools.ServiceLayer/WorkspaceServices/Contracts/ScriptFile.cs b/src/Microsoft.SqlTools.ServiceLayer/Workspace/Contracts/ScriptFile.cs
similarity index 99%
rename from src/Microsoft.SqlTools.ServiceLayer/WorkspaceServices/Contracts/ScriptFile.cs
rename to src/Microsoft.SqlTools.ServiceLayer/Workspace/Contracts/ScriptFile.cs
index 708bae70..8db022cc 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/WorkspaceServices/Contracts/ScriptFile.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Workspace/Contracts/ScriptFile.cs
@@ -9,7 +9,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 
-namespace Microsoft.SqlTools.ServiceLayer.WorkspaceServices.Contracts
+namespace Microsoft.SqlTools.ServiceLayer.Workspace.Contracts
 {
     /// <summary>
     /// Contains the details and contents of an open script file.
diff --git a/src/Microsoft.SqlTools.ServiceLayer/WorkspaceServices/Contracts/ScriptFileMarker.cs b/src/Microsoft.SqlTools.ServiceLayer/Workspace/Contracts/ScriptFileMarker.cs
similarity index 95%
rename from src/Microsoft.SqlTools.ServiceLayer/WorkspaceServices/Contracts/ScriptFileMarker.cs
rename to src/Microsoft.SqlTools.ServiceLayer/Workspace/Contracts/ScriptFileMarker.cs
index 35ba21fa..743ef3d6 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/WorkspaceServices/Contracts/ScriptFileMarker.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Workspace/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.WorkspaceServices.Contracts
+namespace Microsoft.SqlTools.ServiceLayer.Workspace.Contracts
 {
     /// <summary>
     /// Defines the message level of a script file marker.
diff --git a/src/Microsoft.SqlTools.ServiceLayer/WorkspaceServices/Contracts/ScriptRegion.cs b/src/Microsoft.SqlTools.ServiceLayer/Workspace/Contracts/ScriptRegion.cs
similarity index 97%
rename from src/Microsoft.SqlTools.ServiceLayer/WorkspaceServices/Contracts/ScriptRegion.cs
rename to src/Microsoft.SqlTools.ServiceLayer/Workspace/Contracts/ScriptRegion.cs
index 1ac56d01..e68400e9 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/WorkspaceServices/Contracts/ScriptRegion.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Workspace/Contracts/ScriptRegion.cs
@@ -5,7 +5,7 @@
 
 //using System.Management.Automation.Language;
 
-namespace Microsoft.SqlTools.ServiceLayer.WorkspaceServices.Contracts
+namespace Microsoft.SqlTools.ServiceLayer.Workspace.Contracts
 {
     /// <summary>
     /// Contains details about a specific region of text in script file.
diff --git a/src/Microsoft.SqlTools.ServiceLayer/WorkspaceServices/Contracts/TextDocument.cs b/src/Microsoft.SqlTools.ServiceLayer/Workspace/Contracts/TextDocument.cs
similarity index 98%
rename from src/Microsoft.SqlTools.ServiceLayer/WorkspaceServices/Contracts/TextDocument.cs
rename to src/Microsoft.SqlTools.ServiceLayer/Workspace/Contracts/TextDocument.cs
index 0708316d..75b542cd 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/WorkspaceServices/Contracts/TextDocument.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Workspace/Contracts/TextDocument.cs
@@ -6,7 +6,7 @@
 using System.Diagnostics;
 using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts;
 
-namespace Microsoft.SqlTools.ServiceLayer.WorkspaceServices.Contracts
+namespace Microsoft.SqlTools.ServiceLayer.Workspace.Contracts
 {
     /// <summary>
     /// Defines a base parameter class for identifying a text document.
diff --git a/src/Microsoft.SqlTools.ServiceLayer/WorkspaceServices/Contracts/WorkspaceSymbols.cs b/src/Microsoft.SqlTools.ServiceLayer/Workspace/Contracts/WorkspaceSymbols.cs
similarity index 95%
rename from src/Microsoft.SqlTools.ServiceLayer/WorkspaceServices/Contracts/WorkspaceSymbols.cs
rename to src/Microsoft.SqlTools.ServiceLayer/Workspace/Contracts/WorkspaceSymbols.cs
index 1b7731eb..22445c03 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/WorkspaceServices/Contracts/WorkspaceSymbols.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Workspace/Contracts/WorkspaceSymbols.cs
@@ -5,7 +5,7 @@
 
 using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol.Contracts;
 
-namespace Microsoft.SqlTools.ServiceLayer.WorkspaceServices.Contracts
+namespace Microsoft.SqlTools.ServiceLayer.Workspace.Contracts
 {
     public enum SymbolKind 
     {
diff --git a/src/Microsoft.SqlTools.ServiceLayer/WorkspaceServices/Workspace.cs b/src/Microsoft.SqlTools.ServiceLayer/Workspace/Workspace.cs
similarity index 98%
rename from src/Microsoft.SqlTools.ServiceLayer/WorkspaceServices/Workspace.cs
rename to src/Microsoft.SqlTools.ServiceLayer/Workspace/Workspace.cs
index 921ecc7c..560805d7 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/WorkspaceServices/Workspace.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Workspace/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.WorkspaceServices.Contracts;
+using Microsoft.SqlTools.ServiceLayer.Workspace.Contracts;
 
-namespace Microsoft.SqlTools.ServiceLayer.WorkspaceServices
+namespace Microsoft.SqlTools.ServiceLayer.Workspace
 {
     /// <summary>
     /// Manages a "workspace" of script files that are open for a particular
diff --git a/src/Microsoft.SqlTools.ServiceLayer/WorkspaceServices/WorkspaceService.cs b/src/Microsoft.SqlTools.ServiceLayer/Workspace/WorkspaceService.cs
similarity index 98%
rename from src/Microsoft.SqlTools.ServiceLayer/WorkspaceServices/WorkspaceService.cs
rename to src/Microsoft.SqlTools.ServiceLayer/Workspace/WorkspaceService.cs
index 96878f45..701fa6f5 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/WorkspaceServices/WorkspaceService.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/Workspace/WorkspaceService.cs
@@ -11,9 +11,9 @@ using System.Threading.Tasks;
 using Microsoft.SqlTools.EditorServices.Utility;
 using Microsoft.SqlTools.ServiceLayer.Hosting;
 using Microsoft.SqlTools.ServiceLayer.Hosting.Protocol;
-using Microsoft.SqlTools.ServiceLayer.WorkspaceServices.Contracts;
+using Microsoft.SqlTools.ServiceLayer.Workspace.Contracts;
 
-namespace Microsoft.SqlTools.ServiceLayer.WorkspaceServices
+namespace Microsoft.SqlTools.ServiceLayer.Workspace
 {
     /// <summary>
     /// Class for handling requests/events that deal with the state of the workspace, including the