diff --git a/BuildAndTest.proj b/BuildAndTest.proj
index 54b9c3561cbad7b49f02c5c3fa9dc94e7ed18d9d..32bcee16bcea1a5fb92edd6947cafc6bae295dfb 100644
--- a/BuildAndTest.proj
+++ b/BuildAndTest.proj
@@ -100,7 +100,7 @@
     <PropertyGroup>
       <CoreRunExe>$(CoreClrTestDirectory)\CoreRun.exe</CoreRunExe>
       <CoreRunArgs>$(CoreClrTestDirectory)\xunit.console.netcore.exe @(CoreTestAssemblies, ' ') -parallel all -xml $(CoreClrTestDirectory)\xUnitResults\TestResults.xml</CoreRunArgs>
-      <RunTestsExe>Binaries\$(Configuration)\Tools\RunTests\RunTests.exe</RunTestsExe>
+      <RunTestsExe>Binaries\$(Configuration)\Exes\RunTests\RunTests.exe</RunTestsExe>
       <RunTestsArgs>$(NuGetPackageRoot)\xunit.runner.console\$(xunitrunnerconsoleVersion)\tools $(RunTestArgs) @(TestAssemblies, ' ')</RunTestsArgs>
     </PropertyGroup>
     
diff --git a/build/config/SignToolData.json b/build/config/SignToolData.json
index 31a282d0d2c59cc80aa3545cd6d731d50648af87..811c5f856f8c765024a78ef4e4706ba5229b38a9 100644
--- a/build/config/SignToolData.json
+++ b/build/config/SignToolData.json
@@ -52,8 +52,8 @@
                 "Exes\\vbccore\\vbc.exe",
                 "Exes\\vbi\\vbi.exe",
                 "Exes\\vbicore\\vbi.exe",
-                "Tools\\Pdb2Xml\\Microsoft.DiaSymReader.PortablePdb.dll",
-                "Tools\\Pdb2Xml\\Pdb2Xml.exe",
+                "Exes\\Pdb2Xml\\Microsoft.DiaSymReader.PortablePdb.dll",
+                "Exes\\Pdb2Xml\\Pdb2Xml.exe",
                 "Vsix\\CompilerExtension\\Roslyn.Compilers.Extension.dll",
                 "Vsix\\Templates\\Roslyn.Templates.dll",
                 "Vsix\\VisualStudioDiagnosticsWindow\\Roslyn.VisualStudio.DiagnosticsWindow.dll",
diff --git a/cibuild.cmd b/cibuild.cmd
index 95070fffcdcc6377c1e15cb3c72057997f2c9af4..4184996b9e9445b669d466d288a2d454034a20de 100644
--- a/cibuild.cmd
+++ b/cibuild.cmd
@@ -119,7 +119,7 @@ call :TerminateBuildProcesses
 
 REM Verify the state of our project.jsons
 echo Running RepoUtil
-.\Binaries\%BuildConfiguration%\Tools\RepoUtil\RepoUtil.exe verify || goto :BuildFailed
+.\Binaries\%BuildConfiguration%\Exes\RepoUtil\RepoUtil.exe verify || goto :BuildFailed
 
 REM Verify the state of our project.jsons
 echo Running BuildBoss
diff --git a/src/Setup/DevDivInsertionFiles/DevDivInsertionFiles.vbproj b/src/Setup/DevDivInsertionFiles/DevDivInsertionFiles.vbproj
index 8bd9a8438068522a05c3c611a73fd890fe3b3786..c003da1bc56b06e314f2e2bf48fb2683e55417ac 100644
--- a/src/Setup/DevDivInsertionFiles/DevDivInsertionFiles.vbproj
+++ b/src/Setup/DevDivInsertionFiles/DevDivInsertionFiles.vbproj
@@ -8,7 +8,7 @@
     <RootNamespace>Roslyn.BuildDevDivInsertionFiles</RootNamespace>
     <AssemblyName>Roslyn.BuildDevDivInsertionFiles</AssemblyName>
     <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
-    <RoslynProjectType>ToolDesktop</RoslynProjectType>
+    <RoslynProjectType>ExeDesktop</RoslynProjectType>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
   </PropertyGroup>
diff --git a/src/Setup/SetupStep2.proj b/src/Setup/SetupStep2.proj
index 30063720be332e8f76d26869f0ac52de6a067072..6128f7f9165f4de5e80ef19f91b42e4d77e82567 100644
--- a/src/Setup/SetupStep2.proj
+++ b/src/Setup/SetupStep2.proj
@@ -7,7 +7,7 @@
 
     <!-- Build CoreXT packages for insertion into DevDiv (order of the following actions matters) -->
     <MSBuild Projects="DevDivInsertionFiles\DevDivInsertionFiles.sln" />
-    <Exec Command='"$(OutDir)\Tools\DevDivInsertionFiles\Roslyn.BuildDevDivInsertionFiles.exe" "$(OutDir)\" "$(MSBuildThisFileDirectory)\" "$(NuGetPackageRoot)" $(AssemblyVersion)' LogStandardErrorAsError="true" />
+    <Exec Command='"$(OutDir)\Exes\DevDivInsertionFiles\Roslyn.BuildDevDivInsertionFiles.exe" "$(OutDir)\" "$(MSBuildThisFileDirectory)\" "$(NuGetPackageRoot)" $(AssemblyVersion)' LogStandardErrorAsError="true" />
     <MSBuild Projects="DevDivPackages\Roslyn.proj" />
     <MSBuild Projects="DevDivVsix\PortableFacades\PortableFacades.vsmanproj" />
     <MSBuild Projects="DevDivVsix\CompilersPackage\Microsoft.CodeAnalysis.Compilers.vsmanproj" />
diff --git a/src/Tools/BuildBoss/ProjectUtil.cs b/src/Tools/BuildBoss/ProjectUtil.cs
index 8709c9a676689688521147a79091c2b115d90e51..c33df3e05265f4c54b1e4cfbd5bd834af12afccd 100644
--- a/src/Tools/BuildBoss/ProjectUtil.cs
+++ b/src/Tools/BuildBoss/ProjectUtil.cs
@@ -75,7 +75,6 @@ private bool CheckRoslynProjectType(TextWriter textWriter)
             {
                 case "Dll":
                 case "ExeDesktop":
-                case "ToolDesktop":
                 case "ExeCoreClr":
                 case "UnitTest":
                 case "UnitTestNext":
@@ -83,7 +82,6 @@ private bool CheckRoslynProjectType(TextWriter textWriter)
                 case "DeploymentCompilerGeneratorTools":
                 case "Deployment":
                 case "Vsix":
-                case "Ignore":
                 case "Dependency":
                 case "Custom":
                     return true;
diff --git a/src/Tools/ProcessWatchdog/ProcessWatchdog.csproj b/src/Tools/ProcessWatchdog/ProcessWatchdog.csproj
index 7a50af837afc55e9418fa291e280326a096439c1..f118851a489815f8e8065a2b71474897ea2866b7 100644
--- a/src/Tools/ProcessWatchdog/ProcessWatchdog.csproj
+++ b/src/Tools/ProcessWatchdog/ProcessWatchdog.csproj
@@ -11,7 +11,7 @@
     <AssemblyName>ProcessWatchdog</AssemblyName>
     <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
     <SignAssembly>false</SignAssembly>
-    <RoslynProjectType>ToolDesktop</RoslynProjectType>
+    <RoslynProjectType>ExeDesktop</RoslynProjectType>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
diff --git a/src/Tools/RepoUtil/RepoUtil.csproj b/src/Tools/RepoUtil/RepoUtil.csproj
index a69915d711b2df2a2642418b354d54749bc9ae27..8ee069359661e2a00bb2383bd630f48aa1865a0e 100644
--- a/src/Tools/RepoUtil/RepoUtil.csproj
+++ b/src/Tools/RepoUtil/RepoUtil.csproj
@@ -27,7 +27,7 @@
     <IsWebBootstrapper>false</IsWebBootstrapper>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
-    <RoslynProjectType>ToolDesktop</RoslynProjectType>
+    <RoslynProjectType>ExeDesktop</RoslynProjectType>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
diff --git a/src/Tools/Source/MetadataVisualizer/MetadataVisualizer.csproj b/src/Tools/Source/MetadataVisualizer/MetadataVisualizer.csproj
index d21664a0c609b9590cd927af517c809599e16447..1b8d065a22b3d776a7135862a6293a87b9297bb3 100644
--- a/src/Tools/Source/MetadataVisualizer/MetadataVisualizer.csproj
+++ b/src/Tools/Source/MetadataVisualizer/MetadataVisualizer.csproj
@@ -13,7 +13,7 @@
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <RoslynProjectType>ToolDesktop</RoslynProjectType>
+    <RoslynProjectType>ExeDesktop</RoslynProjectType>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
diff --git a/src/Tools/Source/Pdb2Xml/Pdb2Xml.csproj b/src/Tools/Source/Pdb2Xml/Pdb2Xml.csproj
index 1808f4345be8e21437c02e4a069a7239e1d56d25..83ade3e5713a35622aebafb1a0f002c080e14598 100644
--- a/src/Tools/Source/Pdb2Xml/Pdb2Xml.csproj
+++ b/src/Tools/Source/Pdb2Xml/Pdb2Xml.csproj
@@ -13,7 +13,7 @@
     <Prefer32Bit>false</Prefer32Bit>
     <LargeAddressAware>true</LargeAddressAware>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <RoslynProjectType>ToolDesktop</RoslynProjectType>
+    <RoslynProjectType>ExeDesktop</RoslynProjectType>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
diff --git a/src/Tools/Source/RunTests/RunTests.csproj b/src/Tools/Source/RunTests/RunTests.csproj
index 93817ab4faa6686d4212c9688ee87acfa15f31b3..f76dde9ebf5f9858be952365c897e1a3f203adcf 100644
--- a/src/Tools/Source/RunTests/RunTests.csproj
+++ b/src/Tools/Source/RunTests/RunTests.csproj
@@ -11,7 +11,7 @@
     <AssemblyName>RunTests</AssemblyName>
     <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
     <SignAssembly>false</SignAssembly>
-    <RoslynProjectType>ToolDesktop</RoslynProjectType>
+    <RoslynProjectType>ExeDesktop</RoslynProjectType>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />