diff --git a/src/ServiceHost/LanguageServer/Completion.cs b/src/ServiceHost/LanguageService/Contracts/Completion.cs
similarity index 100%
rename from src/ServiceHost/LanguageServer/Completion.cs
rename to src/ServiceHost/LanguageService/Contracts/Completion.cs
diff --git a/src/ServiceHost/LanguageServer/Definition.cs b/src/ServiceHost/LanguageService/Contracts/Definition.cs
similarity index 100%
rename from src/ServiceHost/LanguageServer/Definition.cs
rename to src/ServiceHost/LanguageService/Contracts/Definition.cs
diff --git a/src/ServiceHost/LanguageServer/Diagnostics.cs b/src/ServiceHost/LanguageService/Contracts/Diagnostics.cs
similarity index 100%
rename from src/ServiceHost/LanguageServer/Diagnostics.cs
rename to src/ServiceHost/LanguageService/Contracts/Diagnostics.cs
diff --git a/src/ServiceHost/LanguageServer/DocumentHighlight.cs b/src/ServiceHost/LanguageService/Contracts/DocumentHighlight.cs
similarity index 100%
rename from src/ServiceHost/LanguageServer/DocumentHighlight.cs
rename to src/ServiceHost/LanguageService/Contracts/DocumentHighlight.cs
diff --git a/src/ServiceHost/LanguageServer/ExpandAliasRequest.cs b/src/ServiceHost/LanguageService/Contracts/ExpandAliasRequest.cs
similarity index 100%
rename from src/ServiceHost/LanguageServer/ExpandAliasRequest.cs
rename to src/ServiceHost/LanguageService/Contracts/ExpandAliasRequest.cs
diff --git a/src/ServiceHost/LanguageServer/FindModuleRequest.cs b/src/ServiceHost/LanguageService/Contracts/FindModuleRequest.cs
similarity index 100%
rename from src/ServiceHost/LanguageServer/FindModuleRequest.cs
rename to src/ServiceHost/LanguageService/Contracts/FindModuleRequest.cs
diff --git a/src/ServiceHost/LanguageServer/Hover.cs b/src/ServiceHost/LanguageService/Contracts/Hover.cs
similarity index 100%
rename from src/ServiceHost/LanguageServer/Hover.cs
rename to src/ServiceHost/LanguageService/Contracts/Hover.cs
diff --git a/src/ServiceHost/LanguageServer/InstallModuleRequest.cs b/src/ServiceHost/LanguageService/Contracts/InstallModuleRequest.cs
similarity index 100%
rename from src/ServiceHost/LanguageServer/InstallModuleRequest.cs
rename to src/ServiceHost/LanguageService/Contracts/InstallModuleRequest.cs
diff --git a/src/ServiceHost/LanguageServer/References.cs b/src/ServiceHost/LanguageService/Contracts/References.cs
similarity index 100%
rename from src/ServiceHost/LanguageServer/References.cs
rename to src/ServiceHost/LanguageService/Contracts/References.cs
diff --git a/src/ServiceHost/LanguageServer/ShowOnlineHelpRequest.cs b/src/ServiceHost/LanguageService/Contracts/ShowOnlineHelpRequest.cs
similarity index 100%
rename from src/ServiceHost/LanguageServer/ShowOnlineHelpRequest.cs
rename to src/ServiceHost/LanguageService/Contracts/ShowOnlineHelpRequest.cs
diff --git a/src/ServiceHost/LanguageServer/SignatureHelp.cs b/src/ServiceHost/LanguageService/Contracts/SignatureHelp.cs
similarity index 100%
rename from src/ServiceHost/LanguageServer/SignatureHelp.cs
rename to src/ServiceHost/LanguageService/Contracts/SignatureHelp.cs
diff --git a/src/ServiceHost/LanguageSupport/LanguageService.cs b/src/ServiceHost/LanguageService/LanguageService.cs
similarity index 100%
rename from src/ServiceHost/LanguageSupport/LanguageService.cs
rename to src/ServiceHost/LanguageService/LanguageService.cs
diff --git a/src/ServiceHost/LanguageServer/ClientCapabilities.cs b/src/ServiceHost/ServerService/Contracts/ClientCapabilities.cs
similarity index 100%
rename from src/ServiceHost/LanguageServer/ClientCapabilities.cs
rename to src/ServiceHost/ServerService/Contracts/ClientCapabilities.cs
diff --git a/src/ServiceHost/LanguageServer/Initialize.cs b/src/ServiceHost/ServerService/Contracts/Initialize.cs
similarity index 100%
rename from src/ServiceHost/LanguageServer/Initialize.cs
rename to src/ServiceHost/ServerService/Contracts/Initialize.cs
diff --git a/src/ServiceHost/LanguageServer/ServerCapabilities.cs b/src/ServiceHost/ServerService/Contracts/ServerCapabilities.cs
similarity index 100%
rename from src/ServiceHost/LanguageServer/ServerCapabilities.cs
rename to src/ServiceHost/ServerService/Contracts/ServerCapabilities.cs
diff --git a/src/ServiceHost/LanguageServer/Shutdown.cs b/src/ServiceHost/ServerService/Contracts/Shutdown.cs
similarity index 100%
rename from src/ServiceHost/LanguageServer/Shutdown.cs
rename to src/ServiceHost/ServerService/Contracts/Shutdown.cs
diff --git a/src/ServiceHost/Workspace/BufferPosition.cs b/src/ServiceHost/WorkspaceService/BufferPosition.cs
similarity index 100%
rename from src/ServiceHost/Workspace/BufferPosition.cs
rename to src/ServiceHost/WorkspaceService/BufferPosition.cs
diff --git a/src/ServiceHost/Workspace/BufferRange.cs b/src/ServiceHost/WorkspaceService/BufferRange.cs
similarity index 100%
rename from src/ServiceHost/Workspace/BufferRange.cs
rename to src/ServiceHost/WorkspaceService/BufferRange.cs
diff --git a/src/ServiceHost/LanguageServer/Configuration.cs b/src/ServiceHost/WorkspaceService/Configuration.cs
similarity index 100%
rename from src/ServiceHost/LanguageServer/Configuration.cs
rename to src/ServiceHost/WorkspaceService/Configuration.cs
diff --git a/src/ServiceHost/Workspace/FileChange.cs b/src/ServiceHost/WorkspaceService/FileChange.cs
similarity index 100%
rename from src/ServiceHost/Workspace/FileChange.cs
rename to src/ServiceHost/WorkspaceService/FileChange.cs
diff --git a/src/ServiceHost/Workspace/FilePosition.cs b/src/ServiceHost/WorkspaceService/FilePosition.cs
similarity index 100%
rename from src/ServiceHost/Workspace/FilePosition.cs
rename to src/ServiceHost/WorkspaceService/FilePosition.cs
diff --git a/src/ServiceHost/Workspace/ScriptFile.cs b/src/ServiceHost/WorkspaceService/ScriptFile.cs
similarity index 100%
rename from src/ServiceHost/Workspace/ScriptFile.cs
rename to src/ServiceHost/WorkspaceService/ScriptFile.cs
diff --git a/src/ServiceHost/Workspace/ScriptFileMarker.cs b/src/ServiceHost/WorkspaceService/ScriptFileMarker.cs
similarity index 100%
rename from src/ServiceHost/Workspace/ScriptFileMarker.cs
rename to src/ServiceHost/WorkspaceService/ScriptFileMarker.cs
diff --git a/src/ServiceHost/Workspace/ScriptRegion.cs b/src/ServiceHost/WorkspaceService/ScriptRegion.cs
similarity index 100%
rename from src/ServiceHost/Workspace/ScriptRegion.cs
rename to src/ServiceHost/WorkspaceService/ScriptRegion.cs
diff --git a/src/ServiceHost/LanguageServer/TextDocument.cs b/src/ServiceHost/WorkspaceService/TextDocument.cs
similarity index 100%
rename from src/ServiceHost/LanguageServer/TextDocument.cs
rename to src/ServiceHost/WorkspaceService/TextDocument.cs
diff --git a/src/ServiceHost/Workspace/Workspace.cs b/src/ServiceHost/WorkspaceService/Workspace.cs
similarity index 100%
rename from src/ServiceHost/Workspace/Workspace.cs
rename to src/ServiceHost/WorkspaceService/Workspace.cs
diff --git a/src/ServiceHost/LanguageServer/WorkspaceSymbols.cs b/src/ServiceHost/WorkspaceService/WorkspaceSymbols.cs
similarity index 100%
rename from src/ServiceHost/LanguageServer/WorkspaceSymbols.cs
rename to src/ServiceHost/WorkspaceService/WorkspaceSymbols.cs