diff --git a/src/Microsoft.AspNet.CoreServices/Microsoft.AspNet.CoreServices.csproj b/src/Microsoft.AspNet.CoreServices/Microsoft.AspNet.CoreServices.csproj
index 390e17d671..2b2db0a0e9 100644
--- a/src/Microsoft.AspNet.CoreServices/Microsoft.AspNet.CoreServices.csproj
+++ b/src/Microsoft.AspNet.CoreServices/Microsoft.AspNet.CoreServices.csproj
@@ -38,13 +38,6 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="ActivatorUtilities.cs" />
-    <Compile Include="Compilation\CompilationFailedException.cs" />
-    <Compile Include="Compilation\CompilationMessage.cs" />
-    <Compile Include="Compilation\CompilationResult.cs" />
-    <Compile Include="Compilation\CompilerCache.cs" />
-    <Compile Include="Compilation\CscBasedCompilationService.cs" />
-    <Compile Include="Compilation\DefaultCompilationService.cs" />
-    <Compile Include="Compilation\ICompilationService.cs" />
     <Compile Include="ServiceProvider.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="ServiceProviderExtensions.cs" />
diff --git a/src/Microsoft.AspNet.CoreServices/Compilation/CompilationFailedException.cs b/src/Microsoft.AspNet.Mvc.Razor/Compilation/CompilationFailedException.cs
similarity index 96%
rename from src/Microsoft.AspNet.CoreServices/Compilation/CompilationFailedException.cs
rename to src/Microsoft.AspNet.Mvc.Razor/Compilation/CompilationFailedException.cs
index 69a42bc6dd..d3fe84152e 100644
--- a/src/Microsoft.AspNet.CoreServices/Compilation/CompilationFailedException.cs
+++ b/src/Microsoft.AspNet.Mvc.Razor/Compilation/CompilationFailedException.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace Microsoft.AspNet.CoreServices
+namespace Microsoft.AspNet.Mvc.Razor
 {
     public class CompilationFailedException : Exception
     {
diff --git a/src/Microsoft.AspNet.CoreServices/Compilation/CompilationMessage.cs b/src/Microsoft.AspNet.Mvc.Razor/Compilation/CompilationMessage.cs
similarity index 88%
rename from src/Microsoft.AspNet.CoreServices/Compilation/CompilationMessage.cs
rename to src/Microsoft.AspNet.Mvc.Razor/Compilation/CompilationMessage.cs
index 173841b449..ab5773a3c4 100644
--- a/src/Microsoft.AspNet.CoreServices/Compilation/CompilationMessage.cs
+++ b/src/Microsoft.AspNet.Mvc.Razor/Compilation/CompilationMessage.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace Microsoft.AspNet.CoreServices
+namespace Microsoft.AspNet.Mvc.Razor
 {
     public class CompilationMessage
     {
diff --git a/src/Microsoft.AspNet.CoreServices/Compilation/CompilationResult.cs b/src/Microsoft.AspNet.Mvc.Razor/Compilation/CompilationResult.cs
similarity index 96%
rename from src/Microsoft.AspNet.CoreServices/Compilation/CompilationResult.cs
rename to src/Microsoft.AspNet.Mvc.Razor/Compilation/CompilationResult.cs
index 0e4ce696df..c67cb9a7fc 100644
--- a/src/Microsoft.AspNet.CoreServices/Compilation/CompilationResult.cs
+++ b/src/Microsoft.AspNet.Mvc.Razor/Compilation/CompilationResult.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace Microsoft.AspNet.CoreServices
+namespace Microsoft.AspNet.Mvc.Razor
 {
     public class CompilationResult
     {
diff --git a/src/Microsoft.AspNet.CoreServices/Compilation/CompilerCache.cs b/src/Microsoft.AspNet.Mvc.Razor/Compilation/CompilerCache.cs
similarity index 96%
rename from src/Microsoft.AspNet.CoreServices/Compilation/CompilerCache.cs
rename to src/Microsoft.AspNet.Mvc.Razor/Compilation/CompilerCache.cs
index b0760bfc24..bbcb18e554 100644
--- a/src/Microsoft.AspNet.CoreServices/Compilation/CompilerCache.cs
+++ b/src/Microsoft.AspNet.Mvc.Razor/Compilation/CompilerCache.cs
@@ -3,7 +3,7 @@ using System.Collections.Concurrent;
 using System.Threading.Tasks;
 using Microsoft.Owin.FileSystems;
 
-namespace Microsoft.AspNet.CoreServices
+namespace Microsoft.AspNet.Mvc.Razor
 {
     public class CompilerCache
     {
diff --git a/src/Microsoft.AspNet.CoreServices/Compilation/CscBasedCompilationService.cs b/src/Microsoft.AspNet.Mvc.Razor/Compilation/CscBasedCompilationService.cs
similarity index 98%
rename from src/Microsoft.AspNet.CoreServices/Compilation/CscBasedCompilationService.cs
rename to src/Microsoft.AspNet.Mvc.Razor/Compilation/CscBasedCompilationService.cs
index 4f5e2a18ed..20e50fc2e0 100644
--- a/src/Microsoft.AspNet.CoreServices/Compilation/CscBasedCompilationService.cs
+++ b/src/Microsoft.AspNet.Mvc.Razor/Compilation/CscBasedCompilationService.cs
@@ -8,7 +8,7 @@ using System.Text;
 using System.Threading.Tasks;
 using Microsoft.Owin.FileSystems;
 
-namespace Microsoft.AspNet.CoreServices
+namespace Microsoft.AspNet.Mvc.Razor
 {
     public class CscBasedCompilationService : ICompilationService
     {
diff --git a/src/Microsoft.AspNet.CoreServices/Compilation/DefaultCompilationService.cs b/src/Microsoft.AspNet.Mvc.Razor/Compilation/DefaultCompilationService.cs
similarity index 87%
rename from src/Microsoft.AspNet.CoreServices/Compilation/DefaultCompilationService.cs
rename to src/Microsoft.AspNet.Mvc.Razor/Compilation/DefaultCompilationService.cs
index 87bb79f76e..2ea4ccca9d 100644
--- a/src/Microsoft.AspNet.CoreServices/Compilation/DefaultCompilationService.cs
+++ b/src/Microsoft.AspNet.Mvc.Razor/Compilation/DefaultCompilationService.cs
@@ -2,7 +2,7 @@
 using System.Threading.Tasks;
 using Microsoft.Owin.FileSystems;
 
-namespace Microsoft.AspNet.CoreServices
+namespace Microsoft.AspNet.Mvc.Razor
 {
     public class DefaultCompilationService : ICompilationService
     {
diff --git a/src/Microsoft.AspNet.CoreServices/Compilation/ICompilationService.cs b/src/Microsoft.AspNet.Mvc.Razor/Compilation/ICompilationService.cs
similarity index 82%
rename from src/Microsoft.AspNet.CoreServices/Compilation/ICompilationService.cs
rename to src/Microsoft.AspNet.Mvc.Razor/Compilation/ICompilationService.cs
index 63bed694df..fdca6e0794 100644
--- a/src/Microsoft.AspNet.CoreServices/Compilation/ICompilationService.cs
+++ b/src/Microsoft.AspNet.Mvc.Razor/Compilation/ICompilationService.cs
@@ -2,7 +2,7 @@
 using System.Threading.Tasks;
 using Microsoft.Owin.FileSystems;
 
-namespace Microsoft.AspNet.CoreServices
+namespace Microsoft.AspNet.Mvc.Razor
 {
     public interface ICompilationService
     {
diff --git a/src/Microsoft.AspNet.Mvc.Razor/Microsoft.AspNet.Mvc.Razor.csproj b/src/Microsoft.AspNet.Mvc.Razor/Microsoft.AspNet.Mvc.Razor.csproj
index db1f1caac6..ad6f913bcc 100644
--- a/src/Microsoft.AspNet.Mvc.Razor/Microsoft.AspNet.Mvc.Razor.csproj
+++ b/src/Microsoft.AspNet.Mvc.Razor/Microsoft.AspNet.Mvc.Razor.csproj
@@ -54,6 +54,13 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Compilation\CompilationFailedException.cs" />
+    <Compile Include="Compilation\CompilationMessage.cs" />
+    <Compile Include="Compilation\CompilationResult.cs" />
+    <Compile Include="Compilation\CompilerCache.cs" />
+    <Compile Include="Compilation\CscBasedCompilationService.cs" />
+    <Compile Include="Compilation\DefaultCompilationService.cs" />
+    <Compile Include="Compilation\ICompilationService.cs" />
     <Compile Include="RazorViewOfT.cs" />
     <Compile Include="Razor\MvcCSharpRazorCodeGenerator.cs" />
     <Compile Include="Razor\MvcCSharpRazorCodeParser.cs" />
diff --git a/src/Microsoft.AspNet.Mvc.Razor/Razor/RazorCompilationService.cs b/src/Microsoft.AspNet.Mvc.Razor/Razor/RazorCompilationService.cs
index d26c6503e3..c549708deb 100644
--- a/src/Microsoft.AspNet.Mvc.Razor/Razor/RazorCompilationService.cs
+++ b/src/Microsoft.AspNet.Mvc.Razor/Razor/RazorCompilationService.cs
@@ -1,19 +1,9 @@
-using System;
-using System.CodeDom;
-using System.CodeDom.Compiler;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
+using System.CodeDom.Compiler;
 using System.IO;
 using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using System.Web.Razor;
-using System.Web.Razor.Generator;
-using Microsoft.AspNet.CoreServices;
 using Microsoft.CSharp;
-using Microsoft.Owin;
 using Microsoft.Owin.FileSystems;
 
 namespace Microsoft.AspNet.Mvc.Razor
diff --git a/src/Microsoft.AspNet.Mvc.Razor/ViewEngine/VirtualPathViewFactory.cs b/src/Microsoft.AspNet.Mvc.Razor/ViewEngine/VirtualPathViewFactory.cs
index d84baec780..b50998296b 100644
--- a/src/Microsoft.AspNet.Mvc.Razor/ViewEngine/VirtualPathViewFactory.cs
+++ b/src/Microsoft.AspNet.Mvc.Razor/ViewEngine/VirtualPathViewFactory.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Threading.Tasks;
-using Microsoft.AspNet.CoreServices;
+using Microsoft.AspNet.Mvc.Razor;
 using Microsoft.Owin.FileSystems;
 
 namespace Microsoft.AspNet.Mvc.Razor
diff --git a/src/Microsoft.AspNet.Mvc.Razor/project.json b/src/Microsoft.AspNet.Mvc.Razor/project.json
index 9cfa8a67f6..4cb36608e7 100644
--- a/src/Microsoft.AspNet.Mvc.Razor/project.json
+++ b/src/Microsoft.AspNet.Mvc.Razor/project.json
@@ -5,7 +5,7 @@
     "Microsoft.Owin": "2.0.2",
     "Microsoft.Owin.FileSystems": "2.0.2",
     "Microsoft.AspNet.WebApi.Client": "5.0.0",
-    "Microsoft.AspNet.CoreServices" : ""
+    "Microsoft.AspNet.Mvc.Razor" : ""
   },
   "configurations": {
     "net45": {