diff --git a/Microsoft.DotNet.Cli.sln b/Microsoft.DotNet.Cli.sln
index 88cb00400..1501e300f 100644
--- a/Microsoft.DotNet.Cli.sln
+++ b/Microsoft.DotNet.Cli.sln
@@ -35,10 +35,6 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "dotnet-restore", "src\dotne
 EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "MultiProjectValidator", "tools\MultiProjectValidator\MultiProjectValidator.xproj", "{08A68C6A-86F6-4ED2-89A7-B166D33E9F85}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.DotNet.ProjectModel.Server", "src\Microsoft.DotNet.ProjectModel.Server\Microsoft.DotNet.ProjectModel.Server.xproj", "{1EA9AF94-5494-40DD-A05B-9D564572CCFC}"
-EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.DotNet.ProjectModel.Server.Tests", "test\Microsoft.DotNet.ProjectModel.Server.Tests\Microsoft.DotNet.ProjectModel.Server.Tests.xproj", "{11C77123-E4DA-499F-8900-80C88C2C69F2}"
-EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.Extensions.DependencyModel", "src\Microsoft.Extensions.DependencyModel\Microsoft.Extensions.DependencyModel.xproj", "{688870C8-9843-4F9E-8576-D39290AD0F25}"
 EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "E2E", "test\E2E\E2E.xproj", "{65741CB1-8AEE-4C66-8198-10A7EA0E4258}"
@@ -91,6 +87,10 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "dotnet-compile.Tests", "tes
 EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "dotnet-publish.Tests", "test\dotnet-publish.Tests\dotnet-publish.Tests.xproj", "{386D412C-003C-47B1-8258-0E35865CB7C4}"
 EndProject
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "dotnet-projectmodel-server", "src\dotnet-projectmodel-server\dotnet-projectmodel-server.xproj", "{1EA9AF94-5494-40DD-A05B-9D564572CCFC}"
+EndProject
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "dotnet-projectmodel-server.Tests", "test\dotnet-projectmodel-server.Tests\dotnet-projectmodel-server.Tests.xproj", "{11C77123-E4DA-499F-8900-80C88C2C69F2}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -263,38 +263,6 @@ Global
 		{08A68C6A-86F6-4ED2-89A7-B166D33E9F85}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU
 		{08A68C6A-86F6-4ED2-89A7-B166D33E9F85}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU
 		{08A68C6A-86F6-4ED2-89A7-B166D33E9F85}.RelWithDebInfo|x64.Build.0 = Release|Any CPU
-		{1EA9AF94-5494-40DD-A05B-9D564572CCFC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1EA9AF94-5494-40DD-A05B-9D564572CCFC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1EA9AF94-5494-40DD-A05B-9D564572CCFC}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{1EA9AF94-5494-40DD-A05B-9D564572CCFC}.Debug|x64.Build.0 = Debug|Any CPU
-		{1EA9AF94-5494-40DD-A05B-9D564572CCFC}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU
-		{1EA9AF94-5494-40DD-A05B-9D564572CCFC}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU
-		{1EA9AF94-5494-40DD-A05B-9D564572CCFC}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU
-		{1EA9AF94-5494-40DD-A05B-9D564572CCFC}.MinSizeRel|x64.Build.0 = Debug|Any CPU
-		{1EA9AF94-5494-40DD-A05B-9D564572CCFC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1EA9AF94-5494-40DD-A05B-9D564572CCFC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1EA9AF94-5494-40DD-A05B-9D564572CCFC}.Release|x64.ActiveCfg = Release|Any CPU
-		{1EA9AF94-5494-40DD-A05B-9D564572CCFC}.Release|x64.Build.0 = Release|Any CPU
-		{1EA9AF94-5494-40DD-A05B-9D564572CCFC}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU
-		{1EA9AF94-5494-40DD-A05B-9D564572CCFC}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU
-		{1EA9AF94-5494-40DD-A05B-9D564572CCFC}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU
-		{1EA9AF94-5494-40DD-A05B-9D564572CCFC}.RelWithDebInfo|x64.Build.0 = Release|Any CPU
-		{11C77123-E4DA-499F-8900-80C88C2C69F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{11C77123-E4DA-499F-8900-80C88C2C69F2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{11C77123-E4DA-499F-8900-80C88C2C69F2}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{11C77123-E4DA-499F-8900-80C88C2C69F2}.Debug|x64.Build.0 = Debug|Any CPU
-		{11C77123-E4DA-499F-8900-80C88C2C69F2}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU
-		{11C77123-E4DA-499F-8900-80C88C2C69F2}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU
-		{11C77123-E4DA-499F-8900-80C88C2C69F2}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU
-		{11C77123-E4DA-499F-8900-80C88C2C69F2}.MinSizeRel|x64.Build.0 = Debug|Any CPU
-		{11C77123-E4DA-499F-8900-80C88C2C69F2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{11C77123-E4DA-499F-8900-80C88C2C69F2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{11C77123-E4DA-499F-8900-80C88C2C69F2}.Release|x64.ActiveCfg = Release|Any CPU
-		{11C77123-E4DA-499F-8900-80C88C2C69F2}.Release|x64.Build.0 = Release|Any CPU
-		{11C77123-E4DA-499F-8900-80C88C2C69F2}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU
-		{11C77123-E4DA-499F-8900-80C88C2C69F2}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU
-		{11C77123-E4DA-499F-8900-80C88C2C69F2}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU
-		{11C77123-E4DA-499F-8900-80C88C2C69F2}.RelWithDebInfo|x64.Build.0 = Release|Any CPU
 		{688870C8-9843-4F9E-8576-D39290AD0F25}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{688870C8-9843-4F9E-8576-D39290AD0F25}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{688870C8-9843-4F9E-8576-D39290AD0F25}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -695,6 +663,38 @@ Global
 		{386D412C-003C-47B1-8258-0E35865CB7C4}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU
 		{386D412C-003C-47B1-8258-0E35865CB7C4}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU
 		{386D412C-003C-47B1-8258-0E35865CB7C4}.RelWithDebInfo|x64.Build.0 = Release|Any CPU
+		{1EA9AF94-5494-40DD-A05B-9D564572CCFC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1EA9AF94-5494-40DD-A05B-9D564572CCFC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1EA9AF94-5494-40DD-A05B-9D564572CCFC}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{1EA9AF94-5494-40DD-A05B-9D564572CCFC}.Debug|x64.Build.0 = Debug|Any CPU
+		{1EA9AF94-5494-40DD-A05B-9D564572CCFC}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU
+		{1EA9AF94-5494-40DD-A05B-9D564572CCFC}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU
+		{1EA9AF94-5494-40DD-A05B-9D564572CCFC}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU
+		{1EA9AF94-5494-40DD-A05B-9D564572CCFC}.MinSizeRel|x64.Build.0 = Debug|Any CPU
+		{1EA9AF94-5494-40DD-A05B-9D564572CCFC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1EA9AF94-5494-40DD-A05B-9D564572CCFC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1EA9AF94-5494-40DD-A05B-9D564572CCFC}.Release|x64.ActiveCfg = Release|Any CPU
+		{1EA9AF94-5494-40DD-A05B-9D564572CCFC}.Release|x64.Build.0 = Release|Any CPU
+		{1EA9AF94-5494-40DD-A05B-9D564572CCFC}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU
+		{1EA9AF94-5494-40DD-A05B-9D564572CCFC}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU
+		{1EA9AF94-5494-40DD-A05B-9D564572CCFC}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU
+		{1EA9AF94-5494-40DD-A05B-9D564572CCFC}.RelWithDebInfo|x64.Build.0 = Release|Any CPU
+		{11C77123-E4DA-499F-8900-80C88C2C69F2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{11C77123-E4DA-499F-8900-80C88C2C69F2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{11C77123-E4DA-499F-8900-80C88C2C69F2}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{11C77123-E4DA-499F-8900-80C88C2C69F2}.Debug|x64.Build.0 = Debug|Any CPU
+		{11C77123-E4DA-499F-8900-80C88C2C69F2}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU
+		{11C77123-E4DA-499F-8900-80C88C2C69F2}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU
+		{11C77123-E4DA-499F-8900-80C88C2C69F2}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU
+		{11C77123-E4DA-499F-8900-80C88C2C69F2}.MinSizeRel|x64.Build.0 = Debug|Any CPU
+		{11C77123-E4DA-499F-8900-80C88C2C69F2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{11C77123-E4DA-499F-8900-80C88C2C69F2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{11C77123-E4DA-499F-8900-80C88C2C69F2}.Release|x64.ActiveCfg = Release|Any CPU
+		{11C77123-E4DA-499F-8900-80C88C2C69F2}.Release|x64.Build.0 = Release|Any CPU
+		{11C77123-E4DA-499F-8900-80C88C2C69F2}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU
+		{11C77123-E4DA-499F-8900-80C88C2C69F2}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU
+		{11C77123-E4DA-499F-8900-80C88C2C69F2}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU
+		{11C77123-E4DA-499F-8900-80C88C2C69F2}.RelWithDebInfo|x64.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -710,8 +710,6 @@ Global
 		{7A75ACC4-3C2F-44E1-B492-0EC08704E9FF} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7}
 		{79620410-4EC7-4A38-A8C3-EE81243F818E} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F}
 		{08A68C6A-86F6-4ED2-89A7-B166D33E9F85} = {0722D325-24C8-4E83-B5AF-0A083E7F0749}
-		{1EA9AF94-5494-40DD-A05B-9D564572CCFC} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F}
-		{11C77123-E4DA-499F-8900-80C88C2C69F2} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7}
 		{688870C8-9843-4F9E-8576-D39290AD0F25} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F}
 		{65741CB1-8AEE-4C66-8198-10A7EA0E4258} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7}
 		{E4F46EAB-B5A5-4E60-9B9D-40A1FADBF45C} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7}
@@ -738,5 +736,7 @@ Global
 		{833FFEE1-7EED-4F51-8DFD-946D48833333} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7}
 		{833FFEE1-7EED-4F51-8DFD-946D48893D6E} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7}
 		{386D412C-003C-47B1-8258-0E35865CB7C4} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7}
+		{1EA9AF94-5494-40DD-A05B-9D564572CCFC} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F}
+		{11C77123-E4DA-499F-8900-80C88C2C69F2} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7}
 	EndGlobalSection
 EndGlobal
diff --git a/src/Microsoft.DotNet.ProjectModel.Server/ConnectionContext.cs b/src/dotnet-projectmodel-server/ConnectionContext.cs
similarity index 100%
rename from src/Microsoft.DotNet.ProjectModel.Server/ConnectionContext.cs
rename to src/dotnet-projectmodel-server/ConnectionContext.cs
diff --git a/src/Microsoft.DotNet.ProjectModel.Server/Helpers/DependencyTypeChangeFinder.cs b/src/dotnet-projectmodel-server/Helpers/DependencyTypeChangeFinder.cs
similarity index 100%
rename from src/Microsoft.DotNet.ProjectModel.Server/Helpers/DependencyTypeChangeFinder.cs
rename to src/dotnet-projectmodel-server/Helpers/DependencyTypeChangeFinder.cs
diff --git a/src/Microsoft.DotNet.ProjectModel.Server/Helpers/JTokenExtensions.cs b/src/dotnet-projectmodel-server/Helpers/JTokenExtensions.cs
similarity index 100%
rename from src/Microsoft.DotNet.ProjectModel.Server/Helpers/JTokenExtensions.cs
rename to src/dotnet-projectmodel-server/Helpers/JTokenExtensions.cs
diff --git a/src/Microsoft.DotNet.ProjectModel.Server/Helpers/LibraryExtensions.cs b/src/dotnet-projectmodel-server/Helpers/LibraryExtensions.cs
similarity index 100%
rename from src/Microsoft.DotNet.ProjectModel.Server/Helpers/LibraryExtensions.cs
rename to src/dotnet-projectmodel-server/Helpers/LibraryExtensions.cs
diff --git a/src/Microsoft.DotNet.ProjectModel.Server/Helpers/NuGetFrameworkExtensions.cs b/src/dotnet-projectmodel-server/Helpers/NuGetFrameworkExtensions.cs
similarity index 100%
rename from src/Microsoft.DotNet.ProjectModel.Server/Helpers/NuGetFrameworkExtensions.cs
rename to src/dotnet-projectmodel-server/Helpers/NuGetFrameworkExtensions.cs
diff --git a/src/Microsoft.DotNet.ProjectModel.Server/Helpers/ProjectExtensions.cs b/src/dotnet-projectmodel-server/Helpers/ProjectExtensions.cs
similarity index 100%
rename from src/Microsoft.DotNet.ProjectModel.Server/Helpers/ProjectExtensions.cs
rename to src/dotnet-projectmodel-server/Helpers/ProjectExtensions.cs
diff --git a/src/Microsoft.DotNet.ProjectModel.Server/InternalModels/ProjectContextSnapshot.cs b/src/dotnet-projectmodel-server/InternalModels/ProjectContextSnapshot.cs
similarity index 100%
rename from src/Microsoft.DotNet.ProjectModel.Server/InternalModels/ProjectContextSnapshot.cs
rename to src/dotnet-projectmodel-server/InternalModels/ProjectContextSnapshot.cs
diff --git a/src/Microsoft.DotNet.ProjectModel.Server/InternalModels/ProjectSnapshot.cs b/src/dotnet-projectmodel-server/InternalModels/ProjectSnapshot.cs
similarity index 100%
rename from src/Microsoft.DotNet.ProjectModel.Server/InternalModels/ProjectSnapshot.cs
rename to src/dotnet-projectmodel-server/InternalModels/ProjectSnapshot.cs
diff --git a/src/Microsoft.DotNet.ProjectModel.Server/MessageTypes.cs b/src/dotnet-projectmodel-server/MessageTypes.cs
similarity index 100%
rename from src/Microsoft.DotNet.ProjectModel.Server/MessageTypes.cs
rename to src/dotnet-projectmodel-server/MessageTypes.cs
diff --git a/src/Microsoft.DotNet.ProjectModel.Server/Messengers/CompilerOptionsMessenger.cs b/src/dotnet-projectmodel-server/Messengers/CompilerOptionsMessenger.cs
similarity index 100%
rename from src/Microsoft.DotNet.ProjectModel.Server/Messengers/CompilerOptionsMessenger.cs
rename to src/dotnet-projectmodel-server/Messengers/CompilerOptionsMessenger.cs
diff --git a/src/Microsoft.DotNet.ProjectModel.Server/Messengers/DependenciesMessenger.cs b/src/dotnet-projectmodel-server/Messengers/DependenciesMessenger.cs
similarity index 100%
rename from src/Microsoft.DotNet.ProjectModel.Server/Messengers/DependenciesMessenger.cs
rename to src/dotnet-projectmodel-server/Messengers/DependenciesMessenger.cs
diff --git a/src/Microsoft.DotNet.ProjectModel.Server/Messengers/DependencyDiagnosticsMessenger.cs b/src/dotnet-projectmodel-server/Messengers/DependencyDiagnosticsMessenger.cs
similarity index 100%
rename from src/Microsoft.DotNet.ProjectModel.Server/Messengers/DependencyDiagnosticsMessenger.cs
rename to src/dotnet-projectmodel-server/Messengers/DependencyDiagnosticsMessenger.cs
diff --git a/src/Microsoft.DotNet.ProjectModel.Server/Messengers/GlobalErrorMessenger.cs b/src/dotnet-projectmodel-server/Messengers/GlobalErrorMessenger.cs
similarity index 100%
rename from src/Microsoft.DotNet.ProjectModel.Server/Messengers/GlobalErrorMessenger.cs
rename to src/dotnet-projectmodel-server/Messengers/GlobalErrorMessenger.cs
diff --git a/src/Microsoft.DotNet.ProjectModel.Server/Messengers/Messenger.cs b/src/dotnet-projectmodel-server/Messengers/Messenger.cs
similarity index 100%
rename from src/Microsoft.DotNet.ProjectModel.Server/Messengers/Messenger.cs
rename to src/dotnet-projectmodel-server/Messengers/Messenger.cs
diff --git a/src/Microsoft.DotNet.ProjectModel.Server/Messengers/ProjectDiagnosticsMessenger.cs b/src/dotnet-projectmodel-server/Messengers/ProjectDiagnosticsMessenger.cs
similarity index 100%
rename from src/Microsoft.DotNet.ProjectModel.Server/Messengers/ProjectDiagnosticsMessenger.cs
rename to src/dotnet-projectmodel-server/Messengers/ProjectDiagnosticsMessenger.cs
diff --git a/src/Microsoft.DotNet.ProjectModel.Server/Messengers/ProjectInformationMessenger.cs b/src/dotnet-projectmodel-server/Messengers/ProjectInformationMessenger.cs
similarity index 100%
rename from src/Microsoft.DotNet.ProjectModel.Server/Messengers/ProjectInformationMessenger.cs
rename to src/dotnet-projectmodel-server/Messengers/ProjectInformationMessenger.cs
diff --git a/src/Microsoft.DotNet.ProjectModel.Server/Messengers/ReferencesMessenger.cs b/src/dotnet-projectmodel-server/Messengers/ReferencesMessenger.cs
similarity index 100%
rename from src/Microsoft.DotNet.ProjectModel.Server/Messengers/ReferencesMessenger.cs
rename to src/dotnet-projectmodel-server/Messengers/ReferencesMessenger.cs
diff --git a/src/Microsoft.DotNet.ProjectModel.Server/Messengers/SourcesMessenger.cs b/src/dotnet-projectmodel-server/Messengers/SourcesMessenger.cs
similarity index 100%
rename from src/Microsoft.DotNet.ProjectModel.Server/Messengers/SourcesMessenger.cs
rename to src/dotnet-projectmodel-server/Messengers/SourcesMessenger.cs
diff --git a/src/Microsoft.DotNet.ProjectModel.Server/Models/DependencyDescription.cs b/src/dotnet-projectmodel-server/Models/DependencyDescription.cs
similarity index 100%
rename from src/Microsoft.DotNet.ProjectModel.Server/Models/DependencyDescription.cs
rename to src/dotnet-projectmodel-server/Models/DependencyDescription.cs
diff --git a/src/Microsoft.DotNet.ProjectModel.Server/Models/DependencyItem.cs b/src/dotnet-projectmodel-server/Models/DependencyItem.cs
similarity index 100%
rename from src/Microsoft.DotNet.ProjectModel.Server/Models/DependencyItem.cs
rename to src/dotnet-projectmodel-server/Models/DependencyItem.cs
diff --git a/src/Microsoft.DotNet.ProjectModel.Server/Models/DiagnosticMessageGroup.cs b/src/dotnet-projectmodel-server/Models/DiagnosticMessageGroup.cs
similarity index 100%
rename from src/Microsoft.DotNet.ProjectModel.Server/Models/DiagnosticMessageGroup.cs
rename to src/dotnet-projectmodel-server/Models/DiagnosticMessageGroup.cs
diff --git a/src/Microsoft.DotNet.ProjectModel.Server/Models/DiagnosticMessageView.cs b/src/dotnet-projectmodel-server/Models/DiagnosticMessageView.cs
similarity index 100%
rename from src/Microsoft.DotNet.ProjectModel.Server/Models/DiagnosticMessageView.cs
rename to src/dotnet-projectmodel-server/Models/DiagnosticMessageView.cs
diff --git a/src/Microsoft.DotNet.ProjectModel.Server/Models/DiagnosticsListMessage.cs b/src/dotnet-projectmodel-server/Models/DiagnosticsListMessage.cs
similarity index 100%
rename from src/Microsoft.DotNet.ProjectModel.Server/Models/DiagnosticsListMessage.cs
rename to src/dotnet-projectmodel-server/Models/DiagnosticsListMessage.cs
diff --git a/src/Microsoft.DotNet.ProjectModel.Server/Models/ErrorMessage.cs b/src/dotnet-projectmodel-server/Models/ErrorMessage.cs
similarity index 100%
rename from src/Microsoft.DotNet.ProjectModel.Server/Models/ErrorMessage.cs
rename to src/dotnet-projectmodel-server/Models/ErrorMessage.cs
diff --git a/src/Microsoft.DotNet.ProjectModel.Server/Models/FrameworkData.cs b/src/dotnet-projectmodel-server/Models/FrameworkData.cs
similarity index 100%
rename from src/Microsoft.DotNet.ProjectModel.Server/Models/FrameworkData.cs
rename to src/dotnet-projectmodel-server/Models/FrameworkData.cs
diff --git a/src/Microsoft.DotNet.ProjectModel.Server/Models/Message.cs b/src/dotnet-projectmodel-server/Models/Message.cs
similarity index 100%
rename from src/Microsoft.DotNet.ProjectModel.Server/Models/Message.cs
rename to src/dotnet-projectmodel-server/Models/Message.cs
diff --git a/src/Microsoft.DotNet.ProjectModel.Server/Models/ProjectReferenceDescription.cs b/src/dotnet-projectmodel-server/Models/ProjectReferenceDescription.cs
similarity index 100%
rename from src/Microsoft.DotNet.ProjectModel.Server/Models/ProjectReferenceDescription.cs
rename to src/dotnet-projectmodel-server/Models/ProjectReferenceDescription.cs
diff --git a/src/Microsoft.DotNet.ProjectModel.Server/ProcessingQueue.cs b/src/dotnet-projectmodel-server/ProcessingQueue.cs
similarity index 100%
rename from src/Microsoft.DotNet.ProjectModel.Server/ProcessingQueue.cs
rename to src/dotnet-projectmodel-server/ProcessingQueue.cs
diff --git a/src/Microsoft.DotNet.ProjectModel.Server/Program.cs b/src/dotnet-projectmodel-server/Program.cs
similarity index 100%
rename from src/Microsoft.DotNet.ProjectModel.Server/Program.cs
rename to src/dotnet-projectmodel-server/Program.cs
diff --git a/src/Microsoft.DotNet.ProjectModel.Server/ProjectManager.cs b/src/dotnet-projectmodel-server/ProjectManager.cs
similarity index 100%
rename from src/Microsoft.DotNet.ProjectModel.Server/ProjectManager.cs
rename to src/dotnet-projectmodel-server/ProjectManager.cs
diff --git a/src/Microsoft.DotNet.ProjectModel.Server/ProtocolManager.cs b/src/dotnet-projectmodel-server/ProtocolManager.cs
similarity index 100%
rename from src/Microsoft.DotNet.ProjectModel.Server/ProtocolManager.cs
rename to src/dotnet-projectmodel-server/ProtocolManager.cs
diff --git a/src/Microsoft.DotNet.ProjectModel.Server/Microsoft.DotNet.ProjectModel.Server.xproj b/src/dotnet-projectmodel-server/dotnet-projectmodel-server.xproj
similarity index 100%
rename from src/Microsoft.DotNet.ProjectModel.Server/Microsoft.DotNet.ProjectModel.Server.xproj
rename to src/dotnet-projectmodel-server/dotnet-projectmodel-server.xproj
diff --git a/src/Microsoft.DotNet.ProjectModel.Server/project.json b/src/dotnet-projectmodel-server/project.json
similarity index 95%
rename from src/Microsoft.DotNet.ProjectModel.Server/project.json
rename to src/dotnet-projectmodel-server/project.json
index c7935fefb..3a0a33f61 100644
--- a/src/Microsoft.DotNet.ProjectModel.Server/project.json
+++ b/src/dotnet-projectmodel-server/project.json
@@ -1,5 +1,4 @@
 {
-    "name": "dotnet-projectmodel-server",
     "version": "1.0.0-*",
     "compilationOptions": {
         "emitEntryPoint": true
diff --git a/test/Microsoft.DotNet.ProjectModel.Server.Tests/DthTestClient.cs b/test/dotnet-projectmodel-server.Tests/DthTestClient.cs
similarity index 100%
rename from test/Microsoft.DotNet.ProjectModel.Server.Tests/DthTestClient.cs
rename to test/dotnet-projectmodel-server.Tests/DthTestClient.cs
diff --git a/test/Microsoft.DotNet.ProjectModel.Server.Tests/DthTestServer.cs b/test/dotnet-projectmodel-server.Tests/DthTestServer.cs
similarity index 100%
rename from test/Microsoft.DotNet.ProjectModel.Server.Tests/DthTestServer.cs
rename to test/dotnet-projectmodel-server.Tests/DthTestServer.cs
diff --git a/test/Microsoft.DotNet.ProjectModel.Server.Tests/DthTests.cs b/test/dotnet-projectmodel-server.Tests/DthTests.cs
similarity index 100%
rename from test/Microsoft.DotNet.ProjectModel.Server.Tests/DthTests.cs
rename to test/dotnet-projectmodel-server.Tests/DthTests.cs
diff --git a/test/Microsoft.DotNet.ProjectModel.Server.Tests/Helpers/DthMessage.cs b/test/dotnet-projectmodel-server.Tests/Helpers/DthMessage.cs
similarity index 100%
rename from test/Microsoft.DotNet.ProjectModel.Server.Tests/Helpers/DthMessage.cs
rename to test/dotnet-projectmodel-server.Tests/Helpers/DthMessage.cs
diff --git a/test/Microsoft.DotNet.ProjectModel.Server.Tests/Helpers/DthMessageCollectionExtension.cs b/test/dotnet-projectmodel-server.Tests/Helpers/DthMessageCollectionExtension.cs
similarity index 100%
rename from test/Microsoft.DotNet.ProjectModel.Server.Tests/Helpers/DthMessageCollectionExtension.cs
rename to test/dotnet-projectmodel-server.Tests/Helpers/DthMessageCollectionExtension.cs
diff --git a/test/Microsoft.DotNet.ProjectModel.Server.Tests/Helpers/DthMessageExtension.cs b/test/dotnet-projectmodel-server.Tests/Helpers/DthMessageExtension.cs
similarity index 100%
rename from test/Microsoft.DotNet.ProjectModel.Server.Tests/Helpers/DthMessageExtension.cs
rename to test/dotnet-projectmodel-server.Tests/Helpers/DthMessageExtension.cs
diff --git a/test/Microsoft.DotNet.ProjectModel.Server.Tests/Helpers/JArrayExtensions.cs b/test/dotnet-projectmodel-server.Tests/Helpers/JArrayExtensions.cs
similarity index 100%
rename from test/Microsoft.DotNet.ProjectModel.Server.Tests/Helpers/JArrayExtensions.cs
rename to test/dotnet-projectmodel-server.Tests/Helpers/JArrayExtensions.cs
diff --git a/test/Microsoft.DotNet.ProjectModel.Server.Tests/Helpers/JObjectExtensions.cs b/test/dotnet-projectmodel-server.Tests/Helpers/JObjectExtensions.cs
similarity index 100%
rename from test/Microsoft.DotNet.ProjectModel.Server.Tests/Helpers/JObjectExtensions.cs
rename to test/dotnet-projectmodel-server.Tests/Helpers/JObjectExtensions.cs
diff --git a/test/Microsoft.DotNet.ProjectModel.Server.Tests/Helpers/TestHelper.cs b/test/dotnet-projectmodel-server.Tests/Helpers/TestHelper.cs
similarity index 100%
rename from test/Microsoft.DotNet.ProjectModel.Server.Tests/Helpers/TestHelper.cs
rename to test/dotnet-projectmodel-server.Tests/Helpers/TestHelper.cs
diff --git a/test/Microsoft.DotNet.ProjectModel.Server.Tests/Microsoft.DotNet.ProjectModel.Server.Tests.xproj b/test/dotnet-projectmodel-server.Tests/dotnet-projectmodel-server.Tests.xproj
similarity index 100%
rename from test/Microsoft.DotNet.ProjectModel.Server.Tests/Microsoft.DotNet.ProjectModel.Server.Tests.xproj
rename to test/dotnet-projectmodel-server.Tests/dotnet-projectmodel-server.Tests.xproj
diff --git a/test/Microsoft.DotNet.ProjectModel.Server.Tests/project.json b/test/dotnet-projectmodel-server.Tests/project.json
similarity index 100%
rename from test/Microsoft.DotNet.ProjectModel.Server.Tests/project.json
rename to test/dotnet-projectmodel-server.Tests/project.json