Fixing issues as per suggestions from @kevcunnane

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

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

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

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)
         {

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

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

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> 
     {

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.

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

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.

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.

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.

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.

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 
     {

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

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