diff --git a/Razor.sln b/Razor.sln
index 68c31490a6..f860064d58 100644
--- a/Razor.sln
+++ b/Razor.sln
@@ -31,8 +31,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CodeAnalysis.Remo
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tooling", "tooling", "{C0CC1E1F-1559-44DE-93A8-63259CEA2AAB}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.VisualStudio.LanguageServices.Razor", "tooling\Microsoft.VisualStudio.LanguageServices.Razor\Microsoft.VisualStudio.LanguageServices.Razor.csproj", "{53489966-7486-434F-AA76-6FBC488E3D29}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.VisualStudio.RazorExtension", "tooling\Microsoft.VisualStudio.RazorExtension\Microsoft.VisualStudio.RazorExtension.csproj", "{D66B45B5-CBFD-4947-81F1-F30AB80EA992}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.CodeAnalysis.Razor.Workspaces.Test", "test\Microsoft.CodeAnalysis.Razor.Workspaces.Test\Microsoft.CodeAnalysis.Razor.Workspaces.Test.csproj", "{053B72C3-67BB-4C0D-BF94-34D435E2E42F}"
@@ -41,6 +39,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CodeAnalysis.Razo
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.CodeAnalysis.Razor.Test", "test\Microsoft.CodeAnalysis.Razor.Test\Microsoft.CodeAnalysis.Razor.Test.csproj", "{7A8A1664-37CE-4376-81CA-1862CF5F91D9}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.VisualStudio.LanguageServices.Razor", "src\Microsoft.VisualStudio.LanguageServices.Razor\Microsoft.VisualStudio.LanguageServices.Razor.csproj", "{E5D92DB7-5CBF-410A-9685-FF76F71EC96F}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -159,18 +159,6 @@ Global
 		{4EAD959D-73B2-4FB2-B46F-16CEB1EF49D4}.Release|x64.Build.0 = Release|x64
 		{4EAD959D-73B2-4FB2-B46F-16CEB1EF49D4}.Release|x86.ActiveCfg = Release|x86
 		{4EAD959D-73B2-4FB2-B46F-16CEB1EF49D4}.Release|x86.Build.0 = Release|x86
-		{53489966-7486-434F-AA76-6FBC488E3D29}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{53489966-7486-434F-AA76-6FBC488E3D29}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{53489966-7486-434F-AA76-6FBC488E3D29}.Debug|x64.ActiveCfg = Debug|x64
-		{53489966-7486-434F-AA76-6FBC488E3D29}.Debug|x64.Build.0 = Debug|x64
-		{53489966-7486-434F-AA76-6FBC488E3D29}.Debug|x86.ActiveCfg = Debug|x86
-		{53489966-7486-434F-AA76-6FBC488E3D29}.Debug|x86.Build.0 = Debug|x86
-		{53489966-7486-434F-AA76-6FBC488E3D29}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{53489966-7486-434F-AA76-6FBC488E3D29}.Release|Any CPU.Build.0 = Release|Any CPU
-		{53489966-7486-434F-AA76-6FBC488E3D29}.Release|x64.ActiveCfg = Release|x64
-		{53489966-7486-434F-AA76-6FBC488E3D29}.Release|x64.Build.0 = Release|x64
-		{53489966-7486-434F-AA76-6FBC488E3D29}.Release|x86.ActiveCfg = Release|x86
-		{53489966-7486-434F-AA76-6FBC488E3D29}.Release|x86.Build.0 = Release|x86
 		{D66B45B5-CBFD-4947-81F1-F30AB80EA992}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D66B45B5-CBFD-4947-81F1-F30AB80EA992}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D66B45B5-CBFD-4947-81F1-F30AB80EA992}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -219,6 +207,18 @@ Global
 		{7A8A1664-37CE-4376-81CA-1862CF5F91D9}.Release|x64.Build.0 = Release|x64
 		{7A8A1664-37CE-4376-81CA-1862CF5F91D9}.Release|x86.ActiveCfg = Release|x86
 		{7A8A1664-37CE-4376-81CA-1862CF5F91D9}.Release|x86.Build.0 = Release|x86
+		{E5D92DB7-5CBF-410A-9685-FF76F71EC96F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E5D92DB7-5CBF-410A-9685-FF76F71EC96F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E5D92DB7-5CBF-410A-9685-FF76F71EC96F}.Debug|x64.ActiveCfg = Debug|x64
+		{E5D92DB7-5CBF-410A-9685-FF76F71EC96F}.Debug|x64.Build.0 = Debug|x64
+		{E5D92DB7-5CBF-410A-9685-FF76F71EC96F}.Debug|x86.ActiveCfg = Debug|x86
+		{E5D92DB7-5CBF-410A-9685-FF76F71EC96F}.Debug|x86.Build.0 = Debug|x86
+		{E5D92DB7-5CBF-410A-9685-FF76F71EC96F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E5D92DB7-5CBF-410A-9685-FF76F71EC96F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E5D92DB7-5CBF-410A-9685-FF76F71EC96F}.Release|x64.ActiveCfg = Release|x64
+		{E5D92DB7-5CBF-410A-9685-FF76F71EC96F}.Release|x64.Build.0 = Release|x64
+		{E5D92DB7-5CBF-410A-9685-FF76F71EC96F}.Release|x86.ActiveCfg = Release|x86
+		{E5D92DB7-5CBF-410A-9685-FF76F71EC96F}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -233,10 +233,10 @@ Global
 		{277AB67E-9C8D-4799-A18C-C628E70A8664} = {92463391-81BE-462B-AC3C-78C6C760741F}
 		{0F265874-C592-448B-BC4F-3430AB03E0DC} = {3C0D6505-79B3-49D0-B4C3-176F0F1836ED}
 		{4EAD959D-73B2-4FB2-B46F-16CEB1EF49D4} = {3C0D6505-79B3-49D0-B4C3-176F0F1836ED}
-		{53489966-7486-434F-AA76-6FBC488E3D29} = {C0CC1E1F-1559-44DE-93A8-63259CEA2AAB}
 		{D66B45B5-CBFD-4947-81F1-F30AB80EA992} = {C0CC1E1F-1559-44DE-93A8-63259CEA2AAB}
 		{053B72C3-67BB-4C0D-BF94-34D435E2E42F} = {92463391-81BE-462B-AC3C-78C6C760741F}
 		{42403DAF-F0BC-4F3A-B7F2-46D7013345D8} = {3C0D6505-79B3-49D0-B4C3-176F0F1836ED}
 		{7A8A1664-37CE-4376-81CA-1862CF5F91D9} = {92463391-81BE-462B-AC3C-78C6C760741F}
+		{E5D92DB7-5CBF-410A-9685-FF76F71EC96F} = {3C0D6505-79B3-49D0-B4C3-176F0F1836ED}
 	EndGlobalSection
 EndGlobal
diff --git a/tooling/Microsoft.VisualStudio.LanguageServices.Razor/DefaultRazorEngineAssemblyResolver.cs b/src/Microsoft.VisualStudio.LanguageServices.Razor/DefaultRazorEngineAssemblyResolver.cs
similarity index 100%
rename from tooling/Microsoft.VisualStudio.LanguageServices.Razor/DefaultRazorEngineAssemblyResolver.cs
rename to src/Microsoft.VisualStudio.LanguageServices.Razor/DefaultRazorEngineAssemblyResolver.cs
diff --git a/tooling/Microsoft.VisualStudio.LanguageServices.Razor/DefaultRazorEngineDirectiveResolver.cs b/src/Microsoft.VisualStudio.LanguageServices.Razor/DefaultRazorEngineDirectiveResolver.cs
similarity index 100%
rename from tooling/Microsoft.VisualStudio.LanguageServices.Razor/DefaultRazorEngineDirectiveResolver.cs
rename to src/Microsoft.VisualStudio.LanguageServices.Razor/DefaultRazorEngineDirectiveResolver.cs
diff --git a/tooling/Microsoft.VisualStudio.LanguageServices.Razor/DefaultRazorEngineDocumentGenerator.cs b/src/Microsoft.VisualStudio.LanguageServices.Razor/DefaultRazorEngineDocumentGenerator.cs
similarity index 100%
rename from tooling/Microsoft.VisualStudio.LanguageServices.Razor/DefaultRazorEngineDocumentGenerator.cs
rename to src/Microsoft.VisualStudio.LanguageServices.Razor/DefaultRazorEngineDocumentGenerator.cs
diff --git a/tooling/Microsoft.VisualStudio.LanguageServices.Razor/DefaultTagHelperResolver.cs b/src/Microsoft.VisualStudio.LanguageServices.Razor/DefaultTagHelperResolver.cs
similarity index 100%
rename from tooling/Microsoft.VisualStudio.LanguageServices.Razor/DefaultTagHelperResolver.cs
rename to src/Microsoft.VisualStudio.LanguageServices.Razor/DefaultTagHelperResolver.cs
diff --git a/tooling/Microsoft.VisualStudio.LanguageServices.Razor/IRazorEngineAssemblyResolver.cs b/src/Microsoft.VisualStudio.LanguageServices.Razor/IRazorEngineAssemblyResolver.cs
similarity index 100%
rename from tooling/Microsoft.VisualStudio.LanguageServices.Razor/IRazorEngineAssemblyResolver.cs
rename to src/Microsoft.VisualStudio.LanguageServices.Razor/IRazorEngineAssemblyResolver.cs
diff --git a/tooling/Microsoft.VisualStudio.LanguageServices.Razor/IRazorEngineDirectiveResolver.cs b/src/Microsoft.VisualStudio.LanguageServices.Razor/IRazorEngineDirectiveResolver.cs
similarity index 100%
rename from tooling/Microsoft.VisualStudio.LanguageServices.Razor/IRazorEngineDirectiveResolver.cs
rename to src/Microsoft.VisualStudio.LanguageServices.Razor/IRazorEngineDirectiveResolver.cs
diff --git a/tooling/Microsoft.VisualStudio.LanguageServices.Razor/IRazorEngineDocumentGenerator.cs b/src/Microsoft.VisualStudio.LanguageServices.Razor/IRazorEngineDocumentGenerator.cs
similarity index 100%
rename from tooling/Microsoft.VisualStudio.LanguageServices.Razor/IRazorEngineDocumentGenerator.cs
rename to src/Microsoft.VisualStudio.LanguageServices.Razor/IRazorEngineDocumentGenerator.cs
diff --git a/tooling/Microsoft.VisualStudio.LanguageServices.Razor/ITagHelperResolver.cs b/src/Microsoft.VisualStudio.LanguageServices.Razor/ITagHelperResolver.cs
similarity index 100%
rename from tooling/Microsoft.VisualStudio.LanguageServices.Razor/ITagHelperResolver.cs
rename to src/Microsoft.VisualStudio.LanguageServices.Razor/ITagHelperResolver.cs
diff --git a/tooling/Microsoft.VisualStudio.LanguageServices.Razor/Microsoft.VisualStudio.LanguageServices.Razor.csproj b/src/Microsoft.VisualStudio.LanguageServices.Razor/Microsoft.VisualStudio.LanguageServices.Razor.csproj
similarity index 73%
rename from tooling/Microsoft.VisualStudio.LanguageServices.Razor/Microsoft.VisualStudio.LanguageServices.Razor.csproj
rename to src/Microsoft.VisualStudio.LanguageServices.Razor/Microsoft.VisualStudio.LanguageServices.Razor.csproj
index d7f498de03..507256e96d 100644
--- a/tooling/Microsoft.VisualStudio.LanguageServices.Razor/Microsoft.VisualStudio.LanguageServices.Razor.csproj
+++ b/src/Microsoft.VisualStudio.LanguageServices.Razor/Microsoft.VisualStudio.LanguageServices.Razor.csproj
@@ -8,6 +8,10 @@
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PackageTargetFallback>$(PackageTargetFallback);portable-net45+win8+wp8+wpa81;</PackageTargetFallback>
     <RootNamespace>Microsoft.VisualStudio.LanguageServices.Razor</RootNamespace>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <Description>Razor is a markup syntax for adding server-side logic to web pages. This package contains the Razor design-time infrastructure.</Description>
+    <PackageTags>aspnetcore;cshtml;razor</PackageTags>
+    <PackageTargetFallback>$(PackageTargetFallback);portable-net45+win8+wp8+wpa81;</PackageTargetFallback>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/tooling/Microsoft.VisualStudio.LanguageServices.Razor/Properties/AssemblyInfo.cs b/src/Microsoft.VisualStudio.LanguageServices.Razor/Properties/AssemblyInfo.cs
similarity index 100%
rename from tooling/Microsoft.VisualStudio.LanguageServices.Razor/Properties/AssemblyInfo.cs
rename to src/Microsoft.VisualStudio.LanguageServices.Razor/Properties/AssemblyInfo.cs
diff --git a/tooling/Microsoft.VisualStudio.LanguageServices.Razor/RazorEngineAssembly.cs b/src/Microsoft.VisualStudio.LanguageServices.Razor/RazorEngineAssembly.cs
similarity index 100%
rename from tooling/Microsoft.VisualStudio.LanguageServices.Razor/RazorEngineAssembly.cs
rename to src/Microsoft.VisualStudio.LanguageServices.Razor/RazorEngineAssembly.cs
diff --git a/tooling/Microsoft.VisualStudio.LanguageServices.Razor/RazorEngineDocument.cs b/src/Microsoft.VisualStudio.LanguageServices.Razor/RazorEngineDocument.cs
similarity index 100%
rename from tooling/Microsoft.VisualStudio.LanguageServices.Razor/RazorEngineDocument.cs
rename to src/Microsoft.VisualStudio.LanguageServices.Razor/RazorEngineDocument.cs
diff --git a/tooling/Microsoft.VisualStudio.LanguageServices.Razor/ReflectionNames.cs b/src/Microsoft.VisualStudio.LanguageServices.Razor/ReflectionNames.cs
similarity index 100%
rename from tooling/Microsoft.VisualStudio.LanguageServices.Razor/ReflectionNames.cs
rename to src/Microsoft.VisualStudio.LanguageServices.Razor/ReflectionNames.cs
diff --git a/tooling/Microsoft.VisualStudio.RazorExtension/Microsoft.VisualStudio.RazorExtension.csproj b/tooling/Microsoft.VisualStudio.RazorExtension/Microsoft.VisualStudio.RazorExtension.csproj
index b121c70807..25b39ca0c7 100644
--- a/tooling/Microsoft.VisualStudio.RazorExtension/Microsoft.VisualStudio.RazorExtension.csproj
+++ b/tooling/Microsoft.VisualStudio.RazorExtension/Microsoft.VisualStudio.RazorExtension.csproj
@@ -361,7 +361,7 @@
       <IncludeOutputGroupsInVSIXLocalOnly>
       </IncludeOutputGroupsInVSIXLocalOnly>
     </ProjectReference>
-    <ProjectReference Include="..\Microsoft.VisualStudio.LanguageServices.Razor\Microsoft.VisualStudio.LanguageServices.Razor.csproj">
+    <ProjectReference Include="..\..\src\Microsoft.VisualStudio.LanguageServices.Razor\Microsoft.VisualStudio.LanguageServices.Razor.csproj">
       <Project>{92114fe9-cb07-4712-9aa4-afab65ca28e1}</Project>
       <Name>Microsoft.VisualStudio.LanguageServices.Razor</Name>
       <Private>False</Private>
@@ -374,9 +374,9 @@
   <!-- Workaround for https://github.com/dotnet/sdk/issues/433 -->
   <ItemGroup>
     <VSIXSourceItem Include="..\..\src\Microsoft.CodeAnalysis.Remote.Razor\bin\$(Configuration)\net46\Microsoft.CodeAnalysis.Remote.Razor.dll" />
-    <VSIXSourceItem Include="..\Microsoft.VisualStudio.LanguageServices.Razor\bin\$(Configuration)\net46\Microsoft.AspNetCore.Razor.Evolution.dll" />
-    <VSIXSourceItem Include="..\Microsoft.VisualStudio.LanguageServices.Razor\bin\$(Configuration)\net46\Microsoft.CodeAnalysis.Razor.Workspaces.dll" />
-    <VSIXSourceItem Include="..\Microsoft.VisualStudio.LanguageServices.Razor\bin\$(Configuration)\net46\Microsoft.VisualStudio.LanguageServices.Razor.dll" />
+    <VSIXSourceItem Include="..\..\src\Microsoft.VisualStudio.LanguageServices.Razor\bin\$(Configuration)\net46\Microsoft.AspNetCore.Razor.Evolution.dll" />
+    <VSIXSourceItem Include="..\..\src\Microsoft.VisualStudio.LanguageServices.Razor\bin\$(Configuration)\net46\Microsoft.CodeAnalysis.Razor.Workspaces.dll" />
+    <VSIXSourceItem Include="..\..\src\Microsoft.VisualStudio.LanguageServices.Razor\bin\$(Configuration)\net46\Microsoft.VisualStudio.LanguageServices.Razor.dll" />
     <Content Include="@(VSIXSourceItem)">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>