diff --git a/src/ServiceHost/WorkspaceService/BufferPosition.cs b/src/ServiceHost/WorkspaceService/Contracts/BufferPosition.cs
similarity index 100%
rename from src/ServiceHost/WorkspaceService/BufferPosition.cs
rename to src/ServiceHost/WorkspaceService/Contracts/BufferPosition.cs
diff --git a/src/ServiceHost/WorkspaceService/BufferRange.cs b/src/ServiceHost/WorkspaceService/Contracts/BufferRange.cs
similarity index 100%
rename from src/ServiceHost/WorkspaceService/BufferRange.cs
rename to src/ServiceHost/WorkspaceService/Contracts/BufferRange.cs
diff --git a/src/ServiceHost/WorkspaceService/Configuration.cs b/src/ServiceHost/WorkspaceService/Contracts/Configuration.cs
similarity index 100%
rename from src/ServiceHost/WorkspaceService/Configuration.cs
rename to src/ServiceHost/WorkspaceService/Contracts/Configuration.cs
diff --git a/src/ServiceHost/WorkspaceService/FileChange.cs b/src/ServiceHost/WorkspaceService/Contracts/FileChange.cs
similarity index 100%
rename from src/ServiceHost/WorkspaceService/FileChange.cs
rename to src/ServiceHost/WorkspaceService/Contracts/FileChange.cs
diff --git a/src/ServiceHost/WorkspaceService/FilePosition.cs b/src/ServiceHost/WorkspaceService/Contracts/FilePosition.cs
similarity index 100%
rename from src/ServiceHost/WorkspaceService/FilePosition.cs
rename to src/ServiceHost/WorkspaceService/Contracts/FilePosition.cs
diff --git a/src/ServiceHost/WorkspaceService/ScriptFile.cs b/src/ServiceHost/WorkspaceService/Contracts/ScriptFile.cs
similarity index 100%
rename from src/ServiceHost/WorkspaceService/ScriptFile.cs
rename to src/ServiceHost/WorkspaceService/Contracts/ScriptFile.cs
diff --git a/src/ServiceHost/WorkspaceService/ScriptFileMarker.cs b/src/ServiceHost/WorkspaceService/Contracts/ScriptFileMarker.cs
similarity index 100%
rename from src/ServiceHost/WorkspaceService/ScriptFileMarker.cs
rename to src/ServiceHost/WorkspaceService/Contracts/ScriptFileMarker.cs
diff --git a/src/ServiceHost/WorkspaceService/ScriptRegion.cs b/src/ServiceHost/WorkspaceService/Contracts/ScriptRegion.cs
similarity index 100%
rename from src/ServiceHost/WorkspaceService/ScriptRegion.cs
rename to src/ServiceHost/WorkspaceService/Contracts/ScriptRegion.cs
diff --git a/src/ServiceHost/WorkspaceService/TextDocument.cs b/src/ServiceHost/WorkspaceService/Contracts/TextDocument.cs
similarity index 100%
rename from src/ServiceHost/WorkspaceService/TextDocument.cs
rename to src/ServiceHost/WorkspaceService/Contracts/TextDocument.cs
diff --git a/src/ServiceHost/WorkspaceService/Workspace.cs b/src/ServiceHost/WorkspaceService/Contracts/Workspace.cs
similarity index 100%
rename from src/ServiceHost/WorkspaceService/Workspace.cs
rename to src/ServiceHost/WorkspaceService/Contracts/Workspace.cs
diff --git a/src/ServiceHost/WorkspaceService/WorkspaceSymbols.cs b/src/ServiceHost/WorkspaceService/Contracts/WorkspaceSymbols.cs
similarity index 100%
rename from src/ServiceHost/WorkspaceService/WorkspaceSymbols.cs
rename to src/ServiceHost/WorkspaceService/Contracts/WorkspaceSymbols.cs