diff --git a/.gitignore b/.gitignore
index be64ce05c..8d18bc259 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,7 +37,7 @@ docs/metadata/
 *.zip
 
 # Generated build info file
-src/PowerShellEditorServices.Engine/Hosting/BuildInfo.cs
+src/PowerShellEditorServices/Hosting/BuildInfo.cs
 
 # quickbuild.exe
 /VersionGeneratingLogs/
diff --git a/PowerShellEditorServices.build.ps1 b/PowerShellEditorServices.build.ps1
index 9c4f77faa..aa32c403e 100644
--- a/PowerShellEditorServices.build.ps1
+++ b/PowerShellEditorServices.build.ps1
@@ -27,7 +27,7 @@ $script:ModuleBinPath = "$PSScriptRoot/module/PowerShellEditorServices/bin/"
 $script:VSCodeModuleBinPath = "$PSScriptRoot/module/PowerShellEditorServices.VSCode/bin/"
 $script:WindowsPowerShellFrameworkTarget = 'net461'
 $script:NetFrameworkPlatformId = 'win'
-$script:BuildInfoPath = [System.IO.Path]::Combine($PSScriptRoot, "src", "PowerShellEditorServices.Engine", "Hosting", "BuildInfo.cs")
+$script:BuildInfoPath = [System.IO.Path]::Combine($PSScriptRoot, "src", "PowerShellEditorServices", "Hosting", "BuildInfo.cs")
 
 $script:PSCoreModulePath = $null
 
@@ -50,7 +50,7 @@ Schema is:
 #>
 $script:RequiredBuildAssets = @{
     $script:ModuleBinPath = @{
-        'PowerShellEditorServices.Engine' = @(
+        'PowerShellEditorServices' = @(
             'publish/Microsoft.Extensions.DependencyInjection.Abstractions.dll',
             'publish/Microsoft.Extensions.DependencyInjection.dll',
             'publish/Microsoft.Extensions.FileSystemGlobbing.dll',
@@ -58,8 +58,8 @@ $script:RequiredBuildAssets = @{
             'publish/Microsoft.Extensions.Logging.dll',
             'publish/Microsoft.Extensions.Options.dll',
             'publish/Microsoft.Extensions.Primitives.dll',
-            'publish/Microsoft.PowerShell.EditorServices.Engine.dll',
-            'publish/Microsoft.PowerShell.EditorServices.Engine.pdb',
+            'publish/Microsoft.PowerShell.EditorServices.dll',
+            'publish/Microsoft.PowerShell.EditorServices.pdb',
             'publish/Newtonsoft.Json.dll',
             'publish/OmniSharp.Extensions.JsonRpc.dll',
             'publish/OmniSharp.Extensions.LanguageProtocol.dll',
@@ -304,7 +304,7 @@ task CreateBuildInfo -Before Build {
     [string]$buildTime = [datetime]::Now.ToString("s", [System.Globalization.CultureInfo]::InvariantCulture)
 
     $buildInfoContents = @"
-namespace Microsoft.PowerShell.EditorServices.Engine.Hosting
+namespace Microsoft.PowerShell.EditorServices.Hosting
 {
     public static class BuildInfo
     {
@@ -319,7 +319,7 @@ namespace Microsoft.PowerShell.EditorServices.Engine.Hosting
 }
 
 task Build {
-    exec { & $script:dotnetExe publish -c $Configuration .\src\PowerShellEditorServices.Engine\PowerShellEditorServices.Engine.csproj -f $script:TargetPlatform }
+    exec { & $script:dotnetExe publish -c $Configuration .\src\PowerShellEditorServices\PowerShellEditorServices.csproj -f $script:TargetPlatform }
     exec { & $script:dotnetExe build -c $Configuration .\src\PowerShellEditorServices.VSCode\PowerShellEditorServices.VSCode.csproj $script:TargetFrameworksParam }
 }
 
diff --git a/PowerShellEditorServices.sln b/PowerShellEditorServices.sln
index 91156418d..30c954422 100644
--- a/PowerShellEditorServices.sln
+++ b/PowerShellEditorServices.sln
@@ -22,7 +22,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PowerShellEditorServices.Te
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PowerShellEditorServices.VSCode", "src\PowerShellEditorServices.VSCode\PowerShellEditorServices.VSCode.csproj", "{3B38E8DA-8BFF-4264-AF16-47929E6398A3}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PowerShellEditorServices.Engine", "src\PowerShellEditorServices.Engine\PowerShellEditorServices.Engine.csproj", "{29EEDF03-0990-45F4-846E-2616970D1FA2}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PowerShellEditorServices", "src\PowerShellEditorServices\PowerShellEditorServices.csproj", "{29EEDF03-0990-45F4-846E-2616970D1FA2}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PowerShellEditorServices.Test.E2E", "test\PowerShellEditorServices.Test.E2E\PowerShellEditorServices.Test.E2E.csproj", "{2561F253-8F72-436A-BCC3-AA63AB82EDC0}"
 EndProject
diff --git a/docs/api/index.md b/docs/api/index.md
index 94c6a5d4a..c53ce056c 100644
--- a/docs/api/index.md
+++ b/docs/api/index.md
@@ -20,7 +20,7 @@ the PowerShell debugger.
 Use the @Microsoft.PowerShell.EditorServices.Console.ConsoleService to provide interactive
 console support in the user's editor.
 
-Use the @Microsoft.PowerShell.EditorServices.Engine.Services.ExtensionService to allow
+Use the @Microsoft.PowerShell.EditorServices.Services.ExtensionService to allow
 the user to extend the host editor with new capabilities using PowerShell code.
 
 The core of all the services is the @Microsoft.PowerShell.EditorServices.PowerShellContext
diff --git a/docs/guide/extensions.md b/docs/guide/extensions.md
index 66953aa68..b37c032a6 100644
--- a/docs/guide/extensions.md
+++ b/docs/guide/extensions.md
@@ -9,7 +9,7 @@ uses PowerShell Editor Services.
 ### Introducing `$psEditor`
 
 The entry point for the PowerShell Editor Services extensibility model is the `$psEditor`
-object of the type @Microsoft.PowerShell.EditorServices.Engine.Services.PowerShellContext.EditorObject. For
+object of the type @Microsoft.PowerShell.EditorServices.Services.PowerShellContext.EditorObject. For
 those familiar with the PowerShell ISE's `$psISE` object, the `$psEditor` object is very
 similar.  The primary difference is that this model has been generalized to work against
 any editor which leverages PowerShell Editor Services for its PowerShell editing experience.
@@ -19,7 +19,7 @@ any editor which leverages PowerShell Editor Services for its PowerShell editing
 > please file an issue on our GitHub page.
 
 This object gives access to all of the high-level services in the current
-editing session.  For example, the @Microsoft.PowerShell.EditorServices.Engine.Services.PowerShellContext.EditorObject.Workspace
+editing session.  For example, the @Microsoft.PowerShell.EditorServices.Services.PowerShellContext.EditorObject.Workspace
 property gives access to the editor's workspace, allowing you to create or open files
 in the editor.
 
@@ -79,17 +79,17 @@ Register-EditorCommand `
     -ScriptBlock { Write-Output "My command's script block was invoked!" }
 ```
 
-### The @Microsoft.PowerShell.EditorServices.Engine.Services.PowerShellContext.EditorContext parameter
+### The @Microsoft.PowerShell.EditorServices.Services.PowerShellContext.EditorContext parameter
 
 Your function, cmdlet, or ScriptBlock can optionally accept a single parameter
-of type @Microsoft.PowerShell.EditorServices.Engine.Services.PowerShellContext.EditorContext which provides
+of type @Microsoft.PowerShell.EditorServices.Services.PowerShellContext.EditorContext which provides
 information about the state of the host editor at the time your command was
 invoked.  With this object you can easily perform operations like manipulatin the
 state of the user's active editor buffer or changing the current selection.
 
 The usual convention is that a `$context` parameter is added to your editor
 command's function.  For now it is recommended that you fully specify the
-type of the @Microsoft.PowerShell.EditorServices.Engine.Services.PowerShellContext.EditorContext object
+type of the @Microsoft.PowerShell.EditorServices.Services.PowerShellContext.EditorContext object
 so that you get full IntelliSense on your context parameter.
 
 Here is an example of using the `$context` parameter:
@@ -99,7 +99,7 @@ Register-EditorCommand `
     -Name "MyModule.MyEditorCommandWithContext" `
     -DisplayName "My command with context usage" `
     -ScriptBlock {
-        param([Microsoft.PowerShell.EditorServices.Engine.Services.PowerShellContext.EditorContext]$context)
+        param([Microsoft.PowerShell.EditorServices.Services.PowerShellContext.EditorContext]$context)
         Write-Output "The user's cursor is on line $($context.CursorPosition.Line)!"
     }
 ```
diff --git a/module/PowerShellEditorServices/Commands/Private/BuiltInCommands.ps1 b/module/PowerShellEditorServices/Commands/Private/BuiltInCommands.ps1
index e808cc16a..e56e44af7 100644
--- a/module/PowerShellEditorServices/Commands/Private/BuiltInCommands.ps1
+++ b/module/PowerShellEditorServices/Commands/Private/BuiltInCommands.ps1
@@ -3,7 +3,7 @@ Register-EditorCommand `
     -DisplayName 'Open Editor Profile' `
     -SuppressOutput `
     -ScriptBlock {
-        param([Microsoft.PowerShell.EditorServices.Engine.Services.PowerShellContext.EditorContext]$context)
+        param([Microsoft.PowerShell.EditorServices.Services.PowerShellContext.EditorContext]$context)
         If (!(Test-Path -Path $Profile)) { New-Item -Path $Profile -ItemType File }
         $psEditor.Workspace.OpenFile($Profile)
     }
@@ -13,7 +13,7 @@ Register-EditorCommand `
     -DisplayName 'Open Profile from List (Current User)' `
     -SuppressOutput `
     -ScriptBlock {
-        param([Microsoft.PowerShell.EditorServices.Engine.Services.PowerShellContext.EditorContext]$context)
+        param([Microsoft.PowerShell.EditorServices.Services.PowerShellContext.EditorContext]$context)
 
         $Current = Split-Path -Path $profile -Leaf
         $List = @($Current,'Microsoft.VSCode_profile.ps1','Microsoft.PowerShell_profile.ps1','Microsoft.PowerShellISE_profile.ps1','Profile.ps1') | Select-Object -Unique
diff --git a/module/PowerShellEditorServices/Commands/Public/CmdletInterface.ps1 b/module/PowerShellEditorServices/Commands/Public/CmdletInterface.ps1
index efd5b481e..9018680d9 100644
--- a/module/PowerShellEditorServices/Commands/Public/CmdletInterface.ps1
+++ b/module/PowerShellEditorServices/Commands/Public/CmdletInterface.ps1
@@ -47,7 +47,7 @@ function Register-EditorCommand {
             $commandArgs += $Function
         }
 
-        $editorCommand = New-Object Microsoft.PowerShell.EditorServices.Engine.Services.PowerShellContext.EditorCommand -ArgumentList $commandArgs
+        $editorCommand = New-Object Microsoft.PowerShell.EditorServices.Services.PowerShellContext.EditorCommand -ArgumentList $commandArgs
         if ($psEditor.RegisterCommand($editorCommand))
         {
             Write-Verbose "Registered new command '$Name'"
diff --git a/module/PowerShellEditorServices/Commands/Public/Import-EditorCommand.ps1 b/module/PowerShellEditorServices/Commands/Public/Import-EditorCommand.ps1
index 466d9368e..e57823a3f 100644
--- a/module/PowerShellEditorServices/Commands/Public/Import-EditorCommand.ps1
+++ b/module/PowerShellEditorServices/Commands/Public/Import-EditorCommand.ps1
@@ -7,7 +7,7 @@ function Import-EditorCommand {
     <#
     .EXTERNALHELP ..\PowerShellEditorServices.Commands-help.xml
     #>
-    [OutputType([Microsoft.PowerShell.EditorServices.Engine.Services.PowerShellContext.EditorCommand])]
+    [OutputType([Microsoft.PowerShell.EditorServices.Services.PowerShellContext.EditorCommand])]
     [CmdletBinding(DefaultParameterSetName='ByCommand')]
     param(
         [Parameter(Position=0,
@@ -75,7 +75,7 @@ function Import-EditorCommand {
                 $commands = $Command | Get-Command -ErrorAction SilentlyContinue
             }
         }
-        $attributeType = [Microsoft.PowerShell.EditorServices.Engine.Services.PowerShellContext.EditorCommandAttribute]
+        $attributeType = [Microsoft.PowerShell.EditorServices.Services.PowerShellContext.EditorCommandAttribute]
         foreach ($aCommand in $commands) {
             # Get the attribute from our command to get name info.
             $details = $aCommand.ScriptBlock.Attributes | Where-Object TypeId -eq $attributeType
@@ -99,7 +99,7 @@ function Import-EditorCommand {
                 }
                 # Check for a context parameter.
                 $contextParameter = $aCommand.Parameters.Values |
-                    Where-Object ParameterType -eq ([Microsoft.PowerShell.EditorServices.Engine.Services.PowerShellContext.EditorContext])
+                    Where-Object ParameterType -eq ([Microsoft.PowerShell.EditorServices.Services.PowerShellContext.EditorContext])
 
                 # If one is found then add a named argument. Otherwise call the command directly.
                 if ($contextParameter) {
@@ -109,7 +109,7 @@ function Import-EditorCommand {
                     $scriptBlock = [scriptblock]::Create($aCommand.Name)
                 }
 
-                $editorCommand = New-Object Microsoft.PowerShell.EditorServices.Engine.Services.PowerShellContext.EditorCommand @(
+                $editorCommand = New-Object Microsoft.PowerShell.EditorServices.Services.PowerShellContext.EditorCommand @(
                     <# commandName:    #> $details.Name,
                     <# displayName:    #> $details.DisplayName,
                     <# suppressOutput: #> $details.SuppressOutput,
diff --git a/module/PowerShellEditorServices/PowerShellEditorServices.psm1 b/module/PowerShellEditorServices/PowerShellEditorServices.psm1
index 79a5dbd23..b37b6ee65 100644
--- a/module/PowerShellEditorServices/PowerShellEditorServices.psm1
+++ b/module/PowerShellEditorServices/PowerShellEditorServices.psm1
@@ -10,7 +10,7 @@ if ($PSEdition -eq 'Desktop') {
     Microsoft.PowerShell.Utility\Add-Type -Path "$PSScriptRoot/bin/Desktop/System.Security.Principal.Windows.dll"
 }
 
-Microsoft.PowerShell.Utility\Add-Type -Path "$PSScriptRoot/bin/Microsoft.PowerShell.EditorServices.Engine.dll"
+Microsoft.PowerShell.Utility\Add-Type -Path "$PSScriptRoot/bin/Microsoft.PowerShell.EditorServices.dll"
 
 function Start-EditorServicesHost {
     [CmdletBinding()]
@@ -91,13 +91,13 @@ function Start-EditorServicesHost {
 
     $editorServicesHost = $null
     $hostDetails =
-        Microsoft.PowerShell.Utility\New-Object Microsoft.PowerShell.EditorServices.Engine.Hosting.HostDetails @(
+        Microsoft.PowerShell.Utility\New-Object Microsoft.PowerShell.EditorServices.Hosting.HostDetails @(
             $HostName,
             $HostProfileId,
             (Microsoft.PowerShell.Utility\New-Object System.Version @($HostVersion)))
 
     $editorServicesHost =
-        Microsoft.PowerShell.Utility\New-Object Microsoft.PowerShell.EditorServices.Engine.Hosting.EditorServicesHost @(
+        Microsoft.PowerShell.Utility\New-Object Microsoft.PowerShell.EditorServices.Hosting.EditorServicesHost @(
             $hostDetails,
             $BundledModulesPath,
             $EnableConsoleRepl.IsPresent,
@@ -108,7 +108,7 @@ function Start-EditorServicesHost {
 
     # Build the profile paths using the root paths of the current $profile variable
     $profilePaths =
-        Microsoft.PowerShell.Utility\New-Object Microsoft.PowerShell.EditorServices.Engine.Hosting.ProfilePaths @(
+        Microsoft.PowerShell.Utility\New-Object Microsoft.PowerShell.EditorServices.Hosting.ProfilePaths @(
             $hostDetails.ProfileId,
             [System.IO.Path]::GetDirectoryName($profile.AllUsersAllHosts),
             [System.IO.Path]::GetDirectoryName($profile.CurrentUserAllHosts))
@@ -116,32 +116,32 @@ function Start-EditorServicesHost {
     $editorServicesHost.StartLogging($LogPath, $LogLevel);
 
     $languageServiceConfig =
-        Microsoft.PowerShell.Utility\New-Object Microsoft.PowerShell.EditorServices.Engine.Hosting.EditorServiceTransportConfig
+        Microsoft.PowerShell.Utility\New-Object Microsoft.PowerShell.EditorServices.Hosting.EditorServiceTransportConfig
 
     $debugServiceConfig =
-        Microsoft.PowerShell.Utility\New-Object Microsoft.PowerShell.EditorServices.Engine.Hosting.EditorServiceTransportConfig
+        Microsoft.PowerShell.Utility\New-Object Microsoft.PowerShell.EditorServices.Hosting.EditorServiceTransportConfig
 
     switch ($PSCmdlet.ParameterSetName) {
         "Stdio" {
-            $languageServiceConfig.TransportType = [Microsoft.PowerShell.EditorServices.Engine.Hosting.EditorServiceTransportType]::Stdio
-            $debugServiceConfig.TransportType    = [Microsoft.PowerShell.EditorServices.Engine.Hosting.EditorServiceTransportType]::Stdio
+            $languageServiceConfig.TransportType = [Microsoft.PowerShell.EditorServices.Hosting.EditorServiceTransportType]::Stdio
+            $debugServiceConfig.TransportType    = [Microsoft.PowerShell.EditorServices.Hosting.EditorServiceTransportType]::Stdio
             break
         }
         "NamedPipe" {
-            $languageServiceConfig.TransportType = [Microsoft.PowerShell.EditorServices.Engine.Hosting.EditorServiceTransportType]::NamedPipe
+            $languageServiceConfig.TransportType = [Microsoft.PowerShell.EditorServices.Hosting.EditorServiceTransportType]::NamedPipe
             $languageServiceConfig.InOutPipeName = "$LanguageServiceNamedPipe"
             if ($DebugServiceNamedPipe) {
-                $debugServiceConfig.TransportType = [Microsoft.PowerShell.EditorServices.Engine.Hosting.EditorServiceTransportType]::NamedPipe
+                $debugServiceConfig.TransportType = [Microsoft.PowerShell.EditorServices.Hosting.EditorServiceTransportType]::NamedPipe
                 $debugServiceConfig.InOutPipeName = "$DebugServiceNamedPipe"
             }
             break
         }
         "NamedPipeSimplex" {
-            $languageServiceConfig.TransportType = [Microsoft.PowerShell.EditorServices.Engine.Hosting.EditorServiceTransportType]::NamedPipe
+            $languageServiceConfig.TransportType = [Microsoft.PowerShell.EditorServices.Hosting.EditorServiceTransportType]::NamedPipe
             $languageServiceConfig.InPipeName = $LanguageServiceInNamedPipe
             $languageServiceConfig.OutPipeName = $LanguageServiceOutNamedPipe
             if ($DebugServiceInNamedPipe -and $DebugServiceOutNamedPipe) {
-                $debugServiceConfig.TransportType = [Microsoft.PowerShell.EditorServices.Engine.Hosting.EditorServiceTransportType]::NamedPipe
+                $debugServiceConfig.TransportType = [Microsoft.PowerShell.EditorServices.Hosting.EditorServiceTransportType]::NamedPipe
                 $debugServiceConfig.InPipeName = $DebugServiceInNamedPipe
                 $debugServiceConfig.OutPipeName = $DebugServiceOutNamedPipe
             }
diff --git a/module/docs/Import-EditorCommand.md b/module/docs/Import-EditorCommand.md
index b04487595..cf90e8c55 100644
--- a/module/docs/Import-EditorCommand.md
+++ b/module/docs/Import-EditorCommand.md
@@ -30,7 +30,7 @@ The Import-EditorCommand function will search the specified module for functions
 
 Alternatively, you can specify command info objects (like those from the Get-Command cmdlet) to be processed directly.
 
-To tag a command as an editor command, attach the attribute 'Microsoft.PowerShell.EditorServices.Engine.Services.PowerShellContext.EditorCommandAttribute' to the function like you would with 'CmdletBindingAttribute'.  The attribute accepts the named parameters 'Name', 'DisplayName', and 'SuppressOutput'.
+To tag a command as an editor command, attach the attribute 'Microsoft.PowerShell.EditorServices.Services.PowerShellContext.EditorCommandAttribute' to the function like you would with 'CmdletBindingAttribute'.  The attribute accepts the named parameters 'Name', 'DisplayName', and 'SuppressOutput'.
 
 ## EXAMPLES
 
@@ -55,7 +55,7 @@ Registers all editor commands that contain "Editor" in the name and return all s
 ```powershell
 function Invoke-MyEditorCommand {
     [CmdletBinding()]
-    [Microsoft.PowerShell.EditorServices.Engine.Services.PowerShellContext.EditorCommand(DisplayName='My Command', SuppressOutput)]
+    [Microsoft.PowerShell.EditorServices.Services.PowerShellContext.EditorCommand(DisplayName='My Command', SuppressOutput)]
     param()
     end {
         ConvertTo-ScriptExtent -Offset 0 | Set-ScriptExtent -Text 'My Command!'
@@ -145,7 +145,7 @@ You can pass commands to register as editor commands.
 
 ## OUTPUTS
 
-### Microsoft.PowerShell.EditorServices.Engine.Services.PowerShellContext.EditorCommand
+### Microsoft.PowerShell.EditorServices.Services.PowerShellContext.EditorCommand
 
 If the "PassThru" parameter is specified editor commands that were successfully registered
 will be returned.  This function does not output to the pipeline otherwise.
diff --git a/src/PowerShellEditorServices.VSCode/Cmdlets/VSCodeHtmlContentViewCommands.cs b/src/PowerShellEditorServices.VSCode/Cmdlets/VSCodeHtmlContentViewCommands.cs
index d26162743..de767821c 100644
--- a/src/PowerShellEditorServices.VSCode/Cmdlets/VSCodeHtmlContentViewCommands.cs
+++ b/src/PowerShellEditorServices.VSCode/Cmdlets/VSCodeHtmlContentViewCommands.cs
@@ -7,7 +7,7 @@
 using System.Management.Automation;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
-using Microsoft.PowerShell.EditorServices.Engine.Services.PowerShellContext;
+using Microsoft.PowerShell.EditorServices.Services.PowerShellContext;
 using Microsoft.PowerShell.EditorServices.VSCode.CustomViews;
 using OmniSharp.Extensions.LanguageServer.Protocol.Server;
 
diff --git a/src/PowerShellEditorServices.VSCode/PowerShellEditorServices.VSCode.csproj b/src/PowerShellEditorServices.VSCode/PowerShellEditorServices.VSCode.csproj
index 54a39becd..e1138cbe3 100644
--- a/src/PowerShellEditorServices.VSCode/PowerShellEditorServices.VSCode.csproj
+++ b/src/PowerShellEditorServices.VSCode/PowerShellEditorServices.VSCode.csproj
@@ -15,7 +15,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\PowerShellEditorServices.Engine\PowerShellEditorServices.Engine.csproj" />
+    <ProjectReference Include="..\PowerShellEditorServices\PowerShellEditorServices.csproj" />
     <PackageReference Include="PowerShellStandard.Library" Version="5.1.0">
       <PrivateAssets>All</PrivateAssets>
     </PackageReference>
diff --git a/src/PowerShellEditorServices.Engine/.vscode/launch.json b/src/PowerShellEditorServices/.vscode/launch.json
similarity index 100%
rename from src/PowerShellEditorServices.Engine/.vscode/launch.json
rename to src/PowerShellEditorServices/.vscode/launch.json
diff --git a/src/PowerShellEditorServices.Engine/Hosting/EditorServicesHost.cs b/src/PowerShellEditorServices/Hosting/EditorServicesHost.cs
similarity index 99%
rename from src/PowerShellEditorServices.Engine/Hosting/EditorServicesHost.cs
rename to src/PowerShellEditorServices/Hosting/EditorServicesHost.cs
index b92d9d487..18d5197bd 100644
--- a/src/PowerShellEditorServices.Engine/Hosting/EditorServicesHost.cs
+++ b/src/PowerShellEditorServices/Hosting/EditorServicesHost.cs
@@ -18,12 +18,12 @@
 using System.Threading.Tasks;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
-using Microsoft.PowerShell.EditorServices.Engine.Server;
-using Microsoft.PowerShell.EditorServices.Engine.Services;
+using Microsoft.PowerShell.EditorServices.Server;
+using Microsoft.PowerShell.EditorServices.Services;
 using Microsoft.PowerShell.EditorServices.Utility;
 using Serilog;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Hosting
+namespace Microsoft.PowerShell.EditorServices.Hosting
 {
     public enum EditorServicesHostStatus
     {
diff --git a/src/PowerShellEditorServices.Engine/Hosting/HostDetails.cs b/src/PowerShellEditorServices/Hosting/HostDetails.cs
similarity index 98%
rename from src/PowerShellEditorServices.Engine/Hosting/HostDetails.cs
rename to src/PowerShellEditorServices/Hosting/HostDetails.cs
index ffd829087..cdbe96f94 100644
--- a/src/PowerShellEditorServices.Engine/Hosting/HostDetails.cs
+++ b/src/PowerShellEditorServices/Hosting/HostDetails.cs
@@ -5,7 +5,7 @@
 
 using System;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Hosting
+namespace Microsoft.PowerShell.EditorServices.Hosting
 {
     /// <summary>
     /// Contains details about the current host application (most
diff --git a/src/PowerShellEditorServices.Engine/Hosting/ProfilePaths.cs b/src/PowerShellEditorServices/Hosting/ProfilePaths.cs
similarity index 98%
rename from src/PowerShellEditorServices.Engine/Hosting/ProfilePaths.cs
rename to src/PowerShellEditorServices/Hosting/ProfilePaths.cs
index 4f5e17dce..53eb714f1 100644
--- a/src/PowerShellEditorServices.Engine/Hosting/ProfilePaths.cs
+++ b/src/PowerShellEditorServices/Hosting/ProfilePaths.cs
@@ -7,7 +7,7 @@
 using System.IO;
 using System.Linq;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Hosting
+namespace Microsoft.PowerShell.EditorServices.Hosting
 {
     /// <summary>
     /// Provides profile path resolution behavior relative to the name
diff --git a/src/PowerShellEditorServices.Engine/Hosting/PsesLogLevel.cs b/src/PowerShellEditorServices/Hosting/PsesLogLevel.cs
similarity index 94%
rename from src/PowerShellEditorServices.Engine/Hosting/PsesLogLevel.cs
rename to src/PowerShellEditorServices/Hosting/PsesLogLevel.cs
index 4438fdd02..d1b85077d 100644
--- a/src/PowerShellEditorServices.Engine/Hosting/PsesLogLevel.cs
+++ b/src/PowerShellEditorServices/Hosting/PsesLogLevel.cs
@@ -5,7 +5,7 @@
 
 using Microsoft.Extensions.Logging;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Hosting
+namespace Microsoft.PowerShell.EditorServices.Hosting
 {
     public enum PsesLogLevel
     {
diff --git a/src/PowerShellEditorServices.Engine/Logging/LoggerExtensions.cs b/src/PowerShellEditorServices/Logging/LoggerExtensions.cs
similarity index 94%
rename from src/PowerShellEditorServices.Engine/Logging/LoggerExtensions.cs
rename to src/PowerShellEditorServices/Logging/LoggerExtensions.cs
index 785a72d83..036f978a6 100644
--- a/src/PowerShellEditorServices.Engine/Logging/LoggerExtensions.cs
+++ b/src/PowerShellEditorServices/Logging/LoggerExtensions.cs
@@ -7,7 +7,7 @@
 using System.Runtime.CompilerServices;
 using Microsoft.Extensions.Logging;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Logging
+namespace Microsoft.PowerShell.EditorServices.Logging
 {
     internal static class LoggerExtensions
     {
diff --git a/src/PowerShellEditorServices.Engine/PowerShellEditorServices.Engine.csproj b/src/PowerShellEditorServices/PowerShellEditorServices.csproj
similarity index 92%
rename from src/PowerShellEditorServices.Engine/PowerShellEditorServices.Engine.csproj
rename to src/PowerShellEditorServices/PowerShellEditorServices.csproj
index 3a51e5b13..18b163544 100644
--- a/src/PowerShellEditorServices.Engine/PowerShellEditorServices.Engine.csproj
+++ b/src/PowerShellEditorServices/PowerShellEditorServices.csproj
@@ -3,10 +3,10 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), PowerShellEditorServices.Common.props))\PowerShellEditorServices.Common.props" />
 
   <PropertyGroup>
-    <AssemblyTitle>PowerShell Editor Services Engine</AssemblyTitle>
+    <AssemblyTitle>PowerShell Editor Services</AssemblyTitle>
     <Description>Provides common PowerShell editor capabilities as a .NET library.</Description>
     <TargetFrameworks>netstandard2.0</TargetFrameworks>
-    <AssemblyName>Microsoft.PowerShell.EditorServices.Engine</AssemblyName>
+    <AssemblyName>Microsoft.PowerShell.EditorServices</AssemblyName>
     <LangVersion>Latest</LangVersion>
   </PropertyGroup>
 
diff --git a/src/PowerShellEditorServices.Engine/Server/NamedPipePsesLanguageServer.cs b/src/PowerShellEditorServices/Server/NamedPipePsesLanguageServer.cs
similarity index 98%
rename from src/PowerShellEditorServices.Engine/Server/NamedPipePsesLanguageServer.cs
rename to src/PowerShellEditorServices/Server/NamedPipePsesLanguageServer.cs
index 4742bbe09..864373a30 100644
--- a/src/PowerShellEditorServices.Engine/Server/NamedPipePsesLanguageServer.cs
+++ b/src/PowerShellEditorServices/Server/NamedPipePsesLanguageServer.cs
@@ -11,10 +11,10 @@
 using System.Security.AccessControl;
 using System.Security.Principal;
 using Microsoft.Extensions.Logging;
-using Microsoft.PowerShell.EditorServices.Engine.Hosting;
+using Microsoft.PowerShell.EditorServices.Hosting;
 using Microsoft.PowerShell.EditorServices.Utility;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Server
+namespace Microsoft.PowerShell.EditorServices.Server
 {
     internal class NamedPipePsesLanguageServer : PsesLanguageServer
     {
diff --git a/src/PowerShellEditorServices.Engine/Server/PsesDebugServer.cs b/src/PowerShellEditorServices/Server/PsesDebugServer.cs
similarity index 94%
rename from src/PowerShellEditorServices.Engine/Server/PsesDebugServer.cs
rename to src/PowerShellEditorServices/Server/PsesDebugServer.cs
index 1088cd145..b3bf2edba 100644
--- a/src/PowerShellEditorServices.Engine/Server/PsesDebugServer.cs
+++ b/src/PowerShellEditorServices/Server/PsesDebugServer.cs
@@ -8,13 +8,13 @@
 using System.Threading.Tasks;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
-using Microsoft.PowerShell.EditorServices.Engine.Handlers;
-using Microsoft.PowerShell.EditorServices.Engine.Services;
+using Microsoft.PowerShell.EditorServices.Handlers;
+using Microsoft.PowerShell.EditorServices.Services;
 using OmniSharp.Extensions.DebugAdapter.Protocol.Serialization;
 using OmniSharp.Extensions.JsonRpc;
 using OmniSharp.Extensions.LanguageServer.Server;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Server
+namespace Microsoft.PowerShell.EditorServices.Server
 {
     public class PsesDebugServer : IDisposable
     {
@@ -50,7 +50,7 @@ public async Task StartAsync(IServiceProvider languageServerServiceProvider)
                     .AddSingleton<DebugService>()
                     .AddSingleton<DebugStateService>()
                     .AddSingleton<DebugEventHandlerService>();
-                
+
                 options
                     .WithInput(_inputStream)
                     .WithOutput(_outputStream);
diff --git a/src/PowerShellEditorServices.Engine/Server/PsesLanguageServer.cs b/src/PowerShellEditorServices/Server/PsesLanguageServer.cs
similarity index 96%
rename from src/PowerShellEditorServices.Engine/Server/PsesLanguageServer.cs
rename to src/PowerShellEditorServices/Server/PsesLanguageServer.cs
index 7da6fc1e3..64bb10faa 100644
--- a/src/PowerShellEditorServices.Engine/Server/PsesLanguageServer.cs
+++ b/src/PowerShellEditorServices/Server/PsesLanguageServer.cs
@@ -12,13 +12,13 @@
 using System.Threading.Tasks;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
-using Microsoft.PowerShell.EditorServices.Engine.Handlers;
-using Microsoft.PowerShell.EditorServices.Engine.Hosting;
-using Microsoft.PowerShell.EditorServices.Engine.Services;
-using Microsoft.PowerShell.EditorServices.Engine.Services.PowerShellContext;
+using Microsoft.PowerShell.EditorServices.Handlers;
+using Microsoft.PowerShell.EditorServices.Hosting;
+using Microsoft.PowerShell.EditorServices.Services;
+using Microsoft.PowerShell.EditorServices.Services.PowerShellContext;
 using OmniSharp.Extensions.LanguageServer.Server;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Server
+namespace Microsoft.PowerShell.EditorServices.Server
 {
     internal abstract class PsesLanguageServer
     {
diff --git a/src/PowerShellEditorServices.Engine/Server/StdioPsesLanguageServer.cs b/src/PowerShellEditorServices/Server/StdioPsesLanguageServer.cs
similarity index 90%
rename from src/PowerShellEditorServices.Engine/Server/StdioPsesLanguageServer.cs
rename to src/PowerShellEditorServices/Server/StdioPsesLanguageServer.cs
index 0da4d961e..a2c699b5e 100644
--- a/src/PowerShellEditorServices.Engine/Server/StdioPsesLanguageServer.cs
+++ b/src/PowerShellEditorServices/Server/StdioPsesLanguageServer.cs
@@ -7,9 +7,9 @@
 using System.IO;
 using System.Management.Automation.Host;
 using Microsoft.Extensions.Logging;
-using Microsoft.PowerShell.EditorServices.Engine.Hosting;
+using Microsoft.PowerShell.EditorServices.Hosting;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Server
+namespace Microsoft.PowerShell.EditorServices.Server
 {
     internal class StdioPsesLanguageServer : PsesLanguageServer
     {
@@ -31,7 +31,7 @@ internal StdioPsesLanguageServer(
                 internalHost,
                 profilePaths)
         {
-            
+
         }
 
         protected override (Stream input, Stream output) GetInputOutputStreams()
diff --git a/src/PowerShellEditorServices.Engine/Services/Analysis/AnalysisService.cs b/src/PowerShellEditorServices/Services/Analysis/AnalysisService.cs
similarity index 99%
rename from src/PowerShellEditorServices.Engine/Services/Analysis/AnalysisService.cs
rename to src/PowerShellEditorServices/Services/Analysis/AnalysisService.cs
index d36e497d2..89cd6bcb8 100644
--- a/src/PowerShellEditorServices.Engine/Services/Analysis/AnalysisService.cs
+++ b/src/PowerShellEditorServices/Services/Analysis/AnalysisService.cs
@@ -16,9 +16,9 @@
 using OmniSharp.Extensions.LanguageServer.Protocol.Server;
 using System.Threading;
 using System.Collections.Concurrent;
-using Microsoft.PowerShell.EditorServices.Engine.Services.TextDocument;
+using Microsoft.PowerShell.EditorServices.Services.TextDocument;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Services
+namespace Microsoft.PowerShell.EditorServices.Services
 {
     /// <summary>
     /// Provides a high-level service for performing semantic analysis
diff --git a/src/PowerShellEditorServices.Engine/Services/CodeLens/CodeLensData.cs b/src/PowerShellEditorServices/Services/CodeLens/CodeLensData.cs
similarity index 86%
rename from src/PowerShellEditorServices.Engine/Services/CodeLens/CodeLensData.cs
rename to src/PowerShellEditorServices/Services/CodeLens/CodeLensData.cs
index 8768e2555..15fff728d 100644
--- a/src/PowerShellEditorServices.Engine/Services/CodeLens/CodeLensData.cs
+++ b/src/PowerShellEditorServices/Services/CodeLens/CodeLensData.cs
@@ -3,7 +3,7 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-namespace Microsoft.PowerShell.EditorServices.Engine.CodeLenses
+namespace Microsoft.PowerShell.EditorServices.CodeLenses
 {
     /// <summary>
     /// Represents data expected back in an LSP CodeLens response.
diff --git a/src/PowerShellEditorServices.Engine/Services/CodeLens/ICodeLensProvider.cs b/src/PowerShellEditorServices/Services/CodeLens/ICodeLensProvider.cs
similarity index 91%
rename from src/PowerShellEditorServices.Engine/Services/CodeLens/ICodeLensProvider.cs
rename to src/PowerShellEditorServices/Services/CodeLens/ICodeLensProvider.cs
index 06921c67c..f42525a19 100644
--- a/src/PowerShellEditorServices.Engine/Services/CodeLens/ICodeLensProvider.cs
+++ b/src/PowerShellEditorServices/Services/CodeLens/ICodeLensProvider.cs
@@ -3,10 +3,10 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-using Microsoft.PowerShell.EditorServices.Engine.Services.TextDocument;
+using Microsoft.PowerShell.EditorServices.Services.TextDocument;
 using OmniSharp.Extensions.LanguageServer.Protocol.Models;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.CodeLenses
+namespace Microsoft.PowerShell.EditorServices.CodeLenses
 {
     /// <summary>
     /// Specifies the contract for a Code Lens provider.
diff --git a/src/PowerShellEditorServices.Engine/Services/CodeLens/ICodeLenses.cs b/src/PowerShellEditorServices/Services/CodeLens/ICodeLenses.cs
similarity index 88%
rename from src/PowerShellEditorServices.Engine/Services/CodeLens/ICodeLenses.cs
rename to src/PowerShellEditorServices/Services/CodeLens/ICodeLenses.cs
index bafd13bbc..fd6e1eadf 100644
--- a/src/PowerShellEditorServices.Engine/Services/CodeLens/ICodeLenses.cs
+++ b/src/PowerShellEditorServices/Services/CodeLens/ICodeLenses.cs
@@ -4,10 +4,10 @@
 //
 
 using System.Collections.Generic;
-using Microsoft.PowerShell.EditorServices.Engine.Services.TextDocument;
+using Microsoft.PowerShell.EditorServices.Services.TextDocument;
 using OmniSharp.Extensions.LanguageServer.Protocol.Models;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.CodeLenses
+namespace Microsoft.PowerShell.EditorServices.CodeLenses
 {
     /// <summary>
     /// Specifies the contract for an implementation of
diff --git a/src/PowerShellEditorServices.Engine/Services/CodeLens/PesterCodeLensProvider.cs b/src/PowerShellEditorServices/Services/CodeLens/PesterCodeLensProvider.cs
similarity index 94%
rename from src/PowerShellEditorServices.Engine/Services/CodeLens/PesterCodeLensProvider.cs
rename to src/PowerShellEditorServices/Services/CodeLens/PesterCodeLensProvider.cs
index d2b7daaf4..d927dd90e 100644
--- a/src/PowerShellEditorServices.Engine/Services/CodeLens/PesterCodeLensProvider.cs
+++ b/src/PowerShellEditorServices/Services/CodeLens/PesterCodeLensProvider.cs
@@ -4,13 +4,13 @@
 //
 
 using System.Collections.Generic;
-using Microsoft.PowerShell.EditorServices.Engine.Services.Symbols;
-using Microsoft.PowerShell.EditorServices.Engine.Services.TextDocument;
-using Microsoft.PowerShell.EditorServices.Engine.Utility;
+using Microsoft.PowerShell.EditorServices.Services.Symbols;
+using Microsoft.PowerShell.EditorServices.Services.TextDocument;
+using Microsoft.PowerShell.EditorServices.Utility;
 using Newtonsoft.Json.Linq;
 using OmniSharp.Extensions.LanguageServer.Protocol.Models;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.CodeLenses
+namespace Microsoft.PowerShell.EditorServices.CodeLenses
 {
     internal class PesterCodeLensProvider : ICodeLensProvider
     {
diff --git a/src/PowerShellEditorServices.Engine/Services/CodeLens/ReferencesCodeLensProvider.cs b/src/PowerShellEditorServices/Services/CodeLens/ReferencesCodeLensProvider.cs
similarity index 95%
rename from src/PowerShellEditorServices.Engine/Services/CodeLens/ReferencesCodeLensProvider.cs
rename to src/PowerShellEditorServices/Services/CodeLens/ReferencesCodeLensProvider.cs
index 2c1862d59..98af40532 100644
--- a/src/PowerShellEditorServices.Engine/Services/CodeLens/ReferencesCodeLensProvider.cs
+++ b/src/PowerShellEditorServices/Services/CodeLens/ReferencesCodeLensProvider.cs
@@ -6,15 +6,14 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
-using Microsoft.PowerShell.EditorServices.Engine.Services;
-using Microsoft.PowerShell.EditorServices.Engine.Services.Symbols;
-using Microsoft.PowerShell.EditorServices.Engine.Services.TextDocument;
-using Microsoft.PowerShell.EditorServices.Engine.Utility;
+using Microsoft.PowerShell.EditorServices.Services;
+using Microsoft.PowerShell.EditorServices.Services.Symbols;
+using Microsoft.PowerShell.EditorServices.Services.TextDocument;
 using Microsoft.PowerShell.EditorServices.Utility;
 using Newtonsoft.Json.Linq;
 using OmniSharp.Extensions.LanguageServer.Protocol.Models;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.CodeLenses
+namespace Microsoft.PowerShell.EditorServices.CodeLenses
 {
     /// <summary>
     /// Provides the "reference" code lens by extracting document symbols.
diff --git a/src/PowerShellEditorServices.Engine/Services/DebugAdapter/DebugEventHandlerService.cs b/src/PowerShellEditorServices/Services/DebugAdapter/DebugEventHandlerService.cs
similarity index 96%
rename from src/PowerShellEditorServices.Engine/Services/DebugAdapter/DebugEventHandlerService.cs
rename to src/PowerShellEditorServices/Services/DebugAdapter/DebugEventHandlerService.cs
index e4410f439..da867637e 100644
--- a/src/PowerShellEditorServices.Engine/Services/DebugAdapter/DebugEventHandlerService.cs
+++ b/src/PowerShellEditorServices/Services/DebugAdapter/DebugEventHandlerService.cs
@@ -5,13 +5,13 @@
 
 using System.Management.Automation;
 using Microsoft.Extensions.Logging;
-using Microsoft.PowerShell.EditorServices.Engine.Services.DebugAdapter;
-using Microsoft.PowerShell.EditorServices.Engine.Services.PowerShellContext;
+using Microsoft.PowerShell.EditorServices.Services.DebugAdapter;
+using Microsoft.PowerShell.EditorServices.Services.PowerShellContext;
 using Microsoft.PowerShell.EditorServices.Utility;
 using OmniSharp.Extensions.DebugAdapter.Protocol.Events;
 using OmniSharp.Extensions.JsonRpc;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Services
+namespace Microsoft.PowerShell.EditorServices.Services
 {
     internal class DebugEventHandlerService
     {
diff --git a/src/PowerShellEditorServices.Engine/Services/DebugAdapter/DebugService.cs b/src/PowerShellEditorServices/Services/DebugAdapter/DebugService.cs
similarity index 99%
rename from src/PowerShellEditorServices.Engine/Services/DebugAdapter/DebugService.cs
rename to src/PowerShellEditorServices/Services/DebugAdapter/DebugService.cs
index 64889ae5c..c8d566b12 100644
--- a/src/PowerShellEditorServices.Engine/Services/DebugAdapter/DebugService.cs
+++ b/src/PowerShellEditorServices/Services/DebugAdapter/DebugService.cs
@@ -14,12 +14,12 @@
 using Microsoft.PowerShell.EditorServices.Utility;
 using System.Threading;
 using Microsoft.Extensions.Logging;
-using Microsoft.PowerShell.EditorServices.Engine.Logging;
-using Microsoft.PowerShell.EditorServices.Engine.Services.TextDocument;
-using Microsoft.PowerShell.EditorServices.Engine.Services.PowerShellContext;
-using Microsoft.PowerShell.EditorServices.Engine.Services.DebugAdapter;
+using Microsoft.PowerShell.EditorServices.Logging;
+using Microsoft.PowerShell.EditorServices.Services.TextDocument;
+using Microsoft.PowerShell.EditorServices.Services.PowerShellContext;
+using Microsoft.PowerShell.EditorServices.Services.DebugAdapter;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Services
+namespace Microsoft.PowerShell.EditorServices.Services
 {
     /// <summary>
     /// Provides a high-level service for interacting with the
diff --git a/src/PowerShellEditorServices.Engine/Services/DebugAdapter/DebugStateService.cs b/src/PowerShellEditorServices/Services/DebugAdapter/DebugStateService.cs
similarity index 92%
rename from src/PowerShellEditorServices.Engine/Services/DebugAdapter/DebugStateService.cs
rename to src/PowerShellEditorServices/Services/DebugAdapter/DebugStateService.cs
index fd2ec00cb..c5b755358 100644
--- a/src/PowerShellEditorServices.Engine/Services/DebugAdapter/DebugStateService.cs
+++ b/src/PowerShellEditorServices/Services/DebugAdapter/DebugStateService.cs
@@ -3,7 +3,7 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Services
+namespace Microsoft.PowerShell.EditorServices.Services
 {
     internal class DebugStateService
     {
diff --git a/src/PowerShellEditorServices.Engine/Services/DebugAdapter/Debugging/BreakpointDetails.cs b/src/PowerShellEditorServices/Services/DebugAdapter/Debugging/BreakpointDetails.cs
similarity index 97%
rename from src/PowerShellEditorServices.Engine/Services/DebugAdapter/Debugging/BreakpointDetails.cs
rename to src/PowerShellEditorServices/Services/DebugAdapter/Debugging/BreakpointDetails.cs
index fb479dfb7..4e4ee6340 100644
--- a/src/PowerShellEditorServices.Engine/Services/DebugAdapter/Debugging/BreakpointDetails.cs
+++ b/src/PowerShellEditorServices/Services/DebugAdapter/Debugging/BreakpointDetails.cs
@@ -7,7 +7,7 @@
 using System.Management.Automation;
 using Microsoft.PowerShell.EditorServices.Utility;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Services.DebugAdapter
+namespace Microsoft.PowerShell.EditorServices.Services.DebugAdapter
 {
     /// <summary>
     /// Provides details about a breakpoint that is set in the
diff --git a/src/PowerShellEditorServices.Engine/Services/DebugAdapter/Debugging/BreakpointDetailsBase.cs b/src/PowerShellEditorServices/Services/DebugAdapter/Debugging/BreakpointDetailsBase.cs
similarity index 84%
rename from src/PowerShellEditorServices.Engine/Services/DebugAdapter/Debugging/BreakpointDetailsBase.cs
rename to src/PowerShellEditorServices/Services/DebugAdapter/Debugging/BreakpointDetailsBase.cs
index 3393bd007..061939836 100644
--- a/src/PowerShellEditorServices.Engine/Services/DebugAdapter/Debugging/BreakpointDetailsBase.cs
+++ b/src/PowerShellEditorServices/Services/DebugAdapter/Debugging/BreakpointDetailsBase.cs
@@ -3,7 +3,7 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Services.DebugAdapter
+namespace Microsoft.PowerShell.EditorServices.Services.DebugAdapter
 {
     /// <summary>
     /// Provides details about a breakpoint that is set in the
@@ -12,13 +12,13 @@ namespace Microsoft.PowerShell.EditorServices.Engine.Services.DebugAdapter
     public abstract class BreakpointDetailsBase
     {
         /// <summary>
-        /// Gets or sets a boolean indicator that if true, breakpoint could be set 
-        /// (but not necessarily at the desired location).  
+        /// Gets or sets a boolean indicator that if true, breakpoint could be set
+        /// (but not necessarily at the desired location).
         /// </summary>
         public bool Verified { get; set; }
 
         /// <summary>
-        /// Gets or set an optional message about the state of the breakpoint. This is shown to the user 
+        /// Gets or set an optional message about the state of the breakpoint. This is shown to the user
         /// and can be used to explain why a breakpoint could not be verified.
         /// </summary>
         public string Message { get; set; }
diff --git a/src/PowerShellEditorServices.Engine/Services/DebugAdapter/Debugging/CommandBreakpointDetails.cs b/src/PowerShellEditorServices/Services/DebugAdapter/Debugging/CommandBreakpointDetails.cs
similarity index 97%
rename from src/PowerShellEditorServices.Engine/Services/DebugAdapter/Debugging/CommandBreakpointDetails.cs
rename to src/PowerShellEditorServices/Services/DebugAdapter/Debugging/CommandBreakpointDetails.cs
index d181f3c92..2b7c65def 100644
--- a/src/PowerShellEditorServices.Engine/Services/DebugAdapter/Debugging/CommandBreakpointDetails.cs
+++ b/src/PowerShellEditorServices/Services/DebugAdapter/Debugging/CommandBreakpointDetails.cs
@@ -7,7 +7,7 @@
 using System.Management.Automation;
 using Microsoft.PowerShell.EditorServices.Utility;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Services.DebugAdapter
+namespace Microsoft.PowerShell.EditorServices.Services.DebugAdapter
 {
     /// <summary>
     /// Provides details about a command breakpoint that is set in the PowerShell debugger.
diff --git a/src/PowerShellEditorServices.Engine/Services/DebugAdapter/Debugging/DebuggerStoppedEventArgs.cs b/src/PowerShellEditorServices/Services/DebugAdapter/Debugging/DebuggerStoppedEventArgs.cs
similarity index 96%
rename from src/PowerShellEditorServices.Engine/Services/DebugAdapter/Debugging/DebuggerStoppedEventArgs.cs
rename to src/PowerShellEditorServices/Services/DebugAdapter/Debugging/DebuggerStoppedEventArgs.cs
index 9b478afb0..26ea3519a 100644
--- a/src/PowerShellEditorServices.Engine/Services/DebugAdapter/Debugging/DebuggerStoppedEventArgs.cs
+++ b/src/PowerShellEditorServices/Services/DebugAdapter/Debugging/DebuggerStoppedEventArgs.cs
@@ -3,11 +3,11 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-using Microsoft.PowerShell.EditorServices.Engine.Services.PowerShellContext;
+using Microsoft.PowerShell.EditorServices.Services.PowerShellContext;
 using Microsoft.PowerShell.EditorServices.Utility;
 using System.Management.Automation;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Services.DebugAdapter
+namespace Microsoft.PowerShell.EditorServices.Services.DebugAdapter
 {
     /// <summary>
     /// Provides event arguments for the DebugService.DebuggerStopped event.
diff --git a/src/PowerShellEditorServices.Engine/Services/DebugAdapter/Debugging/InvalidPowerShellExpressionException.cs b/src/PowerShellEditorServices/Services/DebugAdapter/Debugging/InvalidPowerShellExpressionException.cs
similarity index 90%
rename from src/PowerShellEditorServices.Engine/Services/DebugAdapter/Debugging/InvalidPowerShellExpressionException.cs
rename to src/PowerShellEditorServices/Services/DebugAdapter/Debugging/InvalidPowerShellExpressionException.cs
index a708778f9..82597bdd4 100644
--- a/src/PowerShellEditorServices.Engine/Services/DebugAdapter/Debugging/InvalidPowerShellExpressionException.cs
+++ b/src/PowerShellEditorServices/Services/DebugAdapter/Debugging/InvalidPowerShellExpressionException.cs
@@ -5,7 +5,7 @@
 
 using System;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Services.DebugAdapter
+namespace Microsoft.PowerShell.EditorServices.Services.DebugAdapter
 {
     /// <summary>
     /// Represents the exception that is thrown when an invalid expression is provided to the DebugService's SetVariable method.
@@ -16,7 +16,7 @@ public class InvalidPowerShellExpressionException : Exception
         /// Initializes a new instance of the SetVariableExpressionException class.
         /// </summary>
         /// <param name="message">Message indicating why the expression is invalid.</param>
-        public InvalidPowerShellExpressionException(string message) 
+        public InvalidPowerShellExpressionException(string message)
             : base(message)
         {
         }
diff --git a/src/PowerShellEditorServices.Engine/Services/DebugAdapter/Debugging/StackFrameDetails.cs b/src/PowerShellEditorServices/Services/DebugAdapter/Debugging/StackFrameDetails.cs
similarity index 96%
rename from src/PowerShellEditorServices.Engine/Services/DebugAdapter/Debugging/StackFrameDetails.cs
rename to src/PowerShellEditorServices/Services/DebugAdapter/Debugging/StackFrameDetails.cs
index c58f53623..f99476980 100644
--- a/src/PowerShellEditorServices.Engine/Services/DebugAdapter/Debugging/StackFrameDetails.cs
+++ b/src/PowerShellEditorServices/Services/DebugAdapter/Debugging/StackFrameDetails.cs
@@ -5,7 +5,7 @@
 
 using System.Management.Automation;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Services.DebugAdapter
+namespace Microsoft.PowerShell.EditorServices.Services.DebugAdapter
 {
     /// <summary>
     /// Contains details pertaining to a single stack frame in
@@ -56,7 +56,7 @@ public class StackFrameDetails
         public int? EndColumnNumber { get; internal set; }
 
         /// <summary>
-        /// Gets a boolean value indicating whether or not the stack frame is executing 
+        /// Gets a boolean value indicating whether or not the stack frame is executing
         /// in script external to the current workspace root.
         /// </summary>
         public bool IsExternalCode { get; internal set; }
@@ -106,9 +106,9 @@ static internal StackFrameDetails Create(
             string scriptPath = (callStackFrameObject.Properties["ScriptName"].Value as string) ?? NoFileScriptPath;
             int startLineNumber = (int)(callStackFrameObject.Properties["ScriptLineNumber"].Value ?? 0);
 
-            // TODO: RKH 2019-03-07 Temporarily disable "external" code until I have a chance to add 
+            // TODO: RKH 2019-03-07 Temporarily disable "external" code until I have a chance to add
             // settings to control this feature.
-            //if (workspaceRootPath != null && 
+            //if (workspaceRootPath != null &&
             //    invocationInfo != null &&
             //    !scriptPath.StartsWith(workspaceRootPath, StringComparison.OrdinalIgnoreCase))
             //{
diff --git a/src/PowerShellEditorServices.Engine/Services/DebugAdapter/Debugging/VariableContainerDetails.cs b/src/PowerShellEditorServices/Services/DebugAdapter/Debugging/VariableContainerDetails.cs
similarity index 98%
rename from src/PowerShellEditorServices.Engine/Services/DebugAdapter/Debugging/VariableContainerDetails.cs
rename to src/PowerShellEditorServices/Services/DebugAdapter/Debugging/VariableContainerDetails.cs
index 28d2df551..75d264039 100644
--- a/src/PowerShellEditorServices.Engine/Services/DebugAdapter/Debugging/VariableContainerDetails.cs
+++ b/src/PowerShellEditorServices/Services/DebugAdapter/Debugging/VariableContainerDetails.cs
@@ -8,7 +8,7 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.PowerShell.EditorServices.Utility;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Services.DebugAdapter
+namespace Microsoft.PowerShell.EditorServices.Services.DebugAdapter
 {
     /// <summary>
     /// Container for variables that is not itself a variable per se.  However given how
diff --git a/src/PowerShellEditorServices.Engine/Services/DebugAdapter/Debugging/VariableDetails.cs b/src/PowerShellEditorServices/Services/DebugAdapter/Debugging/VariableDetails.cs
similarity index 99%
rename from src/PowerShellEditorServices.Engine/Services/DebugAdapter/Debugging/VariableDetails.cs
rename to src/PowerShellEditorServices/Services/DebugAdapter/Debugging/VariableDetails.cs
index 9d3e375b0..5e181e954 100644
--- a/src/PowerShellEditorServices.Engine/Services/DebugAdapter/Debugging/VariableDetails.cs
+++ b/src/PowerShellEditorServices/Services/DebugAdapter/Debugging/VariableDetails.cs
@@ -13,7 +13,7 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.PowerShell.EditorServices.Utility;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Services.DebugAdapter
+namespace Microsoft.PowerShell.EditorServices.Services.DebugAdapter
 {
     /// <summary>
     /// Contains details pertaining to a variable in the current
diff --git a/src/PowerShellEditorServices.Engine/Services/DebugAdapter/Debugging/VariableDetailsBase.cs b/src/PowerShellEditorServices/Services/DebugAdapter/Debugging/VariableDetailsBase.cs
similarity index 96%
rename from src/PowerShellEditorServices.Engine/Services/DebugAdapter/Debugging/VariableDetailsBase.cs
rename to src/PowerShellEditorServices/Services/DebugAdapter/Debugging/VariableDetailsBase.cs
index 0eb8c32ab..357ebbea3 100644
--- a/src/PowerShellEditorServices.Engine/Services/DebugAdapter/Debugging/VariableDetailsBase.cs
+++ b/src/PowerShellEditorServices/Services/DebugAdapter/Debugging/VariableDetailsBase.cs
@@ -6,7 +6,7 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.PowerShell.EditorServices.Utility;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Services.DebugAdapter
+namespace Microsoft.PowerShell.EditorServices.Services.DebugAdapter
 {
     /// <summary>
     /// Defines the common details between a variable and a variable container such as a scope
diff --git a/src/PowerShellEditorServices.Engine/Services/DebugAdapter/Debugging/VariableScope.cs b/src/PowerShellEditorServices/Services/DebugAdapter/Debugging/VariableScope.cs
similarity index 93%
rename from src/PowerShellEditorServices.Engine/Services/DebugAdapter/Debugging/VariableScope.cs
rename to src/PowerShellEditorServices/Services/DebugAdapter/Debugging/VariableScope.cs
index 411388951..2e4a013e9 100644
--- a/src/PowerShellEditorServices.Engine/Services/DebugAdapter/Debugging/VariableScope.cs
+++ b/src/PowerShellEditorServices/Services/DebugAdapter/Debugging/VariableScope.cs
@@ -3,7 +3,7 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Services.DebugAdapter
+namespace Microsoft.PowerShell.EditorServices.Services.DebugAdapter
 {
     /// <summary>
     /// Contains details pertaining to a variable scope in the current
diff --git a/src/PowerShellEditorServices.Engine/Services/DebugAdapter/Handlers/BreakpointHandlers.cs b/src/PowerShellEditorServices/Services/DebugAdapter/Handlers/BreakpointHandlers.cs
similarity index 96%
rename from src/PowerShellEditorServices.Engine/Services/DebugAdapter/Handlers/BreakpointHandlers.cs
rename to src/PowerShellEditorServices/Services/DebugAdapter/Handlers/BreakpointHandlers.cs
index 8b0d0962c..8b65c4eea 100644
--- a/src/PowerShellEditorServices.Engine/Services/DebugAdapter/Handlers/BreakpointHandlers.cs
+++ b/src/PowerShellEditorServices/Services/DebugAdapter/Handlers/BreakpointHandlers.cs
@@ -9,15 +9,15 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
-using Microsoft.PowerShell.EditorServices.Engine.Logging;
-using Microsoft.PowerShell.EditorServices.Engine.Services;
-using Microsoft.PowerShell.EditorServices.Engine.Services.DebugAdapter;
-using Microsoft.PowerShell.EditorServices.Engine.Services.TextDocument;
+using Microsoft.PowerShell.EditorServices.Logging;
+using Microsoft.PowerShell.EditorServices.Services;
+using Microsoft.PowerShell.EditorServices.Services.DebugAdapter;
+using Microsoft.PowerShell.EditorServices.Services.TextDocument;
 using Microsoft.PowerShell.EditorServices.Utility;
 using OmniSharp.Extensions.DebugAdapter.Protocol.Models;
 using OmniSharp.Extensions.DebugAdapter.Protocol.Requests;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Handlers
+namespace Microsoft.PowerShell.EditorServices.Handlers
 {
     internal class SetFunctionBreakpointsHandler : ISetFunctionBreakpointsHandler
     {
diff --git a/src/PowerShellEditorServices.Engine/Services/DebugAdapter/Handlers/ConfigurationDoneHandler.cs b/src/PowerShellEditorServices/Services/DebugAdapter/Handlers/ConfigurationDoneHandler.cs
similarity index 93%
rename from src/PowerShellEditorServices.Engine/Services/DebugAdapter/Handlers/ConfigurationDoneHandler.cs
rename to src/PowerShellEditorServices/Services/DebugAdapter/Handlers/ConfigurationDoneHandler.cs
index 354d723f4..03cdf7fde 100644
--- a/src/PowerShellEditorServices.Engine/Services/DebugAdapter/Handlers/ConfigurationDoneHandler.cs
+++ b/src/PowerShellEditorServices/Services/DebugAdapter/Handlers/ConfigurationDoneHandler.cs
@@ -6,14 +6,14 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
-using Microsoft.PowerShell.EditorServices.Engine.Services;
-using Microsoft.PowerShell.EditorServices.Engine.Services.PowerShellContext;
-using Microsoft.PowerShell.EditorServices.Engine.Services.TextDocument;
+using Microsoft.PowerShell.EditorServices.Services;
+using Microsoft.PowerShell.EditorServices.Services.PowerShellContext;
+using Microsoft.PowerShell.EditorServices.Services.TextDocument;
 using OmniSharp.Extensions.DebugAdapter.Protocol.Events;
 using OmniSharp.Extensions.DebugAdapter.Protocol.Requests;
 using OmniSharp.Extensions.JsonRpc;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Handlers
+namespace Microsoft.PowerShell.EditorServices.Handlers
 {
     internal class ConfigurationDoneHandler : IConfigurationDoneHandler
     {
diff --git a/src/PowerShellEditorServices.Engine/Services/DebugAdapter/Handlers/DebugEvaluateHandler.cs b/src/PowerShellEditorServices/Services/DebugAdapter/Handlers/DebugEvaluateHandler.cs
similarity index 93%
rename from src/PowerShellEditorServices.Engine/Services/DebugAdapter/Handlers/DebugEvaluateHandler.cs
rename to src/PowerShellEditorServices/Services/DebugAdapter/Handlers/DebugEvaluateHandler.cs
index a35133eb9..246621ce7 100644
--- a/src/PowerShellEditorServices.Engine/Services/DebugAdapter/Handlers/DebugEvaluateHandler.cs
+++ b/src/PowerShellEditorServices/Services/DebugAdapter/Handlers/DebugEvaluateHandler.cs
@@ -7,10 +7,10 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
-using Microsoft.PowerShell.EditorServices.Engine.Services;
-using Microsoft.PowerShell.EditorServices.Engine.Services.DebugAdapter;
+using Microsoft.PowerShell.EditorServices.Services;
+using Microsoft.PowerShell.EditorServices.Services.DebugAdapter;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Handlers
+namespace Microsoft.PowerShell.EditorServices.Handlers
 {
     internal class DebugEvaluateHandler : IEvaluateHandler
     {
diff --git a/src/PowerShellEditorServices.Engine/Services/DebugAdapter/Handlers/DebuggerActionHandlers.cs b/src/PowerShellEditorServices/Services/DebugAdapter/Handlers/DebuggerActionHandlers.cs
similarity index 96%
rename from src/PowerShellEditorServices.Engine/Services/DebugAdapter/Handlers/DebuggerActionHandlers.cs
rename to src/PowerShellEditorServices/Services/DebugAdapter/Handlers/DebuggerActionHandlers.cs
index 2ae5c932c..21c520881 100644
--- a/src/PowerShellEditorServices.Engine/Services/DebugAdapter/Handlers/DebuggerActionHandlers.cs
+++ b/src/PowerShellEditorServices/Services/DebugAdapter/Handlers/DebuggerActionHandlers.cs
@@ -8,11 +8,11 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
-using Microsoft.PowerShell.EditorServices.Engine.Services;
+using Microsoft.PowerShell.EditorServices.Services;
 using OmniSharp.Extensions.DebugAdapter.Protocol.Requests;
 using OmniSharp.Extensions.JsonRpc;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Handlers
+namespace Microsoft.PowerShell.EditorServices.Handlers
 {
     internal class ContinueHandler : IContinueHandler
     {
diff --git a/src/PowerShellEditorServices.Engine/Services/DebugAdapter/Handlers/DisconnectHandler.cs b/src/PowerShellEditorServices/Services/DebugAdapter/Handlers/DisconnectHandler.cs
similarity index 91%
rename from src/PowerShellEditorServices.Engine/Services/DebugAdapter/Handlers/DisconnectHandler.cs
rename to src/PowerShellEditorServices/Services/DebugAdapter/Handlers/DisconnectHandler.cs
index 7c5711e3f..61df26447 100644
--- a/src/PowerShellEditorServices.Engine/Services/DebugAdapter/Handlers/DisconnectHandler.cs
+++ b/src/PowerShellEditorServices/Services/DebugAdapter/Handlers/DisconnectHandler.cs
@@ -7,13 +7,13 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
-using Microsoft.PowerShell.EditorServices.Engine.Logging;
-using Microsoft.PowerShell.EditorServices.Engine.Server;
-using Microsoft.PowerShell.EditorServices.Engine.Services;
-using Microsoft.PowerShell.EditorServices.Engine.Services.PowerShellContext;
+using Microsoft.PowerShell.EditorServices.Logging;
+using Microsoft.PowerShell.EditorServices.Server;
+using Microsoft.PowerShell.EditorServices.Services;
+using Microsoft.PowerShell.EditorServices.Services.PowerShellContext;
 using OmniSharp.Extensions.DebugAdapter.Protocol.Requests;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Handlers
+namespace Microsoft.PowerShell.EditorServices.Handlers
 {
     internal class DisconnectHandler : IDisconnectHandler
     {
diff --git a/src/PowerShellEditorServices.Engine/Services/DebugAdapter/Handlers/InitializeHandler.cs b/src/PowerShellEditorServices/Services/DebugAdapter/Handlers/InitializeHandler.cs
similarity index 92%
rename from src/PowerShellEditorServices.Engine/Services/DebugAdapter/Handlers/InitializeHandler.cs
rename to src/PowerShellEditorServices/Services/DebugAdapter/Handlers/InitializeHandler.cs
index 0876fdff1..77861d443 100644
--- a/src/PowerShellEditorServices.Engine/Services/DebugAdapter/Handlers/InitializeHandler.cs
+++ b/src/PowerShellEditorServices/Services/DebugAdapter/Handlers/InitializeHandler.cs
@@ -6,10 +6,10 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
-using Microsoft.PowerShell.EditorServices.Engine.Services;
+using Microsoft.PowerShell.EditorServices.Services;
 using OmniSharp.Extensions.DebugAdapter.Protocol.Requests;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Handlers
+namespace Microsoft.PowerShell.EditorServices.Handlers
 {
     internal class InitializeHandler : IInitializeHandler
     {
diff --git a/src/PowerShellEditorServices.Engine/Services/DebugAdapter/Handlers/LaunchAndAttachHandler.cs b/src/PowerShellEditorServices/Services/DebugAdapter/Handlers/LaunchAndAttachHandler.cs
similarity index 98%
rename from src/PowerShellEditorServices.Engine/Services/DebugAdapter/Handlers/LaunchAndAttachHandler.cs
rename to src/PowerShellEditorServices/Services/DebugAdapter/Handlers/LaunchAndAttachHandler.cs
index 77e62588a..1772d4a13 100644
--- a/src/PowerShellEditorServices.Engine/Services/DebugAdapter/Handlers/LaunchAndAttachHandler.cs
+++ b/src/PowerShellEditorServices/Services/DebugAdapter/Handlers/LaunchAndAttachHandler.cs
@@ -10,13 +10,13 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
-using Microsoft.PowerShell.EditorServices.Engine.Services;
-using Microsoft.PowerShell.EditorServices.Engine.Services.PowerShellContext;
+using Microsoft.PowerShell.EditorServices.Services;
+using Microsoft.PowerShell.EditorServices.Services.PowerShellContext;
 using OmniSharp.Extensions.DebugAdapter.Protocol.Events;
 using OmniSharp.Extensions.Embedded.MediatR;
 using OmniSharp.Extensions.JsonRpc;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Handlers
+namespace Microsoft.PowerShell.EditorServices.Handlers
 {
     [Serial, Method("launch")]
     interface IPsesLaunchHandler : IJsonRpcRequestHandler<PsesLaunchRequestArguments> { }
diff --git a/src/PowerShellEditorServices.Engine/Services/DebugAdapter/Handlers/ScopesHandler.cs b/src/PowerShellEditorServices/Services/DebugAdapter/Handlers/ScopesHandler.cs
similarity index 87%
rename from src/PowerShellEditorServices.Engine/Services/DebugAdapter/Handlers/ScopesHandler.cs
rename to src/PowerShellEditorServices/Services/DebugAdapter/Handlers/ScopesHandler.cs
index 22a33154c..02c989611 100644
--- a/src/PowerShellEditorServices.Engine/Services/DebugAdapter/Handlers/ScopesHandler.cs
+++ b/src/PowerShellEditorServices/Services/DebugAdapter/Handlers/ScopesHandler.cs
@@ -7,13 +7,13 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
-using Microsoft.PowerShell.EditorServices.Engine.Services;
-using Microsoft.PowerShell.EditorServices.Engine.Services.DebugAdapter;
+using Microsoft.PowerShell.EditorServices.Services;
+using Microsoft.PowerShell.EditorServices.Services.DebugAdapter;
 using Microsoft.PowerShell.EditorServices.Utility;
 using OmniSharp.Extensions.DebugAdapter.Protocol.Models;
 using OmniSharp.Extensions.DebugAdapter.Protocol.Requests;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Handlers
+namespace Microsoft.PowerShell.EditorServices.Handlers
 {
     internal class ScopesHandler : IScopesHandler
     {
diff --git a/src/PowerShellEditorServices.Engine/Services/DebugAdapter/Handlers/SetVariableHandler.cs b/src/PowerShellEditorServices/Services/DebugAdapter/Handlers/SetVariableHandler.cs
similarity index 92%
rename from src/PowerShellEditorServices.Engine/Services/DebugAdapter/Handlers/SetVariableHandler.cs
rename to src/PowerShellEditorServices/Services/DebugAdapter/Handlers/SetVariableHandler.cs
index 542b3f36e..dbd4e0939 100644
--- a/src/PowerShellEditorServices.Engine/Services/DebugAdapter/Handlers/SetVariableHandler.cs
+++ b/src/PowerShellEditorServices/Services/DebugAdapter/Handlers/SetVariableHandler.cs
@@ -9,14 +9,14 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
-using Microsoft.PowerShell.EditorServices.Engine.Services;
-using Microsoft.PowerShell.EditorServices.Engine.Services.DebugAdapter;
+using Microsoft.PowerShell.EditorServices.Services;
+using Microsoft.PowerShell.EditorServices.Services.DebugAdapter;
 using Microsoft.PowerShell.EditorServices.Utility;
 using OmniSharp.Extensions.DebugAdapter.Protocol.Models;
 using OmniSharp.Extensions.DebugAdapter.Protocol.Requests;
 using OmniSharp.Extensions.JsonRpc;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Handlers
+namespace Microsoft.PowerShell.EditorServices.Handlers
 {
     internal class SetVariableHandler : ISetVariableHandler
     {
diff --git a/src/PowerShellEditorServices.Engine/Services/DebugAdapter/Handlers/SourceHandler.cs b/src/PowerShellEditorServices/Services/DebugAdapter/Handlers/SourceHandler.cs
similarity index 91%
rename from src/PowerShellEditorServices.Engine/Services/DebugAdapter/Handlers/SourceHandler.cs
rename to src/PowerShellEditorServices/Services/DebugAdapter/Handlers/SourceHandler.cs
index 168682ca0..0b41345b3 100644
--- a/src/PowerShellEditorServices.Engine/Services/DebugAdapter/Handlers/SourceHandler.cs
+++ b/src/PowerShellEditorServices/Services/DebugAdapter/Handlers/SourceHandler.cs
@@ -7,7 +7,7 @@
 using System.Threading.Tasks;
 using OmniSharp.Extensions.DebugAdapter.Protocol.Requests;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Handlers
+namespace Microsoft.PowerShell.EditorServices.Handlers
 {
     internal class SourceHandler : ISourceHandler
     {
diff --git a/src/PowerShellEditorServices.Engine/Services/DebugAdapter/Handlers/StackTraceHandler.cs b/src/PowerShellEditorServices/Services/DebugAdapter/Handlers/StackTraceHandler.cs
similarity index 93%
rename from src/PowerShellEditorServices.Engine/Services/DebugAdapter/Handlers/StackTraceHandler.cs
rename to src/PowerShellEditorServices/Services/DebugAdapter/Handlers/StackTraceHandler.cs
index 9b2263b24..57061c317 100644
--- a/src/PowerShellEditorServices.Engine/Services/DebugAdapter/Handlers/StackTraceHandler.cs
+++ b/src/PowerShellEditorServices/Services/DebugAdapter/Handlers/StackTraceHandler.cs
@@ -8,13 +8,13 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
-using Microsoft.PowerShell.EditorServices.Engine.Services;
-using Microsoft.PowerShell.EditorServices.Engine.Services.DebugAdapter;
+using Microsoft.PowerShell.EditorServices.Services;
+using Microsoft.PowerShell.EditorServices.Services.DebugAdapter;
 using Microsoft.PowerShell.EditorServices.Utility;
 using OmniSharp.Extensions.DebugAdapter.Protocol.Models;
 using OmniSharp.Extensions.DebugAdapter.Protocol.Requests;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Handlers
+namespace Microsoft.PowerShell.EditorServices.Handlers
 {
     internal class StackTraceHandler : IStackTraceHandler
     {
diff --git a/src/PowerShellEditorServices.Engine/Services/DebugAdapter/Handlers/ThreadsHandler.cs b/src/PowerShellEditorServices/Services/DebugAdapter/Handlers/ThreadsHandler.cs
similarity index 93%
rename from src/PowerShellEditorServices.Engine/Services/DebugAdapter/Handlers/ThreadsHandler.cs
rename to src/PowerShellEditorServices/Services/DebugAdapter/Handlers/ThreadsHandler.cs
index 06c14c44c..800494a2a 100644
--- a/src/PowerShellEditorServices.Engine/Services/DebugAdapter/Handlers/ThreadsHandler.cs
+++ b/src/PowerShellEditorServices/Services/DebugAdapter/Handlers/ThreadsHandler.cs
@@ -8,7 +8,7 @@
 using OmniSharp.Extensions.DebugAdapter.Protocol.Models;
 using OmniSharp.Extensions.DebugAdapter.Protocol.Requests;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Handlers
+namespace Microsoft.PowerShell.EditorServices.Handlers
 {
     internal class ThreadsHandler : IThreadsHandler
     {
diff --git a/src/PowerShellEditorServices.Engine/Services/DebugAdapter/Handlers/VariablesHandler.cs b/src/PowerShellEditorServices/Services/DebugAdapter/Handlers/VariablesHandler.cs
similarity index 89%
rename from src/PowerShellEditorServices.Engine/Services/DebugAdapter/Handlers/VariablesHandler.cs
rename to src/PowerShellEditorServices/Services/DebugAdapter/Handlers/VariablesHandler.cs
index cf8003302..5854d7a58 100644
--- a/src/PowerShellEditorServices.Engine/Services/DebugAdapter/Handlers/VariablesHandler.cs
+++ b/src/PowerShellEditorServices/Services/DebugAdapter/Handlers/VariablesHandler.cs
@@ -8,13 +8,13 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
-using Microsoft.PowerShell.EditorServices.Engine.Services;
-using Microsoft.PowerShell.EditorServices.Engine.Services.DebugAdapter;
+using Microsoft.PowerShell.EditorServices.Services;
+using Microsoft.PowerShell.EditorServices.Services.DebugAdapter;
 using Microsoft.PowerShell.EditorServices.Utility;
 using OmniSharp.Extensions.DebugAdapter.Protocol.Models;
 using OmniSharp.Extensions.DebugAdapter.Protocol.Requests;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Handlers
+namespace Microsoft.PowerShell.EditorServices.Handlers
 {
     internal class VariablesHandler : IVariablesHandler
     {
diff --git a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Console/ChoiceDetails.cs b/src/PowerShellEditorServices/Services/PowerShellContext/Console/ChoiceDetails.cs
similarity index 97%
rename from src/PowerShellEditorServices.Engine/Services/PowerShellContext/Console/ChoiceDetails.cs
rename to src/PowerShellEditorServices/Services/PowerShellContext/Console/ChoiceDetails.cs
index ece5bd4ae..d93d0daca 100644
--- a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Console/ChoiceDetails.cs
+++ b/src/PowerShellEditorServices/Services/PowerShellContext/Console/ChoiceDetails.cs
@@ -6,11 +6,11 @@
 using System;
 using System.Management.Automation.Host;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Services.PowerShellContext
+namespace Microsoft.PowerShell.EditorServices.Services.PowerShellContext
 {
     /// <summary>
     /// Contains the details about a choice that should be displayed
-    /// to the user.  This class is meant to be serializable to the 
+    /// to the user.  This class is meant to be serializable to the
     /// user's UI.
     /// </summary>
     public class ChoiceDetails
diff --git a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Console/ChoicePromptHandler.cs b/src/PowerShellEditorServices/Services/PowerShellContext/Console/ChoicePromptHandler.cs
similarity index 99%
rename from src/PowerShellEditorServices.Engine/Services/PowerShellContext/Console/ChoicePromptHandler.cs
rename to src/PowerShellEditorServices/Services/PowerShellContext/Console/ChoicePromptHandler.cs
index 9f9557920..ecfe1ffde 100644
--- a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Console/ChoicePromptHandler.cs
+++ b/src/PowerShellEditorServices/Services/PowerShellContext/Console/ChoicePromptHandler.cs
@@ -11,7 +11,7 @@
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Services.PowerShellContext
+namespace Microsoft.PowerShell.EditorServices.Services.PowerShellContext
 {
     /// <summary>
     /// Indicates the style of prompt to be displayed.
diff --git a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Console/CollectionFieldDetails.cs b/src/PowerShellEditorServices/Services/PowerShellContext/Console/CollectionFieldDetails.cs
similarity index 98%
rename from src/PowerShellEditorServices.Engine/Services/PowerShellContext/Console/CollectionFieldDetails.cs
rename to src/PowerShellEditorServices/Services/PowerShellContext/Console/CollectionFieldDetails.cs
index e9a6fb425..bfcf4cec8 100644
--- a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Console/CollectionFieldDetails.cs
+++ b/src/PowerShellEditorServices/Services/PowerShellContext/Console/CollectionFieldDetails.cs
@@ -6,7 +6,7 @@
 using System;
 using System.Collections;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Services.PowerShellContext
+namespace Microsoft.PowerShell.EditorServices.Services.PowerShellContext
 {
     /// <summary>
     /// Contains the details of an colleciton input field shown
diff --git a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Console/ConsoleChoicePromptHandler.cs b/src/PowerShellEditorServices/Services/PowerShellContext/Console/ConsoleChoicePromptHandler.cs
similarity index 98%
rename from src/PowerShellEditorServices.Engine/Services/PowerShellContext/Console/ConsoleChoicePromptHandler.cs
rename to src/PowerShellEditorServices/Services/PowerShellContext/Console/ConsoleChoicePromptHandler.cs
index 976ff4533..bf209aeb0 100644
--- a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Console/ConsoleChoicePromptHandler.cs
+++ b/src/PowerShellEditorServices/Services/PowerShellContext/Console/ConsoleChoicePromptHandler.cs
@@ -6,7 +6,7 @@
 using System.Linq;
 using Microsoft.Extensions.Logging;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Services.PowerShellContext
+namespace Microsoft.PowerShell.EditorServices.Services.PowerShellContext
 {
     /// <summary>
     /// Provides a standard implementation of ChoicePromptHandler
diff --git a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Console/ConsoleInputPromptHandler.cs b/src/PowerShellEditorServices/Services/PowerShellContext/Console/ConsoleInputPromptHandler.cs
similarity index 97%
rename from src/PowerShellEditorServices.Engine/Services/PowerShellContext/Console/ConsoleInputPromptHandler.cs
rename to src/PowerShellEditorServices/Services/PowerShellContext/Console/ConsoleInputPromptHandler.cs
index be274122c..1c9187b4f 100644
--- a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Console/ConsoleInputPromptHandler.cs
+++ b/src/PowerShellEditorServices/Services/PowerShellContext/Console/ConsoleInputPromptHandler.cs
@@ -6,7 +6,7 @@
 using System;
 using Microsoft.Extensions.Logging;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Services.PowerShellContext
+namespace Microsoft.PowerShell.EditorServices.Services.PowerShellContext
 {
     /// <summary>
     /// Provides a standard implementation of InputPromptHandler
diff --git a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Console/ConsoleProxy.cs b/src/PowerShellEditorServices/Services/PowerShellContext/Console/ConsoleProxy.cs
similarity index 99%
rename from src/PowerShellEditorServices.Engine/Services/PowerShellContext/Console/ConsoleProxy.cs
rename to src/PowerShellEditorServices/Services/PowerShellContext/Console/ConsoleProxy.cs
index 00c2e13e6..cda8997fe 100644
--- a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Console/ConsoleProxy.cs
+++ b/src/PowerShellEditorServices/Services/PowerShellContext/Console/ConsoleProxy.cs
@@ -8,7 +8,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Services.PowerShellContext
+namespace Microsoft.PowerShell.EditorServices.Services.PowerShellContext
 {
     /// <summary>
     /// Provides asynchronous implementations of the <see cref="Console" /> API's as well as
diff --git a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Console/ConsoleReadLine.cs b/src/PowerShellEditorServices/Services/PowerShellContext/Console/ConsoleReadLine.cs
similarity index 99%
rename from src/PowerShellEditorServices.Engine/Services/PowerShellContext/Console/ConsoleReadLine.cs
rename to src/PowerShellEditorServices/Services/PowerShellContext/Console/ConsoleReadLine.cs
index 9f5648309..0c306944e 100644
--- a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Console/ConsoleReadLine.cs
+++ b/src/PowerShellEditorServices/Services/PowerShellContext/Console/ConsoleReadLine.cs
@@ -9,7 +9,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Services.PowerShellContext
+namespace Microsoft.PowerShell.EditorServices.Services.PowerShellContext
 {
     using System;
     using System.Management.Automation;
diff --git a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Console/CredentialFieldDetails.cs b/src/PowerShellEditorServices/Services/PowerShellContext/Console/CredentialFieldDetails.cs
similarity index 98%
rename from src/PowerShellEditorServices.Engine/Services/PowerShellContext/Console/CredentialFieldDetails.cs
rename to src/PowerShellEditorServices/Services/PowerShellContext/Console/CredentialFieldDetails.cs
index edcbc2fd6..5c27a70f6 100644
--- a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Console/CredentialFieldDetails.cs
+++ b/src/PowerShellEditorServices/Services/PowerShellContext/Console/CredentialFieldDetails.cs
@@ -7,7 +7,7 @@
 using System.Management.Automation;
 using System.Security;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Services.PowerShellContext
+namespace Microsoft.PowerShell.EditorServices.Services.PowerShellContext
 {
     /// <summary>
     /// Contains the details of a PSCredential field shown
diff --git a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Console/FieldDetails.cs b/src/PowerShellEditorServices/Services/PowerShellContext/Console/FieldDetails.cs
similarity index 98%
rename from src/PowerShellEditorServices.Engine/Services/PowerShellContext/Console/FieldDetails.cs
rename to src/PowerShellEditorServices/Services/PowerShellContext/Console/FieldDetails.cs
index 88274be04..3fe573659 100644
--- a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Console/FieldDetails.cs
+++ b/src/PowerShellEditorServices/Services/PowerShellContext/Console/FieldDetails.cs
@@ -11,7 +11,7 @@
 using System.Management.Automation.Host;
 using System.Reflection;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Services.PowerShellContext
+namespace Microsoft.PowerShell.EditorServices.Services.PowerShellContext
 {
     /// <summary>
     /// Contains the details of an input field shown from an
diff --git a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Console/IConsoleOperations.cs b/src/PowerShellEditorServices/Services/PowerShellContext/Console/IConsoleOperations.cs
similarity index 98%
rename from src/PowerShellEditorServices.Engine/Services/PowerShellContext/Console/IConsoleOperations.cs
rename to src/PowerShellEditorServices/Services/PowerShellContext/Console/IConsoleOperations.cs
index c124c5cf4..2bfeb883c 100644
--- a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Console/IConsoleOperations.cs
+++ b/src/PowerShellEditorServices/Services/PowerShellContext/Console/IConsoleOperations.cs
@@ -7,7 +7,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Services.PowerShellContext
+namespace Microsoft.PowerShell.EditorServices.Services.PowerShellContext
 {
     /// <summary>
     /// Provides platform specific console utilities.
diff --git a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Console/InputPromptHandler.cs b/src/PowerShellEditorServices/Services/PowerShellContext/Console/InputPromptHandler.cs
similarity index 99%
rename from src/PowerShellEditorServices.Engine/Services/PowerShellContext/Console/InputPromptHandler.cs
rename to src/PowerShellEditorServices/Services/PowerShellContext/Console/InputPromptHandler.cs
index 442266a92..ed95b9120 100644
--- a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Console/InputPromptHandler.cs
+++ b/src/PowerShellEditorServices/Services/PowerShellContext/Console/InputPromptHandler.cs
@@ -12,7 +12,7 @@
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Services.PowerShellContext
+namespace Microsoft.PowerShell.EditorServices.Services.PowerShellContext
 {
     /// <summary>
     /// Provides a base implementation for IPromptHandler classes
diff --git a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Console/PromptHandler.cs b/src/PowerShellEditorServices/Services/PowerShellContext/Console/PromptHandler.cs
similarity index 95%
rename from src/PowerShellEditorServices.Engine/Services/PowerShellContext/Console/PromptHandler.cs
rename to src/PowerShellEditorServices/Services/PowerShellContext/Console/PromptHandler.cs
index 1bcdec99e..97e8c4c6a 100644
--- a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Console/PromptHandler.cs
+++ b/src/PowerShellEditorServices/Services/PowerShellContext/Console/PromptHandler.cs
@@ -6,7 +6,7 @@
 using System;
 using Microsoft.Extensions.Logging;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Services.PowerShellContext
+namespace Microsoft.PowerShell.EditorServices.Services.PowerShellContext
 {
     /// <summary>
     /// Defines an abstract base class for prompt handler implementations.
diff --git a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Console/TerminalChoicePromptHandler.cs b/src/PowerShellEditorServices/Services/PowerShellContext/Console/TerminalChoicePromptHandler.cs
similarity index 96%
rename from src/PowerShellEditorServices.Engine/Services/PowerShellContext/Console/TerminalChoicePromptHandler.cs
rename to src/PowerShellEditorServices/Services/PowerShellContext/Console/TerminalChoicePromptHandler.cs
index 9cc303bf4..f49c6ca39 100644
--- a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Console/TerminalChoicePromptHandler.cs
+++ b/src/PowerShellEditorServices/Services/PowerShellContext/Console/TerminalChoicePromptHandler.cs
@@ -7,7 +7,7 @@
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Services.PowerShellContext
+namespace Microsoft.PowerShell.EditorServices.Services.PowerShellContext
 {
     /// <summary>
     /// Provides a standard implementation of ChoicePromptHandler
diff --git a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Console/TerminalInputPromptHandler.cs b/src/PowerShellEditorServices/Services/PowerShellContext/Console/TerminalInputPromptHandler.cs
similarity index 97%
rename from src/PowerShellEditorServices.Engine/Services/PowerShellContext/Console/TerminalInputPromptHandler.cs
rename to src/PowerShellEditorServices/Services/PowerShellContext/Console/TerminalInputPromptHandler.cs
index 245a036c2..dacb51f32 100644
--- a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Console/TerminalInputPromptHandler.cs
+++ b/src/PowerShellEditorServices/Services/PowerShellContext/Console/TerminalInputPromptHandler.cs
@@ -8,7 +8,7 @@
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Services.PowerShellContext
+namespace Microsoft.PowerShell.EditorServices.Services.PowerShellContext
 {
     /// <summary>
     /// Provides a standard implementation of InputPromptHandler
diff --git a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Console/UnixConsoleOperations.cs b/src/PowerShellEditorServices/Services/PowerShellContext/Console/UnixConsoleOperations.cs
similarity index 99%
rename from src/PowerShellEditorServices.Engine/Services/PowerShellContext/Console/UnixConsoleOperations.cs
rename to src/PowerShellEditorServices/Services/PowerShellContext/Console/UnixConsoleOperations.cs
index 9d715561f..7df7b186e 100644
--- a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Console/UnixConsoleOperations.cs
+++ b/src/PowerShellEditorServices/Services/PowerShellContext/Console/UnixConsoleOperations.cs
@@ -9,7 +9,7 @@
 using Microsoft.PowerShell.EditorServices.Utility;
 using UnixConsoleEcho;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Services.PowerShellContext
+namespace Microsoft.PowerShell.EditorServices.Services.PowerShellContext
 {
     internal class UnixConsoleOperations : IConsoleOperations
     {
diff --git a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Console/WindowsConsoleOperations.cs b/src/PowerShellEditorServices/Services/PowerShellContext/Console/WindowsConsoleOperations.cs
similarity index 97%
rename from src/PowerShellEditorServices.Engine/Services/PowerShellContext/Console/WindowsConsoleOperations.cs
rename to src/PowerShellEditorServices/Services/PowerShellContext/Console/WindowsConsoleOperations.cs
index c1118b584..69c6ac91e 100644
--- a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Console/WindowsConsoleOperations.cs
+++ b/src/PowerShellEditorServices/Services/PowerShellContext/Console/WindowsConsoleOperations.cs
@@ -8,7 +8,7 @@
 using System.Threading.Tasks;
 using Microsoft.PowerShell.EditorServices.Utility;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Services.PowerShellContext
+namespace Microsoft.PowerShell.EditorServices.Services.PowerShellContext
 {
     internal class WindowsConsoleOperations : IConsoleOperations
     {
diff --git a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/EditorOperationsService.cs b/src/PowerShellEditorServices/Services/PowerShellContext/EditorOperationsService.cs
similarity index 95%
rename from src/PowerShellEditorServices.Engine/Services/PowerShellContext/EditorOperationsService.cs
rename to src/PowerShellEditorServices/Services/PowerShellContext/EditorOperationsService.cs
index 5d42a56d6..1d6ddd247 100644
--- a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/EditorOperationsService.cs
+++ b/src/PowerShellEditorServices/Services/PowerShellContext/EditorOperationsService.cs
@@ -3,14 +3,14 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-using Microsoft.PowerShell.EditorServices.Engine.Handlers;
-using Microsoft.PowerShell.EditorServices.Engine.Services.PowerShellContext;
-using Microsoft.PowerShell.EditorServices.Engine.Services.TextDocument;
+using Microsoft.PowerShell.EditorServices.Handlers;
+using Microsoft.PowerShell.EditorServices.Services.PowerShellContext;
+using Microsoft.PowerShell.EditorServices.Services.TextDocument;
 using OmniSharp.Extensions.LanguageServer.Protocol.Models;
 using OmniSharp.Extensions.LanguageServer.Protocol.Server;
 using System.Threading.Tasks;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Services
+namespace Microsoft.PowerShell.EditorServices.Services
 {
     internal class EditorOperationsService : IEditorOperations
     {
diff --git a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/ExtensionService.cs b/src/PowerShellEditorServices/Services/PowerShellContext/ExtensionService.cs
similarity index 98%
rename from src/PowerShellEditorServices.Engine/Services/PowerShellContext/ExtensionService.cs
rename to src/PowerShellEditorServices/Services/PowerShellContext/ExtensionService.cs
index 983d8354a..4399a5eb9 100644
--- a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/ExtensionService.cs
+++ b/src/PowerShellEditorServices/Services/PowerShellContext/ExtensionService.cs
@@ -3,14 +3,14 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-using Microsoft.PowerShell.EditorServices.Engine.Services.PowerShellContext;
+using Microsoft.PowerShell.EditorServices.Services.PowerShellContext;
 using OmniSharp.Extensions.LanguageServer.Protocol.Server;
 using System;
 using System.Collections.Generic;
 using System.Management.Automation;
 using System.Threading.Tasks;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Services
+namespace Microsoft.PowerShell.EditorServices.Services
 {
     /// <summary>
     /// Provides a high-level service which enables PowerShell scripts
diff --git a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Extensions/EditorCommand.cs b/src/PowerShellEditorServices/Services/PowerShellContext/Extensions/EditorCommand.cs
similarity index 97%
rename from src/PowerShellEditorServices.Engine/Services/PowerShellContext/Extensions/EditorCommand.cs
rename to src/PowerShellEditorServices/Services/PowerShellContext/Extensions/EditorCommand.cs
index 193878f2b..7f24d04a2 100644
--- a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Extensions/EditorCommand.cs
+++ b/src/PowerShellEditorServices/Services/PowerShellContext/Extensions/EditorCommand.cs
@@ -5,7 +5,7 @@
 
 using System.Management.Automation;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Services.PowerShellContext
+namespace Microsoft.PowerShell.EditorServices.Services.PowerShellContext
 {
     /// <summary>
     /// Provides details about a command that has been registered
diff --git a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Extensions/EditorCommandAttribute.cs b/src/PowerShellEditorServices/Services/PowerShellContext/Extensions/EditorCommandAttribute.cs
similarity index 91%
rename from src/PowerShellEditorServices.Engine/Services/PowerShellContext/Extensions/EditorCommandAttribute.cs
rename to src/PowerShellEditorServices/Services/PowerShellContext/Extensions/EditorCommandAttribute.cs
index c43becca3..59aa71df3 100644
--- a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Extensions/EditorCommandAttribute.cs
+++ b/src/PowerShellEditorServices/Services/PowerShellContext/Extensions/EditorCommandAttribute.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Services.PowerShellContext
+namespace Microsoft.PowerShell.EditorServices.Services.PowerShellContext
 {
     /// <summary>
     /// Provides an attribute that can be used to target PowerShell
diff --git a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Extensions/EditorContext.cs b/src/PowerShellEditorServices/Services/PowerShellContext/Extensions/EditorContext.cs
similarity index 96%
rename from src/PowerShellEditorServices.Engine/Services/PowerShellContext/Extensions/EditorContext.cs
rename to src/PowerShellEditorServices/Services/PowerShellContext/Extensions/EditorContext.cs
index c2a1d0a95..144c7db53 100644
--- a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Extensions/EditorContext.cs
+++ b/src/PowerShellEditorServices/Services/PowerShellContext/Extensions/EditorContext.cs
@@ -6,9 +6,9 @@
 using System;
 using System.Linq;
 using System.Management.Automation.Language;
-using Microsoft.PowerShell.EditorServices.Engine.Services.TextDocument;
+using Microsoft.PowerShell.EditorServices.Services.TextDocument;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Services.PowerShellContext
+namespace Microsoft.PowerShell.EditorServices.Services.PowerShellContext
 {
     /// <summary>
     /// Provides context for the host editor at the time of creation.
diff --git a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Extensions/EditorObject.cs b/src/PowerShellEditorServices/Services/PowerShellContext/Extensions/EditorObject.cs
similarity index 98%
rename from src/PowerShellEditorServices.Engine/Services/PowerShellContext/Extensions/EditorObject.cs
rename to src/PowerShellEditorServices/Services/PowerShellContext/Extensions/EditorObject.cs
index 3522debb4..e873cbe0d 100644
--- a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Extensions/EditorObject.cs
+++ b/src/PowerShellEditorServices/Services/PowerShellContext/Extensions/EditorObject.cs
@@ -6,7 +6,7 @@
 using System;
 using System.Reflection;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Services.PowerShellContext
+namespace Microsoft.PowerShell.EditorServices.Services.PowerShellContext
 {
     /// <summary>
     /// Provides the entry point of the extensibility API, inserted into
diff --git a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Extensions/EditorRequests.cs b/src/PowerShellEditorServices/Services/PowerShellContext/Extensions/EditorRequests.cs
similarity index 95%
rename from src/PowerShellEditorServices.Engine/Services/PowerShellContext/Extensions/EditorRequests.cs
rename to src/PowerShellEditorServices/Services/PowerShellContext/Extensions/EditorRequests.cs
index a4c293ced..bd639f249 100644
--- a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Extensions/EditorRequests.cs
+++ b/src/PowerShellEditorServices/Services/PowerShellContext/Extensions/EditorRequests.cs
@@ -5,7 +5,7 @@
 
 using OmniSharp.Extensions.LanguageServer.Protocol.Models;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Services.PowerShellContext
+namespace Microsoft.PowerShell.EditorServices.Services.PowerShellContext
 {
     public class ExtensionCommandAddedNotification
     {
diff --git a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Extensions/EditorWindow.cs b/src/PowerShellEditorServices/Services/PowerShellContext/Extensions/EditorWindow.cs
similarity index 97%
rename from src/PowerShellEditorServices.Engine/Services/PowerShellContext/Extensions/EditorWindow.cs
rename to src/PowerShellEditorServices/Services/PowerShellContext/Extensions/EditorWindow.cs
index d69649510..f21a574ea 100644
--- a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Extensions/EditorWindow.cs
+++ b/src/PowerShellEditorServices/Services/PowerShellContext/Extensions/EditorWindow.cs
@@ -3,7 +3,7 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Services.PowerShellContext
+namespace Microsoft.PowerShell.EditorServices.Services.PowerShellContext
 {
     /// <summary>
     /// Provides a PowerShell-facing API which allows scripts to
diff --git a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Extensions/EditorWorkspace.cs b/src/PowerShellEditorServices/Services/PowerShellContext/Extensions/EditorWorkspace.cs
similarity index 96%
rename from src/PowerShellEditorServices.Engine/Services/PowerShellContext/Extensions/EditorWorkspace.cs
rename to src/PowerShellEditorServices/Services/PowerShellContext/Extensions/EditorWorkspace.cs
index 32670d74b..974d166e7 100644
--- a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Extensions/EditorWorkspace.cs
+++ b/src/PowerShellEditorServices/Services/PowerShellContext/Extensions/EditorWorkspace.cs
@@ -3,7 +3,7 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Services.PowerShellContext
+namespace Microsoft.PowerShell.EditorServices.Services.PowerShellContext
 {
     /// <summary>
     /// Provides a PowerShell-facing API which allows scripts to
diff --git a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Extensions/FileContext.cs b/src/PowerShellEditorServices/Services/PowerShellContext/Extensions/FileContext.cs
similarity index 98%
rename from src/PowerShellEditorServices.Engine/Services/PowerShellContext/Extensions/FileContext.cs
rename to src/PowerShellEditorServices/Services/PowerShellContext/Extensions/FileContext.cs
index 6ed9a64f2..43023de24 100644
--- a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Extensions/FileContext.cs
+++ b/src/PowerShellEditorServices/Services/PowerShellContext/Extensions/FileContext.cs
@@ -6,9 +6,9 @@
 using System;
 using System.IO;
 using System.Management.Automation.Language;
-using Microsoft.PowerShell.EditorServices.Engine.Services.TextDocument;
+using Microsoft.PowerShell.EditorServices.Services.TextDocument;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Services.PowerShellContext
+namespace Microsoft.PowerShell.EditorServices.Services.PowerShellContext
 {
     /// <summary>
     /// Provides context for a file that is open in the editor.
diff --git a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Extensions/IEditorOperations.cs b/src/PowerShellEditorServices/Services/PowerShellContext/Extensions/IEditorOperations.cs
similarity index 97%
rename from src/PowerShellEditorServices.Engine/Services/PowerShellContext/Extensions/IEditorOperations.cs
rename to src/PowerShellEditorServices/Services/PowerShellContext/Extensions/IEditorOperations.cs
index 2435930cd..15a167203 100644
--- a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Extensions/IEditorOperations.cs
+++ b/src/PowerShellEditorServices/Services/PowerShellContext/Extensions/IEditorOperations.cs
@@ -4,9 +4,9 @@
 //
 
 using System.Threading.Tasks;
-using Microsoft.PowerShell.EditorServices.Engine.Services.TextDocument;
+using Microsoft.PowerShell.EditorServices.Services.TextDocument;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Services.PowerShellContext
+namespace Microsoft.PowerShell.EditorServices.Services.PowerShellContext
 {
     /// <summary>
     /// Provides an interface that must be implemented by an editor
diff --git a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Handlers/EvaluateHandler.cs b/src/PowerShellEditorServices/Services/PowerShellContext/Handlers/EvaluateHandler.cs
similarity index 90%
rename from src/PowerShellEditorServices.Engine/Services/PowerShellContext/Handlers/EvaluateHandler.cs
rename to src/PowerShellEditorServices/Services/PowerShellContext/Handlers/EvaluateHandler.cs
index 04a8c01ab..f0579667c 100644
--- a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Handlers/EvaluateHandler.cs
+++ b/src/PowerShellEditorServices/Services/PowerShellContext/Handlers/EvaluateHandler.cs
@@ -6,9 +6,9 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
-using Microsoft.PowerShell.EditorServices.Engine.Services;
+using Microsoft.PowerShell.EditorServices.Services;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Handlers
+namespace Microsoft.PowerShell.EditorServices.Handlers
 {
     public class EvaluateHandler : IEvaluateHandler
     {
diff --git a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Handlers/ExpandAliasHandler.cs b/src/PowerShellEditorServices/Services/PowerShellContext/Handlers/ExpandAliasHandler.cs
similarity index 95%
rename from src/PowerShellEditorServices.Engine/Services/PowerShellContext/Handlers/ExpandAliasHandler.cs
rename to src/PowerShellEditorServices/Services/PowerShellContext/Handlers/ExpandAliasHandler.cs
index 1f9677c46..207b3c33a 100644
--- a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Handlers/ExpandAliasHandler.cs
+++ b/src/PowerShellEditorServices/Services/PowerShellContext/Handlers/ExpandAliasHandler.cs
@@ -8,11 +8,11 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
-using Microsoft.PowerShell.EditorServices.Engine.Services;
+using Microsoft.PowerShell.EditorServices.Services;
 using OmniSharp.Extensions.Embedded.MediatR;
 using OmniSharp.Extensions.JsonRpc;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Handlers
+namespace Microsoft.PowerShell.EditorServices.Handlers
 {
     [Serial, Method("powerShell/expandAlias")]
     public interface IExpandAliasHandler : IJsonRpcRequestHandler<ExpandAliasParams, ExpandAliasResult> { }
diff --git a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Handlers/GetCommandHandler.cs b/src/PowerShellEditorServices/Services/PowerShellContext/Handlers/GetCommandHandler.cs
similarity index 96%
rename from src/PowerShellEditorServices.Engine/Services/PowerShellContext/Handlers/GetCommandHandler.cs
rename to src/PowerShellEditorServices/Services/PowerShellContext/Handlers/GetCommandHandler.cs
index 0cffb060a..56c39f5b8 100644
--- a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Handlers/GetCommandHandler.cs
+++ b/src/PowerShellEditorServices/Services/PowerShellContext/Handlers/GetCommandHandler.cs
@@ -8,11 +8,11 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
-using Microsoft.PowerShell.EditorServices.Engine.Services;
+using Microsoft.PowerShell.EditorServices.Services;
 using OmniSharp.Extensions.Embedded.MediatR;
 using OmniSharp.Extensions.JsonRpc;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Handlers
+namespace Microsoft.PowerShell.EditorServices.Handlers
 {
     [Serial, Method("powerShell/getCommand")]
     public interface IGetCommandHandler : IJsonRpcRequestHandler<GetCommandParams, List<PSCommandMessage>> { }
diff --git a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Handlers/GetCommentHelpHandler.cs b/src/PowerShellEditorServices/Services/PowerShellContext/Handlers/GetCommentHelpHandler.cs
similarity index 95%
rename from src/PowerShellEditorServices.Engine/Services/PowerShellContext/Handlers/GetCommentHelpHandler.cs
rename to src/PowerShellEditorServices/Services/PowerShellContext/Handlers/GetCommentHelpHandler.cs
index e0f5289c7..1f79582a1 100644
--- a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Handlers/GetCommentHelpHandler.cs
+++ b/src/PowerShellEditorServices/Services/PowerShellContext/Handlers/GetCommentHelpHandler.cs
@@ -10,10 +10,10 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
-using Microsoft.PowerShell.EditorServices.Engine.Services;
-using Microsoft.PowerShell.EditorServices.Engine.Services.TextDocument;
+using Microsoft.PowerShell.EditorServices.Services;
+using Microsoft.PowerShell.EditorServices.Services.TextDocument;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Handlers
+namespace Microsoft.PowerShell.EditorServices.Handlers
 {
     public class GetCommentHelpHandler : IGetCommentHelpHandler
     {
diff --git a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Handlers/GetVersionHandler.cs b/src/PowerShellEditorServices/Services/PowerShellContext/Handlers/GetVersionHandler.cs
similarity index 96%
rename from src/PowerShellEditorServices.Engine/Services/PowerShellContext/Handlers/GetVersionHandler.cs
rename to src/PowerShellEditorServices/Services/PowerShellContext/Handlers/GetVersionHandler.cs
index 03c73b7d4..ad8fd62d1 100644
--- a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Handlers/GetVersionHandler.cs
+++ b/src/PowerShellEditorServices/Services/PowerShellContext/Handlers/GetVersionHandler.cs
@@ -9,7 +9,7 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.PowerShell.EditorServices.Utility;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Handlers
+namespace Microsoft.PowerShell.EditorServices.Handlers
 {
     public class GetVersionHandler : IGetVersionHandler
     {
diff --git a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Handlers/IEvaluateHandler.cs b/src/PowerShellEditorServices/Services/PowerShellContext/Handlers/IEvaluateHandler.cs
similarity index 96%
rename from src/PowerShellEditorServices.Engine/Services/PowerShellContext/Handlers/IEvaluateHandler.cs
rename to src/PowerShellEditorServices/Services/PowerShellContext/Handlers/IEvaluateHandler.cs
index 90a7e18ee..b2836af9a 100644
--- a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Handlers/IEvaluateHandler.cs
+++ b/src/PowerShellEditorServices/Services/PowerShellContext/Handlers/IEvaluateHandler.cs
@@ -6,7 +6,7 @@
 using OmniSharp.Extensions.Embedded.MediatR;
 using OmniSharp.Extensions.JsonRpc;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Handlers
+namespace Microsoft.PowerShell.EditorServices.Handlers
 {
     [Serial, Method("evaluate")]
     public interface IEvaluateHandler : IJsonRpcRequestHandler<EvaluateRequestArguments, EvaluateResponseBody> { }
diff --git a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Handlers/IGetCommentHelpHandler.cs b/src/PowerShellEditorServices/Services/PowerShellContext/Handlers/IGetCommentHelpHandler.cs
similarity index 92%
rename from src/PowerShellEditorServices.Engine/Services/PowerShellContext/Handlers/IGetCommentHelpHandler.cs
rename to src/PowerShellEditorServices/Services/PowerShellContext/Handlers/IGetCommentHelpHandler.cs
index 142d78e8f..599e13df5 100644
--- a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Handlers/IGetCommentHelpHandler.cs
+++ b/src/PowerShellEditorServices/Services/PowerShellContext/Handlers/IGetCommentHelpHandler.cs
@@ -7,7 +7,7 @@
 using OmniSharp.Extensions.JsonRpc;
 using OmniSharp.Extensions.LanguageServer.Protocol.Models;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Handlers
+namespace Microsoft.PowerShell.EditorServices.Handlers
 {
     [Serial, Method("powerShell/getCommentHelp")]
     public interface IGetCommentHelpHandler : IJsonRpcRequestHandler<CommentHelpRequestParams, CommentHelpRequestResult> { }
diff --git a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Handlers/IGetPSHostProcessesHandler.cs b/src/PowerShellEditorServices/Services/PowerShellContext/Handlers/IGetPSHostProcessesHandler.cs
similarity index 92%
rename from src/PowerShellEditorServices.Engine/Services/PowerShellContext/Handlers/IGetPSHostProcessesHandler.cs
rename to src/PowerShellEditorServices/Services/PowerShellContext/Handlers/IGetPSHostProcessesHandler.cs
index 61b59623e..88df2a429 100644
--- a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Handlers/IGetPSHostProcessesHandler.cs
+++ b/src/PowerShellEditorServices/Services/PowerShellContext/Handlers/IGetPSHostProcessesHandler.cs
@@ -6,7 +6,7 @@
 using OmniSharp.Extensions.Embedded.MediatR;
 using OmniSharp.Extensions.JsonRpc;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Handlers
+namespace Microsoft.PowerShell.EditorServices.Handlers
 {
     [Serial, Method("powerShell/getPSHostProcesses")]
     public interface IGetPSHostProcessesHandler : IJsonRpcRequestHandler<GetPSHostProcesssesParams, PSHostProcessResponse[]> { }
diff --git a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Handlers/IGetRunspaceHandler.cs b/src/PowerShellEditorServices/Services/PowerShellContext/Handlers/IGetRunspaceHandler.cs
similarity index 91%
rename from src/PowerShellEditorServices.Engine/Services/PowerShellContext/Handlers/IGetRunspaceHandler.cs
rename to src/PowerShellEditorServices/Services/PowerShellContext/Handlers/IGetRunspaceHandler.cs
index 039f60563..77237dee1 100644
--- a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Handlers/IGetRunspaceHandler.cs
+++ b/src/PowerShellEditorServices/Services/PowerShellContext/Handlers/IGetRunspaceHandler.cs
@@ -6,7 +6,7 @@
 using OmniSharp.Extensions.Embedded.MediatR;
 using OmniSharp.Extensions.JsonRpc;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Handlers
+namespace Microsoft.PowerShell.EditorServices.Handlers
 {
     [Serial, Method("powerShell/getRunspace")]
     public interface IGetRunspaceHandler : IJsonRpcRequestHandler<GetRunspaceParams, RunspaceResponse[]> { }
diff --git a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Handlers/IGetVersionHandler.cs b/src/PowerShellEditorServices/Services/PowerShellContext/Handlers/IGetVersionHandler.cs
similarity index 91%
rename from src/PowerShellEditorServices.Engine/Services/PowerShellContext/Handlers/IGetVersionHandler.cs
rename to src/PowerShellEditorServices/Services/PowerShellContext/Handlers/IGetVersionHandler.cs
index afaa4f4ab..1810435a2 100644
--- a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Handlers/IGetVersionHandler.cs
+++ b/src/PowerShellEditorServices/Services/PowerShellContext/Handlers/IGetVersionHandler.cs
@@ -3,11 +3,11 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-using Microsoft.PowerShell.EditorServices.Engine.Services.PowerShellContext;
+using Microsoft.PowerShell.EditorServices.Services.PowerShellContext;
 using OmniSharp.Extensions.Embedded.MediatR;
 using OmniSharp.Extensions.JsonRpc;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Handlers
+namespace Microsoft.PowerShell.EditorServices.Handlers
 {
     [Serial, Method("powerShell/getVersion")]
     public interface IGetVersionHandler : IJsonRpcRequestHandler<GetVersionParams, PowerShellVersion> { }
diff --git a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Handlers/IInvokeExtensionCommandHandler.cs b/src/PowerShellEditorServices/Services/PowerShellContext/Handlers/IInvokeExtensionCommandHandler.cs
similarity index 93%
rename from src/PowerShellEditorServices.Engine/Services/PowerShellContext/Handlers/IInvokeExtensionCommandHandler.cs
rename to src/PowerShellEditorServices/Services/PowerShellContext/Handlers/IInvokeExtensionCommandHandler.cs
index 465bf1a5b..42e8b72ed 100644
--- a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Handlers/IInvokeExtensionCommandHandler.cs
+++ b/src/PowerShellEditorServices/Services/PowerShellContext/Handlers/IInvokeExtensionCommandHandler.cs
@@ -7,7 +7,7 @@
 using OmniSharp.Extensions.JsonRpc;
 using OmniSharp.Extensions.LanguageServer.Protocol.Models;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Handlers
+namespace Microsoft.PowerShell.EditorServices.Handlers
 {
     [Serial, Method("powerShell/invokeExtensionCommand")]
     public interface IInvokeExtensionCommandHandler : IJsonRpcNotificationHandler<InvokeExtensionCommandParams> { }
diff --git a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Handlers/ITemplateHandlers.cs b/src/PowerShellEditorServices/Services/PowerShellContext/Handlers/ITemplateHandlers.cs
similarity index 97%
rename from src/PowerShellEditorServices.Engine/Services/PowerShellContext/Handlers/ITemplateHandlers.cs
rename to src/PowerShellEditorServices/Services/PowerShellContext/Handlers/ITemplateHandlers.cs
index 13f2cf4e3..798f0c9fe 100644
--- a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Handlers/ITemplateHandlers.cs
+++ b/src/PowerShellEditorServices/Services/PowerShellContext/Handlers/ITemplateHandlers.cs
@@ -6,7 +6,7 @@
 using OmniSharp.Extensions.Embedded.MediatR;
 using OmniSharp.Extensions.JsonRpc;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Handlers
+namespace Microsoft.PowerShell.EditorServices.Handlers
 {
     [Serial, Method("powerShell/getProjectTemplates")]
     public interface IGetProjectTemplatesHandler : IJsonRpcRequestHandler<GetProjectTemplatesRequest, GetProjectTemplatesResponse> { }
diff --git a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Handlers/InvokeExtensionCommandHandler.cs b/src/PowerShellEditorServices/Services/PowerShellContext/Handlers/InvokeExtensionCommandHandler.cs
similarity index 88%
rename from src/PowerShellEditorServices.Engine/Services/PowerShellContext/Handlers/InvokeExtensionCommandHandler.cs
rename to src/PowerShellEditorServices/Services/PowerShellContext/Handlers/InvokeExtensionCommandHandler.cs
index 51d0b2e6a..355a3d3db 100644
--- a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Handlers/InvokeExtensionCommandHandler.cs
+++ b/src/PowerShellEditorServices/Services/PowerShellContext/Handlers/InvokeExtensionCommandHandler.cs
@@ -6,11 +6,11 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
-using Microsoft.PowerShell.EditorServices.Engine.Services;
-using Microsoft.PowerShell.EditorServices.Engine.Services.PowerShellContext;
+using Microsoft.PowerShell.EditorServices.Services;
+using Microsoft.PowerShell.EditorServices.Services.PowerShellContext;
 using OmniSharp.Extensions.Embedded.MediatR;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Handlers
+namespace Microsoft.PowerShell.EditorServices.Handlers
 {
     internal class InvokeExtensionCommandHandler : IInvokeExtensionCommandHandler
     {
diff --git a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Handlers/PSHostProcessAndRunspaceHandlers.cs b/src/PowerShellEditorServices/Services/PowerShellContext/Handlers/PSHostProcessAndRunspaceHandlers.cs
similarity index 97%
rename from src/PowerShellEditorServices.Engine/Services/PowerShellContext/Handlers/PSHostProcessAndRunspaceHandlers.cs
rename to src/PowerShellEditorServices/Services/PowerShellContext/Handlers/PSHostProcessAndRunspaceHandlers.cs
index 5337ffb6f..9f82983ad 100644
--- a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Handlers/PSHostProcessAndRunspaceHandlers.cs
+++ b/src/PowerShellEditorServices/Services/PowerShellContext/Handlers/PSHostProcessAndRunspaceHandlers.cs
@@ -9,9 +9,9 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
-using Microsoft.PowerShell.EditorServices.Engine.Services;
+using Microsoft.PowerShell.EditorServices.Services;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Handlers
+namespace Microsoft.PowerShell.EditorServices.Handlers
 {
     using System.Management.Automation;
 
diff --git a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Handlers/ShowHelpHandler.cs b/src/PowerShellEditorServices/Services/PowerShellContext/Handlers/ShowHelpHandler.cs
similarity index 96%
rename from src/PowerShellEditorServices.Engine/Services/PowerShellContext/Handlers/ShowHelpHandler.cs
rename to src/PowerShellEditorServices/Services/PowerShellContext/Handlers/ShowHelpHandler.cs
index 348c1893b..897d6f4ae 100644
--- a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Handlers/ShowHelpHandler.cs
+++ b/src/PowerShellEditorServices/Services/PowerShellContext/Handlers/ShowHelpHandler.cs
@@ -7,11 +7,11 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
-using Microsoft.PowerShell.EditorServices.Engine.Services;
+using Microsoft.PowerShell.EditorServices.Services;
 using OmniSharp.Extensions.Embedded.MediatR;
 using OmniSharp.Extensions.JsonRpc;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Handlers
+namespace Microsoft.PowerShell.EditorServices.Handlers
 {
     [Serial, Method("powerShell/showHelp")]
     public interface IShowHelpHandler : IJsonRpcNotificationHandler<ShowHelpParams> { }
diff --git a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Handlers/TemplateHandlers.cs b/src/PowerShellEditorServices/Services/PowerShellContext/Handlers/TemplateHandlers.cs
similarity index 92%
rename from src/PowerShellEditorServices.Engine/Services/PowerShellContext/Handlers/TemplateHandlers.cs
rename to src/PowerShellEditorServices/Services/PowerShellContext/Handlers/TemplateHandlers.cs
index 59e4e16cb..210ff3ca3 100644
--- a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Handlers/TemplateHandlers.cs
+++ b/src/PowerShellEditorServices/Services/PowerShellContext/Handlers/TemplateHandlers.cs
@@ -7,10 +7,10 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
-using Microsoft.PowerShell.EditorServices.Engine.Logging;
-using Microsoft.PowerShell.EditorServices.Engine.Services;
+using Microsoft.PowerShell.EditorServices.Logging;
+using Microsoft.PowerShell.EditorServices.Services;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Handlers
+namespace Microsoft.PowerShell.EditorServices.Handlers
 {
     public class TemplateHandlers : IGetProjectTemplatesHandler, INewProjectFromTemplateHandler
     {
@@ -41,7 +41,7 @@ await _templateService.GetAvailableTemplatesAsync(
                     Templates = availableTemplates
                 };
             }
-            
+
             return new GetProjectTemplatesResponse
             {
                 NeedsModuleInstall = true,
diff --git a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/PowerShellContextService.cs b/src/PowerShellEditorServices/Services/PowerShellContext/PowerShellContextService.cs
similarity index 99%
rename from src/PowerShellEditorServices.Engine/Services/PowerShellContext/PowerShellContextService.cs
rename to src/PowerShellEditorServices/Services/PowerShellContext/PowerShellContextService.cs
index 3afac2843..c0effd3be 100644
--- a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/PowerShellContextService.cs
+++ b/src/PowerShellEditorServices/Services/PowerShellContext/PowerShellContextService.cs
@@ -19,13 +19,13 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.PowerShell.EditorServices.Utility;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Services
+namespace Microsoft.PowerShell.EditorServices.Services
 {
     using System.Management.Automation;
-    using Microsoft.PowerShell.EditorServices.Engine.Handlers;
-    using Microsoft.PowerShell.EditorServices.Engine.Hosting;
-    using Microsoft.PowerShell.EditorServices.Engine.Logging;
-    using Microsoft.PowerShell.EditorServices.Engine.Services.PowerShellContext;
+    using Microsoft.PowerShell.EditorServices.Handlers;
+    using Microsoft.PowerShell.EditorServices.Hosting;
+    using Microsoft.PowerShell.EditorServices.Logging;
+    using Microsoft.PowerShell.EditorServices.Services.PowerShellContext;
 
     /// <summary>
     /// Manages the lifetime and usage of a PowerShell session.
diff --git a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/RemoteFileManagerService.cs b/src/PowerShellEditorServices/Services/PowerShellContext/RemoteFileManagerService.cs
similarity index 99%
rename from src/PowerShellEditorServices.Engine/Services/PowerShellContext/RemoteFileManagerService.cs
rename to src/PowerShellEditorServices/Services/PowerShellContext/RemoteFileManagerService.cs
index cc32755cc..cca85a199 100644
--- a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/RemoteFileManagerService.cs
+++ b/src/PowerShellEditorServices/Services/PowerShellContext/RemoteFileManagerService.cs
@@ -4,8 +4,8 @@
 //
 
 using Microsoft.Extensions.Logging;
-using Microsoft.PowerShell.EditorServices.Engine.Logging;
-using Microsoft.PowerShell.EditorServices.Engine.Services.PowerShellContext;
+using Microsoft.PowerShell.EditorServices.Logging;
+using Microsoft.PowerShell.EditorServices.Services.PowerShellContext;
 using Microsoft.PowerShell.EditorServices.Utility;
 using System;
 using System.Collections.Generic;
@@ -17,7 +17,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Services
+namespace Microsoft.PowerShell.EditorServices.Services
 {
     /// <summary>
     /// Manages files that are accessed from a remote PowerShell session.
diff --git a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Session/Capabilities/DscBreakpointCapability.cs b/src/PowerShellEditorServices/Services/PowerShellContext/Session/Capabilities/DscBreakpointCapability.cs
similarity index 96%
rename from src/PowerShellEditorServices.Engine/Services/PowerShellContext/Session/Capabilities/DscBreakpointCapability.cs
rename to src/PowerShellEditorServices/Services/PowerShellContext/Session/Capabilities/DscBreakpointCapability.cs
index 76a5c4d80..64e459ecb 100644
--- a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Session/Capabilities/DscBreakpointCapability.cs
+++ b/src/PowerShellEditorServices/Services/PowerShellContext/Session/Capabilities/DscBreakpointCapability.cs
@@ -6,11 +6,11 @@
 using System.Linq;
 using System.Threading.Tasks;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Services.PowerShellContext
+namespace Microsoft.PowerShell.EditorServices.Services.PowerShellContext
 {
     using Microsoft.Extensions.Logging;
-    using Microsoft.PowerShell.EditorServices.Engine.Logging;
-    using Microsoft.PowerShell.EditorServices.Engine.Services.DebugAdapter;
+    using Microsoft.PowerShell.EditorServices.Logging;
+    using Microsoft.PowerShell.EditorServices.Services.DebugAdapter;
     using Microsoft.PowerShell.EditorServices.Utility;
     using System;
     using System.Collections.Generic;
diff --git a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Session/ExecutionOptions.cs b/src/PowerShellEditorServices/Services/PowerShellContext/Session/ExecutionOptions.cs
similarity index 97%
rename from src/PowerShellEditorServices.Engine/Services/PowerShellContext/Session/ExecutionOptions.cs
rename to src/PowerShellEditorServices/Services/PowerShellContext/Session/ExecutionOptions.cs
index fa2fd0f1e..fba9736e0 100644
--- a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Session/ExecutionOptions.cs
+++ b/src/PowerShellEditorServices/Services/PowerShellContext/Session/ExecutionOptions.cs
@@ -3,7 +3,7 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Services.PowerShellContext
+namespace Microsoft.PowerShell.EditorServices.Services.PowerShellContext
 {
     /// <summary>
     /// Defines options for the execution of a command.
diff --git a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Session/ExecutionStatus.cs b/src/PowerShellEditorServices/Services/PowerShellContext/Session/ExecutionStatus.cs
similarity index 92%
rename from src/PowerShellEditorServices.Engine/Services/PowerShellContext/Session/ExecutionStatus.cs
rename to src/PowerShellEditorServices/Services/PowerShellContext/Session/ExecutionStatus.cs
index daf6e499b..66caef00e 100644
--- a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Session/ExecutionStatus.cs
+++ b/src/PowerShellEditorServices/Services/PowerShellContext/Session/ExecutionStatus.cs
@@ -3,7 +3,7 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Services.PowerShellContext
+namespace Microsoft.PowerShell.EditorServices.Services.PowerShellContext
 {
     /// <summary>
     /// Enumerates the possible execution results that can occur after
diff --git a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Session/ExecutionStatusChangedEventArgs.cs b/src/PowerShellEditorServices/Services/PowerShellContext/Session/ExecutionStatusChangedEventArgs.cs
similarity index 93%
rename from src/PowerShellEditorServices.Engine/Services/PowerShellContext/Session/ExecutionStatusChangedEventArgs.cs
rename to src/PowerShellEditorServices/Services/PowerShellContext/Session/ExecutionStatusChangedEventArgs.cs
index ffb4fb5de..f9abb1cbb 100644
--- a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Session/ExecutionStatusChangedEventArgs.cs
+++ b/src/PowerShellEditorServices/Services/PowerShellContext/Session/ExecutionStatusChangedEventArgs.cs
@@ -3,10 +3,10 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Services.PowerShellContext
+namespace Microsoft.PowerShell.EditorServices.Services.PowerShellContext
 {
     /// <summary>
-    /// Contains details about an executed 
+    /// Contains details about an executed
     /// </summary>
     public class ExecutionStatusChangedEventArgs
     {
diff --git a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Session/ExecutionTarget.cs b/src/PowerShellEditorServices/Services/PowerShellContext/Session/ExecutionTarget.cs
similarity index 91%
rename from src/PowerShellEditorServices.Engine/Services/PowerShellContext/Session/ExecutionTarget.cs
rename to src/PowerShellEditorServices/Services/PowerShellContext/Session/ExecutionTarget.cs
index 79c8a860c..19b365f76 100644
--- a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Session/ExecutionTarget.cs
+++ b/src/PowerShellEditorServices/Services/PowerShellContext/Session/ExecutionTarget.cs
@@ -3,7 +3,7 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Services.PowerShellContext
+namespace Microsoft.PowerShell.EditorServices.Services.PowerShellContext
 {
     /// <summary>
     /// Represents the different API's available for executing commands.
diff --git a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Session/Host/EditorServicesPSHost.cs b/src/PowerShellEditorServices/Services/PowerShellContext/Session/Host/EditorServicesPSHost.cs
similarity index 98%
rename from src/PowerShellEditorServices.Engine/Services/PowerShellContext/Session/Host/EditorServicesPSHost.cs
rename to src/PowerShellEditorServices/Services/PowerShellContext/Session/Host/EditorServicesPSHost.cs
index 43ab96e41..39604452b 100644
--- a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Session/Host/EditorServicesPSHost.cs
+++ b/src/PowerShellEditorServices/Services/PowerShellContext/Session/Host/EditorServicesPSHost.cs
@@ -4,13 +4,13 @@
 //
 
 using Microsoft.Extensions.Logging;
-using Microsoft.PowerShell.EditorServices.Engine.Hosting;
+using Microsoft.PowerShell.EditorServices.Hosting;
 using System;
 using System.Management.Automation;
 using System.Management.Automation.Host;
 using System.Management.Automation.Runspaces;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Services.PowerShellContext
+namespace Microsoft.PowerShell.EditorServices.Services.PowerShellContext
 {
     /// <summary>
     /// Provides an implementation of the PSHost class for the
diff --git a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Session/Host/EditorServicesPSHostUserInterface.cs b/src/PowerShellEditorServices/Services/PowerShellContext/Session/Host/EditorServicesPSHostUserInterface.cs
similarity index 99%
rename from src/PowerShellEditorServices.Engine/Services/PowerShellContext/Session/Host/EditorServicesPSHostUserInterface.cs
rename to src/PowerShellEditorServices/Services/PowerShellContext/Session/Host/EditorServicesPSHostUserInterface.cs
index 8d4007725..685f812a8 100644
--- a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Session/Host/EditorServicesPSHostUserInterface.cs
+++ b/src/PowerShellEditorServices/Services/PowerShellContext/Session/Host/EditorServicesPSHostUserInterface.cs
@@ -15,9 +15,9 @@
 using System.Threading;
 using System.Globalization;
 using Microsoft.Extensions.Logging;
-using Microsoft.PowerShell.EditorServices.Engine.Logging;
+using Microsoft.PowerShell.EditorServices.Logging;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Services.PowerShellContext
+namespace Microsoft.PowerShell.EditorServices.Services.PowerShellContext
 {
     /// <summary>
     /// Provides an implementation of the PSHostUserInterface class
diff --git a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Session/Host/IHostInput.cs b/src/PowerShellEditorServices/Services/PowerShellContext/Session/Host/IHostInput.cs
similarity index 89%
rename from src/PowerShellEditorServices.Engine/Services/PowerShellContext/Session/Host/IHostInput.cs
rename to src/PowerShellEditorServices/Services/PowerShellContext/Session/Host/IHostInput.cs
index d22da8cf9..cdce37129 100644
--- a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Session/Host/IHostInput.cs
+++ b/src/PowerShellEditorServices/Services/PowerShellContext/Session/Host/IHostInput.cs
@@ -3,7 +3,7 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Services.PowerShellContext
+namespace Microsoft.PowerShell.EditorServices.Services.PowerShellContext
 {
     /// <summary>
     /// Provides methods for integrating with the host's input system.
diff --git a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Session/Host/IHostOutput.cs b/src/PowerShellEditorServices/Services/PowerShellContext/Session/Host/IHostOutput.cs
similarity index 98%
rename from src/PowerShellEditorServices.Engine/Services/PowerShellContext/Session/Host/IHostOutput.cs
rename to src/PowerShellEditorServices/Services/PowerShellContext/Session/Host/IHostOutput.cs
index 53c72b573..9b5565f37 100644
--- a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Session/Host/IHostOutput.cs
+++ b/src/PowerShellEditorServices/Services/PowerShellContext/Session/Host/IHostOutput.cs
@@ -5,7 +5,7 @@
 
 using System;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Services.PowerShellContext
+namespace Microsoft.PowerShell.EditorServices.Services.PowerShellContext
 {
     /// <summary>
     /// Provides a simplified interface for writing output to a
diff --git a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Session/Host/PromptEvents.cs b/src/PowerShellEditorServices/Services/PowerShellContext/Session/Host/PromptEvents.cs
similarity index 93%
rename from src/PowerShellEditorServices.Engine/Services/PowerShellContext/Session/Host/PromptEvents.cs
rename to src/PowerShellEditorServices/Services/PowerShellContext/Session/Host/PromptEvents.cs
index 99bfb6035..967830d9d 100644
--- a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Session/Host/PromptEvents.cs
+++ b/src/PowerShellEditorServices/Services/PowerShellContext/Session/Host/PromptEvents.cs
@@ -3,7 +3,7 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Services.PowerShellContext
+namespace Microsoft.PowerShell.EditorServices.Services.PowerShellContext
 {
     public class ShowChoicePromptRequest
     {
diff --git a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Session/Host/PromptHandlers.cs b/src/PowerShellEditorServices/Services/PowerShellContext/Session/Host/PromptHandlers.cs
similarity index 98%
rename from src/PowerShellEditorServices.Engine/Services/PowerShellContext/Session/Host/PromptHandlers.cs
rename to src/PowerShellEditorServices/Services/PowerShellContext/Session/Host/PromptHandlers.cs
index b433354fd..98d4905b5 100644
--- a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Session/Host/PromptHandlers.cs
+++ b/src/PowerShellEditorServices/Services/PowerShellContext/Session/Host/PromptHandlers.cs
@@ -10,7 +10,7 @@
 using Microsoft.Extensions.Logging;
 using OmniSharp.Extensions.LanguageServer.Protocol.Server;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Services.PowerShellContext
+namespace Microsoft.PowerShell.EditorServices.Services.PowerShellContext
 {
     internal class ProtocolChoicePromptHandler : ConsoleChoicePromptHandler
     {
diff --git a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Session/Host/ProtocolPSHostUserInterface.cs b/src/PowerShellEditorServices/Services/PowerShellContext/Session/Host/ProtocolPSHostUserInterface.cs
similarity index 97%
rename from src/PowerShellEditorServices.Engine/Services/PowerShellContext/Session/Host/ProtocolPSHostUserInterface.cs
rename to src/PowerShellEditorServices/Services/PowerShellContext/Session/Host/ProtocolPSHostUserInterface.cs
index d3e79f54c..6053245c2 100644
--- a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Session/Host/ProtocolPSHostUserInterface.cs
+++ b/src/PowerShellEditorServices/Services/PowerShellContext/Session/Host/ProtocolPSHostUserInterface.cs
@@ -9,7 +9,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Services.PowerShellContext
+namespace Microsoft.PowerShell.EditorServices.Services.PowerShellContext
 {
     internal class ProtocolPSHostUserInterface : EditorServicesPSHostUserInterface
     {
diff --git a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Session/Host/SimplePSHostRawUserInterface.cs b/src/PowerShellEditorServices/Services/PowerShellContext/Session/Host/SimplePSHostRawUserInterface.cs
similarity index 98%
rename from src/PowerShellEditorServices.Engine/Services/PowerShellContext/Session/Host/SimplePSHostRawUserInterface.cs
rename to src/PowerShellEditorServices/Services/PowerShellContext/Session/Host/SimplePSHostRawUserInterface.cs
index 4d13abd5f..701f48851 100644
--- a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Session/Host/SimplePSHostRawUserInterface.cs
+++ b/src/PowerShellEditorServices/Services/PowerShellContext/Session/Host/SimplePSHostRawUserInterface.cs
@@ -7,7 +7,7 @@
 using System.Management.Automation.Host;
 using Microsoft.Extensions.Logging;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Services.PowerShellContext
+namespace Microsoft.PowerShell.EditorServices.Services.PowerShellContext
 {
     /// <summary>
     /// Provides an simple implementation of the PSHostRawUserInterface class.
diff --git a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Session/Host/TerminalPSHostRawUserInterface.cs b/src/PowerShellEditorServices/Services/PowerShellContext/Session/Host/TerminalPSHostRawUserInterface.cs
similarity index 99%
rename from src/PowerShellEditorServices.Engine/Services/PowerShellContext/Session/Host/TerminalPSHostRawUserInterface.cs
rename to src/PowerShellEditorServices/Services/PowerShellContext/Session/Host/TerminalPSHostRawUserInterface.cs
index 02f11057c..c1a45fcb1 100644
--- a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Session/Host/TerminalPSHostRawUserInterface.cs
+++ b/src/PowerShellEditorServices/Services/PowerShellContext/Session/Host/TerminalPSHostRawUserInterface.cs
@@ -9,7 +9,7 @@
 using System.Management.Automation.Host;
 using System.Threading;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Services.PowerShellContext
+namespace Microsoft.PowerShell.EditorServices.Services.PowerShellContext
 {
     /// <summary>
     /// Provides an implementation of the PSHostRawUserInterface class
diff --git a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Session/Host/TerminalPSHostUserInterface.cs b/src/PowerShellEditorServices/Services/PowerShellContext/Session/Host/TerminalPSHostUserInterface.cs
similarity index 98%
rename from src/PowerShellEditorServices.Engine/Services/PowerShellContext/Session/Host/TerminalPSHostUserInterface.cs
rename to src/PowerShellEditorServices/Services/PowerShellContext/Session/Host/TerminalPSHostUserInterface.cs
index b57fcaec7..93e8173ad 100644
--- a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Session/Host/TerminalPSHostUserInterface.cs
+++ b/src/PowerShellEditorServices/Services/PowerShellContext/Session/Host/TerminalPSHostUserInterface.cs
@@ -9,7 +9,7 @@
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Services.PowerShellContext
+namespace Microsoft.PowerShell.EditorServices.Services.PowerShellContext
 {
     using System.Management.Automation;
 
diff --git a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Session/IPromptContext.cs b/src/PowerShellEditorServices/Services/PowerShellContext/Session/IPromptContext.cs
similarity index 96%
rename from src/PowerShellEditorServices.Engine/Services/PowerShellContext/Session/IPromptContext.cs
rename to src/PowerShellEditorServices/Services/PowerShellContext/Session/IPromptContext.cs
index d14611cee..2d1785670 100644
--- a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Session/IPromptContext.cs
+++ b/src/PowerShellEditorServices/Services/PowerShellContext/Session/IPromptContext.cs
@@ -6,7 +6,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Services.PowerShellContext
+namespace Microsoft.PowerShell.EditorServices.Services.PowerShellContext
 {
     /// <summary>
     /// Provides methods for interacting with implementations of ReadLine.
diff --git a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Session/IRunspaceCapability.cs b/src/PowerShellEditorServices/Services/PowerShellContext/Session/IRunspaceCapability.cs
similarity index 78%
rename from src/PowerShellEditorServices.Engine/Services/PowerShellContext/Session/IRunspaceCapability.cs
rename to src/PowerShellEditorServices/Services/PowerShellContext/Session/IRunspaceCapability.cs
index a79d15c6b..466d80e3b 100644
--- a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Session/IRunspaceCapability.cs
+++ b/src/PowerShellEditorServices/Services/PowerShellContext/Session/IRunspaceCapability.cs
@@ -3,7 +3,7 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Services.PowerShellContext
+namespace Microsoft.PowerShell.EditorServices.Services.PowerShellContext
 {
     internal interface IRunspaceCapability
     {
diff --git a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Session/IVersionSpecificOperations.cs b/src/PowerShellEditorServices/Services/PowerShellContext/Session/IVersionSpecificOperations.cs
similarity index 92%
rename from src/PowerShellEditorServices.Engine/Services/PowerShellContext/Session/IVersionSpecificOperations.cs
rename to src/PowerShellEditorServices/Services/PowerShellContext/Session/IVersionSpecificOperations.cs
index d02c65df5..2b9fb1f6b 100644
--- a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Session/IVersionSpecificOperations.cs
+++ b/src/PowerShellEditorServices/Services/PowerShellContext/Session/IVersionSpecificOperations.cs
@@ -8,7 +8,7 @@
 using System.Management.Automation.Host;
 using System.Management.Automation.Runspaces;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Services.PowerShellContext
+namespace Microsoft.PowerShell.EditorServices.Services.PowerShellContext
 {
     internal interface IVersionSpecificOperations
     {
diff --git a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Session/InvocationEventQueue.cs b/src/PowerShellEditorServices/Services/PowerShellContext/Session/InvocationEventQueue.cs
similarity index 99%
rename from src/PowerShellEditorServices.Engine/Services/PowerShellContext/Session/InvocationEventQueue.cs
rename to src/PowerShellEditorServices/Services/PowerShellContext/Session/InvocationEventQueue.cs
index 0c41bdc8b..b28f0e2d2 100644
--- a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Session/InvocationEventQueue.cs
+++ b/src/PowerShellEditorServices/Services/PowerShellContext/Session/InvocationEventQueue.cs
@@ -12,7 +12,7 @@
 using System.Threading;
 using Microsoft.PowerShell.EditorServices.Utility;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Services.PowerShellContext
+namespace Microsoft.PowerShell.EditorServices.Services.PowerShellContext
 {
     using System.Management.Automation;
 
diff --git a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Session/LegacyReadLineContext.cs b/src/PowerShellEditorServices/Services/PowerShellContext/Session/LegacyReadLineContext.cs
similarity index 95%
rename from src/PowerShellEditorServices.Engine/Services/PowerShellContext/Session/LegacyReadLineContext.cs
rename to src/PowerShellEditorServices/Services/PowerShellContext/Session/LegacyReadLineContext.cs
index 508ddb9c0..8f116a201 100644
--- a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Session/LegacyReadLineContext.cs
+++ b/src/PowerShellEditorServices/Services/PowerShellContext/Session/LegacyReadLineContext.cs
@@ -6,7 +6,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Services.PowerShellContext
+namespace Microsoft.PowerShell.EditorServices.Services.PowerShellContext
 {
     internal class LegacyReadLineContext : IPromptContext
     {
diff --git a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Session/OutputType.cs b/src/PowerShellEditorServices/Services/PowerShellContext/Session/OutputType.cs
similarity index 92%
rename from src/PowerShellEditorServices.Engine/Services/PowerShellContext/Session/OutputType.cs
rename to src/PowerShellEditorServices/Services/PowerShellContext/Session/OutputType.cs
index 384d60820..92b5ef540 100644
--- a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Session/OutputType.cs
+++ b/src/PowerShellEditorServices/Services/PowerShellContext/Session/OutputType.cs
@@ -3,7 +3,7 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Services.PowerShellContext
+namespace Microsoft.PowerShell.EditorServices.Services.PowerShellContext
 {
     /// <summary>
     /// Enumerates the types of output lines that will be sent
@@ -12,7 +12,7 @@ namespace Microsoft.PowerShell.EditorServices.Engine.Services.PowerShellContext
     public enum OutputType
     {
         /// <summary>
-        /// A normal output line, usually written with the or Write-Host or 
+        /// A normal output line, usually written with the or Write-Host or
         /// Write-Output cmdlets.
         /// </summary>
         Normal,
diff --git a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Session/OutputWrittenEventArgs.cs b/src/PowerShellEditorServices/Services/PowerShellContext/Session/OutputWrittenEventArgs.cs
similarity index 96%
rename from src/PowerShellEditorServices.Engine/Services/PowerShellContext/Session/OutputWrittenEventArgs.cs
rename to src/PowerShellEditorServices/Services/PowerShellContext/Session/OutputWrittenEventArgs.cs
index 264576ad6..284dc5dc5 100644
--- a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Session/OutputWrittenEventArgs.cs
+++ b/src/PowerShellEditorServices/Services/PowerShellContext/Session/OutputWrittenEventArgs.cs
@@ -5,7 +5,7 @@
 
 using System;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Services.PowerShellContext
+namespace Microsoft.PowerShell.EditorServices.Services.PowerShellContext
 {
     /// <summary>
     /// Provides details about output that has been written to the
diff --git a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Session/PSReadLinePromptContext.cs b/src/PowerShellEditorServices/Services/PowerShellContext/Session/PSReadLinePromptContext.cs
similarity index 98%
rename from src/PowerShellEditorServices.Engine/Services/PowerShellContext/Session/PSReadLinePromptContext.cs
rename to src/PowerShellEditorServices/Services/PowerShellContext/Session/PSReadLinePromptContext.cs
index ce3c427f8..26b3cc5a7 100644
--- a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Session/PSReadLinePromptContext.cs
+++ b/src/PowerShellEditorServices/Services/PowerShellContext/Session/PSReadLinePromptContext.cs
@@ -10,7 +10,7 @@
 using System;
 using System.Management.Automation.Runspaces;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Services.PowerShellContext
+namespace Microsoft.PowerShell.EditorServices.Services.PowerShellContext
 {
     using System.Management.Automation;
     using Microsoft.Extensions.Logging;
diff --git a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Session/PSReadLineProxy.cs b/src/PowerShellEditorServices/Services/PowerShellContext/Session/PSReadLineProxy.cs
similarity index 98%
rename from src/PowerShellEditorServices.Engine/Services/PowerShellContext/Session/PSReadLineProxy.cs
rename to src/PowerShellEditorServices/Services/PowerShellContext/Session/PSReadLineProxy.cs
index 548a0a2c6..c15f4c719 100644
--- a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Session/PSReadLineProxy.cs
+++ b/src/PowerShellEditorServices/Services/PowerShellContext/Session/PSReadLineProxy.cs
@@ -7,7 +7,7 @@
 using System.Reflection;
 using Microsoft.Extensions.Logging;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Services.PowerShellContext
+namespace Microsoft.PowerShell.EditorServices.Services.PowerShellContext
 {
     internal class PSReadLineProxy
     {
diff --git a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Session/PipelineExecutionRequest.cs b/src/PowerShellEditorServices/Services/PowerShellContext/Session/PipelineExecutionRequest.cs
similarity index 96%
rename from src/PowerShellEditorServices.Engine/Services/PowerShellContext/Session/PipelineExecutionRequest.cs
rename to src/PowerShellEditorServices/Services/PowerShellContext/Session/PipelineExecutionRequest.cs
index dc9bb8962..21af0280f 100644
--- a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Session/PipelineExecutionRequest.cs
+++ b/src/PowerShellEditorServices/Services/PowerShellContext/Session/PipelineExecutionRequest.cs
@@ -8,7 +8,7 @@
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Services.PowerShellContext
+namespace Microsoft.PowerShell.EditorServices.Services.PowerShellContext
 {
     internal interface IPipelineExecutionRequest
     {
diff --git a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Session/PowerShell5Operations.cs b/src/PowerShellEditorServices/Services/PowerShellContext/Session/PowerShell5Operations.cs
similarity index 97%
rename from src/PowerShellEditorServices.Engine/Services/PowerShellContext/Session/PowerShell5Operations.cs
rename to src/PowerShellEditorServices/Services/PowerShellContext/Session/PowerShell5Operations.cs
index e6764f65f..2e7fedcf8 100644
--- a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Session/PowerShell5Operations.cs
+++ b/src/PowerShellEditorServices/Services/PowerShellContext/Session/PowerShell5Operations.cs
@@ -9,7 +9,7 @@
 using System.Management.Automation.Host;
 using System.Management.Automation.Runspaces;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Services.PowerShellContext
+namespace Microsoft.PowerShell.EditorServices.Services.PowerShellContext
 {
     internal class PowerShell5Operations : IVersionSpecificOperations
     {
diff --git a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Session/PowerShellContextState.cs b/src/PowerShellEditorServices/Services/PowerShellContext/Session/PowerShellContextState.cs
similarity index 93%
rename from src/PowerShellEditorServices.Engine/Services/PowerShellContext/Session/PowerShellContextState.cs
rename to src/PowerShellEditorServices/Services/PowerShellContext/Session/PowerShellContextState.cs
index d5c46dcaa..c2742e270 100644
--- a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Session/PowerShellContextState.cs
+++ b/src/PowerShellEditorServices/Services/PowerShellContext/Session/PowerShellContextState.cs
@@ -3,7 +3,7 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Services.PowerShellContext
+namespace Microsoft.PowerShell.EditorServices.Services.PowerShellContext
 {
     /// <summary>
     /// Enumerates the possible states for a PowerShellContext.
diff --git a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Session/PowerShellExecutionResult.cs b/src/PowerShellEditorServices/Services/PowerShellContext/Session/PowerShellExecutionResult.cs
similarity index 92%
rename from src/PowerShellEditorServices.Engine/Services/PowerShellContext/Session/PowerShellExecutionResult.cs
rename to src/PowerShellEditorServices/Services/PowerShellContext/Session/PowerShellExecutionResult.cs
index f9261bbf9..1be771187 100644
--- a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Session/PowerShellExecutionResult.cs
+++ b/src/PowerShellEditorServices/Services/PowerShellContext/Session/PowerShellExecutionResult.cs
@@ -3,7 +3,7 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Services.PowerShellContext
+namespace Microsoft.PowerShell.EditorServices.Services.PowerShellContext
 {
     /// <summary>
     /// Enumerates the possible execution results that can occur after
diff --git a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Session/PowerShellVersionDetails.cs b/src/PowerShellEditorServices/Services/PowerShellContext/Session/PowerShellVersionDetails.cs
similarity index 98%
rename from src/PowerShellEditorServices.Engine/Services/PowerShellContext/Session/PowerShellVersionDetails.cs
rename to src/PowerShellEditorServices/Services/PowerShellContext/Session/PowerShellVersionDetails.cs
index 682c83228..6e1a1a32e 100644
--- a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Session/PowerShellVersionDetails.cs
+++ b/src/PowerShellEditorServices/Services/PowerShellContext/Session/PowerShellVersionDetails.cs
@@ -8,7 +8,7 @@
 using System.Collections;
 using System.Management.Automation.Runspaces;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Services.PowerShellContext
+namespace Microsoft.PowerShell.EditorServices.Services.PowerShellContext
 {
     /// <summary>
     /// Defines the possible enumeration values for the PowerShell process architecture.
diff --git a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Session/ProgressDetails.cs b/src/PowerShellEditorServices/Services/PowerShellContext/Session/ProgressDetails.cs
similarity index 91%
rename from src/PowerShellEditorServices.Engine/Services/PowerShellContext/Session/ProgressDetails.cs
rename to src/PowerShellEditorServices/Services/PowerShellContext/Session/ProgressDetails.cs
index f6afc5829..fc7fb2047 100644
--- a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Session/ProgressDetails.cs
+++ b/src/PowerShellEditorServices/Services/PowerShellContext/Session/ProgressDetails.cs
@@ -5,7 +5,7 @@
 
 using System.Management.Automation;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Services.PowerShellContext
+namespace Microsoft.PowerShell.EditorServices.Services.PowerShellContext
 {
     /// <summary>
     /// Provides details about the progress of a particular activity.
diff --git a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Session/PromptNest.cs b/src/PowerShellEditorServices/Services/PowerShellContext/Session/PromptNest.cs
similarity index 99%
rename from src/PowerShellEditorServices.Engine/Services/PowerShellContext/Session/PromptNest.cs
rename to src/PowerShellEditorServices/Services/PowerShellContext/Session/PromptNest.cs
index 7150d46f6..380c4bb81 100644
--- a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Session/PromptNest.cs
+++ b/src/PowerShellEditorServices/Services/PowerShellContext/Session/PromptNest.cs
@@ -8,7 +8,7 @@
 using System.Threading.Tasks;
 using Microsoft.PowerShell.EditorServices.Utility;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Services.PowerShellContext
+namespace Microsoft.PowerShell.EditorServices.Services.PowerShellContext
 {
     using System;
     using System.Management.Automation;
diff --git a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Session/PromptNestFrame.cs b/src/PowerShellEditorServices/Services/PowerShellContext/Session/PromptNestFrame.cs
similarity index 98%
rename from src/PowerShellEditorServices.Engine/Services/PowerShellContext/Session/PromptNestFrame.cs
rename to src/PowerShellEditorServices/Services/PowerShellContext/Session/PromptNestFrame.cs
index 05fbbe5fa..2d6a1a473 100644
--- a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Session/PromptNestFrame.cs
+++ b/src/PowerShellEditorServices/Services/PowerShellContext/Session/PromptNestFrame.cs
@@ -8,7 +8,7 @@
 using System.Threading.Tasks;
 using Microsoft.PowerShell.EditorServices.Utility;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Services.PowerShellContext
+namespace Microsoft.PowerShell.EditorServices.Services.PowerShellContext
 {
     using System.Management.Automation;
 
diff --git a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Session/PromptNestFrameType.cs b/src/PowerShellEditorServices/Services/PowerShellContext/Session/PromptNestFrameType.cs
similarity index 80%
rename from src/PowerShellEditorServices.Engine/Services/PowerShellContext/Session/PromptNestFrameType.cs
rename to src/PowerShellEditorServices/Services/PowerShellContext/Session/PromptNestFrameType.cs
index 4f360edab..ec4d13977 100644
--- a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Session/PromptNestFrameType.cs
+++ b/src/PowerShellEditorServices/Services/PowerShellContext/Session/PromptNestFrameType.cs
@@ -5,7 +5,7 @@
 
 using System;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Services.PowerShellContext
+namespace Microsoft.PowerShell.EditorServices.Services.PowerShellContext
 {
     [Flags]
     internal enum PromptNestFrameType
diff --git a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Session/RunspaceChangedEventArgs.cs b/src/PowerShellEditorServices/Services/PowerShellContext/Session/RunspaceChangedEventArgs.cs
similarity index 96%
rename from src/PowerShellEditorServices.Engine/Services/PowerShellContext/Session/RunspaceChangedEventArgs.cs
rename to src/PowerShellEditorServices/Services/PowerShellContext/Session/RunspaceChangedEventArgs.cs
index f1e558c89..77512c9c1 100644
--- a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Session/RunspaceChangedEventArgs.cs
+++ b/src/PowerShellEditorServices/Services/PowerShellContext/Session/RunspaceChangedEventArgs.cs
@@ -5,7 +5,7 @@
 
 using Microsoft.PowerShell.EditorServices.Utility;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Services.PowerShellContext
+namespace Microsoft.PowerShell.EditorServices.Services.PowerShellContext
 {
     /// <summary>
     /// Defines the set of actions that will cause the runspace to be changed.
diff --git a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Session/RunspaceDetails.cs b/src/PowerShellEditorServices/Services/PowerShellContext/Session/RunspaceDetails.cs
similarity index 99%
rename from src/PowerShellEditorServices.Engine/Services/PowerShellContext/Session/RunspaceDetails.cs
rename to src/PowerShellEditorServices/Services/PowerShellContext/Session/RunspaceDetails.cs
index 94dfee7a1..54f38cf34 100644
--- a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Session/RunspaceDetails.cs
+++ b/src/PowerShellEditorServices/Services/PowerShellContext/Session/RunspaceDetails.cs
@@ -10,7 +10,7 @@
 using Microsoft.Extensions.Logging;
 using Microsoft.PowerShell.EditorServices.Utility;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Services.PowerShellContext
+namespace Microsoft.PowerShell.EditorServices.Services.PowerShellContext
 {
     /// <summary>
     /// Specifies the possible types of a runspace.
diff --git a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Session/RunspaceHandle.cs b/src/PowerShellEditorServices/Services/PowerShellContext/Session/RunspaceHandle.cs
similarity index 95%
rename from src/PowerShellEditorServices.Engine/Services/PowerShellContext/Session/RunspaceHandle.cs
rename to src/PowerShellEditorServices/Services/PowerShellContext/Session/RunspaceHandle.cs
index 70b643b0c..650cce9d2 100644
--- a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Session/RunspaceHandle.cs
+++ b/src/PowerShellEditorServices/Services/PowerShellContext/Session/RunspaceHandle.cs
@@ -7,7 +7,7 @@
 using System.Management.Automation.Host;
 using System.Management.Automation.Runspaces;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Services.PowerShellContext
+namespace Microsoft.PowerShell.EditorServices.Services.PowerShellContext
 {
     /// <summary>
     /// Provides a handle to the runspace that is managed by
diff --git a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Session/SessionDetails.cs b/src/PowerShellEditorServices/Services/PowerShellContext/Session/SessionDetails.cs
similarity index 96%
rename from src/PowerShellEditorServices.Engine/Services/PowerShellContext/Session/SessionDetails.cs
rename to src/PowerShellEditorServices/Services/PowerShellContext/Session/SessionDetails.cs
index 8da235340..d30722d9f 100644
--- a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Session/SessionDetails.cs
+++ b/src/PowerShellEditorServices/Services/PowerShellContext/Session/SessionDetails.cs
@@ -8,7 +8,7 @@
 using System.Collections;
 using Microsoft.PowerShell.EditorServices.Utility;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Services.PowerShellContext
+namespace Microsoft.PowerShell.EditorServices.Services.PowerShellContext
 {
     /// <summary>
     /// Provides details about the current PowerShell session.
diff --git a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Session/SessionStateChangedEventArgs.cs b/src/PowerShellEditorServices/Services/PowerShellContext/Session/SessionStateChangedEventArgs.cs
similarity index 95%
rename from src/PowerShellEditorServices.Engine/Services/PowerShellContext/Session/SessionStateChangedEventArgs.cs
rename to src/PowerShellEditorServices/Services/PowerShellContext/Session/SessionStateChangedEventArgs.cs
index 9cbcf7765..70c40a7f2 100644
--- a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Session/SessionStateChangedEventArgs.cs
+++ b/src/PowerShellEditorServices/Services/PowerShellContext/Session/SessionStateChangedEventArgs.cs
@@ -5,7 +5,7 @@
 
 using System;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Services.PowerShellContext
+namespace Microsoft.PowerShell.EditorServices.Services.PowerShellContext
 {
     /// <summary>
     /// Provides details about a change in state of a PowerShellContext.
diff --git a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Session/ThreadController.cs b/src/PowerShellEditorServices/Services/PowerShellContext/Session/ThreadController.cs
similarity index 98%
rename from src/PowerShellEditorServices.Engine/Services/PowerShellContext/Session/ThreadController.cs
rename to src/PowerShellEditorServices/Services/PowerShellContext/Session/ThreadController.cs
index fead192b6..4066d5117 100644
--- a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Session/ThreadController.cs
+++ b/src/PowerShellEditorServices/Services/PowerShellContext/Session/ThreadController.cs
@@ -10,7 +10,7 @@
 using System.Threading.Tasks;
 using Microsoft.PowerShell.EditorServices.Utility;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Services.PowerShellContext
+namespace Microsoft.PowerShell.EditorServices.Services.PowerShellContext
 {
     /// <summary>
     /// Provides the ability to route PowerShell command invocations to a specific thread.
diff --git a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/TemplateService.cs b/src/PowerShellEditorServices/Services/PowerShellContext/TemplateService.cs
similarity index 97%
rename from src/PowerShellEditorServices.Engine/Services/PowerShellContext/TemplateService.cs
rename to src/PowerShellEditorServices/Services/PowerShellContext/TemplateService.cs
index fff0b60ba..ed0846481 100644
--- a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/TemplateService.cs
+++ b/src/PowerShellEditorServices/Services/PowerShellContext/TemplateService.cs
@@ -4,15 +4,15 @@
 //
 
 using Microsoft.Extensions.Logging;
-using Microsoft.PowerShell.EditorServices.Engine.Handlers;
-using Microsoft.PowerShell.EditorServices.Engine.Services.PowerShellContext;
+using Microsoft.PowerShell.EditorServices.Handlers;
+using Microsoft.PowerShell.EditorServices.Services.PowerShellContext;
 using Microsoft.PowerShell.EditorServices.Utility;
 using System;
 using System.Linq;
 using System.Management.Automation;
 using System.Threading.Tasks;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Services
+namespace Microsoft.PowerShell.EditorServices.Services
 {
     /// <summary>
     /// Provides a service for listing PowerShell project templates and creating
diff --git a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Utilities/CommandHelpers.cs b/src/PowerShellEditorServices/Services/PowerShellContext/Utilities/CommandHelpers.cs
similarity index 98%
rename from src/PowerShellEditorServices.Engine/Services/PowerShellContext/Utilities/CommandHelpers.cs
rename to src/PowerShellEditorServices/Services/PowerShellContext/Utilities/CommandHelpers.cs
index 4682d0dd4..ced8732f7 100644
--- a/src/PowerShellEditorServices.Engine/Services/PowerShellContext/Utilities/CommandHelpers.cs
+++ b/src/PowerShellEditorServices/Services/PowerShellContext/Utilities/CommandHelpers.cs
@@ -9,7 +9,7 @@
 using System.Threading.Tasks;
 using Microsoft.PowerShell.EditorServices.Utility;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Services.PowerShellContext
+namespace Microsoft.PowerShell.EditorServices.Services.PowerShellContext
 {
     /// <summary>
     /// Provides utility methods for working with PowerShell commands.
diff --git a/src/PowerShellEditorServices.Engine/Services/Symbols/IDocumentSymbolProvider.cs b/src/PowerShellEditorServices/Services/Symbols/IDocumentSymbolProvider.cs
similarity index 84%
rename from src/PowerShellEditorServices.Engine/Services/Symbols/IDocumentSymbolProvider.cs
rename to src/PowerShellEditorServices/Services/Symbols/IDocumentSymbolProvider.cs
index 604917c0d..efb5af5d8 100644
--- a/src/PowerShellEditorServices.Engine/Services/Symbols/IDocumentSymbolProvider.cs
+++ b/src/PowerShellEditorServices/Services/Symbols/IDocumentSymbolProvider.cs
@@ -4,9 +4,9 @@
 //
 
 using System.Collections.Generic;
-using Microsoft.PowerShell.EditorServices.Engine.Services.TextDocument;
+using Microsoft.PowerShell.EditorServices.Services.TextDocument;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Services.Symbols
+namespace Microsoft.PowerShell.EditorServices.Services.Symbols
 {
     /// <summary>
     /// Specifies the contract for a document symbols provider.
diff --git a/src/PowerShellEditorServices.Engine/Services/Symbols/IDocumentSymbols.cs b/src/PowerShellEditorServices/Services/Symbols/IDocumentSymbols.cs
similarity index 88%
rename from src/PowerShellEditorServices.Engine/Services/Symbols/IDocumentSymbols.cs
rename to src/PowerShellEditorServices/Services/Symbols/IDocumentSymbols.cs
index 23c14d850..b1cd09c1b 100644
--- a/src/PowerShellEditorServices.Engine/Services/Symbols/IDocumentSymbols.cs
+++ b/src/PowerShellEditorServices/Services/Symbols/IDocumentSymbols.cs
@@ -5,9 +5,9 @@
 
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using Microsoft.PowerShell.EditorServices.Engine.Services.TextDocument;
+using Microsoft.PowerShell.EditorServices.Services.TextDocument;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Services.Symbols
+namespace Microsoft.PowerShell.EditorServices.Services.Symbols
 {
     /// <summary>
     /// Specifies the contract for an implementation of
diff --git a/src/PowerShellEditorServices.Engine/Services/Symbols/ParameterSetSignatures.cs b/src/PowerShellEditorServices/Services/Symbols/ParameterSetSignatures.cs
similarity index 97%
rename from src/PowerShellEditorServices.Engine/Services/Symbols/ParameterSetSignatures.cs
rename to src/PowerShellEditorServices/Services/Symbols/ParameterSetSignatures.cs
index 3fe325355..df61a0179 100644
--- a/src/PowerShellEditorServices.Engine/Services/Symbols/ParameterSetSignatures.cs
+++ b/src/PowerShellEditorServices/Services/Symbols/ParameterSetSignatures.cs
@@ -6,9 +6,9 @@
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Management.Automation;
-using Microsoft.PowerShell.EditorServices.Engine.Services.TextDocument;
+using Microsoft.PowerShell.EditorServices.Services.TextDocument;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Services.Symbols
+namespace Microsoft.PowerShell.EditorServices.Services.Symbols
 {
     /// <summary>
     /// A class for containing the commandName, the command's
diff --git a/src/PowerShellEditorServices.Engine/Services/Symbols/PesterDocumentSymbolProvider.cs b/src/PowerShellEditorServices/Services/Symbols/PesterDocumentSymbolProvider.cs
similarity index 98%
rename from src/PowerShellEditorServices.Engine/Services/Symbols/PesterDocumentSymbolProvider.cs
rename to src/PowerShellEditorServices/Services/Symbols/PesterDocumentSymbolProvider.cs
index 8d1425db2..1f754a235 100644
--- a/src/PowerShellEditorServices.Engine/Services/Symbols/PesterDocumentSymbolProvider.cs
+++ b/src/PowerShellEditorServices/Services/Symbols/PesterDocumentSymbolProvider.cs
@@ -7,9 +7,9 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Management.Automation.Language;
-using Microsoft.PowerShell.EditorServices.Engine.Services.TextDocument;
+using Microsoft.PowerShell.EditorServices.Services.TextDocument;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Services.Symbols
+namespace Microsoft.PowerShell.EditorServices.Services.Symbols
 {
     /// <summary>
     /// Provides an IDocumentSymbolProvider implementation for
diff --git a/src/PowerShellEditorServices.Engine/Services/Symbols/PsdDocumentSymbolProvider.cs b/src/PowerShellEditorServices/Services/Symbols/PsdDocumentSymbolProvider.cs
similarity index 95%
rename from src/PowerShellEditorServices.Engine/Services/Symbols/PsdDocumentSymbolProvider.cs
rename to src/PowerShellEditorServices/Services/Symbols/PsdDocumentSymbolProvider.cs
index c5cb6099b..3a9d5b2a9 100644
--- a/src/PowerShellEditorServices.Engine/Services/Symbols/PsdDocumentSymbolProvider.cs
+++ b/src/PowerShellEditorServices/Services/Symbols/PsdDocumentSymbolProvider.cs
@@ -7,9 +7,9 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Management.Automation.Language;
-using Microsoft.PowerShell.EditorServices.Engine.Services.TextDocument;
+using Microsoft.PowerShell.EditorServices.Services.TextDocument;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Services.Symbols
+namespace Microsoft.PowerShell.EditorServices.Services.Symbols
 {
     /// <summary>
     /// Provides an IDocumentSymbolProvider implementation for
diff --git a/src/PowerShellEditorServices.Engine/Services/Symbols/ScriptDocumentSymbolProvider.cs b/src/PowerShellEditorServices/Services/Symbols/ScriptDocumentSymbolProvider.cs
similarity index 95%
rename from src/PowerShellEditorServices.Engine/Services/Symbols/ScriptDocumentSymbolProvider.cs
rename to src/PowerShellEditorServices/Services/Symbols/ScriptDocumentSymbolProvider.cs
index 63416c516..0ad1f20ea 100644
--- a/src/PowerShellEditorServices.Engine/Services/Symbols/ScriptDocumentSymbolProvider.cs
+++ b/src/PowerShellEditorServices/Services/Symbols/ScriptDocumentSymbolProvider.cs
@@ -7,9 +7,9 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Management.Automation.Language;
-using Microsoft.PowerShell.EditorServices.Engine.Services.TextDocument;
+using Microsoft.PowerShell.EditorServices.Services.TextDocument;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Services.Symbols
+namespace Microsoft.PowerShell.EditorServices.Services.Symbols
 {
     /// <summary>
     /// Provides an IDocumentSymbolProvider implementation for
diff --git a/src/PowerShellEditorServices.Engine/Services/Symbols/ScriptExtent.cs b/src/PowerShellEditorServices/Services/Symbols/ScriptExtent.cs
similarity index 97%
rename from src/PowerShellEditorServices.Engine/Services/Symbols/ScriptExtent.cs
rename to src/PowerShellEditorServices/Services/Symbols/ScriptExtent.cs
index 00001f7dd..6abff2626 100644
--- a/src/PowerShellEditorServices.Engine/Services/Symbols/ScriptExtent.cs
+++ b/src/PowerShellEditorServices/Services/Symbols/ScriptExtent.cs
@@ -6,7 +6,7 @@
 using System;
 using System.Management.Automation.Language;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Services.Symbols
+namespace Microsoft.PowerShell.EditorServices.Services.Symbols
 {
     /// <summary>
     /// Provides a default IScriptExtent implementation
diff --git a/src/PowerShellEditorServices.Engine/Services/Symbols/SymbolDetails.cs b/src/PowerShellEditorServices/Services/Symbols/SymbolDetails.cs
similarity index 95%
rename from src/PowerShellEditorServices.Engine/Services/Symbols/SymbolDetails.cs
rename to src/PowerShellEditorServices/Services/Symbols/SymbolDetails.cs
index d8866b024..a8272d375 100644
--- a/src/PowerShellEditorServices.Engine/Services/Symbols/SymbolDetails.cs
+++ b/src/PowerShellEditorServices/Services/Symbols/SymbolDetails.cs
@@ -6,9 +6,9 @@
 using System.Diagnostics;
 using System.Management.Automation;
 using System.Threading.Tasks;
-using Microsoft.PowerShell.EditorServices.Engine.Services.PowerShellContext;
+using Microsoft.PowerShell.EditorServices.Services.PowerShellContext;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Services.Symbols
+namespace Microsoft.PowerShell.EditorServices.Services.Symbols
 {
     /// <summary>
     /// Provides detailed information for a given symbol.
diff --git a/src/PowerShellEditorServices.Engine/Services/Symbols/SymbolReference.cs b/src/PowerShellEditorServices/Services/Symbols/SymbolReference.cs
similarity index 95%
rename from src/PowerShellEditorServices.Engine/Services/Symbols/SymbolReference.cs
rename to src/PowerShellEditorServices/Services/Symbols/SymbolReference.cs
index 963ea8b81..02a808c2d 100644
--- a/src/PowerShellEditorServices.Engine/Services/Symbols/SymbolReference.cs
+++ b/src/PowerShellEditorServices/Services/Symbols/SymbolReference.cs
@@ -5,9 +5,9 @@
 
 using System.Diagnostics;
 using System.Management.Automation.Language;
-using Microsoft.PowerShell.EditorServices.Engine.Services.TextDocument;
+using Microsoft.PowerShell.EditorServices.Services.TextDocument;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Services.Symbols
+namespace Microsoft.PowerShell.EditorServices.Services.Symbols
 {
     /// <summary>
     /// A class that holds the type, name, script extent, and source line of a symbol
diff --git a/src/PowerShellEditorServices.Engine/Services/Symbols/SymbolType.cs b/src/PowerShellEditorServices/Services/Symbols/SymbolType.cs
similarity index 93%
rename from src/PowerShellEditorServices.Engine/Services/Symbols/SymbolType.cs
rename to src/PowerShellEditorServices/Services/Symbols/SymbolType.cs
index 9344e5ef3..29352e24b 100644
--- a/src/PowerShellEditorServices.Engine/Services/Symbols/SymbolType.cs
+++ b/src/PowerShellEditorServices/Services/Symbols/SymbolType.cs
@@ -3,7 +3,7 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Services.Symbols
+namespace Microsoft.PowerShell.EditorServices.Services.Symbols
 {
     /// <summary>
     /// A way to define symbols on a higher level
diff --git a/src/PowerShellEditorServices.Engine/Services/Symbols/SymbolsService.cs b/src/PowerShellEditorServices/Services/Symbols/SymbolsService.cs
similarity index 98%
rename from src/PowerShellEditorServices.Engine/Services/Symbols/SymbolsService.cs
rename to src/PowerShellEditorServices/Services/Symbols/SymbolsService.cs
index 1bde8b9ff..f3c9c53b0 100644
--- a/src/PowerShellEditorServices.Engine/Services/Symbols/SymbolsService.cs
+++ b/src/PowerShellEditorServices/Services/Symbols/SymbolsService.cs
@@ -14,13 +14,13 @@
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
-using Microsoft.PowerShell.EditorServices.Engine.Logging;
-using Microsoft.PowerShell.EditorServices.Engine.Services.PowerShellContext;
-using Microsoft.PowerShell.EditorServices.Engine.Services.Symbols;
-using Microsoft.PowerShell.EditorServices.Engine.Services.TextDocument;
+using Microsoft.PowerShell.EditorServices.Logging;
+using Microsoft.PowerShell.EditorServices.Services.PowerShellContext;
+using Microsoft.PowerShell.EditorServices.Services.Symbols;
+using Microsoft.PowerShell.EditorServices.Services.TextDocument;
 using Microsoft.PowerShell.EditorServices.Utility;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Services
+namespace Microsoft.PowerShell.EditorServices.Services
 {
     /// <summary>
     /// Provides a high-level service for performing code completion and
diff --git a/src/PowerShellEditorServices.Engine/Services/Symbols/Vistors/AstOperations.cs b/src/PowerShellEditorServices/Services/Symbols/Vistors/AstOperations.cs
similarity index 99%
rename from src/PowerShellEditorServices.Engine/Services/Symbols/Vistors/AstOperations.cs
rename to src/PowerShellEditorServices/Services/Symbols/Vistors/AstOperations.cs
index 86179305e..4dc284340 100644
--- a/src/PowerShellEditorServices.Engine/Services/Symbols/Vistors/AstOperations.cs
+++ b/src/PowerShellEditorServices/Services/Symbols/Vistors/AstOperations.cs
@@ -13,10 +13,10 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
-using Microsoft.PowerShell.EditorServices.Engine.Services.PowerShellContext;
+using Microsoft.PowerShell.EditorServices.Services.PowerShellContext;
 using Microsoft.PowerShell.EditorServices.Utility;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Services.Symbols
+namespace Microsoft.PowerShell.EditorServices.Services.Symbols
 {
     /// <summary>
     /// Provides common operations for the syntax tree of a parsed script.
diff --git a/src/PowerShellEditorServices.Engine/Services/Symbols/Vistors/FindCommandVisitor.cs b/src/PowerShellEditorServices/Services/Symbols/Vistors/FindCommandVisitor.cs
similarity index 93%
rename from src/PowerShellEditorServices.Engine/Services/Symbols/Vistors/FindCommandVisitor.cs
rename to src/PowerShellEditorServices/Services/Symbols/Vistors/FindCommandVisitor.cs
index dcc45eb3b..6d033188b 100644
--- a/src/PowerShellEditorServices.Engine/Services/Symbols/Vistors/FindCommandVisitor.cs
+++ b/src/PowerShellEditorServices/Services/Symbols/Vistors/FindCommandVisitor.cs
@@ -6,7 +6,7 @@
 using System.Linq;
 using System.Management.Automation.Language;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Services.Symbols
+namespace Microsoft.PowerShell.EditorServices.Services.Symbols
 {
     /// <summary>
     /// The vistior used to find the commandAst of a specific location in an AST
@@ -37,7 +37,7 @@ public override AstVisitAction VisitPipeline(PipelineAst pipelineAst)
                     if (currentLine.Length >= trueEndColumnNumber)
                     {
                         // Get the text left in the line after the command's extent
-                        string remainingLine = 
+                        string remainingLine =
                             currentLine.Substring(
                                 commandAst.Extent.EndColumnNumber);
 
@@ -48,8 +48,8 @@ public override AstVisitAction VisitPipeline(PipelineAst pipelineAst)
                         // just after the last character in the command string or script line.
                         int preTrimLength = remainingLine.Length;
                         int postTrimLength = remainingLine.TrimStart().Length;
-                        trueEndColumnNumber = 
-                            commandAst.Extent.EndColumnNumber + 
+                        trueEndColumnNumber =
+                            commandAst.Extent.EndColumnNumber +
                             (preTrimLength - postTrimLength) + 1;
                     }
 
@@ -70,12 +70,12 @@ public override AstVisitAction VisitPipeline(PipelineAst pipelineAst)
         }
 
         /// <summary>
-        /// Is the position of the given location is in the range of the start 
+        /// Is the position of the given location is in the range of the start
         /// of the first element to the character before the second element
         /// </summary>
         /// <param name="firstExtent">The script extent of the first element of the command ast</param>
         /// <param name="secondExtent">The script extent of the second element of the command ast</param>
-        /// <returns>True if the given position is in the range of the start of 
+        /// <returns>True if the given position is in the range of the start of
         /// the first element to the character before the second element</returns>
         private bool IsPositionInExtent(IScriptExtent firstExtent, IScriptExtent secondExtent)
         {
diff --git a/src/PowerShellEditorServices.Engine/Services/Symbols/Vistors/FindDeclarationVisitor.cs b/src/PowerShellEditorServices/Services/Symbols/Vistors/FindDeclarationVisitor.cs
similarity index 98%
rename from src/PowerShellEditorServices.Engine/Services/Symbols/Vistors/FindDeclarationVisitor.cs
rename to src/PowerShellEditorServices/Services/Symbols/Vistors/FindDeclarationVisitor.cs
index e159af4c8..91f3671ff 100644
--- a/src/PowerShellEditorServices.Engine/Services/Symbols/Vistors/FindDeclarationVisitor.cs
+++ b/src/PowerShellEditorServices/Services/Symbols/Vistors/FindDeclarationVisitor.cs
@@ -6,7 +6,7 @@
 using System;
 using System.Management.Automation.Language;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Services.Symbols
+namespace Microsoft.PowerShell.EditorServices.Services.Symbols
 {
     /// <summary>
     /// The visitor used to find the definition of a symbol
diff --git a/src/PowerShellEditorServices.Engine/Services/Symbols/Vistors/FindDotSourcedVisitor.cs b/src/PowerShellEditorServices/Services/Symbols/Vistors/FindDotSourcedVisitor.cs
similarity index 98%
rename from src/PowerShellEditorServices.Engine/Services/Symbols/Vistors/FindDotSourcedVisitor.cs
rename to src/PowerShellEditorServices/Services/Symbols/Vistors/FindDotSourcedVisitor.cs
index 6caec1e49..11443e327 100644
--- a/src/PowerShellEditorServices.Engine/Services/Symbols/Vistors/FindDotSourcedVisitor.cs
+++ b/src/PowerShellEditorServices/Services/Symbols/Vistors/FindDotSourcedVisitor.cs
@@ -8,7 +8,7 @@
 using System.Management.Automation.Language;
 using Microsoft.PowerShell.EditorServices.Utility;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Services.Symbols
+namespace Microsoft.PowerShell.EditorServices.Services.Symbols
 {
     /// <summary>
     /// The vistor used to find the dont sourced files in an AST
diff --git a/src/PowerShellEditorServices.Engine/Services/Symbols/Vistors/FindReferencesVisitor.cs b/src/PowerShellEditorServices/Services/Symbols/Vistors/FindReferencesVisitor.cs
similarity index 99%
rename from src/PowerShellEditorServices.Engine/Services/Symbols/Vistors/FindReferencesVisitor.cs
rename to src/PowerShellEditorServices/Services/Symbols/Vistors/FindReferencesVisitor.cs
index 5a12dd366..7ca206dae 100644
--- a/src/PowerShellEditorServices.Engine/Services/Symbols/Vistors/FindReferencesVisitor.cs
+++ b/src/PowerShellEditorServices/Services/Symbols/Vistors/FindReferencesVisitor.cs
@@ -7,7 +7,7 @@
 using System.Collections.Generic;
 using System.Management.Automation.Language;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Services.Symbols
+namespace Microsoft.PowerShell.EditorServices.Services.Symbols
 {
     /// <summary>
     /// The visitor used to find the references of a symbol in a script's AST
diff --git a/src/PowerShellEditorServices.Engine/Services/Symbols/Vistors/FindSymbolVisitor.cs b/src/PowerShellEditorServices/Services/Symbols/Vistors/FindSymbolVisitor.cs
similarity index 98%
rename from src/PowerShellEditorServices.Engine/Services/Symbols/Vistors/FindSymbolVisitor.cs
rename to src/PowerShellEditorServices/Services/Symbols/Vistors/FindSymbolVisitor.cs
index 41eb8dc59..6d1629869 100644
--- a/src/PowerShellEditorServices.Engine/Services/Symbols/Vistors/FindSymbolVisitor.cs
+++ b/src/PowerShellEditorServices/Services/Symbols/Vistors/FindSymbolVisitor.cs
@@ -5,7 +5,7 @@
 
 using System.Management.Automation.Language;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Services.Symbols
+namespace Microsoft.PowerShell.EditorServices.Services.Symbols
 {
     /// <summary>
     /// The visitor used to find the the symbol at a specfic location in the AST
diff --git a/src/PowerShellEditorServices.Engine/Services/Symbols/Vistors/FindSymbolsVisitor.cs b/src/PowerShellEditorServices/Services/Symbols/Vistors/FindSymbolsVisitor.cs
similarity index 98%
rename from src/PowerShellEditorServices.Engine/Services/Symbols/Vistors/FindSymbolsVisitor.cs
rename to src/PowerShellEditorServices/Services/Symbols/Vistors/FindSymbolsVisitor.cs
index 95808be91..c7f36544e 100644
--- a/src/PowerShellEditorServices.Engine/Services/Symbols/Vistors/FindSymbolsVisitor.cs
+++ b/src/PowerShellEditorServices/Services/Symbols/Vistors/FindSymbolsVisitor.cs
@@ -6,7 +6,7 @@
 using System.Collections.Generic;
 using System.Management.Automation.Language;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Services.Symbols
+namespace Microsoft.PowerShell.EditorServices.Services.Symbols
 {
     /// <summary>
     /// The visitor used to find all the symbols (function and class defs) in the AST.
diff --git a/src/PowerShellEditorServices.Engine/Services/Symbols/Vistors/FindSymbolsVisitor2.cs b/src/PowerShellEditorServices/Services/Symbols/Vistors/FindSymbolsVisitor2.cs
similarity index 97%
rename from src/PowerShellEditorServices.Engine/Services/Symbols/Vistors/FindSymbolsVisitor2.cs
rename to src/PowerShellEditorServices/Services/Symbols/Vistors/FindSymbolsVisitor2.cs
index 2aedd1228..44f1560d4 100644
--- a/src/PowerShellEditorServices.Engine/Services/Symbols/Vistors/FindSymbolsVisitor2.cs
+++ b/src/PowerShellEditorServices/Services/Symbols/Vistors/FindSymbolsVisitor2.cs
@@ -6,7 +6,7 @@
 using System.Collections.Generic;
 using System.Management.Automation.Language;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Services.Symbols
+namespace Microsoft.PowerShell.EditorServices.Services.Symbols
 {
     // TODO: Restore this when we figure out how to support multiple
     //       PS versions in the new PSES-as-a-module world (issue #276)
diff --git a/src/PowerShellEditorServices.Engine/Services/TextDocument/BufferPosition.cs b/src/PowerShellEditorServices/Services/TextDocument/BufferPosition.cs
similarity index 98%
rename from src/PowerShellEditorServices.Engine/Services/TextDocument/BufferPosition.cs
rename to src/PowerShellEditorServices/Services/TextDocument/BufferPosition.cs
index c7e6bef79..1cdf6cf67 100644
--- a/src/PowerShellEditorServices.Engine/Services/TextDocument/BufferPosition.cs
+++ b/src/PowerShellEditorServices/Services/TextDocument/BufferPosition.cs
@@ -5,7 +5,7 @@
 
 using System.Diagnostics;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Services.TextDocument
+namespace Microsoft.PowerShell.EditorServices.Services.TextDocument
 {
     /// <summary>
     /// Provides details about a position in a file buffer.  All
diff --git a/src/PowerShellEditorServices.Engine/Services/TextDocument/BufferRange.cs b/src/PowerShellEditorServices/Services/TextDocument/BufferRange.cs
similarity index 98%
rename from src/PowerShellEditorServices.Engine/Services/TextDocument/BufferRange.cs
rename to src/PowerShellEditorServices/Services/TextDocument/BufferRange.cs
index 986f3702e..dbc577b05 100644
--- a/src/PowerShellEditorServices.Engine/Services/TextDocument/BufferRange.cs
+++ b/src/PowerShellEditorServices/Services/TextDocument/BufferRange.cs
@@ -6,7 +6,7 @@
 using System;
 using System.Diagnostics;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Services.TextDocument
+namespace Microsoft.PowerShell.EditorServices.Services.TextDocument
 {
     /// <summary>
     /// Provides details about a range between two positions in
diff --git a/src/PowerShellEditorServices.Engine/Services/TextDocument/CompletionResults.cs b/src/PowerShellEditorServices/Services/TextDocument/CompletionResults.cs
similarity index 99%
rename from src/PowerShellEditorServices.Engine/Services/TextDocument/CompletionResults.cs
rename to src/PowerShellEditorServices/Services/TextDocument/CompletionResults.cs
index 308386d50..e267eb0a1 100644
--- a/src/PowerShellEditorServices.Engine/Services/TextDocument/CompletionResults.cs
+++ b/src/PowerShellEditorServices/Services/TextDocument/CompletionResults.cs
@@ -10,7 +10,7 @@
 using System.Text.RegularExpressions;
 using Microsoft.PowerShell.EditorServices.Utility;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Services.TextDocument
+namespace Microsoft.PowerShell.EditorServices.Services.TextDocument
 {
     /// <summary>
     /// Provides the results of a single code completion request.
diff --git a/src/PowerShellEditorServices.Engine/Services/TextDocument/FileChange.cs b/src/PowerShellEditorServices/Services/TextDocument/FileChange.cs
similarity index 94%
rename from src/PowerShellEditorServices.Engine/Services/TextDocument/FileChange.cs
rename to src/PowerShellEditorServices/Services/TextDocument/FileChange.cs
index f465f0826..c407ae881 100644
--- a/src/PowerShellEditorServices.Engine/Services/TextDocument/FileChange.cs
+++ b/src/PowerShellEditorServices/Services/TextDocument/FileChange.cs
@@ -3,7 +3,7 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Services.TextDocument
+namespace Microsoft.PowerShell.EditorServices.Services.TextDocument
 {
     /// <summary>
     /// Contains details relating to a content change in an open file.
diff --git a/src/PowerShellEditorServices.Engine/Services/TextDocument/FilePosition.cs b/src/PowerShellEditorServices/Services/TextDocument/FilePosition.cs
similarity index 98%
rename from src/PowerShellEditorServices.Engine/Services/TextDocument/FilePosition.cs
rename to src/PowerShellEditorServices/Services/TextDocument/FilePosition.cs
index 5b95905dd..8b0e4e970 100644
--- a/src/PowerShellEditorServices.Engine/Services/TextDocument/FilePosition.cs
+++ b/src/PowerShellEditorServices/Services/TextDocument/FilePosition.cs
@@ -3,7 +3,7 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Services.TextDocument
+namespace Microsoft.PowerShell.EditorServices.Services.TextDocument
 {
     /// <summary>
     /// Provides details and operations for a buffer position in a
diff --git a/src/PowerShellEditorServices.Engine/Services/TextDocument/FoldingReference.cs b/src/PowerShellEditorServices/Services/TextDocument/FoldingReference.cs
similarity index 98%
rename from src/PowerShellEditorServices.Engine/Services/TextDocument/FoldingReference.cs
rename to src/PowerShellEditorServices/Services/TextDocument/FoldingReference.cs
index e0d5d7ac8..477c27d88 100644
--- a/src/PowerShellEditorServices.Engine/Services/TextDocument/FoldingReference.cs
+++ b/src/PowerShellEditorServices/Services/TextDocument/FoldingReference.cs
@@ -7,7 +7,7 @@
 using System.Collections.Generic;
 using OmniSharp.Extensions.LanguageServer.Protocol.Models;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Services.TextDocument
+namespace Microsoft.PowerShell.EditorServices.Services.TextDocument
 {
     /// <summary>
     /// A class that holds the information for a foldable region of text in a document
diff --git a/src/PowerShellEditorServices.Engine/Services/TextDocument/Handlers/CodeActionHandler.cs b/src/PowerShellEditorServices/Services/TextDocument/Handlers/CodeActionHandler.cs
similarity index 96%
rename from src/PowerShellEditorServices.Engine/Services/TextDocument/Handlers/CodeActionHandler.cs
rename to src/PowerShellEditorServices/Services/TextDocument/Handlers/CodeActionHandler.cs
index 522e3ba1d..ade90f2b6 100644
--- a/src/PowerShellEditorServices.Engine/Services/TextDocument/Handlers/CodeActionHandler.cs
+++ b/src/PowerShellEditorServices/Services/TextDocument/Handlers/CodeActionHandler.cs
@@ -8,14 +8,14 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
-using Microsoft.PowerShell.EditorServices.Engine.Services;
-using Microsoft.PowerShell.EditorServices.Engine.Services.TextDocument;
+using Microsoft.PowerShell.EditorServices.Services;
+using Microsoft.PowerShell.EditorServices.Services.TextDocument;
 using Newtonsoft.Json.Linq;
 using OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities;
 using OmniSharp.Extensions.LanguageServer.Protocol.Models;
 using OmniSharp.Extensions.LanguageServer.Protocol.Server;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Handlers
+namespace Microsoft.PowerShell.EditorServices.Handlers
 {
     internal class CodeActionHandler : ICodeActionHandler
     {
diff --git a/src/PowerShellEditorServices.Engine/Services/TextDocument/Handlers/CodeLensHandlers.cs b/src/PowerShellEditorServices/Services/TextDocument/Handlers/CodeLensHandlers.cs
similarity index 94%
rename from src/PowerShellEditorServices.Engine/Services/TextDocument/Handlers/CodeLensHandlers.cs
rename to src/PowerShellEditorServices/Services/TextDocument/Handlers/CodeLensHandlers.cs
index 46d96cacd..e87b7595f 100644
--- a/src/PowerShellEditorServices.Engine/Services/TextDocument/Handlers/CodeLensHandlers.cs
+++ b/src/PowerShellEditorServices/Services/TextDocument/Handlers/CodeLensHandlers.cs
@@ -10,16 +10,16 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
-using Microsoft.PowerShell.EditorServices.Engine.CodeLenses;
-using Microsoft.PowerShell.EditorServices.Engine.Logging;
-using Microsoft.PowerShell.EditorServices.Engine.Services;
-using Microsoft.PowerShell.EditorServices.Engine.Services.TextDocument;
+using Microsoft.PowerShell.EditorServices.CodeLenses;
+using Microsoft.PowerShell.EditorServices.Logging;
+using Microsoft.PowerShell.EditorServices.Services;
+using Microsoft.PowerShell.EditorServices.Services.TextDocument;
 using OmniSharp.Extensions.LanguageServer.Protocol;
 using OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities;
 using OmniSharp.Extensions.LanguageServer.Protocol.Models;
 using OmniSharp.Extensions.LanguageServer.Protocol.Server;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Handlers
+namespace Microsoft.PowerShell.EditorServices.Handlers
 {
     public class CodeLensHandlers : ICodeLensHandler, ICodeLensResolveHandler
     {
diff --git a/src/PowerShellEditorServices.Engine/Services/TextDocument/Handlers/CompletionHandler.cs b/src/PowerShellEditorServices/Services/TextDocument/Handlers/CompletionHandler.cs
similarity index 97%
rename from src/PowerShellEditorServices.Engine/Services/TextDocument/Handlers/CompletionHandler.cs
rename to src/PowerShellEditorServices/Services/TextDocument/Handlers/CompletionHandler.cs
index da14ce998..1f2f2e09a 100644
--- a/src/PowerShellEditorServices.Engine/Services/TextDocument/Handlers/CompletionHandler.cs
+++ b/src/PowerShellEditorServices/Services/TextDocument/Handlers/CompletionHandler.cs
@@ -9,16 +9,16 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
-using Microsoft.PowerShell.EditorServices.Engine.Services;
-using Microsoft.PowerShell.EditorServices.Engine.Services.PowerShellContext;
-using Microsoft.PowerShell.EditorServices.Engine.Services.Symbols;
-using Microsoft.PowerShell.EditorServices.Engine.Services.TextDocument;
+using Microsoft.PowerShell.EditorServices.Services;
+using Microsoft.PowerShell.EditorServices.Services.PowerShellContext;
+using Microsoft.PowerShell.EditorServices.Services.Symbols;
+using Microsoft.PowerShell.EditorServices.Services.TextDocument;
 using Microsoft.PowerShell.EditorServices.Utility;
 using OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities;
 using OmniSharp.Extensions.LanguageServer.Protocol.Models;
 using OmniSharp.Extensions.LanguageServer.Protocol.Server;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Handlers
+namespace Microsoft.PowerShell.EditorServices.Handlers
 {
     internal class CompletionHandler : ICompletionHandler, ICompletionResolveHandler
     {
diff --git a/src/PowerShellEditorServices.Engine/Services/TextDocument/Handlers/DefinitionHandler.cs b/src/PowerShellEditorServices/Services/TextDocument/Handlers/DefinitionHandler.cs
similarity index 93%
rename from src/PowerShellEditorServices.Engine/Services/TextDocument/Handlers/DefinitionHandler.cs
rename to src/PowerShellEditorServices/Services/TextDocument/Handlers/DefinitionHandler.cs
index cd35f8ce1..64033c564 100644
--- a/src/PowerShellEditorServices.Engine/Services/TextDocument/Handlers/DefinitionHandler.cs
+++ b/src/PowerShellEditorServices/Services/TextDocument/Handlers/DefinitionHandler.cs
@@ -7,15 +7,15 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
-using Microsoft.PowerShell.EditorServices.Engine.Services;
-using Microsoft.PowerShell.EditorServices.Engine.Services.Symbols;
-using Microsoft.PowerShell.EditorServices.Engine.Services.TextDocument;
+using Microsoft.PowerShell.EditorServices.Services;
+using Microsoft.PowerShell.EditorServices.Services.Symbols;
+using Microsoft.PowerShell.EditorServices.Services.TextDocument;
 using Microsoft.PowerShell.EditorServices.Utility;
 using OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities;
 using OmniSharp.Extensions.LanguageServer.Protocol.Models;
 using OmniSharp.Extensions.LanguageServer.Protocol.Server;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Handlers
+namespace Microsoft.PowerShell.EditorServices.Handlers
 {
     public class DefinitionHandler : IDefinitionHandler
     {
diff --git a/src/PowerShellEditorServices.Engine/Services/TextDocument/Handlers/DocumentHighlightHandler.cs b/src/PowerShellEditorServices/Services/TextDocument/Handlers/DocumentHighlightHandler.cs
similarity index 90%
rename from src/PowerShellEditorServices.Engine/Services/TextDocument/Handlers/DocumentHighlightHandler.cs
rename to src/PowerShellEditorServices/Services/TextDocument/Handlers/DocumentHighlightHandler.cs
index ea1a2e11a..2790f8409 100644
--- a/src/PowerShellEditorServices.Engine/Services/TextDocument/Handlers/DocumentHighlightHandler.cs
+++ b/src/PowerShellEditorServices/Services/TextDocument/Handlers/DocumentHighlightHandler.cs
@@ -4,10 +4,10 @@
 //
 
 using Microsoft.Extensions.Logging;
-using Microsoft.PowerShell.EditorServices.Engine.Services;
-using Microsoft.PowerShell.EditorServices.Engine.Services.Symbols;
-using Microsoft.PowerShell.EditorServices.Engine.Services.TextDocument;
-using Microsoft.PowerShell.EditorServices.Engine.Utility;
+using Microsoft.PowerShell.EditorServices.Services;
+using Microsoft.PowerShell.EditorServices.Services.Symbols;
+using Microsoft.PowerShell.EditorServices.Services.TextDocument;
+using Microsoft.PowerShell.EditorServices.Utility;
 using Microsoft.PowerShell.EditorServices.Utility;
 using OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities;
 using OmniSharp.Extensions.LanguageServer.Protocol.Models;
@@ -16,7 +16,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Handlers
+namespace Microsoft.PowerShell.EditorServices.Handlers
 {
     public class DocumentHighlightHandler : IDocumentHighlightHandler
     {
diff --git a/src/PowerShellEditorServices.Engine/Services/TextDocument/Handlers/DocumentSymbolHandler.cs b/src/PowerShellEditorServices/Services/TextDocument/Handlers/DocumentSymbolHandler.cs
similarity index 95%
rename from src/PowerShellEditorServices.Engine/Services/TextDocument/Handlers/DocumentSymbolHandler.cs
rename to src/PowerShellEditorServices/Services/TextDocument/Handlers/DocumentSymbolHandler.cs
index ed354fb04..9e3ccfd78 100644
--- a/src/PowerShellEditorServices.Engine/Services/TextDocument/Handlers/DocumentSymbolHandler.cs
+++ b/src/PowerShellEditorServices/Services/TextDocument/Handlers/DocumentSymbolHandler.cs
@@ -11,16 +11,16 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
-using Microsoft.PowerShell.EditorServices.Engine.Logging;
-using Microsoft.PowerShell.EditorServices.Engine.Services;
-using Microsoft.PowerShell.EditorServices.Engine.Services.Symbols;
-using Microsoft.PowerShell.EditorServices.Engine.Services.TextDocument;
+using Microsoft.PowerShell.EditorServices.Logging;
+using Microsoft.PowerShell.EditorServices.Services;
+using Microsoft.PowerShell.EditorServices.Services.Symbols;
+using Microsoft.PowerShell.EditorServices.Services.TextDocument;
 using Microsoft.PowerShell.EditorServices.Utility;
 using OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities;
 using OmniSharp.Extensions.LanguageServer.Protocol.Models;
 using OmniSharp.Extensions.LanguageServer.Protocol.Server;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Handlers
+namespace Microsoft.PowerShell.EditorServices.Handlers
 {
     public class DocumentSymbolHandler : IDocumentSymbolHandler
     {
diff --git a/src/PowerShellEditorServices.Engine/Services/TextDocument/Handlers/FoldingRangeHandler.cs b/src/PowerShellEditorServices/Services/TextDocument/Handlers/FoldingRangeHandler.cs
similarity index 94%
rename from src/PowerShellEditorServices.Engine/Services/TextDocument/Handlers/FoldingRangeHandler.cs
rename to src/PowerShellEditorServices/Services/TextDocument/Handlers/FoldingRangeHandler.cs
index 54e8dfbca..dbb554fb0 100644
--- a/src/PowerShellEditorServices.Engine/Services/TextDocument/Handlers/FoldingRangeHandler.cs
+++ b/src/PowerShellEditorServices/Services/TextDocument/Handlers/FoldingRangeHandler.cs
@@ -7,13 +7,13 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
-using Microsoft.PowerShell.EditorServices.Engine.Services;
-using Microsoft.PowerShell.EditorServices.Engine.Services.TextDocument;
+using Microsoft.PowerShell.EditorServices.Services;
+using Microsoft.PowerShell.EditorServices.Services.TextDocument;
 using OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities;
 using OmniSharp.Extensions.LanguageServer.Protocol.Models;
 using OmniSharp.Extensions.LanguageServer.Protocol.Server;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Handlers
+namespace Microsoft.PowerShell.EditorServices.Handlers
 {
     public class FoldingRangeHandler : IFoldingRangeHandler
     {
diff --git a/src/PowerShellEditorServices.Engine/Services/TextDocument/Handlers/FormattingHandlers.cs b/src/PowerShellEditorServices/Services/TextDocument/Handlers/FormattingHandlers.cs
similarity index 98%
rename from src/PowerShellEditorServices.Engine/Services/TextDocument/Handlers/FormattingHandlers.cs
rename to src/PowerShellEditorServices/Services/TextDocument/Handlers/FormattingHandlers.cs
index bc93390c0..90243b9d4 100644
--- a/src/PowerShellEditorServices.Engine/Services/TextDocument/Handlers/FormattingHandlers.cs
+++ b/src/PowerShellEditorServices/Services/TextDocument/Handlers/FormattingHandlers.cs
@@ -6,12 +6,12 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
-using Microsoft.PowerShell.EditorServices.Engine.Services;
+using Microsoft.PowerShell.EditorServices.Services;
 using OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities;
 using OmniSharp.Extensions.LanguageServer.Protocol.Models;
 using OmniSharp.Extensions.LanguageServer.Protocol.Server;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Handlers
+namespace Microsoft.PowerShell.EditorServices.Handlers
 {
     internal class DocumentFormattingHandler : IDocumentFormattingHandler
     {
diff --git a/src/PowerShellEditorServices.Engine/Services/TextDocument/Handlers/HoverHandler.cs b/src/PowerShellEditorServices/Services/TextDocument/Handlers/HoverHandler.cs
similarity index 93%
rename from src/PowerShellEditorServices.Engine/Services/TextDocument/Handlers/HoverHandler.cs
rename to src/PowerShellEditorServices/Services/TextDocument/Handlers/HoverHandler.cs
index cbc978694..8a107ed42 100644
--- a/src/PowerShellEditorServices.Engine/Services/TextDocument/Handlers/HoverHandler.cs
+++ b/src/PowerShellEditorServices/Services/TextDocument/Handlers/HoverHandler.cs
@@ -7,14 +7,14 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
-using Microsoft.PowerShell.EditorServices.Engine.Services;
-using Microsoft.PowerShell.EditorServices.Engine.Services.Symbols;
-using Microsoft.PowerShell.EditorServices.Engine.Services.TextDocument;
+using Microsoft.PowerShell.EditorServices.Services;
+using Microsoft.PowerShell.EditorServices.Services.Symbols;
+using Microsoft.PowerShell.EditorServices.Services.TextDocument;
 using OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities;
 using OmniSharp.Extensions.LanguageServer.Protocol.Models;
 using OmniSharp.Extensions.LanguageServer.Protocol.Server;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Handlers
+namespace Microsoft.PowerShell.EditorServices.Handlers
 {
     public class HoverHandler : IHoverHandler
     {
diff --git a/src/PowerShellEditorServices.Engine/Services/TextDocument/Handlers/ReferencesHandler.cs b/src/PowerShellEditorServices/Services/TextDocument/Handlers/ReferencesHandler.cs
similarity index 93%
rename from src/PowerShellEditorServices.Engine/Services/TextDocument/Handlers/ReferencesHandler.cs
rename to src/PowerShellEditorServices/Services/TextDocument/Handlers/ReferencesHandler.cs
index c5f73a41b..c72ce141e 100644
--- a/src/PowerShellEditorServices.Engine/Services/TextDocument/Handlers/ReferencesHandler.cs
+++ b/src/PowerShellEditorServices/Services/TextDocument/Handlers/ReferencesHandler.cs
@@ -7,15 +7,15 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
-using Microsoft.PowerShell.EditorServices.Engine.Services;
-using Microsoft.PowerShell.EditorServices.Engine.Services.Symbols;
-using Microsoft.PowerShell.EditorServices.Engine.Services.TextDocument;
+using Microsoft.PowerShell.EditorServices.Services;
+using Microsoft.PowerShell.EditorServices.Services.Symbols;
+using Microsoft.PowerShell.EditorServices.Services.TextDocument;
 using Microsoft.PowerShell.EditorServices.Utility;
 using OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities;
 using OmniSharp.Extensions.LanguageServer.Protocol.Models;
 using OmniSharp.Extensions.LanguageServer.Protocol.Server;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Handlers
+namespace Microsoft.PowerShell.EditorServices.Handlers
 {
     class ReferencesHandler : IReferencesHandler
     {
diff --git a/src/PowerShellEditorServices.Engine/Services/TextDocument/Handlers/SignatureHelpHandler.cs b/src/PowerShellEditorServices/Services/TextDocument/Handlers/SignatureHelpHandler.cs
similarity index 94%
rename from src/PowerShellEditorServices.Engine/Services/TextDocument/Handlers/SignatureHelpHandler.cs
rename to src/PowerShellEditorServices/Services/TextDocument/Handlers/SignatureHelpHandler.cs
index 102e71410..eac0303ab 100644
--- a/src/PowerShellEditorServices.Engine/Services/TextDocument/Handlers/SignatureHelpHandler.cs
+++ b/src/PowerShellEditorServices/Services/TextDocument/Handlers/SignatureHelpHandler.cs
@@ -7,14 +7,14 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
-using Microsoft.PowerShell.EditorServices.Engine.Services;
-using Microsoft.PowerShell.EditorServices.Engine.Services.Symbols;
-using Microsoft.PowerShell.EditorServices.Engine.Services.TextDocument;
+using Microsoft.PowerShell.EditorServices.Services;
+using Microsoft.PowerShell.EditorServices.Services.Symbols;
+using Microsoft.PowerShell.EditorServices.Services.TextDocument;
 using OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities;
 using OmniSharp.Extensions.LanguageServer.Protocol.Models;
 using OmniSharp.Extensions.LanguageServer.Protocol.Server;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Handlers
+namespace Microsoft.PowerShell.EditorServices.Handlers
 {
     public class SignatureHelpHandler : ISignatureHelpHandler
     {
diff --git a/src/PowerShellEditorServices.Engine/Services/TextDocument/Handlers/TextDocumentHandler.cs b/src/PowerShellEditorServices/Services/TextDocument/Handlers/TextDocumentHandler.cs
similarity index 97%
rename from src/PowerShellEditorServices.Engine/Services/TextDocument/Handlers/TextDocumentHandler.cs
rename to src/PowerShellEditorServices/Services/TextDocument/Handlers/TextDocumentHandler.cs
index d3b70c43a..375034533 100644
--- a/src/PowerShellEditorServices.Engine/Services/TextDocument/Handlers/TextDocumentHandler.cs
+++ b/src/PowerShellEditorServices/Services/TextDocument/Handlers/TextDocumentHandler.cs
@@ -8,8 +8,8 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
-using Microsoft.PowerShell.EditorServices.Engine.Services;
-using Microsoft.PowerShell.EditorServices.Engine.Services.TextDocument;
+using Microsoft.PowerShell.EditorServices.Services;
+using Microsoft.PowerShell.EditorServices.Services.TextDocument;
 using OmniSharp.Extensions.Embedded.MediatR;
 using OmniSharp.Extensions.LanguageServer.Protocol;
 using OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities;
@@ -17,7 +17,7 @@
 using OmniSharp.Extensions.LanguageServer.Protocol.Server;
 using OmniSharp.Extensions.LanguageServer.Protocol.Server.Capabilities;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Handlers
+namespace Microsoft.PowerShell.EditorServices.Handlers
 {
     class TextDocumentHandler : ITextDocumentSyncHandler
     {
diff --git a/src/PowerShellEditorServices.Engine/Services/TextDocument/ScriptFile.cs b/src/PowerShellEditorServices/Services/TextDocument/ScriptFile.cs
similarity index 99%
rename from src/PowerShellEditorServices.Engine/Services/TextDocument/ScriptFile.cs
rename to src/PowerShellEditorServices/Services/TextDocument/ScriptFile.cs
index 41563ec25..5b1b58bd5 100644
--- a/src/PowerShellEditorServices.Engine/Services/TextDocument/ScriptFile.cs
+++ b/src/PowerShellEditorServices/Services/TextDocument/ScriptFile.cs
@@ -9,10 +9,10 @@
 using System.Linq;
 using System.Management.Automation;
 using System.Management.Automation.Language;
-using Microsoft.PowerShell.EditorServices.Engine.Services.Symbols;
+using Microsoft.PowerShell.EditorServices.Services.Symbols;
 using Microsoft.PowerShell.EditorServices.Utility;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Services.TextDocument
+namespace Microsoft.PowerShell.EditorServices.Services.TextDocument
 {
     /// <summary>
     /// Contains the details and contents of an open script file.
diff --git a/src/PowerShellEditorServices.Engine/Services/TextDocument/ScriptFileMarker.cs b/src/PowerShellEditorServices/Services/TextDocument/ScriptFileMarker.cs
similarity index 98%
rename from src/PowerShellEditorServices.Engine/Services/TextDocument/ScriptFileMarker.cs
rename to src/PowerShellEditorServices/Services/TextDocument/ScriptFileMarker.cs
index 0269c2d3d..9609b2cae 100644
--- a/src/PowerShellEditorServices.Engine/Services/TextDocument/ScriptFileMarker.cs
+++ b/src/PowerShellEditorServices/Services/TextDocument/ScriptFileMarker.cs
@@ -10,7 +10,7 @@
 using System.Management.Automation.Language;
 using Microsoft.PowerShell.EditorServices.Utility;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Services.TextDocument
+namespace Microsoft.PowerShell.EditorServices.Services.TextDocument
 {
     /// <summary>
     /// Contains details for a code correction which can be applied from a ScriptFileMarker.
diff --git a/src/PowerShellEditorServices.Engine/Services/TextDocument/ScriptRegion.cs b/src/PowerShellEditorServices/Services/TextDocument/ScriptRegion.cs
similarity index 98%
rename from src/PowerShellEditorServices.Engine/Services/TextDocument/ScriptRegion.cs
rename to src/PowerShellEditorServices/Services/TextDocument/ScriptRegion.cs
index 0ffee20b2..f18fcd6c4 100644
--- a/src/PowerShellEditorServices.Engine/Services/TextDocument/ScriptRegion.cs
+++ b/src/PowerShellEditorServices/Services/TextDocument/ScriptRegion.cs
@@ -6,7 +6,7 @@
 using System;
 using System.Management.Automation.Language;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Services.TextDocument
+namespace Microsoft.PowerShell.EditorServices.Services.TextDocument
 {
     /// <summary>
     /// Contains details about a specific region of text in script file.
diff --git a/src/PowerShellEditorServices.Engine/Services/TextDocument/TokenOperations.cs b/src/PowerShellEditorServices/Services/TextDocument/TokenOperations.cs
similarity index 99%
rename from src/PowerShellEditorServices.Engine/Services/TextDocument/TokenOperations.cs
rename to src/PowerShellEditorServices/Services/TextDocument/TokenOperations.cs
index 8a3985573..4b3c7f6ab 100644
--- a/src/PowerShellEditorServices.Engine/Services/TextDocument/TokenOperations.cs
+++ b/src/PowerShellEditorServices/Services/TextDocument/TokenOperations.cs
@@ -8,7 +8,7 @@
 using System.Text.RegularExpressions;
 using OmniSharp.Extensions.LanguageServer.Protocol.Models;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Services.TextDocument
+namespace Microsoft.PowerShell.EditorServices.Services.TextDocument
 {
 
     /// <summary>
diff --git a/src/PowerShellEditorServices.Engine/Services/Workspace/ConfigurationService.cs b/src/PowerShellEditorServices/Services/Workspace/ConfigurationService.cs
similarity index 74%
rename from src/PowerShellEditorServices.Engine/Services/Workspace/ConfigurationService.cs
rename to src/PowerShellEditorServices/Services/Workspace/ConfigurationService.cs
index 2351adda1..e9d54359a 100644
--- a/src/PowerShellEditorServices.Engine/Services/Workspace/ConfigurationService.cs
+++ b/src/PowerShellEditorServices/Services/Workspace/ConfigurationService.cs
@@ -3,9 +3,9 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-using Microsoft.PowerShell.EditorServices.Engine.Services.Configuration;
+using Microsoft.PowerShell.EditorServices.Services.Configuration;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Services
+namespace Microsoft.PowerShell.EditorServices.Services
 {
     public class ConfigurationService
     {
diff --git a/src/PowerShellEditorServices.Engine/Services/Workspace/Handlers/ConfigurationHandler.cs b/src/PowerShellEditorServices/Services/Workspace/Handlers/ConfigurationHandler.cs
similarity index 97%
rename from src/PowerShellEditorServices.Engine/Services/Workspace/Handlers/ConfigurationHandler.cs
rename to src/PowerShellEditorServices/Services/Workspace/Handlers/ConfigurationHandler.cs
index 5d2fc49d8..ae97d43ad 100644
--- a/src/PowerShellEditorServices.Engine/Services/Workspace/Handlers/ConfigurationHandler.cs
+++ b/src/PowerShellEditorServices/Services/Workspace/Handlers/ConfigurationHandler.cs
@@ -8,14 +8,14 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
-using Microsoft.PowerShell.EditorServices.Engine.Services;
-using Microsoft.PowerShell.EditorServices.Engine.Services.Configuration;
+using Microsoft.PowerShell.EditorServices.Services;
+using Microsoft.PowerShell.EditorServices.Services.Configuration;
 using OmniSharp.Extensions.Embedded.MediatR;
 using OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities;
 using OmniSharp.Extensions.LanguageServer.Protocol.Models;
 using OmniSharp.Extensions.LanguageServer.Protocol.Server;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Handlers
+namespace Microsoft.PowerShell.EditorServices.Handlers
 {
     internal class ConfigurationHandler : IDidChangeConfigurationHandler
     {
diff --git a/src/PowerShellEditorServices.Engine/Services/Workspace/Handlers/WorkspaceSymbolsHandler.cs b/src/PowerShellEditorServices/Services/Workspace/Handlers/WorkspaceSymbolsHandler.cs
similarity index 94%
rename from src/PowerShellEditorServices.Engine/Services/Workspace/Handlers/WorkspaceSymbolsHandler.cs
rename to src/PowerShellEditorServices/Services/Workspace/Handlers/WorkspaceSymbolsHandler.cs
index d05a02dea..da1ba6f21 100644
--- a/src/PowerShellEditorServices.Engine/Services/Workspace/Handlers/WorkspaceSymbolsHandler.cs
+++ b/src/PowerShellEditorServices/Services/Workspace/Handlers/WorkspaceSymbolsHandler.cs
@@ -9,15 +9,15 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
-using Microsoft.PowerShell.EditorServices.Engine.Services;
-using Microsoft.PowerShell.EditorServices.Engine.Services.Symbols;
-using Microsoft.PowerShell.EditorServices.Engine.Services.TextDocument;
+using Microsoft.PowerShell.EditorServices.Services;
+using Microsoft.PowerShell.EditorServices.Services.Symbols;
+using Microsoft.PowerShell.EditorServices.Services.TextDocument;
 using Microsoft.PowerShell.EditorServices.Utility;
 using OmniSharp.Extensions.LanguageServer.Protocol.Client.Capabilities;
 using OmniSharp.Extensions.LanguageServer.Protocol.Models;
 using OmniSharp.Extensions.LanguageServer.Protocol.Server;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Handlers
+namespace Microsoft.PowerShell.EditorServices.Handlers
 {
     public class WorkspaceSymbolsHandler : IWorkspaceSymbolsHandler
     {
diff --git a/src/PowerShellEditorServices.Engine/Services/Workspace/LanguageServerSettings.cs b/src/PowerShellEditorServices/Services/Workspace/LanguageServerSettings.cs
similarity index 99%
rename from src/PowerShellEditorServices.Engine/Services/Workspace/LanguageServerSettings.cs
rename to src/PowerShellEditorServices/Services/Workspace/LanguageServerSettings.cs
index 894df1d65..2f70d5fe6 100644
--- a/src/PowerShellEditorServices.Engine/Services/Workspace/LanguageServerSettings.cs
+++ b/src/PowerShellEditorServices/Services/Workspace/LanguageServerSettings.cs
@@ -10,9 +10,9 @@
 using System.Reflection;
 using System.Security;
 using Microsoft.Extensions.Logging;
-using Microsoft.PowerShell.EditorServices.Engine.Logging;
+using Microsoft.PowerShell.EditorServices.Logging;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Services.Configuration
+namespace Microsoft.PowerShell.EditorServices.Services.Configuration
 {
     public class LanguageServerSettings
     {
diff --git a/src/PowerShellEditorServices.Engine/Services/Workspace/WorkspaceFileSystemWrapper.cs b/src/PowerShellEditorServices/Services/Workspace/WorkspaceFileSystemWrapper.cs
similarity index 99%
rename from src/PowerShellEditorServices.Engine/Services/Workspace/WorkspaceFileSystemWrapper.cs
rename to src/PowerShellEditorServices/Services/Workspace/WorkspaceFileSystemWrapper.cs
index 6b53b10df..89335db09 100644
--- a/src/PowerShellEditorServices.Engine/Services/Workspace/WorkspaceFileSystemWrapper.cs
+++ b/src/PowerShellEditorServices/Services/Workspace/WorkspaceFileSystemWrapper.cs
@@ -9,9 +9,9 @@
 using System.Security;
 using Microsoft.Extensions.FileSystemGlobbing.Abstractions;
 using Microsoft.Extensions.Logging;
-using Microsoft.PowerShell.EditorServices.Engine.Logging;
+using Microsoft.PowerShell.EditorServices.Logging;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Services.Workspace
+namespace Microsoft.PowerShell.EditorServices.Services.Workspace
 {
 
     /// <summary>
diff --git a/src/PowerShellEditorServices.Engine/Services/Workspace/WorkspaceService.cs b/src/PowerShellEditorServices/Services/Workspace/WorkspaceService.cs
similarity index 99%
rename from src/PowerShellEditorServices.Engine/Services/Workspace/WorkspaceService.cs
rename to src/PowerShellEditorServices/Services/Workspace/WorkspaceService.cs
index f8beeba70..cae7e36a7 100644
--- a/src/PowerShellEditorServices.Engine/Services/Workspace/WorkspaceService.cs
+++ b/src/PowerShellEditorServices/Services/Workspace/WorkspaceService.cs
@@ -13,10 +13,10 @@
 using Microsoft.Extensions.FileSystemGlobbing;
 using Microsoft.Extensions.Logging;
 using Microsoft.PowerShell.EditorServices.Utility;
-using Microsoft.PowerShell.EditorServices.Engine.Services.Workspace;
-using Microsoft.PowerShell.EditorServices.Engine.Services.TextDocument;
+using Microsoft.PowerShell.EditorServices.Services.Workspace;
+using Microsoft.PowerShell.EditorServices.Services.TextDocument;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Services
+namespace Microsoft.PowerShell.EditorServices.Services
 {
     /// <summary>
     /// Manages a "workspace" of script files that are open for a particular
diff --git a/src/PowerShellEditorServices.Engine/Utility/AsyncLock.cs b/src/PowerShellEditorServices/Utility/AsyncLock.cs
similarity index 100%
rename from src/PowerShellEditorServices.Engine/Utility/AsyncLock.cs
rename to src/PowerShellEditorServices/Utility/AsyncLock.cs
diff --git a/src/PowerShellEditorServices.Engine/Utility/AsyncQueue.cs b/src/PowerShellEditorServices/Utility/AsyncQueue.cs
similarity index 100%
rename from src/PowerShellEditorServices.Engine/Utility/AsyncQueue.cs
rename to src/PowerShellEditorServices/Utility/AsyncQueue.cs
diff --git a/src/PowerShellEditorServices.Engine/Utility/AsyncUtils.cs b/src/PowerShellEditorServices/Utility/AsyncUtils.cs
similarity index 100%
rename from src/PowerShellEditorServices.Engine/Utility/AsyncUtils.cs
rename to src/PowerShellEditorServices/Utility/AsyncUtils.cs
diff --git a/src/PowerShellEditorServices.Engine/Utility/Extensions.cs b/src/PowerShellEditorServices/Utility/Extensions.cs
similarity index 100%
rename from src/PowerShellEditorServices.Engine/Utility/Extensions.cs
rename to src/PowerShellEditorServices/Utility/Extensions.cs
diff --git a/src/PowerShellEditorServices.Engine/Utility/IScriptExtentExtensions.cs b/src/PowerShellEditorServices/Utility/IScriptExtentExtensions.cs
similarity index 93%
rename from src/PowerShellEditorServices.Engine/Utility/IScriptExtentExtensions.cs
rename to src/PowerShellEditorServices/Utility/IScriptExtentExtensions.cs
index db7148df0..c48735c14 100644
--- a/src/PowerShellEditorServices.Engine/Utility/IScriptExtentExtensions.cs
+++ b/src/PowerShellEditorServices/Utility/IScriptExtentExtensions.cs
@@ -6,7 +6,7 @@
 using System.Management.Automation.Language;
 using OmniSharp.Extensions.LanguageServer.Protocol.Models;
 
-namespace Microsoft.PowerShell.EditorServices.Engine.Utility
+namespace Microsoft.PowerShell.EditorServices.Utility
 {
     internal static class IScriptExtentExtensions
     {
diff --git a/src/PowerShellEditorServices.Engine/Utility/LspDebugUtils.cs b/src/PowerShellEditorServices/Utility/LspDebugUtils.cs
similarity index 98%
rename from src/PowerShellEditorServices.Engine/Utility/LspDebugUtils.cs
rename to src/PowerShellEditorServices/Utility/LspDebugUtils.cs
index 914b7e2da..4423252ac 100644
--- a/src/PowerShellEditorServices.Engine/Utility/LspDebugUtils.cs
+++ b/src/PowerShellEditorServices/Utility/LspDebugUtils.cs
@@ -1,5 +1,5 @@
 using System;
-using Microsoft.PowerShell.EditorServices.Engine.Services.DebugAdapter;
+using Microsoft.PowerShell.EditorServices.Services.DebugAdapter;
 using OmniSharp.Extensions.DebugAdapter.Protocol.Models;
 
 namespace Microsoft.PowerShell.EditorServices.Utility
diff --git a/src/PowerShellEditorServices.Engine/Utility/PathUtils.cs b/src/PowerShellEditorServices/Utility/PathUtils.cs
similarity index 100%
rename from src/PowerShellEditorServices.Engine/Utility/PathUtils.cs
rename to src/PowerShellEditorServices/Utility/PathUtils.cs
diff --git a/src/PowerShellEditorServices.Engine/Utility/Validate.cs b/src/PowerShellEditorServices/Utility/Validate.cs
similarity index 100%
rename from src/PowerShellEditorServices.Engine/Utility/Validate.cs
rename to src/PowerShellEditorServices/Utility/Validate.cs
diff --git a/src/PowerShellEditorServices.Engine/Utility/VersionUtils.cs b/src/PowerShellEditorServices/Utility/VersionUtils.cs
similarity index 100%
rename from src/PowerShellEditorServices.Engine/Utility/VersionUtils.cs
rename to src/PowerShellEditorServices/Utility/VersionUtils.cs
diff --git a/test/PowerShellEditorServices.Test.E2E/LanguageServerProtocolMessageTests.cs b/test/PowerShellEditorServices.Test.E2E/LanguageServerProtocolMessageTests.cs
index 8654832a6..776b84a40 100644
--- a/test/PowerShellEditorServices.Test.E2E/LanguageServerProtocolMessageTests.cs
+++ b/test/PowerShellEditorServices.Test.E2E/LanguageServerProtocolMessageTests.cs
@@ -11,7 +11,7 @@
 using System.Reflection;
 using System.Threading;
 using System.Threading.Tasks;
-using Microsoft.PowerShell.EditorServices.Engine.Handlers;
+using Microsoft.PowerShell.EditorServices.Handlers;
 using Newtonsoft.Json.Linq;
 using OmniSharp.Extensions.LanguageServer.Client;
 using OmniSharp.Extensions.LanguageServer.Protocol.Models;
diff --git a/test/PowerShellEditorServices.Test.E2E/PowerShellEditorServices.Test.E2E.csproj b/test/PowerShellEditorServices.Test.E2E/PowerShellEditorServices.Test.E2E.csproj
index a2b3878f8..f2e1e0732 100644
--- a/test/PowerShellEditorServices.Test.E2E/PowerShellEditorServices.Test.E2E.csproj
+++ b/test/PowerShellEditorServices.Test.E2E/PowerShellEditorServices.Test.E2E.csproj
@@ -16,7 +16,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\src\PowerShellEditorServices.Engine\PowerShellEditorServices.Engine.csproj" />
+    <ProjectReference Include="..\..\src\PowerShellEditorServices\PowerShellEditorServices.csproj" />
   </ItemGroup>
 
   <ItemGroup>