diff --git a/src/Microsoft.AspNet.Razor.Runtime/Microsoft.AspNet.Razor.Runtime.xproj b/src/Microsoft.AspNetCore.Razor.Runtime/Microsoft.AspNetCore.Razor.Runtime.xproj
similarity index 100%
rename from src/Microsoft.AspNet.Razor.Runtime/Microsoft.AspNet.Razor.Runtime.xproj
rename to src/Microsoft.AspNetCore.Razor.Runtime/Microsoft.AspNetCore.Razor.Runtime.xproj
diff --git a/src/Microsoft.AspNet.Razor.Runtime/Properties/AssemblyInfo.cs b/src/Microsoft.AspNetCore.Razor.Runtime/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor.Runtime/Properties/AssemblyInfo.cs
rename to src/Microsoft.AspNetCore.Razor.Runtime/Properties/AssemblyInfo.cs
diff --git a/src/Microsoft.AspNet.Razor.Runtime/Properties/Resources.Designer.cs b/src/Microsoft.AspNetCore.Razor.Runtime/Properties/Resources.Designer.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor.Runtime/Properties/Resources.Designer.cs
rename to src/Microsoft.AspNetCore.Razor.Runtime/Properties/Resources.Designer.cs
diff --git a/src/Microsoft.AspNet.Razor.Runtime/Resources.resx b/src/Microsoft.AspNetCore.Razor.Runtime/Resources.resx
similarity index 100%
rename from src/Microsoft.AspNet.Razor.Runtime/Resources.resx
rename to src/Microsoft.AspNetCore.Razor.Runtime/Resources.resx
diff --git a/src/Microsoft.AspNet.Razor.Runtime/Runtime/TagHelpers/Constants.cs b/src/Microsoft.AspNetCore.Razor.Runtime/Runtime/TagHelpers/Constants.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor.Runtime/Runtime/TagHelpers/Constants.cs
rename to src/Microsoft.AspNetCore.Razor.Runtime/Runtime/TagHelpers/Constants.cs
diff --git a/src/Microsoft.AspNet.Razor.Runtime/Runtime/TagHelpers/TagHelperDescriptorFactory.cs b/src/Microsoft.AspNetCore.Razor.Runtime/Runtime/TagHelpers/TagHelperDescriptorFactory.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor.Runtime/Runtime/TagHelpers/TagHelperDescriptorFactory.cs
rename to src/Microsoft.AspNetCore.Razor.Runtime/Runtime/TagHelpers/TagHelperDescriptorFactory.cs
diff --git a/src/Microsoft.AspNet.Razor.Runtime/Runtime/TagHelpers/TagHelperDescriptorResolver.cs b/src/Microsoft.AspNetCore.Razor.Runtime/Runtime/TagHelpers/TagHelperDescriptorResolver.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor.Runtime/Runtime/TagHelpers/TagHelperDescriptorResolver.cs
rename to src/Microsoft.AspNetCore.Razor.Runtime/Runtime/TagHelpers/TagHelperDescriptorResolver.cs
diff --git a/src/Microsoft.AspNet.Razor.Runtime/Runtime/TagHelpers/TagHelperDesignTimeDescriptorFactory.cs b/src/Microsoft.AspNetCore.Razor.Runtime/Runtime/TagHelpers/TagHelperDesignTimeDescriptorFactory.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor.Runtime/Runtime/TagHelpers/TagHelperDesignTimeDescriptorFactory.cs
rename to src/Microsoft.AspNetCore.Razor.Runtime/Runtime/TagHelpers/TagHelperDesignTimeDescriptorFactory.cs
diff --git a/src/Microsoft.AspNet.Razor.Runtime/Runtime/TagHelpers/TagHelperExecutionContext.cs b/src/Microsoft.AspNetCore.Razor.Runtime/Runtime/TagHelpers/TagHelperExecutionContext.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor.Runtime/Runtime/TagHelpers/TagHelperExecutionContext.cs
rename to src/Microsoft.AspNetCore.Razor.Runtime/Runtime/TagHelpers/TagHelperExecutionContext.cs
diff --git a/src/Microsoft.AspNet.Razor.Runtime/Runtime/TagHelpers/TagHelperRunner.cs b/src/Microsoft.AspNetCore.Razor.Runtime/Runtime/TagHelpers/TagHelperRunner.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor.Runtime/Runtime/TagHelpers/TagHelperRunner.cs
rename to src/Microsoft.AspNetCore.Razor.Runtime/Runtime/TagHelpers/TagHelperRunner.cs
diff --git a/src/Microsoft.AspNet.Razor.Runtime/Runtime/TagHelpers/TagHelperScopeManager.cs b/src/Microsoft.AspNetCore.Razor.Runtime/Runtime/TagHelpers/TagHelperScopeManager.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor.Runtime/Runtime/TagHelpers/TagHelperScopeManager.cs
rename to src/Microsoft.AspNetCore.Razor.Runtime/Runtime/TagHelpers/TagHelperScopeManager.cs
diff --git a/src/Microsoft.AspNet.Razor.Runtime/Runtime/TagHelpers/TagHelperTypeResolver.cs b/src/Microsoft.AspNetCore.Razor.Runtime/Runtime/TagHelpers/TagHelperTypeResolver.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor.Runtime/Runtime/TagHelpers/TagHelperTypeResolver.cs
rename to src/Microsoft.AspNetCore.Razor.Runtime/Runtime/TagHelpers/TagHelperTypeResolver.cs
diff --git a/src/Microsoft.AspNet.Razor.Runtime/Runtime/TagHelpers/XmlDocumentationProvider.cs b/src/Microsoft.AspNetCore.Razor.Runtime/Runtime/TagHelpers/XmlDocumentationProvider.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor.Runtime/Runtime/TagHelpers/XmlDocumentationProvider.cs
rename to src/Microsoft.AspNetCore.Razor.Runtime/Runtime/TagHelpers/XmlDocumentationProvider.cs
diff --git a/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/DefaultTagHelperContent.cs b/src/Microsoft.AspNetCore.Razor.Runtime/TagHelpers/DefaultTagHelperContent.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor.Runtime/TagHelpers/DefaultTagHelperContent.cs
rename to src/Microsoft.AspNetCore.Razor.Runtime/TagHelpers/DefaultTagHelperContent.cs
diff --git a/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/HtmlAttributeNameAttribute.cs b/src/Microsoft.AspNetCore.Razor.Runtime/TagHelpers/HtmlAttributeNameAttribute.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor.Runtime/TagHelpers/HtmlAttributeNameAttribute.cs
rename to src/Microsoft.AspNetCore.Razor.Runtime/TagHelpers/HtmlAttributeNameAttribute.cs
diff --git a/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/HtmlAttributeNotBoundAttribute.cs b/src/Microsoft.AspNetCore.Razor.Runtime/TagHelpers/HtmlAttributeNotBoundAttribute.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor.Runtime/TagHelpers/HtmlAttributeNotBoundAttribute.cs
rename to src/Microsoft.AspNetCore.Razor.Runtime/TagHelpers/HtmlAttributeNotBoundAttribute.cs
diff --git a/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/HtmlTargetElementAttribute.cs b/src/Microsoft.AspNetCore.Razor.Runtime/TagHelpers/HtmlTargetElementAttribute.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor.Runtime/TagHelpers/HtmlTargetElementAttribute.cs
rename to src/Microsoft.AspNetCore.Razor.Runtime/TagHelpers/HtmlTargetElementAttribute.cs
diff --git a/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/IReadOnlyTagHelperAttribute.cs b/src/Microsoft.AspNetCore.Razor.Runtime/TagHelpers/IReadOnlyTagHelperAttribute.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor.Runtime/TagHelpers/IReadOnlyTagHelperAttribute.cs
rename to src/Microsoft.AspNetCore.Razor.Runtime/TagHelpers/IReadOnlyTagHelperAttribute.cs
diff --git a/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/ITagHelper.cs b/src/Microsoft.AspNetCore.Razor.Runtime/TagHelpers/ITagHelper.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor.Runtime/TagHelpers/ITagHelper.cs
rename to src/Microsoft.AspNetCore.Razor.Runtime/TagHelpers/ITagHelper.cs
diff --git a/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/NullHtmlEncoder.cs b/src/Microsoft.AspNetCore.Razor.Runtime/TagHelpers/NullHtmlEncoder.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor.Runtime/TagHelpers/NullHtmlEncoder.cs
rename to src/Microsoft.AspNetCore.Razor.Runtime/TagHelpers/NullHtmlEncoder.cs
diff --git a/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/OutputElementHintAttribute.cs b/src/Microsoft.AspNetCore.Razor.Runtime/TagHelpers/OutputElementHintAttribute.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor.Runtime/TagHelpers/OutputElementHintAttribute.cs
rename to src/Microsoft.AspNetCore.Razor.Runtime/TagHelpers/OutputElementHintAttribute.cs
diff --git a/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/ReadOnlyTagHelperAttributeList.cs b/src/Microsoft.AspNetCore.Razor.Runtime/TagHelpers/ReadOnlyTagHelperAttributeList.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor.Runtime/TagHelpers/ReadOnlyTagHelperAttributeList.cs
rename to src/Microsoft.AspNetCore.Razor.Runtime/TagHelpers/ReadOnlyTagHelperAttributeList.cs
diff --git a/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/RestrictChildrenAttribute.cs b/src/Microsoft.AspNetCore.Razor.Runtime/TagHelpers/RestrictChildrenAttribute.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor.Runtime/TagHelpers/RestrictChildrenAttribute.cs
rename to src/Microsoft.AspNetCore.Razor.Runtime/TagHelpers/RestrictChildrenAttribute.cs
diff --git a/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/TagHelper.cs b/src/Microsoft.AspNetCore.Razor.Runtime/TagHelpers/TagHelper.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor.Runtime/TagHelpers/TagHelper.cs
rename to src/Microsoft.AspNetCore.Razor.Runtime/TagHelpers/TagHelper.cs
diff --git a/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/TagHelperAttribute.cs b/src/Microsoft.AspNetCore.Razor.Runtime/TagHelpers/TagHelperAttribute.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor.Runtime/TagHelpers/TagHelperAttribute.cs
rename to src/Microsoft.AspNetCore.Razor.Runtime/TagHelpers/TagHelperAttribute.cs
diff --git a/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/TagHelperAttributeList.cs b/src/Microsoft.AspNetCore.Razor.Runtime/TagHelpers/TagHelperAttributeList.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor.Runtime/TagHelpers/TagHelperAttributeList.cs
rename to src/Microsoft.AspNetCore.Razor.Runtime/TagHelpers/TagHelperAttributeList.cs
diff --git a/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/TagHelperContent.cs b/src/Microsoft.AspNetCore.Razor.Runtime/TagHelpers/TagHelperContent.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor.Runtime/TagHelpers/TagHelperContent.cs
rename to src/Microsoft.AspNetCore.Razor.Runtime/TagHelpers/TagHelperContent.cs
diff --git a/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/TagHelperContext.cs b/src/Microsoft.AspNetCore.Razor.Runtime/TagHelpers/TagHelperContext.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor.Runtime/TagHelpers/TagHelperContext.cs
rename to src/Microsoft.AspNetCore.Razor.Runtime/TagHelpers/TagHelperContext.cs
diff --git a/src/Microsoft.AspNet.Razor.Runtime/TagHelpers/TagHelperOutput.cs b/src/Microsoft.AspNetCore.Razor.Runtime/TagHelpers/TagHelperOutput.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor.Runtime/TagHelpers/TagHelperOutput.cs
rename to src/Microsoft.AspNetCore.Razor.Runtime/TagHelpers/TagHelperOutput.cs
diff --git a/src/Microsoft.AspNet.Razor.Runtime/project.json b/src/Microsoft.AspNetCore.Razor.Runtime/project.json
similarity index 100%
rename from src/Microsoft.AspNet.Razor.Runtime/project.json
rename to src/Microsoft.AspNetCore.Razor.Runtime/project.json
diff --git a/src/Microsoft.AspNet.Razor.Test.Sources/CaseSensitiveTagHelperDescriptorComparer.cs b/src/Microsoft.AspNetCore.Razor.Test.Sources/CaseSensitiveTagHelperDescriptorComparer.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor.Test.Sources/CaseSensitiveTagHelperDescriptorComparer.cs
rename to src/Microsoft.AspNetCore.Razor.Test.Sources/CaseSensitiveTagHelperDescriptorComparer.cs
diff --git a/src/Microsoft.AspNet.Razor.Test.Sources/Microsoft.AspNet.Razor.Test.Sources.xproj b/src/Microsoft.AspNetCore.Razor.Test.Sources/Microsoft.AspNetCore.Razor.Test.Sources.xproj
similarity index 100%
rename from src/Microsoft.AspNet.Razor.Test.Sources/Microsoft.AspNet.Razor.Test.Sources.xproj
rename to src/Microsoft.AspNetCore.Razor.Test.Sources/Microsoft.AspNetCore.Razor.Test.Sources.xproj
diff --git a/src/Microsoft.AspNet.Razor.Test.Sources/TagHelperAttributeDescriptorComparer.cs b/src/Microsoft.AspNetCore.Razor.Test.Sources/TagHelperAttributeDescriptorComparer.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor.Test.Sources/TagHelperAttributeDescriptorComparer.cs
rename to src/Microsoft.AspNetCore.Razor.Test.Sources/TagHelperAttributeDescriptorComparer.cs
diff --git a/src/Microsoft.AspNet.Razor.Test.Sources/TagHelperAttributeDesignTimeDescriptorComparer.cs b/src/Microsoft.AspNetCore.Razor.Test.Sources/TagHelperAttributeDesignTimeDescriptorComparer.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor.Test.Sources/TagHelperAttributeDesignTimeDescriptorComparer.cs
rename to src/Microsoft.AspNetCore.Razor.Test.Sources/TagHelperAttributeDesignTimeDescriptorComparer.cs
diff --git a/src/Microsoft.AspNet.Razor.Test.Sources/TagHelperDesignTimeDescriptorComparer.cs b/src/Microsoft.AspNetCore.Razor.Test.Sources/TagHelperDesignTimeDescriptorComparer.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor.Test.Sources/TagHelperDesignTimeDescriptorComparer.cs
rename to src/Microsoft.AspNetCore.Razor.Test.Sources/TagHelperDesignTimeDescriptorComparer.cs
diff --git a/src/Microsoft.AspNet.Razor.Test.Sources/project.json b/src/Microsoft.AspNetCore.Razor.Test.Sources/project.json
similarity index 100%
rename from src/Microsoft.AspNet.Razor.Test.Sources/project.json
rename to src/Microsoft.AspNetCore.Razor.Test.Sources/project.json
diff --git a/src/Microsoft.AspNet.Razor/CSharpRazorCodeLanguage.cs b/src/Microsoft.AspNetCore.Razor/CSharpRazorCodeLanguage.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/CSharpRazorCodeLanguage.cs
rename to src/Microsoft.AspNetCore.Razor/CSharpRazorCodeLanguage.cs
diff --git a/src/Microsoft.AspNet.Razor/Chunks/AddTagHelperChunk.cs b/src/Microsoft.AspNetCore.Razor/Chunks/AddTagHelperChunk.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Chunks/AddTagHelperChunk.cs
rename to src/Microsoft.AspNetCore.Razor/Chunks/AddTagHelperChunk.cs
diff --git a/src/Microsoft.AspNet.Razor/Chunks/Chunk.cs b/src/Microsoft.AspNetCore.Razor/Chunks/Chunk.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Chunks/Chunk.cs
rename to src/Microsoft.AspNetCore.Razor/Chunks/Chunk.cs
diff --git a/src/Microsoft.AspNet.Razor/Chunks/ChunkTree.cs b/src/Microsoft.AspNetCore.Razor/Chunks/ChunkTree.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Chunks/ChunkTree.cs
rename to src/Microsoft.AspNetCore.Razor/Chunks/ChunkTree.cs
diff --git a/src/Microsoft.AspNet.Razor/Chunks/ChunkTreeBuilder.cs b/src/Microsoft.AspNetCore.Razor/Chunks/ChunkTreeBuilder.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Chunks/ChunkTreeBuilder.cs
rename to src/Microsoft.AspNetCore.Razor/Chunks/ChunkTreeBuilder.cs
diff --git a/src/Microsoft.AspNet.Razor/Chunks/CodeAttributeChunk.cs b/src/Microsoft.AspNetCore.Razor/Chunks/CodeAttributeChunk.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Chunks/CodeAttributeChunk.cs
rename to src/Microsoft.AspNetCore.Razor/Chunks/CodeAttributeChunk.cs
diff --git a/src/Microsoft.AspNet.Razor/Chunks/DynamicCodeAttributeChunk.cs b/src/Microsoft.AspNetCore.Razor/Chunks/DynamicCodeAttributeChunk.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Chunks/DynamicCodeAttributeChunk.cs
rename to src/Microsoft.AspNetCore.Razor/Chunks/DynamicCodeAttributeChunk.cs
diff --git a/src/Microsoft.AspNet.Razor/Chunks/ExpressionBlockChunk.cs b/src/Microsoft.AspNetCore.Razor/Chunks/ExpressionBlockChunk.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Chunks/ExpressionBlockChunk.cs
rename to src/Microsoft.AspNetCore.Razor/Chunks/ExpressionBlockChunk.cs
diff --git a/src/Microsoft.AspNet.Razor/Chunks/ExpressionChunk.cs b/src/Microsoft.AspNetCore.Razor/Chunks/ExpressionChunk.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Chunks/ExpressionChunk.cs
rename to src/Microsoft.AspNetCore.Razor/Chunks/ExpressionChunk.cs
diff --git a/src/Microsoft.AspNet.Razor/Chunks/Generators/AddImportChunkGenerator.cs b/src/Microsoft.AspNetCore.Razor/Chunks/Generators/AddImportChunkGenerator.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Chunks/Generators/AddImportChunkGenerator.cs
rename to src/Microsoft.AspNetCore.Razor/Chunks/Generators/AddImportChunkGenerator.cs
diff --git a/src/Microsoft.AspNet.Razor/Chunks/Generators/AddTagHelperChunkGenerator.cs b/src/Microsoft.AspNetCore.Razor/Chunks/Generators/AddTagHelperChunkGenerator.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Chunks/Generators/AddTagHelperChunkGenerator.cs
rename to src/Microsoft.AspNetCore.Razor/Chunks/Generators/AddTagHelperChunkGenerator.cs
diff --git a/src/Microsoft.AspNet.Razor/Chunks/Generators/AttributeBlockChunkGenerator.cs b/src/Microsoft.AspNetCore.Razor/Chunks/Generators/AttributeBlockChunkGenerator.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Chunks/Generators/AttributeBlockChunkGenerator.cs
rename to src/Microsoft.AspNetCore.Razor/Chunks/Generators/AttributeBlockChunkGenerator.cs
diff --git a/src/Microsoft.AspNet.Razor/Chunks/Generators/ChunkGeneratorContext.cs b/src/Microsoft.AspNetCore.Razor/Chunks/Generators/ChunkGeneratorContext.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Chunks/Generators/ChunkGeneratorContext.cs
rename to src/Microsoft.AspNetCore.Razor/Chunks/Generators/ChunkGeneratorContext.cs
diff --git a/src/Microsoft.AspNet.Razor/Chunks/Generators/DynamicAttributeBlockChunkGenerator.cs b/src/Microsoft.AspNetCore.Razor/Chunks/Generators/DynamicAttributeBlockChunkGenerator.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Chunks/Generators/DynamicAttributeBlockChunkGenerator.cs
rename to src/Microsoft.AspNetCore.Razor/Chunks/Generators/DynamicAttributeBlockChunkGenerator.cs
diff --git a/src/Microsoft.AspNet.Razor/Chunks/Generators/ExpressionChunkGenerator.cs b/src/Microsoft.AspNetCore.Razor/Chunks/Generators/ExpressionChunkGenerator.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Chunks/Generators/ExpressionChunkGenerator.cs
rename to src/Microsoft.AspNetCore.Razor/Chunks/Generators/ExpressionChunkGenerator.cs
diff --git a/src/Microsoft.AspNet.Razor/Chunks/Generators/IParentChunkGenerator.cs b/src/Microsoft.AspNetCore.Razor/Chunks/Generators/IParentChunkGenerator.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Chunks/Generators/IParentChunkGenerator.cs
rename to src/Microsoft.AspNetCore.Razor/Chunks/Generators/IParentChunkGenerator.cs
diff --git a/src/Microsoft.AspNet.Razor/Chunks/Generators/ISpanChunkGenerator.cs b/src/Microsoft.AspNetCore.Razor/Chunks/Generators/ISpanChunkGenerator.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Chunks/Generators/ISpanChunkGenerator.cs
rename to src/Microsoft.AspNetCore.Razor/Chunks/Generators/ISpanChunkGenerator.cs
diff --git a/src/Microsoft.AspNet.Razor/Chunks/Generators/LiteralAttributeChunkGenerator.cs b/src/Microsoft.AspNetCore.Razor/Chunks/Generators/LiteralAttributeChunkGenerator.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Chunks/Generators/LiteralAttributeChunkGenerator.cs
rename to src/Microsoft.AspNetCore.Razor/Chunks/Generators/LiteralAttributeChunkGenerator.cs
diff --git a/src/Microsoft.AspNet.Razor/Chunks/Generators/MarkupChunkGenerator.cs b/src/Microsoft.AspNetCore.Razor/Chunks/Generators/MarkupChunkGenerator.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Chunks/Generators/MarkupChunkGenerator.cs
rename to src/Microsoft.AspNetCore.Razor/Chunks/Generators/MarkupChunkGenerator.cs
diff --git a/src/Microsoft.AspNet.Razor/Chunks/Generators/ParentChunkGenerator.cs b/src/Microsoft.AspNetCore.Razor/Chunks/Generators/ParentChunkGenerator.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Chunks/Generators/ParentChunkGenerator.cs
rename to src/Microsoft.AspNetCore.Razor/Chunks/Generators/ParentChunkGenerator.cs
diff --git a/src/Microsoft.AspNet.Razor/Chunks/Generators/RazorChunkGenerator.cs b/src/Microsoft.AspNetCore.Razor/Chunks/Generators/RazorChunkGenerator.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Chunks/Generators/RazorChunkGenerator.cs
rename to src/Microsoft.AspNetCore.Razor/Chunks/Generators/RazorChunkGenerator.cs
diff --git a/src/Microsoft.AspNet.Razor/Chunks/Generators/RazorCommentChunkGenerator.cs b/src/Microsoft.AspNetCore.Razor/Chunks/Generators/RazorCommentChunkGenerator.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Chunks/Generators/RazorCommentChunkGenerator.cs
rename to src/Microsoft.AspNetCore.Razor/Chunks/Generators/RazorCommentChunkGenerator.cs
diff --git a/src/Microsoft.AspNet.Razor/Chunks/Generators/RemoveTagHelperChunkGenerator.cs b/src/Microsoft.AspNetCore.Razor/Chunks/Generators/RemoveTagHelperChunkGenerator.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Chunks/Generators/RemoveTagHelperChunkGenerator.cs
rename to src/Microsoft.AspNetCore.Razor/Chunks/Generators/RemoveTagHelperChunkGenerator.cs
diff --git a/src/Microsoft.AspNet.Razor/Chunks/Generators/SectionChunkGenerator.cs b/src/Microsoft.AspNetCore.Razor/Chunks/Generators/SectionChunkGenerator.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Chunks/Generators/SectionChunkGenerator.cs
rename to src/Microsoft.AspNetCore.Razor/Chunks/Generators/SectionChunkGenerator.cs
diff --git a/src/Microsoft.AspNet.Razor/Chunks/Generators/SetBaseTypeChunkGenerator.cs b/src/Microsoft.AspNetCore.Razor/Chunks/Generators/SetBaseTypeChunkGenerator.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Chunks/Generators/SetBaseTypeChunkGenerator.cs
rename to src/Microsoft.AspNetCore.Razor/Chunks/Generators/SetBaseTypeChunkGenerator.cs
diff --git a/src/Microsoft.AspNet.Razor/Chunks/Generators/SpanChunkGenerator.cs b/src/Microsoft.AspNetCore.Razor/Chunks/Generators/SpanChunkGenerator.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Chunks/Generators/SpanChunkGenerator.cs
rename to src/Microsoft.AspNetCore.Razor/Chunks/Generators/SpanChunkGenerator.cs
diff --git a/src/Microsoft.AspNet.Razor/Chunks/Generators/StatementChunkGenerator.cs b/src/Microsoft.AspNetCore.Razor/Chunks/Generators/StatementChunkGenerator.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Chunks/Generators/StatementChunkGenerator.cs
rename to src/Microsoft.AspNetCore.Razor/Chunks/Generators/StatementChunkGenerator.cs
diff --git a/src/Microsoft.AspNet.Razor/Chunks/Generators/TagHelperChunkGenerator.cs b/src/Microsoft.AspNetCore.Razor/Chunks/Generators/TagHelperChunkGenerator.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Chunks/Generators/TagHelperChunkGenerator.cs
rename to src/Microsoft.AspNetCore.Razor/Chunks/Generators/TagHelperChunkGenerator.cs
diff --git a/src/Microsoft.AspNet.Razor/Chunks/Generators/TagHelperPrefixDirectiveChunkGenerator.cs b/src/Microsoft.AspNetCore.Razor/Chunks/Generators/TagHelperPrefixDirectiveChunkGenerator.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Chunks/Generators/TagHelperPrefixDirectiveChunkGenerator.cs
rename to src/Microsoft.AspNetCore.Razor/Chunks/Generators/TagHelperPrefixDirectiveChunkGenerator.cs
diff --git a/src/Microsoft.AspNet.Razor/Chunks/Generators/TemplateBlockChunkGenerator.cs b/src/Microsoft.AspNetCore.Razor/Chunks/Generators/TemplateBlockChunkGenerator.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Chunks/Generators/TemplateBlockChunkGenerator.cs
rename to src/Microsoft.AspNetCore.Razor/Chunks/Generators/TemplateBlockChunkGenerator.cs
diff --git a/src/Microsoft.AspNet.Razor/Chunks/Generators/TypeMemberChunkGenerator.cs b/src/Microsoft.AspNetCore.Razor/Chunks/Generators/TypeMemberChunkGenerator.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Chunks/Generators/TypeMemberChunkGenerator.cs
rename to src/Microsoft.AspNetCore.Razor/Chunks/Generators/TypeMemberChunkGenerator.cs
diff --git a/src/Microsoft.AspNet.Razor/Chunks/LiteralChunk.cs b/src/Microsoft.AspNetCore.Razor/Chunks/LiteralChunk.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Chunks/LiteralChunk.cs
rename to src/Microsoft.AspNetCore.Razor/Chunks/LiteralChunk.cs
diff --git a/src/Microsoft.AspNet.Razor/Chunks/LiteralCodeAttributeChunk.cs b/src/Microsoft.AspNetCore.Razor/Chunks/LiteralCodeAttributeChunk.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Chunks/LiteralCodeAttributeChunk.cs
rename to src/Microsoft.AspNetCore.Razor/Chunks/LiteralCodeAttributeChunk.cs
diff --git a/src/Microsoft.AspNet.Razor/Chunks/ParentChunk.cs b/src/Microsoft.AspNetCore.Razor/Chunks/ParentChunk.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Chunks/ParentChunk.cs
rename to src/Microsoft.AspNetCore.Razor/Chunks/ParentChunk.cs
diff --git a/src/Microsoft.AspNet.Razor/Chunks/ParentLiteralChunk.cs b/src/Microsoft.AspNetCore.Razor/Chunks/ParentLiteralChunk.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Chunks/ParentLiteralChunk.cs
rename to src/Microsoft.AspNetCore.Razor/Chunks/ParentLiteralChunk.cs
diff --git a/src/Microsoft.AspNet.Razor/Chunks/RemoveTagHelperChunk.cs b/src/Microsoft.AspNetCore.Razor/Chunks/RemoveTagHelperChunk.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Chunks/RemoveTagHelperChunk.cs
rename to src/Microsoft.AspNetCore.Razor/Chunks/RemoveTagHelperChunk.cs
diff --git a/src/Microsoft.AspNet.Razor/Chunks/SectionChunk.cs b/src/Microsoft.AspNetCore.Razor/Chunks/SectionChunk.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Chunks/SectionChunk.cs
rename to src/Microsoft.AspNetCore.Razor/Chunks/SectionChunk.cs
diff --git a/src/Microsoft.AspNet.Razor/Chunks/SetBaseTypeChunk.cs b/src/Microsoft.AspNetCore.Razor/Chunks/SetBaseTypeChunk.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Chunks/SetBaseTypeChunk.cs
rename to src/Microsoft.AspNetCore.Razor/Chunks/SetBaseTypeChunk.cs
diff --git a/src/Microsoft.AspNet.Razor/Chunks/StatementChunk.cs b/src/Microsoft.AspNetCore.Razor/Chunks/StatementChunk.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Chunks/StatementChunk.cs
rename to src/Microsoft.AspNetCore.Razor/Chunks/StatementChunk.cs
diff --git a/src/Microsoft.AspNet.Razor/Chunks/TagHelperChunk.cs b/src/Microsoft.AspNetCore.Razor/Chunks/TagHelperChunk.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Chunks/TagHelperChunk.cs
rename to src/Microsoft.AspNetCore.Razor/Chunks/TagHelperChunk.cs
diff --git a/src/Microsoft.AspNet.Razor/Chunks/TagHelperPrefixDirectiveChunk.cs b/src/Microsoft.AspNetCore.Razor/Chunks/TagHelperPrefixDirectiveChunk.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Chunks/TagHelperPrefixDirectiveChunk.cs
rename to src/Microsoft.AspNetCore.Razor/Chunks/TagHelperPrefixDirectiveChunk.cs
diff --git a/src/Microsoft.AspNet.Razor/Chunks/TemplateChunk.cs b/src/Microsoft.AspNetCore.Razor/Chunks/TemplateChunk.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Chunks/TemplateChunk.cs
rename to src/Microsoft.AspNetCore.Razor/Chunks/TemplateChunk.cs
diff --git a/src/Microsoft.AspNet.Razor/Chunks/TypeMemberChunk.cs b/src/Microsoft.AspNetCore.Razor/Chunks/TypeMemberChunk.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Chunks/TypeMemberChunk.cs
rename to src/Microsoft.AspNetCore.Razor/Chunks/TypeMemberChunk.cs
diff --git a/src/Microsoft.AspNet.Razor/Chunks/UsingChunk.cs b/src/Microsoft.AspNetCore.Razor/Chunks/UsingChunk.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Chunks/UsingChunk.cs
rename to src/Microsoft.AspNetCore.Razor/Chunks/UsingChunk.cs
diff --git a/src/Microsoft.AspNet.Razor/CodeGenerators/CSharpCodeGenerator.cs b/src/Microsoft.AspNetCore.Razor/CodeGenerators/CSharpCodeGenerator.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/CodeGenerators/CSharpCodeGenerator.cs
rename to src/Microsoft.AspNetCore.Razor/CodeGenerators/CSharpCodeGenerator.cs
diff --git a/src/Microsoft.AspNet.Razor/CodeGenerators/CSharpCodeWriter.cs b/src/Microsoft.AspNetCore.Razor/CodeGenerators/CSharpCodeWriter.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/CodeGenerators/CSharpCodeWriter.cs
rename to src/Microsoft.AspNetCore.Razor/CodeGenerators/CSharpCodeWriter.cs
diff --git a/src/Microsoft.AspNet.Razor/CodeGenerators/CSharpCodeWritingScope.cs b/src/Microsoft.AspNetCore.Razor/CodeGenerators/CSharpCodeWritingScope.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/CodeGenerators/CSharpCodeWritingScope.cs
rename to src/Microsoft.AspNetCore.Razor/CodeGenerators/CSharpCodeWritingScope.cs
diff --git a/src/Microsoft.AspNet.Razor/CodeGenerators/CSharpDisableWarningScope.cs b/src/Microsoft.AspNetCore.Razor/CodeGenerators/CSharpDisableWarningScope.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/CodeGenerators/CSharpDisableWarningScope.cs
rename to src/Microsoft.AspNetCore.Razor/CodeGenerators/CSharpDisableWarningScope.cs
diff --git a/src/Microsoft.AspNet.Razor/CodeGenerators/CSharpLineMappingWriter.cs b/src/Microsoft.AspNetCore.Razor/CodeGenerators/CSharpLineMappingWriter.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/CodeGenerators/CSharpLineMappingWriter.cs
rename to src/Microsoft.AspNetCore.Razor/CodeGenerators/CSharpLineMappingWriter.cs
diff --git a/src/Microsoft.AspNet.Razor/CodeGenerators/CSharpPaddingBuilder.cs b/src/Microsoft.AspNetCore.Razor/CodeGenerators/CSharpPaddingBuilder.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/CodeGenerators/CSharpPaddingBuilder.cs
rename to src/Microsoft.AspNetCore.Razor/CodeGenerators/CSharpPaddingBuilder.cs
diff --git a/src/Microsoft.AspNet.Razor/CodeGenerators/CSharpTagHelperCodeRenderer.cs b/src/Microsoft.AspNetCore.Razor/CodeGenerators/CSharpTagHelperCodeRenderer.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/CodeGenerators/CSharpTagHelperCodeRenderer.cs
rename to src/Microsoft.AspNetCore.Razor/CodeGenerators/CSharpTagHelperCodeRenderer.cs
diff --git a/src/Microsoft.AspNet.Razor/CodeGenerators/CodeGenerator.cs b/src/Microsoft.AspNetCore.Razor/CodeGenerators/CodeGenerator.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/CodeGenerators/CodeGenerator.cs
rename to src/Microsoft.AspNetCore.Razor/CodeGenerators/CodeGenerator.cs
diff --git a/src/Microsoft.AspNet.Razor/CodeGenerators/CodeGeneratorContext.cs b/src/Microsoft.AspNetCore.Razor/CodeGenerators/CodeGeneratorContext.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/CodeGenerators/CodeGeneratorContext.cs
rename to src/Microsoft.AspNetCore.Razor/CodeGenerators/CodeGeneratorContext.cs
diff --git a/src/Microsoft.AspNet.Razor/CodeGenerators/CodeGeneratorResult.cs b/src/Microsoft.AspNetCore.Razor/CodeGenerators/CodeGeneratorResult.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/CodeGenerators/CodeGeneratorResult.cs
rename to src/Microsoft.AspNetCore.Razor/CodeGenerators/CodeGeneratorResult.cs
diff --git a/src/Microsoft.AspNet.Razor/CodeGenerators/CodeWriter.cs b/src/Microsoft.AspNetCore.Razor/CodeGenerators/CodeWriter.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/CodeGenerators/CodeWriter.cs
rename to src/Microsoft.AspNetCore.Razor/CodeGenerators/CodeWriter.cs
diff --git a/src/Microsoft.AspNet.Razor/CodeGenerators/ExpressionRenderingMode.cs b/src/Microsoft.AspNetCore.Razor/CodeGenerators/ExpressionRenderingMode.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/CodeGenerators/ExpressionRenderingMode.cs
rename to src/Microsoft.AspNetCore.Razor/CodeGenerators/ExpressionRenderingMode.cs
diff --git a/src/Microsoft.AspNet.Razor/CodeGenerators/GeneratedClassContext.cs b/src/Microsoft.AspNetCore.Razor/CodeGenerators/GeneratedClassContext.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/CodeGenerators/GeneratedClassContext.cs
rename to src/Microsoft.AspNetCore.Razor/CodeGenerators/GeneratedClassContext.cs
diff --git a/src/Microsoft.AspNet.Razor/CodeGenerators/GeneratedTagHelperContext.cs b/src/Microsoft.AspNetCore.Razor/CodeGenerators/GeneratedTagHelperContext.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/CodeGenerators/GeneratedTagHelperContext.cs
rename to src/Microsoft.AspNetCore.Razor/CodeGenerators/GeneratedTagHelperContext.cs
diff --git a/src/Microsoft.AspNet.Razor/CodeGenerators/GeneratorResults.cs b/src/Microsoft.AspNetCore.Razor/CodeGenerators/GeneratorResults.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/CodeGenerators/GeneratorResults.cs
rename to src/Microsoft.AspNetCore.Razor/CodeGenerators/GeneratorResults.cs
diff --git a/src/Microsoft.AspNet.Razor/CodeGenerators/LineMapping.cs b/src/Microsoft.AspNetCore.Razor/CodeGenerators/LineMapping.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/CodeGenerators/LineMapping.cs
rename to src/Microsoft.AspNetCore.Razor/CodeGenerators/LineMapping.cs
diff --git a/src/Microsoft.AspNet.Razor/CodeGenerators/LineMappingManager.cs b/src/Microsoft.AspNetCore.Razor/CodeGenerators/LineMappingManager.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/CodeGenerators/LineMappingManager.cs
rename to src/Microsoft.AspNetCore.Razor/CodeGenerators/LineMappingManager.cs
diff --git a/src/Microsoft.AspNet.Razor/CodeGenerators/MappingLocation.cs b/src/Microsoft.AspNetCore.Razor/CodeGenerators/MappingLocation.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/CodeGenerators/MappingLocation.cs
rename to src/Microsoft.AspNetCore.Razor/CodeGenerators/MappingLocation.cs
diff --git a/src/Microsoft.AspNet.Razor/CodeGenerators/TagHelperAttributeValueCodeRenderer.cs b/src/Microsoft.AspNetCore.Razor/CodeGenerators/TagHelperAttributeValueCodeRenderer.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/CodeGenerators/TagHelperAttributeValueCodeRenderer.cs
rename to src/Microsoft.AspNetCore.Razor/CodeGenerators/TagHelperAttributeValueCodeRenderer.cs
diff --git a/src/Microsoft.AspNet.Razor/CodeGenerators/Visitors/CSharpBaseTypeVisitor.cs b/src/Microsoft.AspNetCore.Razor/CodeGenerators/Visitors/CSharpBaseTypeVisitor.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/CodeGenerators/Visitors/CSharpBaseTypeVisitor.cs
rename to src/Microsoft.AspNetCore.Razor/CodeGenerators/Visitors/CSharpBaseTypeVisitor.cs
diff --git a/src/Microsoft.AspNet.Razor/CodeGenerators/Visitors/CSharpCodeVisitor.cs b/src/Microsoft.AspNetCore.Razor/CodeGenerators/Visitors/CSharpCodeVisitor.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/CodeGenerators/Visitors/CSharpCodeVisitor.cs
rename to src/Microsoft.AspNetCore.Razor/CodeGenerators/Visitors/CSharpCodeVisitor.cs
diff --git a/src/Microsoft.AspNet.Razor/CodeGenerators/Visitors/CSharpDesignTimeCodeVisitor.cs b/src/Microsoft.AspNetCore.Razor/CodeGenerators/Visitors/CSharpDesignTimeCodeVisitor.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/CodeGenerators/Visitors/CSharpDesignTimeCodeVisitor.cs
rename to src/Microsoft.AspNetCore.Razor/CodeGenerators/Visitors/CSharpDesignTimeCodeVisitor.cs
diff --git a/src/Microsoft.AspNet.Razor/CodeGenerators/Visitors/CSharpTagHelperAttributeValueVisitor.cs b/src/Microsoft.AspNetCore.Razor/CodeGenerators/Visitors/CSharpTagHelperAttributeValueVisitor.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/CodeGenerators/Visitors/CSharpTagHelperAttributeValueVisitor.cs
rename to src/Microsoft.AspNetCore.Razor/CodeGenerators/Visitors/CSharpTagHelperAttributeValueVisitor.cs
diff --git a/src/Microsoft.AspNet.Razor/CodeGenerators/Visitors/CSharpTagHelperFieldDeclarationVisitor.cs b/src/Microsoft.AspNetCore.Razor/CodeGenerators/Visitors/CSharpTagHelperFieldDeclarationVisitor.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/CodeGenerators/Visitors/CSharpTagHelperFieldDeclarationVisitor.cs
rename to src/Microsoft.AspNetCore.Razor/CodeGenerators/Visitors/CSharpTagHelperFieldDeclarationVisitor.cs
diff --git a/src/Microsoft.AspNet.Razor/CodeGenerators/Visitors/CSharpTagHelperRunnerInitializationVisitor.cs b/src/Microsoft.AspNetCore.Razor/CodeGenerators/Visitors/CSharpTagHelperRunnerInitializationVisitor.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/CodeGenerators/Visitors/CSharpTagHelperRunnerInitializationVisitor.cs
rename to src/Microsoft.AspNetCore.Razor/CodeGenerators/Visitors/CSharpTagHelperRunnerInitializationVisitor.cs
diff --git a/src/Microsoft.AspNet.Razor/CodeGenerators/Visitors/CSharpTypeMemberVisitor.cs b/src/Microsoft.AspNetCore.Razor/CodeGenerators/Visitors/CSharpTypeMemberVisitor.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/CodeGenerators/Visitors/CSharpTypeMemberVisitor.cs
rename to src/Microsoft.AspNetCore.Razor/CodeGenerators/Visitors/CSharpTypeMemberVisitor.cs
diff --git a/src/Microsoft.AspNet.Razor/CodeGenerators/Visitors/CSharpUsingVisitor.cs b/src/Microsoft.AspNetCore.Razor/CodeGenerators/Visitors/CSharpUsingVisitor.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/CodeGenerators/Visitors/CSharpUsingVisitor.cs
rename to src/Microsoft.AspNetCore.Razor/CodeGenerators/Visitors/CSharpUsingVisitor.cs
diff --git a/src/Microsoft.AspNet.Razor/CodeGenerators/Visitors/ChunkVisitor.cs b/src/Microsoft.AspNetCore.Razor/CodeGenerators/Visitors/ChunkVisitor.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/CodeGenerators/Visitors/ChunkVisitor.cs
rename to src/Microsoft.AspNetCore.Razor/CodeGenerators/Visitors/ChunkVisitor.cs
diff --git a/src/Microsoft.AspNet.Razor/CodeGenerators/Visitors/CodeVisitor.cs b/src/Microsoft.AspNetCore.Razor/CodeGenerators/Visitors/CodeVisitor.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/CodeGenerators/Visitors/CodeVisitor.cs
rename to src/Microsoft.AspNetCore.Razor/CodeGenerators/Visitors/CodeVisitor.cs
diff --git a/src/Microsoft.AspNet.Razor/CodeGenerators/Visitors/IChunkVisitor.cs b/src/Microsoft.AspNetCore.Razor/CodeGenerators/Visitors/IChunkVisitor.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/CodeGenerators/Visitors/IChunkVisitor.cs
rename to src/Microsoft.AspNetCore.Razor/CodeGenerators/Visitors/IChunkVisitor.cs
diff --git a/src/Microsoft.AspNet.Razor/CommonResources.resx b/src/Microsoft.AspNetCore.Razor/CommonResources.resx
similarity index 100%
rename from src/Microsoft.AspNet.Razor/CommonResources.resx
rename to src/Microsoft.AspNetCore.Razor/CommonResources.resx
diff --git a/src/Microsoft.AspNet.Razor/Compilation/TagHelpers/ITagHelperDescriptorResolver.cs b/src/Microsoft.AspNetCore.Razor/Compilation/TagHelpers/ITagHelperDescriptorResolver.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Compilation/TagHelpers/ITagHelperDescriptorResolver.cs
rename to src/Microsoft.AspNetCore.Razor/Compilation/TagHelpers/ITagHelperDescriptorResolver.cs
diff --git a/src/Microsoft.AspNet.Razor/Compilation/TagHelpers/TagHelperAttributeDescriptor.cs b/src/Microsoft.AspNetCore.Razor/Compilation/TagHelpers/TagHelperAttributeDescriptor.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Compilation/TagHelpers/TagHelperAttributeDescriptor.cs
rename to src/Microsoft.AspNetCore.Razor/Compilation/TagHelpers/TagHelperAttributeDescriptor.cs
diff --git a/src/Microsoft.AspNet.Razor/Compilation/TagHelpers/TagHelperAttributeDesignTimeDescriptor.cs b/src/Microsoft.AspNetCore.Razor/Compilation/TagHelpers/TagHelperAttributeDesignTimeDescriptor.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Compilation/TagHelpers/TagHelperAttributeDesignTimeDescriptor.cs
rename to src/Microsoft.AspNetCore.Razor/Compilation/TagHelpers/TagHelperAttributeDesignTimeDescriptor.cs
diff --git a/src/Microsoft.AspNet.Razor/Compilation/TagHelpers/TagHelperDescriptor.cs b/src/Microsoft.AspNetCore.Razor/Compilation/TagHelpers/TagHelperDescriptor.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Compilation/TagHelpers/TagHelperDescriptor.cs
rename to src/Microsoft.AspNetCore.Razor/Compilation/TagHelpers/TagHelperDescriptor.cs
diff --git a/src/Microsoft.AspNet.Razor/Compilation/TagHelpers/TagHelperDescriptorComparer.cs b/src/Microsoft.AspNetCore.Razor/Compilation/TagHelpers/TagHelperDescriptorComparer.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Compilation/TagHelpers/TagHelperDescriptorComparer.cs
rename to src/Microsoft.AspNetCore.Razor/Compilation/TagHelpers/TagHelperDescriptorComparer.cs
diff --git a/src/Microsoft.AspNet.Razor/Compilation/TagHelpers/TagHelperDescriptorProvider.cs b/src/Microsoft.AspNetCore.Razor/Compilation/TagHelpers/TagHelperDescriptorProvider.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Compilation/TagHelpers/TagHelperDescriptorProvider.cs
rename to src/Microsoft.AspNetCore.Razor/Compilation/TagHelpers/TagHelperDescriptorProvider.cs
diff --git a/src/Microsoft.AspNet.Razor/Compilation/TagHelpers/TagHelperDescriptorResolutionContext.cs b/src/Microsoft.AspNetCore.Razor/Compilation/TagHelpers/TagHelperDescriptorResolutionContext.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Compilation/TagHelpers/TagHelperDescriptorResolutionContext.cs
rename to src/Microsoft.AspNetCore.Razor/Compilation/TagHelpers/TagHelperDescriptorResolutionContext.cs
diff --git a/src/Microsoft.AspNet.Razor/Compilation/TagHelpers/TagHelperDesignTimeDescriptor.cs b/src/Microsoft.AspNetCore.Razor/Compilation/TagHelpers/TagHelperDesignTimeDescriptor.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Compilation/TagHelpers/TagHelperDesignTimeDescriptor.cs
rename to src/Microsoft.AspNetCore.Razor/Compilation/TagHelpers/TagHelperDesignTimeDescriptor.cs
diff --git a/src/Microsoft.AspNet.Razor/Compilation/TagHelpers/TagHelperDirectiveDescriptor.cs b/src/Microsoft.AspNetCore.Razor/Compilation/TagHelpers/TagHelperDirectiveDescriptor.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Compilation/TagHelpers/TagHelperDirectiveDescriptor.cs
rename to src/Microsoft.AspNetCore.Razor/Compilation/TagHelpers/TagHelperDirectiveDescriptor.cs
diff --git a/src/Microsoft.AspNet.Razor/Compilation/TagHelpers/TagHelperDirectiveType.cs b/src/Microsoft.AspNetCore.Razor/Compilation/TagHelpers/TagHelperDirectiveType.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Compilation/TagHelpers/TagHelperDirectiveType.cs
rename to src/Microsoft.AspNetCore.Razor/Compilation/TagHelpers/TagHelperDirectiveType.cs
diff --git a/src/Microsoft.AspNet.Razor/Compilation/TagHelpers/TypeBasedTagHelperDescriptorComparer.cs b/src/Microsoft.AspNetCore.Razor/Compilation/TagHelpers/TypeBasedTagHelperDescriptorComparer.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Compilation/TagHelpers/TypeBasedTagHelperDescriptorComparer.cs
rename to src/Microsoft.AspNetCore.Razor/Compilation/TagHelpers/TypeBasedTagHelperDescriptorComparer.cs
diff --git a/src/Microsoft.AspNet.Razor/DocumentParseCompleteEventArgs.cs b/src/Microsoft.AspNetCore.Razor/DocumentParseCompleteEventArgs.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/DocumentParseCompleteEventArgs.cs
rename to src/Microsoft.AspNetCore.Razor/DocumentParseCompleteEventArgs.cs
diff --git a/src/Microsoft.AspNet.Razor/Editor/AutoCompleteEditHandler.cs b/src/Microsoft.AspNetCore.Razor/Editor/AutoCompleteEditHandler.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Editor/AutoCompleteEditHandler.cs
rename to src/Microsoft.AspNetCore.Razor/Editor/AutoCompleteEditHandler.cs
diff --git a/src/Microsoft.AspNet.Razor/Editor/BackgroundParser.cs b/src/Microsoft.AspNetCore.Razor/Editor/BackgroundParser.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Editor/BackgroundParser.cs
rename to src/Microsoft.AspNetCore.Razor/Editor/BackgroundParser.cs
diff --git a/src/Microsoft.AspNet.Razor/Editor/EditResult.cs b/src/Microsoft.AspNetCore.Razor/Editor/EditResult.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Editor/EditResult.cs
rename to src/Microsoft.AspNetCore.Razor/Editor/EditResult.cs
diff --git a/src/Microsoft.AspNet.Razor/Editor/EditorHints.cs b/src/Microsoft.AspNetCore.Razor/Editor/EditorHints.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Editor/EditorHints.cs
rename to src/Microsoft.AspNetCore.Razor/Editor/EditorHints.cs
diff --git a/src/Microsoft.AspNet.Razor/Editor/ImplicitExpressionEditHandler.cs b/src/Microsoft.AspNetCore.Razor/Editor/ImplicitExpressionEditHandler.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Editor/ImplicitExpressionEditHandler.cs
rename to src/Microsoft.AspNetCore.Razor/Editor/ImplicitExpressionEditHandler.cs
diff --git a/src/Microsoft.AspNet.Razor/Editor/RazorEditorTrace.cs b/src/Microsoft.AspNetCore.Razor/Editor/RazorEditorTrace.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Editor/RazorEditorTrace.cs
rename to src/Microsoft.AspNetCore.Razor/Editor/RazorEditorTrace.cs
diff --git a/src/Microsoft.AspNet.Razor/Editor/SingleLineMarkupEditHandler.cs b/src/Microsoft.AspNetCore.Razor/Editor/SingleLineMarkupEditHandler.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Editor/SingleLineMarkupEditHandler.cs
rename to src/Microsoft.AspNetCore.Razor/Editor/SingleLineMarkupEditHandler.cs
diff --git a/src/Microsoft.AspNet.Razor/Editor/SpanEditHandler.cs b/src/Microsoft.AspNetCore.Razor/Editor/SpanEditHandler.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Editor/SpanEditHandler.cs
rename to src/Microsoft.AspNetCore.Razor/Editor/SpanEditHandler.cs
diff --git a/src/Microsoft.AspNet.Razor/ErrorSink.cs b/src/Microsoft.AspNetCore.Razor/ErrorSink.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/ErrorSink.cs
rename to src/Microsoft.AspNetCore.Razor/ErrorSink.cs
diff --git a/src/Microsoft.AspNet.Razor/Microsoft.AspNet.Razor.xproj b/src/Microsoft.AspNetCore.Razor/Microsoft.AspNetCore.Razor.xproj
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Microsoft.AspNet.Razor.xproj
rename to src/Microsoft.AspNetCore.Razor/Microsoft.AspNetCore.Razor.xproj
diff --git a/src/Microsoft.AspNet.Razor/Parser/BalancingModes.cs b/src/Microsoft.AspNetCore.Razor/Parser/BalancingModes.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Parser/BalancingModes.cs
rename to src/Microsoft.AspNetCore.Razor/Parser/BalancingModes.cs
diff --git a/src/Microsoft.AspNet.Razor/Parser/CSharpCodeParser.Directives.cs b/src/Microsoft.AspNetCore.Razor/Parser/CSharpCodeParser.Directives.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Parser/CSharpCodeParser.Directives.cs
rename to src/Microsoft.AspNetCore.Razor/Parser/CSharpCodeParser.Directives.cs
diff --git a/src/Microsoft.AspNet.Razor/Parser/CSharpCodeParser.Expressions.cs b/src/Microsoft.AspNetCore.Razor/Parser/CSharpCodeParser.Expressions.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Parser/CSharpCodeParser.Expressions.cs
rename to src/Microsoft.AspNetCore.Razor/Parser/CSharpCodeParser.Expressions.cs
diff --git a/src/Microsoft.AspNet.Razor/Parser/CSharpCodeParser.Statements.cs b/src/Microsoft.AspNetCore.Razor/Parser/CSharpCodeParser.Statements.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Parser/CSharpCodeParser.Statements.cs
rename to src/Microsoft.AspNetCore.Razor/Parser/CSharpCodeParser.Statements.cs
diff --git a/src/Microsoft.AspNet.Razor/Parser/CSharpCodeParser.cs b/src/Microsoft.AspNetCore.Razor/Parser/CSharpCodeParser.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Parser/CSharpCodeParser.cs
rename to src/Microsoft.AspNetCore.Razor/Parser/CSharpCodeParser.cs
diff --git a/src/Microsoft.AspNet.Razor/Parser/CSharpLanguageCharacteristics.cs b/src/Microsoft.AspNetCore.Razor/Parser/CSharpLanguageCharacteristics.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Parser/CSharpLanguageCharacteristics.cs
rename to src/Microsoft.AspNetCore.Razor/Parser/CSharpLanguageCharacteristics.cs
diff --git a/src/Microsoft.AspNet.Razor/Parser/CallbackVisitor.cs b/src/Microsoft.AspNetCore.Razor/Parser/CallbackVisitor.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Parser/CallbackVisitor.cs
rename to src/Microsoft.AspNetCore.Razor/Parser/CallbackVisitor.cs
diff --git a/src/Microsoft.AspNet.Razor/Parser/ConditionalAttributeCollapser.cs b/src/Microsoft.AspNetCore.Razor/Parser/ConditionalAttributeCollapser.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Parser/ConditionalAttributeCollapser.cs
rename to src/Microsoft.AspNetCore.Razor/Parser/ConditionalAttributeCollapser.cs
diff --git a/src/Microsoft.AspNet.Razor/Parser/HtmlLanguageCharacteristics.cs b/src/Microsoft.AspNetCore.Razor/Parser/HtmlLanguageCharacteristics.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Parser/HtmlLanguageCharacteristics.cs
rename to src/Microsoft.AspNetCore.Razor/Parser/HtmlLanguageCharacteristics.cs
diff --git a/src/Microsoft.AspNet.Razor/Parser/HtmlMarkupParser.Block.cs b/src/Microsoft.AspNetCore.Razor/Parser/HtmlMarkupParser.Block.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Parser/HtmlMarkupParser.Block.cs
rename to src/Microsoft.AspNetCore.Razor/Parser/HtmlMarkupParser.Block.cs
diff --git a/src/Microsoft.AspNet.Razor/Parser/HtmlMarkupParser.Document.cs b/src/Microsoft.AspNetCore.Razor/Parser/HtmlMarkupParser.Document.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Parser/HtmlMarkupParser.Document.cs
rename to src/Microsoft.AspNetCore.Razor/Parser/HtmlMarkupParser.Document.cs
diff --git a/src/Microsoft.AspNet.Razor/Parser/HtmlMarkupParser.Section.cs b/src/Microsoft.AspNetCore.Razor/Parser/HtmlMarkupParser.Section.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Parser/HtmlMarkupParser.Section.cs
rename to src/Microsoft.AspNetCore.Razor/Parser/HtmlMarkupParser.Section.cs
diff --git a/src/Microsoft.AspNet.Razor/Parser/HtmlMarkupParser.cs b/src/Microsoft.AspNetCore.Razor/Parser/HtmlMarkupParser.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Parser/HtmlMarkupParser.cs
rename to src/Microsoft.AspNetCore.Razor/Parser/HtmlMarkupParser.cs
diff --git a/src/Microsoft.AspNet.Razor/Parser/ISyntaxTreeRewriter.cs b/src/Microsoft.AspNetCore.Razor/Parser/ISyntaxTreeRewriter.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Parser/ISyntaxTreeRewriter.cs
rename to src/Microsoft.AspNetCore.Razor/Parser/ISyntaxTreeRewriter.cs
diff --git a/src/Microsoft.AspNet.Razor/Parser/LanguageCharacteristics.cs b/src/Microsoft.AspNetCore.Razor/Parser/LanguageCharacteristics.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Parser/LanguageCharacteristics.cs
rename to src/Microsoft.AspNetCore.Razor/Parser/LanguageCharacteristics.cs
diff --git a/src/Microsoft.AspNet.Razor/Parser/MarkupCollapser.cs b/src/Microsoft.AspNetCore.Razor/Parser/MarkupCollapser.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Parser/MarkupCollapser.cs
rename to src/Microsoft.AspNetCore.Razor/Parser/MarkupCollapser.cs
diff --git a/src/Microsoft.AspNet.Razor/Parser/MarkupRewriter.cs b/src/Microsoft.AspNetCore.Razor/Parser/MarkupRewriter.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Parser/MarkupRewriter.cs
rename to src/Microsoft.AspNetCore.Razor/Parser/MarkupRewriter.cs
diff --git a/src/Microsoft.AspNet.Razor/Parser/ParserBase.cs b/src/Microsoft.AspNetCore.Razor/Parser/ParserBase.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Parser/ParserBase.cs
rename to src/Microsoft.AspNetCore.Razor/Parser/ParserBase.cs
diff --git a/src/Microsoft.AspNet.Razor/Parser/ParserContext.cs b/src/Microsoft.AspNetCore.Razor/Parser/ParserContext.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Parser/ParserContext.cs
rename to src/Microsoft.AspNetCore.Razor/Parser/ParserContext.cs
diff --git a/src/Microsoft.AspNet.Razor/Parser/ParserHelpers.cs b/src/Microsoft.AspNetCore.Razor/Parser/ParserHelpers.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Parser/ParserHelpers.cs
rename to src/Microsoft.AspNetCore.Razor/Parser/ParserHelpers.cs
diff --git a/src/Microsoft.AspNet.Razor/Parser/ParserVisitor.cs b/src/Microsoft.AspNetCore.Razor/Parser/ParserVisitor.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Parser/ParserVisitor.cs
rename to src/Microsoft.AspNetCore.Razor/Parser/ParserVisitor.cs
diff --git a/src/Microsoft.AspNet.Razor/Parser/ParserVisitorExtensions.cs b/src/Microsoft.AspNetCore.Razor/Parser/ParserVisitorExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Parser/ParserVisitorExtensions.cs
rename to src/Microsoft.AspNetCore.Razor/Parser/ParserVisitorExtensions.cs
diff --git a/src/Microsoft.AspNet.Razor/Parser/RazorParser.cs b/src/Microsoft.AspNetCore.Razor/Parser/RazorParser.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Parser/RazorParser.cs
rename to src/Microsoft.AspNetCore.Razor/Parser/RazorParser.cs
diff --git a/src/Microsoft.AspNet.Razor/Parser/RewritingContext.cs b/src/Microsoft.AspNetCore.Razor/Parser/RewritingContext.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Parser/RewritingContext.cs
rename to src/Microsoft.AspNetCore.Razor/Parser/RewritingContext.cs
diff --git a/src/Microsoft.AspNet.Razor/Parser/SyntaxConstants.cs b/src/Microsoft.AspNetCore.Razor/Parser/SyntaxConstants.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Parser/SyntaxConstants.cs
rename to src/Microsoft.AspNetCore.Razor/Parser/SyntaxConstants.cs
diff --git a/src/Microsoft.AspNet.Razor/Parser/SyntaxTree/AcceptedCharacters.cs b/src/Microsoft.AspNetCore.Razor/Parser/SyntaxTree/AcceptedCharacters.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Parser/SyntaxTree/AcceptedCharacters.cs
rename to src/Microsoft.AspNetCore.Razor/Parser/SyntaxTree/AcceptedCharacters.cs
diff --git a/src/Microsoft.AspNet.Razor/Parser/SyntaxTree/Block.cs b/src/Microsoft.AspNetCore.Razor/Parser/SyntaxTree/Block.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Parser/SyntaxTree/Block.cs
rename to src/Microsoft.AspNetCore.Razor/Parser/SyntaxTree/Block.cs
diff --git a/src/Microsoft.AspNet.Razor/Parser/SyntaxTree/BlockBuilder.cs b/src/Microsoft.AspNetCore.Razor/Parser/SyntaxTree/BlockBuilder.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Parser/SyntaxTree/BlockBuilder.cs
rename to src/Microsoft.AspNetCore.Razor/Parser/SyntaxTree/BlockBuilder.cs
diff --git a/src/Microsoft.AspNet.Razor/Parser/SyntaxTree/BlockType.cs b/src/Microsoft.AspNetCore.Razor/Parser/SyntaxTree/BlockType.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Parser/SyntaxTree/BlockType.cs
rename to src/Microsoft.AspNetCore.Razor/Parser/SyntaxTree/BlockType.cs
diff --git a/src/Microsoft.AspNet.Razor/Parser/SyntaxTree/EquivalenceComparer.cs b/src/Microsoft.AspNetCore.Razor/Parser/SyntaxTree/EquivalenceComparer.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Parser/SyntaxTree/EquivalenceComparer.cs
rename to src/Microsoft.AspNetCore.Razor/Parser/SyntaxTree/EquivalenceComparer.cs
diff --git a/src/Microsoft.AspNet.Razor/Parser/SyntaxTree/Span.cs b/src/Microsoft.AspNetCore.Razor/Parser/SyntaxTree/Span.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Parser/SyntaxTree/Span.cs
rename to src/Microsoft.AspNetCore.Razor/Parser/SyntaxTree/Span.cs
diff --git a/src/Microsoft.AspNet.Razor/Parser/SyntaxTree/SpanBuilder.cs b/src/Microsoft.AspNetCore.Razor/Parser/SyntaxTree/SpanBuilder.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Parser/SyntaxTree/SpanBuilder.cs
rename to src/Microsoft.AspNetCore.Razor/Parser/SyntaxTree/SpanBuilder.cs
diff --git a/src/Microsoft.AspNet.Razor/Parser/SyntaxTree/SpanKind.cs b/src/Microsoft.AspNetCore.Razor/Parser/SyntaxTree/SpanKind.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Parser/SyntaxTree/SpanKind.cs
rename to src/Microsoft.AspNetCore.Razor/Parser/SyntaxTree/SpanKind.cs
diff --git a/src/Microsoft.AspNet.Razor/Parser/SyntaxTree/SyntaxTreeNode.cs b/src/Microsoft.AspNetCore.Razor/Parser/SyntaxTree/SyntaxTreeNode.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Parser/SyntaxTree/SyntaxTreeNode.cs
rename to src/Microsoft.AspNetCore.Razor/Parser/SyntaxTree/SyntaxTreeNode.cs
diff --git a/src/Microsoft.AspNet.Razor/Parser/TagHelpers/TagHelperBlock.cs b/src/Microsoft.AspNetCore.Razor/Parser/TagHelpers/TagHelperBlock.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Parser/TagHelpers/TagHelperBlock.cs
rename to src/Microsoft.AspNetCore.Razor/Parser/TagHelpers/TagHelperBlock.cs
diff --git a/src/Microsoft.AspNet.Razor/Parser/TagHelpers/TagHelperBlockBuilder.cs b/src/Microsoft.AspNetCore.Razor/Parser/TagHelpers/TagHelperBlockBuilder.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Parser/TagHelpers/TagHelperBlockBuilder.cs
rename to src/Microsoft.AspNetCore.Razor/Parser/TagHelpers/TagHelperBlockBuilder.cs
diff --git a/src/Microsoft.AspNet.Razor/Parser/TagHelpers/TagHelperBlockRewriter.cs b/src/Microsoft.AspNetCore.Razor/Parser/TagHelpers/TagHelperBlockRewriter.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Parser/TagHelpers/TagHelperBlockRewriter.cs
rename to src/Microsoft.AspNetCore.Razor/Parser/TagHelpers/TagHelperBlockRewriter.cs
diff --git a/src/Microsoft.AspNet.Razor/Parser/TagHelpers/TagHelperDirectiveSpanVisitor.cs b/src/Microsoft.AspNetCore.Razor/Parser/TagHelpers/TagHelperDirectiveSpanVisitor.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Parser/TagHelpers/TagHelperDirectiveSpanVisitor.cs
rename to src/Microsoft.AspNetCore.Razor/Parser/TagHelpers/TagHelperDirectiveSpanVisitor.cs
diff --git a/src/Microsoft.AspNet.Razor/Parser/TagHelpers/TagHelperParseTreeRewriter.cs b/src/Microsoft.AspNetCore.Razor/Parser/TagHelpers/TagHelperParseTreeRewriter.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Parser/TagHelpers/TagHelperParseTreeRewriter.cs
rename to src/Microsoft.AspNetCore.Razor/Parser/TagHelpers/TagHelperParseTreeRewriter.cs
diff --git a/src/Microsoft.AspNet.Razor/Parser/TextReaderExtensions.cs b/src/Microsoft.AspNetCore.Razor/Parser/TextReaderExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Parser/TextReaderExtensions.cs
rename to src/Microsoft.AspNetCore.Razor/Parser/TextReaderExtensions.cs
diff --git a/src/Microsoft.AspNet.Razor/Parser/TokenizerBackedParser.Helpers.cs b/src/Microsoft.AspNetCore.Razor/Parser/TokenizerBackedParser.Helpers.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Parser/TokenizerBackedParser.Helpers.cs
rename to src/Microsoft.AspNetCore.Razor/Parser/TokenizerBackedParser.Helpers.cs
diff --git a/src/Microsoft.AspNet.Razor/Parser/TokenizerBackedParser.cs b/src/Microsoft.AspNetCore.Razor/Parser/TokenizerBackedParser.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Parser/TokenizerBackedParser.cs
rename to src/Microsoft.AspNetCore.Razor/Parser/TokenizerBackedParser.cs
diff --git a/src/Microsoft.AspNet.Razor/Parser/WhitespaceRewriter.cs b/src/Microsoft.AspNetCore.Razor/Parser/WhitespaceRewriter.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Parser/WhitespaceRewriter.cs
rename to src/Microsoft.AspNetCore.Razor/Parser/WhitespaceRewriter.cs
diff --git a/src/Microsoft.AspNet.Razor/ParserResults.cs b/src/Microsoft.AspNetCore.Razor/ParserResults.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/ParserResults.cs
rename to src/Microsoft.AspNetCore.Razor/ParserResults.cs
diff --git a/src/Microsoft.AspNet.Razor/PartialParseResult.cs b/src/Microsoft.AspNetCore.Razor/PartialParseResult.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/PartialParseResult.cs
rename to src/Microsoft.AspNetCore.Razor/PartialParseResult.cs
diff --git a/src/Microsoft.AspNet.Razor/Properties/AssemblyInfo.cs b/src/Microsoft.AspNetCore.Razor/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Properties/AssemblyInfo.cs
rename to src/Microsoft.AspNetCore.Razor/Properties/AssemblyInfo.cs
diff --git a/src/Microsoft.AspNet.Razor/Properties/CommonResources.Designer.cs b/src/Microsoft.AspNetCore.Razor/Properties/CommonResources.Designer.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Properties/CommonResources.Designer.cs
rename to src/Microsoft.AspNetCore.Razor/Properties/CommonResources.Designer.cs
diff --git a/src/Microsoft.AspNet.Razor/Properties/RazorResources.Designer.cs b/src/Microsoft.AspNetCore.Razor/Properties/RazorResources.Designer.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Properties/RazorResources.Designer.cs
rename to src/Microsoft.AspNetCore.Razor/Properties/RazorResources.Designer.cs
diff --git a/src/Microsoft.AspNet.Razor/RazorCodeLanguage.cs b/src/Microsoft.AspNetCore.Razor/RazorCodeLanguage.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/RazorCodeLanguage.cs
rename to src/Microsoft.AspNetCore.Razor/RazorCodeLanguage.cs
diff --git a/src/Microsoft.AspNet.Razor/RazorDebugHelpers.cs b/src/Microsoft.AspNetCore.Razor/RazorDebugHelpers.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/RazorDebugHelpers.cs
rename to src/Microsoft.AspNetCore.Razor/RazorDebugHelpers.cs
diff --git a/src/Microsoft.AspNet.Razor/RazorEditorParser.cs b/src/Microsoft.AspNetCore.Razor/RazorEditorParser.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/RazorEditorParser.cs
rename to src/Microsoft.AspNetCore.Razor/RazorEditorParser.cs
diff --git a/src/Microsoft.AspNet.Razor/RazorEngineHost.cs b/src/Microsoft.AspNetCore.Razor/RazorEngineHost.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/RazorEngineHost.cs
rename to src/Microsoft.AspNetCore.Razor/RazorEngineHost.cs
diff --git a/src/Microsoft.AspNet.Razor/RazorError.cs b/src/Microsoft.AspNetCore.Razor/RazorError.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/RazorError.cs
rename to src/Microsoft.AspNetCore.Razor/RazorError.cs
diff --git a/src/Microsoft.AspNet.Razor/RazorResources.resx b/src/Microsoft.AspNetCore.Razor/RazorResources.resx
similarity index 100%
rename from src/Microsoft.AspNet.Razor/RazorResources.resx
rename to src/Microsoft.AspNetCore.Razor/RazorResources.resx
diff --git a/src/Microsoft.AspNet.Razor/RazorTemplateEngine.cs b/src/Microsoft.AspNetCore.Razor/RazorTemplateEngine.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/RazorTemplateEngine.cs
rename to src/Microsoft.AspNetCore.Razor/RazorTemplateEngine.cs
diff --git a/src/Microsoft.AspNet.Razor/SourceLocation.cs b/src/Microsoft.AspNetCore.Razor/SourceLocation.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/SourceLocation.cs
rename to src/Microsoft.AspNetCore.Razor/SourceLocation.cs
diff --git a/src/Microsoft.AspNet.Razor/TagHelpers/TagMode.cs b/src/Microsoft.AspNetCore.Razor/TagHelpers/TagMode.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/TagHelpers/TagMode.cs
rename to src/Microsoft.AspNetCore.Razor/TagHelpers/TagMode.cs
diff --git a/src/Microsoft.AspNet.Razor/TagHelpers/TagStructure.cs b/src/Microsoft.AspNetCore.Razor/TagHelpers/TagStructure.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/TagHelpers/TagStructure.cs
rename to src/Microsoft.AspNetCore.Razor/TagHelpers/TagStructure.cs
diff --git a/src/Microsoft.AspNet.Razor/Text/BufferingTextReader.cs b/src/Microsoft.AspNetCore.Razor/Text/BufferingTextReader.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Text/BufferingTextReader.cs
rename to src/Microsoft.AspNetCore.Razor/Text/BufferingTextReader.cs
diff --git a/src/Microsoft.AspNet.Razor/Text/ITextBuffer.cs b/src/Microsoft.AspNetCore.Razor/Text/ITextBuffer.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Text/ITextBuffer.cs
rename to src/Microsoft.AspNetCore.Razor/Text/ITextBuffer.cs
diff --git a/src/Microsoft.AspNet.Razor/Text/LineTrackingStringBuffer.cs b/src/Microsoft.AspNetCore.Razor/Text/LineTrackingStringBuffer.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Text/LineTrackingStringBuffer.cs
rename to src/Microsoft.AspNetCore.Razor/Text/LineTrackingStringBuffer.cs
diff --git a/src/Microsoft.AspNet.Razor/Text/LocationTagged.cs b/src/Microsoft.AspNetCore.Razor/Text/LocationTagged.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Text/LocationTagged.cs
rename to src/Microsoft.AspNetCore.Razor/Text/LocationTagged.cs
diff --git a/src/Microsoft.AspNet.Razor/Text/LookaheadTextReader.cs b/src/Microsoft.AspNetCore.Razor/Text/LookaheadTextReader.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Text/LookaheadTextReader.cs
rename to src/Microsoft.AspNetCore.Razor/Text/LookaheadTextReader.cs
diff --git a/src/Microsoft.AspNet.Razor/Text/LookaheadToken.cs b/src/Microsoft.AspNetCore.Razor/Text/LookaheadToken.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Text/LookaheadToken.cs
rename to src/Microsoft.AspNetCore.Razor/Text/LookaheadToken.cs
diff --git a/src/Microsoft.AspNet.Razor/Text/SeekableTextReader.cs b/src/Microsoft.AspNetCore.Razor/Text/SeekableTextReader.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Text/SeekableTextReader.cs
rename to src/Microsoft.AspNetCore.Razor/Text/SeekableTextReader.cs
diff --git a/src/Microsoft.AspNet.Razor/Text/SourceLocationTracker.cs b/src/Microsoft.AspNetCore.Razor/Text/SourceLocationTracker.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Text/SourceLocationTracker.cs
rename to src/Microsoft.AspNetCore.Razor/Text/SourceLocationTracker.cs
diff --git a/src/Microsoft.AspNet.Razor/Text/SourceSpan.cs b/src/Microsoft.AspNetCore.Razor/Text/SourceSpan.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Text/SourceSpan.cs
rename to src/Microsoft.AspNetCore.Razor/Text/SourceSpan.cs
diff --git a/src/Microsoft.AspNet.Razor/Text/TextBufferReader.cs b/src/Microsoft.AspNetCore.Razor/Text/TextBufferReader.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Text/TextBufferReader.cs
rename to src/Microsoft.AspNetCore.Razor/Text/TextBufferReader.cs
diff --git a/src/Microsoft.AspNet.Razor/Text/TextChange.cs b/src/Microsoft.AspNetCore.Razor/Text/TextChange.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Text/TextChange.cs
rename to src/Microsoft.AspNetCore.Razor/Text/TextChange.cs
diff --git a/src/Microsoft.AspNet.Razor/Text/TextChangeType.cs b/src/Microsoft.AspNetCore.Razor/Text/TextChangeType.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Text/TextChangeType.cs
rename to src/Microsoft.AspNetCore.Razor/Text/TextChangeType.cs
diff --git a/src/Microsoft.AspNet.Razor/Text/TextDocumentReader.cs b/src/Microsoft.AspNetCore.Razor/Text/TextDocumentReader.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Text/TextDocumentReader.cs
rename to src/Microsoft.AspNetCore.Razor/Text/TextDocumentReader.cs
diff --git a/src/Microsoft.AspNet.Razor/Text/TextExtensions.cs b/src/Microsoft.AspNetCore.Razor/Text/TextExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Text/TextExtensions.cs
rename to src/Microsoft.AspNetCore.Razor/Text/TextExtensions.cs
diff --git a/src/Microsoft.AspNet.Razor/Tokenizer/CSharpHelpers.cs b/src/Microsoft.AspNetCore.Razor/Tokenizer/CSharpHelpers.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Tokenizer/CSharpHelpers.cs
rename to src/Microsoft.AspNetCore.Razor/Tokenizer/CSharpHelpers.cs
diff --git a/src/Microsoft.AspNet.Razor/Tokenizer/CSharpKeywordDetector.cs b/src/Microsoft.AspNetCore.Razor/Tokenizer/CSharpKeywordDetector.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Tokenizer/CSharpKeywordDetector.cs
rename to src/Microsoft.AspNetCore.Razor/Tokenizer/CSharpKeywordDetector.cs
diff --git a/src/Microsoft.AspNet.Razor/Tokenizer/CSharpTokenizer.cs b/src/Microsoft.AspNetCore.Razor/Tokenizer/CSharpTokenizer.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Tokenizer/CSharpTokenizer.cs
rename to src/Microsoft.AspNetCore.Razor/Tokenizer/CSharpTokenizer.cs
diff --git a/src/Microsoft.AspNet.Razor/Tokenizer/HtmlTokenizer.cs b/src/Microsoft.AspNetCore.Razor/Tokenizer/HtmlTokenizer.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Tokenizer/HtmlTokenizer.cs
rename to src/Microsoft.AspNetCore.Razor/Tokenizer/HtmlTokenizer.cs
diff --git a/src/Microsoft.AspNet.Razor/Tokenizer/ITokenizer.cs b/src/Microsoft.AspNetCore.Razor/Tokenizer/ITokenizer.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Tokenizer/ITokenizer.cs
rename to src/Microsoft.AspNetCore.Razor/Tokenizer/ITokenizer.cs
diff --git a/src/Microsoft.AspNet.Razor/Tokenizer/Symbols/CSharpKeyword.cs b/src/Microsoft.AspNetCore.Razor/Tokenizer/Symbols/CSharpKeyword.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Tokenizer/Symbols/CSharpKeyword.cs
rename to src/Microsoft.AspNetCore.Razor/Tokenizer/Symbols/CSharpKeyword.cs
diff --git a/src/Microsoft.AspNet.Razor/Tokenizer/Symbols/CSharpSymbol.cs b/src/Microsoft.AspNetCore.Razor/Tokenizer/Symbols/CSharpSymbol.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Tokenizer/Symbols/CSharpSymbol.cs
rename to src/Microsoft.AspNetCore.Razor/Tokenizer/Symbols/CSharpSymbol.cs
diff --git a/src/Microsoft.AspNet.Razor/Tokenizer/Symbols/CSharpSymbolType.cs b/src/Microsoft.AspNetCore.Razor/Tokenizer/Symbols/CSharpSymbolType.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Tokenizer/Symbols/CSharpSymbolType.cs
rename to src/Microsoft.AspNetCore.Razor/Tokenizer/Symbols/CSharpSymbolType.cs
diff --git a/src/Microsoft.AspNet.Razor/Tokenizer/Symbols/HtmlSymbol.cs b/src/Microsoft.AspNetCore.Razor/Tokenizer/Symbols/HtmlSymbol.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Tokenizer/Symbols/HtmlSymbol.cs
rename to src/Microsoft.AspNetCore.Razor/Tokenizer/Symbols/HtmlSymbol.cs
diff --git a/src/Microsoft.AspNet.Razor/Tokenizer/Symbols/HtmlSymbolType.cs b/src/Microsoft.AspNetCore.Razor/Tokenizer/Symbols/HtmlSymbolType.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Tokenizer/Symbols/HtmlSymbolType.cs
rename to src/Microsoft.AspNetCore.Razor/Tokenizer/Symbols/HtmlSymbolType.cs
diff --git a/src/Microsoft.AspNet.Razor/Tokenizer/Symbols/ISymbol.cs b/src/Microsoft.AspNetCore.Razor/Tokenizer/Symbols/ISymbol.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Tokenizer/Symbols/ISymbol.cs
rename to src/Microsoft.AspNetCore.Razor/Tokenizer/Symbols/ISymbol.cs
diff --git a/src/Microsoft.AspNet.Razor/Tokenizer/Symbols/KnownSymbolType.cs b/src/Microsoft.AspNetCore.Razor/Tokenizer/Symbols/KnownSymbolType.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Tokenizer/Symbols/KnownSymbolType.cs
rename to src/Microsoft.AspNetCore.Razor/Tokenizer/Symbols/KnownSymbolType.cs
diff --git a/src/Microsoft.AspNet.Razor/Tokenizer/Symbols/SymbolBase.cs b/src/Microsoft.AspNetCore.Razor/Tokenizer/Symbols/SymbolBase.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Tokenizer/Symbols/SymbolBase.cs
rename to src/Microsoft.AspNetCore.Razor/Tokenizer/Symbols/SymbolBase.cs
diff --git a/src/Microsoft.AspNet.Razor/Tokenizer/Symbols/SymbolExtensions.cs b/src/Microsoft.AspNetCore.Razor/Tokenizer/Symbols/SymbolExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Tokenizer/Symbols/SymbolExtensions.cs
rename to src/Microsoft.AspNetCore.Razor/Tokenizer/Symbols/SymbolExtensions.cs
diff --git a/src/Microsoft.AspNet.Razor/Tokenizer/Tokenizer.cs b/src/Microsoft.AspNetCore.Razor/Tokenizer/Tokenizer.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Tokenizer/Tokenizer.cs
rename to src/Microsoft.AspNetCore.Razor/Tokenizer/Tokenizer.cs
diff --git a/src/Microsoft.AspNet.Razor/Tokenizer/TokenizerView.cs b/src/Microsoft.AspNetCore.Razor/Tokenizer/TokenizerView.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Tokenizer/TokenizerView.cs
rename to src/Microsoft.AspNetCore.Razor/Tokenizer/TokenizerView.cs
diff --git a/src/Microsoft.AspNet.Razor/Tokenizer/XmlHelpers.cs b/src/Microsoft.AspNetCore.Razor/Tokenizer/XmlHelpers.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Tokenizer/XmlHelpers.cs
rename to src/Microsoft.AspNetCore.Razor/Tokenizer/XmlHelpers.cs
diff --git a/src/Microsoft.AspNet.Razor/Utils/CharUtils.cs b/src/Microsoft.AspNetCore.Razor/Utils/CharUtils.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Utils/CharUtils.cs
rename to src/Microsoft.AspNetCore.Razor/Utils/CharUtils.cs
diff --git a/src/Microsoft.AspNet.Razor/Utils/DisposableAction.cs b/src/Microsoft.AspNetCore.Razor/Utils/DisposableAction.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Utils/DisposableAction.cs
rename to src/Microsoft.AspNetCore.Razor/Utils/DisposableAction.cs
diff --git a/src/Microsoft.AspNet.Razor/Utils/EnumUtil.cs b/src/Microsoft.AspNetCore.Razor/Utils/EnumUtil.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Utils/EnumUtil.cs
rename to src/Microsoft.AspNetCore.Razor/Utils/EnumUtil.cs
diff --git a/src/Microsoft.AspNet.Razor/Utils/EnumeratorExtensions.cs b/src/Microsoft.AspNetCore.Razor/Utils/EnumeratorExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNet.Razor/Utils/EnumeratorExtensions.cs
rename to src/Microsoft.AspNetCore.Razor/Utils/EnumeratorExtensions.cs
diff --git a/src/Microsoft.AspNet.Razor/project.json b/src/Microsoft.AspNetCore.Razor/project.json
similarity index 100%
rename from src/Microsoft.AspNet.Razor/project.json
rename to src/Microsoft.AspNetCore.Razor/project.json
diff --git a/test/Microsoft.AspNet.Razor.Runtime.Test/Microsoft.AspNet.Razor.Runtime.Test.xproj b/test/Microsoft.AspNetCore.Razor.Runtime.Test/Microsoft.AspNetCore.Razor.Runtime.Test.xproj
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Runtime.Test/Microsoft.AspNet.Razor.Runtime.Test.xproj
rename to test/Microsoft.AspNetCore.Razor.Runtime.Test/Microsoft.AspNetCore.Razor.Runtime.Test.xproj
diff --git a/test/Microsoft.AspNet.Razor.Runtime.Test/Runtime/TagHelpers/CaseSensitiveTagHelperAttributeComparer.cs b/test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/CaseSensitiveTagHelperAttributeComparer.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Runtime.Test/Runtime/TagHelpers/CaseSensitiveTagHelperAttributeComparer.cs
rename to test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/CaseSensitiveTagHelperAttributeComparer.cs
diff --git a/test/Microsoft.AspNet.Razor.Runtime.Test/Runtime/TagHelpers/TagHelperDescriptorFactoryTest.cs b/test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/TagHelperDescriptorFactoryTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Runtime.Test/Runtime/TagHelpers/TagHelperDescriptorFactoryTest.cs
rename to test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/TagHelperDescriptorFactoryTest.cs
diff --git a/test/Microsoft.AspNet.Razor.Runtime.Test/Runtime/TagHelpers/TagHelperDescriptorResolverTest.cs b/test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/TagHelperDescriptorResolverTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Runtime.Test/Runtime/TagHelpers/TagHelperDescriptorResolverTest.cs
rename to test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/TagHelperDescriptorResolverTest.cs
diff --git a/test/Microsoft.AspNet.Razor.Runtime.Test/Runtime/TagHelpers/TagHelperDesignTimeDescriptorFactoryTest.cs b/test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/TagHelperDesignTimeDescriptorFactoryTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Runtime.Test/Runtime/TagHelpers/TagHelperDesignTimeDescriptorFactoryTest.cs
rename to test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/TagHelperDesignTimeDescriptorFactoryTest.cs
diff --git a/test/Microsoft.AspNet.Razor.Runtime.Test/Runtime/TagHelpers/TagHelperExecutionContextTest.cs b/test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/TagHelperExecutionContextTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Runtime.Test/Runtime/TagHelpers/TagHelperExecutionContextTest.cs
rename to test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/TagHelperExecutionContextTest.cs
diff --git a/test/Microsoft.AspNet.Razor.Runtime.Test/Runtime/TagHelpers/TagHelperRunnerTest.cs b/test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/TagHelperRunnerTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Runtime.Test/Runtime/TagHelpers/TagHelperRunnerTest.cs
rename to test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/TagHelperRunnerTest.cs
diff --git a/test/Microsoft.AspNet.Razor.Runtime.Test/Runtime/TagHelpers/TagHelperScopeManagerTest.cs b/test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/TagHelperScopeManagerTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Runtime.Test/Runtime/TagHelpers/TagHelperScopeManagerTest.cs
rename to test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/TagHelperScopeManagerTest.cs
diff --git a/test/Microsoft.AspNet.Razor.Runtime.Test/Runtime/TagHelpers/TagHelperTypeResolverTest.cs b/test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/TagHelperTypeResolverTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Runtime.Test/Runtime/TagHelpers/TagHelperTypeResolverTest.cs
rename to test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/TagHelperTypeResolverTest.cs
diff --git a/test/Microsoft.AspNet.Razor.Runtime.Test/Runtime/TagHelpers/TestTagHelpers/CommonTagHelpers.cs b/test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/TestTagHelpers/CommonTagHelpers.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Runtime.Test/Runtime/TagHelpers/TestTagHelpers/CommonTagHelpers.cs
rename to test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/TestTagHelpers/CommonTagHelpers.cs
diff --git a/test/Microsoft.AspNet.Razor.Runtime.Test/Runtime/TagHelpers/TestTagHelpers/TagHelperDescriptorFactoryTagHelpers.cs b/test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/TestTagHelpers/TagHelperDescriptorFactoryTagHelpers.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Runtime.Test/Runtime/TagHelpers/TestTagHelpers/TagHelperDescriptorFactoryTagHelpers.cs
rename to test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/TestTagHelpers/TagHelperDescriptorFactoryTagHelpers.cs
diff --git a/test/Microsoft.AspNet.Razor.Runtime.Test/Runtime/TagHelpers/XmlDocumentationProviderTest.cs b/test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/XmlDocumentationProviderTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Runtime.Test/Runtime/TagHelpers/XmlDocumentationProviderTest.cs
rename to test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/XmlDocumentationProviderTest.cs
diff --git a/test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/DefaultTagHelperContentTest.cs b/test/Microsoft.AspNetCore.Razor.Runtime.Test/TagHelpers/DefaultTagHelperContentTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/DefaultTagHelperContentTest.cs
rename to test/Microsoft.AspNetCore.Razor.Runtime.Test/TagHelpers/DefaultTagHelperContentTest.cs
diff --git a/test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/NullHtmlEncoderTest.cs b/test/Microsoft.AspNetCore.Razor.Runtime.Test/TagHelpers/NullHtmlEncoderTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/NullHtmlEncoderTest.cs
rename to test/Microsoft.AspNetCore.Razor.Runtime.Test/TagHelpers/NullHtmlEncoderTest.cs
diff --git a/test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/ReadOnlyTagHelperAttributeListTest.cs b/test/Microsoft.AspNetCore.Razor.Runtime.Test/TagHelpers/ReadOnlyTagHelperAttributeListTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/ReadOnlyTagHelperAttributeListTest.cs
rename to test/Microsoft.AspNetCore.Razor.Runtime.Test/TagHelpers/ReadOnlyTagHelperAttributeListTest.cs
diff --git a/test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/TagHelperAttributeListTest.cs b/test/Microsoft.AspNetCore.Razor.Runtime.Test/TagHelpers/TagHelperAttributeListTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/TagHelperAttributeListTest.cs
rename to test/Microsoft.AspNetCore.Razor.Runtime.Test/TagHelpers/TagHelperAttributeListTest.cs
diff --git a/test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/TagHelperAttributeTest.cs b/test/Microsoft.AspNetCore.Razor.Runtime.Test/TagHelpers/TagHelperAttributeTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/TagHelperAttributeTest.cs
rename to test/Microsoft.AspNetCore.Razor.Runtime.Test/TagHelpers/TagHelperAttributeTest.cs
diff --git a/test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/TagHelperContextTest.cs b/test/Microsoft.AspNetCore.Razor.Runtime.Test/TagHelpers/TagHelperContextTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/TagHelperContextTest.cs
rename to test/Microsoft.AspNetCore.Razor.Runtime.Test/TagHelpers/TagHelperContextTest.cs
diff --git a/test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/TagHelperOutputTest.cs b/test/Microsoft.AspNetCore.Razor.Runtime.Test/TagHelpers/TagHelperOutputTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Runtime.Test/TagHelpers/TagHelperOutputTest.cs
rename to test/Microsoft.AspNetCore.Razor.Runtime.Test/TagHelpers/TagHelperOutputTest.cs
diff --git a/test/Microsoft.AspNet.Razor.Runtime.Test/TestFiles/Localized/TagHelperDocumentation.nl-BE.xml b/test/Microsoft.AspNetCore.Razor.Runtime.Test/TestFiles/Localized/TagHelperDocumentation.nl-BE.xml
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Runtime.Test/TestFiles/Localized/TagHelperDocumentation.nl-BE.xml
rename to test/Microsoft.AspNetCore.Razor.Runtime.Test/TestFiles/Localized/TagHelperDocumentation.nl-BE.xml
diff --git a/test/Microsoft.AspNet.Razor.Runtime.Test/TestFiles/Localized/en-GB/TagHelperDocumentation.xml b/test/Microsoft.AspNetCore.Razor.Runtime.Test/TestFiles/Localized/en-GB/TagHelperDocumentation.xml
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Runtime.Test/TestFiles/Localized/en-GB/TagHelperDocumentation.xml
rename to test/Microsoft.AspNetCore.Razor.Runtime.Test/TestFiles/Localized/en-GB/TagHelperDocumentation.xml
diff --git a/test/Microsoft.AspNet.Razor.Runtime.Test/TestFiles/Localized/en/TagHelperDocumentation.xml b/test/Microsoft.AspNetCore.Razor.Runtime.Test/TestFiles/Localized/en/TagHelperDocumentation.xml
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Runtime.Test/TestFiles/Localized/en/TagHelperDocumentation.xml
rename to test/Microsoft.AspNetCore.Razor.Runtime.Test/TestFiles/Localized/en/TagHelperDocumentation.xml
diff --git a/test/Microsoft.AspNet.Razor.Runtime.Test/TestFiles/Localized/fr-FR/TagHelperDocumentation.fr-FR.xml b/test/Microsoft.AspNetCore.Razor.Runtime.Test/TestFiles/Localized/fr-FR/TagHelperDocumentation.fr-FR.xml
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Runtime.Test/TestFiles/Localized/fr-FR/TagHelperDocumentation.fr-FR.xml
rename to test/Microsoft.AspNetCore.Razor.Runtime.Test/TestFiles/Localized/fr-FR/TagHelperDocumentation.fr-FR.xml
diff --git a/test/Microsoft.AspNet.Razor.Runtime.Test/TestFiles/Localized/fr/TagHelperDocumentation.fr.xml b/test/Microsoft.AspNetCore.Razor.Runtime.Test/TestFiles/Localized/fr/TagHelperDocumentation.fr.xml
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Runtime.Test/TestFiles/Localized/fr/TagHelperDocumentation.fr.xml
rename to test/Microsoft.AspNetCore.Razor.Runtime.Test/TestFiles/Localized/fr/TagHelperDocumentation.fr.xml
diff --git a/test/Microsoft.AspNet.Razor.Runtime.Test/TestFiles/NotLocalized/TagHelperDocumentation.xml b/test/Microsoft.AspNetCore.Razor.Runtime.Test/TestFiles/NotLocalized/TagHelperDocumentation.xml
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Runtime.Test/TestFiles/NotLocalized/TagHelperDocumentation.xml
rename to test/Microsoft.AspNetCore.Razor.Runtime.Test/TestFiles/NotLocalized/TagHelperDocumentation.xml
diff --git a/test/Microsoft.AspNet.Razor.Runtime.Test/project.json b/test/Microsoft.AspNetCore.Razor.Runtime.Test/project.json
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Runtime.Test/project.json
rename to test/Microsoft.AspNetCore.Razor.Runtime.Test/project.json
diff --git a/test/Microsoft.AspNet.Razor.Test/CSharpRazorCodeLanguageTest.cs b/test/Microsoft.AspNetCore.Razor.Test/CSharpRazorCodeLanguageTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/CSharpRazorCodeLanguageTest.cs
rename to test/Microsoft.AspNetCore.Razor.Test/CSharpRazorCodeLanguageTest.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/Chunks/Generators/AttributeBlockChunkGeneratorTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Chunks/Generators/AttributeBlockChunkGeneratorTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/Chunks/Generators/AttributeBlockChunkGeneratorTest.cs
rename to test/Microsoft.AspNetCore.Razor.Test/Chunks/Generators/AttributeBlockChunkGeneratorTest.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/Chunks/Generators/ChunkTreeBuilderTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Chunks/Generators/ChunkTreeBuilderTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/Chunks/Generators/ChunkTreeBuilderTest.cs
rename to test/Microsoft.AspNetCore.Razor.Test/Chunks/Generators/ChunkTreeBuilderTest.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/Chunks/Generators/ChunkVisitorTests.cs b/test/Microsoft.AspNetCore.Razor.Test/Chunks/Generators/ChunkVisitorTests.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/Chunks/Generators/ChunkVisitorTests.cs
rename to test/Microsoft.AspNetCore.Razor.Test/Chunks/Generators/ChunkVisitorTests.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/CodeGenerators/AddImportChunkGeneratorTest.cs b/test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/AddImportChunkGeneratorTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/CodeGenerators/AddImportChunkGeneratorTest.cs
rename to test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/AddImportChunkGeneratorTest.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/CodeGenerators/CSharpCodeGeneratorTest.cs b/test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/CSharpCodeGeneratorTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/CodeGenerators/CSharpCodeGeneratorTest.cs
rename to test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/CSharpCodeGeneratorTest.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/CodeGenerators/CSharpCodeWriterTest.cs b/test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/CSharpCodeWriterTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/CodeGenerators/CSharpCodeWriterTest.cs
rename to test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/CSharpCodeWriterTest.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/CodeGenerators/CSharpLineMappingWriterTest.cs b/test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/CSharpLineMappingWriterTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/CodeGenerators/CSharpLineMappingWriterTest.cs
rename to test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/CSharpLineMappingWriterTest.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/CodeGenerators/CSharpPaddingBuilderTests.cs b/test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/CSharpPaddingBuilderTests.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/CodeGenerators/CSharpPaddingBuilderTests.cs
rename to test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/CSharpPaddingBuilderTests.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/CodeGenerators/CSharpRazorChunkGeneratorTest.cs b/test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/CSharpRazorChunkGeneratorTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/CodeGenerators/CSharpRazorChunkGeneratorTest.cs
rename to test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/CSharpRazorChunkGeneratorTest.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/CodeGenerators/CSharpTagHelperRenderingTest.cs b/test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/CSharpTagHelperRenderingTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/CodeGenerators/CSharpTagHelperRenderingTest.cs
rename to test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/CSharpTagHelperRenderingTest.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/CodeGenerators/CSharpTagHelperRenderingUnitTest.cs b/test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/CSharpTagHelperRenderingUnitTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/CodeGenerators/CSharpTagHelperRenderingUnitTest.cs
rename to test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/CSharpTagHelperRenderingUnitTest.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/CodeGenerators/CodeGenTestCodeGenerator.cs b/test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/CodeGenTestCodeGenerator.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/CodeGenerators/CodeGenTestCodeGenerator.cs
rename to test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/CodeGenTestCodeGenerator.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/CodeGenerators/CodeGenTestHost.cs b/test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/CodeGenTestHost.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/CodeGenerators/CodeGenTestHost.cs
rename to test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/CodeGenTestHost.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/CodeGenerators/CodeWriterTest.cs b/test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/CodeWriterTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/CodeGenerators/CodeWriterTest.cs
rename to test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/CodeWriterTest.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/CodeGenerators/DynamicAttributeBlockChunkGeneratorTest.cs b/test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/DynamicAttributeBlockChunkGeneratorTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/CodeGenerators/DynamicAttributeBlockChunkGeneratorTest.cs
rename to test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/DynamicAttributeBlockChunkGeneratorTest.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/CodeGenerators/LineMappingTest.cs b/test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/LineMappingTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/CodeGenerators/LineMappingTest.cs
rename to test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/LineMappingTest.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/CodeGenerators/RazorChunkGeneratorTest.cs b/test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/RazorChunkGeneratorTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/CodeGenerators/RazorChunkGeneratorTest.cs
rename to test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/RazorChunkGeneratorTest.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/CodeGenerators/RazorCommentChunkGeneratorTest.cs b/test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/RazorCommentChunkGeneratorTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/CodeGenerators/RazorCommentChunkGeneratorTest.cs
rename to test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/RazorCommentChunkGeneratorTest.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/CodeGenerators/TabTest.cs b/test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/TabTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/CodeGenerators/TabTest.cs
rename to test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/TabTest.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/CodeGenerators/TagHelperAttributeValueCodeRendererTest.cs b/test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/TagHelperAttributeValueCodeRendererTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/CodeGenerators/TagHelperAttributeValueCodeRendererTest.cs
rename to test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/TagHelperAttributeValueCodeRendererTest.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/CodeGenerators/TagHelperTestBase.cs b/test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/TagHelperTestBase.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/CodeGenerators/TagHelperTestBase.cs
rename to test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/TagHelperTestBase.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/CodeGenerators/TestSpan.cs b/test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/TestSpan.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/CodeGenerators/TestSpan.cs
rename to test/Microsoft.AspNetCore.Razor.Test/CodeGenerators/TestSpan.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/Editor/AutoCompleteEditHandlerTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Editor/AutoCompleteEditHandlerTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/Editor/AutoCompleteEditHandlerTest.cs
rename to test/Microsoft.AspNetCore.Razor.Test/Editor/AutoCompleteEditHandlerTest.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/Editor/ImplicitExpressionEditHandlerTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Editor/ImplicitExpressionEditHandlerTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/Editor/ImplicitExpressionEditHandlerTest.cs
rename to test/Microsoft.AspNetCore.Razor.Test/Editor/ImplicitExpressionEditHandlerTest.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/Editor/RazorEditorParserTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Editor/RazorEditorParserTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/Editor/RazorEditorParserTest.cs
rename to test/Microsoft.AspNetCore.Razor.Test/Editor/RazorEditorParserTest.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/Editor/SpanEditHandlerTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Editor/SpanEditHandlerTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/Editor/SpanEditHandlerTest.cs
rename to test/Microsoft.AspNetCore.Razor.Test/Editor/SpanEditHandlerTest.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/Framework/BlockExtensions.cs b/test/Microsoft.AspNetCore.Razor.Test/Framework/BlockExtensions.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/Framework/BlockExtensions.cs
rename to test/Microsoft.AspNetCore.Razor.Test/Framework/BlockExtensions.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/Framework/BlockFactory.cs b/test/Microsoft.AspNetCore.Razor.Test/Framework/BlockFactory.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/Framework/BlockFactory.cs
rename to test/Microsoft.AspNetCore.Razor.Test/Framework/BlockFactory.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/Framework/BlockTypes.cs b/test/Microsoft.AspNetCore.Razor.Test/Framework/BlockTypes.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/Framework/BlockTypes.cs
rename to test/Microsoft.AspNetCore.Razor.Test/Framework/BlockTypes.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/Framework/CodeParserTestBase.cs b/test/Microsoft.AspNetCore.Razor.Test/Framework/CodeParserTestBase.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/Framework/CodeParserTestBase.cs
rename to test/Microsoft.AspNetCore.Razor.Test/Framework/CodeParserTestBase.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/Framework/CsHtmlCodeParserTestBase.cs b/test/Microsoft.AspNetCore.Razor.Test/Framework/CsHtmlCodeParserTestBase.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/Framework/CsHtmlCodeParserTestBase.cs
rename to test/Microsoft.AspNetCore.Razor.Test/Framework/CsHtmlCodeParserTestBase.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/Framework/CsHtmlMarkupParserTestBase.cs b/test/Microsoft.AspNetCore.Razor.Test/Framework/CsHtmlMarkupParserTestBase.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/Framework/CsHtmlMarkupParserTestBase.cs
rename to test/Microsoft.AspNetCore.Razor.Test/Framework/CsHtmlMarkupParserTestBase.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/Framework/ErrorCollector.cs b/test/Microsoft.AspNetCore.Razor.Test/Framework/ErrorCollector.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/Framework/ErrorCollector.cs
rename to test/Microsoft.AspNetCore.Razor.Test/Framework/ErrorCollector.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/Framework/MarkupParserTestBase.cs b/test/Microsoft.AspNetCore.Razor.Test/Framework/MarkupParserTestBase.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/Framework/MarkupParserTestBase.cs
rename to test/Microsoft.AspNetCore.Razor.Test/Framework/MarkupParserTestBase.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/Framework/ParserTestBase.cs b/test/Microsoft.AspNetCore.Razor.Test/Framework/ParserTestBase.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/Framework/ParserTestBase.cs
rename to test/Microsoft.AspNetCore.Razor.Test/Framework/ParserTestBase.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/Framework/RawTextSymbol.cs b/test/Microsoft.AspNetCore.Razor.Test/Framework/RawTextSymbol.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/Framework/RawTextSymbol.cs
rename to test/Microsoft.AspNetCore.Razor.Test/Framework/RawTextSymbol.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/Framework/TestSpanBuilder.cs b/test/Microsoft.AspNetCore.Razor.Test/Framework/TestSpanBuilder.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/Framework/TestSpanBuilder.cs
rename to test/Microsoft.AspNetCore.Razor.Test/Framework/TestSpanBuilder.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/Microsoft.AspNet.Razor.Test.xproj b/test/Microsoft.AspNetCore.Razor.Test/Microsoft.AspNetCore.Razor.Test.xproj
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/Microsoft.AspNet.Razor.Test.xproj
rename to test/Microsoft.AspNetCore.Razor.Test/Microsoft.AspNetCore.Razor.Test.xproj
diff --git a/test/Microsoft.AspNet.Razor.Test/Parser/BlockTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Parser/BlockTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/Parser/BlockTest.cs
rename to test/Microsoft.AspNetCore.Razor.Test/Parser/BlockTest.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/Parser/CSharp/CSharpAutoCompleteTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpAutoCompleteTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/Parser/CSharp/CSharpAutoCompleteTest.cs
rename to test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpAutoCompleteTest.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/Parser/CSharp/CSharpBlockTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpBlockTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/Parser/CSharp/CSharpBlockTest.cs
rename to test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpBlockTest.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/Parser/CSharp/CSharpDirectivesTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpDirectivesTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/Parser/CSharp/CSharpDirectivesTest.cs
rename to test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpDirectivesTest.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/Parser/CSharp/CSharpErrorTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpErrorTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/Parser/CSharp/CSharpErrorTest.cs
rename to test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpErrorTest.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/Parser/CSharp/CSharpExplicitExpressionTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpExplicitExpressionTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/Parser/CSharp/CSharpExplicitExpressionTest.cs
rename to test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpExplicitExpressionTest.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/Parser/CSharp/CSharpImplicitExpressionTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpImplicitExpressionTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/Parser/CSharp/CSharpImplicitExpressionTest.cs
rename to test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpImplicitExpressionTest.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/Parser/CSharp/CSharpNestedStatementsTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpNestedStatementsTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/Parser/CSharp/CSharpNestedStatementsTest.cs
rename to test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpNestedStatementsTest.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/Parser/CSharp/CSharpRazorCommentsTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpRazorCommentsTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/Parser/CSharp/CSharpRazorCommentsTest.cs
rename to test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpRazorCommentsTest.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/Parser/CSharp/CSharpReservedWordsTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpReservedWordsTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/Parser/CSharp/CSharpReservedWordsTest.cs
rename to test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpReservedWordsTest.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/Parser/CSharp/CSharpSectionTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpSectionTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/Parser/CSharp/CSharpSectionTest.cs
rename to test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpSectionTest.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/Parser/CSharp/CSharpSpecialBlockTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpSpecialBlockTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/Parser/CSharp/CSharpSpecialBlockTest.cs
rename to test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpSpecialBlockTest.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/Parser/CSharp/CSharpStatementTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpStatementTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/Parser/CSharp/CSharpStatementTest.cs
rename to test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpStatementTest.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/Parser/CSharp/CSharpTemplateTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpTemplateTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/Parser/CSharp/CSharpTemplateTest.cs
rename to test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpTemplateTest.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/Parser/CSharp/CSharpToMarkupSwitchTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpToMarkupSwitchTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/Parser/CSharp/CSharpToMarkupSwitchTest.cs
rename to test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpToMarkupSwitchTest.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/Parser/CSharp/CSharpVerbatimBlockTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpVerbatimBlockTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/Parser/CSharp/CSharpVerbatimBlockTest.cs
rename to test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpVerbatimBlockTest.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/Parser/CSharp/CSharpWhitespaceHandlingTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpWhitespaceHandlingTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/Parser/CSharp/CSharpWhitespaceHandlingTest.cs
rename to test/Microsoft.AspNetCore.Razor.Test/Parser/CSharp/CSharpWhitespaceHandlingTest.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/Parser/CallbackParserListenerTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Parser/CallbackParserListenerTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/Parser/CallbackParserListenerTest.cs
rename to test/Microsoft.AspNetCore.Razor.Test/Parser/CallbackParserListenerTest.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/Parser/Html/HtmlAttributeTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Parser/Html/HtmlAttributeTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/Parser/Html/HtmlAttributeTest.cs
rename to test/Microsoft.AspNetCore.Razor.Test/Parser/Html/HtmlAttributeTest.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/Parser/Html/HtmlBlockTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Parser/Html/HtmlBlockTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/Parser/Html/HtmlBlockTest.cs
rename to test/Microsoft.AspNetCore.Razor.Test/Parser/Html/HtmlBlockTest.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/Parser/Html/HtmlDocumentTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Parser/Html/HtmlDocumentTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/Parser/Html/HtmlDocumentTest.cs
rename to test/Microsoft.AspNetCore.Razor.Test/Parser/Html/HtmlDocumentTest.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/Parser/Html/HtmlErrorTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Parser/Html/HtmlErrorTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/Parser/Html/HtmlErrorTest.cs
rename to test/Microsoft.AspNetCore.Razor.Test/Parser/Html/HtmlErrorTest.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/Parser/Html/HtmlParserTestUtils.cs b/test/Microsoft.AspNetCore.Razor.Test/Parser/Html/HtmlParserTestUtils.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/Parser/Html/HtmlParserTestUtils.cs
rename to test/Microsoft.AspNetCore.Razor.Test/Parser/Html/HtmlParserTestUtils.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/Parser/Html/HtmlTagsTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Parser/Html/HtmlTagsTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/Parser/Html/HtmlTagsTest.cs
rename to test/Microsoft.AspNetCore.Razor.Test/Parser/Html/HtmlTagsTest.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/Parser/Html/HtmlToCodeSwitchTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Parser/Html/HtmlToCodeSwitchTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/Parser/Html/HtmlToCodeSwitchTest.cs
rename to test/Microsoft.AspNetCore.Razor.Test/Parser/Html/HtmlToCodeSwitchTest.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/Parser/ParserContextTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Parser/ParserContextTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/Parser/ParserContextTest.cs
rename to test/Microsoft.AspNetCore.Razor.Test/Parser/ParserContextTest.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/Parser/ParserVisitorExtensionsTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Parser/ParserVisitorExtensionsTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/Parser/ParserVisitorExtensionsTest.cs
rename to test/Microsoft.AspNetCore.Razor.Test/Parser/ParserVisitorExtensionsTest.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/Parser/PartialParsing/CSharpPartialParsingTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Parser/PartialParsing/CSharpPartialParsingTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/Parser/PartialParsing/CSharpPartialParsingTest.cs
rename to test/Microsoft.AspNetCore.Razor.Test/Parser/PartialParsing/CSharpPartialParsingTest.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/Parser/PartialParsing/PartialParsingTestBase.cs b/test/Microsoft.AspNetCore.Razor.Test/Parser/PartialParsing/PartialParsingTestBase.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/Parser/PartialParsing/PartialParsingTestBase.cs
rename to test/Microsoft.AspNetCore.Razor.Test/Parser/PartialParsing/PartialParsingTestBase.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/Parser/RazorParserTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Parser/RazorParserTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/Parser/RazorParserTest.cs
rename to test/Microsoft.AspNetCore.Razor.Test/Parser/RazorParserTest.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/Parser/TagHelperBlockTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Parser/TagHelperBlockTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/Parser/TagHelperBlockTest.cs
rename to test/Microsoft.AspNetCore.Razor.Test/Parser/TagHelperBlockTest.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/Parser/WhitespaceRewriterTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Parser/WhitespaceRewriterTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/Parser/WhitespaceRewriterTest.cs
rename to test/Microsoft.AspNetCore.Razor.Test/Parser/WhitespaceRewriterTest.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/RazorCodeLanguageTest.cs b/test/Microsoft.AspNetCore.Razor.Test/RazorCodeLanguageTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/RazorCodeLanguageTest.cs
rename to test/Microsoft.AspNetCore.Razor.Test/RazorCodeLanguageTest.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/RazorEngineHostTest.cs b/test/Microsoft.AspNetCore.Razor.Test/RazorEngineHostTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/RazorEngineHostTest.cs
rename to test/Microsoft.AspNetCore.Razor.Test/RazorEngineHostTest.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/RazorErrorTest.cs b/test/Microsoft.AspNetCore.Razor.Test/RazorErrorTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/RazorErrorTest.cs
rename to test/Microsoft.AspNetCore.Razor.Test/RazorErrorTest.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/RazorTemplateEngineTest.cs b/test/Microsoft.AspNetCore.Razor.Test/RazorTemplateEngineTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/RazorTemplateEngineTest.cs
rename to test/Microsoft.AspNetCore.Razor.Test/RazorTemplateEngineTest.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/SourceLocationTest.cs b/test/Microsoft.AspNetCore.Razor.Test/SourceLocationTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/SourceLocationTest.cs
rename to test/Microsoft.AspNetCore.Razor.Test/SourceLocationTest.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/StringTextBuffer.cs b/test/Microsoft.AspNetCore.Razor.Test/StringTextBuffer.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/StringTextBuffer.cs
rename to test/Microsoft.AspNetCore.Razor.Test/StringTextBuffer.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/TagHelpers/TagHelperBlockRewriterTest.cs b/test/Microsoft.AspNetCore.Razor.Test/TagHelpers/TagHelperBlockRewriterTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TagHelpers/TagHelperBlockRewriterTest.cs
rename to test/Microsoft.AspNetCore.Razor.Test/TagHelpers/TagHelperBlockRewriterTest.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/TagHelpers/TagHelperDescriptorProviderTest.cs b/test/Microsoft.AspNetCore.Razor.Test/TagHelpers/TagHelperDescriptorProviderTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TagHelpers/TagHelperDescriptorProviderTest.cs
rename to test/Microsoft.AspNetCore.Razor.Test/TagHelpers/TagHelperDescriptorProviderTest.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/TagHelpers/TagHelperDescriptorTest.cs b/test/Microsoft.AspNetCore.Razor.Test/TagHelpers/TagHelperDescriptorTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TagHelpers/TagHelperDescriptorTest.cs
rename to test/Microsoft.AspNetCore.Razor.Test/TagHelpers/TagHelperDescriptorTest.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/TagHelpers/TagHelperDirectiveSpanVisitorTest.cs b/test/Microsoft.AspNetCore.Razor.Test/TagHelpers/TagHelperDirectiveSpanVisitorTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TagHelpers/TagHelperDirectiveSpanVisitorTest.cs
rename to test/Microsoft.AspNetCore.Razor.Test/TagHelpers/TagHelperDirectiveSpanVisitorTest.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/TagHelpers/TagHelperParseTreeRewriterTest.cs b/test/Microsoft.AspNetCore.Razor.Test/TagHelpers/TagHelperParseTreeRewriterTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TagHelpers/TagHelperParseTreeRewriterTest.cs
rename to test/Microsoft.AspNetCore.Razor.Test/TagHelpers/TagHelperParseTreeRewriterTest.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/TagHelpers/TagHelperRewritingTestBase.cs b/test/Microsoft.AspNetCore.Razor.Test/TagHelpers/TagHelperRewritingTestBase.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TagHelpers/TagHelperRewritingTestBase.cs
rename to test/Microsoft.AspNetCore.Razor.Test/TagHelpers/TagHelperRewritingTestBase.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/AddTagHelperDirective.cs b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/AddTagHelperDirective.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/AddTagHelperDirective.cs
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/AddTagHelperDirective.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/AttributeTargetingTagHelpers.DesignTime.cs b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/AttributeTargetingTagHelpers.DesignTime.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/AttributeTargetingTagHelpers.DesignTime.cs
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/AttributeTargetingTagHelpers.DesignTime.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/AttributeTargetingTagHelpers.cs b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/AttributeTargetingTagHelpers.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/AttributeTargetingTagHelpers.cs
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/AttributeTargetingTagHelpers.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/Await.DesignTime.cs b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/Await.DesignTime.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/Await.DesignTime.cs
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/Await.DesignTime.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/Await.cs b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/Await.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/Await.cs
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/Await.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/BasicTagHelpers.CustomAttributeCodeGenerator.cs b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/BasicTagHelpers.CustomAttributeCodeGenerator.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/BasicTagHelpers.CustomAttributeCodeGenerator.cs
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/BasicTagHelpers.CustomAttributeCodeGenerator.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/BasicTagHelpers.DesignTime.cs b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/BasicTagHelpers.DesignTime.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/BasicTagHelpers.DesignTime.cs
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/BasicTagHelpers.DesignTime.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/BasicTagHelpers.Prefixed.DesignTime.cs b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/BasicTagHelpers.Prefixed.DesignTime.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/BasicTagHelpers.Prefixed.DesignTime.cs
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/BasicTagHelpers.Prefixed.DesignTime.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/BasicTagHelpers.Prefixed.cs b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/BasicTagHelpers.Prefixed.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/BasicTagHelpers.Prefixed.cs
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/BasicTagHelpers.Prefixed.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/BasicTagHelpers.RemoveTagHelper.cs b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/BasicTagHelpers.RemoveTagHelper.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/BasicTagHelpers.RemoveTagHelper.cs
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/BasicTagHelpers.RemoveTagHelper.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/BasicTagHelpers.cs b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/BasicTagHelpers.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/BasicTagHelpers.cs
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/BasicTagHelpers.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/Blocks.cs b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/Blocks.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/Blocks.cs
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/Blocks.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/CSharpCodeGenerator.cs b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/CSharpCodeGenerator.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/CSharpCodeGenerator.cs
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/CSharpCodeGenerator.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/CodeBlock.cs b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/CodeBlock.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/CodeBlock.cs
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/CodeBlock.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/CodeBlockAtEOF.cs b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/CodeBlockAtEOF.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/CodeBlockAtEOF.cs
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/CodeBlockAtEOF.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/CodeBlockWithTextElement.cs b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/CodeBlockWithTextElement.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/CodeBlockWithTextElement.cs
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/CodeBlockWithTextElement.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/ComplexTagHelpers.DesignTime.cs b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/ComplexTagHelpers.DesignTime.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/ComplexTagHelpers.DesignTime.cs
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/ComplexTagHelpers.DesignTime.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/ComplexTagHelpers.cs b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/ComplexTagHelpers.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/ComplexTagHelpers.cs
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/ComplexTagHelpers.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/ConditionalAttributes.DesignTime.cs b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/ConditionalAttributes.DesignTime.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/ConditionalAttributes.DesignTime.cs
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/ConditionalAttributes.DesignTime.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/ConditionalAttributes.cs b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/ConditionalAttributes.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/ConditionalAttributes.cs
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/ConditionalAttributes.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/DesignTime.cs b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/DesignTime.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/DesignTime.cs
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/DesignTime.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/DuplicateAttributeTagHelpers.DesignTime.cs b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/DuplicateAttributeTagHelpers.DesignTime.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/DuplicateAttributeTagHelpers.DesignTime.cs
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/DuplicateAttributeTagHelpers.DesignTime.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/DuplicateAttributeTagHelpers.cs b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/DuplicateAttributeTagHelpers.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/DuplicateAttributeTagHelpers.cs
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/DuplicateAttributeTagHelpers.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/DuplicateTargetTagHelper.cs b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/DuplicateTargetTagHelper.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/DuplicateTargetTagHelper.cs
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/DuplicateTargetTagHelper.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/DynamicAttributeTagHelpers.DesignTime.cs b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/DynamicAttributeTagHelpers.DesignTime.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/DynamicAttributeTagHelpers.DesignTime.cs
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/DynamicAttributeTagHelpers.DesignTime.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/DynamicAttributeTagHelpers.cs b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/DynamicAttributeTagHelpers.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/DynamicAttributeTagHelpers.cs
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/DynamicAttributeTagHelpers.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/EmptyAttributeTagHelpers.DesignTime.cs b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/EmptyAttributeTagHelpers.DesignTime.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/EmptyAttributeTagHelpers.DesignTime.cs
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/EmptyAttributeTagHelpers.DesignTime.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/EmptyAttributeTagHelpers.cs b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/EmptyAttributeTagHelpers.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/EmptyAttributeTagHelpers.cs
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/EmptyAttributeTagHelpers.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/EmptyCodeBlock.cs b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/EmptyCodeBlock.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/EmptyCodeBlock.cs
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/EmptyCodeBlock.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/EmptyExplicitExpression.cs b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/EmptyExplicitExpression.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/EmptyExplicitExpression.cs
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/EmptyExplicitExpression.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/EmptyImplicitExpression.cs b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/EmptyImplicitExpression.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/EmptyImplicitExpression.cs
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/EmptyImplicitExpression.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/EmptyImplicitExpressionInCode.Tabs.cs b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/EmptyImplicitExpressionInCode.Tabs.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/EmptyImplicitExpressionInCode.Tabs.cs
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/EmptyImplicitExpressionInCode.Tabs.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/EmptyImplicitExpressionInCode.cs b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/EmptyImplicitExpressionInCode.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/EmptyImplicitExpressionInCode.cs
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/EmptyImplicitExpressionInCode.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/EnumTagHelpers.DesignTime.cs b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/EnumTagHelpers.DesignTime.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/EnumTagHelpers.DesignTime.cs
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/EnumTagHelpers.DesignTime.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/EnumTagHelpers.cs b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/EnumTagHelpers.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/EnumTagHelpers.cs
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/EnumTagHelpers.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/EscapedTagHelpers.DesignTime.cs b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/EscapedTagHelpers.DesignTime.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/EscapedTagHelpers.DesignTime.cs
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/EscapedTagHelpers.DesignTime.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/EscapedTagHelpers.cs b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/EscapedTagHelpers.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/EscapedTagHelpers.cs
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/EscapedTagHelpers.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/ExplicitExpression.cs b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/ExplicitExpression.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/ExplicitExpression.cs
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/ExplicitExpression.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/ExplicitExpressionAtEOF.cs b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/ExplicitExpressionAtEOF.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/ExplicitExpressionAtEOF.cs
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/ExplicitExpressionAtEOF.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/ExpressionsInCode.cs b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/ExpressionsInCode.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/ExpressionsInCode.cs
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/ExpressionsInCode.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/FunctionsBlock.DesignTime.Tabs.cs b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/FunctionsBlock.DesignTime.Tabs.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/FunctionsBlock.DesignTime.Tabs.cs
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/FunctionsBlock.DesignTime.Tabs.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/FunctionsBlock.DesignTime.cs b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/FunctionsBlock.DesignTime.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/FunctionsBlock.DesignTime.cs
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/FunctionsBlock.DesignTime.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/FunctionsBlock.cs b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/FunctionsBlock.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/FunctionsBlock.cs
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/FunctionsBlock.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/FunctionsBlockMinimal.DesignTime.Tabs.cs b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/FunctionsBlockMinimal.DesignTime.Tabs.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/FunctionsBlockMinimal.DesignTime.Tabs.cs
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/FunctionsBlockMinimal.DesignTime.Tabs.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/FunctionsBlock_Tabs.cs b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/FunctionsBlock_Tabs.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/FunctionsBlock_Tabs.cs
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/FunctionsBlock_Tabs.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/HiddenSpansInCode.cs b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/HiddenSpansInCode.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/HiddenSpansInCode.cs
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/HiddenSpansInCode.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/HtmlCommentWithQuote_Double.cs b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/HtmlCommentWithQuote_Double.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/HtmlCommentWithQuote_Double.cs
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/HtmlCommentWithQuote_Double.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/HtmlCommentWithQuote_Single.cs b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/HtmlCommentWithQuote_Single.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/HtmlCommentWithQuote_Single.cs
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/HtmlCommentWithQuote_Single.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/ImplicitExpression.cs b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/ImplicitExpression.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/ImplicitExpression.cs
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/ImplicitExpression.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/ImplicitExpressionAtEOF.cs b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/ImplicitExpressionAtEOF.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/ImplicitExpressionAtEOF.cs
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/ImplicitExpressionAtEOF.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/Imports.DesignTime.cs b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/Imports.DesignTime.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/Imports.DesignTime.cs
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/Imports.DesignTime.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/Imports.cs b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/Imports.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/Imports.cs
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/Imports.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/IncompleteTagHelper.cs b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/IncompleteTagHelper.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/IncompleteTagHelper.cs
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/IncompleteTagHelper.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/Inherits.Designtime.cs b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/Inherits.Designtime.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/Inherits.Designtime.cs
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/Inherits.Designtime.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/Inherits.Runtime.cs b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/Inherits.Runtime.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/Inherits.Runtime.cs
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/Inherits.Runtime.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/InlineBlocks.cs b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/InlineBlocks.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/InlineBlocks.cs
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/InlineBlocks.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/Instrumented.cs b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/Instrumented.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/Instrumented.cs
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/Instrumented.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/MarkupInCodeBlock.cs b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/MarkupInCodeBlock.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/MarkupInCodeBlock.cs
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/MarkupInCodeBlock.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/MinimizedTagHelpers.DesignTime.cs b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/MinimizedTagHelpers.DesignTime.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/MinimizedTagHelpers.DesignTime.cs
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/MinimizedTagHelpers.DesignTime.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/MinimizedTagHelpers.cs b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/MinimizedTagHelpers.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/MinimizedTagHelpers.cs
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/MinimizedTagHelpers.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/NestedCSharp.DesignTime.cs b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/NestedCSharp.DesignTime.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/NestedCSharp.DesignTime.cs
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/NestedCSharp.DesignTime.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/NestedCSharp.cs b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/NestedCSharp.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/NestedCSharp.cs
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/NestedCSharp.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/NestedCodeBlocks.cs b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/NestedCodeBlocks.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/NestedCodeBlocks.cs
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/NestedCodeBlocks.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/NestedScriptTagTagHelpers.DesignTime.cs b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/NestedScriptTagTagHelpers.DesignTime.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/NestedScriptTagTagHelpers.DesignTime.cs
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/NestedScriptTagTagHelpers.DesignTime.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/NestedScriptTagTagHelpers.cs b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/NestedScriptTagTagHelpers.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/NestedScriptTagTagHelpers.cs
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/NestedScriptTagTagHelpers.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/NoLinePragmas.cs b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/NoLinePragmas.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/NoLinePragmas.cs
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/NoLinePragmas.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/NullConditionalExpressions.DesignTime.cs b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/NullConditionalExpressions.DesignTime.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/NullConditionalExpressions.DesignTime.cs
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/NullConditionalExpressions.DesignTime.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/NullConditionalExpressions.cs b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/NullConditionalExpressions.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/NullConditionalExpressions.cs
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/NullConditionalExpressions.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/OpenedIf.DesignTime.Tabs.cs b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/OpenedIf.DesignTime.Tabs.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/OpenedIf.DesignTime.Tabs.cs
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/OpenedIf.DesignTime.Tabs.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/OpenedIf.DesignTime.cs b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/OpenedIf.DesignTime.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/OpenedIf.DesignTime.cs
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/OpenedIf.DesignTime.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/ParserError.cs b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/ParserError.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/ParserError.cs
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/ParserError.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/PrefixedAttributeTagHelpers.DesignTime.cs b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/PrefixedAttributeTagHelpers.DesignTime.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/PrefixedAttributeTagHelpers.DesignTime.cs
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/PrefixedAttributeTagHelpers.DesignTime.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/PrefixedAttributeTagHelpers.Reversed.cs b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/PrefixedAttributeTagHelpers.Reversed.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/PrefixedAttributeTagHelpers.Reversed.cs
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/PrefixedAttributeTagHelpers.Reversed.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/PrefixedAttributeTagHelpers.cs b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/PrefixedAttributeTagHelpers.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/PrefixedAttributeTagHelpers.cs
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/PrefixedAttributeTagHelpers.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/RazorComments.DesignTime.cs b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/RazorComments.DesignTime.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/RazorComments.DesignTime.cs
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/RazorComments.DesignTime.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/RazorComments.cs b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/RazorComments.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/RazorComments.cs
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/RazorComments.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/RemoveTagHelperDirective.cs b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/RemoveTagHelperDirective.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/RemoveTagHelperDirective.cs
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/RemoveTagHelperDirective.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/Sections.cs b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/Sections.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/Sections.cs
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/Sections.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/SimpleUnspacedIf.DesignTime.Tabs.cs b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/SimpleUnspacedIf.DesignTime.Tabs.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/SimpleUnspacedIf.DesignTime.Tabs.cs
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/SimpleUnspacedIf.DesignTime.Tabs.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/SingleTagHelper.DesignTime.cs b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/SingleTagHelper.DesignTime.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/SingleTagHelper.DesignTime.cs
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/SingleTagHelper.DesignTime.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/SingleTagHelper.cs b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/SingleTagHelper.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/SingleTagHelper.cs
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/SingleTagHelper.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/SingleTagHelperWithNewlineBeforeAttributes.cs b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/SingleTagHelperWithNewlineBeforeAttributes.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/SingleTagHelperWithNewlineBeforeAttributes.cs
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/SingleTagHelperWithNewlineBeforeAttributes.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/StringLiterals.cs b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/StringLiterals.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/StringLiterals.cs
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/StringLiterals.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/SymbolBoundAttributes.DesignTime.cs b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/SymbolBoundAttributes.DesignTime.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/SymbolBoundAttributes.DesignTime.cs
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/SymbolBoundAttributes.DesignTime.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/SymbolBoundAttributes.cs b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/SymbolBoundAttributes.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/SymbolBoundAttributes.cs
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/SymbolBoundAttributes.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/TagHelpersInSection.cs b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/TagHelpersInSection.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/TagHelpersInSection.cs
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/TagHelpersInSection.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/TagHelpersWithWeirdlySpacedAttributes.cs b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/TagHelpersWithWeirdlySpacedAttributes.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/TagHelpersWithWeirdlySpacedAttributes.cs
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/TagHelpersWithWeirdlySpacedAttributes.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/Templates.cs b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/Templates.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/Templates.cs
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/Templates.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/TransitionsInTagHelperAttributes.DesignTime.cs b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/TransitionsInTagHelperAttributes.DesignTime.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/TransitionsInTagHelperAttributes.DesignTime.cs
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/TransitionsInTagHelperAttributes.DesignTime.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/TransitionsInTagHelperAttributes.cs b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/TransitionsInTagHelperAttributes.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/TransitionsInTagHelperAttributes.cs
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/TransitionsInTagHelperAttributes.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/UnfinishedExpressionInCode.Tabs.cs b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/UnfinishedExpressionInCode.Tabs.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/UnfinishedExpressionInCode.Tabs.cs
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/UnfinishedExpressionInCode.Tabs.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/UnfinishedExpressionInCode.cs b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/UnfinishedExpressionInCode.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Output/UnfinishedExpressionInCode.cs
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Output/UnfinishedExpressionInCode.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/AddTagHelperDirective.cshtml b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/AddTagHelperDirective.cshtml
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/AddTagHelperDirective.cshtml
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/AddTagHelperDirective.cshtml
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/AttributeTargetingTagHelpers.cshtml b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/AttributeTargetingTagHelpers.cshtml
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/AttributeTargetingTagHelpers.cshtml
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/AttributeTargetingTagHelpers.cshtml
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/Await.cshtml b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/Await.cshtml
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/Await.cshtml
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/Await.cshtml
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/BasicTagHelpers.Prefixed.cshtml b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/BasicTagHelpers.Prefixed.cshtml
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/BasicTagHelpers.Prefixed.cshtml
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/BasicTagHelpers.Prefixed.cshtml
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/BasicTagHelpers.RemoveTagHelper.cshtml b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/BasicTagHelpers.RemoveTagHelper.cshtml
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/BasicTagHelpers.RemoveTagHelper.cshtml
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/BasicTagHelpers.RemoveTagHelper.cshtml
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/BasicTagHelpers.cshtml b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/BasicTagHelpers.cshtml
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/BasicTagHelpers.cshtml
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/BasicTagHelpers.cshtml
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/Blocks.cshtml b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/Blocks.cshtml
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/Blocks.cshtml
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/Blocks.cshtml
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/CodeBlock.cshtml b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/CodeBlock.cshtml
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/CodeBlock.cshtml
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/CodeBlock.cshtml
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/CodeBlockAtEOF.cshtml b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/CodeBlockAtEOF.cshtml
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/CodeBlockAtEOF.cshtml
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/CodeBlockAtEOF.cshtml
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/CodeBlockWithTextElement.cshtml b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/CodeBlockWithTextElement.cshtml
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/CodeBlockWithTextElement.cshtml
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/CodeBlockWithTextElement.cshtml
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/ComplexTagHelpers.cshtml b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/ComplexTagHelpers.cshtml
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/ComplexTagHelpers.cshtml
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/ComplexTagHelpers.cshtml
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/ConditionalAttributes.cshtml b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/ConditionalAttributes.cshtml
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/ConditionalAttributes.cshtml
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/ConditionalAttributes.cshtml
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/DesignTime.cshtml b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/DesignTime.cshtml
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/DesignTime.cshtml
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/DesignTime.cshtml
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/DuplicateAttributeTagHelpers.cshtml b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/DuplicateAttributeTagHelpers.cshtml
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/DuplicateAttributeTagHelpers.cshtml
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/DuplicateAttributeTagHelpers.cshtml
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/DuplicateTargetTagHelper.cshtml b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/DuplicateTargetTagHelper.cshtml
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/DuplicateTargetTagHelper.cshtml
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/DuplicateTargetTagHelper.cshtml
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/DynamicAttributeTagHelpers.cshtml b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/DynamicAttributeTagHelpers.cshtml
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/DynamicAttributeTagHelpers.cshtml
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/DynamicAttributeTagHelpers.cshtml
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/EmptyAttributeTagHelpers.cshtml b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/EmptyAttributeTagHelpers.cshtml
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/EmptyAttributeTagHelpers.cshtml
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/EmptyAttributeTagHelpers.cshtml
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/EmptyCodeBlock.cshtml b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/EmptyCodeBlock.cshtml
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/EmptyCodeBlock.cshtml
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/EmptyCodeBlock.cshtml
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/EmptyExplicitExpression.cshtml b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/EmptyExplicitExpression.cshtml
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/EmptyExplicitExpression.cshtml
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/EmptyExplicitExpression.cshtml
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/EmptyImplicitExpression.cshtml b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/EmptyImplicitExpression.cshtml
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/EmptyImplicitExpression.cshtml
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/EmptyImplicitExpression.cshtml
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/EmptyImplicitExpressionInCode.cshtml b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/EmptyImplicitExpressionInCode.cshtml
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/EmptyImplicitExpressionInCode.cshtml
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/EmptyImplicitExpressionInCode.cshtml
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/EnumTagHelpers.cshtml b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/EnumTagHelpers.cshtml
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/EnumTagHelpers.cshtml
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/EnumTagHelpers.cshtml
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/EscapedTagHelpers.cshtml b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/EscapedTagHelpers.cshtml
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/EscapedTagHelpers.cshtml
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/EscapedTagHelpers.cshtml
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/ExplicitExpression.cshtml b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/ExplicitExpression.cshtml
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/ExplicitExpression.cshtml
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/ExplicitExpression.cshtml
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/ExplicitExpressionAtEOF.cshtml b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/ExplicitExpressionAtEOF.cshtml
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/ExplicitExpressionAtEOF.cshtml
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/ExplicitExpressionAtEOF.cshtml
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/ExpressionsInCode.cshtml b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/ExpressionsInCode.cshtml
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/ExpressionsInCode.cshtml
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/ExpressionsInCode.cshtml
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/FunctionsBlock.cshtml b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/FunctionsBlock.cshtml
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/FunctionsBlock.cshtml
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/FunctionsBlock.cshtml
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/FunctionsBlockMinimal.cshtml b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/FunctionsBlockMinimal.cshtml
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/FunctionsBlockMinimal.cshtml
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/FunctionsBlockMinimal.cshtml
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/FunctionsBlock_Tabs.cshtml b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/FunctionsBlock_Tabs.cshtml
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/FunctionsBlock_Tabs.cshtml
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/FunctionsBlock_Tabs.cshtml
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/HiddenSpansInCode.cshtml b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/HiddenSpansInCode.cshtml
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/HiddenSpansInCode.cshtml
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/HiddenSpansInCode.cshtml
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/HtmlCommentWithQuote_Double.cshtml b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/HtmlCommentWithQuote_Double.cshtml
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/HtmlCommentWithQuote_Double.cshtml
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/HtmlCommentWithQuote_Double.cshtml
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/HtmlCommentWithQuote_Single.cshtml b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/HtmlCommentWithQuote_Single.cshtml
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/HtmlCommentWithQuote_Single.cshtml
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/HtmlCommentWithQuote_Single.cshtml
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/ImplicitExpression.cshtml b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/ImplicitExpression.cshtml
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/ImplicitExpression.cshtml
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/ImplicitExpression.cshtml
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/ImplicitExpressionAtEOF.cshtml b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/ImplicitExpressionAtEOF.cshtml
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/ImplicitExpressionAtEOF.cshtml
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/ImplicitExpressionAtEOF.cshtml
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/Imports.cshtml b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/Imports.cshtml
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/Imports.cshtml
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/Imports.cshtml
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/IncompleteTagHelper.cshtml b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/IncompleteTagHelper.cshtml
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/IncompleteTagHelper.cshtml
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/IncompleteTagHelper.cshtml
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/Inherits.cshtml b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/Inherits.cshtml
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/Inherits.cshtml
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/Inherits.cshtml
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/InlineBlocks.cshtml b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/InlineBlocks.cshtml
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/InlineBlocks.cshtml
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/InlineBlocks.cshtml
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/Instrumented.cshtml b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/Instrumented.cshtml
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/Instrumented.cshtml
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/Instrumented.cshtml
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/MarkupInCodeBlock.cshtml b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/MarkupInCodeBlock.cshtml
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/MarkupInCodeBlock.cshtml
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/MarkupInCodeBlock.cshtml
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/MinimizedTagHelpers.cshtml b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/MinimizedTagHelpers.cshtml
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/MinimizedTagHelpers.cshtml
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/MinimizedTagHelpers.cshtml
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/NestedCSharp.cshtml b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/NestedCSharp.cshtml
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/NestedCSharp.cshtml
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/NestedCSharp.cshtml
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/NestedCodeBlocks.cshtml b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/NestedCodeBlocks.cshtml
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/NestedCodeBlocks.cshtml
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/NestedCodeBlocks.cshtml
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/NestedScriptTagTagHelpers.cshtml b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/NestedScriptTagTagHelpers.cshtml
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/NestedScriptTagTagHelpers.cshtml
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/NestedScriptTagTagHelpers.cshtml
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/NoLinePragmas.cshtml b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/NoLinePragmas.cshtml
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/NoLinePragmas.cshtml
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/NoLinePragmas.cshtml
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/NullConditionalExpressions.cshtml b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/NullConditionalExpressions.cshtml
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/NullConditionalExpressions.cshtml
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/NullConditionalExpressions.cshtml
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/OpenedIf.cshtml b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/OpenedIf.cshtml
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/OpenedIf.cshtml
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/OpenedIf.cshtml
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/ParserError.cshtml b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/ParserError.cshtml
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/ParserError.cshtml
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/ParserError.cshtml
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/PrefixedAttributeTagHelpers.cshtml b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/PrefixedAttributeTagHelpers.cshtml
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/PrefixedAttributeTagHelpers.cshtml
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/PrefixedAttributeTagHelpers.cshtml
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/RazorComments.cshtml b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/RazorComments.cshtml
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/RazorComments.cshtml
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/RazorComments.cshtml
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/RemoveTagHelperDirective.cshtml b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/RemoveTagHelperDirective.cshtml
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/RemoveTagHelperDirective.cshtml
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/RemoveTagHelperDirective.cshtml
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/Sections.cshtml b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/Sections.cshtml
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/Sections.cshtml
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/Sections.cshtml
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/SimpleUnspacedIf.cshtml b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/SimpleUnspacedIf.cshtml
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/SimpleUnspacedIf.cshtml
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/SimpleUnspacedIf.cshtml
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/SingleTagHelper.cshtml b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/SingleTagHelper.cshtml
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/SingleTagHelper.cshtml
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/SingleTagHelper.cshtml
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/SingleTagHelperWithNewlineBeforeAttributes.cshtml b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/SingleTagHelperWithNewlineBeforeAttributes.cshtml
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/SingleTagHelperWithNewlineBeforeAttributes.cshtml
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/SingleTagHelperWithNewlineBeforeAttributes.cshtml
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/StringLiterals.cshtml b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/StringLiterals.cshtml
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/StringLiterals.cshtml
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/StringLiterals.cshtml
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/SymbolBoundAttributes.cshtml b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/SymbolBoundAttributes.cshtml
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/SymbolBoundAttributes.cshtml
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/SymbolBoundAttributes.cshtml
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/TagHelpersInSection.cshtml b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/TagHelpersInSection.cshtml
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/TagHelpersInSection.cshtml
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/TagHelpersInSection.cshtml
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/TagHelpersWithWeirdlySpacedAttributes.cshtml b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/TagHelpersWithWeirdlySpacedAttributes.cshtml
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/TagHelpersWithWeirdlySpacedAttributes.cshtml
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/TagHelpersWithWeirdlySpacedAttributes.cshtml
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/Templates.cshtml b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/Templates.cshtml
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/Templates.cshtml
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/Templates.cshtml
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/TransitionsInTagHelperAttributes.cshtml b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/TransitionsInTagHelperAttributes.cshtml
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/TransitionsInTagHelperAttributes.cshtml
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/TransitionsInTagHelperAttributes.cshtml
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/UnfinishedExpressionInCode.cshtml b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/UnfinishedExpressionInCode.cshtml
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/CodeGenerator/Source/UnfinishedExpressionInCode.cshtml
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/CodeGenerator/Source/UnfinishedExpressionInCode.cshtml
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/DesignTime/Simple.cshtml b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/DesignTime/Simple.cshtml
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/DesignTime/Simple.cshtml
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/DesignTime/Simple.cshtml
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/DesignTime/Simple.txt b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/DesignTime/Simple.txt
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/DesignTime/Simple.txt
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/DesignTime/Simple.txt
diff --git a/test/Microsoft.AspNet.Razor.Test/TestFiles/nested-1000.html b/test/Microsoft.AspNetCore.Razor.Test/TestFiles/nested-1000.html
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/TestFiles/nested-1000.html
rename to test/Microsoft.AspNetCore.Razor.Test/TestFiles/nested-1000.html
diff --git a/test/Microsoft.AspNet.Razor.Test/Text/BufferingTextReaderTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Text/BufferingTextReaderTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/Text/BufferingTextReaderTest.cs
rename to test/Microsoft.AspNetCore.Razor.Test/Text/BufferingTextReaderTest.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/Text/LineTrackingStringBufferTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Text/LineTrackingStringBufferTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/Text/LineTrackingStringBufferTest.cs
rename to test/Microsoft.AspNetCore.Razor.Test/Text/LineTrackingStringBufferTest.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/Text/LookaheadTextReaderTestBase.cs b/test/Microsoft.AspNetCore.Razor.Test/Text/LookaheadTextReaderTestBase.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/Text/LookaheadTextReaderTestBase.cs
rename to test/Microsoft.AspNetCore.Razor.Test/Text/LookaheadTextReaderTestBase.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/Text/SourceLocationTrackerTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Text/SourceLocationTrackerTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/Text/SourceLocationTrackerTest.cs
rename to test/Microsoft.AspNetCore.Razor.Test/Text/SourceLocationTrackerTest.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/Text/TextBufferReaderTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Text/TextBufferReaderTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/Text/TextBufferReaderTest.cs
rename to test/Microsoft.AspNetCore.Razor.Test/Text/TextBufferReaderTest.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/Text/TextChangeTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Text/TextChangeTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/Text/TextChangeTest.cs
rename to test/Microsoft.AspNetCore.Razor.Test/Text/TextChangeTest.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/Text/TextReaderExtensionsTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Text/TextReaderExtensionsTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/Text/TextReaderExtensionsTest.cs
rename to test/Microsoft.AspNetCore.Razor.Test/Text/TextReaderExtensionsTest.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/Tokenizer/CSharpTokenizerCommentTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Tokenizer/CSharpTokenizerCommentTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/Tokenizer/CSharpTokenizerCommentTest.cs
rename to test/Microsoft.AspNetCore.Razor.Test/Tokenizer/CSharpTokenizerCommentTest.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/Tokenizer/CSharpTokenizerIdentifierTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Tokenizer/CSharpTokenizerIdentifierTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/Tokenizer/CSharpTokenizerIdentifierTest.cs
rename to test/Microsoft.AspNetCore.Razor.Test/Tokenizer/CSharpTokenizerIdentifierTest.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/Tokenizer/CSharpTokenizerLiteralTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Tokenizer/CSharpTokenizerLiteralTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/Tokenizer/CSharpTokenizerLiteralTest.cs
rename to test/Microsoft.AspNetCore.Razor.Test/Tokenizer/CSharpTokenizerLiteralTest.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/Tokenizer/CSharpTokenizerOperatorsTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Tokenizer/CSharpTokenizerOperatorsTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/Tokenizer/CSharpTokenizerOperatorsTest.cs
rename to test/Microsoft.AspNetCore.Razor.Test/Tokenizer/CSharpTokenizerOperatorsTest.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/Tokenizer/CSharpTokenizerTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Tokenizer/CSharpTokenizerTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/Tokenizer/CSharpTokenizerTest.cs
rename to test/Microsoft.AspNetCore.Razor.Test/Tokenizer/CSharpTokenizerTest.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/Tokenizer/CSharpTokenizerTestBase.cs b/test/Microsoft.AspNetCore.Razor.Test/Tokenizer/CSharpTokenizerTestBase.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/Tokenizer/CSharpTokenizerTestBase.cs
rename to test/Microsoft.AspNetCore.Razor.Test/Tokenizer/CSharpTokenizerTestBase.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/Tokenizer/HtmlTokenizerTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Tokenizer/HtmlTokenizerTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/Tokenizer/HtmlTokenizerTest.cs
rename to test/Microsoft.AspNetCore.Razor.Test/Tokenizer/HtmlTokenizerTest.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/Tokenizer/HtmlTokenizerTestBase.cs b/test/Microsoft.AspNetCore.Razor.Test/Tokenizer/HtmlTokenizerTestBase.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/Tokenizer/HtmlTokenizerTestBase.cs
rename to test/Microsoft.AspNetCore.Razor.Test/Tokenizer/HtmlTokenizerTestBase.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/Tokenizer/TokenizerLookaheadTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Tokenizer/TokenizerLookaheadTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/Tokenizer/TokenizerLookaheadTest.cs
rename to test/Microsoft.AspNetCore.Razor.Test/Tokenizer/TokenizerLookaheadTest.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/Tokenizer/TokenizerTestBase.cs b/test/Microsoft.AspNetCore.Razor.Test/Tokenizer/TokenizerTestBase.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/Tokenizer/TokenizerTestBase.cs
rename to test/Microsoft.AspNetCore.Razor.Test/Tokenizer/TokenizerTestBase.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/Utils/BaselineWriter.cs b/test/Microsoft.AspNetCore.Razor.Test/Utils/BaselineWriter.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/Utils/BaselineWriter.cs
rename to test/Microsoft.AspNetCore.Razor.Test/Utils/BaselineWriter.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/Utils/DisposableActionTest.cs b/test/Microsoft.AspNetCore.Razor.Test/Utils/DisposableActionTest.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/Utils/DisposableActionTest.cs
rename to test/Microsoft.AspNetCore.Razor.Test/Utils/DisposableActionTest.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/Utils/ExceptionHelpers.cs b/test/Microsoft.AspNetCore.Razor.Test/Utils/ExceptionHelpers.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/Utils/ExceptionHelpers.cs
rename to test/Microsoft.AspNetCore.Razor.Test/Utils/ExceptionHelpers.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/Utils/MiscUtils.cs b/test/Microsoft.AspNetCore.Razor.Test/Utils/MiscUtils.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/Utils/MiscUtils.cs
rename to test/Microsoft.AspNetCore.Razor.Test/Utils/MiscUtils.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/Utils/TestFile.cs b/test/Microsoft.AspNetCore.Razor.Test/Utils/TestFile.cs
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/Utils/TestFile.cs
rename to test/Microsoft.AspNetCore.Razor.Test/Utils/TestFile.cs
diff --git a/test/Microsoft.AspNet.Razor.Test/project.json b/test/Microsoft.AspNetCore.Razor.Test/project.json
similarity index 100%
rename from test/Microsoft.AspNet.Razor.Test/project.json
rename to test/Microsoft.AspNetCore.Razor.Test/project.json