diff --git a/src/Microsoft.AspNet.Mvc.Razor/Compilation/CompilationFailedException.cs b/src/Microsoft.AspNet.Mvc.Razor/Compilation/CompilationFailedException.cs
index bd78159379..96d697ce33 100644
--- a/src/Microsoft.AspNet.Mvc.Razor/Compilation/CompilationFailedException.cs
+++ b/src/Microsoft.AspNet.Mvc.Razor/Compilation/CompilationFailedException.cs
@@ -7,7 +7,7 @@ using System.Linq;
 using Microsoft.Framework.Runtime;
 using Microsoft.Framework.Internal;
 
-namespace Microsoft.AspNet.Mvc.Razor
+namespace Microsoft.AspNet.Mvc.Razor.Compilation
 {
     /// <summary>
     /// An <see cref="Exception"/> thrown when accessing the result of a failed compilation.
diff --git a/src/Microsoft.AspNet.Mvc.Razor/Compilation/CompilationOptionsProviderExtension.cs b/src/Microsoft.AspNet.Mvc.Razor/Compilation/CompilationOptionsProviderExtension.cs
index cd415155df..d0833db0df 100644
--- a/src/Microsoft.AspNet.Mvc.Razor/Compilation/CompilationOptionsProviderExtension.cs
+++ b/src/Microsoft.AspNet.Mvc.Razor/Compilation/CompilationOptionsProviderExtension.cs
@@ -5,7 +5,7 @@ using Microsoft.Framework.Internal;
 using Microsoft.Framework.Runtime;
 using Microsoft.Framework.Runtime.Roslyn;
 
-namespace Microsoft.AspNet.Mvc.Razor
+namespace Microsoft.AspNet.Mvc.Razor.Compilation
 {
     /// <summary>
     /// Extension methods for <see cref="ICompilerOptionsProvider"/>.
diff --git a/src/Microsoft.AspNet.Mvc.Razor/Compilation/CompilationResult.cs b/src/Microsoft.AspNet.Mvc.Razor/Compilation/CompilationResult.cs
index 714d68404b..a55a32fa63 100644
--- a/src/Microsoft.AspNet.Mvc.Razor/Compilation/CompilationResult.cs
+++ b/src/Microsoft.AspNet.Mvc.Razor/Compilation/CompilationResult.cs
@@ -5,7 +5,7 @@ using System;
 using Microsoft.Framework.Runtime;
 using Microsoft.Framework.Internal;
 
-namespace Microsoft.AspNet.Mvc.Razor
+namespace Microsoft.AspNet.Mvc.Razor.Compilation
 {
     /// <summary>
     /// Represents the result of compilation.
diff --git a/src/Microsoft.AspNet.Mvc.Razor/Compilation/CompilerCache.cs b/src/Microsoft.AspNet.Mvc.Razor/Compilation/CompilerCache.cs
index e8568b2f74..4d8741908c 100644
--- a/src/Microsoft.AspNet.Mvc.Razor/Compilation/CompilerCache.cs
+++ b/src/Microsoft.AspNet.Mvc.Razor/Compilation/CompilerCache.cs
@@ -6,12 +6,13 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
 using Microsoft.AspNet.FileProviders;
+using Microsoft.AspNet.Mvc.Razor.Precompilation;
 using Microsoft.Framework.Caching.Memory;
 using Microsoft.Framework.Internal;
 using Microsoft.Framework.OptionsModel;
 using Microsoft.Framework.Runtime;
 
-namespace Microsoft.AspNet.Mvc.Razor
+namespace Microsoft.AspNet.Mvc.Razor.Compilation
 {
     /// <summary>
     /// Caches the result of runtime compilation of Razor files for the duration of the app lifetime.
diff --git a/src/Microsoft.AspNet.Mvc.Razor/Compilation/CompilerCacheEntry.cs b/src/Microsoft.AspNet.Mvc.Razor/Compilation/CompilerCacheEntry.cs
index 4d0111c8ec..9e4c2b114c 100644
--- a/src/Microsoft.AspNet.Mvc.Razor/Compilation/CompilerCacheEntry.cs
+++ b/src/Microsoft.AspNet.Mvc.Razor/Compilation/CompilerCacheEntry.cs
@@ -2,9 +2,10 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
+using Microsoft.AspNet.Mvc.Razor.Precompilation;
 using Microsoft.Framework.Internal;
 
-namespace Microsoft.AspNet.Mvc.Razor
+namespace Microsoft.AspNet.Mvc.Razor.Compilation
 {
     /// <summary>
     /// An entry in <see cref="ICompilerCache"/> that contain metadata about precompiled and dynamically compiled file.
diff --git a/src/Microsoft.AspNet.Mvc.Razor/Compilation/CompilerCacheResult.cs b/src/Microsoft.AspNet.Mvc.Razor/Compilation/CompilerCacheResult.cs
index 16a9983860..f5803a5f62 100644
--- a/src/Microsoft.AspNet.Mvc.Razor/Compilation/CompilerCacheResult.cs
+++ b/src/Microsoft.AspNet.Mvc.Razor/Compilation/CompilerCacheResult.cs
@@ -3,7 +3,7 @@
 
 using Microsoft.Framework.Internal;
 
-namespace Microsoft.AspNet.Mvc.Razor
+namespace Microsoft.AspNet.Mvc.Razor.Compilation
 {
     /// <summary>
     /// Result of <see cref="ICompilerCache"/>.
@@ -20,7 +20,7 @@ namespace Microsoft.AspNet.Mvc.Razor
         /// Initializes a new instance of <see cref="CompilerCacheResult"/> with the specified
         /// <see cref="CompilationResult"/>.
         /// </summary>
-        /// <param name="compilationResult">The <see cref="Razor.CompilationResult"/> </param>
+        /// <param name="compilationResult">The <see cref="Compilation.CompilationResult"/> </param>
         public CompilerCacheResult([NotNull] CompilationResult compilationResult)
         {
             CompilationResult = compilationResult;
@@ -34,7 +34,7 @@ namespace Microsoft.AspNet.Mvc.Razor
         }
 
         /// <summary>
-        /// The <see cref="Razor.CompilationResult"/>.
+        /// The <see cref="Compilation.CompilationResult"/>.
         /// </summary>
         /// <remarks>This property is null when file lookup failed.</remarks>
         public CompilationResult CompilationResult { get; }
diff --git a/src/Microsoft.AspNet.Mvc.Razor/Compilation/ICompilationService.cs b/src/Microsoft.AspNet.Mvc.Razor/Compilation/ICompilationService.cs
index 1d88cf4009..9742bd8d00 100644
--- a/src/Microsoft.AspNet.Mvc.Razor/Compilation/ICompilationService.cs
+++ b/src/Microsoft.AspNet.Mvc.Razor/Compilation/ICompilationService.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.AspNet.Mvc.Razor
+namespace Microsoft.AspNet.Mvc.Razor.Compilation
 {
     /// <summary>
     /// Provides methods for compilation of a Razor page.
diff --git a/src/Microsoft.AspNet.Mvc.Razor/Compilation/ICompilerCache.cs b/src/Microsoft.AspNet.Mvc.Razor/Compilation/ICompilerCache.cs
index 9f30bf0431..230dace72e 100644
--- a/src/Microsoft.AspNet.Mvc.Razor/Compilation/ICompilerCache.cs
+++ b/src/Microsoft.AspNet.Mvc.Razor/Compilation/ICompilerCache.cs
@@ -4,7 +4,7 @@
 using System;
 using Microsoft.Framework.Internal;
 
-namespace Microsoft.AspNet.Mvc.Razor
+namespace Microsoft.AspNet.Mvc.Razor.Compilation
 {
     /// <summary>
     /// Caches the result of runtime compilation of Razor files for the duration of the app lifetime.
diff --git a/src/Microsoft.AspNet.Mvc.Razor/Razor/IRazorCompilationService.cs b/src/Microsoft.AspNet.Mvc.Razor/Compilation/IRazorCompilationService.cs
similarity index 94%
rename from src/Microsoft.AspNet.Mvc.Razor/Razor/IRazorCompilationService.cs
rename to src/Microsoft.AspNet.Mvc.Razor/Compilation/IRazorCompilationService.cs
index 2ebc4e4d90..70bdea1375 100644
--- a/src/Microsoft.AspNet.Mvc.Razor/Razor/IRazorCompilationService.cs
+++ b/src/Microsoft.AspNet.Mvc.Razor/Compilation/IRazorCompilationService.cs
@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.AspNet.Mvc.Razor
+namespace Microsoft.AspNet.Mvc.Razor.Compilation
 {
     /// <summary>
     /// Specifies the contracts for a service that compiles Razor files.
diff --git a/src/Microsoft.AspNet.Mvc.Razor/Compilation/RazorCompilationFailure.cs b/src/Microsoft.AspNet.Mvc.Razor/Compilation/RazorCompilationFailure.cs
index a2268d62ed..e5086d0866 100644
--- a/src/Microsoft.AspNet.Mvc.Razor/Compilation/RazorCompilationFailure.cs
+++ b/src/Microsoft.AspNet.Mvc.Razor/Compilation/RazorCompilationFailure.cs
@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using Microsoft.Framework.Runtime;
 using Microsoft.Framework.Internal;
 
-namespace Microsoft.AspNet.Mvc.Razor
+namespace Microsoft.AspNet.Mvc.Razor.Compilation
 {
     /// <summary>
     /// <see cref="ICompilationFailure"/> for Razor parse failures.
diff --git a/src/Microsoft.AspNet.Mvc.Razor/Compilation/RazorCompilationMessage.cs b/src/Microsoft.AspNet.Mvc.Razor/Compilation/RazorCompilationMessage.cs
index 90fb0a3655..2b26894776 100644
--- a/src/Microsoft.AspNet.Mvc.Razor/Compilation/RazorCompilationMessage.cs
+++ b/src/Microsoft.AspNet.Mvc.Razor/Compilation/RazorCompilationMessage.cs
@@ -5,7 +5,7 @@ using Microsoft.AspNet.Razor.Parser.SyntaxTree;
 using Microsoft.Framework.Internal;
 using Microsoft.Framework.Runtime;
 
-namespace Microsoft.AspNet.Mvc.Razor
+namespace Microsoft.AspNet.Mvc.Razor.Compilation
 {
     /// <summary>
     /// <see cref="ICompilationMessage"/> for a <see cref="RazorError"/> encountered during parsing.
diff --git a/src/Microsoft.AspNet.Mvc.Razor/Razor/RazorCompilationService.cs b/src/Microsoft.AspNet.Mvc.Razor/Compilation/RazorCompilationService.cs
similarity index 97%
rename from src/Microsoft.AspNet.Mvc.Razor/Razor/RazorCompilationService.cs
rename to src/Microsoft.AspNet.Mvc.Razor/Compilation/RazorCompilationService.cs
index 526a89e74f..20493ddc90 100644
--- a/src/Microsoft.AspNet.Mvc.Razor/Razor/RazorCompilationService.cs
+++ b/src/Microsoft.AspNet.Mvc.Razor/Compilation/RazorCompilationService.cs
@@ -7,7 +7,7 @@ using Microsoft.AspNet.FileProviders;
 using Microsoft.AspNet.Razor;
 using Microsoft.Framework.Internal;
 
-namespace Microsoft.AspNet.Mvc.Razor
+namespace Microsoft.AspNet.Mvc.Razor.Compilation
 {
     /// <summary>
     /// Default implementation of <see cref="IRazorCompilationService"/>.
diff --git a/src/Microsoft.AspNet.Mvc.Razor/Razor/RazorFileHash.cs b/src/Microsoft.AspNet.Mvc.Razor/Compilation/RazorFileHash.cs
similarity index 93%
rename from src/Microsoft.AspNet.Mvc.Razor/Razor/RazorFileHash.cs
rename to src/Microsoft.AspNet.Mvc.Razor/Compilation/RazorFileHash.cs
index 88de82af27..f3e370ac3f 100644
--- a/src/Microsoft.AspNet.Mvc.Razor/Razor/RazorFileHash.cs
+++ b/src/Microsoft.AspNet.Mvc.Razor/Compilation/RazorFileHash.cs
@@ -5,9 +5,10 @@ using System;
 using System.Globalization;
 using System.IO;
 using Microsoft.AspNet.FileProviders;
+using Microsoft.AspNet.Mvc.Razor.Internal;
 using Microsoft.Framework.Internal;
 
-namespace Microsoft.AspNet.Mvc.Razor
+namespace Microsoft.AspNet.Mvc.Razor.Compilation
 {
     public static class RazorFileHash
     {
diff --git a/src/Microsoft.AspNet.Mvc.Razor/Razor/PreCompileViews/RelativeFileInfo.cs b/src/Microsoft.AspNet.Mvc.Razor/Compilation/RelativeFileInfo.cs
similarity index 96%
rename from src/Microsoft.AspNet.Mvc.Razor/Razor/PreCompileViews/RelativeFileInfo.cs
rename to src/Microsoft.AspNet.Mvc.Razor/Compilation/RelativeFileInfo.cs
index 212ea08d74..a1e89f8673 100644
--- a/src/Microsoft.AspNet.Mvc.Razor/Razor/PreCompileViews/RelativeFileInfo.cs
+++ b/src/Microsoft.AspNet.Mvc.Razor/Compilation/RelativeFileInfo.cs
@@ -5,7 +5,7 @@ using System;
 using Microsoft.AspNet.FileProviders;
 using Microsoft.Framework.Internal;
 
-namespace Microsoft.AspNet.Mvc.Razor
+namespace Microsoft.AspNet.Mvc.Razor.Compilation
 {
     /// <summary>
     /// A container type that represents <see cref="IFileInfo"/> along with the application base relative path
diff --git a/src/Microsoft.AspNet.Mvc.Razor/Compilation/RoslynCompilationService.cs b/src/Microsoft.AspNet.Mvc.Razor/Compilation/RoslynCompilationService.cs
index 8ee83d7b8d..b17e26b747 100644
--- a/src/Microsoft.AspNet.Mvc.Razor/Compilation/RoslynCompilationService.cs
+++ b/src/Microsoft.AspNet.Mvc.Razor/Compilation/RoslynCompilationService.cs
@@ -19,7 +19,7 @@ using Microsoft.Framework.Runtime;
 using Microsoft.Framework.Runtime.Compilation;
 using Microsoft.Framework.Runtime.Roslyn;
 
-namespace Microsoft.AspNet.Mvc.Razor
+namespace Microsoft.AspNet.Mvc.Razor.Compilation
 {
     /// <summary>
     /// A type that uses Roslyn to compile C# content.
diff --git a/src/Microsoft.AspNet.Mvc.Razor/Compilation/SyntaxTreeGenerator.cs b/src/Microsoft.AspNet.Mvc.Razor/Compilation/SyntaxTreeGenerator.cs
index 2e7eb5ba95..499edf9ba9 100644
--- a/src/Microsoft.AspNet.Mvc.Razor/Compilation/SyntaxTreeGenerator.cs
+++ b/src/Microsoft.AspNet.Mvc.Razor/Compilation/SyntaxTreeGenerator.cs
@@ -8,7 +8,7 @@ using Microsoft.CodeAnalysis.Text;
 using Microsoft.Framework.Internal;
 using Microsoft.Framework.Runtime.Roslyn;
 
-namespace Microsoft.AspNet.Mvc.Razor
+namespace Microsoft.AspNet.Mvc.Razor.Compilation
 {
     public static class SyntaxTreeGenerator
     {
diff --git a/src/Microsoft.AspNet.Mvc.Razor/Compilation/UncachedCompilationResult.cs b/src/Microsoft.AspNet.Mvc.Razor/Compilation/UncachedCompilationResult.cs
index e7d6ec1e3c..96fd2cfc6a 100644
--- a/src/Microsoft.AspNet.Mvc.Razor/Compilation/UncachedCompilationResult.cs
+++ b/src/Microsoft.AspNet.Mvc.Razor/Compilation/UncachedCompilationResult.cs
@@ -4,7 +4,7 @@
 using System;
 using Microsoft.Framework.Internal;
 
-namespace Microsoft.AspNet.Mvc.Razor
+namespace Microsoft.AspNet.Mvc.Razor.Compilation
 {
     /// <summary>
     /// Represents the result of compilation that does not come from the <see cref="ICompilerCache" />.
diff --git a/src/Microsoft.AspNet.Mvc.Razor/Razor/Crc32.cs b/src/Microsoft.AspNet.Mvc.Razor/Internal/Crc32.cs
similarity index 99%
rename from src/Microsoft.AspNet.Mvc.Razor/Razor/Crc32.cs
rename to src/Microsoft.AspNet.Mvc.Razor/Internal/Crc32.cs
index c17d037db3..5f086204fb 100644
--- a/src/Microsoft.AspNet.Mvc.Razor/Razor/Crc32.cs
+++ b/src/Microsoft.AspNet.Mvc.Razor/Internal/Crc32.cs
@@ -3,7 +3,7 @@
 
 using System.IO;
 
-namespace Microsoft.AspNet.Mvc.Razor
+namespace Microsoft.AspNet.Mvc.Razor.Internal
 {
     internal static class Crc32
     {
diff --git a/src/Microsoft.AspNet.Mvc.Razor/Razor/PreCompileViews/GeneratorResultExtensions.cs b/src/Microsoft.AspNet.Mvc.Razor/Precompilation/GeneratorResultExtensions.cs
similarity index 96%
rename from src/Microsoft.AspNet.Mvc.Razor/Razor/PreCompileViews/GeneratorResultExtensions.cs
rename to src/Microsoft.AspNet.Mvc.Razor/Precompilation/GeneratorResultExtensions.cs
index 97332c9483..7876a39b59 100644
--- a/src/Microsoft.AspNet.Mvc.Razor/Razor/PreCompileViews/GeneratorResultExtensions.cs
+++ b/src/Microsoft.AspNet.Mvc.Razor/Precompilation/GeneratorResultExtensions.cs
@@ -8,7 +8,7 @@ using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.Framework.Internal;
 
-namespace Microsoft.AspNet.Mvc.Razor
+namespace Microsoft.AspNet.Mvc.Razor.Precompilation
 {
     public static class GeneratorResultExtensions
     {
diff --git a/src/Microsoft.AspNet.Mvc.Razor/Razor/PreCompileViews/PrecompilationCacheEntry.cs b/src/Microsoft.AspNet.Mvc.Razor/Precompilation/PrecompilationCacheEntry.cs
similarity index 98%
rename from src/Microsoft.AspNet.Mvc.Razor/Razor/PreCompileViews/PrecompilationCacheEntry.cs
rename to src/Microsoft.AspNet.Mvc.Razor/Precompilation/PrecompilationCacheEntry.cs
index 5730bf0a60..3d88d216c3 100644
--- a/src/Microsoft.AspNet.Mvc.Razor/Razor/PreCompileViews/PrecompilationCacheEntry.cs
+++ b/src/Microsoft.AspNet.Mvc.Razor/Precompilation/PrecompilationCacheEntry.cs
@@ -5,7 +5,7 @@ using System.Collections.Generic;
 using Microsoft.CodeAnalysis;
 using Microsoft.Framework.Internal;
 
-namespace Microsoft.AspNet.Mvc.Razor
+namespace Microsoft.AspNet.Mvc.Razor.Precompilation
 {
     /// <summary>
     /// An entry in the cache used by <see cref="RazorPreCompiler"/>.
diff --git a/src/Microsoft.AspNet.Mvc.Razor/Razor/PreCompileViews/PrecompilationTagHelperDescriptorResolver.cs b/src/Microsoft.AspNet.Mvc.Razor/Precompilation/PrecompilationTagHelperDescriptorResolver.cs
similarity index 98%
rename from src/Microsoft.AspNet.Mvc.Razor/Razor/PreCompileViews/PrecompilationTagHelperDescriptorResolver.cs
rename to src/Microsoft.AspNet.Mvc.Razor/Precompilation/PrecompilationTagHelperDescriptorResolver.cs
index 8ffd9cf5ee..67d436341f 100644
--- a/src/Microsoft.AspNet.Mvc.Razor/Razor/PreCompileViews/PrecompilationTagHelperDescriptorResolver.cs
+++ b/src/Microsoft.AspNet.Mvc.Razor/Precompilation/PrecompilationTagHelperDescriptorResolver.cs
@@ -12,7 +12,7 @@ using Microsoft.Framework.Internal;
 using Microsoft.Framework.Runtime;
 using Microsoft.Framework.Runtime.Roslyn;
 
-namespace Microsoft.AspNet.Mvc.Razor
+namespace Microsoft.AspNet.Mvc.Razor.Precompilation
 {
     /// <summary>
     /// <see cref="TagHelperDescriptorResolver"/> used during Razor precompilation.
diff --git a/src/Microsoft.AspNet.Mvc.Razor/Razor/PreCompileViews/RazorErrorExtensions.cs b/src/Microsoft.AspNet.Mvc.Razor/Precompilation/RazorErrorExtensions.cs
similarity index 96%
rename from src/Microsoft.AspNet.Mvc.Razor/Razor/PreCompileViews/RazorErrorExtensions.cs
rename to src/Microsoft.AspNet.Mvc.Razor/Precompilation/RazorErrorExtensions.cs
index 158a8668c8..7495f1e201 100644
--- a/src/Microsoft.AspNet.Mvc.Razor/Razor/PreCompileViews/RazorErrorExtensions.cs
+++ b/src/Microsoft.AspNet.Mvc.Razor/Precompilation/RazorErrorExtensions.cs
@@ -6,7 +6,7 @@ using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Text;
 using Microsoft.Framework.Internal;
 
-namespace Microsoft.AspNet.Mvc.Razor
+namespace Microsoft.AspNet.Mvc.Razor.Precompilation
 {
     public static class RazorErrorExtensions
     {
diff --git a/src/Microsoft.AspNet.Mvc.Razor/Razor/PreCompileViews/RazorFileInfo.cs b/src/Microsoft.AspNet.Mvc.Razor/Precompilation/RazorFileInfo.cs
similarity index 95%
rename from src/Microsoft.AspNet.Mvc.Razor/Razor/PreCompileViews/RazorFileInfo.cs
rename to src/Microsoft.AspNet.Mvc.Razor/Precompilation/RazorFileInfo.cs
index f31459696b..669bd2b60e 100644
--- a/src/Microsoft.AspNet.Mvc.Razor/Razor/PreCompileViews/RazorFileInfo.cs
+++ b/src/Microsoft.AspNet.Mvc.Razor/Precompilation/RazorFileInfo.cs
@@ -3,7 +3,7 @@
 
 using System;
 
-namespace Microsoft.AspNet.Mvc.Razor
+namespace Microsoft.AspNet.Mvc.Razor.Precompilation
 {
     public class RazorFileInfo
     {
diff --git a/src/Microsoft.AspNet.Mvc.Razor/Razor/PreCompileViews/RazorFileInfoCollection.cs b/src/Microsoft.AspNet.Mvc.Razor/Precompilation/RazorFileInfoCollection.cs
similarity index 97%
rename from src/Microsoft.AspNet.Mvc.Razor/Razor/PreCompileViews/RazorFileInfoCollection.cs
rename to src/Microsoft.AspNet.Mvc.Razor/Precompilation/RazorFileInfoCollection.cs
index b1d9aa55d0..568cb90185 100644
--- a/src/Microsoft.AspNet.Mvc.Razor/Razor/PreCompileViews/RazorFileInfoCollection.cs
+++ b/src/Microsoft.AspNet.Mvc.Razor/Precompilation/RazorFileInfoCollection.cs
@@ -7,7 +7,7 @@ using System.IO;
 using System.Reflection;
 using Microsoft.Framework.Runtime;
 
-namespace Microsoft.AspNet.Mvc.Razor
+namespace Microsoft.AspNet.Mvc.Razor.Precompilation
 {
     /// <summary>
     /// Specifies metadata about precompiled views.
diff --git a/src/Microsoft.AspNet.Mvc.Razor/Razor/PreCompileViews/RazorFileInfoCollectionGenerator.cs b/src/Microsoft.AspNet.Mvc.Razor/Precompilation/RazorFileInfoCollectionGenerator.cs
similarity index 97%
rename from src/Microsoft.AspNet.Mvc.Razor/Razor/PreCompileViews/RazorFileInfoCollectionGenerator.cs
rename to src/Microsoft.AspNet.Mvc.Razor/Precompilation/RazorFileInfoCollectionGenerator.cs
index 34d82b047b..76f82c7c56 100644
--- a/src/Microsoft.AspNet.Mvc.Razor/Razor/PreCompileViews/RazorFileInfoCollectionGenerator.cs
+++ b/src/Microsoft.AspNet.Mvc.Razor/Precompilation/RazorFileInfoCollectionGenerator.cs
@@ -3,12 +3,13 @@
 
 using System.Globalization;
 using System.Text;
+using Microsoft.AspNet.Mvc.Razor.Compilation;
 using Microsoft.CodeAnalysis;
 using Microsoft.Framework.Internal;
 using Microsoft.Framework.Runtime;
 using Microsoft.Framework.Runtime.Roslyn;
 
-namespace Microsoft.AspNet.Mvc.Razor
+namespace Microsoft.AspNet.Mvc.Razor.Precompilation
 {
     public class RazorFileInfoCollectionGenerator
     {
diff --git a/src/Microsoft.AspNet.Mvc.Razor/Razor/PreCompileViews/RazorPreCompiler.cs b/src/Microsoft.AspNet.Mvc.Razor/Precompilation/RazorPreCompiler.cs
similarity index 99%
rename from src/Microsoft.AspNet.Mvc.Razor/Razor/PreCompileViews/RazorPreCompiler.cs
rename to src/Microsoft.AspNet.Mvc.Razor/Precompilation/RazorPreCompiler.cs
index d2aefa5de4..de0d78f3fd 100644
--- a/src/Microsoft.AspNet.Mvc.Razor/Razor/PreCompileViews/RazorPreCompiler.cs
+++ b/src/Microsoft.AspNet.Mvc.Razor/Precompilation/RazorPreCompiler.cs
@@ -8,6 +8,7 @@ using System.Linq;
 using System.Reflection;
 using System.Threading.Tasks;
 using Microsoft.AspNet.FileProviders;
+using Microsoft.AspNet.Mvc.Razor.Compilation;
 using Microsoft.AspNet.Mvc.Razor.Directives;
 using Microsoft.AspNet.Mvc.Razor.Internal;
 using Microsoft.AspNet.Razor.Runtime.TagHelpers;
@@ -18,7 +19,7 @@ using Microsoft.Framework.Internal;
 using Microsoft.Framework.Runtime;
 using Microsoft.Framework.Runtime.Roslyn;
 
-namespace Microsoft.AspNet.Mvc.Razor
+namespace Microsoft.AspNet.Mvc.Razor.Precompilation
 {
     public class RazorPreCompiler
     {
diff --git a/src/Microsoft.AspNet.Mvc.Razor/VirtualPathRazorPageFactory.cs b/src/Microsoft.AspNet.Mvc.Razor/VirtualPathRazorPageFactory.cs
index be3a05cea3..00031d6e44 100644
--- a/src/Microsoft.AspNet.Mvc.Razor/VirtualPathRazorPageFactory.cs
+++ b/src/Microsoft.AspNet.Mvc.Razor/VirtualPathRazorPageFactory.cs
@@ -2,7 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using System.Collections.Concurrent;
+using Microsoft.AspNet.Mvc.Razor.Compilation;
 using Microsoft.Framework.DependencyInjection;
 using Microsoft.Framework.Internal;
 
diff --git a/src/Microsoft.AspNet.Mvc/MvcServices.cs b/src/Microsoft.AspNet.Mvc/MvcServices.cs
index f14ad95f8a..6682f2164f 100644
--- a/src/Microsoft.AspNet.Mvc/MvcServices.cs
+++ b/src/Microsoft.AspNet.Mvc/MvcServices.cs
@@ -12,6 +12,7 @@ using Microsoft.AspNet.Mvc.ModelBinding.Metadata;
 using Microsoft.AspNet.Mvc.ModelBinding.Validation;
 using Microsoft.AspNet.Mvc.OptionDescriptors;
 using Microsoft.AspNet.Mvc.Razor;
+using Microsoft.AspNet.Mvc.Razor.Compilation;
 using Microsoft.AspNet.Mvc.Razor.Directives;
 using Microsoft.AspNet.Mvc.Razor.OptionDescriptors;
 using Microsoft.AspNet.Mvc.Rendering;
@@ -81,8 +82,8 @@ namespace Microsoft.AspNet.Mvc
             // Dataflow - ModelBinding, Validation and Formatting
             //
             // The DefaultModelMetadataProvider does significant caching and should be a singleton.
-            services.AddSingleton<ModelBinding.IModelMetadataProvider, DefaultModelMetadataProvider>();
-            services.AddTransient<ModelBinding.Metadata.ICompositeMetadataDetailsProvider>(serviceProvider =>
+            services.AddSingleton<IModelMetadataProvider, DefaultModelMetadataProvider>();
+            services.AddTransient<ICompositeMetadataDetailsProvider>(serviceProvider =>
             {
                 var options = serviceProvider.GetRequiredService<IOptions<MvcOptions>>().Options;
                 return new DefaultCompositeMetadataDetailsProvider(options.ModelMetadataDetailsProviders);
@@ -156,7 +157,7 @@ namespace Microsoft.AspNet.Mvc
             // These do caching so they should stay singleton
             services.AddSingleton<IViewComponentSelector, DefaultViewComponentSelector>();
             services.AddSingleton<IViewComponentActivator, DefaultViewComponentActivator>();
-            services.AddSingleton<IViewComponentDescriptorCollectionProvider, 
+            services.AddSingleton<IViewComponentDescriptorCollectionProvider,
                 DefaultViewComponentDescriptorCollectionProvider>();
 
             services.AddTransient<IViewComponentDescriptorProvider, DefaultViewComponentDescriptorProvider>();
diff --git a/src/Microsoft.AspNet.Mvc/RazorPreCompileModule.cs b/src/Microsoft.AspNet.Mvc/RazorPreCompileModule.cs
index 4a63e5c1ab..8046a2aaa5 100644
--- a/src/Microsoft.AspNet.Mvc/RazorPreCompileModule.cs
+++ b/src/Microsoft.AspNet.Mvc/RazorPreCompileModule.cs
@@ -3,7 +3,7 @@
 
 using System;
 using Microsoft.AspNet.FileProviders;
-using Microsoft.AspNet.Mvc.Razor;
+using Microsoft.AspNet.Mvc.Razor.Precompilation;
 using Microsoft.Framework.Caching.Memory;
 using Microsoft.Framework.DependencyInjection;
 using Microsoft.Framework.Runtime;
diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/PrecompilationTest.cs b/test/Microsoft.AspNet.Mvc.FunctionalTests/PrecompilationTest.cs
index 065b71499f..3e60a80eed 100644
--- a/test/Microsoft.AspNet.Mvc.FunctionalTests/PrecompilationTest.cs
+++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/PrecompilationTest.cs
@@ -9,6 +9,7 @@ using System.Reflection;
 using System.Threading.Tasks;
 using Microsoft.AspNet.Builder;
 using Microsoft.AspNet.Mvc.Razor;
+using Microsoft.AspNet.Mvc.Razor.Precompilation;
 using Microsoft.Framework.DependencyInjection;
 using Microsoft.Framework.Runtime;
 using PrecompilationWebSite;
diff --git a/test/Microsoft.AspNet.Mvc.Razor.Test/Compilation/CompilationResultTest.cs b/test/Microsoft.AspNet.Mvc.Razor.Test/Compilation/CompilationResultTest.cs
index d318326a91..46a42549c1 100644
--- a/test/Microsoft.AspNet.Mvc.Razor.Test/Compilation/CompilationResultTest.cs
+++ b/test/Microsoft.AspNet.Mvc.Razor.Test/Compilation/CompilationResultTest.cs
@@ -5,7 +5,7 @@ using Microsoft.Framework.Runtime;
 using Moq;
 using Xunit;
 
-namespace Microsoft.AspNet.Mvc.Razor.Test
+namespace Microsoft.AspNet.Mvc.Razor.Compilation
 {
     public class CompilationResultTest
     {
diff --git a/test/Microsoft.AspNet.Mvc.Razor.Test/Compilation/CompilerCacheTest.cs b/test/Microsoft.AspNet.Mvc.Razor.Test/Compilation/CompilerCacheTest.cs
index e2f4ff9d99..5fa7997703 100644
--- a/test/Microsoft.AspNet.Mvc.Razor.Test/Compilation/CompilerCacheTest.cs
+++ b/test/Microsoft.AspNet.Mvc.Razor.Test/Compilation/CompilerCacheTest.cs
@@ -9,11 +9,13 @@ using System.Linq;
 using System.Reflection;
 using System.Text;
 using Microsoft.AspNet.FileProviders;
+using Microsoft.AspNet.Mvc.Razor.Internal;
+using Microsoft.AspNet.Mvc.Razor.Precompilation;
 using Microsoft.Framework.Runtime;
 using Moq;
 using Xunit;
 
-namespace Microsoft.AspNet.Mvc.Razor
+namespace Microsoft.AspNet.Mvc.Razor.Compilation
 {
     public class CompilerCacheTest
     {
diff --git a/test/Microsoft.AspNet.Mvc.Razor.Test/Compilation/RazorCompilationServiceTest.cs b/test/Microsoft.AspNet.Mvc.Razor.Test/Compilation/RazorCompilationServiceTest.cs
index 5b2c57f8ab..2015c9e160 100644
--- a/test/Microsoft.AspNet.Mvc.Razor.Test/Compilation/RazorCompilationServiceTest.cs
+++ b/test/Microsoft.AspNet.Mvc.Razor.Test/Compilation/RazorCompilationServiceTest.cs
@@ -12,7 +12,7 @@ using Microsoft.AspNet.Razor.TagHelpers;
 using Moq;
 using Xunit;
 
-namespace Microsoft.AspNet.Mvc.Razor.Test
+namespace Microsoft.AspNet.Mvc.Razor.Compilation
 {
     public class RazorCompilationServiceTest
     {
diff --git a/test/Microsoft.AspNet.Mvc.Razor.Test/Compilation/RoslynCompilationServiceTest.cs b/test/Microsoft.AspNet.Mvc.Razor.Test/Compilation/RoslynCompilationServiceTest.cs
index 3fcaee1494..b4161006ad 100644
--- a/test/Microsoft.AspNet.Mvc.Razor.Test/Compilation/RoslynCompilationServiceTest.cs
+++ b/test/Microsoft.AspNet.Mvc.Razor.Test/Compilation/RoslynCompilationServiceTest.cs
@@ -11,7 +11,7 @@ using Microsoft.Framework.Runtime.Compilation;
 using Moq;
 using Xunit;
 
-namespace Microsoft.AspNet.Mvc.Razor
+namespace Microsoft.AspNet.Mvc.Razor.Compilation
 {
     public class RoslynCompilationServiceTest
     {
diff --git a/test/Microsoft.AspNet.Mvc.Razor.Test/RazorFileHashTest.cs b/test/Microsoft.AspNet.Mvc.Razor.Test/RazorFileHashTest.cs
index 4e644f6acd..f18d50b451 100644
--- a/test/Microsoft.AspNet.Mvc.Razor.Test/RazorFileHashTest.cs
+++ b/test/Microsoft.AspNet.Mvc.Razor.Test/RazorFileHashTest.cs
@@ -12,7 +12,7 @@ using Microsoft.AspNet.Testing;
 using Moq;
 using Xunit;
 
-namespace Microsoft.AspNet.Mvc.Razor
+namespace Microsoft.AspNet.Mvc.Razor.Compilation
 {
     public class RazorFileHashTest
     {
diff --git a/test/WebSites/RazorCompilerCacheWebSite/Services/CustomCompilerCache.cs b/test/WebSites/RazorCompilerCacheWebSite/Services/CustomCompilerCache.cs
index 288b9ab3e7..bb704eba51 100644
--- a/test/WebSites/RazorCompilerCacheWebSite/Services/CustomCompilerCache.cs
+++ b/test/WebSites/RazorCompilerCacheWebSite/Services/CustomCompilerCache.cs
@@ -3,6 +3,7 @@
 
 using Microsoft.AspNet.Mvc;
 using Microsoft.AspNet.Mvc.Razor;
+using Microsoft.AspNet.Mvc.Razor.Compilation;
 using Microsoft.Framework.OptionsModel;
 using Microsoft.Framework.Runtime;
 
diff --git a/test/WebSites/RazorCompilerCacheWebSite/Startup.cs b/test/WebSites/RazorCompilerCacheWebSite/Startup.cs
index 7fd492d1b9..ea32473a0c 100644
--- a/test/WebSites/RazorCompilerCacheWebSite/Startup.cs
+++ b/test/WebSites/RazorCompilerCacheWebSite/Startup.cs
@@ -2,7 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using Microsoft.AspNet.Builder;
-using Microsoft.AspNet.Mvc.Razor;
+using Microsoft.AspNet.Mvc.Razor.Compilation;
 using Microsoft.Framework.DependencyInjection;
 
 namespace RazorCompilerCacheWebSite