diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/CompilationOptionsProviderExtension.cs b/src/Microsoft.AspNetCore.Mvc.Razor/Internal/CompilationOptionsProviderExtension.cs
similarity index 97%
rename from src/Microsoft.AspNetCore.Mvc.Razor/Compilation/CompilationOptionsProviderExtension.cs
rename to src/Microsoft.AspNetCore.Mvc.Razor/Internal/CompilationOptionsProviderExtension.cs
index e4f53c3ead..5a6448d640 100644
--- a/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/CompilationOptionsProviderExtension.cs
+++ b/src/Microsoft.AspNetCore.Mvc.Razor/Internal/CompilationOptionsProviderExtension.cs
@@ -6,7 +6,7 @@ using Microsoft.Dnx.Compilation.CSharp;
 using Microsoft.Extensions.CompilationAbstractions;
 using Microsoft.Extensions.PlatformAbstractions;
 
-namespace Microsoft.AspNetCore.Mvc.Razor.Compilation
+namespace Microsoft.AspNetCore.Mvc.Razor.Internal
 {
     /// <summary>
     /// Extension methods for <see cref="ICompilerOptionsProvider"/>.
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/CompilerCache.cs b/src/Microsoft.AspNetCore.Mvc.Razor/Internal/CompilerCache.cs
similarity index 98%
rename from src/Microsoft.AspNetCore.Mvc.Razor/Compilation/CompilerCache.cs
rename to src/Microsoft.AspNetCore.Mvc.Razor/Internal/CompilerCache.cs
index 4b45b814f7..3afd1804f2 100644
--- a/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/CompilerCache.cs
+++ b/src/Microsoft.AspNetCore.Mvc.Razor/Internal/CompilerCache.cs
@@ -7,10 +7,11 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Text;
 using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc.Razor.Compilation;
 using Microsoft.Extensions.Caching.Memory;
 using Microsoft.Extensions.FileProviders;
 
-namespace Microsoft.AspNetCore.Mvc.Razor.Compilation
+namespace Microsoft.AspNetCore.Mvc.Razor.Internal
 {
     /// <summary>
     /// Caches the result of runtime compilation of Razor files for the duration of the application lifetime.
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/CompilerCacheResult.cs b/src/Microsoft.AspNetCore.Mvc.Razor/Internal/CompilerCacheResult.cs
similarity index 96%
rename from src/Microsoft.AspNetCore.Mvc.Razor/Compilation/CompilerCacheResult.cs
rename to src/Microsoft.AspNetCore.Mvc.Razor/Internal/CompilerCacheResult.cs
index 95fd506107..fd90164525 100644
--- a/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/CompilerCacheResult.cs
+++ b/src/Microsoft.AspNetCore.Mvc.Razor/Internal/CompilerCacheResult.cs
@@ -3,9 +3,10 @@
 
 using System;
 using System.Collections.Generic;
+using Microsoft.AspNetCore.Mvc.Razor.Compilation;
 using Microsoft.Extensions.Primitives;
 
-namespace Microsoft.AspNetCore.Mvc.Razor.Compilation
+namespace Microsoft.AspNetCore.Mvc.Razor.Internal
 {
     /// <summary>
     /// Result of <see cref="ICompilerCache"/>.
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/DefaultCompilerCacheProvider.cs b/src/Microsoft.AspNetCore.Mvc.Razor/Internal/DefaultCompilerCacheProvider.cs
similarity index 94%
rename from src/Microsoft.AspNetCore.Mvc.Razor/Compilation/DefaultCompilerCacheProvider.cs
rename to src/Microsoft.AspNetCore.Mvc.Razor/Internal/DefaultCompilerCacheProvider.cs
index 6970a8595a..f38ddd4457 100644
--- a/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/DefaultCompilerCacheProvider.cs
+++ b/src/Microsoft.AspNetCore.Mvc.Razor/Internal/DefaultCompilerCacheProvider.cs
@@ -3,7 +3,7 @@
 
 using Microsoft.Extensions.Options;
 
-namespace Microsoft.AspNetCore.Mvc.Razor.Compilation
+namespace Microsoft.AspNetCore.Mvc.Razor.Internal
 {
     /// <summary>
     /// Default implementation for <see cref="ICompilerCacheProvider"/>.
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/DefaultRazorPageFactoryProvider.cs b/src/Microsoft.AspNetCore.Mvc.Razor/Internal/DefaultRazorPageFactoryProvider.cs
similarity index 97%
rename from src/Microsoft.AspNetCore.Mvc.Razor/DefaultRazorPageFactoryProvider.cs
rename to src/Microsoft.AspNetCore.Mvc.Razor/Internal/DefaultRazorPageFactoryProvider.cs
index 194291d724..c2f7467e0b 100644
--- a/src/Microsoft.AspNetCore.Mvc.Razor/DefaultRazorPageFactoryProvider.cs
+++ b/src/Microsoft.AspNetCore.Mvc.Razor/Internal/DefaultRazorPageFactoryProvider.cs
@@ -3,8 +3,9 @@
 
 using System;
 using Microsoft.AspNetCore.Mvc.Razor.Compilation;
+using Microsoft.AspNetCore.Mvc.Razor.Internal;
 
-namespace Microsoft.AspNetCore.Mvc.Razor
+namespace Microsoft.AspNetCore.Mvc.Razor.Internal
 {
     /// <summary>
     /// Represents a <see cref="IRazorPageFactoryProvider"/> that creates <see cref="RazorPage"/> instances
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/DefaultRazorViewEngineFileProviderAccessor.cs b/src/Microsoft.AspNetCore.Mvc.Razor/Internal/DefaultRazorViewEngineFileProviderAccessor.cs
similarity index 96%
rename from src/Microsoft.AspNetCore.Mvc.Razor/DefaultRazorViewEngineFileProviderAccessor.cs
rename to src/Microsoft.AspNetCore.Mvc.Razor/Internal/DefaultRazorViewEngineFileProviderAccessor.cs
index fb70355ec7..e1fc5f6bf7 100644
--- a/src/Microsoft.AspNetCore.Mvc.Razor/DefaultRazorViewEngineFileProviderAccessor.cs
+++ b/src/Microsoft.AspNetCore.Mvc.Razor/Internal/DefaultRazorViewEngineFileProviderAccessor.cs
@@ -4,7 +4,7 @@
 using Microsoft.Extensions.FileProviders;
 using Microsoft.Extensions.Options;
 
-namespace Microsoft.AspNetCore.Mvc.Razor
+namespace Microsoft.AspNetCore.Mvc.Razor.Internal
 {
     /// <summary>
     /// Default implementation of <see cref="IRazorViewEngineFileProviderAccessor"/>.
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/DefaultRoslynCompilationService.cs b/src/Microsoft.AspNetCore.Mvc.Razor/Internal/DefaultRoslynCompilationService.cs
similarity index 99%
rename from src/Microsoft.AspNetCore.Mvc.Razor/Compilation/DefaultRoslynCompilationService.cs
rename to src/Microsoft.AspNetCore.Mvc.Razor/Internal/DefaultRoslynCompilationService.cs
index f55a8d2187..430f1e9c0e 100644
--- a/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/DefaultRoslynCompilationService.cs
+++ b/src/Microsoft.AspNetCore.Mvc.Razor/Internal/DefaultRoslynCompilationService.cs
@@ -12,7 +12,7 @@ using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Microsoft.Extensions.PlatformAbstractions;
 
-namespace Microsoft.AspNetCore.Mvc.Razor.Compilation
+namespace Microsoft.AspNetCore.Mvc.Razor.Internal
 {
     /// <summary>
     /// A type that uses Roslyn to compile C# content and <see cref="ILibraryExporter"/> to find out references.
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/DefaultTagHelperActivator.cs b/src/Microsoft.AspNetCore.Mvc.Razor/Internal/DefaultTagHelperActivator.cs
similarity index 98%
rename from src/Microsoft.AspNetCore.Mvc.Razor/DefaultTagHelperActivator.cs
rename to src/Microsoft.AspNetCore.Mvc.Razor/Internal/DefaultTagHelperActivator.cs
index c499e4c7c3..8824fdae4e 100644
--- a/src/Microsoft.AspNetCore.Mvc.Razor/DefaultTagHelperActivator.cs
+++ b/src/Microsoft.AspNetCore.Mvc.Razor/Internal/DefaultTagHelperActivator.cs
@@ -11,7 +11,7 @@ using Microsoft.AspNetCore.Razor.TagHelpers;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Internal;
 
-namespace Microsoft.AspNetCore.Mvc.Razor
+namespace Microsoft.AspNetCore.Mvc.Razor.Internal
 {
     /// <inheritdoc />
     public class DefaultTagHelperActivator : ITagHelperActivator
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/DependencyContextCompilationService.cs b/src/Microsoft.AspNetCore.Mvc.Razor/Internal/DependencyContextCompilationService.cs
similarity index 98%
rename from src/Microsoft.AspNetCore.Mvc.Razor/Compilation/DependencyContextCompilationService.cs
rename to src/Microsoft.AspNetCore.Mvc.Razor/Internal/DependencyContextCompilationService.cs
index 1cd07ca7c1..b11294b830 100644
--- a/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/DependencyContextCompilationService.cs
+++ b/src/Microsoft.AspNetCore.Mvc.Razor/Internal/DependencyContextCompilationService.cs
@@ -9,7 +9,7 @@ using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Microsoft.Extensions.PlatformAbstractions;
 
-namespace Microsoft.AspNetCore.Mvc.Razor.Compilation
+namespace Microsoft.AspNetCore.Mvc.Razor.Internal
 {
     /// <summary>
     /// A type that uses Roslyn to compile C# content and <see cref="DependencyContext"/> to locate references.
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/DependencyContextRazorViewEngineOptionsSetup.cs b/src/Microsoft.AspNetCore.Mvc.Razor/Internal/DependencyContextRazorViewEngineOptionsSetup.cs
similarity index 98%
rename from src/Microsoft.AspNetCore.Mvc.Razor/DependencyContextRazorViewEngineOptionsSetup.cs
rename to src/Microsoft.AspNetCore.Mvc.Razor/Internal/DependencyContextRazorViewEngineOptionsSetup.cs
index 1a29476769..119d2100e7 100644
--- a/src/Microsoft.AspNetCore.Mvc.Razor/DependencyContextRazorViewEngineOptionsSetup.cs
+++ b/src/Microsoft.AspNetCore.Mvc.Razor/Internal/DependencyContextRazorViewEngineOptionsSetup.cs
@@ -8,7 +8,7 @@ using Microsoft.CodeAnalysis;
 using Microsoft.Extensions.Options;
 using Microsoft.Extensions.DependencyModel;
 
-namespace Microsoft.AspNetCore.Mvc
+namespace Microsoft.AspNetCore.Mvc.Razor.Internal
 {
     /// <summary>
     /// Sets up compilation and parse option default options for <see cref="RazorViewEngineOptions"/> using <see cref="DependencyContext"/>
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/ExpressionRewriter.cs b/src/Microsoft.AspNetCore.Mvc.Razor/Internal/ExpressionRewriter.cs
similarity index 99%
rename from src/Microsoft.AspNetCore.Mvc.Razor/Compilation/ExpressionRewriter.cs
rename to src/Microsoft.AspNetCore.Mvc.Razor/Internal/ExpressionRewriter.cs
index ccf3ce0dc2..85ada012df 100644
--- a/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/ExpressionRewriter.cs
+++ b/src/Microsoft.AspNetCore.Mvc.Razor/Internal/ExpressionRewriter.cs
@@ -8,7 +8,7 @@ using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 
-namespace Microsoft.AspNetCore.Mvc.Razor.Compilation
+namespace Microsoft.AspNetCore.Mvc.Razor.Internal
 {
     /// <summary>
     /// An expression rewriter which can hoist a simple expression lambda into a private field.
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/ICompilerCache.cs b/src/Microsoft.AspNetCore.Mvc.Razor/Internal/ICompilerCache.cs
similarity index 90%
rename from src/Microsoft.AspNetCore.Mvc.Razor/Compilation/ICompilerCache.cs
rename to src/Microsoft.AspNetCore.Mvc.Razor/Internal/ICompilerCache.cs
index b090c42a35..13cd73239b 100644
--- a/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/ICompilerCache.cs
+++ b/src/Microsoft.AspNetCore.Mvc.Razor/Internal/ICompilerCache.cs
@@ -2,8 +2,9 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
+using Microsoft.AspNetCore.Mvc.Razor.Compilation;
 
-namespace Microsoft.AspNetCore.Mvc.Razor.Compilation
+namespace Microsoft.AspNetCore.Mvc.Razor.Internal
 {
     /// <summary>
     /// Caches the result of runtime compilation of Razor files for the duration of the app lifetime.
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/ICompilerCacheProvider.cs b/src/Microsoft.AspNetCore.Mvc.Razor/Internal/ICompilerCacheProvider.cs
similarity index 90%
rename from src/Microsoft.AspNetCore.Mvc.Razor/Compilation/ICompilerCacheProvider.cs
rename to src/Microsoft.AspNetCore.Mvc.Razor/Internal/ICompilerCacheProvider.cs
index 51966545ba..b621b0ac0b 100644
--- a/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/ICompilerCacheProvider.cs
+++ b/src/Microsoft.AspNetCore.Mvc.Razor/Internal/ICompilerCacheProvider.cs
@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-namespace Microsoft.AspNetCore.Mvc.Razor.Compilation
+namespace Microsoft.AspNetCore.Mvc.Razor.Internal
 {
     /// <summary>
     /// Provides access to a cached <see cref="ICompilerCache"/> instance.
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/IRazorViewEngineFileProviderAccessor.cs b/src/Microsoft.AspNetCore.Mvc.Razor/Internal/IRazorViewEngineFileProviderAccessor.cs
similarity index 92%
rename from src/Microsoft.AspNetCore.Mvc.Razor/IRazorViewEngineFileProviderAccessor.cs
rename to src/Microsoft.AspNetCore.Mvc.Razor/Internal/IRazorViewEngineFileProviderAccessor.cs
index 253f1061e0..670b7c3db3 100644
--- a/src/Microsoft.AspNetCore.Mvc.Razor/IRazorViewEngineFileProviderAccessor.cs
+++ b/src/Microsoft.AspNetCore.Mvc.Razor/Internal/IRazorViewEngineFileProviderAccessor.cs
@@ -3,7 +3,7 @@
 
 using Microsoft.Extensions.FileProviders;
 
-namespace Microsoft.AspNetCore.Mvc.Razor
+namespace Microsoft.AspNetCore.Mvc.Razor.Internal
 {
     /// <summary>
     /// Accessor to the <see cref="IFileProvider"/> used by <see cref="RazorViewEngine"/>.
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/RazorCompilationService.cs b/src/Microsoft.AspNetCore.Mvc.Razor/Internal/RazorCompilationService.cs
similarity index 98%
rename from src/Microsoft.AspNetCore.Mvc.Razor/Compilation/RazorCompilationService.cs
rename to src/Microsoft.AspNetCore.Mvc.Razor/Internal/RazorCompilationService.cs
index e41141d923..b707707c55 100644
--- a/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/RazorCompilationService.cs
+++ b/src/Microsoft.AspNetCore.Mvc.Razor/Internal/RazorCompilationService.cs
@@ -7,13 +7,14 @@ using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using Microsoft.AspNetCore.Diagnostics;
+using Microsoft.AspNetCore.Mvc.Razor.Compilation;
 using Microsoft.AspNetCore.Mvc.Razor.Internal;
 using Microsoft.AspNetCore.Razor;
 using Microsoft.AspNetCore.Razor.CodeGenerators;
 using Microsoft.Extensions.FileProviders;
 using Microsoft.Extensions.Logging;
 
-namespace Microsoft.AspNetCore.Mvc.Razor.Compilation
+namespace Microsoft.AspNetCore.Mvc.Razor.Internal
 {
     /// <summary>
     /// Default implementation of <see cref="IRazorCompilationService"/>.
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/RoslynCompilationService.cs b/src/Microsoft.AspNetCore.Mvc.Razor/Internal/RoslynCompilationService.cs
similarity index 99%
rename from src/Microsoft.AspNetCore.Mvc.Razor/Compilation/RoslynCompilationService.cs
rename to src/Microsoft.AspNetCore.Mvc.Razor/Internal/RoslynCompilationService.cs
index 47ef124a82..47cbf66eff 100644
--- a/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/RoslynCompilationService.cs
+++ b/src/Microsoft.AspNetCore.Mvc.Razor/Internal/RoslynCompilationService.cs
@@ -14,7 +14,7 @@ using System.Runtime.Loader;
 #endif
 using System.Runtime.Versioning;
 using Microsoft.AspNetCore.Diagnostics;
-using Microsoft.AspNetCore.Mvc.Razor.Internal;
+using Microsoft.AspNetCore.Mvc.Razor.Compilation;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.Emit;
@@ -24,7 +24,7 @@ using Microsoft.Extensions.PlatformAbstractions;
 using Microsoft.Extensions.Options;
 using Microsoft.Extensions.Logging;
 
-namespace Microsoft.AspNetCore.Mvc.Razor.Compilation
+namespace Microsoft.AspNetCore.Mvc.Razor.Internal
 {
     /// <summary>
     /// A type that uses Roslyn to compile C# content.
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/SyntaxTreeGenerator.cs b/src/Microsoft.AspNetCore.Mvc.Razor/Internal/SyntaxTreeGenerator.cs
similarity index 97%
rename from src/Microsoft.AspNetCore.Mvc.Razor/Compilation/SyntaxTreeGenerator.cs
rename to src/Microsoft.AspNetCore.Mvc.Razor/Internal/SyntaxTreeGenerator.cs
index c46746d501..778b0e0ace 100644
--- a/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/SyntaxTreeGenerator.cs
+++ b/src/Microsoft.AspNetCore.Mvc.Razor/Internal/SyntaxTreeGenerator.cs
@@ -8,7 +8,7 @@ using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.Text;
 using Microsoft.Dnx.Compilation.CSharp;
 
-namespace Microsoft.AspNetCore.Mvc.Razor.Compilation
+namespace Microsoft.AspNetCore.Mvc.Razor.Internal
 {
     public static class SyntaxTreeGenerator
     {
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/ViewLocationCacheItem.cs b/src/Microsoft.AspNetCore.Mvc.Razor/Internal/ViewLocationCacheItem.cs
similarity index 95%
rename from src/Microsoft.AspNetCore.Mvc.Razor/ViewLocationCacheItem.cs
rename to src/Microsoft.AspNetCore.Mvc.Razor/Internal/ViewLocationCacheItem.cs
index 0b11e00b30..23fe788101 100644
--- a/src/Microsoft.AspNetCore.Mvc.Razor/ViewLocationCacheItem.cs
+++ b/src/Microsoft.AspNetCore.Mvc.Razor/Internal/ViewLocationCacheItem.cs
@@ -3,7 +3,7 @@
 
 using System;
 
-namespace Microsoft.AspNetCore.Mvc.Razor
+namespace Microsoft.AspNetCore.Mvc.Razor.Internal
 {
     /// <summary>
     /// An item in <see cref="ViewLocationCacheResult"/>.
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/ViewLocationCacheKey.cs b/src/Microsoft.AspNetCore.Mvc.Razor/Internal/ViewLocationCacheKey.cs
similarity index 99%
rename from src/Microsoft.AspNetCore.Mvc.Razor/ViewLocationCacheKey.cs
rename to src/Microsoft.AspNetCore.Mvc.Razor/Internal/ViewLocationCacheKey.cs
index 435960f430..ff2ca0b5df 100644
--- a/src/Microsoft.AspNetCore.Mvc.Razor/ViewLocationCacheKey.cs
+++ b/src/Microsoft.AspNetCore.Mvc.Razor/Internal/ViewLocationCacheKey.cs
@@ -5,7 +5,7 @@ using System;
 using System.Collections.Generic;
 using Microsoft.Extensions.Internal;
 
-namespace Microsoft.AspNetCore.Mvc.Razor
+namespace Microsoft.AspNetCore.Mvc.Razor.Internal
 {
     /// <summary>
     /// Key for entries in <see cref="RazorViewEngine.ViewLookupCache"/>.
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/ViewLocationCacheResult.cs b/src/Microsoft.AspNetCore.Mvc.Razor/Internal/ViewLocationCacheResult.cs
similarity index 98%
rename from src/Microsoft.AspNetCore.Mvc.Razor/ViewLocationCacheResult.cs
rename to src/Microsoft.AspNetCore.Mvc.Razor/Internal/ViewLocationCacheResult.cs
index 3a2fd69d6d..c703bcaf19 100644
--- a/src/Microsoft.AspNetCore.Mvc.Razor/ViewLocationCacheResult.cs
+++ b/src/Microsoft.AspNetCore.Mvc.Razor/Internal/ViewLocationCacheResult.cs
@@ -4,7 +4,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace Microsoft.AspNetCore.Mvc.Razor
+namespace Microsoft.AspNetCore.Mvc.Razor.Internal
 {
     /// <summary>
     /// Result of view location cache lookup.
diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Test/DefaultPrecompiledViewsProviderTest.cs b/test/Microsoft.AspNetCore.Mvc.Razor.Test/DefaultPrecompiledViewsProviderTest.cs
deleted file mode 100644
index bfa2c0ed88..0000000000
--- a/test/Microsoft.AspNetCore.Mvc.Razor.Test/DefaultPrecompiledViewsProviderTest.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using Xunit;
-
-namespace Microsoft.AspNetCore.Mvc.Razor
-{
-    public class DefaultPrecompiledViewsProviderTest
-    {
-        
-    }
-}
\ No newline at end of file
diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Test/Compilation/CompilerCacheTest.cs b/test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/CompilerCacheTest.cs
similarity index 99%
rename from test/Microsoft.AspNetCore.Mvc.Razor.Test/Compilation/CompilerCacheTest.cs
rename to test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/CompilerCacheTest.cs
index 2261cb2fc0..5f88be6af0 100644
--- a/test/Microsoft.AspNetCore.Mvc.Razor.Test/Compilation/CompilerCacheTest.cs
+++ b/test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/CompilerCacheTest.cs
@@ -6,10 +6,11 @@ using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Diagnostics;
+using Microsoft.AspNetCore.Mvc.Razor.Compilation;
 using Moq;
 using Xunit;
 
-namespace Microsoft.AspNetCore.Mvc.Razor.Compilation
+namespace Microsoft.AspNetCore.Mvc.Razor.Internal
 {
     public class CompilerCacheTest
     {
diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Test/DefaultRazorPageFactoryProviderTest.cs b/test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/DefaultRazorPageFactoryProviderTest.cs
similarity index 98%
rename from test/Microsoft.AspNetCore.Mvc.Razor.Test/DefaultRazorPageFactoryProviderTest.cs
rename to test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/DefaultRazorPageFactoryProviderTest.cs
index 2c15aff18a..2e4e6af3b3 100644
--- a/test/Microsoft.AspNetCore.Mvc.Razor.Test/DefaultRazorPageFactoryProviderTest.cs
+++ b/test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/DefaultRazorPageFactoryProviderTest.cs
@@ -8,7 +8,7 @@ using Microsoft.Extensions.Primitives;
 using Moq;
 using Xunit;
 
-namespace Microsoft.AspNetCore.Mvc.Razor.Test
+namespace Microsoft.AspNetCore.Mvc.Razor.Internal
 {
     public class DefaultRazorPageFactoryProviderTest
     {
diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Test/DefaultRazorViewEngineFileProviderAccessorTest.cs b/test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/DefaultRazorViewEngineFileProviderAccessorTest.cs
similarity index 94%
rename from test/Microsoft.AspNetCore.Mvc.Razor.Test/DefaultRazorViewEngineFileProviderAccessorTest.cs
rename to test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/DefaultRazorViewEngineFileProviderAccessorTest.cs
index de77b8a41e..52ac2610c4 100644
--- a/test/Microsoft.AspNetCore.Mvc.Razor.Test/DefaultRazorViewEngineFileProviderAccessorTest.cs
+++ b/test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/DefaultRazorViewEngineFileProviderAccessorTest.cs
@@ -1,14 +1,12 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using Microsoft.AspNetCore.Mvc.Internal;
-using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.FileProviders;
 using Microsoft.Extensions.Options;
 using Moq;
 using Xunit;
 
-namespace Microsoft.AspNetCore.Mvc.Razor
+namespace Microsoft.AspNetCore.Mvc.Razor.Internal
 {
     public class DefaultRazorViewEngineFileProviderAccessorTest
     {
diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Test/Compilation/DefaultRoslynCompilationServiceTest.cs b/test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/DefaultRoslynCompilationServiceTest.cs
similarity index 99%
rename from test/Microsoft.AspNetCore.Mvc.Razor.Test/Compilation/DefaultRoslynCompilationServiceTest.cs
rename to test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/DefaultRoslynCompilationServiceTest.cs
index bfe5e1c5ee..abb6915038 100644
--- a/test/Microsoft.AspNetCore.Mvc.Razor.Test/Compilation/DefaultRoslynCompilationServiceTest.cs
+++ b/test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/DefaultRoslynCompilationServiceTest.cs
@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
+using Microsoft.AspNetCore.Mvc.Razor.Compilation;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Text;
 using Microsoft.Extensions.CompilationAbstractions;
@@ -12,7 +13,7 @@ using Microsoft.Extensions.PlatformAbstractions;
 using Moq;
 using Xunit;
 
-namespace Microsoft.AspNetCore.Mvc.Razor.Compilation
+namespace Microsoft.AspNetCore.Mvc.Razor.Internal
 {
     public class DefaultRoslynCompilationServiceTest
     {
diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Test/DefaultTagHelperActivatorTest.cs b/test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/DefaultTagHelperActivatorTest.cs
similarity index 99%
rename from test/Microsoft.AspNetCore.Mvc.Razor.Test/DefaultTagHelperActivatorTest.cs
rename to test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/DefaultTagHelperActivatorTest.cs
index 023f3d5811..889639f391 100644
--- a/test/Microsoft.AspNetCore.Mvc.Razor.Test/DefaultTagHelperActivatorTest.cs
+++ b/test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/DefaultTagHelperActivatorTest.cs
@@ -17,7 +17,7 @@ using Microsoft.Extensions.DependencyInjection;
 using Moq;
 using Xunit;
 
-namespace Microsoft.AspNetCore.Mvc.Razor
+namespace Microsoft.AspNetCore.Mvc.Razor.Internal
 {
     public class DefaultTagHelperActivatorTest
     {
diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Test/Compilation/ExpressionRewriterTest.cs b/test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/ExpressionRewriterTest.cs
similarity index 99%
rename from test/Microsoft.AspNetCore.Mvc.Razor.Test/Compilation/ExpressionRewriterTest.cs
rename to test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/ExpressionRewriterTest.cs
index 735d53605b..06bae5ba20 100644
--- a/test/Microsoft.AspNetCore.Mvc.Razor.Test/Compilation/ExpressionRewriterTest.cs
+++ b/test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/ExpressionRewriterTest.cs
@@ -12,7 +12,7 @@ using Microsoft.Extensions.CompilationAbstractions;
 using Microsoft.Extensions.PlatformAbstractions;
 using Xunit;
 
-namespace Microsoft.AspNetCore.Mvc.Razor.Compilation
+namespace Microsoft.AspNetCore.Mvc.Razor.Internal
 {
     public class ExpressionRewriterTest
     {
diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Test/Compilation/RazorCompilationServiceTest.cs b/test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/RazorCompilationServiceTest.cs
similarity index 99%
rename from test/Microsoft.AspNetCore.Mvc.Razor.Test/Compilation/RazorCompilationServiceTest.cs
rename to test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/RazorCompilationServiceTest.cs
index f6c5909b3b..0eaa04556a 100644
--- a/test/Microsoft.AspNetCore.Mvc.Razor.Test/Compilation/RazorCompilationServiceTest.cs
+++ b/test/Microsoft.AspNetCore.Mvc.Razor.Test/Internal/RazorCompilationServiceTest.cs
@@ -3,6 +3,7 @@
 
 using System.IO;
 using System.Linq;
+using Microsoft.AspNetCore.Mvc.Razor.Compilation;
 using Microsoft.AspNetCore.Razor;
 using Microsoft.AspNetCore.Razor.Chunks;
 using Microsoft.AspNetCore.Razor.CodeGenerators;
@@ -14,7 +15,7 @@ using Microsoft.Extensions.Options;
 using Moq;
 using Xunit;
 
-namespace Microsoft.AspNetCore.Mvc.Razor.Compilation
+namespace Microsoft.AspNetCore.Mvc.Razor.Internal
 {
     public class RazorCompilationServiceTest
     {
diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Test/RazorPageCreateTagHelperTest.cs b/test/Microsoft.AspNetCore.Mvc.Razor.Test/RazorPageCreateTagHelperTest.cs
index 207b064bf0..170505a25f 100644
--- a/test/Microsoft.AspNetCore.Mvc.Razor.Test/RazorPageCreateTagHelperTest.cs
+++ b/test/Microsoft.AspNetCore.Mvc.Razor.Test/RazorPageCreateTagHelperTest.cs
@@ -12,6 +12,7 @@ using Microsoft.AspNetCore.Mvc.Abstractions;
 using Microsoft.AspNetCore.Mvc.Infrastructure;
 using Microsoft.AspNetCore.Mvc.Internal;
 using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.AspNetCore.Mvc.Razor.Internal;
 using Microsoft.AspNetCore.Mvc.Rendering;
 using Microsoft.AspNetCore.Mvc.ViewEngines;
 using Microsoft.AspNetCore.Mvc.ViewFeatures;
diff --git a/test/WebSites/RazorPageExecutionInstrumentationWebSite/TestRazorCompilationService.cs b/test/WebSites/RazorPageExecutionInstrumentationWebSite/TestRazorCompilationService.cs
index 0bbe73d1c9..d9b8410710 100644
--- a/test/WebSites/RazorPageExecutionInstrumentationWebSite/TestRazorCompilationService.cs
+++ b/test/WebSites/RazorPageExecutionInstrumentationWebSite/TestRazorCompilationService.cs
@@ -5,6 +5,7 @@ using System.IO;
 using System.Text;
 using Microsoft.AspNetCore.Mvc.Razor;
 using Microsoft.AspNetCore.Mvc.Razor.Compilation;
+using Microsoft.AspNetCore.Mvc.Razor.Internal;
 using Microsoft.AspNetCore.Razor.CodeGenerators;
 using Microsoft.Extensions.Logging;