diff --git a/NuGetPackageVerifier.json b/NuGetPackageVerifier.json
index 6cbde058da..c91ce34b30 100644
--- a/NuGetPackageVerifier.json
+++ b/NuGetPackageVerifier.json
@@ -13,7 +13,8 @@
             // Don't run any rules for packages the ADX team creates but doesn't ship.
         ],
         "packages": {
-            "Microsoft.AspNetCore.Razor.Test.Sources": { }
+            "Microsoft.AspNetCore.Razor.Test.Sources": { },
+            "RazorPageGenerator": { }
         }
     },
     "Default": { // Rules to run for packages not listed in any other set.
diff --git a/Razor.sln b/Razor.sln
index c59344b6c9..34fb26682b 100644
--- a/Razor.sln
+++ b/Razor.sln
@@ -22,9 +22,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		NuGet.config = NuGet.config
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{A53A3B44-0456-4832-87F6-5BA85224851C}"
-EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "RazorPageGenerator", "tools\RazorPageGenerator\RazorPageGenerator.xproj", "{0FC7CE11-DC10-499E-8B91-8D9CADAEFBEB}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "RazorPageGenerator", "src\RazorPageGenerator\RazorPageGenerator.xproj", "{7BE58880-36AD-4CD5-9E16-2A5AFEA790EF}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -52,10 +50,10 @@ Global
 		{E3A2A305-634D-4BA6-95DB-AA06D6C442B0}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E3A2A305-634D-4BA6-95DB-AA06D6C442B0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E3A2A305-634D-4BA6-95DB-AA06D6C442B0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0FC7CE11-DC10-499E-8B91-8D9CADAEFBEB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0FC7CE11-DC10-499E-8B91-8D9CADAEFBEB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0FC7CE11-DC10-499E-8B91-8D9CADAEFBEB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0FC7CE11-DC10-499E-8B91-8D9CADAEFBEB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7BE58880-36AD-4CD5-9E16-2A5AFEA790EF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7BE58880-36AD-4CD5-9E16-2A5AFEA790EF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7BE58880-36AD-4CD5-9E16-2A5AFEA790EF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7BE58880-36AD-4CD5-9E16-2A5AFEA790EF}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -66,6 +64,6 @@ Global
 		{D0196096-1B01-4133-AACE-1A10A0F7247C} = {3C0D6505-79B3-49D0-B4C3-176F0F1836ED}
 		{0535998A-E32C-4D1A-80D1-0B15A513C471} = {92463391-81BE-462B-AC3C-78C6C760741F}
 		{E3A2A305-634D-4BA6-95DB-AA06D6C442B0} = {3C0D6505-79B3-49D0-B4C3-176F0F1836ED}
-		{0FC7CE11-DC10-499E-8B91-8D9CADAEFBEB} = {A53A3B44-0456-4832-87F6-5BA85224851C}
+		{7BE58880-36AD-4CD5-9E16-2A5AFEA790EF} = {3C0D6505-79B3-49D0-B4C3-176F0F1836ED}
 	EndGlobalSection
 EndGlobal
diff --git a/tools/RazorPageGenerator/Program.cs b/src/RazorPageGenerator/Program.cs
similarity index 100%
rename from tools/RazorPageGenerator/Program.cs
rename to src/RazorPageGenerator/Program.cs
diff --git a/tools/RazorPageGenerator/RazorPageGenerator.xproj b/src/RazorPageGenerator/RazorPageGenerator.xproj
similarity index 93%
rename from tools/RazorPageGenerator/RazorPageGenerator.xproj
rename to src/RazorPageGenerator/RazorPageGenerator.xproj
index 950e957d69..0c73d8f421 100644
--- a/tools/RazorPageGenerator/RazorPageGenerator.xproj
+++ b/src/RazorPageGenerator/RazorPageGenerator.xproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
   <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.Props" Condition="'$(VSToolsPath)' != ''" />
   <PropertyGroup Label="Globals">
-    <ProjectGuid>0fc7ce11-dc10-499e-8b91-8d9cadaefbeb</ProjectGuid>
+    <ProjectGuid>7be58880-36ad-4cd5-9e16-2a5afea790ef</ProjectGuid>
     <RootNamespace>RazorPageGenerator</RootNamespace>
     <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
     <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
diff --git a/tools/RazorPageGenerator/project.json b/src/RazorPageGenerator/project.json
similarity index 100%
rename from tools/RazorPageGenerator/project.json
rename to src/RazorPageGenerator/project.json