diff --git a/src/ServiceHost/Server/LanguageServer.cs b/src/ServiceHost/ServiceHost/ServiceHost.cs
similarity index 100%
rename from src/ServiceHost/Server/LanguageServer.cs
rename to src/ServiceHost/ServiceHost/ServiceHost.cs
diff --git a/src/ServiceHost/Server/LanguageServerBase.cs b/src/ServiceHost/ServiceHost/ServiceHostBase.cs
similarity index 100%
rename from src/ServiceHost/Server/LanguageServerBase.cs
rename to src/ServiceHost/ServiceHost/ServiceHostBase.cs
diff --git a/src/ServiceHost/Server/LanguageServerEditorOperations.cs b/src/ServiceHost/ServiceHost/ServiceHostEditorOperations.cs
similarity index 100%
rename from src/ServiceHost/Server/LanguageServerEditorOperations.cs
rename to src/ServiceHost/ServiceHost/ServiceHostEditorOperations.cs
diff --git a/src/ServiceHost/Server/LanguageServerSettings.cs b/src/ServiceHost/ServiceHost/ServiceHostSettings.cs
similarity index 100%
rename from src/ServiceHost/Server/LanguageServerSettings.cs
rename to src/ServiceHost/ServiceHost/ServiceHostSettings.cs