diff --git a/.gitignore b/.gitignore
index e2179148cf..023ffa1262 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,6 +28,7 @@ node_modules
 *.sln.ide
 project.lock.json
 .vs/
+.vscode/
 launchSettings.json
 .build/
-.testPublish/
\ No newline at end of file
+.testPublish/
diff --git a/DiagnosticsPages.sln b/DiagnosticsPages.sln
index 2b442e391a..a21cb53511 100644
--- a/DiagnosticsPages.sln
+++ b/DiagnosticsPages.sln
@@ -47,8 +47,6 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.Middle
 EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.Diagnostics.FunctionalTests", "test\Microsoft.AspNetCore.Diagnostics.FunctionalTests\Microsoft.AspNetCore.Diagnostics.FunctionalTests.xproj", "{BFDFE1E3-A6A9-4DAB-8939-1DA306FC69C8}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNetCore.DiagnosticsViewPage.Sources", "src\Microsoft.AspNetCore.DiagnosticsViewPage.Sources\Microsoft.AspNetCore.DiagnosticsViewPage.Sources.xproj", "{B9F08060-621F-4E1F-BDA8-9C4EA107E08A}"
-EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ClassLibraryWithPortablePdbs", "test\ClassLibraryWithPortablePdbs\ClassLibraryWithPortablePdbs.xproj", "{AA3661A1-CE8D-4597-ADFD-A5A30834E5D0}"
 EndProject
 Global
@@ -255,18 +253,6 @@ Global
 		{BFDFE1E3-A6A9-4DAB-8939-1DA306FC69C8}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{BFDFE1E3-A6A9-4DAB-8939-1DA306FC69C8}.Release|x86.ActiveCfg = Release|Any CPU
 		{BFDFE1E3-A6A9-4DAB-8939-1DA306FC69C8}.Release|x86.Build.0 = Release|Any CPU
-		{B9F08060-621F-4E1F-BDA8-9C4EA107E08A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B9F08060-621F-4E1F-BDA8-9C4EA107E08A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B9F08060-621F-4E1F-BDA8-9C4EA107E08A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-		{B9F08060-621F-4E1F-BDA8-9C4EA107E08A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
-		{B9F08060-621F-4E1F-BDA8-9C4EA107E08A}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{B9F08060-621F-4E1F-BDA8-9C4EA107E08A}.Debug|x86.Build.0 = Debug|Any CPU
-		{B9F08060-621F-4E1F-BDA8-9C4EA107E08A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B9F08060-621F-4E1F-BDA8-9C4EA107E08A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B9F08060-621F-4E1F-BDA8-9C4EA107E08A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
-		{B9F08060-621F-4E1F-BDA8-9C4EA107E08A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
-		{B9F08060-621F-4E1F-BDA8-9C4EA107E08A}.Release|x86.ActiveCfg = Release|Any CPU
-		{B9F08060-621F-4E1F-BDA8-9C4EA107E08A}.Release|x86.Build.0 = Release|Any CPU
 		{AA3661A1-CE8D-4597-ADFD-A5A30834E5D0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{AA3661A1-CE8D-4597-ADFD-A5A30834E5D0}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{AA3661A1-CE8D-4597-ADFD-A5A30834E5D0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -301,7 +287,6 @@ Global
 		{95981429-F212-44E1-83AA-32DA9E2A517C} = {ACAA0157-A8C4-4152-93DE-90CCDF304087}
 		{B0166AED-738F-42EE-AF4D-C487C8B21521} = {2AF90579-B118-4583-AE88-672EFACB5BC4}
 		{BFDFE1E3-A6A9-4DAB-8939-1DA306FC69C8} = {2AF90579-B118-4583-AE88-672EFACB5BC4}
-		{B9F08060-621F-4E1F-BDA8-9C4EA107E08A} = {509A6F36-AD80-4A18-B5B1-717D38DFF29D}
 		{AA3661A1-CE8D-4597-ADFD-A5A30834E5D0} = {2AF90579-B118-4583-AE88-672EFACB5BC4}
 	EndGlobalSection
 EndGlobal
diff --git a/NuGetPackageVerifier.json b/NuGetPackageVerifier.json
index 6e62f6c278..b153ab1515 100644
--- a/NuGetPackageVerifier.json
+++ b/NuGetPackageVerifier.json
@@ -1,11 +1,5 @@
 {
-    "adx-nonshipping": {
-        "rules": [],
-        "packages": {
-            "Microsoft.AspNetCore.DiagnosticsViewPage.Sources": { }
-        }
-    },
-    "Default": { // Rules to run for packages not listed in any other set.
+    "Default": {
         "rules": [
             "DefaultCompositeRule"
         ]
diff --git a/src/Microsoft.AspNetCore.Diagnostics.Elm/project.json b/src/Microsoft.AspNetCore.Diagnostics.Elm/project.json
index 72d4be6d8b..12bb10415a 100644
--- a/src/Microsoft.AspNetCore.Diagnostics.Elm/project.json
+++ b/src/Microsoft.AspNetCore.Diagnostics.Elm/project.json
@@ -2,6 +2,7 @@
   "version": "0.3.0-*",
   "description": "ASP.NET Core Error Logging Middleware (ELM) to capture and display request logs.",
   "buildOptions": {
+    "compile": "../shared/**/*.cs",
     "keyFile": "../../tools/Key.snk",
     "nowarn": [
       "CS1591"
@@ -20,10 +21,6 @@
     ]
   },
   "dependencies": {
-    "Microsoft.AspNetCore.DiagnosticsViewPage.Sources": {
-      "type": "build",
-      "target": "project"
-    },
     "Microsoft.AspNetCore.Http.Abstractions": "1.2.0-*",
     "Microsoft.Extensions.Logging.Abstractions": "1.2.0-*",
     "Microsoft.Extensions.Options": "1.2.0-*",
diff --git a/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/project.json b/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/project.json
index 22d65bac40..9b10029e76 100644
--- a/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/project.json
+++ b/src/Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore/project.json
@@ -13,6 +13,7 @@
     ]
   },
   "buildOptions": {
+    "compile": "../shared/**/*.cs",
     "warningsAsErrors": true,
     "keyFile": "../../tools/Key.snk",
     "nowarn": [
@@ -21,10 +22,6 @@
     "xmlDoc": true
   },
   "dependencies": {
-    "Microsoft.AspNetCore.DiagnosticsViewPage.Sources": {
-      "type": "build",
-      "target": "project"
-    },
     "Microsoft.AspNetCore.Http.Abstractions": "1.2.0-*",
     "Microsoft.EntityFrameworkCore.Relational": "1.2.0-*",
     "Microsoft.Extensions.RazorViews.Sources": {
diff --git a/src/Microsoft.AspNetCore.Diagnostics/project.json b/src/Microsoft.AspNetCore.Diagnostics/project.json
index a11b2b3d7a..a4bf8f567d 100644
--- a/src/Microsoft.AspNetCore.Diagnostics/project.json
+++ b/src/Microsoft.AspNetCore.Diagnostics/project.json
@@ -2,6 +2,7 @@
   "version": "1.2.0-*",
   "description": "ASP.NET Core middleware for exception handling, exception display pages, and diagnostics information. Includes developer exception page middleware, exception handler middleware, runtime info middleware, status code page middleware, and welcome page middleware",
   "buildOptions": {
+    "compile": "../shared/**/*.cs",
     "warningsAsErrors": true,
     "keyFile": "../../tools/Key.snk",
     "nowarn": [
@@ -23,10 +24,6 @@
     "Microsoft.AspNetCore.Diagnostics.Abstractions": {
       "target": "project"
     },
-    "Microsoft.AspNetCore.DiagnosticsViewPage.Sources": {
-      "type": "build",
-      "target": "project"
-    },
     "Microsoft.AspNetCore.Hosting.Abstractions": "1.2.0-*",
     "Microsoft.AspNetCore.Http.Extensions": "1.2.0-*",
     "Microsoft.AspNetCore.WebUtilities": "1.2.0-*",
diff --git a/src/Microsoft.AspNetCore.DiagnosticsViewPage.Sources/Microsoft.AspNetCore.DiagnosticsViewPage.Sources.xproj b/src/Microsoft.AspNetCore.DiagnosticsViewPage.Sources/Microsoft.AspNetCore.DiagnosticsViewPage.Sources.xproj
deleted file mode 100644
index 7312cf2de3..0000000000
--- a/src/Microsoft.AspNetCore.DiagnosticsViewPage.Sources/Microsoft.AspNetCore.DiagnosticsViewPage.Sources.xproj
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.Props" Condition="'$(VSToolsPath)' != ''" />
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>b9f08060-621f-4e1f-bda8-9c4ea107e08a</ProjectGuid>
-    <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">.\obj</BaseIntermediateOutputPath>
-    <OutputPath Condition="'$(OutputPath)'=='' ">.\bin\</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SchemaVersion>2.0</SchemaVersion>
-  </PropertyGroup>
-  <Import Project="$(VSToolsPath)\DNX\Microsoft.DNX.targets" Condition="'$(VSToolsPath)' != ''" />
-</Project>
\ No newline at end of file
diff --git a/src/Microsoft.AspNetCore.DiagnosticsViewPage.Sources/project.json b/src/Microsoft.AspNetCore.DiagnosticsViewPage.Sources/project.json
deleted file mode 100644
index d40c402625..0000000000
--- a/src/Microsoft.AspNetCore.DiagnosticsViewPage.Sources/project.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "version": "1.2.0-*",
-  "shared": "*.cs",
-  "dependencies": {
-    "NETStandard.Library": "1.6.2-*"
-  },
-  "frameworks": {
-    "netstandard1.0": {}
-  }
-}
\ No newline at end of file
diff --git a/src/Microsoft.AspNetCore.DiagnosticsViewPage.Sources/AttributeValue.cs b/src/shared/AttributeValue.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.DiagnosticsViewPage.Sources/AttributeValue.cs
rename to src/shared/AttributeValue.cs
diff --git a/src/Microsoft.AspNetCore.DiagnosticsViewPage.Sources/BaseView.cs b/src/shared/BaseView.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.DiagnosticsViewPage.Sources/BaseView.cs
rename to src/shared/BaseView.cs
diff --git a/src/Microsoft.AspNetCore.DiagnosticsViewPage.Sources/HelperResult.cs b/src/shared/HelperResult.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.DiagnosticsViewPage.Sources/HelperResult.cs
rename to src/shared/HelperResult.cs