diff --git a/Mvc.NoFun.sln b/Mvc.NoFun.sln
index 99fecfc678..8a366513b6 100644
--- a/Mvc.NoFun.sln
+++ b/Mvc.NoFun.sln
@@ -54,7 +54,7 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Mvc.Xml",
 EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Mvc.Xml.Test", "test\Microsoft.AspNet.Mvc.Xml.Test\Microsoft.AspNet.Mvc.Xml.Test.kproj", "{22019146-BDFA-442E-8C8E-345FB9644578}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.PageExecutionInstrumentation", "src\Microsoft.AspNet.PageExecutionInstrumentation\Microsoft.AspNet.PageExecutionInstrumentation.kproj", "{4DA2D7C1-A7B6-4C01-B57D-89E6EA4609DE}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.PageExecutionInstrumentation.Interfaces", "src\Microsoft.AspNet.PageExecutionInstrumentation.Interfaces\Microsoft.AspNet.PageExecutionInstrumentation.Interfaces.kproj", "{4DA2D7C1-A7B6-4C01-B57D-89E6EA4609DE}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/Mvc.sln b/Mvc.sln
index 098e30615f..244b4d4860 100644
--- a/Mvc.sln
+++ b/Mvc.sln
@@ -138,7 +138,7 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ControllersFromServicesClas
 EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "RazorCompilerCacheWebSite", "test\WebSites\RazorCompilerCacheWebSite\RazorCompilerCacheWebSite.kproj", "{42C5D417-4060-48F4-BB28-E9E179007779}"
 EndProject
-Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.PageExecutionInstrumentation", "src\Microsoft.AspNet.PageExecutionInstrumentation\Microsoft.AspNet.PageExecutionInstrumentation.kproj", "{4DA2D7C1-A7B6-4C01-B57D-89E6EA4609DE}"
+Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.PageExecutionInstrumentation.Interfaces", "src\Microsoft.AspNet.PageExecutionInstrumentation.Interfaces\Microsoft.AspNet.PageExecutionInstrumentation.Interfaces.kproj", "{4DA2D7C1-A7B6-4C01-B57D-89E6EA4609DE}"
 EndProject
 Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "UserClassLibrary", "test\WebSites\UserClassLibrary\UserClassLibrary.kproj", "{C651F432-4EBE-41A6-BAD2-3E07CCBA209C}"
 EndProject
diff --git a/src/Microsoft.AspNet.Mvc.Razor/project.json b/src/Microsoft.AspNet.Mvc.Razor/project.json
index 41afe53d57..5c9622342c 100644
--- a/src/Microsoft.AspNet.Mvc.Razor/project.json
+++ b/src/Microsoft.AspNet.Mvc.Razor/project.json
@@ -9,7 +9,7 @@
         "Microsoft.AspNet.Mvc.Common": { "version": "6.0.0-*", "type": "build" },
         "Microsoft.AspNet.Mvc.Core": "6.0.0-*",
         "Microsoft.AspNet.Mvc.Razor.Host": "6.0.0-*",
-        "Microsoft.AspNet.PageExecutionInstrumentation" : "1.0.0-*",
+        "Microsoft.AspNet.PageExecutionInstrumentation.Interfaces" : "1.0.0-*",
         "Microsoft.Framework.Runtime.Roslyn.Common": "1.0.0-*",
         "Microsoft.Framework.Runtime.Roslyn.Interfaces": "1.0.0-*"
     },
diff --git a/src/Microsoft.AspNet.PageExecutionInstrumentation/IBufferedTextWriter.cs b/src/Microsoft.AspNet.PageExecutionInstrumentation.Interfaces/IBufferedTextWriter.cs
similarity index 100%
rename from src/Microsoft.AspNet.PageExecutionInstrumentation/IBufferedTextWriter.cs
rename to src/Microsoft.AspNet.PageExecutionInstrumentation.Interfaces/IBufferedTextWriter.cs
diff --git a/src/Microsoft.AspNet.PageExecutionInstrumentation/IPageExecutionContext.cs b/src/Microsoft.AspNet.PageExecutionInstrumentation.Interfaces/IPageExecutionContext.cs
similarity index 100%
rename from src/Microsoft.AspNet.PageExecutionInstrumentation/IPageExecutionContext.cs
rename to src/Microsoft.AspNet.PageExecutionInstrumentation.Interfaces/IPageExecutionContext.cs
diff --git a/src/Microsoft.AspNet.PageExecutionInstrumentation/IPageExecutionListenerFeature.cs b/src/Microsoft.AspNet.PageExecutionInstrumentation.Interfaces/IPageExecutionListenerFeature.cs
similarity index 100%
rename from src/Microsoft.AspNet.PageExecutionInstrumentation/IPageExecutionListenerFeature.cs
rename to src/Microsoft.AspNet.PageExecutionInstrumentation.Interfaces/IPageExecutionListenerFeature.cs
diff --git a/src/Microsoft.AspNet.PageExecutionInstrumentation/Microsoft.AspNet.PageExecutionInstrumentation.kproj b/src/Microsoft.AspNet.PageExecutionInstrumentation.Interfaces/Microsoft.AspNet.PageExecutionInstrumentation.Interfaces.kproj
similarity index 100%
rename from src/Microsoft.AspNet.PageExecutionInstrumentation/Microsoft.AspNet.PageExecutionInstrumentation.kproj
rename to src/Microsoft.AspNet.PageExecutionInstrumentation.Interfaces/Microsoft.AspNet.PageExecutionInstrumentation.Interfaces.kproj
diff --git a/src/Microsoft.AspNet.PageExecutionInstrumentation/project.json b/src/Microsoft.AspNet.PageExecutionInstrumentation.Interfaces/project.json
similarity index 100%
rename from src/Microsoft.AspNet.PageExecutionInstrumentation/project.json
rename to src/Microsoft.AspNet.PageExecutionInstrumentation.Interfaces/project.json