diff --git a/src/Microsoft.AspNetCore.Razor/Editor/AutoCompleteEditHandler.cs b/src/Microsoft.AspNetCore.Razor/Editor/AutoCompleteEditHandler.cs
index 4be3782243..421a9c034d 100644
--- a/src/Microsoft.AspNetCore.Razor/Editor/AutoCompleteEditHandler.cs
+++ b/src/Microsoft.AspNetCore.Razor/Editor/AutoCompleteEditHandler.cs
@@ -3,12 +3,13 @@
 
 using System;
 using System.Collections.Generic;
-using Microsoft.AspNetCore.Razor.Editor;
+using Microsoft.AspNetCore.Razor.Parser;
+using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
 using Microsoft.AspNetCore.Razor.Text;
 using Microsoft.AspNetCore.Razor.Tokenizer.Symbols;
 using Microsoft.Extensions.Internal;
 
-namespace Microsoft.AspNetCore.Razor.Parser.SyntaxTree
+namespace Microsoft.AspNetCore.Razor.Editor
 {
     public class AutoCompleteEditHandler : SpanEditHandler
     {
diff --git a/src/Microsoft.AspNetCore.Razor/Editor/BackgroundParser.cs b/src/Microsoft.AspNetCore.Razor/Editor/BackgroundParser.cs
index 6051487e2d..b7ec764d34 100644
--- a/src/Microsoft.AspNetCore.Razor/Editor/BackgroundParser.cs
+++ b/src/Microsoft.AspNetCore.Razor/Editor/BackgroundParser.cs
@@ -9,9 +9,9 @@ using System.IO;
 using System.Linq;
 using System.Threading;
 using Microsoft.AspNetCore.Razor.CodeGenerators;
+using Microsoft.AspNetCore.Razor.Parser;
 using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
 using Microsoft.AspNetCore.Razor.Text;
-using Microsoft.AspNetCore.Razor.Utils;
 
 namespace Microsoft.AspNetCore.Razor.Editor
 {
diff --git a/src/Microsoft.AspNetCore.Razor/Editor/ImplicitExpressionEditHandler.cs b/src/Microsoft.AspNetCore.Razor/Editor/ImplicitExpressionEditHandler.cs
index 41f8cc9a9f..dc9be897a2 100644
--- a/src/Microsoft.AspNetCore.Razor/Editor/ImplicitExpressionEditHandler.cs
+++ b/src/Microsoft.AspNetCore.Razor/Editor/ImplicitExpressionEditHandler.cs
@@ -8,6 +8,7 @@ using System.Globalization;
 using System.IO;
 using System.Linq;
 using Microsoft.AspNetCore.Razor.Parser;
+using Microsoft.AspNetCore.Razor.Parser.Internal;
 using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
 using Microsoft.AspNetCore.Razor.Text;
 using Microsoft.AspNetCore.Razor.Tokenizer.Symbols;
diff --git a/src/Microsoft.AspNetCore.Razor/Parser/CSharpCodeParser.Directives.cs b/src/Microsoft.AspNetCore.Razor/Parser/CSharpCodeParser.Directives.cs
index d1a5a3fb4c..37c02d172c 100644
--- a/src/Microsoft.AspNetCore.Razor/Parser/CSharpCodeParser.Directives.cs
+++ b/src/Microsoft.AspNetCore.Razor/Parser/CSharpCodeParser.Directives.cs
@@ -4,8 +4,10 @@
 using System;
 using System.Diagnostics;
 using Microsoft.AspNetCore.Razor.Chunks.Generators;
+using Microsoft.AspNetCore.Razor.Editor;
 using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
 using Microsoft.AspNetCore.Razor.Tokenizer.Symbols;
+using Microsoft.AspNetCore.Razor.Tokenizer.Symbols.Internal;
 
 namespace Microsoft.AspNetCore.Razor.Parser
 {
diff --git a/src/Microsoft.AspNetCore.Razor/Parser/CSharpCodeParser.Expressions.cs b/src/Microsoft.AspNetCore.Razor/Parser/CSharpCodeParser.Expressions.cs
index c3caf67343..a952c780fa 100644
--- a/src/Microsoft.AspNetCore.Razor/Parser/CSharpCodeParser.Expressions.cs
+++ b/src/Microsoft.AspNetCore.Razor/Parser/CSharpCodeParser.Expressions.cs
@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using Microsoft.AspNetCore.Razor.Tokenizer.Symbols;
+using Microsoft.AspNetCore.Razor.Tokenizer.Symbols.Internal;
 
 namespace Microsoft.AspNetCore.Razor.Parser
 {
diff --git a/src/Microsoft.AspNetCore.Razor/Parser/CSharpCodeParser.Statements.cs b/src/Microsoft.AspNetCore.Razor/Parser/CSharpCodeParser.Statements.cs
index 6fc0b0bfa0..005a17449b 100644
--- a/src/Microsoft.AspNetCore.Razor/Parser/CSharpCodeParser.Statements.cs
+++ b/src/Microsoft.AspNetCore.Razor/Parser/CSharpCodeParser.Statements.cs
@@ -8,6 +8,7 @@ using System.Linq;
 using Microsoft.AspNetCore.Razor.Chunks.Generators;
 using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
 using Microsoft.AspNetCore.Razor.Tokenizer.Symbols;
+using Microsoft.AspNetCore.Razor.Tokenizer.Symbols.Internal;
 
 namespace Microsoft.AspNetCore.Razor.Parser
 {
diff --git a/src/Microsoft.AspNetCore.Razor/Parser/CSharpCodeParser.cs b/src/Microsoft.AspNetCore.Razor/Parser/CSharpCodeParser.cs
index e2b360b709..50a9a49141 100644
--- a/src/Microsoft.AspNetCore.Razor/Parser/CSharpCodeParser.cs
+++ b/src/Microsoft.AspNetCore.Razor/Parser/CSharpCodeParser.cs
@@ -7,7 +7,7 @@ using System.Diagnostics;
 using Microsoft.AspNetCore.Razor.Chunks.Generators;
 using Microsoft.AspNetCore.Razor.Editor;
 using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
-using Microsoft.AspNetCore.Razor.Tokenizer;
+using Microsoft.AspNetCore.Razor.Tokenizer.Internal;
 using Microsoft.AspNetCore.Razor.Tokenizer.Symbols;
 
 namespace Microsoft.AspNetCore.Razor.Parser
diff --git a/src/Microsoft.AspNetCore.Razor/Parser/CSharpLanguageCharacteristics.cs b/src/Microsoft.AspNetCore.Razor/Parser/CSharpLanguageCharacteristics.cs
index f0f99c837e..02933dd1d6 100644
--- a/src/Microsoft.AspNetCore.Razor/Parser/CSharpLanguageCharacteristics.cs
+++ b/src/Microsoft.AspNetCore.Razor/Parser/CSharpLanguageCharacteristics.cs
@@ -4,7 +4,7 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using Microsoft.AspNetCore.Razor.Text;
-using Microsoft.AspNetCore.Razor.Tokenizer;
+using Microsoft.AspNetCore.Razor.Tokenizer.Internal;
 using Microsoft.AspNetCore.Razor.Tokenizer.Symbols;
 
 namespace Microsoft.AspNetCore.Razor.Parser
diff --git a/src/Microsoft.AspNetCore.Razor/Parser/ConditionalAttributeCollapser.cs b/src/Microsoft.AspNetCore.Razor/Parser/ConditionalAttributeCollapser.cs
index 0969bc33ce..0431ce2adb 100644
--- a/src/Microsoft.AspNetCore.Razor/Parser/ConditionalAttributeCollapser.cs
+++ b/src/Microsoft.AspNetCore.Razor/Parser/ConditionalAttributeCollapser.cs
@@ -4,10 +4,11 @@
 using System;
 using System.Diagnostics;
 using System.Linq;
-using Microsoft.AspNetCore.Razor.Editor;
 using Microsoft.AspNetCore.Razor.Chunks.Generators;
+using Microsoft.AspNetCore.Razor.Editor;
+using Microsoft.AspNetCore.Razor.Parser.Internal;
 using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
-using Microsoft.AspNetCore.Razor.Tokenizer;
+using Microsoft.AspNetCore.Razor.Tokenizer.Internal;
 
 namespace Microsoft.AspNetCore.Razor.Parser
 {
diff --git a/src/Microsoft.AspNetCore.Razor/Utils/DisposableAction.cs b/src/Microsoft.AspNetCore.Razor/Parser/DisposableAction.cs
similarity index 94%
rename from src/Microsoft.AspNetCore.Razor/Utils/DisposableAction.cs
rename to src/Microsoft.AspNetCore.Razor/Parser/DisposableAction.cs
index 3b13311740..a7538dc011 100644
--- a/src/Microsoft.AspNetCore.Razor/Utils/DisposableAction.cs
+++ b/src/Microsoft.AspNetCore.Razor/Parser/DisposableAction.cs
@@ -3,7 +3,7 @@
 
 using System;
 
-namespace Microsoft.AspNetCore.Razor.Utils
+namespace Microsoft.AspNetCore.Razor.Parser
 {
     internal class DisposableAction : IDisposable
     {
diff --git a/src/Microsoft.AspNetCore.Razor/Parser/CallbackVisitor.cs b/src/Microsoft.AspNetCore.Razor/Parser/Internal/CallbackVisitor.cs
similarity index 98%
rename from src/Microsoft.AspNetCore.Razor/Parser/CallbackVisitor.cs
rename to src/Microsoft.AspNetCore.Razor/Parser/Internal/CallbackVisitor.cs
index b89e0ebef9..7713488cc9 100644
--- a/src/Microsoft.AspNetCore.Razor/Parser/CallbackVisitor.cs
+++ b/src/Microsoft.AspNetCore.Razor/Parser/Internal/CallbackVisitor.cs
@@ -5,7 +5,7 @@ using System;
 using System.Threading;
 using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
 
-namespace Microsoft.AspNetCore.Razor.Parser
+namespace Microsoft.AspNetCore.Razor.Parser.Internal
 {
     public class CallbackVisitor : ParserVisitor
     {
diff --git a/src/Microsoft.AspNetCore.Razor/Parser/HtmlLanguageCharacteristics.cs b/src/Microsoft.AspNetCore.Razor/Parser/Internal/HtmlLanguageCharacteristics.cs
similarity index 96%
rename from src/Microsoft.AspNetCore.Razor/Parser/HtmlLanguageCharacteristics.cs
rename to src/Microsoft.AspNetCore.Razor/Parser/Internal/HtmlLanguageCharacteristics.cs
index 690cacc1c8..1f572bc39d 100644
--- a/src/Microsoft.AspNetCore.Razor/Parser/HtmlLanguageCharacteristics.cs
+++ b/src/Microsoft.AspNetCore.Razor/Parser/Internal/HtmlLanguageCharacteristics.cs
@@ -1,14 +1,14 @@
 // 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 System.Collections.Generic;
 using System.Diagnostics;
 using Microsoft.AspNetCore.Razor.Text;
-using Microsoft.AspNetCore.Razor.Tokenizer;
+using Microsoft.AspNetCore.Razor.Tokenizer.Internal;
 using Microsoft.AspNetCore.Razor.Tokenizer.Symbols;
+using Microsoft.AspNetCore.Razor.Tokenizer.Symbols.Internal;
 
-namespace Microsoft.AspNetCore.Razor.Parser
+namespace Microsoft.AspNetCore.Razor.Parser.Internal
 {
     public class HtmlLanguageCharacteristics : LanguageCharacteristics<HtmlTokenizer, HtmlSymbol, HtmlSymbolType>
     {
diff --git a/src/Microsoft.AspNetCore.Razor/Parser/HtmlMarkupParser.Block.cs b/src/Microsoft.AspNetCore.Razor/Parser/Internal/HtmlMarkupParser.Block.cs
similarity index 99%
rename from src/Microsoft.AspNetCore.Razor/Parser/HtmlMarkupParser.Block.cs
rename to src/Microsoft.AspNetCore.Razor/Parser/Internal/HtmlMarkupParser.Block.cs
index ee0de4eba8..1fd74b3382 100644
--- a/src/Microsoft.AspNetCore.Razor/Parser/HtmlMarkupParser.Block.cs
+++ b/src/Microsoft.AspNetCore.Razor/Parser/Internal/HtmlMarkupParser.Block.cs
@@ -10,8 +10,9 @@ using Microsoft.AspNetCore.Razor.Editor;
 using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
 using Microsoft.AspNetCore.Razor.Text;
 using Microsoft.AspNetCore.Razor.Tokenizer.Symbols;
+using Microsoft.AspNetCore.Razor.Tokenizer.Symbols.Internal;
 
-namespace Microsoft.AspNetCore.Razor.Parser
+namespace Microsoft.AspNetCore.Razor.Parser.Internal
 {
     public partial class HtmlMarkupParser
     {
diff --git a/src/Microsoft.AspNetCore.Razor/Parser/HtmlMarkupParser.Document.cs b/src/Microsoft.AspNetCore.Razor/Parser/Internal/HtmlMarkupParser.Document.cs
similarity index 98%
rename from src/Microsoft.AspNetCore.Razor/Parser/HtmlMarkupParser.Document.cs
rename to src/Microsoft.AspNetCore.Razor/Parser/Internal/HtmlMarkupParser.Document.cs
index 9a05699afb..3bd434d6a3 100644
--- a/src/Microsoft.AspNetCore.Razor/Parser/HtmlMarkupParser.Document.cs
+++ b/src/Microsoft.AspNetCore.Razor/Parser/Internal/HtmlMarkupParser.Document.cs
@@ -7,8 +7,9 @@ using System.Linq;
 using Microsoft.AspNetCore.Razor.Chunks.Generators;
 using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
 using Microsoft.AspNetCore.Razor.Tokenizer.Symbols;
+using Microsoft.AspNetCore.Razor.Tokenizer.Symbols.Internal;
 
-namespace Microsoft.AspNetCore.Razor.Parser
+namespace Microsoft.AspNetCore.Razor.Parser.Internal
 {
     public partial class HtmlMarkupParser
     {
diff --git a/src/Microsoft.AspNetCore.Razor/Parser/HtmlMarkupParser.Section.cs b/src/Microsoft.AspNetCore.Razor/Parser/Internal/HtmlMarkupParser.Section.cs
similarity index 98%
rename from src/Microsoft.AspNetCore.Razor/Parser/HtmlMarkupParser.Section.cs
rename to src/Microsoft.AspNetCore.Razor/Parser/Internal/HtmlMarkupParser.Section.cs
index 5806b92cae..cd3287002c 100644
--- a/src/Microsoft.AspNetCore.Razor/Parser/HtmlMarkupParser.Section.cs
+++ b/src/Microsoft.AspNetCore.Razor/Parser/Internal/HtmlMarkupParser.Section.cs
@@ -5,8 +5,9 @@ using System;
 using System.Diagnostics;
 using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
 using Microsoft.AspNetCore.Razor.Tokenizer.Symbols;
+using Microsoft.AspNetCore.Razor.Tokenizer.Symbols.Internal;
 
-namespace Microsoft.AspNetCore.Razor.Parser
+namespace Microsoft.AspNetCore.Razor.Parser.Internal
 {
     public partial class HtmlMarkupParser
     {
diff --git a/src/Microsoft.AspNetCore.Razor/Parser/HtmlMarkupParser.cs b/src/Microsoft.AspNetCore.Razor/Parser/Internal/HtmlMarkupParser.cs
similarity index 98%
rename from src/Microsoft.AspNetCore.Razor/Parser/HtmlMarkupParser.cs
rename to src/Microsoft.AspNetCore.Razor/Parser/Internal/HtmlMarkupParser.cs
index 3b5c52f5dd..8373703c67 100644
--- a/src/Microsoft.AspNetCore.Razor/Parser/HtmlMarkupParser.cs
+++ b/src/Microsoft.AspNetCore.Razor/Parser/Internal/HtmlMarkupParser.cs
@@ -5,10 +5,10 @@ using System;
 using System.Collections.Generic;
 using Microsoft.AspNetCore.Razor.Chunks.Generators;
 using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
-using Microsoft.AspNetCore.Razor.Tokenizer;
-using Microsoft.AspNetCore.Razor.Tokenizer.Symbols;
+using Microsoft.AspNetCore.Razor.Tokenizer.Internal;
+using Microsoft.AspNetCore.Razor.Tokenizer.Symbols.Internal;
 
-namespace Microsoft.AspNetCore.Razor.Parser
+namespace Microsoft.AspNetCore.Razor.Parser.Internal
 {
     public partial class HtmlMarkupParser : TokenizerBackedParser<HtmlTokenizer, HtmlSymbol, HtmlSymbolType>
     {
diff --git a/src/Microsoft.AspNetCore.Razor/Parser/MarkupCollapser.cs b/src/Microsoft.AspNetCore.Razor/Parser/MarkupCollapser.cs
index 8d75b1f0e4..8f23ba1450 100644
--- a/src/Microsoft.AspNetCore.Razor/Parser/MarkupCollapser.cs
+++ b/src/Microsoft.AspNetCore.Razor/Parser/MarkupCollapser.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Linq;
 using Microsoft.AspNetCore.Razor.Chunks.Generators;
+using Microsoft.AspNetCore.Razor.Parser.Internal;
 using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
 
 namespace Microsoft.AspNetCore.Razor.Parser
diff --git a/src/Microsoft.AspNetCore.Razor/Parser/ParserContext.cs b/src/Microsoft.AspNetCore.Razor/Parser/ParserContext.cs
index b430f0abd8..7f31cc194f 100644
--- a/src/Microsoft.AspNetCore.Razor/Parser/ParserContext.cs
+++ b/src/Microsoft.AspNetCore.Razor/Parser/ParserContext.cs
@@ -8,9 +8,9 @@ using System.Globalization;
 using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Razor.Compilation.TagHelpers;
+using Microsoft.AspNetCore.Razor.Parser.Internal;
 using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
 using Microsoft.AspNetCore.Razor.Text;
-using Microsoft.AspNetCore.Razor.Utils;
 
 namespace Microsoft.AspNetCore.Razor.Parser
 {
diff --git a/src/Microsoft.AspNetCore.Razor/Parser/RazorParser.cs b/src/Microsoft.AspNetCore.Razor/Parser/RazorParser.cs
index 8b762a02d3..3d0b7be6c3 100644
--- a/src/Microsoft.AspNetCore.Razor/Parser/RazorParser.cs
+++ b/src/Microsoft.AspNetCore.Razor/Parser/RazorParser.cs
@@ -8,6 +8,7 @@ using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Razor.Compilation.TagHelpers;
+using Microsoft.AspNetCore.Razor.Parser.Internal;
 using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
 using Microsoft.AspNetCore.Razor.Parser.TagHelpers;
 using Microsoft.AspNetCore.Razor.Parser.TagHelpers.Internal;
diff --git a/src/Microsoft.AspNetCore.Razor/Parser/TagHelpers/TagHelperBlockRewriter.cs b/src/Microsoft.AspNetCore.Razor/Parser/TagHelpers/Internal/TagHelperBlockRewriter.cs
similarity index 99%
rename from src/Microsoft.AspNetCore.Razor/Parser/TagHelpers/TagHelperBlockRewriter.cs
rename to src/Microsoft.AspNetCore.Razor/Parser/TagHelpers/Internal/TagHelperBlockRewriter.cs
index 8fefd92e56..4f2f4129fc 100644
--- a/src/Microsoft.AspNetCore.Razor/Parser/TagHelpers/TagHelperBlockRewriter.cs
+++ b/src/Microsoft.AspNetCore.Razor/Parser/TagHelpers/Internal/TagHelperBlockRewriter.cs
@@ -7,9 +7,10 @@ using System.Diagnostics;
 using System.Linq;
 using Microsoft.AspNetCore.Razor.Chunks.Generators;
 using Microsoft.AspNetCore.Razor.Compilation.TagHelpers;
+using Microsoft.AspNetCore.Razor.Parser.Internal;
 using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
 using Microsoft.AspNetCore.Razor.TagHelpers;
-using Microsoft.AspNetCore.Razor.Tokenizer.Symbols;
+using Microsoft.AspNetCore.Razor.Tokenizer.Symbols.Internal;
 
 namespace Microsoft.AspNetCore.Razor.Parser.TagHelpers.Internal
 {
diff --git a/src/Microsoft.AspNetCore.Razor/Parser/TagHelpers/TagHelperParseTreeRewriter.cs b/src/Microsoft.AspNetCore.Razor/Parser/TagHelpers/Internal/TagHelperParseTreeRewriter.cs
similarity index 99%
rename from src/Microsoft.AspNetCore.Razor/Parser/TagHelpers/TagHelperParseTreeRewriter.cs
rename to src/Microsoft.AspNetCore.Razor/Parser/TagHelpers/Internal/TagHelperParseTreeRewriter.cs
index 6168999c87..ee17ca334c 100644
--- a/src/Microsoft.AspNetCore.Razor/Parser/TagHelpers/TagHelperParseTreeRewriter.cs
+++ b/src/Microsoft.AspNetCore.Razor/Parser/TagHelpers/Internal/TagHelperParseTreeRewriter.cs
@@ -9,7 +9,7 @@ using System.Text;
 using Microsoft.AspNetCore.Razor.Compilation.TagHelpers;
 using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
 using Microsoft.AspNetCore.Razor.TagHelpers;
-using Microsoft.AspNetCore.Razor.Tokenizer.Symbols;
+using Microsoft.AspNetCore.Razor.Tokenizer.Symbols.Internal;
 
 namespace Microsoft.AspNetCore.Razor.Parser.TagHelpers.Internal
 {
diff --git a/src/Microsoft.AspNetCore.Razor/Parser/TokenizerBackedParser.Helpers.cs b/src/Microsoft.AspNetCore.Razor/Parser/TokenizerBackedParser.Helpers.cs
index 483fb79e38..4d433b71b2 100644
--- a/src/Microsoft.AspNetCore.Razor/Parser/TokenizerBackedParser.Helpers.cs
+++ b/src/Microsoft.AspNetCore.Razor/Parser/TokenizerBackedParser.Helpers.cs
@@ -7,10 +7,10 @@ using System.Diagnostics;
 using System.Linq;
 using Microsoft.AspNetCore.Razor.Chunks.Generators;
 using Microsoft.AspNetCore.Razor.Editor;
+using Microsoft.AspNetCore.Razor.Parser.Internal;
 using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
 using Microsoft.AspNetCore.Razor.Tokenizer;
 using Microsoft.AspNetCore.Razor.Tokenizer.Symbols;
-using Microsoft.AspNetCore.Razor.Utils;
 
 namespace Microsoft.AspNetCore.Razor.Parser
 {
diff --git a/src/Microsoft.AspNetCore.Razor/Parser/WhitespaceRewriter.cs b/src/Microsoft.AspNetCore.Razor/Parser/WhitespaceRewriter.cs
index 8d6ba73982..f59fbe74cc 100644
--- a/src/Microsoft.AspNetCore.Razor/Parser/WhitespaceRewriter.cs
+++ b/src/Microsoft.AspNetCore.Razor/Parser/WhitespaceRewriter.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Microsoft.AspNetCore.Razor.Parser.Internal;
 using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
 
 namespace Microsoft.AspNetCore.Razor.Parser
@@ -24,36 +25,6 @@ namespace Microsoft.AspNetCore.Razor.Parser
             return block.Type == BlockType.Expression && Parent != null;
         }
 
-        //public override void VisitBlock(Block block)
-        //{
-        //    BlockBuilder parent = null;
-        //    if (_blocks.Count > 0)
-        //    {
-        //        parent = _blocks.Peek();
-        //    }
-        //    BlockBuilder newBlock = new BlockBuilder(block);
-        //    newBlock.Children.Clear();
-        //    _blocks.Push(newBlock);
-        //    if (block.Type == BlockType.Expression && parent != null)
-        //    {
-        //        VisitExpressionBlock(block, parent);
-        //    }
-        //    else
-        //    {
-        //        base.VisitBlock(block);
-        //    }
-        //    if (_blocks.Count > 1)
-        //    {
-        //        parent.Children.Add(_blocks.Pop().Build());
-        //    }
-        //}
-
-        //public override void VisitSpan(Span span)
-        //{
-        //    Debug.Assert(_blocks.Count > 0);
-        //    _blocks.Peek().Children.Add(span);
-        //}
-
         protected override SyntaxTreeNode RewriteBlock(BlockBuilder parent, Block block)
         {
             var newBlock = new BlockBuilder(block);
diff --git a/src/Microsoft.AspNetCore.Razor/RazorEngineHost.cs b/src/Microsoft.AspNetCore.Razor/RazorEngineHost.cs
index 179dc2fe83..1689b19881 100644
--- a/src/Microsoft.AspNetCore.Razor/RazorEngineHost.cs
+++ b/src/Microsoft.AspNetCore.Razor/RazorEngineHost.cs
@@ -7,6 +7,7 @@ using Microsoft.AspNetCore.Razor.Chunks.Generators;
 using Microsoft.AspNetCore.Razor.CodeGenerators;
 using Microsoft.AspNetCore.Razor.Compilation.TagHelpers;
 using Microsoft.AspNetCore.Razor.Parser;
+using Microsoft.AspNetCore.Razor.Parser.Internal;
 
 namespace Microsoft.AspNetCore.Razor
 {
diff --git a/src/Microsoft.AspNetCore.Razor/Text/ITextBuffer.cs b/src/Microsoft.AspNetCore.Razor/Text/ITextBuffer.cs
index f80104a8bc..d3165ba410 100644
--- a/src/Microsoft.AspNetCore.Razor/Text/ITextBuffer.cs
+++ b/src/Microsoft.AspNetCore.Razor/Text/ITextBuffer.cs
@@ -10,10 +10,4 @@ namespace Microsoft.AspNetCore.Razor.Text
         int Read();
         int Peek();
     }
-
-    // TextBuffer with Location tracking
-    public interface ITextDocument : ITextBuffer
-    {
-        SourceLocation Location { get; }
-    }
 }
diff --git a/src/Microsoft.AspNetCore.Razor/Text/TextChangeType.cs b/src/Microsoft.AspNetCore.Razor/Text/ITextDocument.cs
similarity index 53%
rename from src/Microsoft.AspNetCore.Razor/Text/TextChangeType.cs
rename to src/Microsoft.AspNetCore.Razor/Text/ITextDocument.cs
index 59631b3822..767941661a 100644
--- a/src/Microsoft.AspNetCore.Razor/Text/TextChangeType.cs
+++ b/src/Microsoft.AspNetCore.Razor/Text/ITextDocument.cs
@@ -1,11 +1,10 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+// 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.Razor.Text
 {
-    public enum TextChangeType
+    public interface ITextDocument : ITextBuffer
     {
-        Insert,
-        Remove
+        SourceLocation Location { get; }
     }
 }
diff --git a/src/Microsoft.AspNetCore.Razor/Tokenizer/CSharpHelpers.cs b/src/Microsoft.AspNetCore.Razor/Tokenizer/Internal/CSharpHelpers.cs
similarity index 96%
rename from src/Microsoft.AspNetCore.Razor/Tokenizer/CSharpHelpers.cs
rename to src/Microsoft.AspNetCore.Razor/Tokenizer/Internal/CSharpHelpers.cs
index a2825d2b4f..c99a6e72ec 100644
--- a/src/Microsoft.AspNetCore.Razor/Tokenizer/CSharpHelpers.cs
+++ b/src/Microsoft.AspNetCore.Razor/Tokenizer/Internal/CSharpHelpers.cs
@@ -4,7 +4,7 @@
 using System;
 using System.Globalization;
 
-namespace Microsoft.AspNetCore.Razor.Tokenizer
+namespace Microsoft.AspNetCore.Razor.Tokenizer.Internal
 {
     public static class CSharpHelpers
     {
diff --git a/src/Microsoft.AspNetCore.Razor/Tokenizer/CSharpTokenizer.cs b/src/Microsoft.AspNetCore.Razor/Tokenizer/Internal/CSharpTokenizer.cs
similarity index 99%
rename from src/Microsoft.AspNetCore.Razor/Tokenizer/CSharpTokenizer.cs
rename to src/Microsoft.AspNetCore.Razor/Tokenizer/Internal/CSharpTokenizer.cs
index 11cea3d193..46f762cae9 100644
--- a/src/Microsoft.AspNetCore.Razor/Tokenizer/CSharpTokenizer.cs
+++ b/src/Microsoft.AspNetCore.Razor/Tokenizer/Internal/CSharpTokenizer.cs
@@ -8,7 +8,7 @@ using Microsoft.AspNetCore.Razor.Parser;
 using Microsoft.AspNetCore.Razor.Text;
 using Microsoft.AspNetCore.Razor.Tokenizer.Symbols;
 
-namespace Microsoft.AspNetCore.Razor.Tokenizer
+namespace Microsoft.AspNetCore.Razor.Tokenizer.Internal
 {
     public class CSharpTokenizer : Tokenizer<CSharpSymbol, CSharpSymbolType>
     {
diff --git a/src/Microsoft.AspNetCore.Razor/Tokenizer/HtmlTokenizer.cs b/src/Microsoft.AspNetCore.Razor/Tokenizer/Internal/HtmlTokenizer.cs
similarity index 98%
rename from src/Microsoft.AspNetCore.Razor/Tokenizer/HtmlTokenizer.cs
rename to src/Microsoft.AspNetCore.Razor/Tokenizer/Internal/HtmlTokenizer.cs
index dda16afe30..a618fb9212 100644
--- a/src/Microsoft.AspNetCore.Razor/Tokenizer/HtmlTokenizer.cs
+++ b/src/Microsoft.AspNetCore.Razor/Tokenizer/Internal/HtmlTokenizer.cs
@@ -1,14 +1,13 @@
 // 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 System.Collections.Generic;
 using System.Diagnostics;
 using Microsoft.AspNetCore.Razor.Parser;
 using Microsoft.AspNetCore.Razor.Text;
-using Microsoft.AspNetCore.Razor.Tokenizer.Symbols;
+using Microsoft.AspNetCore.Razor.Tokenizer.Symbols.Internal;
 
-namespace Microsoft.AspNetCore.Razor.Tokenizer
+namespace Microsoft.AspNetCore.Razor.Tokenizer.Internal
 {
     // Tokenizer _loosely_ based on http://dev.w3.org/html5/spec/Overview.html#tokenization
     public class HtmlTokenizer : Tokenizer<HtmlSymbol, HtmlSymbolType>
diff --git a/src/Microsoft.AspNetCore.Razor/Tokenizer/Symbols/HtmlSymbol.cs b/src/Microsoft.AspNetCore.Razor/Tokenizer/Symbols/Internal/HtmlSymbol.cs
similarity index 96%
rename from src/Microsoft.AspNetCore.Razor/Tokenizer/Symbols/HtmlSymbol.cs
rename to src/Microsoft.AspNetCore.Razor/Tokenizer/Symbols/Internal/HtmlSymbol.cs
index 327c34b19e..52b698b447 100644
--- a/src/Microsoft.AspNetCore.Razor/Tokenizer/Symbols/HtmlSymbol.cs
+++ b/src/Microsoft.AspNetCore.Razor/Tokenizer/Symbols/Internal/HtmlSymbol.cs
@@ -5,7 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace Microsoft.AspNetCore.Razor.Tokenizer.Symbols
+namespace Microsoft.AspNetCore.Razor.Tokenizer.Symbols.Internal
 {
     public class HtmlSymbol : SymbolBase<HtmlSymbolType>
     {
diff --git a/src/Microsoft.AspNetCore.Razor/Tokenizer/Symbols/Internal/HtmlSymbolExtensions.cs b/src/Microsoft.AspNetCore.Razor/Tokenizer/Symbols/Internal/HtmlSymbolExtensions.cs
new file mode 100644
index 0000000000..2ba3630d14
--- /dev/null
+++ b/src/Microsoft.AspNetCore.Razor/Tokenizer/Symbols/Internal/HtmlSymbolExtensions.cs
@@ -0,0 +1,25 @@
+// 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 System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace Microsoft.AspNetCore.Razor.Tokenizer.Symbols.Internal
+{
+    public static class HtmlSymbolExtensions
+    {
+        /// <summary>
+        /// Converts the generic <see cref="IEnumerable{ISymbol}"/> to a <see cref="IEnumerable{HtmlSymbol}"/> and
+        /// finds the first <see cref="HtmlSymbol"/> with type <paramref name="type"/>.
+        /// </summary>
+        /// <param name="symbols">The <see cref="IEnumerable{ISymbol}"/> instance this method extends.</param>
+        /// <param name="type">The <see cref="HtmlSymbolType"/> to search for.</param>
+        /// <returns>The first <see cref="HtmlSymbol"/> of type <paramref name="type"/>.</returns>
+        public static HtmlSymbol FirstHtmlSymbolAs(this IEnumerable<ISymbol> symbols, HtmlSymbolType type)
+        {
+            return symbols.OfType<HtmlSymbol>().FirstOrDefault(sym => (type & sym.Type) == sym.Type);
+        }
+    }
+}
diff --git a/src/Microsoft.AspNetCore.Razor/Tokenizer/Symbols/HtmlSymbolType.cs b/src/Microsoft.AspNetCore.Razor/Tokenizer/Symbols/Internal/HtmlSymbolType.cs
similarity index 92%
rename from src/Microsoft.AspNetCore.Razor/Tokenizer/Symbols/HtmlSymbolType.cs
rename to src/Microsoft.AspNetCore.Razor/Tokenizer/Symbols/Internal/HtmlSymbolType.cs
index 506743ace3..7e72a26f56 100644
--- a/src/Microsoft.AspNetCore.Razor/Tokenizer/Symbols/HtmlSymbolType.cs
+++ b/src/Microsoft.AspNetCore.Razor/Tokenizer/Symbols/Internal/HtmlSymbolType.cs
@@ -3,7 +3,7 @@
 
 using System;
 
-namespace Microsoft.AspNetCore.Razor.Tokenizer.Symbols
+namespace Microsoft.AspNetCore.Razor.Tokenizer.Symbols.Internal
 {
     [Flags]
     public enum HtmlSymbolType
diff --git a/src/Microsoft.AspNetCore.Razor/Tokenizer/Symbols/SymbolExtensions.cs b/src/Microsoft.AspNetCore.Razor/Tokenizer/Symbols/SymbolExtensions.cs
index 2809283663..33ad1478df 100644
--- a/src/Microsoft.AspNetCore.Razor/Tokenizer/Symbols/SymbolExtensions.cs
+++ b/src/Microsoft.AspNetCore.Razor/Tokenizer/Symbols/SymbolExtensions.cs
@@ -37,17 +37,5 @@ namespace Microsoft.AspNetCore.Razor.Tokenizer.Symbols
         {
             return new LocationTagged<string>(symbol.Content, symbol.Start);
         }
-
-        /// <summary>
-        /// Converts the generic <see cref="IEnumerable{ISymbol}"/> to a <see cref="IEnumerable{HtmlSymbol}"/> and
-        /// finds the first <see cref="HtmlSymbol"/> with type <paramref name="type"/>.
-        /// </summary>
-        /// <param name="symbols">The <see cref="IEnumerable{ISymbol}"/> instance this method extends.</param>
-        /// <param name="type">The <see cref="HtmlSymbolType"/> to search for.</param>
-        /// <returns>The first <see cref="HtmlSymbol"/> of type <paramref name="type"/>.</returns>
-        public static HtmlSymbol FirstHtmlSymbolAs(this IEnumerable<ISymbol> symbols, HtmlSymbolType type)
-        {
-            return symbols.OfType<HtmlSymbol>().FirstOrDefault(sym => (type & sym.Type) == sym.Type);
-        }
     }
 }
diff --git a/src/Microsoft.AspNetCore.Razor/Tokenizer/Tokenizer.cs b/src/Microsoft.AspNetCore.Razor/Tokenizer/Tokenizer.cs
index ece5707233..a9b3de5534 100644
--- a/src/Microsoft.AspNetCore.Razor/Tokenizer/Tokenizer.cs
+++ b/src/Microsoft.AspNetCore.Razor/Tokenizer/Tokenizer.cs
@@ -112,7 +112,7 @@ namespace Microsoft.AspNetCore.Razor.Tokenizer
                     CurrentState = next.State;
                     CurrentSymbol = next.Result;
                 }
-                while (CurrentState != null && CurrentSymbol == null); 
+                while (CurrentState != null && CurrentSymbol == null);
 
                 if (CurrentState == null)
                 {
diff --git a/test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/TestTagHelpers/TagHelperDescriptorFactoryTagHelpers.cs b/test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/TestTagHelpers/TagHelperDescriptorFactoryTagHelpers.cs
index 918da5479a..c855db01e2 100644
--- a/test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/TestTagHelpers/TagHelperDescriptorFactoryTagHelpers.cs
+++ b/test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/TestTagHelpers/TagHelperDescriptorFactoryTagHelpers.cs
@@ -1,11 +1,8 @@
 // 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 System.Collections.Generic;
 using System.ComponentModel;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Razor.TagHelpers;
 
 namespace Microsoft.AspNetCore.Razor.TagHelpers
 {
diff --git a/test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/CSharpPaddingBuilderTests.cs b/test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/CSharpPaddingBuilderTests.cs
index e837bb0b8f..33c18ca479 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/CSharpPaddingBuilderTests.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/CSharpPaddingBuilderTests.cs
@@ -7,6 +7,7 @@ using System.IO;
 using System.Linq;
 using Microsoft.AspNetCore.Razor.CodeGenerators;
 using Microsoft.AspNetCore.Razor.Parser;
+using Microsoft.AspNetCore.Razor.Parser.Internal;
 using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
 using Xunit;
 
diff --git a/test/Microsoft.AspNetCore.Razor.Test/Framework/CsHtmlCodeParserTestBase.cs b/test/Microsoft.AspNetCore.Razor.Test/Framework/CsHtmlCodeParserTestBase.cs
index a7bda1d242..8f30fe7b87 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/Framework/CsHtmlCodeParserTestBase.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/Framework/CsHtmlCodeParserTestBase.cs
@@ -3,6 +3,7 @@
 
 using System.Collections.Generic;
 using Microsoft.AspNetCore.Razor.Parser;
+using Microsoft.AspNetCore.Razor.Parser.Internal;
 
 namespace Microsoft.AspNetCore.Razor.Test.Framework
 {
diff --git a/test/Microsoft.AspNetCore.Razor.Test/Framework/CsHtmlMarkupParserTestBase.cs b/test/Microsoft.AspNetCore.Razor.Test/Framework/CsHtmlMarkupParserTestBase.cs
index 08bbd5714b..4576949324 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/Framework/CsHtmlMarkupParserTestBase.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/Framework/CsHtmlMarkupParserTestBase.cs
@@ -3,6 +3,7 @@
 
 using System.Collections.Generic;
 using Microsoft.AspNetCore.Razor.Parser;
+using Microsoft.AspNetCore.Razor.Parser.Internal;
 
 namespace Microsoft.AspNetCore.Razor.Test.Framework
 {
diff --git a/test/Microsoft.AspNetCore.Razor.Test/Framework/ErrorCollector.cs b/test/Microsoft.AspNetCore.Razor.Test/Framework/ErrorCollector.cs
index 7193c6f95b..57413774a4 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/Framework/ErrorCollector.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/Framework/ErrorCollector.cs
@@ -3,7 +3,7 @@
 
 using System;
 using System.Text;
-using Microsoft.AspNetCore.Razor.Utils;
+using Microsoft.AspNetCore.Razor.Parser;
 
 namespace Microsoft.AspNetCore.Razor.Test.Framework
 {
diff --git a/test/Microsoft.AspNetCore.Razor.Test/Framework/TestSpanBuilder.cs b/test/Microsoft.AspNetCore.Razor.Test/Framework/TestSpanBuilder.cs
index ab48b7fb26..e97dae18a9 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/Framework/TestSpanBuilder.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/Framework/TestSpanBuilder.cs
@@ -10,7 +10,9 @@ using Microsoft.AspNetCore.Razor.Parser;
 using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
 using Microsoft.AspNetCore.Razor.Text;
 using Microsoft.AspNetCore.Razor.Tokenizer;
+using Microsoft.AspNetCore.Razor.Tokenizer.Internal;
 using Microsoft.AspNetCore.Razor.Tokenizer.Symbols;
+using Microsoft.AspNetCore.Razor.Tokenizer.Symbols.Internal;
 
 namespace Microsoft.AspNetCore.Razor.Test.Framework
 {
diff --git a/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpAutoCompleteTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpAutoCompleteTest.cs
index 1fb2b1fd11..d7b50862d1 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpAutoCompleteTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpAutoCompleteTest.cs
@@ -3,6 +3,7 @@
 
 using System;
 using Microsoft.AspNetCore.Razor.Chunks.Generators;
+using Microsoft.AspNetCore.Razor.Editor;
 using Microsoft.AspNetCore.Razor.Parser;
 using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
 using Microsoft.AspNetCore.Razor.Test.Framework;
diff --git a/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpBlockTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpBlockTest.cs
index b46de748b0..68ea25e136 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpBlockTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpBlockTest.cs
@@ -7,7 +7,7 @@ using Microsoft.AspNetCore.Razor.Parser;
 using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
 using Microsoft.AspNetCore.Razor.Test.Framework;
 using Microsoft.AspNetCore.Razor.Text;
-using Microsoft.AspNetCore.Razor.Tokenizer;
+using Microsoft.AspNetCore.Razor.Tokenizer.Internal;
 using Microsoft.AspNetCore.Razor.Tokenizer.Symbols;
 using Xunit;
 
diff --git a/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpErrorTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpErrorTest.cs
index fadf44df45..4304cb2468 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpErrorTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpErrorTest.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.Razor.Editor;
 using Microsoft.AspNetCore.Razor.Parser;
 using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
 using Microsoft.AspNetCore.Razor.Test.Framework;
diff --git a/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpRazorCommentsTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpRazorCommentsTest.cs
index d2210074ba..b3762c6969 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpRazorCommentsTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpRazorCommentsTest.cs
@@ -7,6 +7,7 @@ using Microsoft.AspNetCore.Razor.Parser;
 using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
 using Microsoft.AspNetCore.Razor.Test.Framework;
 using Microsoft.AspNetCore.Razor.Tokenizer.Symbols;
+using Microsoft.AspNetCore.Razor.Tokenizer.Symbols.Internal;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Test.Parser.CSharp
diff --git a/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpSectionTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpSectionTest.cs
index 97f42def50..d820ac3c1d 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpSectionTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpSectionTest.cs
@@ -7,7 +7,7 @@ using Microsoft.AspNetCore.Razor.Parser;
 using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
 using Microsoft.AspNetCore.Razor.Test.Framework;
 using Microsoft.AspNetCore.Razor.Text;
-using Microsoft.AspNetCore.Razor.Tokenizer;
+using Microsoft.AspNetCore.Razor.Tokenizer.Internal;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Test.Parser.CSharp
diff --git a/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpTemplateTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpTemplateTest.cs
index 1e0dfc1cd4..fd4f2f2743 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpTemplateTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpTemplateTest.cs
@@ -9,6 +9,7 @@ using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
 using Microsoft.AspNetCore.Razor.Test.Framework;
 using Microsoft.AspNetCore.Razor.Text;
 using Microsoft.AspNetCore.Razor.Tokenizer.Symbols;
+using Microsoft.AspNetCore.Razor.Tokenizer.Symbols.Internal;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Test.Parser.CSharp
diff --git a/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpToMarkupSwitchTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpToMarkupSwitchTest.cs
index 232900ab6e..6aafc49b95 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpToMarkupSwitchTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpToMarkupSwitchTest.cs
@@ -8,6 +8,7 @@ using Microsoft.AspNetCore.Razor.Parser;
 using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
 using Microsoft.AspNetCore.Razor.Test.Framework;
 using Microsoft.AspNetCore.Razor.Tokenizer.Symbols;
+using Microsoft.AspNetCore.Razor.Tokenizer.Symbols.Internal;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Test.Parser.CSharp
diff --git a/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpWhitespaceHandlingTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpWhitespaceHandlingTest.cs
index 75a17e6217..fe4777c5a6 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpWhitespaceHandlingTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpWhitespaceHandlingTest.cs
@@ -7,6 +7,7 @@ using Microsoft.AspNetCore.Razor.Parser;
 using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
 using Microsoft.AspNetCore.Razor.Test.Framework;
 using Microsoft.AspNetCore.Razor.Tokenizer.Symbols;
+using Microsoft.AspNetCore.Razor.Tokenizer.Symbols.Internal;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Test.Parser.CSharp
diff --git a/test/Microsoft.AspNetCore.Razor.Test/Parser/CallbackParserListenerTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Parser/CallbackParserListenerTest.cs
index f64531bb79..b0bc578dfa 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/Parser/CallbackParserListenerTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/Parser/CallbackParserListenerTest.cs
@@ -3,7 +3,7 @@
 
 using System;
 using System.Threading;
-using Microsoft.AspNetCore.Razor.Parser;
+using Microsoft.AspNetCore.Razor.Parser.Internal;
 using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
 using Microsoft.AspNetCore.Razor.Test.Framework;
 using Moq;
diff --git a/test/Microsoft.AspNetCore.Razor.Test/Parser/Html/HtmlAttributeTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Parser/Html/HtmlAttributeTest.cs
index 1c3921249a..c692528971 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/Parser/Html/HtmlAttributeTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/Parser/Html/HtmlAttributeTest.cs
@@ -5,6 +5,7 @@ using System;
 using System.Linq;
 using Microsoft.AspNetCore.Razor.Chunks.Generators;
 using Microsoft.AspNetCore.Razor.Parser;
+using Microsoft.AspNetCore.Razor.Parser.Internal;
 using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
 using Microsoft.AspNetCore.Razor.Test.Framework;
 using Microsoft.AspNetCore.Razor.Text;
diff --git a/test/Microsoft.AspNetCore.Razor.Test/Parser/Html/HtmlBlockTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Parser/Html/HtmlBlockTest.cs
index d10c3fc453..70dc0d4e4f 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/Parser/Html/HtmlBlockTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/Parser/Html/HtmlBlockTest.cs
@@ -5,11 +5,12 @@ using System;
 using Microsoft.AspNetCore.Razor.Chunks.Generators;
 using Microsoft.AspNetCore.Razor.Editor;
 using Microsoft.AspNetCore.Razor.Parser;
+using Microsoft.AspNetCore.Razor.Parser.Internal;
 using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
 using Microsoft.AspNetCore.Razor.Test.Framework;
 using Microsoft.AspNetCore.Razor.Text;
-using Microsoft.AspNetCore.Razor.Tokenizer;
-using Microsoft.AspNetCore.Razor.Tokenizer.Symbols;
+using Microsoft.AspNetCore.Razor.Tokenizer.Internal;
+using Microsoft.AspNetCore.Razor.Tokenizer.Symbols.Internal;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Test.Parser.Html
diff --git a/test/Microsoft.AspNetCore.Razor.Test/Parser/Html/HtmlDocumentTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Parser/Html/HtmlDocumentTest.cs
index 7603942a23..ed4e7cdae0 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/Parser/Html/HtmlDocumentTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/Parser/Html/HtmlDocumentTest.cs
@@ -5,11 +5,12 @@ using System;
 using Microsoft.AspNetCore.Razor.Chunks.Generators;
 using Microsoft.AspNetCore.Razor.Editor;
 using Microsoft.AspNetCore.Razor.Parser;
+using Microsoft.AspNetCore.Razor.Parser.Internal;
 using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
 using Microsoft.AspNetCore.Razor.Test.Framework;
 using Microsoft.AspNetCore.Razor.Text;
-using Microsoft.AspNetCore.Razor.Tokenizer;
-using Microsoft.AspNetCore.Razor.Tokenizer.Symbols;
+using Microsoft.AspNetCore.Razor.Tokenizer.Internal;
+using Microsoft.AspNetCore.Razor.Tokenizer.Symbols.Internal;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Test.Parser.Html
diff --git a/test/Microsoft.AspNetCore.Razor.Test/Parser/Html/HtmlToCodeSwitchTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Parser/Html/HtmlToCodeSwitchTest.cs
index 64f2980f4e..1c3e966643 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/Parser/Html/HtmlToCodeSwitchTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/Parser/Html/HtmlToCodeSwitchTest.cs
@@ -9,6 +9,7 @@ using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
 using Microsoft.AspNetCore.Razor.Test.Framework;
 using Microsoft.AspNetCore.Razor.Text;
 using Microsoft.AspNetCore.Razor.Tokenizer.Symbols;
+using Microsoft.AspNetCore.Razor.Tokenizer.Symbols.Internal;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Test.Parser.Html
diff --git a/test/Microsoft.AspNetCore.Razor.Test/Parser/ParserContextTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Parser/ParserContextTest.cs
index 9968d728eb..9e7b3803cb 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/Parser/ParserContextTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/Parser/ParserContextTest.cs
@@ -4,6 +4,7 @@
 using System;
 using System.IO;
 using Microsoft.AspNetCore.Razor.Parser;
+using Microsoft.AspNetCore.Razor.Parser.Internal;
 using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
 using Microsoft.AspNetCore.Razor.Test.Framework;
 using Microsoft.AspNetCore.Razor.Text;
diff --git a/test/Microsoft.AspNetCore.Razor.Test/Parser/RazorParserTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Parser/RazorParserTest.cs
index 265845a09e..220e710a5b 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/Parser/RazorParserTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/Parser/RazorParserTest.cs
@@ -5,9 +5,10 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using Microsoft.AspNetCore.Razor.Parser;
-using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
 using Microsoft.AspNetCore.Razor.Compilation.TagHelpers;
+using Microsoft.AspNetCore.Razor.Parser;
+using Microsoft.AspNetCore.Razor.Parser.Internal;
+using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
 using Microsoft.AspNetCore.Razor.Test.Framework;
 using Moq;
 using Moq.Protected;
@@ -69,16 +70,16 @@ namespace Microsoft.AspNetCore.Razor.Test.Parser
         {
             // Arrange
             var factory = SpanFactory.CreateCsHtml();
-            var parser = new Mock<RazorParser>(new CSharpCodeParser(),
-                                               new HtmlMarkupParser(),
-                                               Mock.Of<ITagHelperDescriptorResolver>());
+            var parser = new Mock<RazorParser>(
+                new CSharpCodeParser(),
+                new HtmlMarkupParser(),
+                Mock.Of<ITagHelperDescriptorResolver>());
             parser.CallBase = true;
-            parser.Protected()
-                  .Setup<IEnumerable<TagHelperDescriptor>>("GetTagHelperDescriptors", 
-                                                           ItExpr.IsAny<Block>(), 
-                                                           ItExpr.IsAny<ErrorSink>())
-                  .Returns(Enumerable.Empty<TagHelperDescriptor>())
-                  .Verifiable();
+            parser
+                .Protected()
+                .Setup<IEnumerable<TagHelperDescriptor>>("GetTagHelperDescriptors", ItExpr.IsAny<Block>(), ItExpr.IsAny<ErrorSink>())
+                .Returns(Enumerable.Empty<TagHelperDescriptor>())
+                .Verifiable();
 
             // Act
             parser.Object.Parse(new StringReader("<p>Hello world. The time is @DateTime.UtcNow</p>"));
diff --git a/test/Microsoft.AspNetCore.Razor.Test/Parser/WhitespaceRewriterTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Parser/WhitespaceRewriterTest.cs
index 2f79ecbb64..29f8d42805 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/Parser/WhitespaceRewriterTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/Parser/WhitespaceRewriterTest.cs
@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using Microsoft.AspNetCore.Razor.Parser;
+using Microsoft.AspNetCore.Razor.Parser.Internal;
 using Microsoft.AspNetCore.Razor.Test.Framework;
 using Xunit;
 
diff --git a/test/Microsoft.AspNetCore.Razor.Test/RazorEngineHostTest.cs b/test/Microsoft.AspNetCore.Razor.Test/RazorEngineHostTest.cs
index 8fb274567c..3c106917be 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/RazorEngineHostTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/RazorEngineHostTest.cs
@@ -4,6 +4,7 @@
 using Microsoft.AspNetCore.Razor.Chunks.Generators;
 using Microsoft.AspNetCore.Razor.CodeGenerators;
 using Microsoft.AspNetCore.Razor.Parser;
+using Microsoft.AspNetCore.Razor.Parser.Internal;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Test
diff --git a/test/Microsoft.AspNetCore.Razor.Test/RazorTemplateEngineTest.cs b/test/Microsoft.AspNetCore.Razor.Test/RazorTemplateEngineTest.cs
index d7d454a502..9c4ac36159 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/RazorTemplateEngineTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/RazorTemplateEngineTest.cs
@@ -9,6 +9,7 @@ using System.Web.WebPages.TestUtils;
 using Microsoft.AspNetCore.Razor.Chunks.Generators;
 using Microsoft.AspNetCore.Razor.CodeGenerators;
 using Microsoft.AspNetCore.Razor.Parser;
+using Microsoft.AspNetCore.Razor.Parser.Internal;
 using Microsoft.AspNetCore.Razor.Text;
 using Moq;
 using Xunit;
diff --git a/test/Microsoft.AspNetCore.Razor.Test/TagHelpers/TagHelperDirectiveSpanVisitorTest.cs b/test/Microsoft.AspNetCore.Razor.Test/TagHelpers/TagHelperDirectiveSpanVisitorTest.cs
index e18f75e464..fcb5282182 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/TagHelpers/TagHelperDirectiveSpanVisitorTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/TagHelpers/TagHelperDirectiveSpanVisitorTest.cs
@@ -8,7 +8,7 @@ using Microsoft.AspNetCore.Razor.Parser;
 using Microsoft.AspNetCore.Razor.Parser.SyntaxTree;
 using Microsoft.AspNetCore.Razor.Parser.TagHelpers;
 using Microsoft.AspNetCore.Razor.Test.Framework;
-using Microsoft.AspNetCore.Razor.Tokenizer;
+using Microsoft.AspNetCore.Razor.Tokenizer.Internal;
 using Microsoft.Extensions.Internal;
 using Moq;
 using Xunit;
diff --git a/test/Microsoft.AspNetCore.Razor.Test/TagHelpers/TagHelperParseTreeRewriterTest.cs b/test/Microsoft.AspNetCore.Razor.Test/TagHelpers/TagHelperParseTreeRewriterTest.cs
index 4d5c982ccd..edc38baaf8 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/TagHelpers/TagHelperParseTreeRewriterTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/TagHelpers/TagHelperParseTreeRewriterTest.cs
@@ -15,6 +15,7 @@ using Microsoft.AspNetCore.Razor.Text;
 using Xunit;
 using Microsoft.AspNetCore.Razor.Parser.TagHelpers.Internal;
 using Microsoft.AspNetCore.Razor.Parser.TagHelpers;
+using Microsoft.AspNetCore.Razor.Parser.Internal;
 
 namespace Microsoft.AspNetCore.Razor.Test.TagHelpers
 {
diff --git a/test/Microsoft.AspNetCore.Razor.Test/TagHelpers/TagHelperRewritingTestBase.cs b/test/Microsoft.AspNetCore.Razor.Test/TagHelpers/TagHelperRewritingTestBase.cs
index ac985ce4c9..4f71d0f535 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/TagHelpers/TagHelperRewritingTestBase.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/TagHelpers/TagHelperRewritingTestBase.cs
@@ -9,6 +9,7 @@ using Microsoft.AspNetCore.Razor.Compilation.TagHelpers;
 using Microsoft.AspNetCore.Razor.Test.Framework;
 using Microsoft.AspNetCore.Razor.Text;
 using Microsoft.AspNetCore.Razor.Tokenizer;
+using Microsoft.AspNetCore.Razor.Tokenizer.Internal;
 
 namespace Microsoft.AspNetCore.Razor.Test.TagHelpers
 {
diff --git a/test/Microsoft.AspNetCore.Razor.Test/Text/TextReaderExtensionsTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Text/TextReaderExtensionsTest.cs
index 042eae0217..3c42fb7369 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/Text/TextReaderExtensionsTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/Text/TextReaderExtensionsTest.cs
@@ -4,6 +4,7 @@
 using System;
 using System.IO;
 using Microsoft.AspNetCore.Razor.Parser;
+using Microsoft.AspNetCore.Razor.Parser.Internal;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Test.Text
diff --git a/test/Microsoft.AspNetCore.Razor.Test/Tokenizer/CSharpTokenizerTestBase.cs b/test/Microsoft.AspNetCore.Razor.Test/Tokenizer/CSharpTokenizerTestBase.cs
index a5c789bf85..915464bd3e 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/Tokenizer/CSharpTokenizerTestBase.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/Tokenizer/CSharpTokenizerTestBase.cs
@@ -3,6 +3,7 @@
 
 using Microsoft.AspNetCore.Razor.Text;
 using Microsoft.AspNetCore.Razor.Tokenizer;
+using Microsoft.AspNetCore.Razor.Tokenizer.Internal;
 using Microsoft.AspNetCore.Razor.Tokenizer.Symbols;
 
 namespace Microsoft.AspNetCore.Razor.Test.Tokenizer
diff --git a/test/Microsoft.AspNetCore.Razor.Test/Tokenizer/HtmlTokenizerTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Tokenizer/HtmlTokenizerTest.cs
index 80269a683c..547147264d 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/Tokenizer/HtmlTokenizerTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/Tokenizer/HtmlTokenizerTest.cs
@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using Microsoft.AspNetCore.Razor.Tokenizer.Symbols;
+using Microsoft.AspNetCore.Razor.Tokenizer.Symbols.Internal;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Test.Tokenizer
diff --git a/test/Microsoft.AspNetCore.Razor.Test/Tokenizer/HtmlTokenizerTestBase.cs b/test/Microsoft.AspNetCore.Razor.Test/Tokenizer/HtmlTokenizerTestBase.cs
index 5e7af81caf..704c6b8fc9 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/Tokenizer/HtmlTokenizerTestBase.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/Tokenizer/HtmlTokenizerTestBase.cs
@@ -3,7 +3,8 @@
 
 using Microsoft.AspNetCore.Razor.Text;
 using Microsoft.AspNetCore.Razor.Tokenizer;
-using Microsoft.AspNetCore.Razor.Tokenizer.Symbols;
+using Microsoft.AspNetCore.Razor.Tokenizer.Internal;
+using Microsoft.AspNetCore.Razor.Tokenizer.Symbols.Internal;
 
 namespace Microsoft.AspNetCore.Razor.Test.Tokenizer
 {
diff --git a/test/Microsoft.AspNetCore.Razor.Test/Tokenizer/TokenizerLookaheadTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Tokenizer/TokenizerLookaheadTest.cs
index 757668abdb..757e74793a 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/Tokenizer/TokenizerLookaheadTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/Tokenizer/TokenizerLookaheadTest.cs
@@ -7,7 +7,9 @@ using System.IO;
 using System.Text;
 using Microsoft.AspNetCore.Razor.Text;
 using Microsoft.AspNetCore.Razor.Tokenizer;
+using Microsoft.AspNetCore.Razor.Tokenizer.Internal;
 using Microsoft.AspNetCore.Razor.Tokenizer.Symbols;
+using Microsoft.AspNetCore.Razor.Tokenizer.Symbols.Internal;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Test.Tokenizer
diff --git a/test/Microsoft.AspNetCore.Razor.Test/Utils/DisposableActionTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Utils/DisposableActionTest.cs
index e952394be2..739bfe2f7b 100644
--- a/test/Microsoft.AspNetCore.Razor.Test/Utils/DisposableActionTest.cs
+++ b/test/Microsoft.AspNetCore.Razor.Test/Utils/DisposableActionTest.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.AspNetCore.Razor.Utils;
+using Microsoft.AspNetCore.Razor.Parser;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Test.Utils