diff --git a/.appveyor.yml b/.appveyor.yml
deleted file mode 100644
index 018881c6046a7a0ff53ee21320251d9411a40a7a..0000000000000000000000000000000000000000
--- a/.appveyor.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-init:
-- git config --global core.autocrlf true
-branches:
- only:
- - master
- - /^release\/.*$/
- - /^(.*\/)?ci-.*$/
-build_script:
-- ps: .\run.ps1 -CI default-build
-clone_depth: 1
-test: 'off'
-deploy: 'off'
-image: Visual Studio 2017
diff --git a/.gitattributes b/.gitattributes
deleted file mode 100644
index d4ee1cb7f39c17015b32c592b582b92245670fd5..0000000000000000000000000000000000000000
--- a/.gitattributes
+++ /dev/null
@@ -1,52 +0,0 @@
-*.doc diff=astextplain
-*.DOC diff=astextplain
-*.docx diff=astextplain
-*.DOCX diff=astextplain
-*.dot diff=astextplain
-*.DOT diff=astextplain
-*.pdf diff=astextplain
-*.PDF diff=astextplain
-*.rtf diff=astextplain
-*.RTF diff=astextplain
-
-*.jpg binary
-*.png binary
-*.gif binary
-
-*.cs text=auto diff=csharp
-*.vb text=auto
-*.resx text=auto
-*.c text=auto
-*.cpp text=auto
-*.cxx text=auto
-*.h text=auto
-*.hxx text=auto
-*.py text=auto
-*.rb text=auto
-*.java text=auto
-*.html text=auto
-*.htm text=auto
-*.css text=auto
-*.scss text=auto
-*.sass text=auto
-*.less text=auto
-*.js text=auto
-*.lisp text=auto
-*.clj text=auto
-*.sql text=auto
-*.php text=auto
-*.lua text=auto
-*.m text=auto
-*.asm text=auto
-*.erl text=auto
-*.fs text=auto
-*.fsx text=auto
-*.hs text=auto
-
-*.csproj text=auto
-*.vbproj text=auto
-*.fsproj text=auto
-*.dbproj text=auto
-*.sln text=auto eol=crlf
-
-*.sh eol=lf
diff --git a/.github/ISSUE_TEMPLATE b/.github/ISSUE_TEMPLATE
deleted file mode 100644
index 4fef45813805d90ef5232f05e1bf88d48e036b62..0000000000000000000000000000000000000000
--- a/.github/ISSUE_TEMPLATE
+++ /dev/null
@@ -1,25 +0,0 @@
-#### Is this a Bug or Feature request?:
-
-
-#### Steps to reproduce (preferably a link to a GitHub repo with a repro project):
-
-
-#### Description of the problem:
-
-
-#### Version of `Microsoft.AspNetCore.Mvc` or `Microsoft.AspNetCore.App` or `Microsoft.AspNetCore.All`:
-
-
-<!--
- --- NOTE ---
-1. Try enabling logging (in the most verbose level) and see if the details help you in fixing
- the issue you are seeing. Share the logs too if it helps in diagnosing the issue faster.
- More info: https://docs.microsoft.com/en-us/aspnet/core/fundamentals/logging
-
-2. If you are seeing an exception, include the full exceptions details (message and stack trace).
- More info: https://docs.microsoft.com/en-us/aspnet/core/fundamentals/error-handling
-
-3. If you believe you have an issue that affects the security of the platform please do
- not create an issue, instead email your issue to 'secure@microsoft.com'. Your report may
- be eligible for our bug bounty. More info: https://technet.microsoft.com/en-us/mt764065.aspx
--->
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index d56301c4532f70b5635fef87026b2fb7d28f0aa7..0000000000000000000000000000000000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-language: csharp
-sudo: required
-dist: trusty
-addons:
- apt:
- packages:
- - libunwind8
-mono: none
-os:
-- linux
-- osx
-osx_image: xcode8.2
-branches:
- only:
- - master
- - /^release\/.*$/
- - /^(.*\/)?ci-.*$/
-before_install:
-- if test "$TRAVIS_OS_NAME" == "osx"; then brew update; brew install openssl; ln -s
- /usr/local/opt/openssl/lib/libcrypto.1.0.0.dylib /usr/local/lib/; ln -s /usr/local/opt/openssl/lib/libssl.1.0.0.dylib
- /usr/local/lib/; fi
-script:
-- ./build.sh --ci
diff --git a/.vsts-pipelines/builds/ci-internal.yml b/.vsts-pipelines/builds/ci-internal.yml
deleted file mode 100644
index c2c5336fd0fbe2fda75a67f8142749cdd1eaca8d..0000000000000000000000000000000000000000
--- a/.vsts-pipelines/builds/ci-internal.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-trigger:
-- master
-- release/*
-
-resources:
- repositories:
- - repository: buildtools
- type: git
- name: aspnet-BuildTools
- ref: refs/heads/master
-
-phases:
-- template: .vsts-pipelines/templates/project-ci.yml@buildtools
diff --git a/.vsts-pipelines/builds/ci-public.yml b/.vsts-pipelines/builds/ci-public.yml
deleted file mode 100644
index 58346c9cab2f20cbdddccf90a05bee3ef76a3689..0000000000000000000000000000000000000000
--- a/.vsts-pipelines/builds/ci-public.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-trigger:
-- master
-- release/*
-
-phases:
-- template: ../templates/project-ci.yml
diff --git a/.vsts-pipelines/templates/phases/default-build.yml b/.vsts-pipelines/templates/phases/default-build.yml
deleted file mode 100644
index de8aa8d488a0705c31168b7d7dbb01d4457e12a8..0000000000000000000000000000000000000000
--- a/.vsts-pipelines/templates/phases/default-build.yml
+++ /dev/null
@@ -1,118 +0,0 @@
-#
-# Obsolete! New projects should use .azure/templates/jobs/default-build.yml instead
-#
-# TODO: remove this once templated projects have referenced the new location.
-#
-# default-build.yml
-# Description: Defines a build phase for invoking build.sh/cmd
-# Parameters:
-# phaseName: string
-# The name of the phase. Defaults to the name of the OS.
-# queueName: string
-# The name of the VSTS agent queue to use.
-# agentOs: string
-# Used in templates to define variables which are OS specific. Typically from the set { Windows, Linux, macOS }
-# buildArgs: string
-# Additional arguments to pass to the build.sh/cmd script.
-# Note: -ci is always passed
-# beforeBuild: [steps]
-# Additional steps to run before build.sh/cmd
-# afterBuild: [steps]
-# Additional steps to run after build.sh/cmd
-# artifacts:
-# publish: boolean
-# Should artifacts be published
-# path: string
-# The file path to artifacts output
-# name: string
-# The name of the artifact container
-# variables: { string: string }
-# A map of custom variables
-# matrix: { string: { string: string } }
-# A map of matrix configurations and variables. https://docs.microsoft.com/en-us/vsts/pipelines/yaml-schema?view=vsts#matrix
-# demands: string | [ string ]
-# A list of agent demands. https://docs.microsoft.com/en-us/vsts/pipelines/yaml-schema?view=vsts#demands
-# dependsOn: string | [ string ]
-# For fan-out/fan-in. https://docs.microsoft.com/en-us/vsts/pipelines/yaml-schema?view=vsts#phase
-
-#
-# See https://docs.microsoft.com/en-us/vsts/pipelines/yaml-schema for details
-#
-
-parameters:
- agentOs: 'Windows'
- # phaseName: ''
- queueName: ''
- buildArgs: ''
- configuration: 'Release'
- demands: []
- beforeBuild: []
- afterBuild: []
- variables: {}
- dependsOn: ''
- # matrix: {} - don't define an empty object default because there is no way in template expression yet to check "if isEmpty(parameters.matrix)"
- artifacts:
- publish: true
- path: 'artifacts/' # TODO: this is going to change when we converge with dotnet/arcade tooling
-
-phases:
-- phase: ${{ coalesce(parameters.phaseName, parameters.agentOs) }}
- dependsOn: ${{ parameters.dependsOn }}
- queue:
- # If a matrix of builds has been configured, run the matrix in parallel
- ${{ if ne(parameters.matrix, '') }}:
- parallel: 4 # Pick 4 as the default because we usually don't have a matrix of more than 4 configs, and there is no way to say parallel: all
- matrix: ${{ parameters.matrix }}
- # Map friendly OS names to the right queue
- ${{ if ne(parameters.queueName, '') }}:
- name: ${{ parameters.queueName }}
- ${{ if and(eq(parameters.queueName, ''), eq(parameters.agentOs, 'macOS')) }}:
- name: Hosted macOS Preview
- ${{ if and(eq(parameters.queueName, ''), eq(parameters.agentOs, 'Linux')) }}:
- name: Hosted Linux Preview
- ${{ if and(eq(parameters.queueName, ''), eq(parameters.agentOs, 'Windows')) }}:
- name: Hosted VS2017
- demands: ${{ parameters.demands }}
- variables:
- AgentOsName: ${{ parameters.agentOs }}
- ASPNETCORE_TEST_LOG_MAXPATH: "200" # Keep test log file name length low enough for artifact zipping
- DOTNET_HOME: $(Agent.WorkFolder)/.dotnet
- BuildScriptArgs: ${{ parameters.buildArgs }}
- BuildConfiguration: ${{ parameters.configuration }}
- ${{ insert }}: ${{ parameters.variables }}
- steps:
- - script: echo "This build template is obsolete and will be removed in the future. Please update your schema to use the .azure/templates/jobs/default-build.yml template"
- displayName: THIS TEMPLATE IS OBSOLETE
- - checkout: self
- clean: true
- - ${{ parameters.beforeBuild }}
- - ${{ if eq(parameters.agentOs, 'Windows') }}:
- - script: .\buildWithProcDump.cmd -ci /p:Configuration=$(BuildConfiguration) $(BuildScriptArgs)
- displayName: Run build.cmd
- - ${{ if ne(parameters.agentOs, 'Windows') }}:
- - script: ./build.sh -ci -p:Configuration=$(BuildConfiguration) $(BuildScriptArgs)
- displayName: Run build.sh
- - task: PublishTestResults@2
- displayName: Publish test results
- condition: always()
- inputs:
- testRunner: vstest
- testResultsFiles: 'artifacts/logs/**/*.trx'
- - task: PublishTestResults@2
- displayName: Publish junit test results
- condition: always()
- inputs:
- testRunner: junit
- testResultsFiles: 'artifacts/logs/**/*.junit.xml'
- - ${{ if eq(parameters.artifacts.publish, 'true') }}:
- - task: PublishBuildArtifacts@1
- displayName: Upload artifacts
- condition: eq(variables['system.pullrequest.isfork'], false)
- inputs:
- pathtoPublish: ${{ parameters.artifacts.path }}
- ${{ if eq(parameters.artifacts.name, '') }}:
- artifactName: artifacts-$(AgentOsName)-$(BuildConfiguration)
- ${{ if ne(parameters.artifacts.name, '') }}:
- artifactName: ${{ parameters.artifacts.name }}
- artifactType: Container
- - ${{ parameters.afterBuild }}
diff --git a/.vsts-pipelines/templates/project-ci.yml b/.vsts-pipelines/templates/project-ci.yml
deleted file mode 100644
index 72a5d6a6e8975539c0899525da22b730ad7862eb..0000000000000000000000000000000000000000
--- a/.vsts-pipelines/templates/project-ci.yml
+++ /dev/null
@@ -1,56 +0,0 @@
-#
-# Obsolete! New projects should use .azure/templates/project-ci.yml instead
-#
-# TODO: remove this once templated projects have referenced the new location.
-#
-#
-# Description: Runs build.cmd/sh on macOS, Linux, and Windows
-# Parameters:
-# buildArgs: string
-# Additional arguments to pass to the build.sh/cmd script.
-# Note: -ci is always passed
-# beforeBuild: [steps]
-# Additional steps to run before build.sh/cmd
-# afterBuild: [steps]
-# Additional steps to run after build.sh/cmd
-# variables: {}
-# VSTS build and environment variables
-# matrix: {}
-# The matrix of configurations to run. By default, it runs a Debug and Release build on all platforms
-
-parameters:
- buildArgs: ''
- beforeBuild: []
- afterBuild: []
- variables: {}
- matrix:
- Release:
- BuildConfiguration: Release
- Debug:
- BuildConfiguration: Debug
-
-phases:
-- template: phases/default-build.yml
- parameters:
- agentOs: Windows
- matrix: ${{ parameters.matrix }}
- buildArgs: ${{ parameters.buildArgs }}
- beforeBuild: ${{ parameters.beforeBuild }}
- afterBuild: ${{ parameters.afterBuild }}
- variables: ${{ parameters.variables }}
-- template: phases/default-build.yml
- parameters:
- agentOs: macOS
- matrix: ${{ parameters.matrix }}
- buildArgs: ${{ parameters.buildArgs }}
- beforeBuild: ${{ parameters.beforeBuild }}
- afterBuild: ${{ parameters.afterBuild }}
- variables: ${{ parameters.variables }}
-- template: phases/default-build.yml
- parameters:
- agentOs: Linux
- matrix: ${{ parameters.matrix }}
- buildArgs: ${{ parameters.buildArgs }}
- beforeBuild: ${{ parameters.beforeBuild }}
- afterBuild: ${{ parameters.afterBuild }}
- variables: ${{ parameters.variables }}
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
deleted file mode 100644
index eac4268e4c97dc979c89a79ed8705c9998506413..0000000000000000000000000000000000000000
--- a/CONTRIBUTING.md
+++ /dev/null
@@ -1,4 +0,0 @@
-Contributing
-======
-
-Information on contributing to this repo is in the [Contributing Guide](https://github.com/aspnet/Home/blob/master/CONTRIBUTING.md) in the Home repo.
diff --git a/LICENSE.txt b/LICENSE.txt
deleted file mode 100644
index b3b180cd51e903437bdd4a37c1c8f054b2a3a131..0000000000000000000000000000000000000000
--- a/LICENSE.txt
+++ /dev/null
@@ -1,201 +0,0 @@
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright (c) .NET Foundation and Contributors
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
diff --git a/NuGet.config b/NuGet.config
deleted file mode 100644
index cec9479a72bfa183df4d1eb0f06779f46f2caff3..0000000000000000000000000000000000000000
--- a/NuGet.config
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
- <packageSources>
- <clear />
- <!--
- Restore sources should be defined in build/sources.props.
- The only allowed feed here is myget.org/aspnet-tools which is required to work around
- https://github.com/Microsoft/msbuild/issues/2914
- -->
- <add key="myget.org aspnetcore-tools" value="https://dotnet.myget.org/F/aspnetcore-tools/api/v3/index.json" />
- </packageSources>
-</configuration>
diff --git a/build.cmd b/build.cmd
deleted file mode 100644
index c0050bda125e73f3745de70a4021262eaa048c7b..0000000000000000000000000000000000000000
--- a/build.cmd
+++ /dev/null
@@ -1,2 +0,0 @@
-@ECHO OFF
-PowerShell -NoProfile -NoLogo -ExecutionPolicy unrestricted -Command "[System.Threading.Thread]::CurrentThread.CurrentCulture = ''; [System.Threading.Thread]::CurrentThread.CurrentUICulture = '';& '%~dp0run.ps1' default-build %*; exit $LASTEXITCODE"
diff --git a/build.sh b/build.sh
deleted file mode 100755
index 98a4b227658413eca2adb0d1d2d68178a80155cf..0000000000000000000000000000000000000000
--- a/build.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-
-set -euo pipefail
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-# Call "sync" between "chmod" and execution to prevent "text file busy" error in Docker (aufs)
-chmod +x "$DIR/run.sh"; sync
-"$DIR/run.sh" default-build "$@"
diff --git a/korebuild-lock.txt b/korebuild-lock.txt
deleted file mode 100644
index 73613543d0a63af6db6711e71bce4b3f4575fdf2..0000000000000000000000000000000000000000
--- a/korebuild-lock.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-version:3.0.0-build-20181114.5
-commithash:880e9a204d4ee4a18dfd83c9fb05a192a28bca60
diff --git a/korebuild.json b/korebuild.json
deleted file mode 100644
index 8a276a7f35d8a3ea32f2985b48d45a552dcb3175..0000000000000000000000000000000000000000
--- a/korebuild.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/master/tools/korebuild.schema.json",
- "channel": "master"
-}
diff --git a/run.cmd b/run.cmd
deleted file mode 100644
index d52d5c7e689e8108ed0f0b83a22b61375fde8fef..0000000000000000000000000000000000000000
--- a/run.cmd
+++ /dev/null
@@ -1,2 +0,0 @@
-@ECHO OFF
-PowerShell -NoProfile -NoLogo -ExecutionPolicy unrestricted -Command "[System.Threading.Thread]::CurrentThread.CurrentCulture = ''; [System.Threading.Thread]::CurrentThread.CurrentUICulture = '';& '%~dp0run.ps1' %*; exit $LASTEXITCODE"
diff --git a/run.ps1 b/run.ps1
deleted file mode 100644
index 34604c7175877351351d0a60c3f60c90673c8cdf..0000000000000000000000000000000000000000
--- a/run.ps1
+++ /dev/null
@@ -1,209 +0,0 @@
-#!/usr/bin/env powershell
-#requires -version 4
-
-<#
-.SYNOPSIS
-Executes KoreBuild commands.
-
-.DESCRIPTION
-Downloads korebuild if required. Then executes the KoreBuild command. To see available commands, execute with `-Command help`.
-
-.PARAMETER Command
-The KoreBuild command to run.
-
-.PARAMETER Path
-The folder to build. Defaults to the folder containing this script.
-
-.PARAMETER Channel
-The channel of KoreBuild to download. Overrides the value from the config file.
-
-.PARAMETER DotNetHome
-The directory where .NET Core tools will be stored.
-
-.PARAMETER ToolsSource
-The base url where build tools can be downloaded. Overrides the value from the config file.
-
-.PARAMETER Update
-Updates KoreBuild to the latest version even if a lock file is present.
-
-.PARAMETER Reinstall
-Re-installs KoreBuild
-
-.PARAMETER ConfigFile
-The path to the configuration file that stores values. Defaults to korebuild.json.
-
-.PARAMETER ToolsSourceSuffix
-The Suffix to append to the end of the ToolsSource. Useful for query strings in blob stores.
-
-.PARAMETER CI
-Sets up CI specific settings and variables.
-
-.PARAMETER Arguments
-Arguments to be passed to the command
-
-.NOTES
-This function will create a file $PSScriptRoot/korebuild-lock.txt. This lock file can be committed to source, but does not have to be.
-When the lockfile is not present, KoreBuild will create one using latest available version from $Channel.
-
-The $ConfigFile is expected to be an JSON file. It is optional, and the configuration values in it are optional as well. Any options set
-in the file are overridden by command line parameters.
-
-.EXAMPLE
-Example config file:
-```json
-{
- "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/master/tools/korebuild.schema.json",
- "channel": "master",
- "toolsSource": "https://aspnetcore.blob.core.windows.net/buildtools"
-}
-```
-#>
-[CmdletBinding(PositionalBinding = $false)]
-param(
- [Parameter(Mandatory = $true, Position = 0)]
- [string]$Command,
- [string]$Path = $PSScriptRoot,
- [Alias('c')]
- [string]$Channel,
- [Alias('d')]
- [string]$DotNetHome,
- [Alias('s')]
- [string]$ToolsSource,
- [Alias('u')]
- [switch]$Update,
- [switch]$Reinstall,
- [string]$ToolsSourceSuffix,
- [string]$ConfigFile = $null,
- [switch]$CI,
- [Parameter(ValueFromRemainingArguments = $true)]
- [string[]]$Arguments
-)
-
-Set-StrictMode -Version 2
-$ErrorActionPreference = 'Stop'
-
-#
-# Functions
-#
-
-function Get-KoreBuild {
-
- $lockFile = Join-Path $Path 'korebuild-lock.txt'
-
- if (!(Test-Path $lockFile) -or $Update) {
- Get-RemoteFile "$ToolsSource/korebuild/channels/$Channel/latest.txt" $lockFile $ToolsSourceSuffix
- }
-
- $version = Get-Content $lockFile | Where-Object { $_ -like 'version:*' } | Select-Object -first 1
- if (!$version) {
- Write-Error "Failed to parse version from $lockFile. Expected a line that begins with 'version:'"
- }
- $version = $version.TrimStart('version:').Trim()
- $korebuildPath = Join-Paths $DotNetHome ('buildtools', 'korebuild', $version)
-
- if ($Reinstall -and (Test-Path $korebuildPath)) {
- Remove-Item -Force -Recurse $korebuildPath
- }
-
- if (!(Test-Path $korebuildPath)) {
- Write-Host -ForegroundColor Magenta "Downloading KoreBuild $version"
- New-Item -ItemType Directory -Path $korebuildPath | Out-Null
- $remotePath = "$ToolsSource/korebuild/artifacts/$version/korebuild.$version.zip"
-
- try {
- $tmpfile = Join-Path ([IO.Path]::GetTempPath()) "KoreBuild-$([guid]::NewGuid()).zip"
- Get-RemoteFile $remotePath $tmpfile $ToolsSourceSuffix
- if (Get-Command -Name 'Microsoft.PowerShell.Archive\Expand-Archive' -ErrorAction Ignore) {
- # Use built-in commands where possible as they are cross-plat compatible
- Microsoft.PowerShell.Archive\Expand-Archive -Path $tmpfile -DestinationPath $korebuildPath
- }
- else {
- # Fallback to old approach for old installations of PowerShell
- Add-Type -AssemblyName System.IO.Compression.FileSystem
- [System.IO.Compression.ZipFile]::ExtractToDirectory($tmpfile, $korebuildPath)
- }
- }
- catch {
- Remove-Item -Recurse -Force $korebuildPath -ErrorAction Ignore
- throw
- }
- finally {
- Remove-Item $tmpfile -ErrorAction Ignore
- }
- }
-
- return $korebuildPath
-}
-
-function Join-Paths([string]$path, [string[]]$childPaths) {
- $childPaths | ForEach-Object { $path = Join-Path $path $_ }
- return $path
-}
-
-function Get-RemoteFile([string]$RemotePath, [string]$LocalPath, [string]$RemoteSuffix) {
- if ($RemotePath -notlike 'http*') {
- Copy-Item $RemotePath $LocalPath
- return
- }
-
- $retries = 10
- while ($retries -gt 0) {
- $retries -= 1
- try {
- Invoke-WebRequest -UseBasicParsing -Uri $($RemotePath + $RemoteSuffix) -OutFile $LocalPath
- return
- }
- catch {
- Write-Verbose "Request failed. $retries retries remaining"
- }
- }
-
- Write-Error "Download failed: '$RemotePath'."
-}
-
-#
-# Main
-#
-
-# Load configuration or set defaults
-
-$Path = Resolve-Path $Path
-if (!$ConfigFile) { $ConfigFile = Join-Path $Path 'korebuild.json' }
-
-if (Test-Path $ConfigFile) {
- try {
- $config = Get-Content -Raw -Encoding UTF8 -Path $ConfigFile | ConvertFrom-Json
- if ($config) {
- if (!($Channel) -and (Get-Member -Name 'channel' -InputObject $config)) { [string] $Channel = $config.channel }
- if (!($ToolsSource) -and (Get-Member -Name 'toolsSource' -InputObject $config)) { [string] $ToolsSource = $config.toolsSource}
- }
- }
- catch {
- Write-Host -ForegroundColor Red $Error[0]
- Write-Error "$ConfigFile contains invalid JSON."
- exit 1
- }
-}
-
-if (!$DotNetHome) {
- $DotNetHome = if ($env:DOTNET_HOME) { $env:DOTNET_HOME } `
- elseif ($env:USERPROFILE) { Join-Path $env:USERPROFILE '.dotnet'} `
- elseif ($env:HOME) {Join-Path $env:HOME '.dotnet'}`
- else { Join-Path $PSScriptRoot '.dotnet'}
-}
-
-if (!$Channel) { $Channel = 'master' }
-if (!$ToolsSource) { $ToolsSource = 'https://aspnetcore.blob.core.windows.net/buildtools' }
-
-# Execute
-
-$korebuildPath = Get-KoreBuild
-Import-Module -Force -Scope Local (Join-Path $korebuildPath 'KoreBuild.psd1')
-
-try {
- Set-KoreBuildSettings -ToolsSource $ToolsSource -DotNetHome $DotNetHome -RepoPath $Path -ConfigFile $ConfigFile -CI:$CI
- Invoke-KoreBuildCommand $Command @Arguments
-}
-finally {
- Remove-Module 'KoreBuild' -ErrorAction Ignore
-}
diff --git a/run.sh b/run.sh
deleted file mode 100755
index 4c1fed5646ca811ed28e7bd5f47ec62da9a1fe9f..0000000000000000000000000000000000000000
--- a/run.sh
+++ /dev/null
@@ -1,256 +0,0 @@
-#!/usr/bin/env bash
-
-set -euo pipefail
-
-#
-# variables
-#
-
-RESET="\033[0m"
-RED="\033[0;31m"
-YELLOW="\033[0;33m"
-MAGENTA="\033[0;95m"
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-[ -z "${DOTNET_HOME:-}" ] && DOTNET_HOME="$HOME/.dotnet"
-verbose=false
-update=false
-reinstall=false
-repo_path="$DIR"
-channel=''
-tools_source=''
-tools_source_suffix=''
-ci=false
-
-#
-# Functions
-#
-__usage() {
- echo "Usage: $(basename "${BASH_SOURCE[0]}") command [options] [[--] <Arguments>...]"
- echo ""
- echo "Arguments:"
- echo " command The command to be run."
- echo " <Arguments>... Arguments passed to the command. Variable number of arguments allowed."
- echo ""
- echo "Options:"
- echo " --verbose Show verbose output."
- echo " -c|--channel <CHANNEL> The channel of KoreBuild to download. Overrides the value from the config file.."
- echo " --config-file <FILE> The path to the configuration file that stores values. Defaults to korebuild.json."
- echo " -d|--dotnet-home <DIR> The directory where .NET Core tools will be stored. Defaults to '\$DOTNET_HOME' or '\$HOME/.dotnet."
- echo " --path <PATH> The directory to build. Defaults to the directory containing the script."
- echo " -s|--tools-source|-ToolsSource <URL> The base url where build tools can be downloaded. Overrides the value from the config file."
- echo " --tools-source-suffix|-ToolsSourceSuffix <SUFFIX> The suffix to append to tools-source. Useful for query strings."
- echo " -u|--update Update to the latest KoreBuild even if the lock file is present."
- echo " --reinstall Reinstall KoreBuild."
- echo " --ci Apply CI specific settings and environment variables."
- echo ""
- echo "Description:"
- echo " This function will create a file \$DIR/korebuild-lock.txt. This lock file can be committed to source, but does not have to be."
- echo " When the lockfile is not present, KoreBuild will create one using latest available version from \$channel."
-
- if [[ "${1:-}" != '--no-exit' ]]; then
- exit 2
- fi
-}
-
-get_korebuild() {
- local version
- local lock_file="$repo_path/korebuild-lock.txt"
- if [ ! -f "$lock_file" ] || [ "$update" = true ]; then
- __get_remote_file "$tools_source/korebuild/channels/$channel/latest.txt" "$lock_file" "$tools_source_suffix"
- fi
- version="$(grep 'version:*' -m 1 "$lock_file")"
- if [[ "$version" == '' ]]; then
- __error "Failed to parse version from $lock_file. Expected a line that begins with 'version:'"
- return 1
- fi
- version="$(echo "${version#version:}" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')"
- local korebuild_path="$DOTNET_HOME/buildtools/korebuild/$version"
-
- if [ "$reinstall" = true ] && [ -d "$korebuild_path" ]; then
- rm -rf "$korebuild_path"
- fi
-
- {
- if [ ! -d "$korebuild_path" ]; then
- mkdir -p "$korebuild_path"
- local remote_path="$tools_source/korebuild/artifacts/$version/korebuild.$version.zip"
- tmpfile="$(mktemp)"
- echo -e "${MAGENTA}Downloading KoreBuild ${version}${RESET}"
- if __get_remote_file "$remote_path" "$tmpfile" "$tools_source_suffix"; then
- unzip -q -d "$korebuild_path" "$tmpfile"
- fi
- rm "$tmpfile" || true
- fi
-
- source "$korebuild_path/KoreBuild.sh"
- } || {
- if [ -d "$korebuild_path" ]; then
- echo "Cleaning up after failed installation"
- rm -rf "$korebuild_path" || true
- fi
- return 1
- }
-}
-
-__error() {
- echo -e "${RED}error: $*${RESET}" 1>&2
-}
-
-__warn() {
- echo -e "${YELLOW}warning: $*${RESET}"
-}
-
-__machine_has() {
- hash "$1" > /dev/null 2>&1
- return $?
-}
-
-__get_remote_file() {
- local remote_path=$1
- local local_path=$2
- local remote_path_suffix=$3
-
- if [[ "$remote_path" != 'http'* ]]; then
- cp "$remote_path" "$local_path"
- return 0
- fi
-
- local failed=false
- if __machine_has wget; then
- wget --tries 10 --quiet -O "$local_path" "${remote_path}${remote_path_suffix}" || failed=true
- else
- failed=true
- fi
-
- if [ "$failed" = true ] && __machine_has curl; then
- failed=false
- curl --retry 10 -sSL -f --create-dirs -o "$local_path" "${remote_path}${remote_path_suffix}" || failed=true
- fi
-
- if [ "$failed" = true ]; then
- __error "Download failed: $remote_path" 1>&2
- return 1
- fi
-}
-
-#
-# main
-#
-
-command="${1:-}"
-shift
-
-while [[ $# -gt 0 ]]; do
- case $1 in
- -\?|-h|--help)
- __usage --no-exit
- exit 0
- ;;
- -c|--channel|-Channel)
- shift
- channel="${1:-}"
- [ -z "$channel" ] && __usage
- ;;
- --config-file|-ConfigFile)
- shift
- config_file="${1:-}"
- [ -z "$config_file" ] && __usage
- if [ ! -f "$config_file" ]; then
- __error "Invalid value for --config-file. $config_file does not exist."
- exit 1
- fi
- ;;
- -d|--dotnet-home|-DotNetHome)
- shift
- DOTNET_HOME="${1:-}"
- [ -z "$DOTNET_HOME" ] && __usage
- ;;
- --path|-Path)
- shift
- repo_path="${1:-}"
- [ -z "$repo_path" ] && __usage
- ;;
- -s|--tools-source|-ToolsSource)
- shift
- tools_source="${1:-}"
- [ -z "$tools_source" ] && __usage
- ;;
- --tools-source-suffix|-ToolsSourceSuffix)
- shift
- tools_source_suffix="${1:-}"
- [ -z "$tools_source_suffix" ] && __usage
- ;;
- -u|--update|-Update)
- update=true
- ;;
- --reinstall|-[Rr]einstall)
- reinstall=true
- ;;
- --ci|-[Cc][Ii])
- ci=true
- ;;
- --verbose|-Verbose)
- verbose=true
- ;;
- --)
- shift
- break
- ;;
- *)
- break
- ;;
- esac
- shift
-done
-
-if ! __machine_has unzip; then
- __error 'Missing required command: unzip'
- exit 1
-fi
-
-if ! __machine_has curl && ! __machine_has wget; then
- __error 'Missing required command. Either wget or curl is required.'
- exit 1
-fi
-
-[ -z "${config_file:-}" ] && config_file="$repo_path/korebuild.json"
-if [ -f "$config_file" ]; then
- if __machine_has jq ; then
- if jq '.' "$config_file" >/dev/null ; then
- config_channel="$(jq -r 'select(.channel!=null) | .channel' "$config_file")"
- config_tools_source="$(jq -r 'select(.toolsSource!=null) | .toolsSource' "$config_file")"
- else
- __error "$config_file contains invalid JSON."
- exit 1
- fi
- elif __machine_has python ; then
- if python -c "import json,codecs;obj=json.load(codecs.open('$config_file', 'r', 'utf-8-sig'))" >/dev/null ; then
- config_channel="$(python -c "import json,codecs;obj=json.load(codecs.open('$config_file', 'r', 'utf-8-sig'));print(obj['channel'] if 'channel' in obj else '')")"
- config_tools_source="$(python -c "import json,codecs;obj=json.load(codecs.open('$config_file', 'r', 'utf-8-sig'));print(obj['toolsSource'] if 'toolsSource' in obj else '')")"
- else
- __error "$config_file contains invalid JSON."
- exit 1
- fi
- elif __machine_has python3 ; then
- if python3 -c "import json,codecs;obj=json.load(codecs.open('$config_file', 'r', 'utf-8-sig'))" >/dev/null ; then
- config_channel="$(python3 -c "import json,codecs;obj=json.load(codecs.open('$config_file', 'r', 'utf-8-sig'));print(obj['channel'] if 'channel' in obj else '')")"
- config_tools_source="$(python3 -c "import json,codecs;obj=json.load(codecs.open('$config_file', 'r', 'utf-8-sig'));print(obj['toolsSource'] if 'toolsSource' in obj else '')")"
- else
- __error "$config_file contains invalid JSON."
- exit 1
- fi
- else
- __error 'Missing required command: jq or python. Could not parse the JSON file.'
- exit 1
- fi
-
- [ ! -z "${config_channel:-}" ] && channel="$config_channel"
- [ ! -z "${config_tools_source:-}" ] && tools_source="$config_tools_source"
-fi
-
-[ -z "$channel" ] && channel='master'
-[ -z "$tools_source" ] && tools_source='https://aspnetcore.blob.core.windows.net/buildtools'
-
-get_korebuild
-set_korebuildsettings "$tools_source" "$DOTNET_HOME" "$repo_path" "$config_file" "$ci"
-invoke_korebuild_command "$command" "$@"
diff --git a/.editorconfig b/src/Mvc/.editorconfig
similarity index 100%
rename from .editorconfig
rename to src/Mvc/.editorconfig
diff --git a/.gitignore b/src/Mvc/.gitignore
similarity index 100%
rename from .gitignore
rename to src/Mvc/.gitignore
diff --git a/Directory.Build.props b/src/Mvc/Directory.Build.props
similarity index 100%
rename from Directory.Build.props
rename to src/Mvc/Directory.Build.props
diff --git a/Directory.Build.targets b/src/Mvc/Directory.Build.targets
similarity index 100%
rename from Directory.Build.targets
rename to src/Mvc/Directory.Build.targets
diff --git a/Mvc.NoFun.sln b/src/Mvc/Mvc.NoFun.sln
similarity index 100%
rename from Mvc.NoFun.sln
rename to src/Mvc/Mvc.NoFun.sln
diff --git a/Mvc.sln b/src/Mvc/Mvc.sln
similarity index 100%
rename from Mvc.sln
rename to src/Mvc/Mvc.sln
diff --git a/NuGetPackageVerifier.json b/src/Mvc/NuGetPackageVerifier.json
similarity index 100%
rename from NuGetPackageVerifier.json
rename to src/Mvc/NuGetPackageVerifier.json
diff --git a/README.md b/src/Mvc/README.md
similarity index 100%
rename from README.md
rename to src/Mvc/README.md
diff --git a/Settings.StyleCop b/src/Mvc/Settings.StyleCop
similarity index 100%
rename from Settings.StyleCop
rename to src/Mvc/Settings.StyleCop
diff --git a/benchmarkapps/BasicApi/BasicApi.csproj b/src/Mvc/benchmarkapps/BasicApi/BasicApi.csproj
similarity index 100%
rename from benchmarkapps/BasicApi/BasicApi.csproj
rename to src/Mvc/benchmarkapps/BasicApi/BasicApi.csproj
diff --git a/benchmarkapps/BasicApi/Controllers/PetController.cs b/src/Mvc/benchmarkapps/BasicApi/Controllers/PetController.cs
similarity index 100%
rename from benchmarkapps/BasicApi/Controllers/PetController.cs
rename to src/Mvc/benchmarkapps/BasicApi/Controllers/PetController.cs
diff --git a/benchmarkapps/BasicApi/Controllers/TokenController.cs b/src/Mvc/benchmarkapps/BasicApi/Controllers/TokenController.cs
similarity index 100%
rename from benchmarkapps/BasicApi/Controllers/TokenController.cs
rename to src/Mvc/benchmarkapps/BasicApi/Controllers/TokenController.cs
diff --git a/benchmarkapps/BasicApi/Migrations/20180609000420_InitialCreate.Designer.cs b/src/Mvc/benchmarkapps/BasicApi/Migrations/20180609000420_InitialCreate.Designer.cs
similarity index 100%
rename from benchmarkapps/BasicApi/Migrations/20180609000420_InitialCreate.Designer.cs
rename to src/Mvc/benchmarkapps/BasicApi/Migrations/20180609000420_InitialCreate.Designer.cs
diff --git a/benchmarkapps/BasicApi/Migrations/20180609000420_InitialCreate.cs b/src/Mvc/benchmarkapps/BasicApi/Migrations/20180609000420_InitialCreate.cs
similarity index 100%
rename from benchmarkapps/BasicApi/Migrations/20180609000420_InitialCreate.cs
rename to src/Mvc/benchmarkapps/BasicApi/Migrations/20180609000420_InitialCreate.cs
diff --git a/benchmarkapps/BasicApi/Migrations/BasicApiContextModelSnapshot.cs b/src/Mvc/benchmarkapps/BasicApi/Migrations/BasicApiContextModelSnapshot.cs
similarity index 100%
rename from benchmarkapps/BasicApi/Migrations/BasicApiContextModelSnapshot.cs
rename to src/Mvc/benchmarkapps/BasicApi/Migrations/BasicApiContextModelSnapshot.cs
diff --git a/benchmarkapps/BasicApi/Models/BasicApiContext.cs b/src/Mvc/benchmarkapps/BasicApi/Models/BasicApiContext.cs
similarity index 100%
rename from benchmarkapps/BasicApi/Models/BasicApiContext.cs
rename to src/Mvc/benchmarkapps/BasicApi/Models/BasicApiContext.cs
diff --git a/benchmarkapps/BasicApi/Models/Category.cs b/src/Mvc/benchmarkapps/BasicApi/Models/Category.cs
similarity index 100%
rename from benchmarkapps/BasicApi/Models/Category.cs
rename to src/Mvc/benchmarkapps/BasicApi/Models/Category.cs
diff --git a/benchmarkapps/BasicApi/Models/Image.cs b/src/Mvc/benchmarkapps/BasicApi/Models/Image.cs
similarity index 100%
rename from benchmarkapps/BasicApi/Models/Image.cs
rename to src/Mvc/benchmarkapps/BasicApi/Models/Image.cs
diff --git a/benchmarkapps/BasicApi/Models/Pet.cs b/src/Mvc/benchmarkapps/BasicApi/Models/Pet.cs
similarity index 100%
rename from benchmarkapps/BasicApi/Models/Pet.cs
rename to src/Mvc/benchmarkapps/BasicApi/Models/Pet.cs
diff --git a/benchmarkapps/BasicApi/Models/Tag.cs b/src/Mvc/benchmarkapps/BasicApi/Models/Tag.cs
similarity index 100%
rename from benchmarkapps/BasicApi/Models/Tag.cs
rename to src/Mvc/benchmarkapps/BasicApi/Models/Tag.cs
diff --git a/benchmarkapps/BasicApi/Startup.cs b/src/Mvc/benchmarkapps/BasicApi/Startup.cs
similarity index 100%
rename from benchmarkapps/BasicApi/Startup.cs
rename to src/Mvc/benchmarkapps/BasicApi/Startup.cs
diff --git a/benchmarkapps/BasicApi/benchmarks.json b/src/Mvc/benchmarkapps/BasicApi/benchmarks.json
similarity index 100%
rename from benchmarkapps/BasicApi/benchmarks.json
rename to src/Mvc/benchmarkapps/BasicApi/benchmarks.json
diff --git a/benchmarkapps/BasicApi/getWithToken.lua b/src/Mvc/benchmarkapps/BasicApi/getWithToken.lua
similarity index 100%
rename from benchmarkapps/BasicApi/getWithToken.lua
rename to src/Mvc/benchmarkapps/BasicApi/getWithToken.lua
diff --git a/benchmarkapps/BasicApi/postJsonWithToken.lua b/src/Mvc/benchmarkapps/BasicApi/postJsonWithToken.lua
similarity index 100%
rename from benchmarkapps/BasicApi/postJsonWithToken.lua
rename to src/Mvc/benchmarkapps/BasicApi/postJsonWithToken.lua
diff --git a/benchmarkapps/BasicApi/runtimeconfig.template.json b/src/Mvc/benchmarkapps/BasicApi/runtimeconfig.template.json
similarity index 100%
rename from benchmarkapps/BasicApi/runtimeconfig.template.json
rename to src/Mvc/benchmarkapps/BasicApi/runtimeconfig.template.json
diff --git a/benchmarkapps/BasicViews/BasicViews.csproj b/src/Mvc/benchmarkapps/BasicViews/BasicViews.csproj
similarity index 100%
rename from benchmarkapps/BasicViews/BasicViews.csproj
rename to src/Mvc/benchmarkapps/BasicViews/BasicViews.csproj
diff --git a/benchmarkapps/BasicViews/BasicViewsContext.cs b/src/Mvc/benchmarkapps/BasicViews/BasicViewsContext.cs
similarity index 100%
rename from benchmarkapps/BasicViews/BasicViewsContext.cs
rename to src/Mvc/benchmarkapps/BasicViews/BasicViewsContext.cs
diff --git a/benchmarkapps/BasicViews/Components/CurrentUser.cs b/src/Mvc/benchmarkapps/BasicViews/Components/CurrentUser.cs
similarity index 100%
rename from benchmarkapps/BasicViews/Components/CurrentUser.cs
rename to src/Mvc/benchmarkapps/BasicViews/Components/CurrentUser.cs
diff --git a/benchmarkapps/BasicViews/Controllers/HomeController.cs b/src/Mvc/benchmarkapps/BasicViews/Controllers/HomeController.cs
similarity index 100%
rename from benchmarkapps/BasicViews/Controllers/HomeController.cs
rename to src/Mvc/benchmarkapps/BasicViews/Controllers/HomeController.cs
diff --git a/benchmarkapps/BasicViews/Migrations/20180609000611_InitialCreate.Designer.cs b/src/Mvc/benchmarkapps/BasicViews/Migrations/20180609000611_InitialCreate.Designer.cs
similarity index 100%
rename from benchmarkapps/BasicViews/Migrations/20180609000611_InitialCreate.Designer.cs
rename to src/Mvc/benchmarkapps/BasicViews/Migrations/20180609000611_InitialCreate.Designer.cs
diff --git a/benchmarkapps/BasicViews/Migrations/20180609000611_InitialCreate.cs b/src/Mvc/benchmarkapps/BasicViews/Migrations/20180609000611_InitialCreate.cs
similarity index 100%
rename from benchmarkapps/BasicViews/Migrations/20180609000611_InitialCreate.cs
rename to src/Mvc/benchmarkapps/BasicViews/Migrations/20180609000611_InitialCreate.cs
diff --git a/benchmarkapps/BasicViews/Migrations/BasicViewsContextModelSnapshot.cs b/src/Mvc/benchmarkapps/BasicViews/Migrations/BasicViewsContextModelSnapshot.cs
similarity index 100%
rename from benchmarkapps/BasicViews/Migrations/BasicViewsContextModelSnapshot.cs
rename to src/Mvc/benchmarkapps/BasicViews/Migrations/BasicViewsContextModelSnapshot.cs
diff --git a/benchmarkapps/BasicViews/Person.cs b/src/Mvc/benchmarkapps/BasicViews/Person.cs
similarity index 100%
rename from benchmarkapps/BasicViews/Person.cs
rename to src/Mvc/benchmarkapps/BasicViews/Person.cs
diff --git a/benchmarkapps/BasicViews/Startup.cs b/src/Mvc/benchmarkapps/BasicViews/Startup.cs
similarity index 100%
rename from benchmarkapps/BasicViews/Startup.cs
rename to src/Mvc/benchmarkapps/BasicViews/Startup.cs
diff --git a/benchmarkapps/BasicViews/Views/Home/HtmlHelpers.cshtml b/src/Mvc/benchmarkapps/BasicViews/Views/Home/HtmlHelpers.cshtml
similarity index 100%
rename from benchmarkapps/BasicViews/Views/Home/HtmlHelpers.cshtml
rename to src/Mvc/benchmarkapps/BasicViews/Views/Home/HtmlHelpers.cshtml
diff --git a/benchmarkapps/BasicViews/Views/Home/Index.cshtml b/src/Mvc/benchmarkapps/BasicViews/Views/Home/Index.cshtml
similarity index 100%
rename from benchmarkapps/BasicViews/Views/Home/Index.cshtml
rename to src/Mvc/benchmarkapps/BasicViews/Views/Home/Index.cshtml
diff --git a/benchmarkapps/BasicViews/Views/Shared/_Layout.cshtml b/src/Mvc/benchmarkapps/BasicViews/Views/Shared/_Layout.cshtml
similarity index 100%
rename from benchmarkapps/BasicViews/Views/Shared/_Layout.cshtml
rename to src/Mvc/benchmarkapps/BasicViews/Views/Shared/_Layout.cshtml
diff --git a/benchmarkapps/BasicViews/Views/_ViewImports.cshtml b/src/Mvc/benchmarkapps/BasicViews/Views/_ViewImports.cshtml
similarity index 100%
rename from benchmarkapps/BasicViews/Views/_ViewImports.cshtml
rename to src/Mvc/benchmarkapps/BasicViews/Views/_ViewImports.cshtml
diff --git a/benchmarkapps/BasicViews/Views/_ViewStart.cshtml b/src/Mvc/benchmarkapps/BasicViews/Views/_ViewStart.cshtml
similarity index 100%
rename from benchmarkapps/BasicViews/Views/_ViewStart.cshtml
rename to src/Mvc/benchmarkapps/BasicViews/Views/_ViewStart.cshtml
diff --git a/benchmarkapps/BasicViews/benchmarks.json b/src/Mvc/benchmarkapps/BasicViews/benchmarks.json
similarity index 100%
rename from benchmarkapps/BasicViews/benchmarks.json
rename to src/Mvc/benchmarkapps/BasicViews/benchmarks.json
diff --git a/benchmarkapps/BasicViews/post.lua b/src/Mvc/benchmarkapps/BasicViews/post.lua
similarity index 100%
rename from benchmarkapps/BasicViews/post.lua
rename to src/Mvc/benchmarkapps/BasicViews/post.lua
diff --git a/benchmarkapps/BasicViews/postWithToken.lua b/src/Mvc/benchmarkapps/BasicViews/postWithToken.lua
similarity index 100%
rename from benchmarkapps/BasicViews/postWithToken.lua
rename to src/Mvc/benchmarkapps/BasicViews/postWithToken.lua
diff --git a/benchmarkapps/BasicViews/runtimeconfig.template.json b/src/Mvc/benchmarkapps/BasicViews/runtimeconfig.template.json
similarity index 100%
rename from benchmarkapps/BasicViews/runtimeconfig.template.json
rename to src/Mvc/benchmarkapps/BasicViews/runtimeconfig.template.json
diff --git a/benchmarkapps/BasicViews/web.config b/src/Mvc/benchmarkapps/BasicViews/web.config
similarity index 100%
rename from benchmarkapps/BasicViews/web.config
rename to src/Mvc/benchmarkapps/BasicViews/web.config
diff --git a/benchmarkapps/BasicViews/wwwroot/css/site.css b/src/Mvc/benchmarkapps/BasicViews/wwwroot/css/site.css
similarity index 100%
rename from benchmarkapps/BasicViews/wwwroot/css/site.css
rename to src/Mvc/benchmarkapps/BasicViews/wwwroot/css/site.css
diff --git a/benchmarkapps/BasicViews/wwwroot/css/site.min.css b/src/Mvc/benchmarkapps/BasicViews/wwwroot/css/site.min.css
similarity index 100%
rename from benchmarkapps/BasicViews/wwwroot/css/site.min.css
rename to src/Mvc/benchmarkapps/BasicViews/wwwroot/css/site.min.css
diff --git a/benchmarkapps/BasicViews/wwwroot/js/site.js b/src/Mvc/benchmarkapps/BasicViews/wwwroot/js/site.js
similarity index 100%
rename from benchmarkapps/BasicViews/wwwroot/js/site.js
rename to src/Mvc/benchmarkapps/BasicViews/wwwroot/js/site.js
diff --git a/benchmarkapps/BasicViews/wwwroot/js/site.min.js b/src/Mvc/benchmarkapps/BasicViews/wwwroot/js/site.min.js
similarity index 100%
rename from benchmarkapps/BasicViews/wwwroot/js/site.min.js
rename to src/Mvc/benchmarkapps/BasicViews/wwwroot/js/site.min.js
diff --git a/benchmarkapps/README.md b/src/Mvc/benchmarkapps/README.md
similarity index 100%
rename from benchmarkapps/README.md
rename to src/Mvc/benchmarkapps/README.md
diff --git a/benchmarkapps/RazorRendering/Data/DataA.cs b/src/Mvc/benchmarkapps/RazorRendering/Data/DataA.cs
similarity index 100%
rename from benchmarkapps/RazorRendering/Data/DataA.cs
rename to src/Mvc/benchmarkapps/RazorRendering/Data/DataA.cs
diff --git a/benchmarkapps/RazorRendering/Data/DataB.cs b/src/Mvc/benchmarkapps/RazorRendering/Data/DataB.cs
similarity index 100%
rename from benchmarkapps/RazorRendering/Data/DataB.cs
rename to src/Mvc/benchmarkapps/RazorRendering/Data/DataB.cs
diff --git a/benchmarkapps/RazorRendering/Pages/Category/PageA.cshtml b/src/Mvc/benchmarkapps/RazorRendering/Pages/Category/PageA.cshtml
similarity index 100%
rename from benchmarkapps/RazorRendering/Pages/Category/PageA.cshtml
rename to src/Mvc/benchmarkapps/RazorRendering/Pages/Category/PageA.cshtml
diff --git a/benchmarkapps/RazorRendering/Pages/Category/PageA.cshtml.cs b/src/Mvc/benchmarkapps/RazorRendering/Pages/Category/PageA.cshtml.cs
similarity index 100%
rename from benchmarkapps/RazorRendering/Pages/Category/PageA.cshtml.cs
rename to src/Mvc/benchmarkapps/RazorRendering/Pages/Category/PageA.cshtml.cs
diff --git a/benchmarkapps/RazorRendering/Pages/Category/_Subcategories.cshtml b/src/Mvc/benchmarkapps/RazorRendering/Pages/Category/_Subcategories.cshtml
similarity index 100%
rename from benchmarkapps/RazorRendering/Pages/Category/_Subcategories.cshtml
rename to src/Mvc/benchmarkapps/RazorRendering/Pages/Category/_Subcategories.cshtml
diff --git a/benchmarkapps/RazorRendering/Pages/Page.cs b/src/Mvc/benchmarkapps/RazorRendering/Pages/Page.cs
similarity index 100%
rename from benchmarkapps/RazorRendering/Pages/Page.cs
rename to src/Mvc/benchmarkapps/RazorRendering/Pages/Page.cs
diff --git a/benchmarkapps/RazorRendering/Pages/Shared/_Layout.cshtml b/src/Mvc/benchmarkapps/RazorRendering/Pages/Shared/_Layout.cshtml
similarity index 100%
rename from benchmarkapps/RazorRendering/Pages/Shared/_Layout.cshtml
rename to src/Mvc/benchmarkapps/RazorRendering/Pages/Shared/_Layout.cshtml
diff --git a/benchmarkapps/RazorRendering/Pages/_ViewImports.cshtml b/src/Mvc/benchmarkapps/RazorRendering/Pages/_ViewImports.cshtml
similarity index 100%
rename from benchmarkapps/RazorRendering/Pages/_ViewImports.cshtml
rename to src/Mvc/benchmarkapps/RazorRendering/Pages/_ViewImports.cshtml
diff --git a/benchmarkapps/RazorRendering/Pages/_ViewStart.cshtml b/src/Mvc/benchmarkapps/RazorRendering/Pages/_ViewStart.cshtml
similarity index 100%
rename from benchmarkapps/RazorRendering/Pages/_ViewStart.cshtml
rename to src/Mvc/benchmarkapps/RazorRendering/Pages/_ViewStart.cshtml
diff --git a/benchmarkapps/RazorRendering/RazorRendering.csproj b/src/Mvc/benchmarkapps/RazorRendering/RazorRendering.csproj
similarity index 100%
rename from benchmarkapps/RazorRendering/RazorRendering.csproj
rename to src/Mvc/benchmarkapps/RazorRendering/RazorRendering.csproj
diff --git a/benchmarkapps/RazorRendering/Readme.md b/src/Mvc/benchmarkapps/RazorRendering/Readme.md
similarity index 100%
rename from benchmarkapps/RazorRendering/Readme.md
rename to src/Mvc/benchmarkapps/RazorRendering/Readme.md
diff --git a/benchmarkapps/RazorRendering/Startup.cs b/src/Mvc/benchmarkapps/RazorRendering/Startup.cs
similarity index 100%
rename from benchmarkapps/RazorRendering/Startup.cs
rename to src/Mvc/benchmarkapps/RazorRendering/Startup.cs
diff --git a/benchmarks/Microsoft.AspNetCore.Mvc.Performance.Views/HelperExtensions.cs b/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance.Views/HelperExtensions.cs
similarity index 100%
rename from benchmarks/Microsoft.AspNetCore.Mvc.Performance.Views/HelperExtensions.cs
rename to src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance.Views/HelperExtensions.cs
diff --git a/benchmarks/Microsoft.AspNetCore.Mvc.Performance.Views/Microsoft.AspNetCore.Mvc.Performance.Views.csproj b/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance.Views/Microsoft.AspNetCore.Mvc.Performance.Views.csproj
similarity index 100%
rename from benchmarks/Microsoft.AspNetCore.Mvc.Performance.Views/Microsoft.AspNetCore.Mvc.Performance.Views.csproj
rename to src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance.Views/Microsoft.AspNetCore.Mvc.Performance.Views.csproj
diff --git a/benchmarks/Microsoft.AspNetCore.Mvc.Performance.Views/ViewAssemblyMarker.cs b/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance.Views/ViewAssemblyMarker.cs
similarity index 100%
rename from benchmarks/Microsoft.AspNetCore.Mvc.Performance.Views/ViewAssemblyMarker.cs
rename to src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance.Views/ViewAssemblyMarker.cs
diff --git a/benchmarks/Microsoft.AspNetCore.Mvc.Performance.Views/Views/HelloWorld.cshtml b/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance.Views/Views/HelloWorld.cshtml
similarity index 100%
rename from benchmarks/Microsoft.AspNetCore.Mvc.Performance.Views/Views/HelloWorld.cshtml
rename to src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance.Views/Views/HelloWorld.cshtml
diff --git a/benchmarks/Microsoft.AspNetCore.Mvc.Performance.Views/Views/HelperDynamic.cshtml b/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance.Views/Views/HelperDynamic.cshtml
similarity index 100%
rename from benchmarks/Microsoft.AspNetCore.Mvc.Performance.Views/Views/HelperDynamic.cshtml
rename to src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance.Views/Views/HelperDynamic.cshtml
diff --git a/benchmarks/Microsoft.AspNetCore.Mvc.Performance.Views/Views/HelperExtensions.cshtml b/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance.Views/Views/HelperExtensions.cshtml
similarity index 100%
rename from benchmarks/Microsoft.AspNetCore.Mvc.Performance.Views/Views/HelperExtensions.cshtml
rename to src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance.Views/Views/HelperExtensions.cshtml
diff --git a/benchmarks/Microsoft.AspNetCore.Mvc.Performance.Views/Views/HelperPartialAsync.cshtml b/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance.Views/Views/HelperPartialAsync.cshtml
similarity index 100%
rename from benchmarks/Microsoft.AspNetCore.Mvc.Performance.Views/Views/HelperPartialAsync.cshtml
rename to src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance.Views/Views/HelperPartialAsync.cshtml
diff --git a/benchmarks/Microsoft.AspNetCore.Mvc.Performance.Views/Views/HelperPartialSync.cshtml b/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance.Views/Views/HelperPartialSync.cshtml
similarity index 100%
rename from benchmarks/Microsoft.AspNetCore.Mvc.Performance.Views/Views/HelperPartialSync.cshtml
rename to src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance.Views/Views/HelperPartialSync.cshtml
diff --git a/benchmarks/Microsoft.AspNetCore.Mvc.Performance.Views/Views/HelperPartialTagHelper.cshtml b/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance.Views/Views/HelperPartialTagHelper.cshtml
similarity index 100%
rename from benchmarks/Microsoft.AspNetCore.Mvc.Performance.Views/Views/HelperPartialTagHelper.cshtml
rename to src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance.Views/Views/HelperPartialTagHelper.cshtml
diff --git a/benchmarks/Microsoft.AspNetCore.Mvc.Performance.Views/Views/HelperPartial_Partial.cshtml b/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance.Views/Views/HelperPartial_Partial.cshtml
similarity index 100%
rename from benchmarks/Microsoft.AspNetCore.Mvc.Performance.Views/Views/HelperPartial_Partial.cshtml
rename to src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance.Views/Views/HelperPartial_Partial.cshtml
diff --git a/benchmarks/Microsoft.AspNetCore.Mvc.Performance.Views/Views/HelperTyped.cshtml b/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance.Views/Views/HelperTyped.cshtml
similarity index 100%
rename from benchmarks/Microsoft.AspNetCore.Mvc.Performance.Views/Views/HelperTyped.cshtml
rename to src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance.Views/Views/HelperTyped.cshtml
diff --git a/benchmarks/Microsoft.AspNetCore.Mvc.Performance/ActionSelectorBenchmark.cs b/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance/ActionSelectorBenchmark.cs
similarity index 100%
rename from benchmarks/Microsoft.AspNetCore.Mvc.Performance/ActionSelectorBenchmark.cs
rename to src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance/ActionSelectorBenchmark.cs
diff --git a/benchmarks/Microsoft.AspNetCore.Mvc.Performance/AssemblyInfo.cs b/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance/AssemblyInfo.cs
similarity index 100%
rename from benchmarks/Microsoft.AspNetCore.Mvc.Performance/AssemblyInfo.cs
rename to src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance/AssemblyInfo.cs
diff --git a/benchmarks/Microsoft.AspNetCore.Mvc.Performance/HelperPerformanceBenchmark.cs b/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance/HelperPerformanceBenchmark.cs
similarity index 100%
rename from benchmarks/Microsoft.AspNetCore.Mvc.Performance/HelperPerformanceBenchmark.cs
rename to src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance/HelperPerformanceBenchmark.cs
diff --git a/benchmarks/Microsoft.AspNetCore.Mvc.Performance/Microsoft.AspNetCore.Mvc.Performance.csproj b/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance/Microsoft.AspNetCore.Mvc.Performance.csproj
similarity index 100%
rename from benchmarks/Microsoft.AspNetCore.Mvc.Performance/Microsoft.AspNetCore.Mvc.Performance.csproj
rename to src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance/Microsoft.AspNetCore.Mvc.Performance.csproj
diff --git a/benchmarks/Microsoft.AspNetCore.Mvc.Performance/MvcEndpointDatasourceBenchmark.cs b/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance/MvcEndpointDatasourceBenchmark.cs
similarity index 100%
rename from benchmarks/Microsoft.AspNetCore.Mvc.Performance/MvcEndpointDatasourceBenchmark.cs
rename to src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance/MvcEndpointDatasourceBenchmark.cs
diff --git a/benchmarks/Microsoft.AspNetCore.Mvc.Performance/RuntimePerformanceBenchmarkBase.cs b/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance/RuntimePerformanceBenchmarkBase.cs
similarity index 100%
rename from benchmarks/Microsoft.AspNetCore.Mvc.Performance/RuntimePerformanceBenchmarkBase.cs
rename to src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance/RuntimePerformanceBenchmarkBase.cs
diff --git a/benchmarks/Microsoft.AspNetCore.Mvc.Performance/ValidationVisitorBenchmarkBase.cs b/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance/ValidationVisitorBenchmarkBase.cs
similarity index 100%
rename from benchmarks/Microsoft.AspNetCore.Mvc.Performance/ValidationVisitorBenchmarkBase.cs
rename to src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance/ValidationVisitorBenchmarkBase.cs
diff --git a/benchmarks/Microsoft.AspNetCore.Mvc.Performance/ValidationVisitorByteArrayBenchmark.cs b/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance/ValidationVisitorByteArrayBenchmark.cs
similarity index 100%
rename from benchmarks/Microsoft.AspNetCore.Mvc.Performance/ValidationVisitorByteArrayBenchmark.cs
rename to src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance/ValidationVisitorByteArrayBenchmark.cs
diff --git a/benchmarks/Microsoft.AspNetCore.Mvc.Performance/ValidationVisitorModelWithValidatedProperties.cs b/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance/ValidationVisitorModelWithValidatedProperties.cs
similarity index 100%
rename from benchmarks/Microsoft.AspNetCore.Mvc.Performance/ValidationVisitorModelWithValidatedProperties.cs
rename to src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance/ValidationVisitorModelWithValidatedProperties.cs
diff --git a/benchmarks/Microsoft.AspNetCore.Mvc.Performance/readme.md b/src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance/readme.md
similarity index 100%
rename from benchmarks/Microsoft.AspNetCore.Mvc.Performance/readme.md
rename to src/Mvc/benchmarks/Microsoft.AspNetCore.Mvc.Performance/readme.md
diff --git a/build/Key.snk b/src/Mvc/build/Key.snk
similarity index 100%
rename from build/Key.snk
rename to src/Mvc/build/Key.snk
diff --git a/build/buildpipeline/linux.groovy b/src/Mvc/build/buildpipeline/linux.groovy
similarity index 100%
rename from build/buildpipeline/linux.groovy
rename to src/Mvc/build/buildpipeline/linux.groovy
diff --git a/build/buildpipeline/osx.groovy b/src/Mvc/build/buildpipeline/osx.groovy
similarity index 100%
rename from build/buildpipeline/osx.groovy
rename to src/Mvc/build/buildpipeline/osx.groovy
diff --git a/build/buildpipeline/pipeline.groovy b/src/Mvc/build/buildpipeline/pipeline.groovy
similarity index 100%
rename from build/buildpipeline/pipeline.groovy
rename to src/Mvc/build/buildpipeline/pipeline.groovy
diff --git a/build/buildpipeline/windows.groovy b/src/Mvc/build/buildpipeline/windows.groovy
similarity index 100%
rename from build/buildpipeline/windows.groovy
rename to src/Mvc/build/buildpipeline/windows.groovy
diff --git a/build/dependencies.props b/src/Mvc/build/dependencies.props
similarity index 100%
rename from build/dependencies.props
rename to src/Mvc/build/dependencies.props
diff --git a/build/repo.props b/src/Mvc/build/repo.props
similarity index 100%
rename from build/repo.props
rename to src/Mvc/build/repo.props
diff --git a/build/sources.props b/src/Mvc/build/sources.props
similarity index 100%
rename from build/sources.props
rename to src/Mvc/build/sources.props
diff --git a/buildWithProcDump.cmd b/src/Mvc/buildWithProcDump.cmd
similarity index 100%
rename from buildWithProcDump.cmd
rename to src/Mvc/buildWithProcDump.cmd
diff --git a/global.json b/src/Mvc/global.json
similarity index 100%
rename from global.json
rename to src/Mvc/global.json
diff --git a/runWithProcDump.ps1 b/src/Mvc/runWithProcDump.ps1
similarity index 100%
rename from runWithProcDump.ps1
rename to src/Mvc/runWithProcDump.ps1
diff --git a/samples/MvcSandbox/.bowerrc b/src/Mvc/samples/MvcSandbox/.bowerrc
similarity index 100%
rename from samples/MvcSandbox/.bowerrc
rename to src/Mvc/samples/MvcSandbox/.bowerrc
diff --git a/samples/MvcSandbox/.gitignore b/src/Mvc/samples/MvcSandbox/.gitignore
similarity index 100%
rename from samples/MvcSandbox/.gitignore
rename to src/Mvc/samples/MvcSandbox/.gitignore
diff --git a/samples/MvcSandbox/Controllers/HomeController.cs b/src/Mvc/samples/MvcSandbox/Controllers/HomeController.cs
similarity index 100%
rename from samples/MvcSandbox/Controllers/HomeController.cs
rename to src/Mvc/samples/MvcSandbox/Controllers/HomeController.cs
diff --git a/samples/MvcSandbox/Controllers/LoginController.cs b/src/Mvc/samples/MvcSandbox/Controllers/LoginController.cs
similarity index 100%
rename from samples/MvcSandbox/Controllers/LoginController.cs
rename to src/Mvc/samples/MvcSandbox/Controllers/LoginController.cs
diff --git a/samples/MvcSandbox/HealthChecks/HealthChecksEndpointRouteBuilderExtensions.cs b/src/Mvc/samples/MvcSandbox/HealthChecks/HealthChecksEndpointRouteBuilderExtensions.cs
similarity index 100%
rename from samples/MvcSandbox/HealthChecks/HealthChecksEndpointRouteBuilderExtensions.cs
rename to src/Mvc/samples/MvcSandbox/HealthChecks/HealthChecksEndpointRouteBuilderExtensions.cs
diff --git a/samples/MvcSandbox/Models/Index.cs b/src/Mvc/samples/MvcSandbox/Models/Index.cs
similarity index 100%
rename from samples/MvcSandbox/Models/Index.cs
rename to src/Mvc/samples/MvcSandbox/Models/Index.cs
diff --git a/samples/MvcSandbox/Models/TestModel.cs b/src/Mvc/samples/MvcSandbox/Models/TestModel.cs
similarity index 100%
rename from samples/MvcSandbox/Models/TestModel.cs
rename to src/Mvc/samples/MvcSandbox/Models/TestModel.cs
diff --git a/samples/MvcSandbox/MvcSandbox.csproj b/src/Mvc/samples/MvcSandbox/MvcSandbox.csproj
similarity index 100%
rename from samples/MvcSandbox/MvcSandbox.csproj
rename to src/Mvc/samples/MvcSandbox/MvcSandbox.csproj
diff --git a/samples/MvcSandbox/Pages/PagesHome.cshtml b/src/Mvc/samples/MvcSandbox/Pages/PagesHome.cshtml
similarity index 100%
rename from samples/MvcSandbox/Pages/PagesHome.cshtml
rename to src/Mvc/samples/MvcSandbox/Pages/PagesHome.cshtml
diff --git a/samples/MvcSandbox/Pages/_ViewImports.cshtml b/src/Mvc/samples/MvcSandbox/Pages/_ViewImports.cshtml
similarity index 100%
rename from samples/MvcSandbox/Pages/_ViewImports.cshtml
rename to src/Mvc/samples/MvcSandbox/Pages/_ViewImports.cshtml
diff --git a/samples/MvcSandbox/Pages/_ViewStart.cshtml b/src/Mvc/samples/MvcSandbox/Pages/_ViewStart.cshtml
similarity index 100%
rename from samples/MvcSandbox/Pages/_ViewStart.cshtml
rename to src/Mvc/samples/MvcSandbox/Pages/_ViewStart.cshtml
diff --git a/samples/MvcSandbox/Startup.cs b/src/Mvc/samples/MvcSandbox/Startup.cs
similarity index 100%
rename from samples/MvcSandbox/Startup.cs
rename to src/Mvc/samples/MvcSandbox/Startup.cs
diff --git a/samples/MvcSandbox/Views/Home/Index.cshtml b/src/Mvc/samples/MvcSandbox/Views/Home/Index.cshtml
similarity index 100%
rename from samples/MvcSandbox/Views/Home/Index.cshtml
rename to src/Mvc/samples/MvcSandbox/Views/Home/Index.cshtml
diff --git a/samples/MvcSandbox/Views/Shared/_Layout.cshtml b/src/Mvc/samples/MvcSandbox/Views/Shared/_Layout.cshtml
similarity index 100%
rename from samples/MvcSandbox/Views/Shared/_Layout.cshtml
rename to src/Mvc/samples/MvcSandbox/Views/Shared/_Layout.cshtml
diff --git a/samples/MvcSandbox/Views/_ViewImports.cshtml b/src/Mvc/samples/MvcSandbox/Views/_ViewImports.cshtml
similarity index 100%
rename from samples/MvcSandbox/Views/_ViewImports.cshtml
rename to src/Mvc/samples/MvcSandbox/Views/_ViewImports.cshtml
diff --git a/samples/MvcSandbox/Views/_ViewStart.cshtml b/src/Mvc/samples/MvcSandbox/Views/_ViewStart.cshtml
similarity index 100%
rename from samples/MvcSandbox/Views/_ViewStart.cshtml
rename to src/Mvc/samples/MvcSandbox/Views/_ViewStart.cshtml
diff --git a/src/Directory.Build.props b/src/Mvc/src/Directory.Build.props
similarity index 100%
rename from src/Directory.Build.props
rename to src/Mvc/src/Directory.Build.props
diff --git a/src/GetDocumentInsider/AnsiConsole.cs b/src/Mvc/src/GetDocumentInsider/AnsiConsole.cs
similarity index 100%
rename from src/GetDocumentInsider/AnsiConsole.cs
rename to src/Mvc/src/GetDocumentInsider/AnsiConsole.cs
diff --git a/src/GetDocumentInsider/AnsiConstants.cs b/src/Mvc/src/GetDocumentInsider/AnsiConstants.cs
similarity index 100%
rename from src/GetDocumentInsider/AnsiConstants.cs
rename to src/Mvc/src/GetDocumentInsider/AnsiConstants.cs
diff --git a/src/GetDocumentInsider/AnsiTextWriter.cs b/src/Mvc/src/GetDocumentInsider/AnsiTextWriter.cs
similarity index 100%
rename from src/GetDocumentInsider/AnsiTextWriter.cs
rename to src/Mvc/src/GetDocumentInsider/AnsiTextWriter.cs
diff --git a/src/GetDocumentInsider/CommandException.cs b/src/Mvc/src/GetDocumentInsider/CommandException.cs
similarity index 100%
rename from src/GetDocumentInsider/CommandException.cs
rename to src/Mvc/src/GetDocumentInsider/CommandException.cs
diff --git a/src/GetDocumentInsider/CommandLineUtils/CommandArgument.cs b/src/Mvc/src/GetDocumentInsider/CommandLineUtils/CommandArgument.cs
similarity index 100%
rename from src/GetDocumentInsider/CommandLineUtils/CommandArgument.cs
rename to src/Mvc/src/GetDocumentInsider/CommandLineUtils/CommandArgument.cs
diff --git a/src/GetDocumentInsider/CommandLineUtils/CommandLineApplication.cs b/src/Mvc/src/GetDocumentInsider/CommandLineUtils/CommandLineApplication.cs
similarity index 100%
rename from src/GetDocumentInsider/CommandLineUtils/CommandLineApplication.cs
rename to src/Mvc/src/GetDocumentInsider/CommandLineUtils/CommandLineApplication.cs
diff --git a/src/GetDocumentInsider/CommandLineUtils/CommandLineApplicationExtensions.cs b/src/Mvc/src/GetDocumentInsider/CommandLineUtils/CommandLineApplicationExtensions.cs
similarity index 100%
rename from src/GetDocumentInsider/CommandLineUtils/CommandLineApplicationExtensions.cs
rename to src/Mvc/src/GetDocumentInsider/CommandLineUtils/CommandLineApplicationExtensions.cs
diff --git a/src/GetDocumentInsider/CommandLineUtils/CommandOption.cs b/src/Mvc/src/GetDocumentInsider/CommandLineUtils/CommandOption.cs
similarity index 100%
rename from src/GetDocumentInsider/CommandLineUtils/CommandOption.cs
rename to src/Mvc/src/GetDocumentInsider/CommandLineUtils/CommandOption.cs
diff --git a/src/GetDocumentInsider/CommandLineUtils/CommandOptionType.cs b/src/Mvc/src/GetDocumentInsider/CommandLineUtils/CommandOptionType.cs
similarity index 100%
rename from src/GetDocumentInsider/CommandLineUtils/CommandOptionType.cs
rename to src/Mvc/src/GetDocumentInsider/CommandLineUtils/CommandOptionType.cs
diff --git a/src/GetDocumentInsider/CommandLineUtils/CommandParsingException.cs b/src/Mvc/src/GetDocumentInsider/CommandLineUtils/CommandParsingException.cs
similarity index 100%
rename from src/GetDocumentInsider/CommandLineUtils/CommandParsingException.cs
rename to src/Mvc/src/GetDocumentInsider/CommandLineUtils/CommandParsingException.cs
diff --git a/src/GetDocumentInsider/Commands/CommandBase.cs b/src/Mvc/src/GetDocumentInsider/Commands/CommandBase.cs
similarity index 100%
rename from src/GetDocumentInsider/Commands/CommandBase.cs
rename to src/Mvc/src/GetDocumentInsider/Commands/CommandBase.cs
diff --git a/src/GetDocumentInsider/Commands/GetDocumentCommand.cs b/src/Mvc/src/GetDocumentInsider/Commands/GetDocumentCommand.cs
similarity index 100%
rename from src/GetDocumentInsider/Commands/GetDocumentCommand.cs
rename to src/Mvc/src/GetDocumentInsider/Commands/GetDocumentCommand.cs
diff --git a/src/GetDocumentInsider/Commands/GetDocumentCommandContext.cs b/src/Mvc/src/GetDocumentInsider/Commands/GetDocumentCommandContext.cs
similarity index 100%
rename from src/GetDocumentInsider/Commands/GetDocumentCommandContext.cs
rename to src/Mvc/src/GetDocumentInsider/Commands/GetDocumentCommandContext.cs
diff --git a/src/GetDocumentInsider/Commands/GetDocumentCommandWorker.cs b/src/Mvc/src/GetDocumentInsider/Commands/GetDocumentCommandWorker.cs
similarity index 100%
rename from src/GetDocumentInsider/Commands/GetDocumentCommandWorker.cs
rename to src/Mvc/src/GetDocumentInsider/Commands/GetDocumentCommandWorker.cs
diff --git a/src/GetDocumentInsider/Commands/HelpCommandBase.cs b/src/Mvc/src/GetDocumentInsider/Commands/HelpCommandBase.cs
similarity index 100%
rename from src/GetDocumentInsider/Commands/HelpCommandBase.cs
rename to src/Mvc/src/GetDocumentInsider/Commands/HelpCommandBase.cs
diff --git a/src/GetDocumentInsider/Commands/ProjectCommandBase.cs b/src/Mvc/src/GetDocumentInsider/Commands/ProjectCommandBase.cs
similarity index 100%
rename from src/GetDocumentInsider/Commands/ProjectCommandBase.cs
rename to src/Mvc/src/GetDocumentInsider/Commands/ProjectCommandBase.cs
diff --git a/src/GetDocumentInsider/GetDocumentInsider.csproj b/src/Mvc/src/GetDocumentInsider/GetDocumentInsider.csproj
similarity index 100%
rename from src/GetDocumentInsider/GetDocumentInsider.csproj
rename to src/Mvc/src/GetDocumentInsider/GetDocumentInsider.csproj
diff --git a/src/GetDocumentInsider/ProductInfo.cs b/src/Mvc/src/GetDocumentInsider/ProductInfo.cs
similarity index 100%
rename from src/GetDocumentInsider/ProductInfo.cs
rename to src/Mvc/src/GetDocumentInsider/ProductInfo.cs
diff --git a/src/GetDocumentInsider/Program.cs b/src/Mvc/src/GetDocumentInsider/Program.cs
similarity index 100%
rename from src/GetDocumentInsider/Program.cs
rename to src/Mvc/src/GetDocumentInsider/Program.cs
diff --git a/src/GetDocumentInsider/Properties/Resources.Designer.cs b/src/Mvc/src/GetDocumentInsider/Properties/Resources.Designer.cs
similarity index 100%
rename from src/GetDocumentInsider/Properties/Resources.Designer.cs
rename to src/Mvc/src/GetDocumentInsider/Properties/Resources.Designer.cs
diff --git a/src/GetDocumentInsider/Reporter.cs b/src/Mvc/src/GetDocumentInsider/Reporter.cs
similarity index 100%
rename from src/GetDocumentInsider/Reporter.cs
rename to src/Mvc/src/GetDocumentInsider/Reporter.cs
diff --git a/src/GetDocumentInsider/Resources.resx b/src/Mvc/src/GetDocumentInsider/Resources.resx
similarity index 100%
rename from src/GetDocumentInsider/Resources.resx
rename to src/Mvc/src/GetDocumentInsider/Resources.resx
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/Abstractions/ActionDescriptor.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Abstractions/ActionDescriptor.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/Abstractions/ActionDescriptor.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Abstractions/ActionDescriptor.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/Abstractions/ActionDescriptorExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Abstractions/ActionDescriptorExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/Abstractions/ActionDescriptorExtensions.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Abstractions/ActionDescriptorExtensions.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/Abstractions/ActionDescriptorProviderContext.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Abstractions/ActionDescriptorProviderContext.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/Abstractions/ActionDescriptorProviderContext.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Abstractions/ActionDescriptorProviderContext.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/Abstractions/ActionInvokerProviderContext.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Abstractions/ActionInvokerProviderContext.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/Abstractions/ActionInvokerProviderContext.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Abstractions/ActionInvokerProviderContext.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/Abstractions/IActionDescriptorProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Abstractions/IActionDescriptorProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/Abstractions/IActionDescriptorProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Abstractions/IActionDescriptorProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/Abstractions/IActionInvoker.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Abstractions/IActionInvoker.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/Abstractions/IActionInvoker.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Abstractions/IActionInvoker.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/Abstractions/IActionInvokerProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Abstractions/IActionInvokerProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/Abstractions/IActionInvokerProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Abstractions/IActionInvokerProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/Abstractions/ParameterDescriptor.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Abstractions/ParameterDescriptor.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/Abstractions/ParameterDescriptor.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Abstractions/ParameterDescriptor.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/ActionConstraints/ActionConstraintContext.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ActionConstraints/ActionConstraintContext.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/ActionConstraints/ActionConstraintContext.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ActionConstraints/ActionConstraintContext.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/ActionConstraints/ActionConstraintItem.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ActionConstraints/ActionConstraintItem.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/ActionConstraints/ActionConstraintItem.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ActionConstraints/ActionConstraintItem.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/ActionConstraints/ActionConstraintProviderContext.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ActionConstraints/ActionConstraintProviderContext.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/ActionConstraints/ActionConstraintProviderContext.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ActionConstraints/ActionConstraintProviderContext.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/ActionConstraints/ActionSelectorCandidate.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ActionConstraints/ActionSelectorCandidate.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/ActionConstraints/ActionSelectorCandidate.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ActionConstraints/ActionSelectorCandidate.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/ActionConstraints/IActionConstraint.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ActionConstraints/IActionConstraint.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/ActionConstraints/IActionConstraint.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ActionConstraints/IActionConstraint.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/ActionConstraints/IActionConstraintFactory.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ActionConstraints/IActionConstraintFactory.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/ActionConstraints/IActionConstraintFactory.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ActionConstraints/IActionConstraintFactory.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/ActionConstraints/IActionConstraintMetadata.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ActionConstraints/IActionConstraintMetadata.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/ActionConstraints/IActionConstraintMetadata.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ActionConstraints/IActionConstraintMetadata.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/ActionConstraints/IActionConstraintProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ActionConstraints/IActionConstraintProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/ActionConstraints/IActionConstraintProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ActionConstraints/IActionConstraintProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/ActionContext.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ActionContext.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/ActionContext.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ActionContext.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/ApiExplorer/ApiDescription.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ApiExplorer/ApiDescription.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/ApiExplorer/ApiDescription.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ApiExplorer/ApiDescription.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/ApiExplorer/ApiDescriptionProviderContext.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ApiExplorer/ApiDescriptionProviderContext.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/ApiExplorer/ApiDescriptionProviderContext.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ApiExplorer/ApiDescriptionProviderContext.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/ApiExplorer/ApiParameterDescription.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ApiExplorer/ApiParameterDescription.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/ApiExplorer/ApiParameterDescription.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ApiExplorer/ApiParameterDescription.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/ApiExplorer/ApiParameterRouteInfo.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ApiExplorer/ApiParameterRouteInfo.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/ApiExplorer/ApiParameterRouteInfo.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ApiExplorer/ApiParameterRouteInfo.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/ApiExplorer/ApiRequestFormat.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ApiExplorer/ApiRequestFormat.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/ApiExplorer/ApiRequestFormat.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ApiExplorer/ApiRequestFormat.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/ApiExplorer/ApiResponseFormat.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ApiExplorer/ApiResponseFormat.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/ApiExplorer/ApiResponseFormat.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ApiExplorer/ApiResponseFormat.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/ApiExplorer/ApiResponseType.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ApiExplorer/ApiResponseType.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/ApiExplorer/ApiResponseType.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ApiExplorer/ApiResponseType.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/ApiExplorer/IApiDescriptionProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ApiExplorer/IApiDescriptionProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/ApiExplorer/IApiDescriptionProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ApiExplorer/IApiDescriptionProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/Authorization/IAllowAnonymousFilter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Authorization/IAllowAnonymousFilter.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/Authorization/IAllowAnonymousFilter.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Authorization/IAllowAnonymousFilter.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/ActionExecutedContext.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/ActionExecutedContext.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/ActionExecutedContext.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/ActionExecutedContext.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/ActionExecutingContext.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/ActionExecutingContext.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/ActionExecutingContext.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/ActionExecutingContext.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/ActionExecutionDelegate.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/ActionExecutionDelegate.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/ActionExecutionDelegate.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/ActionExecutionDelegate.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/AuthorizationFilterContext.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/AuthorizationFilterContext.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/AuthorizationFilterContext.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/AuthorizationFilterContext.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/ExceptionContext.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/ExceptionContext.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/ExceptionContext.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/ExceptionContext.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/FilterContext.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/FilterContext.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/FilterContext.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/FilterContext.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/FilterDescriptor.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/FilterDescriptor.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/FilterDescriptor.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/FilterDescriptor.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/FilterItem.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/FilterItem.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/FilterItem.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/FilterItem.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/FilterProviderContext.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/FilterProviderContext.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/FilterProviderContext.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/FilterProviderContext.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IActionFilter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IActionFilter.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IActionFilter.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IActionFilter.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IAlwaysRunResultFilter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IAlwaysRunResultFilter.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IAlwaysRunResultFilter.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IAlwaysRunResultFilter.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IAsyncActionFilter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IAsyncActionFilter.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IAsyncActionFilter.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IAsyncActionFilter.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IAsyncAlwaysRunResultFilter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IAsyncAlwaysRunResultFilter.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IAsyncAlwaysRunResultFilter.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IAsyncAlwaysRunResultFilter.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IAsyncAuthorizationFilter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IAsyncAuthorizationFilter.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IAsyncAuthorizationFilter.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IAsyncAuthorizationFilter.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IAsyncExceptionFilter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IAsyncExceptionFilter.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IAsyncExceptionFilter.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IAsyncExceptionFilter.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IAsyncResourceFilter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IAsyncResourceFilter.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IAsyncResourceFilter.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IAsyncResourceFilter.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IAsyncResultFilter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IAsyncResultFilter.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IAsyncResultFilter.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IAsyncResultFilter.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IAuthorizationFilter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IAuthorizationFilter.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IAuthorizationFilter.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IAuthorizationFilter.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IExceptionFilter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IExceptionFilter.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IExceptionFilter.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IExceptionFilter.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IFilterContainer.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IFilterContainer.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IFilterContainer.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IFilterContainer.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IFilterFactory.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IFilterFactory.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IFilterFactory.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IFilterFactory.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IFilterMetadata.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IFilterMetadata.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IFilterMetadata.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IFilterMetadata.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IFilterProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IFilterProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IFilterProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IFilterProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IOrderedFilter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IOrderedFilter.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IOrderedFilter.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IOrderedFilter.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IResourceFilter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IResourceFilter.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IResourceFilter.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IResourceFilter.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IResultFilter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IResultFilter.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IResultFilter.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/IResultFilter.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/ResourceExecutedContext.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/ResourceExecutedContext.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/ResourceExecutedContext.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/ResourceExecutedContext.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/ResourceExecutingContext.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/ResourceExecutingContext.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/ResourceExecutingContext.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/ResourceExecutingContext.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/ResourceExecutionDelegate.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/ResourceExecutionDelegate.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/ResourceExecutionDelegate.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/ResourceExecutionDelegate.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/ResultExecutedContext.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/ResultExecutedContext.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/ResultExecutedContext.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/ResultExecutedContext.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/ResultExecutingContext.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/ResultExecutingContext.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/ResultExecutingContext.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/ResultExecutingContext.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/ResultExecutionDelegate.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/ResultExecutionDelegate.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/ResultExecutionDelegate.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Filters/ResultExecutionDelegate.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/Formatters/FormatterCollection.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Formatters/FormatterCollection.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/Formatters/FormatterCollection.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Formatters/FormatterCollection.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/Formatters/IInputFormatter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Formatters/IInputFormatter.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/Formatters/IInputFormatter.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Formatters/IInputFormatter.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/Formatters/IInputFormatterExceptionPolicy.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Formatters/IInputFormatterExceptionPolicy.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/Formatters/IInputFormatterExceptionPolicy.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Formatters/IInputFormatterExceptionPolicy.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/Formatters/IOutputFormatter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Formatters/IOutputFormatter.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/Formatters/IOutputFormatter.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Formatters/IOutputFormatter.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/Formatters/InputFormatterContext.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Formatters/InputFormatterContext.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/Formatters/InputFormatterContext.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Formatters/InputFormatterContext.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/Formatters/InputFormatterException.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Formatters/InputFormatterException.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/Formatters/InputFormatterException.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Formatters/InputFormatterException.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/Formatters/InputFormatterExceptionPolicy.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Formatters/InputFormatterExceptionPolicy.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/Formatters/InputFormatterExceptionPolicy.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Formatters/InputFormatterExceptionPolicy.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/Formatters/InputFormatterResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Formatters/InputFormatterResult.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/Formatters/InputFormatterResult.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Formatters/InputFormatterResult.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/Formatters/OutputFormatterCanWriteContext.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Formatters/OutputFormatterCanWriteContext.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/Formatters/OutputFormatterCanWriteContext.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Formatters/OutputFormatterCanWriteContext.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/Formatters/OutputFormatterWriteContext.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Formatters/OutputFormatterWriteContext.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/Formatters/OutputFormatterWriteContext.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Formatters/OutputFormatterWriteContext.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/IActionResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/IActionResult.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/IActionResult.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/IActionResult.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/IUrlHelper.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/IUrlHelper.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/IUrlHelper.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/IUrlHelper.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/Microsoft.AspNetCore.Mvc.Abstractions.csproj b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Microsoft.AspNetCore.Mvc.Abstractions.csproj
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/Microsoft.AspNetCore.Mvc.Abstractions.csproj
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Microsoft.AspNetCore.Mvc.Abstractions.csproj
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/BindingInfo.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/BindingInfo.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/BindingInfo.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/BindingInfo.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/BindingSource.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/BindingSource.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/BindingSource.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/BindingSource.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/CompositeBindingSource.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/CompositeBindingSource.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/CompositeBindingSource.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/CompositeBindingSource.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/EnumGroupAndName.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/EnumGroupAndName.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/EnumGroupAndName.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/EnumGroupAndName.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/IBinderTypeProviderMetadata.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/IBinderTypeProviderMetadata.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/IBinderTypeProviderMetadata.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/IBinderTypeProviderMetadata.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/IBindingSourceMetadata.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/IBindingSourceMetadata.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/IBindingSourceMetadata.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/IBindingSourceMetadata.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/IModelBinder.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/IModelBinder.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/IModelBinder.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/IModelBinder.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/IModelBinderProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/IModelBinderProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/IModelBinderProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/IModelBinderProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/IModelMetadataProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/IModelMetadataProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/IModelMetadataProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/IModelMetadataProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/IModelNameProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/IModelNameProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/IModelNameProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/IModelNameProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/IPropertyFilterProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/IPropertyFilterProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/IPropertyFilterProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/IPropertyFilterProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/IRequestPredicateProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/IRequestPredicateProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/IRequestPredicateProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/IRequestPredicateProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/IValueProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/IValueProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/IValueProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/IValueProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/IValueProviderFactory.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/IValueProviderFactory.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/IValueProviderFactory.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/IValueProviderFactory.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Metadata/ModelBindingMessageProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Metadata/ModelBindingMessageProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Metadata/ModelBindingMessageProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Metadata/ModelBindingMessageProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Metadata/ModelMetadataIdentity.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Metadata/ModelMetadataIdentity.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Metadata/ModelMetadataIdentity.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Metadata/ModelMetadataIdentity.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Metadata/ModelMetadataKind.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Metadata/ModelMetadataKind.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Metadata/ModelMetadataKind.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Metadata/ModelMetadataKind.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ModelBinderProviderContext.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ModelBinderProviderContext.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ModelBinderProviderContext.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ModelBinderProviderContext.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ModelBindingContext.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ModelBindingContext.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ModelBindingContext.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ModelBindingContext.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ModelBindingResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ModelBindingResult.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ModelBindingResult.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ModelBindingResult.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ModelError.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ModelError.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ModelError.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ModelError.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ModelErrorCollection.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ModelErrorCollection.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ModelErrorCollection.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ModelErrorCollection.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ModelMetadata.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ModelMetadata.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ModelMetadata.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ModelMetadata.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ModelMetadataProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ModelMetadataProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ModelMetadataProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ModelMetadataProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ModelPropertyCollection.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ModelPropertyCollection.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ModelPropertyCollection.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ModelPropertyCollection.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ModelStateDictionary.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ModelStateDictionary.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ModelStateDictionary.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ModelStateDictionary.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ModelStateEntry.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ModelStateEntry.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ModelStateEntry.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ModelStateEntry.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ModelValidationState.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ModelValidationState.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ModelValidationState.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ModelValidationState.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/TooManyModelErrorsException.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/TooManyModelErrorsException.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/TooManyModelErrorsException.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/TooManyModelErrorsException.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/ClientModelValidationContext.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/ClientModelValidationContext.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/ClientModelValidationContext.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/ClientModelValidationContext.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/ClientValidatorItem.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/ClientValidatorItem.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/ClientValidatorItem.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/ClientValidatorItem.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/ClientValidatorProviderContext.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/ClientValidatorProviderContext.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/ClientValidatorProviderContext.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/ClientValidatorProviderContext.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/IClientModelValidator.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/IClientModelValidator.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/IClientModelValidator.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/IClientModelValidator.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/IClientModelValidatorProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/IClientModelValidatorProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/IClientModelValidatorProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/IClientModelValidatorProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/IModelValidator.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/IModelValidator.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/IModelValidator.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/IModelValidator.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/IModelValidatorProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/IModelValidatorProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/IModelValidatorProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/IModelValidatorProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/IPropertyValidationFilter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/IPropertyValidationFilter.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/IPropertyValidationFilter.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/IPropertyValidationFilter.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/IValidationStrategy.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/IValidationStrategy.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/IValidationStrategy.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/IValidationStrategy.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/ModelValidationContext.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/ModelValidationContext.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/ModelValidationContext.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/ModelValidationContext.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/ModelValidationContextBase.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/ModelValidationContextBase.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/ModelValidationContextBase.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/ModelValidationContextBase.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/ModelValidationResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/ModelValidationResult.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/ModelValidationResult.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/ModelValidationResult.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/ModelValidatorProviderContext.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/ModelValidatorProviderContext.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/ModelValidatorProviderContext.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/ModelValidatorProviderContext.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/ValidationEntry.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/ValidationEntry.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/ValidationEntry.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/ValidationEntry.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/ValidationStateDictionary.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/ValidationStateDictionary.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/ValidationStateDictionary.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/ValidationStateDictionary.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/ValidationStateEntry.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/ValidationStateEntry.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/ValidationStateEntry.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/ValidationStateEntry.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/ValidatorItem.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/ValidatorItem.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/ValidatorItem.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/Validation/ValidatorItem.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ValueProviderFactoryContext.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ValueProviderFactoryContext.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ValueProviderFactoryContext.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ValueProviderFactoryContext.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ValueProviderResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ValueProviderResult.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ValueProviderResult.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/ModelBinding/ValueProviderResult.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/Properties/AssemblyInfo.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/Properties/AssemblyInfo.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Properties/AssemblyInfo.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/Properties/Resources.Designer.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Properties/Resources.Designer.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/Properties/Resources.Designer.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Properties/Resources.Designer.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/Resources.resx b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Resources.resx
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/Resources.resx
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Resources.resx
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/Routing/AttributeRouteInfo.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Routing/AttributeRouteInfo.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/Routing/AttributeRouteInfo.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Routing/AttributeRouteInfo.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/Routing/UrlActionContext.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Routing/UrlActionContext.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/Routing/UrlActionContext.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Routing/UrlActionContext.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/Routing/UrlRouteContext.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Routing/UrlRouteContext.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/Routing/UrlRouteContext.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/Routing/UrlRouteContext.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/baseline.netcore.json b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/baseline.netcore.json
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Abstractions/baseline.netcore.json
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Abstractions/baseline.netcore.json
diff --git a/src/Microsoft.AspNetCore.Mvc.Analyzers/AttributesShouldNotBeAppliedToPageModelAnalyzer.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers/AttributesShouldNotBeAppliedToPageModelAnalyzer.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Analyzers/AttributesShouldNotBeAppliedToPageModelAnalyzer.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers/AttributesShouldNotBeAppliedToPageModelAnalyzer.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Analyzers/AvoidHtmlPartialAnalyzer.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers/AvoidHtmlPartialAnalyzer.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Analyzers/AvoidHtmlPartialAnalyzer.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers/AvoidHtmlPartialAnalyzer.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Analyzers/CodeAnalysisExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers/CodeAnalysisExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Analyzers/CodeAnalysisExtensions.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers/CodeAnalysisExtensions.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Analyzers/DiagnosticDescriptors.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers/DiagnosticDescriptors.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Analyzers/DiagnosticDescriptors.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers/DiagnosticDescriptors.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Analyzers/Microsoft.AspNetCore.Mvc.Analyzers.csproj b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers/Microsoft.AspNetCore.Mvc.Analyzers.csproj
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Analyzers/Microsoft.AspNetCore.Mvc.Analyzers.csproj
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers/Microsoft.AspNetCore.Mvc.Analyzers.csproj
diff --git a/src/Microsoft.AspNetCore.Mvc.Analyzers/Microsoft.AspNetCore.Mvc.Analyzers.nuspec b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers/Microsoft.AspNetCore.Mvc.Analyzers.nuspec
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Analyzers/Microsoft.AspNetCore.Mvc.Analyzers.nuspec
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers/Microsoft.AspNetCore.Mvc.Analyzers.nuspec
diff --git a/src/Microsoft.AspNetCore.Mvc.Analyzers/MvcFacts.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers/MvcFacts.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Analyzers/MvcFacts.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers/MvcFacts.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Analyzers/Properties/AssemblyInfo.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Analyzers/Properties/AssemblyInfo.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers/Properties/AssemblyInfo.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Analyzers/SymbolNames.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers/SymbolNames.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Analyzers/SymbolNames.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers/SymbolNames.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Analyzers/TopLevelParameterNameAnalyzer.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers/TopLevelParameterNameAnalyzer.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Analyzers/TopLevelParameterNameAnalyzer.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers/TopLevelParameterNameAnalyzer.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Analyzers/ViewFeatureAnalyzerBase.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers/ViewFeatureAnalyzerBase.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Analyzers/ViewFeatureAnalyzerBase.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers/ViewFeatureAnalyzerBase.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Analyzers/ViewFeaturesAnalyzerContext.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers/ViewFeaturesAnalyzerContext.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Analyzers/ViewFeaturesAnalyzerContext.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Analyzers/ViewFeaturesAnalyzerContext.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Api.Analyzers/ActualApiResponseMetadata.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Api.Analyzers/ActualApiResponseMetadata.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Api.Analyzers/ActualApiResponseMetadata.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Api.Analyzers/ActualApiResponseMetadata.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Api.Analyzers/ActualApiResponseMetadataFactory.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Api.Analyzers/ActualApiResponseMetadataFactory.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Api.Analyzers/ActualApiResponseMetadataFactory.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Api.Analyzers/ActualApiResponseMetadataFactory.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Api.Analyzers/AddResponseTypeAttributeCodeFixAction.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Api.Analyzers/AddResponseTypeAttributeCodeFixAction.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Api.Analyzers/AddResponseTypeAttributeCodeFixAction.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Api.Analyzers/AddResponseTypeAttributeCodeFixAction.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Api.Analyzers/AddResponseTypeAttributeCodeFixProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Api.Analyzers/AddResponseTypeAttributeCodeFixProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Api.Analyzers/AddResponseTypeAttributeCodeFixProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Api.Analyzers/AddResponseTypeAttributeCodeFixProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Api.Analyzers/ApiActionsDoNotRequireExplicitModelValidationCheckAnalyzer.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Api.Analyzers/ApiActionsDoNotRequireExplicitModelValidationCheckAnalyzer.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Api.Analyzers/ApiActionsDoNotRequireExplicitModelValidationCheckAnalyzer.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Api.Analyzers/ApiActionsDoNotRequireExplicitModelValidationCheckAnalyzer.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Api.Analyzers/ApiActionsDoNotRequireExplicitModelValidationCodeFixProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Api.Analyzers/ApiActionsDoNotRequireExplicitModelValidationCodeFixProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Api.Analyzers/ApiActionsDoNotRequireExplicitModelValidationCodeFixProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Api.Analyzers/ApiActionsDoNotRequireExplicitModelValidationCodeFixProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Api.Analyzers/ApiControllerFacts.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Api.Analyzers/ApiControllerFacts.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Api.Analyzers/ApiControllerFacts.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Api.Analyzers/ApiControllerFacts.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Api.Analyzers/ApiControllerSymbolCache.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Api.Analyzers/ApiControllerSymbolCache.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Api.Analyzers/ApiControllerSymbolCache.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Api.Analyzers/ApiControllerSymbolCache.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Api.Analyzers/ApiConventionAnalyzer.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Api.Analyzers/ApiConventionAnalyzer.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Api.Analyzers/ApiConventionAnalyzer.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Api.Analyzers/ApiConventionAnalyzer.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Api.Analyzers/ApiDiagnosticDescriptors.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Api.Analyzers/ApiDiagnosticDescriptors.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Api.Analyzers/ApiDiagnosticDescriptors.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Api.Analyzers/ApiDiagnosticDescriptors.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Api.Analyzers/ApiSymbolNames.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Api.Analyzers/ApiSymbolNames.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Api.Analyzers/ApiSymbolNames.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Api.Analyzers/ApiSymbolNames.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Api.Analyzers/DeclaredApiResponseMetadata.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Api.Analyzers/DeclaredApiResponseMetadata.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Api.Analyzers/DeclaredApiResponseMetadata.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Api.Analyzers/DeclaredApiResponseMetadata.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Api.Analyzers/Microsoft.AspNetCore.Mvc.Api.Analyzers.csproj b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Api.Analyzers/Microsoft.AspNetCore.Mvc.Api.Analyzers.csproj
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Api.Analyzers/Microsoft.AspNetCore.Mvc.Api.Analyzers.csproj
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Api.Analyzers/Microsoft.AspNetCore.Mvc.Api.Analyzers.csproj
diff --git a/src/Microsoft.AspNetCore.Mvc.Api.Analyzers/Microsoft.AspNetCore.Mvc.Api.Analyzers.nuspec b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Api.Analyzers/Microsoft.AspNetCore.Mvc.Api.Analyzers.nuspec
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Api.Analyzers/Microsoft.AspNetCore.Mvc.Api.Analyzers.nuspec
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Api.Analyzers/Microsoft.AspNetCore.Mvc.Api.Analyzers.nuspec
diff --git a/src/Microsoft.AspNetCore.Mvc.Api.Analyzers/Properties/AssemblyInfo.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Api.Analyzers/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Api.Analyzers/Properties/AssemblyInfo.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Api.Analyzers/Properties/AssemblyInfo.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Api.Analyzers/SymbolApiConventionMatcher.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Api.Analyzers/SymbolApiConventionMatcher.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Api.Analyzers/SymbolApiConventionMatcher.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Api.Analyzers/SymbolApiConventionMatcher.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Api.Analyzers/SymbolApiResponseMetadataProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Api.Analyzers/SymbolApiResponseMetadataProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Api.Analyzers/SymbolApiResponseMetadataProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Api.Analyzers/SymbolApiResponseMetadataProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ApiExplorer/ApiDescriptionExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ApiExplorer/ApiDescriptionExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ApiExplorer/ApiDescriptionExtensions.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ApiExplorer/ApiDescriptionExtensions.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ApiExplorer/ApiDescriptionGroup.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ApiExplorer/ApiDescriptionGroup.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ApiExplorer/ApiDescriptionGroup.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ApiExplorer/ApiDescriptionGroup.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ApiExplorer/ApiDescriptionGroupCollection.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ApiExplorer/ApiDescriptionGroupCollection.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ApiExplorer/ApiDescriptionGroupCollection.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ApiExplorer/ApiDescriptionGroupCollection.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ApiExplorer/ApiDescriptionGroupCollectionProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ApiExplorer/ApiDescriptionGroupCollectionProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ApiExplorer/ApiDescriptionGroupCollectionProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ApiExplorer/ApiDescriptionGroupCollectionProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ApiExplorer/ApiParameterContext.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ApiExplorer/ApiParameterContext.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ApiExplorer/ApiParameterContext.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ApiExplorer/ApiParameterContext.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ApiExplorer/ApiResponseTypeProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ApiExplorer/ApiResponseTypeProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ApiExplorer/ApiResponseTypeProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ApiExplorer/ApiResponseTypeProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ApiExplorer/DefaultApiDescriptionProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ApiExplorer/DefaultApiDescriptionProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ApiExplorer/DefaultApiDescriptionProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ApiExplorer/DefaultApiDescriptionProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ApiExplorer/DependencyInjection/MvcApiExplorerMvcCoreBuilderExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ApiExplorer/DependencyInjection/MvcApiExplorerMvcCoreBuilderExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ApiExplorer/DependencyInjection/MvcApiExplorerMvcCoreBuilderExtensions.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ApiExplorer/DependencyInjection/MvcApiExplorerMvcCoreBuilderExtensions.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ApiExplorer/IApiDescriptionGroupCollectionProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ApiExplorer/IApiDescriptionGroupCollectionProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ApiExplorer/IApiDescriptionGroupCollectionProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ApiExplorer/IApiDescriptionGroupCollectionProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ApiExplorer/Microsoft.AspNetCore.Mvc.ApiExplorer.csproj b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ApiExplorer/Microsoft.AspNetCore.Mvc.ApiExplorer.csproj
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ApiExplorer/Microsoft.AspNetCore.Mvc.ApiExplorer.csproj
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ApiExplorer/Microsoft.AspNetCore.Mvc.ApiExplorer.csproj
diff --git a/src/Microsoft.AspNetCore.Mvc.ApiExplorer/Properties/AssemblyInfo.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ApiExplorer/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ApiExplorer/Properties/AssemblyInfo.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ApiExplorer/Properties/AssemblyInfo.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ApiExplorer/baseline.netcore.json b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ApiExplorer/baseline.netcore.json
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ApiExplorer/baseline.netcore.json
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ApiExplorer/baseline.netcore.json
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/AcceptVerbsAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/AcceptVerbsAttribute.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/AcceptVerbsAttribute.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/AcceptVerbsAttribute.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/AcceptedAtActionResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/AcceptedAtActionResult.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/AcceptedAtActionResult.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/AcceptedAtActionResult.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/AcceptedAtRouteResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/AcceptedAtRouteResult.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/AcceptedAtRouteResult.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/AcceptedAtRouteResult.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/AcceptedResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/AcceptedResult.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/AcceptedResult.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/AcceptedResult.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ActionConstraints/ActionConstraintCache.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ActionConstraints/ActionConstraintCache.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ActionConstraints/ActionConstraintCache.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ActionConstraints/ActionConstraintCache.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ActionConstraints/ActionMethodSelectorAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ActionConstraints/ActionMethodSelectorAttribute.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ActionConstraints/ActionMethodSelectorAttribute.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ActionConstraints/ActionMethodSelectorAttribute.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ActionConstraints/DefaultActionConstraintProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ActionConstraints/DefaultActionConstraintProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ActionConstraints/DefaultActionConstraintProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ActionConstraints/DefaultActionConstraintProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ActionConstraints/HttpMethodActionConstraint.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ActionConstraints/HttpMethodActionConstraint.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ActionConstraints/HttpMethodActionConstraint.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ActionConstraints/HttpMethodActionConstraint.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ActionConstraints/IConsumesActionConstraint.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ActionConstraints/IConsumesActionConstraint.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ActionConstraints/IConsumesActionConstraint.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ActionConstraints/IConsumesActionConstraint.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ActionContextAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ActionContextAttribute.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ActionContextAttribute.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ActionContextAttribute.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ActionNameAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ActionNameAttribute.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ActionNameAttribute.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ActionNameAttribute.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ActionResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ActionResult.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ActionResult.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ActionResult.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ActionResultOfT.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ActionResultOfT.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ActionResultOfT.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ActionResultOfT.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/AntiforgeryValidationFailedResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/AntiforgeryValidationFailedResult.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/AntiforgeryValidationFailedResult.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/AntiforgeryValidationFailedResult.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ApiBehaviorOptions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApiBehaviorOptions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ApiBehaviorOptions.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApiBehaviorOptions.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ApiControllerAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApiControllerAttribute.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ApiControllerAttribute.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApiControllerAttribute.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ApiConventionMethodAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApiConventionMethodAttribute.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ApiConventionMethodAttribute.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApiConventionMethodAttribute.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ApiConventionTypeAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApiConventionTypeAttribute.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ApiConventionTypeAttribute.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApiConventionTypeAttribute.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ApiExplorer/ApiConventionMatcher.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApiExplorer/ApiConventionMatcher.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ApiExplorer/ApiConventionMatcher.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApiExplorer/ApiConventionMatcher.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ApiExplorer/ApiConventionNameMatchAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApiExplorer/ApiConventionNameMatchAttribute.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ApiExplorer/ApiConventionNameMatchAttribute.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApiExplorer/ApiConventionNameMatchAttribute.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ApiExplorer/ApiConventionNameMatchBehavior.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApiExplorer/ApiConventionNameMatchBehavior.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ApiExplorer/ApiConventionNameMatchBehavior.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApiExplorer/ApiConventionNameMatchBehavior.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ApiExplorer/ApiConventionResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApiExplorer/ApiConventionResult.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ApiExplorer/ApiConventionResult.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApiExplorer/ApiConventionResult.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ApiExplorer/ApiConventionTypeMatchAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApiExplorer/ApiConventionTypeMatchAttribute.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ApiExplorer/ApiConventionTypeMatchAttribute.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApiExplorer/ApiConventionTypeMatchAttribute.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ApiExplorer/ApiConventionTypeMatchBehavior.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApiExplorer/ApiConventionTypeMatchBehavior.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ApiExplorer/ApiConventionTypeMatchBehavior.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApiExplorer/ApiConventionTypeMatchBehavior.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ApiExplorer/ApiDescriptionActionData.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApiExplorer/ApiDescriptionActionData.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ApiExplorer/ApiDescriptionActionData.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApiExplorer/ApiDescriptionActionData.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ApiExplorer/IApiDefaultResponseMetadataProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApiExplorer/IApiDefaultResponseMetadataProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ApiExplorer/IApiDefaultResponseMetadataProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApiExplorer/IApiDefaultResponseMetadataProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ApiExplorer/IApiDescriptionGroupNameProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApiExplorer/IApiDescriptionGroupNameProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ApiExplorer/IApiDescriptionGroupNameProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApiExplorer/IApiDescriptionGroupNameProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ApiExplorer/IApiDescriptionVisibilityProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApiExplorer/IApiDescriptionVisibilityProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ApiExplorer/IApiDescriptionVisibilityProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApiExplorer/IApiDescriptionVisibilityProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ApiExplorer/IApiRequestFormatMetadataProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApiExplorer/IApiRequestFormatMetadataProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ApiExplorer/IApiRequestFormatMetadataProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApiExplorer/IApiRequestFormatMetadataProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ApiExplorer/IApiRequestMetadataProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApiExplorer/IApiRequestMetadataProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ApiExplorer/IApiRequestMetadataProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApiExplorer/IApiRequestMetadataProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ApiExplorer/IApiResponseMetadataProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApiExplorer/IApiResponseMetadataProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ApiExplorer/IApiResponseMetadataProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApiExplorer/IApiResponseMetadataProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ApiExplorer/IApiResponseTypeMetadataProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApiExplorer/IApiResponseTypeMetadataProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ApiExplorer/IApiResponseTypeMetadataProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApiExplorer/IApiResponseTypeMetadataProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ApiExplorerSettingsAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApiExplorerSettingsAttribute.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ApiExplorerSettingsAttribute.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApiExplorerSettingsAttribute.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ActionAttributeRouteModel.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ActionAttributeRouteModel.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ActionAttributeRouteModel.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ActionAttributeRouteModel.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ActionModel.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ActionModel.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ActionModel.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ActionModel.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ApiBehaviorApplicationModelProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ApiBehaviorApplicationModelProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ApiBehaviorApplicationModelProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ApiBehaviorApplicationModelProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ApiConventionApplicationModelConvention.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ApiConventionApplicationModelConvention.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ApiConventionApplicationModelConvention.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ApiConventionApplicationModelConvention.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ApiExplorerModel.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ApiExplorerModel.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ApiExplorerModel.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ApiExplorerModel.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ApiVisibilityConvention.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ApiVisibilityConvention.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ApiVisibilityConvention.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ApiVisibilityConvention.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ApplicationModel.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ApplicationModel.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ApplicationModel.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ApplicationModel.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ApplicationModelConventions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ApplicationModelConventions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ApplicationModelConventions.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ApplicationModelConventions.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ApplicationModelFactory.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ApplicationModelFactory.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ApplicationModelFactory.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ApplicationModelFactory.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ApplicationModelProviderContext.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ApplicationModelProviderContext.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ApplicationModelProviderContext.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ApplicationModelProviderContext.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/AttributeRouteModel.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/AttributeRouteModel.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/AttributeRouteModel.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/AttributeRouteModel.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/AuthorizationApplicationModelProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/AuthorizationApplicationModelProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/AuthorizationApplicationModelProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/AuthorizationApplicationModelProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ClientErrorResultFilterConvention.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ClientErrorResultFilterConvention.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ClientErrorResultFilterConvention.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ClientErrorResultFilterConvention.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ConsumesConstraintForFormFileParameterConvention.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ConsumesConstraintForFormFileParameterConvention.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ConsumesConstraintForFormFileParameterConvention.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ConsumesConstraintForFormFileParameterConvention.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ControllerActionDescriptorBuilder.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ControllerActionDescriptorBuilder.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ControllerActionDescriptorBuilder.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ControllerActionDescriptorBuilder.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ControllerActionDescriptorProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ControllerActionDescriptorProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ControllerActionDescriptorProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ControllerActionDescriptorProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ControllerModel.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ControllerModel.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ControllerModel.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ControllerModel.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/DefaultApplicationModelProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/DefaultApplicationModelProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/DefaultApplicationModelProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/DefaultApplicationModelProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/IActionModelConvention.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/IActionModelConvention.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/IActionModelConvention.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/IActionModelConvention.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/IApiExplorerModel.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/IApiExplorerModel.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/IApiExplorerModel.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/IApiExplorerModel.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/IApplicationModelConvention.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/IApplicationModelConvention.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/IApplicationModelConvention.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/IApplicationModelConvention.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/IApplicationModelProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/IApplicationModelProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/IApplicationModelProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/IApplicationModelProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/IBindingModel.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/IBindingModel.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/IBindingModel.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/IBindingModel.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ICommonModel.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ICommonModel.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ICommonModel.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ICommonModel.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/IControllerModelConvention.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/IControllerModelConvention.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/IControllerModelConvention.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/IControllerModelConvention.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/IFilterModel.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/IFilterModel.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/IFilterModel.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/IFilterModel.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/IParameterModelBaseConvention.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/IParameterModelBaseConvention.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/IParameterModelBaseConvention.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/IParameterModelBaseConvention.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/IParameterModelConvention.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/IParameterModelConvention.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/IParameterModelConvention.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/IParameterModelConvention.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/IPropertyModel.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/IPropertyModel.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/IPropertyModel.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/IPropertyModel.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/InferParameterBindingInfoConvention.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/InferParameterBindingInfoConvention.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/InferParameterBindingInfoConvention.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/InferParameterBindingInfoConvention.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/InvalidModelStateFilterConvention.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/InvalidModelStateFilterConvention.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/InvalidModelStateFilterConvention.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/InvalidModelStateFilterConvention.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ParameterModel.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ParameterModel.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ParameterModel.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ParameterModel.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ParameterModelBase.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ParameterModelBase.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ParameterModelBase.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/ParameterModelBase.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/PropertyModel.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/PropertyModel.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/PropertyModel.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/PropertyModel.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/RouteTokenTransformerConvention.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/RouteTokenTransformerConvention.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/RouteTokenTransformerConvention.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/RouteTokenTransformerConvention.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/SelectorModel.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/SelectorModel.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/SelectorModel.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/SelectorModel.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/ApplicationAssembliesProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/ApplicationAssembliesProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/ApplicationAssembliesProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/ApplicationAssembliesProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/ApplicationPart.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/ApplicationPart.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/ApplicationPart.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/ApplicationPart.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/ApplicationPartFactory.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/ApplicationPartFactory.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/ApplicationPartFactory.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/ApplicationPartFactory.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/ApplicationPartManager.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/ApplicationPartManager.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/ApplicationPartManager.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/ApplicationPartManager.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/AssemblyPart.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/AssemblyPart.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/AssemblyPart.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/AssemblyPart.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/DefaultApplicationPartFactory.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/DefaultApplicationPartFactory.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/DefaultApplicationPartFactory.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/DefaultApplicationPartFactory.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/IApplicationFeatureProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/IApplicationFeatureProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/IApplicationFeatureProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/IApplicationFeatureProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/IApplicationFeatureProviderOfT.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/IApplicationFeatureProviderOfT.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/IApplicationFeatureProviderOfT.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/IApplicationFeatureProviderOfT.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/IApplicationPartTypeProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/IApplicationPartTypeProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/IApplicationPartTypeProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/IApplicationPartTypeProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/ICompilationReferencesProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/ICompilationReferencesProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/ICompilationReferencesProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/ICompilationReferencesProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/NullApplicationPartFactory.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/NullApplicationPartFactory.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/NullApplicationPartFactory.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/NullApplicationPartFactory.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/ProvideApplicationPartFactoryAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/ProvideApplicationPartFactoryAttribute.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/ProvideApplicationPartFactoryAttribute.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/ProvideApplicationPartFactoryAttribute.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/RelatedAssemblyAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/RelatedAssemblyAttribute.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/RelatedAssemblyAttribute.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/RelatedAssemblyAttribute.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/AreaAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/AreaAttribute.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/AreaAttribute.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/AreaAttribute.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Authorization/AllowAnonymousFilter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Authorization/AllowAnonymousFilter.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Authorization/AllowAnonymousFilter.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Authorization/AllowAnonymousFilter.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Authorization/AuthorizeFilter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Authorization/AuthorizeFilter.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Authorization/AuthorizeFilter.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Authorization/AuthorizeFilter.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/BadRequestObjectResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/BadRequestObjectResult.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/BadRequestObjectResult.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/BadRequestObjectResult.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/BadRequestResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/BadRequestResult.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/BadRequestResult.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/BadRequestResult.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/BindAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/BindAttribute.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/BindAttribute.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/BindAttribute.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/BindPropertiesAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/BindPropertiesAttribute.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/BindPropertiesAttribute.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/BindPropertiesAttribute.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/BindPropertyAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/BindPropertyAttribute.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/BindPropertyAttribute.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/BindPropertyAttribute.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Builder/DefaultEndpointConventionBuilder.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Builder/DefaultEndpointConventionBuilder.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Builder/DefaultEndpointConventionBuilder.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Builder/DefaultEndpointConventionBuilder.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Builder/MvcApplicationBuilderExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Builder/MvcApplicationBuilderExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Builder/MvcApplicationBuilderExtensions.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Builder/MvcApplicationBuilderExtensions.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Builder/MvcAreaRouteBuilderExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Builder/MvcAreaRouteBuilderExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Builder/MvcAreaRouteBuilderExtensions.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Builder/MvcAreaRouteBuilderExtensions.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Builder/MvcEndpointInfo.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Builder/MvcEndpointInfo.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Builder/MvcEndpointInfo.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Builder/MvcEndpointInfo.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Builder/MvcEndpointRouteBuilderExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Builder/MvcEndpointRouteBuilderExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Builder/MvcEndpointRouteBuilderExtensions.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Builder/MvcEndpointRouteBuilderExtensions.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/CacheProfile.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/CacheProfile.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/CacheProfile.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/CacheProfile.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ChallengeResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ChallengeResult.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ChallengeResult.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ChallengeResult.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ClientErrorData.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ClientErrorData.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ClientErrorData.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ClientErrorData.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/CompatibilityVersion.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/CompatibilityVersion.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/CompatibilityVersion.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/CompatibilityVersion.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ConflictObjectResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ConflictObjectResult.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ConflictObjectResult.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ConflictObjectResult.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ConflictResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ConflictResult.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ConflictResult.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ConflictResult.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ConsumesAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ConsumesAttribute.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ConsumesAttribute.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ConsumesAttribute.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ContentResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ContentResult.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ContentResult.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ContentResult.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ControllerAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ControllerAttribute.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ControllerAttribute.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ControllerAttribute.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ControllerBase.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ControllerBase.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ControllerBase.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ControllerBase.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ControllerContext.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ControllerContext.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ControllerContext.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ControllerContext.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ControllerContextAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ControllerContextAttribute.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ControllerContextAttribute.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ControllerContextAttribute.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Controllers/ControllerActionDescriptor.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Controllers/ControllerActionDescriptor.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Controllers/ControllerActionDescriptor.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Controllers/ControllerActionDescriptor.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Controllers/ControllerActivatorProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Controllers/ControllerActivatorProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Controllers/ControllerActivatorProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Controllers/ControllerActivatorProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Controllers/ControllerBinderDelegate.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Controllers/ControllerBinderDelegate.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Controllers/ControllerBinderDelegate.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Controllers/ControllerBinderDelegate.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Controllers/ControllerBinderDelegateProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Controllers/ControllerBinderDelegateProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Controllers/ControllerBinderDelegateProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Controllers/ControllerBinderDelegateProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Controllers/ControllerBoundPropertyDescriptor.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Controllers/ControllerBoundPropertyDescriptor.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Controllers/ControllerBoundPropertyDescriptor.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Controllers/ControllerBoundPropertyDescriptor.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Controllers/ControllerFactoryProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Controllers/ControllerFactoryProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Controllers/ControllerFactoryProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Controllers/ControllerFactoryProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Controllers/ControllerFeature.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Controllers/ControllerFeature.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Controllers/ControllerFeature.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Controllers/ControllerFeature.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Controllers/ControllerFeatureProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Controllers/ControllerFeatureProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Controllers/ControllerFeatureProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Controllers/ControllerFeatureProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Controllers/ControllerParameterDescriptor.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Controllers/ControllerParameterDescriptor.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Controllers/ControllerParameterDescriptor.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Controllers/ControllerParameterDescriptor.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Controllers/DefaultControllerActivator.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Controllers/DefaultControllerActivator.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Controllers/DefaultControllerActivator.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Controllers/DefaultControllerActivator.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Controllers/DefaultControllerFactory.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Controllers/DefaultControllerFactory.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Controllers/DefaultControllerFactory.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Controllers/DefaultControllerFactory.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Controllers/DefaultControllerPropertyActivator.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Controllers/DefaultControllerPropertyActivator.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Controllers/DefaultControllerPropertyActivator.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Controllers/DefaultControllerPropertyActivator.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Controllers/IControllerActivator.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Controllers/IControllerActivator.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Controllers/IControllerActivator.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Controllers/IControllerActivator.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Controllers/IControllerActivatorProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Controllers/IControllerActivatorProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Controllers/IControllerActivatorProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Controllers/IControllerActivatorProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Controllers/IControllerFactory.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Controllers/IControllerFactory.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Controllers/IControllerFactory.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Controllers/IControllerFactory.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Controllers/IControllerFactoryProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Controllers/IControllerFactoryProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Controllers/IControllerFactoryProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Controllers/IControllerFactoryProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Controllers/IControllerPropertyActivatorFactory.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Controllers/IControllerPropertyActivatorFactory.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Controllers/IControllerPropertyActivatorFactory.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Controllers/IControllerPropertyActivatorFactory.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Controllers/ServiceBasedControllerActivator.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Controllers/ServiceBasedControllerActivator.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Controllers/ServiceBasedControllerActivator.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Controllers/ServiceBasedControllerActivator.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/CreatedAtActionResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/CreatedAtActionResult.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/CreatedAtActionResult.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/CreatedAtActionResult.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/CreatedAtRouteResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/CreatedAtRouteResult.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/CreatedAtRouteResult.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/CreatedAtRouteResult.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/CreatedResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/CreatedResult.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/CreatedResult.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/CreatedResult.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/DefaultApiConventions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/DefaultApiConventions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/DefaultApiConventions.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/DefaultApiConventions.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/DependencyInjection/ApiBehaviorOptionsSetup.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/DependencyInjection/ApiBehaviorOptionsSetup.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/DependencyInjection/ApiBehaviorOptionsSetup.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/DependencyInjection/ApiBehaviorOptionsSetup.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/DependencyInjection/ApplicationModelConventionExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/DependencyInjection/ApplicationModelConventionExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/DependencyInjection/ApplicationModelConventionExtensions.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/DependencyInjection/ApplicationModelConventionExtensions.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/DependencyInjection/IMvcBuilder.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/DependencyInjection/IMvcBuilder.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/DependencyInjection/IMvcBuilder.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/DependencyInjection/IMvcBuilder.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/DependencyInjection/IMvcCoreBuilder.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/DependencyInjection/IMvcCoreBuilder.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/DependencyInjection/IMvcCoreBuilder.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/DependencyInjection/IMvcCoreBuilder.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/DependencyInjection/MvcBuilder.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/DependencyInjection/MvcBuilder.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/DependencyInjection/MvcBuilder.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/DependencyInjection/MvcBuilder.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/DependencyInjection/MvcCoreBuilder.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/DependencyInjection/MvcCoreBuilder.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/DependencyInjection/MvcCoreBuilder.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/DependencyInjection/MvcCoreBuilder.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/DependencyInjection/MvcCoreMvcBuilderExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/DependencyInjection/MvcCoreMvcBuilderExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/DependencyInjection/MvcCoreMvcBuilderExtensions.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/DependencyInjection/MvcCoreMvcBuilderExtensions.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/DependencyInjection/MvcCoreMvcCoreBuilderExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/DependencyInjection/MvcCoreMvcCoreBuilderExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/DependencyInjection/MvcCoreMvcCoreBuilderExtensions.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/DependencyInjection/MvcCoreMvcCoreBuilderExtensions.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/DependencyInjection/MvcCoreRouteOptionsSetup.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/DependencyInjection/MvcCoreRouteOptionsSetup.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/DependencyInjection/MvcCoreRouteOptionsSetup.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/DependencyInjection/MvcCoreRouteOptionsSetup.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/DependencyInjection/MvcCoreServiceCollectionExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/DependencyInjection/MvcCoreServiceCollectionExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/DependencyInjection/MvcCoreServiceCollectionExtensions.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/DependencyInjection/MvcCoreServiceCollectionExtensions.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/DependencyInjection/MvcMarkerService.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/DependencyInjection/MvcMarkerService.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/DependencyInjection/MvcMarkerService.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/DependencyInjection/MvcMarkerService.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/DisableRequestSizeLimitAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/DisableRequestSizeLimitAttribute.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/DisableRequestSizeLimitAttribute.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/DisableRequestSizeLimitAttribute.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/EmptyResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/EmptyResult.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/EmptyResult.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/EmptyResult.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/FileContentResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/FileContentResult.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/FileContentResult.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/FileContentResult.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/FileResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/FileResult.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/FileResult.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/FileResult.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/FileStreamResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/FileStreamResult.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/FileStreamResult.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/FileStreamResult.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Filters/ActionFilterAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/ActionFilterAttribute.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Filters/ActionFilterAttribute.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/ActionFilterAttribute.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Filters/ControllerActionFilter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/ControllerActionFilter.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Filters/ControllerActionFilter.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/ControllerActionFilter.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Filters/ControllerResultFilter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/ControllerResultFilter.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Filters/ControllerResultFilter.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/ControllerResultFilter.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Filters/DefaultFilterProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/DefaultFilterProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Filters/DefaultFilterProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/DefaultFilterProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Filters/DisableRequestSizeLimitFilter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/DisableRequestSizeLimitFilter.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Filters/DisableRequestSizeLimitFilter.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/DisableRequestSizeLimitFilter.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Filters/ExceptionFilterAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/ExceptionFilterAttribute.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Filters/ExceptionFilterAttribute.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/ExceptionFilterAttribute.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Filters/FilterCollection.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/FilterCollection.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Filters/FilterCollection.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/FilterCollection.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Filters/FilterCursor.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/FilterCursor.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Filters/FilterCursor.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/FilterCursor.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Filters/FilterCursorItem.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/FilterCursorItem.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Filters/FilterCursorItem.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/FilterCursorItem.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Filters/FilterDescriptorOrderComparer.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/FilterDescriptorOrderComparer.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Filters/FilterDescriptorOrderComparer.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/FilterDescriptorOrderComparer.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Filters/FilterFactory.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/FilterFactory.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Filters/FilterFactory.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/FilterFactory.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Filters/FilterFactoryResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/FilterFactoryResult.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Filters/FilterFactoryResult.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/FilterFactoryResult.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Filters/FilterScope.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/FilterScope.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Filters/FilterScope.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/FilterScope.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Filters/IMiddlewareFilterFeature.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/IMiddlewareFilterFeature.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Filters/IMiddlewareFilterFeature.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/IMiddlewareFilterFeature.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Filters/IResponseCacheFilter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/IResponseCacheFilter.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Filters/IResponseCacheFilter.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/IResponseCacheFilter.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Filters/MiddlewareFilter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/MiddlewareFilter.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Filters/MiddlewareFilter.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/MiddlewareFilter.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Filters/MiddlewareFilterAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/MiddlewareFilterAttribute.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Filters/MiddlewareFilterAttribute.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/MiddlewareFilterAttribute.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Filters/MiddlewareFilterBuilder.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/MiddlewareFilterBuilder.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Filters/MiddlewareFilterBuilder.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/MiddlewareFilterBuilder.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Filters/MiddlewareFilterBuilderStartupFilter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/MiddlewareFilterBuilderStartupFilter.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Filters/MiddlewareFilterBuilderStartupFilter.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/MiddlewareFilterBuilderStartupFilter.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Filters/MiddlewareFilterConfigurationProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/MiddlewareFilterConfigurationProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Filters/MiddlewareFilterConfigurationProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/MiddlewareFilterConfigurationProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Filters/MiddlewareFilterFeature.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/MiddlewareFilterFeature.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Filters/MiddlewareFilterFeature.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/MiddlewareFilterFeature.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Filters/RequestFormLimitsFilter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/RequestFormLimitsFilter.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Filters/RequestFormLimitsFilter.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/RequestFormLimitsFilter.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Filters/RequestSizeLimitFilter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/RequestSizeLimitFilter.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Filters/RequestSizeLimitFilter.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/RequestSizeLimitFilter.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Filters/ResponseCacheFilter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/ResponseCacheFilter.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Filters/ResponseCacheFilter.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/ResponseCacheFilter.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Filters/ResponseCacheFilterExecutor.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/ResponseCacheFilterExecutor.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Filters/ResponseCacheFilterExecutor.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/ResponseCacheFilterExecutor.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Filters/ResultFilterAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/ResultFilterAttribute.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Filters/ResultFilterAttribute.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Filters/ResultFilterAttribute.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ForbidResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ForbidResult.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ForbidResult.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ForbidResult.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/FormatFilterAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/FormatFilterAttribute.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/FormatFilterAttribute.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/FormatFilterAttribute.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Formatters/AcceptHeaderParser.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Formatters/AcceptHeaderParser.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Formatters/AcceptHeaderParser.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Formatters/AcceptHeaderParser.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Formatters/FormatFilter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Formatters/FormatFilter.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Formatters/FormatFilter.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Formatters/FormatFilter.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Formatters/FormatterMappings.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Formatters/FormatterMappings.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Formatters/FormatterMappings.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Formatters/FormatterMappings.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Formatters/HttpNoContentOutputFormatter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Formatters/HttpNoContentOutputFormatter.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Formatters/HttpNoContentOutputFormatter.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Formatters/HttpNoContentOutputFormatter.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Formatters/HttpParseResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Formatters/HttpParseResult.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Formatters/HttpParseResult.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Formatters/HttpParseResult.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Formatters/HttpTokenParsingRules.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Formatters/HttpTokenParsingRules.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Formatters/HttpTokenParsingRules.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Formatters/HttpTokenParsingRules.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Formatters/IFormatFilter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Formatters/IFormatFilter.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Formatters/IFormatFilter.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Formatters/IFormatFilter.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Formatters/InputFormatter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Formatters/InputFormatter.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Formatters/InputFormatter.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Formatters/InputFormatter.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Formatters/MediaType.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Formatters/MediaType.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Formatters/MediaType.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Formatters/MediaType.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Formatters/MediaTypeCollection.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Formatters/MediaTypeCollection.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Formatters/MediaTypeCollection.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Formatters/MediaTypeCollection.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Formatters/MediaTypeSegmentWithQuality.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Formatters/MediaTypeSegmentWithQuality.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Formatters/MediaTypeSegmentWithQuality.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Formatters/MediaTypeSegmentWithQuality.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Formatters/OutputFormatter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Formatters/OutputFormatter.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Formatters/OutputFormatter.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Formatters/OutputFormatter.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Formatters/ResponseContentTypeHelper.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Formatters/ResponseContentTypeHelper.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Formatters/ResponseContentTypeHelper.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Formatters/ResponseContentTypeHelper.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Formatters/StreamOutputFormatter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Formatters/StreamOutputFormatter.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Formatters/StreamOutputFormatter.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Formatters/StreamOutputFormatter.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Formatters/StringOutputFormatter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Formatters/StringOutputFormatter.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Formatters/StringOutputFormatter.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Formatters/StringOutputFormatter.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Formatters/TextInputFormatter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Formatters/TextInputFormatter.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Formatters/TextInputFormatter.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Formatters/TextInputFormatter.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Formatters/TextOutputFormatter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Formatters/TextOutputFormatter.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Formatters/TextOutputFormatter.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Formatters/TextOutputFormatter.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/FromBodyAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/FromBodyAttribute.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/FromBodyAttribute.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/FromBodyAttribute.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/FromFormAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/FromFormAttribute.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/FromFormAttribute.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/FromFormAttribute.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/FromHeaderAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/FromHeaderAttribute.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/FromHeaderAttribute.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/FromHeaderAttribute.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/FromQueryAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/FromQueryAttribute.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/FromQueryAttribute.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/FromQueryAttribute.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/FromRouteAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/FromRouteAttribute.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/FromRouteAttribute.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/FromRouteAttribute.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/FromServicesAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/FromServicesAttribute.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/FromServicesAttribute.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/FromServicesAttribute.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/HttpDeleteAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/HttpDeleteAttribute.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/HttpDeleteAttribute.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/HttpDeleteAttribute.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/HttpGetAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/HttpGetAttribute.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/HttpGetAttribute.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/HttpGetAttribute.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/HttpHeadAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/HttpHeadAttribute.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/HttpHeadAttribute.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/HttpHeadAttribute.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/HttpOptionsAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/HttpOptionsAttribute.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/HttpOptionsAttribute.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/HttpOptionsAttribute.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/HttpPatchAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/HttpPatchAttribute.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/HttpPatchAttribute.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/HttpPatchAttribute.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/HttpPostAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/HttpPostAttribute.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/HttpPostAttribute.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/HttpPostAttribute.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/HttpPutAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/HttpPutAttribute.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/HttpPutAttribute.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/HttpPutAttribute.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/IApiBehaviorMetadata.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/IApiBehaviorMetadata.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/IApiBehaviorMetadata.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/IApiBehaviorMetadata.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/IDesignTimeMvcBuilderConfiguration.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/IDesignTimeMvcBuilderConfiguration.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/IDesignTimeMvcBuilderConfiguration.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/IDesignTimeMvcBuilderConfiguration.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/IRequestFormLimitsPolicy.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/IRequestFormLimitsPolicy.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/IRequestFormLimitsPolicy.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/IRequestFormLimitsPolicy.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/IRequestSizePolicy.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/IRequestSizePolicy.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/IRequestSizePolicy.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/IRequestSizePolicy.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ActionContextAccessor.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ActionContextAccessor.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ActionContextAccessor.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ActionContextAccessor.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ActionDescriptorCollection.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ActionDescriptorCollection.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ActionDescriptorCollection.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ActionDescriptorCollection.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ActionDescriptorCollectionProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ActionDescriptorCollectionProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ActionDescriptorCollectionProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ActionDescriptorCollectionProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ActionInvokerFactory.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ActionInvokerFactory.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ActionInvokerFactory.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ActionInvokerFactory.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ActionMethodExecutor.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ActionMethodExecutor.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ActionMethodExecutor.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ActionMethodExecutor.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ActionResultObjectValueAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ActionResultObjectValueAttribute.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ActionResultObjectValueAttribute.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ActionResultObjectValueAttribute.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ActionResultStatusCodeAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ActionResultStatusCodeAttribute.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ActionResultStatusCodeAttribute.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ActionResultStatusCodeAttribute.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ActionResultTypeMapper.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ActionResultTypeMapper.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ActionResultTypeMapper.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ActionResultTypeMapper.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ActionSelector.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ActionSelector.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ActionSelector.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ActionSelector.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/AmbiguousActionException.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/AmbiguousActionException.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/AmbiguousActionException.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/AmbiguousActionException.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ClientErrorResultFilter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ClientErrorResultFilter.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ClientErrorResultFilter.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ClientErrorResultFilter.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ClientErrorResultFilterFactory.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ClientErrorResultFilterFactory.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ClientErrorResultFilterFactory.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ClientErrorResultFilterFactory.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/CompatibilitySwitch.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/CompatibilitySwitch.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/CompatibilitySwitch.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/CompatibilitySwitch.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ConfigureCompatibilityOptions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ConfigureCompatibilityOptions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ConfigureCompatibilityOptions.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ConfigureCompatibilityOptions.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ContentResultExecutor.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ContentResultExecutor.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ContentResultExecutor.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ContentResultExecutor.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ControllerActionInvoker.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ControllerActionInvoker.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ControllerActionInvoker.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ControllerActionInvoker.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ControllerActionInvokerCache.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ControllerActionInvokerCache.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ControllerActionInvokerCache.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ControllerActionInvokerCache.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ControllerActionInvokerCacheEntry.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ControllerActionInvokerCacheEntry.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ControllerActionInvokerCacheEntry.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ControllerActionInvokerCacheEntry.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ControllerActionInvokerProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ControllerActionInvokerProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ControllerActionInvokerProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ControllerActionInvokerProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/CopyOnWriteList.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/CopyOnWriteList.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/CopyOnWriteList.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/CopyOnWriteList.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/DefaultActionDescriptorCollectionProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/DefaultActionDescriptorCollectionProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/DefaultActionDescriptorCollectionProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/DefaultActionDescriptorCollectionProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/DefaultOutputFormatterSelector.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/DefaultOutputFormatterSelector.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/DefaultOutputFormatterSelector.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/DefaultOutputFormatterSelector.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/DefaultStatusCodeAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/DefaultStatusCodeAttribute.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/DefaultStatusCodeAttribute.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/DefaultStatusCodeAttribute.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/FileContentResultExecutor.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/FileContentResultExecutor.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/FileContentResultExecutor.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/FileContentResultExecutor.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/FileResultExecutorBase.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/FileResultExecutorBase.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/FileResultExecutorBase.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/FileResultExecutorBase.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/FileStreamResultExecutor.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/FileStreamResultExecutor.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/FileStreamResultExecutor.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/FileStreamResultExecutor.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IActionContextAccessor.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IActionContextAccessor.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IActionContextAccessor.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IActionContextAccessor.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IActionDescriptorChangeProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IActionDescriptorChangeProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IActionDescriptorChangeProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IActionDescriptorChangeProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IActionDescriptorCollectionProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IActionDescriptorCollectionProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IActionDescriptorCollectionProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IActionDescriptorCollectionProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IActionInvokerFactory.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IActionInvokerFactory.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IActionInvokerFactory.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IActionInvokerFactory.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IActionResultExecutor.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IActionResultExecutor.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IActionResultExecutor.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IActionResultExecutor.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IActionResultTypeMapper.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IActionResultTypeMapper.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IActionResultTypeMapper.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IActionResultTypeMapper.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IActionSelector.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IActionSelector.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IActionSelector.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IActionSelector.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IAntiforgeryValidationFailedResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IAntiforgeryValidationFailedResult.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IAntiforgeryValidationFailedResult.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IAntiforgeryValidationFailedResult.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IClientErrorActionResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IClientErrorActionResult.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IClientErrorActionResult.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IClientErrorActionResult.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IClientErrorFactory.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IClientErrorFactory.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IClientErrorFactory.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IClientErrorFactory.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ICompatibilitySwitch.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ICompatibilitySwitch.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ICompatibilitySwitch.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ICompatibilitySwitch.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IConvertToActionResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IConvertToActionResult.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IConvertToActionResult.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IConvertToActionResult.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IHttpRequestStreamReaderFactory.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IHttpRequestStreamReaderFactory.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IHttpRequestStreamReaderFactory.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IHttpRequestStreamReaderFactory.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IHttpResponseStreamWriterFactory.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IHttpResponseStreamWriterFactory.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IHttpResponseStreamWriterFactory.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IHttpResponseStreamWriterFactory.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IParameterInfoParameterDescriptor.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IParameterInfoParameterDescriptor.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IParameterInfoParameterDescriptor.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IParameterInfoParameterDescriptor.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IPropertyInfoParameterDescriptor.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IPropertyInfoParameterDescriptor.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IPropertyInfoParameterDescriptor.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IPropertyInfoParameterDescriptor.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IStatusCodeActionResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IStatusCodeActionResult.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IStatusCodeActionResult.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/IStatusCodeActionResult.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ITypeActivatorCache.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ITypeActivatorCache.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ITypeActivatorCache.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ITypeActivatorCache.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/LocalRedirectResultExecutor.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/LocalRedirectResultExecutor.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/LocalRedirectResultExecutor.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/LocalRedirectResultExecutor.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/MemoryPoolHttpRequestStreamReaderFactory.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/MemoryPoolHttpRequestStreamReaderFactory.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/MemoryPoolHttpRequestStreamReaderFactory.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/MemoryPoolHttpRequestStreamReaderFactory.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/MemoryPoolHttpResponseStreamWriterFactory.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/MemoryPoolHttpResponseStreamWriterFactory.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/MemoryPoolHttpResponseStreamWriterFactory.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/MemoryPoolHttpResponseStreamWriterFactory.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ModelStateInvalidFilter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ModelStateInvalidFilter.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ModelStateInvalidFilter.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ModelStateInvalidFilter.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ModelStateInvalidFilterFactory.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ModelStateInvalidFilterFactory.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ModelStateInvalidFilterFactory.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ModelStateInvalidFilterFactory.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/MvcCompatibilityOptions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/MvcCompatibilityOptions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/MvcCompatibilityOptions.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/MvcCompatibilityOptions.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/MvcCoreMvcOptionsSetup.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/MvcCoreMvcOptionsSetup.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/MvcCoreMvcOptionsSetup.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/MvcCoreMvcOptionsSetup.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/MvcOptionsConfigureCompatibilityOptions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/MvcOptionsConfigureCompatibilityOptions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/MvcOptionsConfigureCompatibilityOptions.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/MvcOptionsConfigureCompatibilityOptions.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/NonDisposableStream.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/NonDisposableStream.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/NonDisposableStream.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/NonDisposableStream.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/NullableCompatibilitySwitch.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/NullableCompatibilitySwitch.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/NullableCompatibilitySwitch.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/NullableCompatibilitySwitch.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ObjectResultExecutor.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ObjectResultExecutor.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ObjectResultExecutor.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ObjectResultExecutor.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/OutputFormatterSelector.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/OutputFormatterSelector.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/OutputFormatterSelector.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/OutputFormatterSelector.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ParameterDefaultValues.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ParameterDefaultValues.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ParameterDefaultValues.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ParameterDefaultValues.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/PhysicalFileResultExecutor.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/PhysicalFileResultExecutor.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/PhysicalFileResultExecutor.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/PhysicalFileResultExecutor.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ProblemDetailsClientErrorFactory.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ProblemDetailsClientErrorFactory.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ProblemDetailsClientErrorFactory.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ProblemDetailsClientErrorFactory.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/RedirectResultExecutor.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/RedirectResultExecutor.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/RedirectResultExecutor.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/RedirectResultExecutor.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/RedirectToActionResultExecutor.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/RedirectToActionResultExecutor.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/RedirectToActionResultExecutor.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/RedirectToActionResultExecutor.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/RedirectToPageResultExecutor.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/RedirectToPageResultExecutor.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/RedirectToPageResultExecutor.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/RedirectToPageResultExecutor.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/RedirectToRouteResultExecutor.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/RedirectToRouteResultExecutor.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/RedirectToRouteResultExecutor.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/RedirectToRouteResultExecutor.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ResourceInvoker.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ResourceInvoker.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ResourceInvoker.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/ResourceInvoker.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/TypeActivatorCache.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/TypeActivatorCache.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/TypeActivatorCache.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/TypeActivatorCache.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/VirtualFileResultExecutor.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/VirtualFileResultExecutor.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/VirtualFileResultExecutor.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Infrastructure/VirtualFileResultExecutor.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/LocalRedirectResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/LocalRedirectResult.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/LocalRedirectResult.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/LocalRedirectResult.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Microsoft.AspNetCore.Mvc.Core.csproj b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Microsoft.AspNetCore.Mvc.Core.csproj
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Microsoft.AspNetCore.Mvc.Core.csproj
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Microsoft.AspNetCore.Mvc.Core.csproj
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinderAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinderAttribute.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ModelBinderAttribute.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinderAttribute.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/BindNeverAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/BindNeverAttribute.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/BindNeverAttribute.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/BindNeverAttribute.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/BindRequiredAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/BindRequiredAttribute.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/BindRequiredAttribute.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/BindRequiredAttribute.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/ArrayModelBinder.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/ArrayModelBinder.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/ArrayModelBinder.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/ArrayModelBinder.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/ArrayModelBinderProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/ArrayModelBinderProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/ArrayModelBinderProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/ArrayModelBinderProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/BinderTypeModelBinder.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/BinderTypeModelBinder.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/BinderTypeModelBinder.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/BinderTypeModelBinder.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/BinderTypeModelBinderProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/BinderTypeModelBinderProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/BinderTypeModelBinderProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/BinderTypeModelBinderProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/BodyModelBinder.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/BodyModelBinder.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/BodyModelBinder.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/BodyModelBinder.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/BodyModelBinderProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/BodyModelBinderProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/BodyModelBinderProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/BodyModelBinderProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/ByteArrayModelBinder.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/ByteArrayModelBinder.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/ByteArrayModelBinder.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/ByteArrayModelBinder.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/ByteArrayModelBinderProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/ByteArrayModelBinderProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/ByteArrayModelBinderProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/ByteArrayModelBinderProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/CancellationTokenModelBinder.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/CancellationTokenModelBinder.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/CancellationTokenModelBinder.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/CancellationTokenModelBinder.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/CancellationTokenModelBinderProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/CancellationTokenModelBinderProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/CancellationTokenModelBinderProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/CancellationTokenModelBinderProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/CollectionModelBinder.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/CollectionModelBinder.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/CollectionModelBinder.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/CollectionModelBinder.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/CollectionModelBinderProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/CollectionModelBinderProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/CollectionModelBinderProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/CollectionModelBinderProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/ComplexTypeModelBinder.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/ComplexTypeModelBinder.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/ComplexTypeModelBinder.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/ComplexTypeModelBinder.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/ComplexTypeModelBinderProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/ComplexTypeModelBinderProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/ComplexTypeModelBinderProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/ComplexTypeModelBinderProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/DecimalModelBinder.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/DecimalModelBinder.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/DecimalModelBinder.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/DecimalModelBinder.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/DictionaryModelBinder.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/DictionaryModelBinder.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/DictionaryModelBinder.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/DictionaryModelBinder.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/DictionaryModelBinderProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/DictionaryModelBinderProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/DictionaryModelBinderProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/DictionaryModelBinderProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/DoubleModelBinder.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/DoubleModelBinder.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/DoubleModelBinder.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/DoubleModelBinder.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/EnumTypeModelBinder.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/EnumTypeModelBinder.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/EnumTypeModelBinder.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/EnumTypeModelBinder.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/EnumTypeModelBinderProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/EnumTypeModelBinderProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/EnumTypeModelBinderProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/EnumTypeModelBinderProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/FloatModelBinder.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/FloatModelBinder.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/FloatModelBinder.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/FloatModelBinder.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/FloatingPointTypeModelBinderProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/FloatingPointTypeModelBinderProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/FloatingPointTypeModelBinderProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/FloatingPointTypeModelBinderProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/FormCollectionModelBinder.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/FormCollectionModelBinder.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/FormCollectionModelBinder.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/FormCollectionModelBinder.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/FormCollectionModelBinderProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/FormCollectionModelBinderProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/FormCollectionModelBinderProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/FormCollectionModelBinderProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/FormFileModelBinder.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/FormFileModelBinder.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/FormFileModelBinder.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/FormFileModelBinder.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/FormFileModelBinderProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/FormFileModelBinderProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/FormFileModelBinderProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/FormFileModelBinderProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/HeaderModelBinder.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/HeaderModelBinder.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/HeaderModelBinder.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/HeaderModelBinder.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/HeaderModelBinderProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/HeaderModelBinderProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/HeaderModelBinderProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/HeaderModelBinderProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/KeyValuePairModelBinder.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/KeyValuePairModelBinder.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/KeyValuePairModelBinder.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/KeyValuePairModelBinder.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/KeyValuePairModelBinderProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/KeyValuePairModelBinderProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/KeyValuePairModelBinderProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/KeyValuePairModelBinderProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/ServicesModelBinder.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/ServicesModelBinder.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/ServicesModelBinder.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/ServicesModelBinder.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/ServicesModelBinderProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/ServicesModelBinderProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/ServicesModelBinderProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/ServicesModelBinderProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/SimpleTypeModelBinder.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/SimpleTypeModelBinder.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/SimpleTypeModelBinder.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/SimpleTypeModelBinder.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/SimpleTypeModelBinderProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/SimpleTypeModelBinderProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/SimpleTypeModelBinderProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Binders/SimpleTypeModelBinderProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/BindingBehavior.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/BindingBehavior.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/BindingBehavior.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/BindingBehavior.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/BindingBehaviorAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/BindingBehaviorAttribute.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/BindingBehaviorAttribute.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/BindingBehaviorAttribute.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/BindingSourceValueProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/BindingSourceValueProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/BindingSourceValueProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/BindingSourceValueProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/CompositeValueProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/CompositeValueProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/CompositeValueProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/CompositeValueProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/DefaultModelBindingContext.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/DefaultModelBindingContext.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/DefaultModelBindingContext.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/DefaultModelBindingContext.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/DefaultPropertyFilterProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/DefaultPropertyFilterProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/DefaultPropertyFilterProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/DefaultPropertyFilterProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/ElementalValueProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/ElementalValueProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/ElementalValueProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/ElementalValueProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/EmptyModelMetadataProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/EmptyModelMetadataProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/EmptyModelMetadataProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/EmptyModelMetadataProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/FormValueProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/FormValueProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/FormValueProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/FormValueProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/FormValueProviderFactory.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/FormValueProviderFactory.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/FormValueProviderFactory.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/FormValueProviderFactory.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/IBindingSourceValueProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/IBindingSourceValueProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/IBindingSourceValueProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/IBindingSourceValueProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/ICollectionModelBinder.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/ICollectionModelBinder.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/ICollectionModelBinder.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/ICollectionModelBinder.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/IEnumerableValueProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/IEnumerableValueProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/IEnumerableValueProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/IEnumerableValueProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/IKeyRewriterValueProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/IKeyRewriterValueProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/IKeyRewriterValueProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/IKeyRewriterValueProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/IModelBinderFactory.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/IModelBinderFactory.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/IModelBinderFactory.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/IModelBinderFactory.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/JQueryFormValueProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/JQueryFormValueProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/JQueryFormValueProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/JQueryFormValueProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/JQueryFormValueProviderFactory.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/JQueryFormValueProviderFactory.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/JQueryFormValueProviderFactory.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/JQueryFormValueProviderFactory.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/JQueryKeyValuePairNormalizer.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/JQueryKeyValuePairNormalizer.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/JQueryKeyValuePairNormalizer.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/JQueryKeyValuePairNormalizer.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/JQueryQueryStringValueProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/JQueryQueryStringValueProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/JQueryQueryStringValueProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/JQueryQueryStringValueProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/JQueryQueryStringValueProviderFactory.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/JQueryQueryStringValueProviderFactory.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/JQueryQueryStringValueProviderFactory.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/JQueryQueryStringValueProviderFactory.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/JQueryValueProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/JQueryValueProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/JQueryValueProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/JQueryValueProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/BindingMetadata.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/BindingMetadata.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/BindingMetadata.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/BindingMetadata.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/BindingMetadataProviderContext.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/BindingMetadataProviderContext.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/BindingMetadataProviderContext.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/BindingMetadataProviderContext.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/BindingSourceMetadataProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/BindingSourceMetadataProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/BindingSourceMetadataProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/BindingSourceMetadataProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/DefaultBindingMetadataProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/DefaultBindingMetadataProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/DefaultBindingMetadataProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/DefaultBindingMetadataProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/DefaultCompositeMetadataDetailsProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/DefaultCompositeMetadataDetailsProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/DefaultCompositeMetadataDetailsProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/DefaultCompositeMetadataDetailsProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/DefaultMetadataDetails.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/DefaultMetadataDetails.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/DefaultMetadataDetails.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/DefaultMetadataDetails.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/DefaultModelBindingMessageProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/DefaultModelBindingMessageProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/DefaultModelBindingMessageProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/DefaultModelBindingMessageProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/DefaultModelMetadata.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/DefaultModelMetadata.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/DefaultModelMetadata.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/DefaultModelMetadata.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/DefaultModelMetadataProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/DefaultModelMetadataProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/DefaultModelMetadataProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/DefaultModelMetadataProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/DefaultValidationMetadataProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/DefaultValidationMetadataProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/DefaultValidationMetadataProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/DefaultValidationMetadataProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/DisplayMetadata.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/DisplayMetadata.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/DisplayMetadata.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/DisplayMetadata.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/DisplayMetadataProviderContext.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/DisplayMetadataProviderContext.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/DisplayMetadataProviderContext.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/DisplayMetadataProviderContext.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/ExcludeBindingMetadataProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/ExcludeBindingMetadataProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/ExcludeBindingMetadataProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/ExcludeBindingMetadataProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/HasValidatorsValidationMetadataProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/HasValidatorsValidationMetadataProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/HasValidatorsValidationMetadataProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/HasValidatorsValidationMetadataProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/IBindingMetadataProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/IBindingMetadataProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/IBindingMetadataProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/IBindingMetadataProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/ICompositeMetadataDetailsProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/ICompositeMetadataDetailsProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/ICompositeMetadataDetailsProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/ICompositeMetadataDetailsProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/IDisplayMetadataProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/IDisplayMetadataProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/IDisplayMetadataProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/IDisplayMetadataProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/IMetadataDetailsProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/IMetadataDetailsProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/IMetadataDetailsProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/IMetadataDetailsProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/IValidationMetadataProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/IValidationMetadataProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/IValidationMetadataProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/IValidationMetadataProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/MetadataDetailsProviderExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/MetadataDetailsProviderExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/MetadataDetailsProviderExtensions.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/MetadataDetailsProviderExtensions.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/ModelAttributes.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/ModelAttributes.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/ModelAttributes.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/ModelAttributes.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/ValidationMetadata.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/ValidationMetadata.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/ValidationMetadata.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/ValidationMetadata.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/ValidationMetadataProviderContext.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/ValidationMetadataProviderContext.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/ValidationMetadataProviderContext.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Metadata/ValidationMetadataProviderContext.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/ModelBinderFactory.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/ModelBinderFactory.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/ModelBinderFactory.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/ModelBinderFactory.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/ModelBinderFactoryContext.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/ModelBinderFactoryContext.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/ModelBinderFactoryContext.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/ModelBinderFactoryContext.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/ModelBinderProviderExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/ModelBinderProviderExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/ModelBinderProviderExtensions.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/ModelBinderProviderExtensions.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/ModelBindingHelper.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/ModelBindingHelper.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/ModelBindingHelper.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/ModelBindingHelper.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/ModelMetadataProviderExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/ModelMetadataProviderExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/ModelMetadataProviderExtensions.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/ModelMetadataProviderExtensions.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/ModelNames.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/ModelNames.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/ModelNames.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/ModelNames.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/NoOpBinder.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/NoOpBinder.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/NoOpBinder.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/NoOpBinder.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/ObjectModelValidator.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/ObjectModelValidator.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/ObjectModelValidator.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/ObjectModelValidator.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/ParameterBinder.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/ParameterBinder.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/ParameterBinder.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/ParameterBinder.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/PlaceholderBinder.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/PlaceholderBinder.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/PlaceholderBinder.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/PlaceholderBinder.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/PrefixContainer.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/PrefixContainer.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/PrefixContainer.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/PrefixContainer.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/PropertyValueSetter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/PropertyValueSetter.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/PropertyValueSetter.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/PropertyValueSetter.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/QueryStringValueProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/QueryStringValueProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/QueryStringValueProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/QueryStringValueProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/QueryStringValueProviderFactory.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/QueryStringValueProviderFactory.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/QueryStringValueProviderFactory.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/QueryStringValueProviderFactory.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/ReferenceEqualityComparer.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/ReferenceEqualityComparer.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/ReferenceEqualityComparer.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/ReferenceEqualityComparer.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/RouteValueProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/RouteValueProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/RouteValueProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/RouteValueProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/RouteValueProviderFactory.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/RouteValueProviderFactory.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/RouteValueProviderFactory.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/RouteValueProviderFactory.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/SuppressChildValidationMetadataProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/SuppressChildValidationMetadataProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/SuppressChildValidationMetadataProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/SuppressChildValidationMetadataProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/UnsupportedContentTypeException.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/UnsupportedContentTypeException.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/UnsupportedContentTypeException.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/UnsupportedContentTypeException.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/UnsupportedContentTypeFilter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/UnsupportedContentTypeFilter.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/UnsupportedContentTypeFilter.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/UnsupportedContentTypeFilter.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Validation/ClientValidatorCache.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Validation/ClientValidatorCache.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Validation/ClientValidatorCache.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Validation/ClientValidatorCache.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Validation/CompositeClientModelValidatorProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Validation/CompositeClientModelValidatorProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Validation/CompositeClientModelValidatorProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Validation/CompositeClientModelValidatorProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Validation/CompositeModelValidatorProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Validation/CompositeModelValidatorProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Validation/CompositeModelValidatorProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Validation/CompositeModelValidatorProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Validation/DefaultCollectionValidationStrategy.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Validation/DefaultCollectionValidationStrategy.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Validation/DefaultCollectionValidationStrategy.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Validation/DefaultCollectionValidationStrategy.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Validation/DefaultComplexObjectValidationStrategy.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Validation/DefaultComplexObjectValidationStrategy.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Validation/DefaultComplexObjectValidationStrategy.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Validation/DefaultComplexObjectValidationStrategy.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Validation/DefaultModelValidatorProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Validation/DefaultModelValidatorProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Validation/DefaultModelValidatorProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Validation/DefaultModelValidatorProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Validation/DefaultObjectValidator.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Validation/DefaultObjectValidator.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Validation/DefaultObjectValidator.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Validation/DefaultObjectValidator.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Validation/ExplicitIndexCollectionValidationStrategy.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Validation/ExplicitIndexCollectionValidationStrategy.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Validation/ExplicitIndexCollectionValidationStrategy.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Validation/ExplicitIndexCollectionValidationStrategy.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Validation/IMetadataBasedModelValidatorProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Validation/IMetadataBasedModelValidatorProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Validation/IMetadataBasedModelValidatorProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Validation/IMetadataBasedModelValidatorProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Validation/IObjectModelValidator.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Validation/IObjectModelValidator.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Validation/IObjectModelValidator.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Validation/IObjectModelValidator.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Validation/ModelValidatorProviderExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Validation/ModelValidatorProviderExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Validation/ModelValidatorProviderExtensions.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Validation/ModelValidatorProviderExtensions.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Validation/ShortFormDictionaryValidationStrategy.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Validation/ShortFormDictionaryValidationStrategy.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Validation/ShortFormDictionaryValidationStrategy.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Validation/ShortFormDictionaryValidationStrategy.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Validation/ValidateNeverAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Validation/ValidateNeverAttribute.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Validation/ValidateNeverAttribute.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Validation/ValidateNeverAttribute.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Validation/ValidationStack.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Validation/ValidationStack.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Validation/ValidationStack.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Validation/ValidationStack.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Validation/ValidationVisitor.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Validation/ValidationVisitor.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Validation/ValidationVisitor.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Validation/ValidationVisitor.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Validation/ValidatorCache.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Validation/ValidatorCache.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Validation/ValidatorCache.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/Validation/ValidatorCache.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/ValueProviderFactoryExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/ValueProviderFactoryExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/ValueProviderFactoryExtensions.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/ValueProviderFactoryExtensions.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ModelMetadataTypeAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelMetadataTypeAttribute.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ModelMetadataTypeAttribute.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ModelMetadataTypeAttribute.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/MvcCoreDiagnosticSourceExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/MvcCoreDiagnosticSourceExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/MvcCoreDiagnosticSourceExtensions.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/MvcCoreDiagnosticSourceExtensions.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/MvcCoreLoggerExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/MvcCoreLoggerExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/MvcCoreLoggerExtensions.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/MvcCoreLoggerExtensions.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/MvcOptions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/MvcOptions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/MvcOptions.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/MvcOptions.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/NoContentResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/NoContentResult.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/NoContentResult.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/NoContentResult.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/NonActionAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/NonActionAttribute.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/NonActionAttribute.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/NonActionAttribute.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/NonControllerAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/NonControllerAttribute.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/NonControllerAttribute.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/NonControllerAttribute.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/NonViewComponentAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/NonViewComponentAttribute.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/NonViewComponentAttribute.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/NonViewComponentAttribute.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/NotFoundObjectResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/NotFoundObjectResult.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/NotFoundObjectResult.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/NotFoundObjectResult.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/NotFoundResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/NotFoundResult.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/NotFoundResult.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/NotFoundResult.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ObjectResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ObjectResult.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ObjectResult.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ObjectResult.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/OkObjectResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/OkObjectResult.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/OkObjectResult.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/OkObjectResult.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/OkResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/OkResult.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/OkResult.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/OkResult.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/PhysicalFileResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/PhysicalFileResult.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/PhysicalFileResult.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/PhysicalFileResult.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ProblemDetails.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ProblemDetails.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ProblemDetails.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ProblemDetails.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ProducesAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ProducesAttribute.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ProducesAttribute.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ProducesAttribute.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ProducesDefaultResponseTypeAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ProducesDefaultResponseTypeAttribute.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ProducesDefaultResponseTypeAttribute.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ProducesDefaultResponseTypeAttribute.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ProducesErrorResponseTypeAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ProducesErrorResponseTypeAttribute.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ProducesErrorResponseTypeAttribute.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ProducesErrorResponseTypeAttribute.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ProducesResponseTypeAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ProducesResponseTypeAttribute.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ProducesResponseTypeAttribute.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ProducesResponseTypeAttribute.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Properties/AssemblyInfo.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Properties/AssemblyInfo.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Properties/AssemblyInfo.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Properties/Resources.Designer.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Properties/Resources.Designer.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Properties/Resources.Designer.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Properties/Resources.Designer.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/RedirectResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/RedirectResult.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/RedirectResult.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/RedirectResult.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/RedirectToActionResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/RedirectToActionResult.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/RedirectToActionResult.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/RedirectToActionResult.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/RedirectToPageResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/RedirectToPageResult.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/RedirectToPageResult.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/RedirectToPageResult.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/RedirectToRouteResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/RedirectToRouteResult.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/RedirectToRouteResult.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/RedirectToRouteResult.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/RequestFormLimitsAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/RequestFormLimitsAttribute.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/RequestFormLimitsAttribute.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/RequestFormLimitsAttribute.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/RequestSizeLimitAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/RequestSizeLimitAttribute.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/RequestSizeLimitAttribute.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/RequestSizeLimitAttribute.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/RequireHttpsAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/RequireHttpsAttribute.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/RequireHttpsAttribute.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/RequireHttpsAttribute.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Resources.resx b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Resources.resx
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Resources.resx
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Resources.resx
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ResponseCacheAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ResponseCacheAttribute.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ResponseCacheAttribute.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ResponseCacheAttribute.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ResponseCacheLocation.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ResponseCacheLocation.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ResponseCacheLocation.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ResponseCacheLocation.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/RouteAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/RouteAttribute.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/RouteAttribute.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/RouteAttribute.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Routing/ActionConstraintMatcherPolicy.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/ActionConstraintMatcherPolicy.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Routing/ActionConstraintMatcherPolicy.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/ActionConstraintMatcherPolicy.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Routing/AttributeRoute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/AttributeRoute.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Routing/AttributeRoute.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/AttributeRoute.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Routing/AttributeRouting.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/AttributeRouting.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Routing/AttributeRouting.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/AttributeRouting.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Routing/ConsumesMatcherPolicy.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/ConsumesMatcherPolicy.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Routing/ConsumesMatcherPolicy.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/ConsumesMatcherPolicy.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Routing/ConsumesMetadata.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/ConsumesMetadata.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Routing/ConsumesMetadata.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/ConsumesMetadata.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Routing/ControllerLinkGeneratorExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/ControllerLinkGeneratorExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Routing/ControllerLinkGeneratorExtensions.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/ControllerLinkGeneratorExtensions.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Routing/EndpointRoutingUrlHelper.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/EndpointRoutingUrlHelper.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Routing/EndpointRoutingUrlHelper.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/EndpointRoutingUrlHelper.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Routing/HttpMethodAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/HttpMethodAttribute.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Routing/HttpMethodAttribute.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/HttpMethodAttribute.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Routing/IActionHttpMethodProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/IActionHttpMethodProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Routing/IActionHttpMethodProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/IActionHttpMethodProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Routing/IConsumesMetadata.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/IConsumesMetadata.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Routing/IConsumesMetadata.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/IConsumesMetadata.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Routing/IRouteTemplateProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/IRouteTemplateProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Routing/IRouteTemplateProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/IRouteTemplateProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Routing/IRouteValueProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/IRouteValueProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Routing/IRouteValueProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/IRouteValueProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Routing/IUrlHelperFactory.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/IUrlHelperFactory.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Routing/IUrlHelperFactory.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/IUrlHelperFactory.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Routing/KnownRouteValueConstraint.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/KnownRouteValueConstraint.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Routing/KnownRouteValueConstraint.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/KnownRouteValueConstraint.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Routing/MvcAttributeRouteHandler.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/MvcAttributeRouteHandler.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Routing/MvcAttributeRouteHandler.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/MvcAttributeRouteHandler.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Routing/MvcEndpointDataSource.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/MvcEndpointDataSource.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Routing/MvcEndpointDataSource.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/MvcEndpointDataSource.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Routing/MvcEndpointInvokerFactory.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/MvcEndpointInvokerFactory.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Routing/MvcEndpointInvokerFactory.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/MvcEndpointInvokerFactory.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Routing/MvcRouteHandler.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/MvcRouteHandler.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Routing/MvcRouteHandler.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/MvcRouteHandler.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Routing/NormalizedRouteValue.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/NormalizedRouteValue.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Routing/NormalizedRouteValue.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/NormalizedRouteValue.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Routing/NullRouter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/NullRouter.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Routing/NullRouter.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/NullRouter.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Routing/PageLinkGeneratorExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/PageLinkGeneratorExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Routing/PageLinkGeneratorExtensions.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/PageLinkGeneratorExtensions.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Routing/RoutePatternWriter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/RoutePatternWriter.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Routing/RoutePatternWriter.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/RoutePatternWriter.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Routing/RouteValueAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/RouteValueAttribute.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Routing/RouteValueAttribute.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/RouteValueAttribute.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Routing/UrlHelper.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/UrlHelper.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Routing/UrlHelper.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/UrlHelper.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Routing/UrlHelperBase.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/UrlHelperBase.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Routing/UrlHelperBase.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/UrlHelperBase.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Routing/UrlHelperFactory.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/UrlHelperFactory.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Routing/UrlHelperFactory.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/UrlHelperFactory.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Routing/ViewEnginePath.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/ViewEnginePath.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/Routing/ViewEnginePath.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/Routing/ViewEnginePath.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/SerializableError.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/SerializableError.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/SerializableError.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/SerializableError.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ServiceFilterAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ServiceFilterAttribute.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ServiceFilterAttribute.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ServiceFilterAttribute.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/SignInResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/SignInResult.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/SignInResult.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/SignInResult.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/SignOutResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/SignOutResult.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/SignOutResult.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/SignOutResult.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/StatusCodeResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/StatusCodeResult.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/StatusCodeResult.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/StatusCodeResult.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/TypeFilterAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/TypeFilterAttribute.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/TypeFilterAttribute.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/TypeFilterAttribute.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/UnauthorizedObjectResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/UnauthorizedObjectResult.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/UnauthorizedObjectResult.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/UnauthorizedObjectResult.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/UnauthorizedResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/UnauthorizedResult.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/UnauthorizedResult.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/UnauthorizedResult.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/UnprocessableEntityObjectResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/UnprocessableEntityObjectResult.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/UnprocessableEntityObjectResult.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/UnprocessableEntityObjectResult.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/UnprocessableEntityResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/UnprocessableEntityResult.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/UnprocessableEntityResult.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/UnprocessableEntityResult.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/UnsupportedMediaTypeResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/UnsupportedMediaTypeResult.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/UnsupportedMediaTypeResult.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/UnsupportedMediaTypeResult.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/UrlHelperExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/UrlHelperExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/UrlHelperExtensions.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/UrlHelperExtensions.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ValidationProblemDetails.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ValidationProblemDetails.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ValidationProblemDetails.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ValidationProblemDetails.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ViewFeatures/IKeepTempDataResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ViewFeatures/IKeepTempDataResult.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/ViewFeatures/IKeepTempDataResult.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/ViewFeatures/IKeepTempDataResult.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/VirtualFileResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/VirtualFileResult.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/VirtualFileResult.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/VirtualFileResult.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/baseline.netcore.json b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/baseline.netcore.json
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/baseline.netcore.json
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/baseline.netcore.json
diff --git a/src/Microsoft.AspNetCore.Mvc.Core/breakingchanges.netcore.json b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/breakingchanges.netcore.json
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Core/breakingchanges.netcore.json
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Core/breakingchanges.netcore.json
diff --git a/src/Microsoft.AspNetCore.Mvc.Cors/CorsApplicationModelProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Cors/CorsApplicationModelProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Cors/CorsApplicationModelProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Cors/CorsApplicationModelProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Cors/CorsAuthorizationFilter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Cors/CorsAuthorizationFilter.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Cors/CorsAuthorizationFilter.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Cors/CorsAuthorizationFilter.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Cors/CorsAuthorizationFilterFactory.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Cors/CorsAuthorizationFilterFactory.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Cors/CorsAuthorizationFilterFactory.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Cors/CorsAuthorizationFilterFactory.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Cors/CorsHttpMethodActionConstraint.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Cors/CorsHttpMethodActionConstraint.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Cors/CorsHttpMethodActionConstraint.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Cors/CorsHttpMethodActionConstraint.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Cors/CorsLoggerExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Cors/CorsLoggerExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Cors/CorsLoggerExtensions.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Cors/CorsLoggerExtensions.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Cors/DependencyInjection/MvcCorsMvcCoreBuilderExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Cors/DependencyInjection/MvcCorsMvcCoreBuilderExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Cors/DependencyInjection/MvcCorsMvcCoreBuilderExtensions.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Cors/DependencyInjection/MvcCorsMvcCoreBuilderExtensions.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Cors/DisableCorsAuthorizationFilter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Cors/DisableCorsAuthorizationFilter.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Cors/DisableCorsAuthorizationFilter.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Cors/DisableCorsAuthorizationFilter.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Cors/ICorsAuthorizationFilter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Cors/ICorsAuthorizationFilter.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Cors/ICorsAuthorizationFilter.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Cors/ICorsAuthorizationFilter.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Cors/Microsoft.AspNetCore.Mvc.Cors.csproj b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Cors/Microsoft.AspNetCore.Mvc.Cors.csproj
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Cors/Microsoft.AspNetCore.Mvc.Cors.csproj
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Cors/Microsoft.AspNetCore.Mvc.Cors.csproj
diff --git a/src/Microsoft.AspNetCore.Mvc.Cors/Properties/AssemblyInfo.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Cors/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Cors/Properties/AssemblyInfo.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Cors/Properties/AssemblyInfo.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Cors/Properties/Resources.Designer.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Cors/Properties/Resources.Designer.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Cors/Properties/Resources.Designer.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Cors/Properties/Resources.Designer.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Cors/Resources.resx b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Cors/Resources.resx
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Cors/Resources.resx
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Cors/Resources.resx
diff --git a/src/Microsoft.AspNetCore.Mvc.Cors/baseline.netcore.json b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Cors/baseline.netcore.json
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Cors/baseline.netcore.json
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Cors/baseline.netcore.json
diff --git a/src/Microsoft.AspNetCore.Mvc.Cors/breakingchanges.netcore.json b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Cors/breakingchanges.netcore.json
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Cors/breakingchanges.netcore.json
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Cors/breakingchanges.netcore.json
diff --git a/src/Microsoft.AspNetCore.Mvc.DataAnnotations/AttributeAdapterBase.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/AttributeAdapterBase.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.DataAnnotations/AttributeAdapterBase.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/AttributeAdapterBase.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.DataAnnotations/CompareAttributeAdapter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/CompareAttributeAdapter.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.DataAnnotations/CompareAttributeAdapter.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/CompareAttributeAdapter.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.DataAnnotations/DataAnnotationsClientModelValidatorProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/DataAnnotationsClientModelValidatorProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.DataAnnotations/DataAnnotationsClientModelValidatorProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/DataAnnotationsClientModelValidatorProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.DataAnnotations/DataAnnotationsLocalizationServices.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/DataAnnotationsLocalizationServices.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.DataAnnotations/DataAnnotationsLocalizationServices.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/DataAnnotationsLocalizationServices.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.DataAnnotations/DataAnnotationsMetadataProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/DataAnnotationsMetadataProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.DataAnnotations/DataAnnotationsMetadataProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/DataAnnotationsMetadataProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.DataAnnotations/DataAnnotationsModelValidator.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/DataAnnotationsModelValidator.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.DataAnnotations/DataAnnotationsModelValidator.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/DataAnnotationsModelValidator.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.DataAnnotations/DataAnnotationsModelValidatorProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/DataAnnotationsModelValidatorProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.DataAnnotations/DataAnnotationsModelValidatorProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/DataAnnotationsModelValidatorProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.DataAnnotations/DataTypeAttributeAdapter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/DataTypeAttributeAdapter.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.DataAnnotations/DataTypeAttributeAdapter.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/DataTypeAttributeAdapter.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.DataAnnotations/DefaultClientModelValidatorProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/DefaultClientModelValidatorProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.DataAnnotations/DefaultClientModelValidatorProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/DefaultClientModelValidatorProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.DataAnnotations/DependencyInjection/MvcDataAnnotationsLocalizationConfigureCompatibilityOptions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/DependencyInjection/MvcDataAnnotationsLocalizationConfigureCompatibilityOptions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.DataAnnotations/DependencyInjection/MvcDataAnnotationsLocalizationConfigureCompatibilityOptions.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/DependencyInjection/MvcDataAnnotationsLocalizationConfigureCompatibilityOptions.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.DataAnnotations/DependencyInjection/MvcDataAnnotationsLocalizationOptionsSetup.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/DependencyInjection/MvcDataAnnotationsLocalizationOptionsSetup.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.DataAnnotations/DependencyInjection/MvcDataAnnotationsLocalizationOptionsSetup.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/DependencyInjection/MvcDataAnnotationsLocalizationOptionsSetup.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.DataAnnotations/DependencyInjection/MvcDataAnnotationsMvcBuilderExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/DependencyInjection/MvcDataAnnotationsMvcBuilderExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.DataAnnotations/DependencyInjection/MvcDataAnnotationsMvcBuilderExtensions.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/DependencyInjection/MvcDataAnnotationsMvcBuilderExtensions.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.DataAnnotations/DependencyInjection/MvcDataAnnotationsMvcCoreBuilderExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/DependencyInjection/MvcDataAnnotationsMvcCoreBuilderExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.DataAnnotations/DependencyInjection/MvcDataAnnotationsMvcCoreBuilderExtensions.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/DependencyInjection/MvcDataAnnotationsMvcCoreBuilderExtensions.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.DataAnnotations/DependencyInjection/MvcDataAnnotationsMvcOptionsSetup.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/DependencyInjection/MvcDataAnnotationsMvcOptionsSetup.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.DataAnnotations/DependencyInjection/MvcDataAnnotationsMvcOptionsSetup.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/DependencyInjection/MvcDataAnnotationsMvcOptionsSetup.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.DataAnnotations/FileExtensionsAttributeAdapter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/FileExtensionsAttributeAdapter.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.DataAnnotations/FileExtensionsAttributeAdapter.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/FileExtensionsAttributeAdapter.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.DataAnnotations/HiddenInputAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/HiddenInputAttribute.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.DataAnnotations/HiddenInputAttribute.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/HiddenInputAttribute.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.DataAnnotations/IAttributeAdapter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/IAttributeAdapter.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.DataAnnotations/IAttributeAdapter.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/IAttributeAdapter.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.DataAnnotations/IValidationAttributeAdapterProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/IValidationAttributeAdapterProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.DataAnnotations/IValidationAttributeAdapterProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/IValidationAttributeAdapterProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.DataAnnotations/MaxLengthAttributeAdapter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/MaxLengthAttributeAdapter.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.DataAnnotations/MaxLengthAttributeAdapter.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/MaxLengthAttributeAdapter.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Microsoft.AspNetCore.Mvc.DataAnnotations.csproj b/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Microsoft.AspNetCore.Mvc.DataAnnotations.csproj
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.DataAnnotations/Microsoft.AspNetCore.Mvc.DataAnnotations.csproj
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Microsoft.AspNetCore.Mvc.DataAnnotations.csproj
diff --git a/src/Microsoft.AspNetCore.Mvc.DataAnnotations/MinLengthAttributeAdapter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/MinLengthAttributeAdapter.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.DataAnnotations/MinLengthAttributeAdapter.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/MinLengthAttributeAdapter.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.DataAnnotations/MvcDataAnnotationsLocalizationOptions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/MvcDataAnnotationsLocalizationOptions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.DataAnnotations/MvcDataAnnotationsLocalizationOptions.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/MvcDataAnnotationsLocalizationOptions.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.DataAnnotations/NumericClientModelValidator.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/NumericClientModelValidator.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.DataAnnotations/NumericClientModelValidator.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/NumericClientModelValidator.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.DataAnnotations/NumericClientModelValidatorProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/NumericClientModelValidatorProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.DataAnnotations/NumericClientModelValidatorProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/NumericClientModelValidatorProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Properties/AssemblyInfo.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.DataAnnotations/Properties/AssemblyInfo.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Properties/AssemblyInfo.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Properties/Resources.Designer.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Properties/Resources.Designer.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.DataAnnotations/Properties/Resources.Designer.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Properties/Resources.Designer.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.DataAnnotations/RangeAttributeAdapter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/RangeAttributeAdapter.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.DataAnnotations/RangeAttributeAdapter.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/RangeAttributeAdapter.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.DataAnnotations/RegularExpressionAttributeAdapter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/RegularExpressionAttributeAdapter.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.DataAnnotations/RegularExpressionAttributeAdapter.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/RegularExpressionAttributeAdapter.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.DataAnnotations/RequiredAttributeAdapter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/RequiredAttributeAdapter.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.DataAnnotations/RequiredAttributeAdapter.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/RequiredAttributeAdapter.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Resources.resx b/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Resources.resx
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.DataAnnotations/Resources.resx
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Resources.resx
diff --git a/src/Microsoft.AspNetCore.Mvc.DataAnnotations/StringLengthAttributeAdapter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/StringLengthAttributeAdapter.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.DataAnnotations/StringLengthAttributeAdapter.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/StringLengthAttributeAdapter.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.DataAnnotations/ValidatableObjectAdapter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/ValidatableObjectAdapter.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.DataAnnotations/ValidatableObjectAdapter.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/ValidatableObjectAdapter.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.DataAnnotations/ValidationAttributeAdapterOfTAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/ValidationAttributeAdapterOfTAttribute.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.DataAnnotations/ValidationAttributeAdapterOfTAttribute.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/ValidationAttributeAdapterOfTAttribute.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.DataAnnotations/ValidationAttributeAdapterProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/ValidationAttributeAdapterProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.DataAnnotations/ValidationAttributeAdapterProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/ValidationAttributeAdapterProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.DataAnnotations/ValidationProviderAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/ValidationProviderAttribute.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.DataAnnotations/ValidationProviderAttribute.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/ValidationProviderAttribute.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.DataAnnotations/baseline.netcore.json b/src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/baseline.netcore.json
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.DataAnnotations/baseline.netcore.json
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.DataAnnotations/baseline.netcore.json
diff --git a/src/Microsoft.AspNetCore.Mvc.Formatters.Json/DependencyInjection/MvcJsonMvcBuilderExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/DependencyInjection/MvcJsonMvcBuilderExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Formatters.Json/DependencyInjection/MvcJsonMvcBuilderExtensions.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/DependencyInjection/MvcJsonMvcBuilderExtensions.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Formatters.Json/DependencyInjection/MvcJsonMvcCoreBuilderExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/DependencyInjection/MvcJsonMvcCoreBuilderExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Formatters.Json/DependencyInjection/MvcJsonMvcCoreBuilderExtensions.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/DependencyInjection/MvcJsonMvcCoreBuilderExtensions.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Formatters.Json/DependencyInjection/MvcJsonMvcOptionsSetup.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/DependencyInjection/MvcJsonMvcOptionsSetup.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Formatters.Json/DependencyInjection/MvcJsonMvcOptionsSetup.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/DependencyInjection/MvcJsonMvcOptionsSetup.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Formatters.Json/DependencyInjection/MvcJsonOptionsConfigureCompatibilityOptions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/DependencyInjection/MvcJsonOptionsConfigureCompatibilityOptions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Formatters.Json/DependencyInjection/MvcJsonOptionsConfigureCompatibilityOptions.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/DependencyInjection/MvcJsonOptionsConfigureCompatibilityOptions.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Formatters.Json/DependencyInjection/MvcJsonOptionsExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/DependencyInjection/MvcJsonOptionsExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Formatters.Json/DependencyInjection/MvcJsonOptionsExtensions.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/DependencyInjection/MvcJsonOptionsExtensions.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Formatters.Json/JsonArrayPool.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/JsonArrayPool.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Formatters.Json/JsonArrayPool.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/JsonArrayPool.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Formatters.Json/JsonInputFormatter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/JsonInputFormatter.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Formatters.Json/JsonInputFormatter.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/JsonInputFormatter.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Formatters.Json/JsonOutputFormatter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/JsonOutputFormatter.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Formatters.Json/JsonOutputFormatter.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/JsonOutputFormatter.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Formatters.Json/JsonPatchExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/JsonPatchExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Formatters.Json/JsonPatchExtensions.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/JsonPatchExtensions.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Formatters.Json/JsonPatchInputFormatter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/JsonPatchInputFormatter.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Formatters.Json/JsonPatchInputFormatter.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/JsonPatchInputFormatter.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Formatters.Json/JsonPatchOperationsArrayProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/JsonPatchOperationsArrayProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Formatters.Json/JsonPatchOperationsArrayProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/JsonPatchOperationsArrayProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Formatters.Json/JsonResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/JsonResult.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Formatters.Json/JsonResult.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/JsonResult.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Formatters.Json/JsonResultExecutor.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/JsonResultExecutor.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Formatters.Json/JsonResultExecutor.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/JsonResultExecutor.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Formatters.Json/JsonSerializerObjectPolicy.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/JsonSerializerObjectPolicy.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Formatters.Json/JsonSerializerObjectPolicy.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/JsonSerializerObjectPolicy.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Formatters.Json/JsonSerializerSettingsProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/JsonSerializerSettingsProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Formatters.Json/JsonSerializerSettingsProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/JsonSerializerSettingsProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Formatters.Json/MediaTypeHeaderValues.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/MediaTypeHeaderValues.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Formatters.Json/MediaTypeHeaderValues.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/MediaTypeHeaderValues.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Formatters.Json/Microsoft.AspNetCore.Mvc.Formatters.Json.csproj b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/Microsoft.AspNetCore.Mvc.Formatters.Json.csproj
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Formatters.Json/Microsoft.AspNetCore.Mvc.Formatters.Json.csproj
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/Microsoft.AspNetCore.Mvc.Formatters.Json.csproj
diff --git a/src/Microsoft.AspNetCore.Mvc.Formatters.Json/MvcJsonLoggerExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/MvcJsonLoggerExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Formatters.Json/MvcJsonLoggerExtensions.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/MvcJsonLoggerExtensions.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Formatters.Json/MvcJsonOptions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/MvcJsonOptions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Formatters.Json/MvcJsonOptions.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/MvcJsonOptions.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Formatters.Json/Properties/AssemblyInfo.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Formatters.Json/Properties/AssemblyInfo.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/Properties/AssemblyInfo.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Formatters.Json/Properties/Resources.Designer.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/Properties/Resources.Designer.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Formatters.Json/Properties/Resources.Designer.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/Properties/Resources.Designer.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Formatters.Json/Resources.resx b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/Resources.resx
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Formatters.Json/Resources.resx
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/Resources.resx
diff --git a/src/Microsoft.AspNetCore.Mvc.Formatters.Json/baseline.netcore.json b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/baseline.netcore.json
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Formatters.Json/baseline.netcore.json
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Json/baseline.netcore.json
diff --git a/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/DelegatingEnumerable.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/DelegatingEnumerable.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Formatters.Xml/DelegatingEnumerable.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/DelegatingEnumerable.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/DelegatingEnumerator.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/DelegatingEnumerator.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Formatters.Xml/DelegatingEnumerator.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/DelegatingEnumerator.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/DependencyInjection/MvcXmlMvcBuilderExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/DependencyInjection/MvcXmlMvcBuilderExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Formatters.Xml/DependencyInjection/MvcXmlMvcBuilderExtensions.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/DependencyInjection/MvcXmlMvcBuilderExtensions.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/DependencyInjection/MvcXmlMvcCoreBuilderExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/DependencyInjection/MvcXmlMvcCoreBuilderExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Formatters.Xml/DependencyInjection/MvcXmlMvcCoreBuilderExtensions.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/DependencyInjection/MvcXmlMvcCoreBuilderExtensions.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/DependencyInjection/MvcXmlOptionsConfigureCompatibilityOptions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/DependencyInjection/MvcXmlOptionsConfigureCompatibilityOptions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Formatters.Xml/DependencyInjection/MvcXmlOptionsConfigureCompatibilityOptions.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/DependencyInjection/MvcXmlOptionsConfigureCompatibilityOptions.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/DependencyInjection/XmlDataContractSerializerMvcOptionsSetup.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/DependencyInjection/XmlDataContractSerializerMvcOptionsSetup.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Formatters.Xml/DependencyInjection/XmlDataContractSerializerMvcOptionsSetup.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/DependencyInjection/XmlDataContractSerializerMvcOptionsSetup.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/DependencyInjection/XmlSerializerMvcOptionsSetup.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/DependencyInjection/XmlSerializerMvcOptionsSetup.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Formatters.Xml/DependencyInjection/XmlSerializerMvcOptionsSetup.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/DependencyInjection/XmlSerializerMvcOptionsSetup.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/EnumerableWrapperProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/EnumerableWrapperProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Formatters.Xml/EnumerableWrapperProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/EnumerableWrapperProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/EnumerableWrapperProviderFactory.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/EnumerableWrapperProviderFactory.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Formatters.Xml/EnumerableWrapperProviderFactory.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/EnumerableWrapperProviderFactory.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/FormattingUtilities.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/FormattingUtilities.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Formatters.Xml/FormattingUtilities.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/FormattingUtilities.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/IUnwrappable.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/IUnwrappable.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Formatters.Xml/IUnwrappable.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/IUnwrappable.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/IWrapperProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/IWrapperProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Formatters.Xml/IWrapperProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/IWrapperProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/IWrapperProviderFactory.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/IWrapperProviderFactory.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Formatters.Xml/IWrapperProviderFactory.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/IWrapperProviderFactory.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/LoggerExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/LoggerExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Formatters.Xml/LoggerExtensions.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/LoggerExtensions.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/MediaTypeHeaderValues.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/MediaTypeHeaderValues.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Formatters.Xml/MediaTypeHeaderValues.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/MediaTypeHeaderValues.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/Microsoft.AspNetCore.Mvc.Formatters.Xml.csproj b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/Microsoft.AspNetCore.Mvc.Formatters.Xml.csproj
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Formatters.Xml/Microsoft.AspNetCore.Mvc.Formatters.Xml.csproj
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/Microsoft.AspNetCore.Mvc.Formatters.Xml.csproj
diff --git a/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/ModelBinding/DataMemberRequiredBindingMetadataProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/ModelBinding/DataMemberRequiredBindingMetadataProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Formatters.Xml/ModelBinding/DataMemberRequiredBindingMetadataProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/ModelBinding/DataMemberRequiredBindingMetadataProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/MvcXmlOptions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/MvcXmlOptions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Formatters.Xml/MvcXmlOptions.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/MvcXmlOptions.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/ProblemDetails21Wrapper.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/ProblemDetails21Wrapper.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Formatters.Xml/ProblemDetails21Wrapper.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/ProblemDetails21Wrapper.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/ProblemDetailsWrapper.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/ProblemDetailsWrapper.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Formatters.Xml/ProblemDetailsWrapper.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/ProblemDetailsWrapper.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/ProblemDetailsWrapperProviderFactory.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/ProblemDetailsWrapperProviderFactory.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Formatters.Xml/ProblemDetailsWrapperProviderFactory.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/ProblemDetailsWrapperProviderFactory.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/Properties/AssemblyInfo.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Formatters.Xml/Properties/AssemblyInfo.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/Properties/AssemblyInfo.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/Properties/Resources.Designer.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/Properties/Resources.Designer.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Formatters.Xml/Properties/Resources.Designer.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/Properties/Resources.Designer.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/Resources.resx b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/Resources.resx
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Formatters.Xml/Resources.resx
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/Resources.resx
diff --git a/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/SerializableErrorWrapper.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/SerializableErrorWrapper.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Formatters.Xml/SerializableErrorWrapper.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/SerializableErrorWrapper.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/SerializableErrorWrapperProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/SerializableErrorWrapperProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Formatters.Xml/SerializableErrorWrapperProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/SerializableErrorWrapperProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/SerializableErrorWrapperProviderFactory.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/SerializableErrorWrapperProviderFactory.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Formatters.Xml/SerializableErrorWrapperProviderFactory.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/SerializableErrorWrapperProviderFactory.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/ValidationProblemDetails21Wrapper.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/ValidationProblemDetails21Wrapper.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Formatters.Xml/ValidationProblemDetails21Wrapper.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/ValidationProblemDetails21Wrapper.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/ValidationProblemDetailsWrapper.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/ValidationProblemDetailsWrapper.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Formatters.Xml/ValidationProblemDetailsWrapper.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/ValidationProblemDetailsWrapper.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/WrapperProviderContext.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/WrapperProviderContext.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Formatters.Xml/WrapperProviderContext.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/WrapperProviderContext.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/WrapperProviderFactoriesExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/WrapperProviderFactoriesExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Formatters.Xml/WrapperProviderFactoriesExtensions.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/WrapperProviderFactoriesExtensions.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/XmlDataContractSerializerInputFormatter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/XmlDataContractSerializerInputFormatter.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Formatters.Xml/XmlDataContractSerializerInputFormatter.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/XmlDataContractSerializerInputFormatter.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/XmlDataContractSerializerOutputFormatter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/XmlDataContractSerializerOutputFormatter.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Formatters.Xml/XmlDataContractSerializerOutputFormatter.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/XmlDataContractSerializerOutputFormatter.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/XmlSerializerInputFormatter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/XmlSerializerInputFormatter.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Formatters.Xml/XmlSerializerInputFormatter.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/XmlSerializerInputFormatter.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/XmlSerializerOutputFormatter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/XmlSerializerOutputFormatter.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Formatters.Xml/XmlSerializerOutputFormatter.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/XmlSerializerOutputFormatter.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/baseline.netcore.json b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/baseline.netcore.json
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Formatters.Xml/baseline.netcore.json
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/baseline.netcore.json
diff --git a/src/Microsoft.AspNetCore.Mvc.Localization/DependencyInjection/MvcLocalizationMvcBuilderExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/DependencyInjection/MvcLocalizationMvcBuilderExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Localization/DependencyInjection/MvcLocalizationMvcBuilderExtensions.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/DependencyInjection/MvcLocalizationMvcBuilderExtensions.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Localization/DependencyInjection/MvcLocalizationMvcCoreBuilderExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/DependencyInjection/MvcLocalizationMvcCoreBuilderExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Localization/DependencyInjection/MvcLocalizationMvcCoreBuilderExtensions.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/DependencyInjection/MvcLocalizationMvcCoreBuilderExtensions.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Localization/HtmlLocalizer.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/HtmlLocalizer.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Localization/HtmlLocalizer.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/HtmlLocalizer.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Localization/HtmlLocalizerExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/HtmlLocalizerExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Localization/HtmlLocalizerExtensions.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/HtmlLocalizerExtensions.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Localization/HtmlLocalizerFactory.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/HtmlLocalizerFactory.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Localization/HtmlLocalizerFactory.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/HtmlLocalizerFactory.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Localization/HtmlLocalizerOfT.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/HtmlLocalizerOfT.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Localization/HtmlLocalizerOfT.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/HtmlLocalizerOfT.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Localization/IHtmlLocalizer.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/IHtmlLocalizer.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Localization/IHtmlLocalizer.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/IHtmlLocalizer.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Localization/IHtmlLocalizerFactory.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/IHtmlLocalizerFactory.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Localization/IHtmlLocalizerFactory.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/IHtmlLocalizerFactory.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Localization/IHtmlLocalizerOfT.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/IHtmlLocalizerOfT.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Localization/IHtmlLocalizerOfT.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/IHtmlLocalizerOfT.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Localization/IViewLocalizer.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/IViewLocalizer.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Localization/IViewLocalizer.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/IViewLocalizer.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Localization/LocalizedHtmlString.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/LocalizedHtmlString.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Localization/LocalizedHtmlString.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/LocalizedHtmlString.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Localization/Microsoft.AspNetCore.Mvc.Localization.csproj b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/Microsoft.AspNetCore.Mvc.Localization.csproj
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Localization/Microsoft.AspNetCore.Mvc.Localization.csproj
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/Microsoft.AspNetCore.Mvc.Localization.csproj
diff --git a/src/Microsoft.AspNetCore.Mvc.Localization/MvcLocalizationServices.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/MvcLocalizationServices.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Localization/MvcLocalizationServices.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/MvcLocalizationServices.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Localization/Properties/AssemblyInfo.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Localization/Properties/AssemblyInfo.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/Properties/AssemblyInfo.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Localization/Properties/Resources.Designer.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/Properties/Resources.Designer.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Localization/Properties/Resources.Designer.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/Properties/Resources.Designer.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Localization/ViewLocalizer.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/ViewLocalizer.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Localization/ViewLocalizer.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/ViewLocalizer.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Localization/baseline.netcore.json b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/baseline.netcore.json
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Localization/baseline.netcore.json
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Localization/baseline.netcore.json
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/ApplicationParts/CompiledRazorAssemblyApplicationPartFactory.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/ApplicationParts/CompiledRazorAssemblyApplicationPartFactory.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Razor/ApplicationParts/CompiledRazorAssemblyApplicationPartFactory.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/ApplicationParts/CompiledRazorAssemblyApplicationPartFactory.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/ApplicationParts/CompiledRazorAssemblyPart.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/ApplicationParts/CompiledRazorAssemblyPart.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Razor/ApplicationParts/CompiledRazorAssemblyPart.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/ApplicationParts/CompiledRazorAssemblyPart.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/ApplicationParts/IRazorCompiledItemProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/ApplicationParts/IRazorCompiledItemProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Razor/ApplicationParts/IRazorCompiledItemProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/ApplicationParts/IRazorCompiledItemProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/ApplicationParts/RazorCompiledItemFeatureProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/ApplicationParts/RazorCompiledItemFeatureProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Razor/ApplicationParts/RazorCompiledItemFeatureProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/ApplicationParts/RazorCompiledItemFeatureProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/CompiledViewDescriptor.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/CompiledViewDescriptor.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Razor/Compilation/CompiledViewDescriptor.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/CompiledViewDescriptor.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/DefaultRazorPageFactoryProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/DefaultRazorPageFactoryProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Razor/Compilation/DefaultRazorPageFactoryProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/DefaultRazorPageFactoryProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/IViewCompiler.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/IViewCompiler.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Razor/Compilation/IViewCompiler.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/IViewCompiler.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/IViewCompilerProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/IViewCompilerProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Razor/Compilation/IViewCompilerProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/IViewCompilerProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/RazorViewAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/RazorViewAttribute.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Razor/Compilation/RazorViewAttribute.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/RazorViewAttribute.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/RazorViewCompiler.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/RazorViewCompiler.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Razor/Compilation/RazorViewCompiler.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/RazorViewCompiler.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/RazorViewCompilerProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/RazorViewCompilerProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Razor/Compilation/RazorViewCompilerProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/RazorViewCompilerProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/ViewsFeature.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/ViewsFeature.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Razor/Compilation/ViewsFeature.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/ViewsFeature.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/ViewsFeatureProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/ViewsFeatureProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Razor/Compilation/ViewsFeatureProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Compilation/ViewsFeatureProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/DefaultTagHelperFactory.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/DefaultTagHelperFactory.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Razor/DefaultTagHelperFactory.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/DefaultTagHelperFactory.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/DependencyInjection/MvcRazorMvcBuilderExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/DependencyInjection/MvcRazorMvcBuilderExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Razor/DependencyInjection/MvcRazorMvcBuilderExtensions.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/DependencyInjection/MvcRazorMvcBuilderExtensions.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/DependencyInjection/MvcRazorMvcCoreBuilderExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/DependencyInjection/MvcRazorMvcCoreBuilderExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Razor/DependencyInjection/MvcRazorMvcCoreBuilderExtensions.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/DependencyInjection/MvcRazorMvcCoreBuilderExtensions.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/DependencyInjection/MvcRazorMvcViewOptionsSetup.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/DependencyInjection/MvcRazorMvcViewOptionsSetup.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Razor/DependencyInjection/MvcRazorMvcViewOptionsSetup.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/DependencyInjection/MvcRazorMvcViewOptionsSetup.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/DependencyInjection/TagHelpersAsServices.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/DependencyInjection/TagHelpersAsServices.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Razor/DependencyInjection/TagHelpersAsServices.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/DependencyInjection/TagHelpersAsServices.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/HelperResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/HelperResult.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Razor/HelperResult.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/HelperResult.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/IModelTypeProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/IModelTypeProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Razor/IModelTypeProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/IModelTypeProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/IRazorPage.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/IRazorPage.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Razor/IRazorPage.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/IRazorPage.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/IRazorPageActivator.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/IRazorPageActivator.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Razor/IRazorPageActivator.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/IRazorPageActivator.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/IRazorPageFactoryProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/IRazorPageFactoryProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Razor/IRazorPageFactoryProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/IRazorPageFactoryProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/IRazorViewEngine.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/IRazorViewEngine.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Razor/IRazorViewEngine.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/IRazorViewEngine.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/ITagHelperActivator.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/ITagHelperActivator.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Razor/ITagHelperActivator.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/ITagHelperActivator.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/ITagHelperFactory.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/ITagHelperFactory.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Razor/ITagHelperFactory.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/ITagHelperFactory.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/ITagHelperInitializerOfT.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/ITagHelperInitializerOfT.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Razor/ITagHelperInitializerOfT.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/ITagHelperInitializerOfT.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/IViewLocationExpander.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/IViewLocationExpander.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Razor/IViewLocationExpander.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/IViewLocationExpander.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/Infrastructure/CryptographyAlgorithms.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Infrastructure/CryptographyAlgorithms.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Razor/Infrastructure/CryptographyAlgorithms.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Infrastructure/CryptographyAlgorithms.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/Infrastructure/DefaultFileVersionProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Infrastructure/DefaultFileVersionProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Razor/Infrastructure/DefaultFileVersionProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Infrastructure/DefaultFileVersionProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/Infrastructure/DefaultTagHelperActivator.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Infrastructure/DefaultTagHelperActivator.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Razor/Infrastructure/DefaultTagHelperActivator.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Infrastructure/DefaultTagHelperActivator.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/Infrastructure/TagHelperMemoryCacheProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Infrastructure/TagHelperMemoryCacheProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Razor/Infrastructure/TagHelperMemoryCacheProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Infrastructure/TagHelperMemoryCacheProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/Internal/RazorInjectAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/RazorInjectAttribute.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Razor/Internal/RazorInjectAttribute.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Internal/RazorInjectAttribute.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/LanguageViewLocationExpander.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/LanguageViewLocationExpander.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Razor/LanguageViewLocationExpander.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/LanguageViewLocationExpander.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/LanguageViewLocationExpanderFormat.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/LanguageViewLocationExpanderFormat.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Razor/LanguageViewLocationExpanderFormat.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/LanguageViewLocationExpanderFormat.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/Microsoft.AspNetCore.Mvc.Razor.csproj b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Microsoft.AspNetCore.Mvc.Razor.csproj
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Razor/Microsoft.AspNetCore.Mvc.Razor.csproj
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Microsoft.AspNetCore.Mvc.Razor.csproj
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/MvcRazorDiagnosticSourceExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/MvcRazorDiagnosticSourceExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Razor/MvcRazorDiagnosticSourceExtensions.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/MvcRazorDiagnosticSourceExtensions.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/MvcRazorLoggerExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/MvcRazorLoggerExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Razor/MvcRazorLoggerExtensions.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/MvcRazorLoggerExtensions.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/Properties/AssemblyInfo.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Razor/Properties/AssemblyInfo.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Properties/AssemblyInfo.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/Properties/Resources.Designer.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Properties/Resources.Designer.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Razor/Properties/Resources.Designer.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Properties/Resources.Designer.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/RazorFileHierarchy.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/RazorFileHierarchy.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Razor/RazorFileHierarchy.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/RazorFileHierarchy.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/RazorPage.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/RazorPage.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Razor/RazorPage.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/RazorPage.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/RazorPageActivator.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/RazorPageActivator.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Razor/RazorPageActivator.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/RazorPageActivator.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/RazorPageBase.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/RazorPageBase.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Razor/RazorPageBase.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/RazorPageBase.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/RazorPageFactoryResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/RazorPageFactoryResult.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Razor/RazorPageFactoryResult.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/RazorPageFactoryResult.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/RazorPageOfT.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/RazorPageOfT.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Razor/RazorPageOfT.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/RazorPageOfT.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/RazorPagePropertyActivator.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/RazorPagePropertyActivator.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Razor/RazorPagePropertyActivator.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/RazorPagePropertyActivator.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/RazorPageResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/RazorPageResult.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Razor/RazorPageResult.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/RazorPageResult.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/RazorView.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/RazorView.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Razor/RazorView.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/RazorView.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/RazorViewEngine.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/RazorViewEngine.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Razor/RazorViewEngine.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/RazorViewEngine.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/RazorViewEngineOptions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/RazorViewEngineOptions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Razor/RazorViewEngineOptions.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/RazorViewEngineOptions.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/RazorViewEngineOptionsSetup.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/RazorViewEngineOptionsSetup.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Razor/RazorViewEngineOptionsSetup.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/RazorViewEngineOptionsSetup.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/RenderAsyncDelegate.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/RenderAsyncDelegate.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Razor/RenderAsyncDelegate.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/RenderAsyncDelegate.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/Resources.resx b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Resources.resx
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Razor/Resources.resx
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/Resources.resx
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/ServiceBasedTagHelperActivator.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/ServiceBasedTagHelperActivator.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Razor/ServiceBasedTagHelperActivator.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/ServiceBasedTagHelperActivator.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/TagHelperComponentManager.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/TagHelperComponentManager.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Razor/TagHelperComponentManager.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/TagHelperComponentManager.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/TagHelperInitializerOfT.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/TagHelperInitializerOfT.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Razor/TagHelperInitializerOfT.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/TagHelperInitializerOfT.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/TagHelpers/BodyTagHelper.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/TagHelpers/BodyTagHelper.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Razor/TagHelpers/BodyTagHelper.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/TagHelpers/BodyTagHelper.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/TagHelpers/HeadTagHelper.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/TagHelpers/HeadTagHelper.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Razor/TagHelpers/HeadTagHelper.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/TagHelpers/HeadTagHelper.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/TagHelpers/ITagHelperComponentManager.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/TagHelpers/ITagHelperComponentManager.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Razor/TagHelpers/ITagHelperComponentManager.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/TagHelpers/ITagHelperComponentManager.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/TagHelpers/ITagHelperComponentPropertyActivator.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/TagHelpers/ITagHelperComponentPropertyActivator.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Razor/TagHelpers/ITagHelperComponentPropertyActivator.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/TagHelpers/ITagHelperComponentPropertyActivator.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/TagHelpers/TagHelperComponentPropertyActivator.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/TagHelpers/TagHelperComponentPropertyActivator.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Razor/TagHelpers/TagHelperComponentPropertyActivator.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/TagHelpers/TagHelperComponentPropertyActivator.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/TagHelpers/TagHelperComponentTagHelper.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/TagHelpers/TagHelperComponentTagHelper.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Razor/TagHelpers/TagHelperComponentTagHelper.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/TagHelpers/TagHelperComponentTagHelper.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/TagHelpers/TagHelperFeature.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/TagHelpers/TagHelperFeature.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Razor/TagHelpers/TagHelperFeature.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/TagHelpers/TagHelperFeature.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/TagHelpers/TagHelperFeatureProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/TagHelpers/TagHelperFeatureProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Razor/TagHelpers/TagHelperFeatureProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/TagHelpers/TagHelperFeatureProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/TagHelpers/UrlResolutionTagHelper.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/TagHelpers/UrlResolutionTagHelper.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Razor/TagHelpers/UrlResolutionTagHelper.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/TagHelpers/UrlResolutionTagHelper.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/ViewLocationCacheItem.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/ViewLocationCacheItem.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Razor/ViewLocationCacheItem.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/ViewLocationCacheItem.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/ViewLocationCacheKey.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/ViewLocationCacheKey.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Razor/ViewLocationCacheKey.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/ViewLocationCacheKey.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/ViewLocationCacheResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/ViewLocationCacheResult.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Razor/ViewLocationCacheResult.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/ViewLocationCacheResult.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/ViewLocationExpanderContext.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/ViewLocationExpanderContext.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Razor/ViewLocationExpanderContext.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/ViewLocationExpanderContext.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/ViewPath.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/ViewPath.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Razor/ViewPath.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/ViewPath.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/baseline.netcore.json b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/baseline.netcore.json
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Razor/baseline.netcore.json
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/baseline.netcore.json
diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/breakingchanges.netcore.json b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/breakingchanges.netcore.json
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Razor/breakingchanges.netcore.json
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Razor/breakingchanges.netcore.json
diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/AuthorizationPageApplicationModelProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/AuthorizationPageApplicationModelProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/AuthorizationPageApplicationModelProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/AuthorizationPageApplicationModelProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/AutoValidateAntiforgeryPageApplicationModelProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/AutoValidateAntiforgeryPageApplicationModelProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/AutoValidateAntiforgeryPageApplicationModelProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/AutoValidateAntiforgeryPageApplicationModelProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/CompiledPageActionDescriptorBuilder.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/CompiledPageActionDescriptorBuilder.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/CompiledPageActionDescriptorBuilder.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/CompiledPageActionDescriptorBuilder.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/CompiledPageRouteModelProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/CompiledPageRouteModelProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/CompiledPageRouteModelProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/CompiledPageRouteModelProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/DefaultPageApplicationModelProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/DefaultPageApplicationModelProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/DefaultPageApplicationModelProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/DefaultPageApplicationModelProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/IPageApplicationModelConvention.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/IPageApplicationModelConvention.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/IPageApplicationModelConvention.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/IPageApplicationModelConvention.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/IPageApplicationModelProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/IPageApplicationModelProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/IPageApplicationModelProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/IPageApplicationModelProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/IPageConvention.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/IPageConvention.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/IPageConvention.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/IPageConvention.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/IPageHandlerModelConvention.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/IPageHandlerModelConvention.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/IPageHandlerModelConvention.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/IPageHandlerModelConvention.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/IPageRouteModelConvention.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/IPageRouteModelConvention.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/IPageRouteModelConvention.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/IPageRouteModelConvention.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/IPageRouteModelProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/IPageRouteModelProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/IPageRouteModelProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/IPageRouteModelProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/PageApplicationModel.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/PageApplicationModel.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/PageApplicationModel.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/PageApplicationModel.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/PageApplicationModelProviderContext.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/PageApplicationModelProviderContext.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/PageApplicationModelProviderContext.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/PageApplicationModelProviderContext.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/PageConventionCollection.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/PageConventionCollection.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/PageConventionCollection.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/PageConventionCollection.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/PageHandlerModel.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/PageHandlerModel.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/PageHandlerModel.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/PageHandlerModel.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/PageParameterModel.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/PageParameterModel.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/PageParameterModel.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/PageParameterModel.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/PagePropertyModel.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/PagePropertyModel.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/PagePropertyModel.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/PagePropertyModel.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/PageRouteMetadata.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/PageRouteMetadata.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/PageRouteMetadata.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/PageRouteMetadata.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/PageRouteModel.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/PageRouteModel.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/PageRouteModel.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/PageRouteModel.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/PageRouteModelFactory.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/PageRouteModelFactory.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/PageRouteModelFactory.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/PageRouteModelFactory.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/PageRouteModelProviderContext.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/PageRouteModelProviderContext.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/PageRouteModelProviderContext.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/PageRouteModelProviderContext.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/PageRouteTransformerConvention.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/PageRouteTransformerConvention.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/PageRouteTransformerConvention.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/PageRouteTransformerConvention.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/ResponseCacheFilterApplicationModelProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/ResponseCacheFilterApplicationModelProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/ResponseCacheFilterApplicationModelProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/ResponseCacheFilterApplicationModelProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/TempDataFilterPageApplicationModelProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/TempDataFilterPageApplicationModelProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/TempDataFilterPageApplicationModelProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/TempDataFilterPageApplicationModelProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/ViewDataAttributePageApplicationModelProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/ViewDataAttributePageApplicationModelProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/ViewDataAttributePageApplicationModelProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/ViewDataAttributePageApplicationModelProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/Builder/RazorPagesEndpointRouteBuilderExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Builder/RazorPagesEndpointRouteBuilderExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.RazorPages/Builder/RazorPagesEndpointRouteBuilderExtensions.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Builder/RazorPagesEndpointRouteBuilderExtensions.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/CompiledPageActionDescriptor.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/CompiledPageActionDescriptor.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.RazorPages/CompiledPageActionDescriptor.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/CompiledPageActionDescriptor.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/DependencyInjection/MvcRazorPagesMvcBuilderExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/DependencyInjection/MvcRazorPagesMvcBuilderExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.RazorPages/DependencyInjection/MvcRazorPagesMvcBuilderExtensions.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/DependencyInjection/MvcRazorPagesMvcBuilderExtensions.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/DependencyInjection/MvcRazorPagesMvcCoreBuilderExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/DependencyInjection/MvcRazorPagesMvcCoreBuilderExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.RazorPages/DependencyInjection/MvcRazorPagesMvcCoreBuilderExtensions.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/DependencyInjection/MvcRazorPagesMvcCoreBuilderExtensions.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/DependencyInjection/PageConventionCollectionExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/DependencyInjection/PageConventionCollectionExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.RazorPages/DependencyInjection/PageConventionCollectionExtensions.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/DependencyInjection/PageConventionCollectionExtensions.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/DependencyInjection/RazorPagesRazorViewEngineOptionsSetup.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/DependencyInjection/RazorPagesRazorViewEngineOptionsSetup.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.RazorPages/DependencyInjection/RazorPagesRazorViewEngineOptionsSetup.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/DependencyInjection/RazorPagesRazorViewEngineOptionsSetup.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/Filters/IAsyncPageFilter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Filters/IAsyncPageFilter.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.RazorPages/Filters/IAsyncPageFilter.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Filters/IAsyncPageFilter.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/Filters/IPageFilter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Filters/IPageFilter.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.RazorPages/Filters/IPageFilter.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Filters/IPageFilter.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/Filters/PageHandlerExecutedContext.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Filters/PageHandlerExecutedContext.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.RazorPages/Filters/PageHandlerExecutedContext.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Filters/PageHandlerExecutedContext.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/Filters/PageHandlerExecutingContext.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Filters/PageHandlerExecutingContext.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.RazorPages/Filters/PageHandlerExecutingContext.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Filters/PageHandlerExecutingContext.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/Filters/PageHandlerExecutionDelegate.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Filters/PageHandlerExecutionDelegate.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.RazorPages/Filters/PageHandlerExecutionDelegate.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Filters/PageHandlerExecutionDelegate.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/Filters/PageHandlerPageFilter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Filters/PageHandlerPageFilter.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.RazorPages/Filters/PageHandlerPageFilter.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Filters/PageHandlerPageFilter.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/Filters/PageHandlerResultFIlter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Filters/PageHandlerResultFIlter.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.RazorPages/Filters/PageHandlerResultFIlter.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Filters/PageHandlerResultFIlter.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/Filters/PageHandlerSelectedContext.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Filters/PageHandlerSelectedContext.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.RazorPages/Filters/PageHandlerSelectedContext.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Filters/PageHandlerSelectedContext.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/Filters/PageResponseCacheFilter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Filters/PageResponseCacheFilter.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.RazorPages/Filters/PageResponseCacheFilter.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Filters/PageResponseCacheFilter.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/Filters/PageSaveTempDataPropertyFilter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Filters/PageSaveTempDataPropertyFilter.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.RazorPages/Filters/PageSaveTempDataPropertyFilter.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Filters/PageSaveTempDataPropertyFilter.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/Filters/PageSaveTempDataPropertyFilterFactory.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Filters/PageSaveTempDataPropertyFilterFactory.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.RazorPages/Filters/PageSaveTempDataPropertyFilterFactory.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Filters/PageSaveTempDataPropertyFilterFactory.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/Filters/PageViewDataAttributeFilter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Filters/PageViewDataAttributeFilter.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.RazorPages/Filters/PageViewDataAttributeFilter.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Filters/PageViewDataAttributeFilter.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/Filters/PageViewDataAttributeFilterFactory.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Filters/PageViewDataAttributeFilterFactory.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.RazorPages/Filters/PageViewDataAttributeFilterFactory.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Filters/PageViewDataAttributeFilterFactory.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/IPageActivatorProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/IPageActivatorProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.RazorPages/IPageActivatorProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/IPageActivatorProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/IPageFactoryProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/IPageFactoryProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.RazorPages/IPageFactoryProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/IPageFactoryProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/IPageModelActivatorProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/IPageModelActivatorProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.RazorPages/IPageModelActivatorProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/IPageModelActivatorProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/IPageModelFactoryProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/IPageModelFactoryProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.RazorPages/IPageModelFactoryProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/IPageModelFactoryProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/DefaultPageActivatorProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/DefaultPageActivatorProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/DefaultPageActivatorProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/DefaultPageActivatorProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/DefaultPageArgumentBinder.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/DefaultPageArgumentBinder.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/DefaultPageArgumentBinder.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/DefaultPageArgumentBinder.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/DefaultPageFactoryProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/DefaultPageFactoryProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/DefaultPageFactoryProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/DefaultPageFactoryProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/DefaultPageHandlerMethodSelector.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/DefaultPageHandlerMethodSelector.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/DefaultPageHandlerMethodSelector.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/DefaultPageHandlerMethodSelector.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/DefaultPageLoader.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/DefaultPageLoader.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/DefaultPageLoader.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/DefaultPageLoader.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/DefaultPageModelActivatorProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/DefaultPageModelActivatorProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/DefaultPageModelActivatorProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/DefaultPageModelActivatorProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/DefaultPageModelFactoryProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/DefaultPageModelFactoryProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/DefaultPageModelFactoryProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/DefaultPageModelFactoryProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/ExecutorFactory.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/ExecutorFactory.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/ExecutorFactory.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/ExecutorFactory.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/HandleOptionsRequestsPageFilter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/HandleOptionsRequestsPageFilter.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/HandleOptionsRequestsPageFilter.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/HandleOptionsRequestsPageFilter.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/HandlerMethodDescriptor.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/HandlerMethodDescriptor.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/HandlerMethodDescriptor.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/HandlerMethodDescriptor.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/HandlerParameterDescriptor.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/HandlerParameterDescriptor.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/HandlerParameterDescriptor.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/HandlerParameterDescriptor.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/IPageHandlerMethodSelector.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/IPageHandlerMethodSelector.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/IPageHandlerMethodSelector.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/IPageHandlerMethodSelector.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/IPageLoader.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/IPageLoader.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/IPageLoader.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/IPageLoader.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageActionDescriptorProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageActionDescriptorProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageActionDescriptorProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageActionDescriptorProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageActionInvoker.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageActionInvoker.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageActionInvoker.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageActionInvoker.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageActionInvokerCacheEntry.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageActionInvokerCacheEntry.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageActionInvokerCacheEntry.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageActionInvokerCacheEntry.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageActionInvokerProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageActionInvokerProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageActionInvokerProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageActionInvokerProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageArgumentBinder.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageArgumentBinder.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageArgumentBinder.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageArgumentBinder.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageBinderFactory.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageBinderFactory.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageBinderFactory.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageBinderFactory.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageBoundPropertyDescriptor.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageBoundPropertyDescriptor.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageBoundPropertyDescriptor.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageBoundPropertyDescriptor.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageHandlerBinderDelegate.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageHandlerBinderDelegate.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageHandlerBinderDelegate.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageHandlerBinderDelegate.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageHandlerExecutorDelegate.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageHandlerExecutorDelegate.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageHandlerExecutorDelegate.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageHandlerExecutorDelegate.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageModelAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageModelAttribute.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageModelAttribute.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageModelAttribute.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageResultExecutor.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageResultExecutor.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageResultExecutor.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageResultExecutor.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageViewLocationExpander.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageViewLocationExpander.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageViewLocationExpander.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/PageViewLocationExpander.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/RazorPageAdapter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/RazorPageAdapter.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/RazorPageAdapter.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/RazorPageAdapter.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/RazorPageAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/RazorPageAttribute.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/RazorPageAttribute.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/RazorPageAttribute.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/ServiceBasedPageModelActivatorProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/ServiceBasedPageModelActivatorProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/ServiceBasedPageModelActivatorProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Infrastructure/ServiceBasedPageModelActivatorProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/Microsoft.AspNetCore.Mvc.RazorPages.csproj b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Microsoft.AspNetCore.Mvc.RazorPages.csproj
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.RazorPages/Microsoft.AspNetCore.Mvc.RazorPages.csproj
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Microsoft.AspNetCore.Mvc.RazorPages.csproj
diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/MvcRazorPagesDiagnosticSourceExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/MvcRazorPagesDiagnosticSourceExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.RazorPages/MvcRazorPagesDiagnosticSourceExtensions.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/MvcRazorPagesDiagnosticSourceExtensions.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/NonHandlerAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/NonHandlerAttribute.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.RazorPages/NonHandlerAttribute.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/NonHandlerAttribute.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/Page.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Page.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.RazorPages/Page.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Page.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/PageActionDescriptor.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/PageActionDescriptor.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.RazorPages/PageActionDescriptor.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/PageActionDescriptor.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/PageBase.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/PageBase.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.RazorPages/PageBase.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/PageBase.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/PageContext.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/PageContext.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.RazorPages/PageContext.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/PageContext.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/PageContextAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/PageContextAttribute.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.RazorPages/PageContextAttribute.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/PageContextAttribute.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/PageLoggerExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/PageLoggerExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.RazorPages/PageLoggerExtensions.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/PageLoggerExtensions.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/PageModel.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/PageModel.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.RazorPages/PageModel.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/PageModel.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/PageResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/PageResult.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.RazorPages/PageResult.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/PageResult.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/Properties/AssemblyInfo.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.RazorPages/Properties/AssemblyInfo.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Properties/AssemblyInfo.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/Properties/Resources.Designer.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Properties/Resources.Designer.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.RazorPages/Properties/Resources.Designer.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Properties/Resources.Designer.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/RazorPagesOptions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/RazorPagesOptions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.RazorPages/RazorPagesOptions.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/RazorPagesOptions.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/RazorPagesOptionsConfigureCompatibilityOptions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/RazorPagesOptionsConfigureCompatibilityOptions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.RazorPages/RazorPagesOptionsConfigureCompatibilityOptions.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/RazorPagesOptionsConfigureCompatibilityOptions.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/Resources.resx b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Resources.resx
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.RazorPages/Resources.resx
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/Resources.resx
diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/baseline.netcore.json b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/baseline.netcore.json
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.RazorPages/baseline.netcore.json
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/baseline.netcore.json
diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/breakingchanges.netcore.json b/src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/breakingchanges.netcore.json
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.RazorPages/breakingchanges.netcore.json
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.RazorPages/breakingchanges.netcore.json
diff --git a/src/Microsoft.AspNetCore.Mvc.TagHelpers/AnchorTagHelper.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/AnchorTagHelper.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.TagHelpers/AnchorTagHelper.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/AnchorTagHelper.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.TagHelpers/AttributeMatcher.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/AttributeMatcher.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.TagHelpers/AttributeMatcher.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/AttributeMatcher.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.TagHelpers/Cache/CacheTagKey.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Cache/CacheTagKey.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.TagHelpers/Cache/CacheTagKey.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Cache/CacheTagKey.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.TagHelpers/Cache/DistributedCacheTagHelperFormatter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Cache/DistributedCacheTagHelperFormatter.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.TagHelpers/Cache/DistributedCacheTagHelperFormatter.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Cache/DistributedCacheTagHelperFormatter.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.TagHelpers/Cache/DistributedCacheTagHelperFormattingContext.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Cache/DistributedCacheTagHelperFormattingContext.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.TagHelpers/Cache/DistributedCacheTagHelperFormattingContext.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Cache/DistributedCacheTagHelperFormattingContext.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.TagHelpers/Cache/DistributedCacheTagHelperService.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Cache/DistributedCacheTagHelperService.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.TagHelpers/Cache/DistributedCacheTagHelperService.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Cache/DistributedCacheTagHelperService.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.TagHelpers/Cache/DistributedCacheTagHelperStorage.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Cache/DistributedCacheTagHelperStorage.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.TagHelpers/Cache/DistributedCacheTagHelperStorage.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Cache/DistributedCacheTagHelperStorage.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.TagHelpers/Cache/IDistributedCacheTagHelperFormatter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Cache/IDistributedCacheTagHelperFormatter.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.TagHelpers/Cache/IDistributedCacheTagHelperFormatter.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Cache/IDistributedCacheTagHelperFormatter.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.TagHelpers/Cache/IDistributedCacheTagHelperService.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Cache/IDistributedCacheTagHelperService.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.TagHelpers/Cache/IDistributedCacheTagHelperService.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Cache/IDistributedCacheTagHelperService.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.TagHelpers/Cache/IDistributedCacheTagHelperStorage.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Cache/IDistributedCacheTagHelperStorage.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.TagHelpers/Cache/IDistributedCacheTagHelperStorage.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Cache/IDistributedCacheTagHelperStorage.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.TagHelpers/CacheTagHelper.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/CacheTagHelper.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.TagHelpers/CacheTagHelper.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/CacheTagHelper.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.TagHelpers/CacheTagHelperBase.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/CacheTagHelperBase.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.TagHelpers/CacheTagHelperBase.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/CacheTagHelperBase.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.TagHelpers/CacheTagHelperMemoryCacheFactory.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/CacheTagHelperMemoryCacheFactory.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.TagHelpers/CacheTagHelperMemoryCacheFactory.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/CacheTagHelperMemoryCacheFactory.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.TagHelpers/CacheTagHelperOptions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/CacheTagHelperOptions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.TagHelpers/CacheTagHelperOptions.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/CacheTagHelperOptions.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.TagHelpers/CurrentValues.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/CurrentValues.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.TagHelpers/CurrentValues.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/CurrentValues.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.TagHelpers/DependencyInjection/TagHelperExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/DependencyInjection/TagHelperExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.TagHelpers/DependencyInjection/TagHelperExtensions.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/DependencyInjection/TagHelperExtensions.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.TagHelpers/DistributedCacheTagHelper.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/DistributedCacheTagHelper.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.TagHelpers/DistributedCacheTagHelper.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/DistributedCacheTagHelper.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.TagHelpers/EnvironmentTagHelper.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/EnvironmentTagHelper.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.TagHelpers/EnvironmentTagHelper.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/EnvironmentTagHelper.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.TagHelpers/FileProviderGlobbingDirectory.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/FileProviderGlobbingDirectory.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.TagHelpers/FileProviderGlobbingDirectory.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/FileProviderGlobbingDirectory.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.TagHelpers/FileProviderGlobbingFile.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/FileProviderGlobbingFile.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.TagHelpers/FileProviderGlobbingFile.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/FileProviderGlobbingFile.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.TagHelpers/FormActionTagHelper.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/FormActionTagHelper.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.TagHelpers/FormActionTagHelper.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/FormActionTagHelper.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.TagHelpers/FormTagHelper.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/FormTagHelper.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.TagHelpers/FormTagHelper.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/FormTagHelper.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.TagHelpers/GlobbingUrlBuilder.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/GlobbingUrlBuilder.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.TagHelpers/GlobbingUrlBuilder.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/GlobbingUrlBuilder.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.TagHelpers/ImageTagHelper.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/ImageTagHelper.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.TagHelpers/ImageTagHelper.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/ImageTagHelper.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.TagHelpers/InputTagHelper.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/InputTagHelper.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.TagHelpers/InputTagHelper.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/InputTagHelper.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.TagHelpers/JavaScriptResources.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/JavaScriptResources.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.TagHelpers/JavaScriptResources.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/JavaScriptResources.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.TagHelpers/LabelTagHelper.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/LabelTagHelper.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.TagHelpers/LabelTagHelper.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/LabelTagHelper.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.TagHelpers/LinkTagHelper.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/LinkTagHelper.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.TagHelpers/LinkTagHelper.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/LinkTagHelper.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.TagHelpers/Microsoft.AspNetCore.Mvc.TagHelpers.csproj b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Microsoft.AspNetCore.Mvc.TagHelpers.csproj
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.TagHelpers/Microsoft.AspNetCore.Mvc.TagHelpers.csproj
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Microsoft.AspNetCore.Mvc.TagHelpers.csproj
diff --git a/src/Microsoft.AspNetCore.Mvc.TagHelpers/ModeAttributesOfT.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/ModeAttributesOfT.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.TagHelpers/ModeAttributesOfT.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/ModeAttributesOfT.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.TagHelpers/MvcTagHelpersLoggerExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/MvcTagHelpersLoggerExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.TagHelpers/MvcTagHelpersLoggerExtensions.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/MvcTagHelpersLoggerExtensions.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.TagHelpers/OptionTagHelper.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/OptionTagHelper.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.TagHelpers/OptionTagHelper.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/OptionTagHelper.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.TagHelpers/PartialTagHelper.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/PartialTagHelper.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.TagHelpers/PartialTagHelper.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/PartialTagHelper.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.TagHelpers/Properties/AssemblyInfo.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.TagHelpers/Properties/AssemblyInfo.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Properties/AssemblyInfo.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.TagHelpers/Properties/Resources.Designer.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Properties/Resources.Designer.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.TagHelpers/Properties/Resources.Designer.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Properties/Resources.Designer.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.TagHelpers/RenderAtEndOfFormTagHelper.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/RenderAtEndOfFormTagHelper.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.TagHelpers/RenderAtEndOfFormTagHelper.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/RenderAtEndOfFormTagHelper.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.TagHelpers/Rendering/ValidationSummary.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Rendering/ValidationSummary.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.TagHelpers/Rendering/ValidationSummary.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Rendering/ValidationSummary.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.TagHelpers/Resources.resx b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Resources.resx
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.TagHelpers/Resources.resx
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/Resources.resx
diff --git a/src/Microsoft.AspNetCore.Mvc.TagHelpers/ScriptTagHelper.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/ScriptTagHelper.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.TagHelpers/ScriptTagHelper.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/ScriptTagHelper.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.TagHelpers/SelectTagHelper.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/SelectTagHelper.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.TagHelpers/SelectTagHelper.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/SelectTagHelper.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.TagHelpers/TagHelperOutputExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/TagHelperOutputExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.TagHelpers/TagHelperOutputExtensions.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/TagHelperOutputExtensions.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.TagHelpers/TextAreaTagHelper.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/TextAreaTagHelper.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.TagHelpers/TextAreaTagHelper.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/TextAreaTagHelper.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.TagHelpers/ValidationMessageTagHelper.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/ValidationMessageTagHelper.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.TagHelpers/ValidationMessageTagHelper.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/ValidationMessageTagHelper.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.TagHelpers/ValidationSummaryTagHelper.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/ValidationSummaryTagHelper.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.TagHelpers/ValidationSummaryTagHelper.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/ValidationSummaryTagHelper.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.TagHelpers/_grunt.readme b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/_grunt.readme
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.TagHelpers/_grunt.readme
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/_grunt.readme
diff --git a/src/Microsoft.AspNetCore.Mvc.TagHelpers/_gruntfile.js b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/_gruntfile.js
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.TagHelpers/_gruntfile.js
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/_gruntfile.js
diff --git a/src/Microsoft.AspNetCore.Mvc.TagHelpers/_package.json b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/_package.json
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.TagHelpers/_package.json
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/_package.json
diff --git a/src/Microsoft.AspNetCore.Mvc.TagHelpers/baseline.netcore.json b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/baseline.netcore.json
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.TagHelpers/baseline.netcore.json
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/baseline.netcore.json
diff --git a/src/Microsoft.AspNetCore.Mvc.TagHelpers/breakingchanges.netcore.json b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/breakingchanges.netcore.json
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.TagHelpers/breakingchanges.netcore.json
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/breakingchanges.netcore.json
diff --git a/src/Microsoft.AspNetCore.Mvc.TagHelpers/compiler/resources/LinkTagHelper_FallbackJavaScript.js b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/compiler/resources/LinkTagHelper_FallbackJavaScript.js
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.TagHelpers/compiler/resources/LinkTagHelper_FallbackJavaScript.js
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/compiler/resources/LinkTagHelper_FallbackJavaScript.js
diff --git a/src/Microsoft.AspNetCore.Mvc.TagHelpers/js/LinkTagHelper_FallbackJavaScript.js b/src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/js/LinkTagHelper_FallbackJavaScript.js
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.TagHelpers/js/LinkTagHelper_FallbackJavaScript.js
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.TagHelpers/js/LinkTagHelper_FallbackJavaScript.js
diff --git a/src/Microsoft.AspNetCore.Mvc.Testing/Handlers/CookieContainerHandler.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Testing/Handlers/CookieContainerHandler.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Testing/Handlers/CookieContainerHandler.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Testing/Handlers/CookieContainerHandler.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Testing/Handlers/RedirectHandler.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Testing/Handlers/RedirectHandler.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Testing/Handlers/RedirectHandler.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Testing/Handlers/RedirectHandler.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Testing/Microsoft.AspNetCore.Mvc.Testing.csproj b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Testing/Microsoft.AspNetCore.Mvc.Testing.csproj
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Testing/Microsoft.AspNetCore.Mvc.Testing.csproj
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Testing/Microsoft.AspNetCore.Mvc.Testing.csproj
diff --git a/src/Microsoft.AspNetCore.Mvc.Testing/Microsoft.AspNetCore.Mvc.Testing.targets b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Testing/Microsoft.AspNetCore.Mvc.Testing.targets
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Testing/Microsoft.AspNetCore.Mvc.Testing.targets
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Testing/Microsoft.AspNetCore.Mvc.Testing.targets
diff --git a/src/Microsoft.AspNetCore.Mvc.Testing/Properties/Resources.Designer.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Testing/Properties/Resources.Designer.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Testing/Properties/Resources.Designer.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Testing/Properties/Resources.Designer.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Testing/Resources.resx b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Testing/Resources.resx
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Testing/Resources.resx
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Testing/Resources.resx
diff --git a/src/Microsoft.AspNetCore.Mvc.Testing/WebApplicationFactory.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Testing/WebApplicationFactory.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Testing/WebApplicationFactory.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Testing/WebApplicationFactory.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Testing/WebApplicationFactoryClientOptions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Testing/WebApplicationFactoryClientOptions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Testing/WebApplicationFactoryClientOptions.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Testing/WebApplicationFactoryClientOptions.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Testing/WebApplicationFactoryContentRootAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Testing/WebApplicationFactoryContentRootAttribute.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Testing/WebApplicationFactoryContentRootAttribute.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Testing/WebApplicationFactoryContentRootAttribute.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.Testing/baseline.netcore.json b/src/Mvc/src/Microsoft.AspNetCore.Mvc.Testing/baseline.netcore.json
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.Testing/baseline.netcore.json
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.Testing/baseline.netcore.json
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/AntiforgeryExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/AntiforgeryExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/AntiforgeryExtensions.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/AntiforgeryExtensions.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/AttributeDictionary.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/AttributeDictionary.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/AttributeDictionary.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/AttributeDictionary.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/AutoValidateAntiforgeryTokenAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/AutoValidateAntiforgeryTokenAttribute.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/AutoValidateAntiforgeryTokenAttribute.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/AutoValidateAntiforgeryTokenAttribute.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Buffers/ArrayPoolBufferSource.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Buffers/ArrayPoolBufferSource.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/Buffers/ArrayPoolBufferSource.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Buffers/ArrayPoolBufferSource.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Buffers/CharArrayBufferSource.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Buffers/CharArrayBufferSource.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/Buffers/CharArrayBufferSource.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Buffers/CharArrayBufferSource.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Buffers/ICharBufferSource.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Buffers/ICharBufferSource.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/Buffers/ICharBufferSource.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Buffers/ICharBufferSource.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Buffers/IViewBufferScope.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Buffers/IViewBufferScope.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/Buffers/IViewBufferScope.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Buffers/IViewBufferScope.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Buffers/MemoryPoolViewBufferScope.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Buffers/MemoryPoolViewBufferScope.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/Buffers/MemoryPoolViewBufferScope.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Buffers/MemoryPoolViewBufferScope.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Buffers/PagedBufferedTextWriter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Buffers/PagedBufferedTextWriter.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/Buffers/PagedBufferedTextWriter.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Buffers/PagedBufferedTextWriter.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Buffers/PagedCharBuffer.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Buffers/PagedCharBuffer.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/Buffers/PagedCharBuffer.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Buffers/PagedCharBuffer.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Buffers/ViewBuffer.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Buffers/ViewBuffer.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/Buffers/ViewBuffer.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Buffers/ViewBuffer.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Buffers/ViewBufferPage.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Buffers/ViewBufferPage.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/Buffers/ViewBufferPage.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Buffers/ViewBufferPage.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Buffers/ViewBufferTextWriter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Buffers/ViewBufferTextWriter.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/Buffers/ViewBufferTextWriter.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Buffers/ViewBufferTextWriter.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Buffers/ViewBufferValue.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Buffers/ViewBufferValue.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/Buffers/ViewBufferValue.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Buffers/ViewBufferValue.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/CachedExpressionCompiler.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/CachedExpressionCompiler.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/CachedExpressionCompiler.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/CachedExpressionCompiler.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Controller.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Controller.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/Controller.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Controller.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/CookieTempDataProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/CookieTempDataProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/CookieTempDataProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/CookieTempDataProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/CookieTempDataProviderOptions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/CookieTempDataProviderOptions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/CookieTempDataProviderOptions.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/CookieTempDataProviderOptions.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/DefaultDisplayTemplates.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/DefaultDisplayTemplates.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/DefaultDisplayTemplates.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/DefaultDisplayTemplates.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/DefaultEditorTemplates.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/DefaultEditorTemplates.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/DefaultEditorTemplates.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/DefaultEditorTemplates.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/DefaultHtmlGenerator.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/DefaultHtmlGenerator.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/DefaultHtmlGenerator.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/DefaultHtmlGenerator.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/DefaultHtmlGeneratorExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/DefaultHtmlGeneratorExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/DefaultHtmlGeneratorExtensions.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/DefaultHtmlGeneratorExtensions.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/DefaultValidationHtmlAttributeProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/DefaultValidationHtmlAttributeProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/DefaultValidationHtmlAttributeProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/DefaultValidationHtmlAttributeProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/DependencyInjection/MvcViewFeaturesMvcBuilderExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/DependencyInjection/MvcViewFeaturesMvcBuilderExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/DependencyInjection/MvcViewFeaturesMvcBuilderExtensions.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/DependencyInjection/MvcViewFeaturesMvcBuilderExtensions.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/DependencyInjection/MvcViewFeaturesMvcCoreBuilderExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/DependencyInjection/MvcViewFeaturesMvcCoreBuilderExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/DependencyInjection/MvcViewFeaturesMvcCoreBuilderExtensions.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/DependencyInjection/MvcViewFeaturesMvcCoreBuilderExtensions.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/DependencyInjection/MvcViewOptionsSetup.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/DependencyInjection/MvcViewOptionsSetup.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/DependencyInjection/MvcViewOptionsSetup.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/DependencyInjection/MvcViewOptionsSetup.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/DependencyInjection/TempDataMvcOptionsSetup.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/DependencyInjection/TempDataMvcOptionsSetup.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/DependencyInjection/TempDataMvcOptionsSetup.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/DependencyInjection/TempDataMvcOptionsSetup.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/DynamicViewData.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/DynamicViewData.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/DynamicViewData.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/DynamicViewData.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ExpressionHelper.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ExpressionHelper.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/ExpressionHelper.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ExpressionHelper.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ExpressionMetadataProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ExpressionMetadataProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/ExpressionMetadataProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ExpressionMetadataProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ExpressionTextCache.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ExpressionTextCache.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/ExpressionTextCache.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ExpressionTextCache.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/AutoValidateAntiforgeryTokenAuthorizationFilter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/AutoValidateAntiforgeryTokenAuthorizationFilter.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/AutoValidateAntiforgeryTokenAuthorizationFilter.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/AutoValidateAntiforgeryTokenAuthorizationFilter.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/ControllerSaveTempDataPropertyFilter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/ControllerSaveTempDataPropertyFilter.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/ControllerSaveTempDataPropertyFilter.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/ControllerSaveTempDataPropertyFilter.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/ControllerSaveTempDataPropertyFilterFactory.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/ControllerSaveTempDataPropertyFilterFactory.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/ControllerSaveTempDataPropertyFilterFactory.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/ControllerSaveTempDataPropertyFilterFactory.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/ControllerViewDataAttributeFilter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/ControllerViewDataAttributeFilter.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/ControllerViewDataAttributeFilter.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/ControllerViewDataAttributeFilter.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/ControllerViewDataAttributeFilterFactory.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/ControllerViewDataAttributeFilterFactory.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/ControllerViewDataAttributeFilterFactory.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/ControllerViewDataAttributeFilterFactory.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/ISaveTempDataCallback.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/ISaveTempDataCallback.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/ISaveTempDataCallback.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/ISaveTempDataCallback.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/IViewDataValuesProviderFeature.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/IViewDataValuesProviderFeature.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/IViewDataValuesProviderFeature.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/IViewDataValuesProviderFeature.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/LifecycleProperty.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/LifecycleProperty.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/LifecycleProperty.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/LifecycleProperty.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/SaveTempDataFilter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/SaveTempDataFilter.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/SaveTempDataFilter.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/SaveTempDataFilter.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/SaveTempDataPropertyFilterBase.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/SaveTempDataPropertyFilterBase.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/SaveTempDataPropertyFilterBase.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/SaveTempDataPropertyFilterBase.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/TempDataApplicationModelProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/TempDataApplicationModelProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/TempDataApplicationModelProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/TempDataApplicationModelProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/TempDataSerializer.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/TempDataSerializer.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/TempDataSerializer.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/TempDataSerializer.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/ValidateAntiforgeryTokenAuthorizationFilter.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/ValidateAntiforgeryTokenAuthorizationFilter.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/ValidateAntiforgeryTokenAuthorizationFilter.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/ValidateAntiforgeryTokenAuthorizationFilter.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/ViewDataAttributeApplicationModelProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/ViewDataAttributeApplicationModelProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/ViewDataAttributeApplicationModelProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/ViewDataAttributeApplicationModelProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/ViewDataAttributePropertyProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/ViewDataAttributePropertyProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/ViewDataAttributePropertyProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Filters/ViewDataAttributePropertyProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/FormContext.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/FormContext.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/FormContext.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/FormContext.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/FormatWeekHelper.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/FormatWeekHelper.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/FormatWeekHelper.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/FormatWeekHelper.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/HtmlAttributePropertyHelper.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/HtmlAttributePropertyHelper.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/HtmlAttributePropertyHelper.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/HtmlAttributePropertyHelper.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/HtmlHelper.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/HtmlHelper.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/HtmlHelper.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/HtmlHelper.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/HtmlHelperOfT.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/HtmlHelperOfT.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/HtmlHelperOfT.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/HtmlHelperOfT.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/HtmlHelperOptions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/HtmlHelperOptions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/HtmlHelperOptions.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/HtmlHelperOptions.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/IAntiforgeryPolicy.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/IAntiforgeryPolicy.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/IAntiforgeryPolicy.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/IAntiforgeryPolicy.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/IFileVersionProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/IFileVersionProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/IFileVersionProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/IFileVersionProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/IHtmlGenerator.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/IHtmlGenerator.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/IHtmlGenerator.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/IHtmlGenerator.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/IModelExpressionProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/IModelExpressionProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/IModelExpressionProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/IModelExpressionProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ITempDataDictionary.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ITempDataDictionary.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/ITempDataDictionary.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ITempDataDictionary.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ITempDataDictionaryFactory.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ITempDataDictionaryFactory.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/ITempDataDictionaryFactory.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ITempDataDictionaryFactory.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ITempDataProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ITempDataProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/ITempDataProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ITempDataProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/IViewComponentHelper.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/IViewComponentHelper.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/IViewComponentHelper.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/IViewComponentHelper.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/IViewComponentResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/IViewComponentResult.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/IViewComponentResult.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/IViewComponentResult.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/IViewContextAware.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/IViewContextAware.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/IViewContextAware.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/IViewContextAware.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/IgnoreAntiforgeryTokenAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/IgnoreAntiforgeryTokenAttribute.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/IgnoreAntiforgeryTokenAttribute.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/IgnoreAntiforgeryTokenAttribute.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/InputType.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/InputType.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/InputType.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/InputType.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/JsonHelper.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/JsonHelper.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/JsonHelper.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/JsonHelper.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/MemberExpressionCacheKey.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/MemberExpressionCacheKey.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/MemberExpressionCacheKey.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/MemberExpressionCacheKey.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/MemberExpressionCacheKeyComparer.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/MemberExpressionCacheKeyComparer.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/MemberExpressionCacheKeyComparer.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/MemberExpressionCacheKeyComparer.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Microsoft.AspNetCore.Mvc.ViewFeatures.csproj b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Microsoft.AspNetCore.Mvc.ViewFeatures.csproj
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/Microsoft.AspNetCore.Mvc.ViewFeatures.csproj
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Microsoft.AspNetCore.Mvc.ViewFeatures.csproj
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ModelExplorer.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ModelExplorer.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/ModelExplorer.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ModelExplorer.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ModelExplorerExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ModelExplorerExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/ModelExplorerExtensions.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ModelExplorerExtensions.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ModelExpression.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ModelExpression.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/ModelExpression.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ModelExpression.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ModelExpressionProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ModelExpressionProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/ModelExpressionProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ModelExpressionProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ModelMetadataProviderExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ModelMetadataProviderExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/ModelMetadataProviderExtensions.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ModelMetadataProviderExtensions.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ModelStateDictionaryExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ModelStateDictionaryExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/ModelStateDictionaryExtensions.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ModelStateDictionaryExtensions.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/MvcViewFeaturesDiagnosticSourceExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/MvcViewFeaturesDiagnosticSourceExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/MvcViewFeaturesDiagnosticSourceExtensions.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/MvcViewFeaturesDiagnosticSourceExtensions.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/MvcViewFeaturesLoggerExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/MvcViewFeaturesLoggerExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/MvcViewFeaturesLoggerExtensions.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/MvcViewFeaturesLoggerExtensions.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/MvcViewOptions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/MvcViewOptions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/MvcViewOptions.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/MvcViewOptions.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/MvcViewOptionsConfigureCompatibilityOptions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/MvcViewOptionsConfigureCompatibilityOptions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/MvcViewOptionsConfigureCompatibilityOptions.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/MvcViewOptionsConfigureCompatibilityOptions.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/NameAndIdProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/NameAndIdProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/NameAndIdProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/NameAndIdProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/NullView.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/NullView.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/NullView.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/NullView.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/PageRemoteAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/PageRemoteAttribute.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/PageRemoteAttribute.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/PageRemoteAttribute.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/PartialViewResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/PartialViewResult.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/PartialViewResult.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/PartialViewResult.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/PartialViewResultExecutor.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/PartialViewResultExecutor.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/PartialViewResultExecutor.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/PartialViewResultExecutor.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Properties/AssemblyInfo.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/Properties/AssemblyInfo.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Properties/AssemblyInfo.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Properties/Resources.Designer.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Properties/Resources.Designer.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/Properties/Resources.Designer.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Properties/Resources.Designer.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/RemoteAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/RemoteAttribute.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/RemoteAttribute.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/RemoteAttribute.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/RemoteAttributeBase.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/RemoteAttributeBase.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/RemoteAttributeBase.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/RemoteAttributeBase.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/FormMethod.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/FormMethod.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/FormMethod.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/FormMethod.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/Html5DateRenderingMode.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/Html5DateRenderingMode.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/Html5DateRenderingMode.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/Html5DateRenderingMode.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/HtmlHelperDisplayExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/HtmlHelperDisplayExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/HtmlHelperDisplayExtensions.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/HtmlHelperDisplayExtensions.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/HtmlHelperDisplayNameExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/HtmlHelperDisplayNameExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/HtmlHelperDisplayNameExtensions.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/HtmlHelperDisplayNameExtensions.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/HtmlHelperEditorExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/HtmlHelperEditorExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/HtmlHelperEditorExtensions.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/HtmlHelperEditorExtensions.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/HtmlHelperFormExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/HtmlHelperFormExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/HtmlHelperFormExtensions.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/HtmlHelperFormExtensions.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/HtmlHelperInputExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/HtmlHelperInputExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/HtmlHelperInputExtensions.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/HtmlHelperInputExtensions.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/HtmlHelperLabelExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/HtmlHelperLabelExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/HtmlHelperLabelExtensions.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/HtmlHelperLabelExtensions.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/HtmlHelperLinkExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/HtmlHelperLinkExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/HtmlHelperLinkExtensions.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/HtmlHelperLinkExtensions.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/HtmlHelperNameExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/HtmlHelperNameExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/HtmlHelperNameExtensions.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/HtmlHelperNameExtensions.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/HtmlHelperPartialExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/HtmlHelperPartialExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/HtmlHelperPartialExtensions.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/HtmlHelperPartialExtensions.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/HtmlHelperSelectExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/HtmlHelperSelectExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/HtmlHelperSelectExtensions.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/HtmlHelperSelectExtensions.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/HtmlHelperValidationExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/HtmlHelperValidationExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/HtmlHelperValidationExtensions.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/HtmlHelperValidationExtensions.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/HtmlHelperValueExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/HtmlHelperValueExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/HtmlHelperValueExtensions.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/HtmlHelperValueExtensions.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/IHtmlHelper.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/IHtmlHelper.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/IHtmlHelper.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/IHtmlHelper.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/IHtmlHelperOfT.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/IHtmlHelperOfT.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/IHtmlHelperOfT.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/IHtmlHelperOfT.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/IJsonHelper.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/IJsonHelper.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/IJsonHelper.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/IJsonHelper.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/MultiSelectList.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/MultiSelectList.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/MultiSelectList.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/MultiSelectList.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/MvcForm.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/MvcForm.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/MvcForm.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/MvcForm.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/SelectList.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/SelectList.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/SelectList.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/SelectList.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/SelectListGroup.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/SelectListGroup.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/SelectListGroup.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/SelectListGroup.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/SelectListItem.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/SelectListItem.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/SelectListItem.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/SelectListItem.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/TagBuilder.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/TagBuilder.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/TagBuilder.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/TagBuilder.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/TagRenderMode.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/TagRenderMode.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/TagRenderMode.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/TagRenderMode.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/ViewComponentHelperExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/ViewComponentHelperExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/ViewComponentHelperExtensions.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/ViewComponentHelperExtensions.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/ViewContext.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/ViewContext.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/ViewContext.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Rendering/ViewContext.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Resources.resx b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Resources.resx
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/Resources.resx
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Resources.resx
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/SaveTempDataAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/SaveTempDataAttribute.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/SaveTempDataAttribute.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/SaveTempDataAttribute.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/SessionStateTempDataProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/SessionStateTempDataProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/SessionStateTempDataProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/SessionStateTempDataProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/SkipStatusCodePagesAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/SkipStatusCodePagesAttribute.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/SkipStatusCodePagesAttribute.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/SkipStatusCodePagesAttribute.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/StringHtmlContent.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/StringHtmlContent.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/StringHtmlContent.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/StringHtmlContent.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/TempDataAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/TempDataAttribute.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/TempDataAttribute.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/TempDataAttribute.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/TempDataDictionary.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/TempDataDictionary.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/TempDataDictionary.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/TempDataDictionary.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/TempDataDictionaryFactory.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/TempDataDictionaryFactory.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/TempDataDictionaryFactory.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/TempDataDictionaryFactory.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/TemplateBuilder.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/TemplateBuilder.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/TemplateBuilder.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/TemplateBuilder.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/TemplateInfo.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/TemplateInfo.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/TemplateInfo.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/TemplateInfo.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/TemplateRenderer.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/TemplateRenderer.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/TemplateRenderer.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/TemplateRenderer.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/TryGetValueDelegate.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/TryGetValueDelegate.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/TryGetValueDelegate.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/TryGetValueDelegate.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/TryGetValueProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/TryGetValueProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/TryGetValueProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/TryGetValueProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ValidateAntiForgeryTokenAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ValidateAntiForgeryTokenAttribute.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/ValidateAntiForgeryTokenAttribute.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ValidateAntiForgeryTokenAttribute.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ValidationHelpers.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ValidationHelpers.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/ValidationHelpers.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ValidationHelpers.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ValidationHtmlAttributeProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ValidationHtmlAttributeProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/ValidationHtmlAttributeProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ValidationHtmlAttributeProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponent.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponent.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponent.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponent.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponentAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponentAttribute.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponentAttribute.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponentAttribute.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponentResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponentResult.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponentResult.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponentResult.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponentResultExecutor.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponentResultExecutor.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponentResultExecutor.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponentResultExecutor.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/ContentViewComponentResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/ContentViewComponentResult.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/ContentViewComponentResult.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/ContentViewComponentResult.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentActivator.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentActivator.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentActivator.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentActivator.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentDescriptorCollectionProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentDescriptorCollectionProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentDescriptorCollectionProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentDescriptorCollectionProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentDescriptorProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentDescriptorProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentDescriptorProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentDescriptorProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentFactory.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentFactory.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentFactory.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentFactory.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentHelper.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentHelper.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentHelper.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentHelper.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentInvoker.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentInvoker.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentInvoker.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentInvoker.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentInvokerFactory.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentInvokerFactory.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentInvokerFactory.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentInvokerFactory.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentSelector.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentSelector.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentSelector.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/DefaultViewComponentSelector.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/HtmlContentViewComponentResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/HtmlContentViewComponentResult.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/HtmlContentViewComponentResult.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/HtmlContentViewComponentResult.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/IViewComponentActivator.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/IViewComponentActivator.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/IViewComponentActivator.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/IViewComponentActivator.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/IViewComponentDescriptorCollectionProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/IViewComponentDescriptorCollectionProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/IViewComponentDescriptorCollectionProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/IViewComponentDescriptorCollectionProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/IViewComponentDescriptorProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/IViewComponentDescriptorProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/IViewComponentDescriptorProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/IViewComponentDescriptorProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/IViewComponentFactory.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/IViewComponentFactory.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/IViewComponentFactory.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/IViewComponentFactory.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/IViewComponentInvoker.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/IViewComponentInvoker.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/IViewComponentInvoker.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/IViewComponentInvoker.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/IViewComponentInvokerFactory.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/IViewComponentInvokerFactory.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/IViewComponentInvokerFactory.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/IViewComponentInvokerFactory.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/IViewComponentSelector.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/IViewComponentSelector.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/IViewComponentSelector.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/IViewComponentSelector.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/ServiceBasedViewComponentActivator.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/ServiceBasedViewComponentActivator.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/ServiceBasedViewComponentActivator.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/ServiceBasedViewComponentActivator.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/ViewComponentContext.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/ViewComponentContext.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/ViewComponentContext.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/ViewComponentContext.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/ViewComponentContextAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/ViewComponentContextAttribute.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/ViewComponentContextAttribute.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/ViewComponentContextAttribute.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/ViewComponentConventions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/ViewComponentConventions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/ViewComponentConventions.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/ViewComponentConventions.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/ViewComponentDescriptor.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/ViewComponentDescriptor.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/ViewComponentDescriptor.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/ViewComponentDescriptor.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/ViewComponentDescriptorCollection.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/ViewComponentDescriptorCollection.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/ViewComponentDescriptorCollection.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/ViewComponentDescriptorCollection.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/ViewComponentFeature.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/ViewComponentFeature.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/ViewComponentFeature.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/ViewComponentFeature.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/ViewComponentFeatureProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/ViewComponentFeatureProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/ViewComponentFeatureProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/ViewComponentFeatureProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/ViewComponentInvokerCache.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/ViewComponentInvokerCache.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/ViewComponentInvokerCache.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/ViewComponentInvokerCache.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/ViewViewComponentResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/ViewViewComponentResult.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/ViewViewComponentResult.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewComponents/ViewViewComponentResult.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewContextAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewContextAttribute.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewContextAttribute.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewContextAttribute.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewDataAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewDataAttribute.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewDataAttribute.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewDataAttribute.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewDataDictionary.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewDataDictionary.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewDataDictionary.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewDataDictionary.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewDataDictionaryAttribute.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewDataDictionaryAttribute.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewDataDictionaryAttribute.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewDataDictionaryAttribute.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewDataDictionaryControllerPropertyActivator.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewDataDictionaryControllerPropertyActivator.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewDataDictionaryControllerPropertyActivator.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewDataDictionaryControllerPropertyActivator.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewDataDictionaryFactory.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewDataDictionaryFactory.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewDataDictionaryFactory.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewDataDictionaryFactory.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewDataDictionaryOfT.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewDataDictionaryOfT.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewDataDictionaryOfT.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewDataDictionaryOfT.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewDataEvaluator.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewDataEvaluator.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewDataEvaluator.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewDataEvaluator.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewDataInfo.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewDataInfo.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewDataInfo.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewDataInfo.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewEngines/CompositeViewEngine.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewEngines/CompositeViewEngine.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewEngines/CompositeViewEngine.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewEngines/CompositeViewEngine.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewEngines/ICompositeViewEngine.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewEngines/ICompositeViewEngine.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewEngines/ICompositeViewEngine.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewEngines/ICompositeViewEngine.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewEngines/IView.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewEngines/IView.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewEngines/IView.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewEngines/IView.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewEngines/IViewEngine.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewEngines/IViewEngine.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewEngines/IViewEngine.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewEngines/IViewEngine.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewEngines/ViewEngineResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewEngines/ViewEngineResult.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewEngines/ViewEngineResult.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewEngines/ViewEngineResult.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewExecutor.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewExecutor.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewExecutor.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewExecutor.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewResult.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewResult.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewResult.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewResult.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewResultExecutor.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewResultExecutor.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewResultExecutor.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ViewResultExecutor.cs
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/baseline.netcore.json b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/baseline.netcore.json
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/baseline.netcore.json
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/baseline.netcore.json
diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/breakingchanges.netcore.json b/src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/breakingchanges.netcore.json
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc.ViewFeatures/breakingchanges.netcore.json
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc.ViewFeatures/breakingchanges.netcore.json
diff --git a/src/Microsoft.AspNetCore.Mvc/DesignTimeMvcServiceCollectionProvider.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc/DesignTimeMvcServiceCollectionProvider.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc/DesignTimeMvcServiceCollectionProvider.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc/DesignTimeMvcServiceCollectionProvider.cs
diff --git a/src/Microsoft.AspNetCore.Mvc/Microsoft.AspNetCore.Mvc.csproj b/src/Mvc/src/Microsoft.AspNetCore.Mvc/Microsoft.AspNetCore.Mvc.csproj
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc/Microsoft.AspNetCore.Mvc.csproj
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc/Microsoft.AspNetCore.Mvc.csproj
diff --git a/src/Microsoft.AspNetCore.Mvc/MvcServiceCollectionExtensions.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc/MvcServiceCollectionExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc/MvcServiceCollectionExtensions.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc/MvcServiceCollectionExtensions.cs
diff --git a/src/Microsoft.AspNetCore.Mvc/Properties/AssemblyInfo.cs b/src/Mvc/src/Microsoft.AspNetCore.Mvc/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc/Properties/AssemblyInfo.cs
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc/Properties/AssemblyInfo.cs
diff --git a/src/Microsoft.AspNetCore.Mvc/baseline.netcore.json b/src/Mvc/src/Microsoft.AspNetCore.Mvc/baseline.netcore.json
similarity index 100%
rename from src/Microsoft.AspNetCore.Mvc/baseline.netcore.json
rename to src/Mvc/src/Microsoft.AspNetCore.Mvc/baseline.netcore.json
diff --git a/src/Microsoft.Extensions.ApiDescription.Design/DownloadFile.cs b/src/Mvc/src/Microsoft.Extensions.ApiDescription.Design/DownloadFile.cs
similarity index 100%
rename from src/Microsoft.Extensions.ApiDescription.Design/DownloadFile.cs
rename to src/Mvc/src/Microsoft.Extensions.ApiDescription.Design/DownloadFile.cs
diff --git a/src/Microsoft.Extensions.ApiDescription.Design/GetCurrentItems.cs b/src/Mvc/src/Microsoft.Extensions.ApiDescription.Design/GetCurrentItems.cs
similarity index 100%
rename from src/Microsoft.Extensions.ApiDescription.Design/GetCurrentItems.cs
rename to src/Mvc/src/Microsoft.Extensions.ApiDescription.Design/GetCurrentItems.cs
diff --git a/src/Microsoft.Extensions.ApiDescription.Design/GetFileReferenceMetadata.cs b/src/Mvc/src/Microsoft.Extensions.ApiDescription.Design/GetFileReferenceMetadata.cs
similarity index 100%
rename from src/Microsoft.Extensions.ApiDescription.Design/GetFileReferenceMetadata.cs
rename to src/Mvc/src/Microsoft.Extensions.ApiDescription.Design/GetFileReferenceMetadata.cs
diff --git a/src/Microsoft.Extensions.ApiDescription.Design/GetProjectReferenceMetadata.cs b/src/Mvc/src/Microsoft.Extensions.ApiDescription.Design/GetProjectReferenceMetadata.cs
similarity index 100%
rename from src/Microsoft.Extensions.ApiDescription.Design/GetProjectReferenceMetadata.cs
rename to src/Mvc/src/Microsoft.Extensions.ApiDescription.Design/GetProjectReferenceMetadata.cs
diff --git a/src/Microsoft.Extensions.ApiDescription.Design/GetUriReferenceMetadata.cs b/src/Mvc/src/Microsoft.Extensions.ApiDescription.Design/GetUriReferenceMetadata.cs
similarity index 100%
rename from src/Microsoft.Extensions.ApiDescription.Design/GetUriReferenceMetadata.cs
rename to src/Mvc/src/Microsoft.Extensions.ApiDescription.Design/GetUriReferenceMetadata.cs
diff --git a/src/Microsoft.Extensions.ApiDescription.Design/MetadataSerializer.cs b/src/Mvc/src/Microsoft.Extensions.ApiDescription.Design/MetadataSerializer.cs
similarity index 100%
rename from src/Microsoft.Extensions.ApiDescription.Design/MetadataSerializer.cs
rename to src/Mvc/src/Microsoft.Extensions.ApiDescription.Design/MetadataSerializer.cs
diff --git a/src/Microsoft.Extensions.ApiDescription.Design/Microsoft.Extensions.ApiDescription.Design.csproj b/src/Mvc/src/Microsoft.Extensions.ApiDescription.Design/Microsoft.Extensions.ApiDescription.Design.csproj
similarity index 100%
rename from src/Microsoft.Extensions.ApiDescription.Design/Microsoft.Extensions.ApiDescription.Design.csproj
rename to src/Mvc/src/Microsoft.Extensions.ApiDescription.Design/Microsoft.Extensions.ApiDescription.Design.csproj
diff --git a/src/Microsoft.Extensions.ApiDescription.Design/Microsoft.Extensions.ApiDescription.Design.nuspec b/src/Mvc/src/Microsoft.Extensions.ApiDescription.Design/Microsoft.Extensions.ApiDescription.Design.nuspec
similarity index 100%
rename from src/Microsoft.Extensions.ApiDescription.Design/Microsoft.Extensions.ApiDescription.Design.nuspec
rename to src/Mvc/src/Microsoft.Extensions.ApiDescription.Design/Microsoft.Extensions.ApiDescription.Design.nuspec
diff --git a/src/Microsoft.Extensions.ApiDescription.Design/Properties/Resources.Designer.cs b/src/Mvc/src/Microsoft.Extensions.ApiDescription.Design/Properties/Resources.Designer.cs
similarity index 100%
rename from src/Microsoft.Extensions.ApiDescription.Design/Properties/Resources.Designer.cs
rename to src/Mvc/src/Microsoft.Extensions.ApiDescription.Design/Properties/Resources.Designer.cs
diff --git a/src/Microsoft.Extensions.ApiDescription.Design/Resources.resx b/src/Mvc/src/Microsoft.Extensions.ApiDescription.Design/Resources.resx
similarity index 100%
rename from src/Microsoft.Extensions.ApiDescription.Design/Resources.resx
rename to src/Mvc/src/Microsoft.Extensions.ApiDescription.Design/Resources.resx
diff --git a/src/Microsoft.Extensions.ApiDescription.Design/build/Microsoft.Extensions.ApiDescription.Design.props b/src/Mvc/src/Microsoft.Extensions.ApiDescription.Design/build/Microsoft.Extensions.ApiDescription.Design.props
similarity index 100%
rename from src/Microsoft.Extensions.ApiDescription.Design/build/Microsoft.Extensions.ApiDescription.Design.props
rename to src/Mvc/src/Microsoft.Extensions.ApiDescription.Design/build/Microsoft.Extensions.ApiDescription.Design.props
diff --git a/src/Microsoft.Extensions.ApiDescription.Design/build/Microsoft.Extensions.ApiDescription.Design.targets b/src/Mvc/src/Microsoft.Extensions.ApiDescription.Design/build/Microsoft.Extensions.ApiDescription.Design.targets
similarity index 100%
rename from src/Microsoft.Extensions.ApiDescription.Design/build/Microsoft.Extensions.ApiDescription.Design.targets
rename to src/Mvc/src/Microsoft.Extensions.ApiDescription.Design/build/Microsoft.Extensions.ApiDescription.Design.targets
diff --git a/src/Microsoft.Extensions.ApiDescription.Design/buildMultiTargeting/Microsoft.Extensions.ApiDescription.Design.targets b/src/Mvc/src/Microsoft.Extensions.ApiDescription.Design/buildMultiTargeting/Microsoft.Extensions.ApiDescription.Design.targets
similarity index 100%
rename from src/Microsoft.Extensions.ApiDescription.Design/buildMultiTargeting/Microsoft.Extensions.ApiDescription.Design.targets
rename to src/Mvc/src/Microsoft.Extensions.ApiDescription.Design/buildMultiTargeting/Microsoft.Extensions.ApiDescription.Design.targets
diff --git a/src/dotnet-getdocument/Commands/InvokeCommand.cs b/src/Mvc/src/dotnet-getdocument/Commands/InvokeCommand.cs
similarity index 100%
rename from src/dotnet-getdocument/Commands/InvokeCommand.cs
rename to src/Mvc/src/dotnet-getdocument/Commands/InvokeCommand.cs
diff --git a/src/dotnet-getdocument/Exe.cs b/src/Mvc/src/dotnet-getdocument/Exe.cs
similarity index 100%
rename from src/dotnet-getdocument/Exe.cs
rename to src/Mvc/src/dotnet-getdocument/Exe.cs
diff --git a/src/dotnet-getdocument/Program.cs b/src/Mvc/src/dotnet-getdocument/Program.cs
similarity index 100%
rename from src/dotnet-getdocument/Program.cs
rename to src/Mvc/src/dotnet-getdocument/Program.cs
diff --git a/src/dotnet-getdocument/Project.cs b/src/Mvc/src/dotnet-getdocument/Project.cs
similarity index 100%
rename from src/dotnet-getdocument/Project.cs
rename to src/Mvc/src/dotnet-getdocument/Project.cs
diff --git a/src/dotnet-getdocument/ProjectOptions.cs b/src/Mvc/src/dotnet-getdocument/ProjectOptions.cs
similarity index 100%
rename from src/dotnet-getdocument/ProjectOptions.cs
rename to src/Mvc/src/dotnet-getdocument/ProjectOptions.cs
diff --git a/src/dotnet-getdocument/Properties/Resources.Designer.cs b/src/Mvc/src/dotnet-getdocument/Properties/Resources.Designer.cs
similarity index 100%
rename from src/dotnet-getdocument/Properties/Resources.Designer.cs
rename to src/Mvc/src/dotnet-getdocument/Properties/Resources.Designer.cs
diff --git a/src/dotnet-getdocument/Resources.resx b/src/Mvc/src/dotnet-getdocument/Resources.resx
similarity index 100%
rename from src/dotnet-getdocument/Resources.resx
rename to src/Mvc/src/dotnet-getdocument/Resources.resx
diff --git a/src/dotnet-getdocument/ServiceProjectReferenceMetadata.targets b/src/Mvc/src/dotnet-getdocument/ServiceProjectReferenceMetadata.targets
similarity index 100%
rename from src/dotnet-getdocument/ServiceProjectReferenceMetadata.targets
rename to src/Mvc/src/dotnet-getdocument/ServiceProjectReferenceMetadata.targets
diff --git a/src/dotnet-getdocument/dotnet-getdocument.csproj b/src/Mvc/src/dotnet-getdocument/dotnet-getdocument.csproj
similarity index 100%
rename from src/dotnet-getdocument/dotnet-getdocument.csproj
rename to src/Mvc/src/dotnet-getdocument/dotnet-getdocument.csproj
diff --git a/test/Directory.Build.props b/src/Mvc/test/Directory.Build.props
similarity index 100%
rename from test/Directory.Build.props
rename to src/Mvc/test/Directory.Build.props
diff --git a/test/Microsoft.AspNetCore.Mvc.Abstractions.Test/Filters/FilterContextTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Abstractions.Test/Filters/FilterContextTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Abstractions.Test/Filters/FilterContextTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Abstractions.Test/Filters/FilterContextTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Abstractions.Test/Microsoft.AspNetCore.Mvc.Abstractions.Test.csproj b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Abstractions.Test/Microsoft.AspNetCore.Mvc.Abstractions.Test.csproj
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Abstractions.Test/Microsoft.AspNetCore.Mvc.Abstractions.Test.csproj
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Abstractions.Test/Microsoft.AspNetCore.Mvc.Abstractions.Test.csproj
diff --git a/test/Microsoft.AspNetCore.Mvc.Abstractions.Test/ModelBinding/BindingInfoTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Abstractions.Test/ModelBinding/BindingInfoTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Abstractions.Test/ModelBinding/BindingInfoTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Abstractions.Test/ModelBinding/BindingInfoTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Abstractions.Test/ModelBinding/ModelMetadataTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Abstractions.Test/ModelBinding/ModelMetadataTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Abstractions.Test/ModelBinding/ModelMetadataTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Abstractions.Test/ModelBinding/ModelMetadataTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Abstractions.Test/ModelBinding/ModelStateDictionaryTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Abstractions.Test/ModelBinding/ModelStateDictionaryTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Abstractions.Test/ModelBinding/ModelStateDictionaryTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Abstractions.Test/ModelBinding/ModelStateDictionaryTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Abstractions.Test/ModelBinding/ValueProviderResultTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Abstractions.Test/ModelBinding/ValueProviderResultTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Abstractions.Test/ModelBinding/ValueProviderResultTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Abstractions.Test/ModelBinding/ValueProviderResultTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Abstractions.Test/Properties/AssemblyInfo.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Abstractions.Test/Properties/AssemblyInfo.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Abstractions.Test/Properties/AssemblyInfo.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Abstractions.Test/Properties/AssemblyInfo.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.ApiExplorer.Test/ApiResponseTypeProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ApiExplorer.Test/ApiResponseTypeProviderTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.ApiExplorer.Test/ApiResponseTypeProviderTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.ApiExplorer.Test/ApiResponseTypeProviderTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.ApiExplorer.Test/DefaultApiDescriptionProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ApiExplorer.Test/DefaultApiDescriptionProviderTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.ApiExplorer.Test/DefaultApiDescriptionProviderTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.ApiExplorer.Test/DefaultApiDescriptionProviderTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.ApiExplorer.Test/Microsoft.AspNetCore.Mvc.ApiExplorer.Test.csproj b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ApiExplorer.Test/Microsoft.AspNetCore.Mvc.ApiExplorer.Test.csproj
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.ApiExplorer.Test/Microsoft.AspNetCore.Mvc.ApiExplorer.Test.csproj
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.ApiExplorer.Test/Microsoft.AspNetCore.Mvc.ApiExplorer.Test.csproj
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/AcceptedAtActionResultTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/AcceptedAtActionResultTests.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/AcceptedAtActionResultTests.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/AcceptedAtActionResultTests.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/AcceptedAtRouteResultTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/AcceptedAtRouteResultTests.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/AcceptedAtRouteResultTests.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/AcceptedAtRouteResultTests.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/AcceptedResultTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/AcceptedResultTests.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/AcceptedResultTests.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/AcceptedResultTests.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ActionConstraints/ActionConstraintCacheTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ActionConstraints/ActionConstraintCacheTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ActionConstraints/ActionConstraintCacheTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ActionConstraints/ActionConstraintCacheTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ActionConstraints/HttpMethodActionConstraintTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ActionConstraints/HttpMethodActionConstraintTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ActionConstraints/HttpMethodActionConstraintTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ActionConstraints/HttpMethodActionConstraintTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ActionResultOfTTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ActionResultOfTTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ActionResultOfTTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ActionResultOfTTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ApiConventionMethodAttributeTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApiConventionMethodAttributeTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ApiConventionMethodAttributeTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApiConventionMethodAttributeTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ApiConventionTypeAttributeTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApiConventionTypeAttributeTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ApiConventionTypeAttributeTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApiConventionTypeAttributeTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ApiExplorer/ApiConventionMatcherTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApiExplorer/ApiConventionMatcherTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ApiExplorer/ApiConventionMatcherTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApiExplorer/ApiConventionMatcherTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ApiExplorer/ApiConventionResultTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApiExplorer/ApiConventionResultTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ApiExplorer/ApiConventionResultTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApiExplorer/ApiConventionResultTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModels/ActionModelTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModels/ActionModelTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModels/ActionModelTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModels/ActionModelTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModels/ApiBehaviorApplicationModelProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModels/ApiBehaviorApplicationModelProviderTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModels/ApiBehaviorApplicationModelProviderTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModels/ApiBehaviorApplicationModelProviderTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModels/ApiConventionApplicationModelConventionTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModels/ApiConventionApplicationModelConventionTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModels/ApiConventionApplicationModelConventionTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModels/ApiConventionApplicationModelConventionTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModels/ApiVisibilityConventionTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModels/ApiVisibilityConventionTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModels/ApiVisibilityConventionTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModels/ApiVisibilityConventionTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModels/AttributeRouteModelTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModels/AttributeRouteModelTests.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModels/AttributeRouteModelTests.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModels/AttributeRouteModelTests.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModels/AuthorizationApplicationModelProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModels/AuthorizationApplicationModelProviderTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModels/AuthorizationApplicationModelProviderTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModels/AuthorizationApplicationModelProviderTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModels/ClientErrorResultFilterConventionTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModels/ClientErrorResultFilterConventionTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModels/ClientErrorResultFilterConventionTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModels/ClientErrorResultFilterConventionTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModels/ConsumesConstraintForFormFileParameterConventionTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModels/ConsumesConstraintForFormFileParameterConventionTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModels/ConsumesConstraintForFormFileParameterConventionTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModels/ConsumesConstraintForFormFileParameterConventionTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModels/ControllerActionDescriptorBuilderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModels/ControllerActionDescriptorBuilderTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModels/ControllerActionDescriptorBuilderTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModels/ControllerActionDescriptorBuilderTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModels/ControllerActionDescriptorProviderTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModels/ControllerActionDescriptorProviderTests.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModels/ControllerActionDescriptorProviderTests.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModels/ControllerActionDescriptorProviderTests.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModels/ControllerModelTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModels/ControllerModelTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModels/ControllerModelTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModels/ControllerModelTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModels/DefaultApplicationModelProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModels/DefaultApplicationModelProviderTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModels/DefaultApplicationModelProviderTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModels/DefaultApplicationModelProviderTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModels/InferParameterBindingInfoConventionTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModels/InferParameterBindingInfoConventionTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModels/InferParameterBindingInfoConventionTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModels/InferParameterBindingInfoConventionTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModels/InvalidModelStateFilterConventionTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModels/InvalidModelStateFilterConventionTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModels/InvalidModelStateFilterConventionTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModels/InvalidModelStateFilterConventionTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModels/ParameterModelTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModels/ParameterModelTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModels/ParameterModelTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModels/ParameterModelTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModels/PropertyModelTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModels/PropertyModelTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModels/PropertyModelTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModels/PropertyModelTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModels/RouteTokenTransformerConventionTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModels/RouteTokenTransformerConventionTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModels/RouteTokenTransformerConventionTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationModels/RouteTokenTransformerConventionTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationParts/ApplicationAssembliesProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationParts/ApplicationAssembliesProviderTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationParts/ApplicationAssembliesProviderTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationParts/ApplicationAssembliesProviderTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationParts/ApplicationPartManagerTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationParts/ApplicationPartManagerTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationParts/ApplicationPartManagerTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationParts/ApplicationPartManagerTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationParts/AssemblyPartTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationParts/AssemblyPartTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationParts/AssemblyPartTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationParts/AssemblyPartTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationParts/RelatedAssemblyPartTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationParts/RelatedAssemblyPartTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationParts/RelatedAssemblyPartTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationParts/RelatedAssemblyPartTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/Authorization/AuthorizeFilterTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Authorization/AuthorizeFilterTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/Authorization/AuthorizeFilterTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Authorization/AuthorizeFilterTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/BadRequestObjectResultTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/BadRequestObjectResultTests.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/BadRequestObjectResultTests.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/BadRequestObjectResultTests.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/BadRequestResultTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/BadRequestResultTests.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/BadRequestResultTests.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/BadRequestResultTests.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/BindAttributeTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/BindAttributeTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/BindAttributeTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/BindAttributeTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/Builder/MvcApplicationBuilderExtensionsTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Builder/MvcApplicationBuilderExtensionsTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/Builder/MvcApplicationBuilderExtensionsTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Builder/MvcApplicationBuilderExtensionsTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/Builder/MvcAreaRouteBuilderExtensionsTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Builder/MvcAreaRouteBuilderExtensionsTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/Builder/MvcAreaRouteBuilderExtensionsTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Builder/MvcAreaRouteBuilderExtensionsTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ChallengeResultTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ChallengeResultTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ChallengeResultTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ChallengeResultTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ConflictObjectResultTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ConflictObjectResultTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ConflictObjectResultTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ConflictObjectResultTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ConflictResultTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ConflictResultTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ConflictResultTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ConflictResultTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ConsumesAttributeTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ConsumesAttributeTests.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ConsumesAttributeTests.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ConsumesAttributeTests.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ContentResultTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ContentResultTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ContentResultTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ContentResultTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ControllerBaseTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ControllerBaseTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ControllerBaseTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ControllerBaseTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/Controllers/ControllerActivatorProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Controllers/ControllerActivatorProviderTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/Controllers/ControllerActivatorProviderTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Controllers/ControllerActivatorProviderTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/Controllers/ControllerBinderDelegateProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Controllers/ControllerBinderDelegateProviderTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/Controllers/ControllerBinderDelegateProviderTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Controllers/ControllerBinderDelegateProviderTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/Controllers/ControllerFactoryProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Controllers/ControllerFactoryProviderTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/Controllers/ControllerFactoryProviderTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Controllers/ControllerFactoryProviderTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/Controllers/ControllerFeatureProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Controllers/ControllerFeatureProviderTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/Controllers/ControllerFeatureProviderTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Controllers/ControllerFeatureProviderTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/Controllers/DefaultControllerActivatorTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Controllers/DefaultControllerActivatorTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/Controllers/DefaultControllerActivatorTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Controllers/DefaultControllerActivatorTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/Controllers/DefaultControllerFactoryTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Controllers/DefaultControllerFactoryTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/Controllers/DefaultControllerFactoryTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Controllers/DefaultControllerFactoryTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/Controllers/ServiceBasedControllerActivatorTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Controllers/ServiceBasedControllerActivatorTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/Controllers/ServiceBasedControllerActivatorTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Controllers/ServiceBasedControllerActivatorTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/CreatedAtActionResultTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/CreatedAtActionResultTests.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/CreatedAtActionResultTests.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/CreatedAtActionResultTests.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/CreatedAtRouteResultTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/CreatedAtRouteResultTests.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/CreatedAtRouteResultTests.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/CreatedAtRouteResultTests.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/CreatedResultTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/CreatedResultTests.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/CreatedResultTests.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/CreatedResultTests.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/DependencyInjection/ApiBehaviorOptionsSetupTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/DependencyInjection/ApiBehaviorOptionsSetupTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/DependencyInjection/ApiBehaviorOptionsSetupTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/DependencyInjection/ApiBehaviorOptionsSetupTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/DependencyInjection/ApplicationModelConventionExtensionsTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/DependencyInjection/ApplicationModelConventionExtensionsTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/DependencyInjection/ApplicationModelConventionExtensionsTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/DependencyInjection/ApplicationModelConventionExtensionsTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/DependencyInjection/MvcBuilderExtensionsTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/DependencyInjection/MvcBuilderExtensionsTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/DependencyInjection/MvcBuilderExtensionsTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/DependencyInjection/MvcBuilderExtensionsTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/DependencyInjection/MvcCoreBuilderExtensionsTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/DependencyInjection/MvcCoreBuilderExtensionsTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/DependencyInjection/MvcCoreBuilderExtensionsTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/DependencyInjection/MvcCoreBuilderExtensionsTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/DependencyInjection/MvcCoreServiceCollectionExtensionsTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/DependencyInjection/MvcCoreServiceCollectionExtensionsTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/DependencyInjection/MvcCoreServiceCollectionExtensionsTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/DependencyInjection/MvcCoreServiceCollectionExtensionsTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/EmptyResultTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/EmptyResultTests.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/EmptyResultTests.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/EmptyResultTests.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/FileContentResultTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/FileContentResultTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/FileContentResultTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/FileContentResultTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/FileResultTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/FileResultTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/FileResultTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/FileResultTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/FileStreamResultTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/FileStreamResultTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/FileStreamResultTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/FileStreamResultTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/Filters/ActionFilterAttributeTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Filters/ActionFilterAttributeTests.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/Filters/ActionFilterAttributeTests.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Filters/ActionFilterAttributeTests.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/Filters/DisableRequestSizeLimitFilterTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Filters/DisableRequestSizeLimitFilterTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/Filters/DisableRequestSizeLimitFilterTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Filters/DisableRequestSizeLimitFilterTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/Filters/FilterCollectionTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Filters/FilterCollectionTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/Filters/FilterCollectionTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Filters/FilterCollectionTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/Filters/FilterFactoryTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Filters/FilterFactoryTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/Filters/FilterFactoryTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Filters/FilterFactoryTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/Filters/FilterProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Filters/FilterProviderTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/Filters/FilterProviderTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Filters/FilterProviderTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/Filters/MiddlewareFilterAttributeTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Filters/MiddlewareFilterAttributeTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/Filters/MiddlewareFilterAttributeTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Filters/MiddlewareFilterAttributeTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/Filters/MiddlewareFilterBuilderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Filters/MiddlewareFilterBuilderTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/Filters/MiddlewareFilterBuilderTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Filters/MiddlewareFilterBuilderTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/Filters/MiddlewareFilterConfigurationProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Filters/MiddlewareFilterConfigurationProviderTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/Filters/MiddlewareFilterConfigurationProviderTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Filters/MiddlewareFilterConfigurationProviderTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/Filters/MiddlewareFilterTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Filters/MiddlewareFilterTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/Filters/MiddlewareFilterTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Filters/MiddlewareFilterTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/Filters/RequestFormLimitsFilterTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Filters/RequestFormLimitsFilterTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/Filters/RequestFormLimitsFilterTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Filters/RequestFormLimitsFilterTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/Filters/RequestSizeLimitFilterTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Filters/RequestSizeLimitFilterTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/Filters/RequestSizeLimitFilterTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Filters/RequestSizeLimitFilterTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/Filters/ResponseCacheFilterExecutorTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Filters/ResponseCacheFilterExecutorTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/Filters/ResponseCacheFilterExecutorTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Filters/ResponseCacheFilterExecutorTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/Filters/ResultFilterAttributeTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Filters/ResultFilterAttributeTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/Filters/ResultFilterAttributeTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Filters/ResultFilterAttributeTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/FlushReportingStream.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/FlushReportingStream.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/FlushReportingStream.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/FlushReportingStream.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ForbidResultTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ForbidResultTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ForbidResultTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ForbidResultTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/AcceptHeaderParserTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/AcceptHeaderParserTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/AcceptHeaderParserTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/AcceptHeaderParserTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/FormatFilterTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/FormatFilterTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/FormatFilterTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/FormatFilterTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/FormatterCollectionTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/FormatterCollectionTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/FormatterCollectionTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/FormatterCollectionTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/FormatterMappingsTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/FormatterMappingsTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/FormatterMappingsTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/FormatterMappingsTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/InputFormatterTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/InputFormatterTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/InputFormatterTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/InputFormatterTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/MediaTypeTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/MediaTypeTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/MediaTypeTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/MediaTypeTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/NoContentFormatterTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/NoContentFormatterTests.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/NoContentFormatterTests.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/NoContentFormatterTests.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/OutputFormatterTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/OutputFormatterTests.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/OutputFormatterTests.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/OutputFormatterTests.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/ResponseContentTypeHelperTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/ResponseContentTypeHelperTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/ResponseContentTypeHelperTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/ResponseContentTypeHelperTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/StreamOutputFormatterTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/StreamOutputFormatterTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/StreamOutputFormatterTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/StreamOutputFormatterTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/StringOutputFormatterTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/StringOutputFormatterTests.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/StringOutputFormatterTests.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/StringOutputFormatterTests.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/TextInputFormatterTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/TextInputFormatterTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/TextInputFormatterTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/TextInputFormatterTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/TextOutputFormatterTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/TextOutputFormatterTests.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/TextOutputFormatterTests.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Formatters/TextOutputFormatterTests.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/HttpNotFoundObjectResultTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/HttpNotFoundObjectResultTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/HttpNotFoundObjectResultTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/HttpNotFoundObjectResultTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/HttpNotFoundResultTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/HttpNotFoundResultTests.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/HttpNotFoundResultTests.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/HttpNotFoundResultTests.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/HttpOkObjectResultTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/HttpOkObjectResultTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/HttpOkObjectResultTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/HttpOkObjectResultTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/HttpOkResultTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/HttpOkResultTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/HttpOkResultTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/HttpOkResultTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/HttpStatusCodeResultTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/HttpStatusCodeResultTests.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/HttpStatusCodeResultTests.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/HttpStatusCodeResultTests.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/HttpUnauthorizedResultTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/HttpUnauthorizedResultTests.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/HttpUnauthorizedResultTests.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/HttpUnauthorizedResultTests.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/ActionMethodExecutorTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/ActionMethodExecutorTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/ActionMethodExecutorTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/ActionMethodExecutorTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/ActionResultTypeMapperTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/ActionResultTypeMapperTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/ActionResultTypeMapperTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/ActionResultTypeMapperTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/ActionSelectorTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/ActionSelectorTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/ActionSelectorTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/ActionSelectorTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/ClientErrorResultFilterTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/ClientErrorResultFilterTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/ClientErrorResultFilterTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/ClientErrorResultFilterTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/CompatibilitySwitchTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/CompatibilitySwitchTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/CompatibilitySwitchTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/CompatibilitySwitchTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/ConfigureCompatibilityOptionsTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/ConfigureCompatibilityOptionsTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/ConfigureCompatibilityOptionsTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/ConfigureCompatibilityOptionsTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/ControllerActionInvokerCacheTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/ControllerActionInvokerCacheTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/ControllerActionInvokerCacheTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/ControllerActionInvokerCacheTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/ControllerActionInvokerTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/ControllerActionInvokerTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/ControllerActionInvokerTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/ControllerActionInvokerTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/DefaultActionDescriptorCollectionProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/DefaultActionDescriptorCollectionProviderTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/DefaultActionDescriptorCollectionProviderTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/DefaultActionDescriptorCollectionProviderTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/DefaultOutputFormatterSelectorTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/DefaultOutputFormatterSelectorTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/DefaultOutputFormatterSelectorTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/DefaultOutputFormatterSelectorTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/ModelStateInvalidFilterTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/ModelStateInvalidFilterTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/ModelStateInvalidFilterTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/ModelStateInvalidFilterTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/MvcOptionsConfigureCompatibilityOptionsTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/MvcOptionsConfigureCompatibilityOptionsTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/MvcOptionsConfigureCompatibilityOptionsTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/MvcOptionsConfigureCompatibilityOptionsTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/NonDisposableStreamTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/NonDisposableStreamTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/NonDisposableStreamTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/NonDisposableStreamTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/NullableCompatibilitySwitchTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/NullableCompatibilitySwitchTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/NullableCompatibilitySwitchTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/NullableCompatibilitySwitchTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/ObjectResultExecutorTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/ObjectResultExecutorTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/ObjectResultExecutorTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/ObjectResultExecutorTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/ParameterDefaultValuesTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/ParameterDefaultValuesTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/ParameterDefaultValuesTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/ParameterDefaultValuesTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/ProblemDetalsClientErrorFactoryTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/ProblemDetalsClientErrorFactoryTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/ProblemDetalsClientErrorFactoryTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Infrastructure/ProblemDetalsClientErrorFactoryTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/LocalRedirectResultTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/LocalRedirectResultTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/LocalRedirectResultTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/LocalRedirectResultTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/MediaTypeCollectionTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/MediaTypeCollectionTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/MediaTypeCollectionTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/MediaTypeCollectionTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/Microsoft.AspNetCore.Mvc.Core.Test.csproj b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Microsoft.AspNetCore.Mvc.Core.Test.csproj
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/Microsoft.AspNetCore.Mvc.Core.Test.csproj
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Microsoft.AspNetCore.Mvc.Core.Test.csproj
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/ArrayModelBinderProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/ArrayModelBinderProviderTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/ArrayModelBinderProviderTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/ArrayModelBinderProviderTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/ArrayModelBinderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/ArrayModelBinderTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/ArrayModelBinderTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/ArrayModelBinderTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/BinderTypeModelBinderProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/BinderTypeModelBinderProviderTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/BinderTypeModelBinderProviderTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/BinderTypeModelBinderProviderTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/BinderTypeModelBinderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/BinderTypeModelBinderTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/BinderTypeModelBinderTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/BinderTypeModelBinderTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/BodyModelBinderProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/BodyModelBinderProviderTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/BodyModelBinderProviderTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/BodyModelBinderProviderTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/BodyModelBinderTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/BodyModelBinderTests.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/BodyModelBinderTests.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/BodyModelBinderTests.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/ByteArrayModelBinderProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/ByteArrayModelBinderProviderTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/ByteArrayModelBinderProviderTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/ByteArrayModelBinderProviderTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/ByteArrayModelBinderTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/ByteArrayModelBinderTests.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/ByteArrayModelBinderTests.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/ByteArrayModelBinderTests.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/CancellationTokenModelBinderProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/CancellationTokenModelBinderProviderTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/CancellationTokenModelBinderProviderTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/CancellationTokenModelBinderProviderTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/CancellationTokenModelBinderTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/CancellationTokenModelBinderTests.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/CancellationTokenModelBinderTests.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/CancellationTokenModelBinderTests.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/CollectionModelBinderProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/CollectionModelBinderProviderTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/CollectionModelBinderProviderTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/CollectionModelBinderProviderTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/CollectionModelBinderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/CollectionModelBinderTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/CollectionModelBinderTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/CollectionModelBinderTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/ComplexTypeModelBinderProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/ComplexTypeModelBinderProviderTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/ComplexTypeModelBinderProviderTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/ComplexTypeModelBinderProviderTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/ComplexTypeModelBinderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/ComplexTypeModelBinderTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/ComplexTypeModelBinderTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/ComplexTypeModelBinderTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/DecimalModelBinderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/DecimalModelBinderTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/DecimalModelBinderTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/DecimalModelBinderTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/DictionaryModelBinderProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/DictionaryModelBinderProviderTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/DictionaryModelBinderProviderTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/DictionaryModelBinderProviderTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/DictionaryModelBinderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/DictionaryModelBinderTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/DictionaryModelBinderTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/DictionaryModelBinderTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/DoubleModelBinderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/DoubleModelBinderTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/DoubleModelBinderTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/DoubleModelBinderTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/EnumTypeModelBinderProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/EnumTypeModelBinderProviderTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/EnumTypeModelBinderProviderTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/EnumTypeModelBinderProviderTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/EnumTypeModelBinderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/EnumTypeModelBinderTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/EnumTypeModelBinderTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/EnumTypeModelBinderTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/FloatModelBinderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/FloatModelBinderTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/FloatModelBinderTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/FloatModelBinderTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/FloatingPointTypeModelBinderProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/FloatingPointTypeModelBinderProviderTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/FloatingPointTypeModelBinderProviderTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/FloatingPointTypeModelBinderProviderTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/FloatingPointTypeModelBinderTestOfT.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/FloatingPointTypeModelBinderTestOfT.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/FloatingPointTypeModelBinderTestOfT.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/FloatingPointTypeModelBinderTestOfT.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/FormCollectionModelBinderProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/FormCollectionModelBinderProviderTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/FormCollectionModelBinderProviderTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/FormCollectionModelBinderProviderTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/FormCollectionModelBinderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/FormCollectionModelBinderTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/FormCollectionModelBinderTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/FormCollectionModelBinderTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/FormFileModelBinderProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/FormFileModelBinderProviderTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/FormFileModelBinderProviderTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/FormFileModelBinderProviderTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/FormFileModelBinderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/FormFileModelBinderTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/FormFileModelBinderTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/FormFileModelBinderTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/HeaderModelBinderProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/HeaderModelBinderProviderTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/HeaderModelBinderProviderTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/HeaderModelBinderProviderTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/HeaderModelBinderTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/HeaderModelBinderTests.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/HeaderModelBinderTests.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/HeaderModelBinderTests.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/KeyValuePairModelBinderProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/KeyValuePairModelBinderProviderTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/KeyValuePairModelBinderProviderTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/KeyValuePairModelBinderProviderTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/KeyValuePairModelBinderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/KeyValuePairModelBinderTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/KeyValuePairModelBinderTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/KeyValuePairModelBinderTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/ServicesModelBinderProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/ServicesModelBinderProviderTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/ServicesModelBinderProviderTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/ServicesModelBinderProviderTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/ServicesModelBinderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/ServicesModelBinderTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/ServicesModelBinderTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/ServicesModelBinderTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/SimpleTypeModelBinderProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/SimpleTypeModelBinderProviderTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/SimpleTypeModelBinderProviderTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/SimpleTypeModelBinderProviderTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/SimpleTypeModelBinderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/SimpleTypeModelBinderTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/SimpleTypeModelBinderTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Binders/SimpleTypeModelBinderTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/BindingSourceValueProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/BindingSourceValueProviderTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/BindingSourceValueProviderTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/BindingSourceValueProviderTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/CompositeValueProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/CompositeValueProviderTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/CompositeValueProviderTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/CompositeValueProviderTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/DefaultModelBindingContextTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/DefaultModelBindingContextTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/DefaultModelBindingContextTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/DefaultModelBindingContextTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/ElementalValueProviderTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/ElementalValueProviderTests.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/ElementalValueProviderTests.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/ElementalValueProviderTests.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/EnumerableValueProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/EnumerableValueProviderTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/EnumerableValueProviderTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/EnumerableValueProviderTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/FormValueProviderFactoryTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/FormValueProviderFactoryTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/FormValueProviderFactoryTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/FormValueProviderFactoryTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/FormValueProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/FormValueProviderTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/FormValueProviderTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/FormValueProviderTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/JQueryFormValueProviderFactoryTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/JQueryFormValueProviderFactoryTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/JQueryFormValueProviderFactoryTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/JQueryFormValueProviderFactoryTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/JQueryFormValueProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/JQueryFormValueProviderTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/JQueryFormValueProviderTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/JQueryFormValueProviderTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/JQueryQueryStringValueProviderFactoryTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/JQueryQueryStringValueProviderFactoryTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/JQueryQueryStringValueProviderFactoryTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/JQueryQueryStringValueProviderFactoryTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/JQueryQueryStringValueProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/JQueryQueryStringValueProviderTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/JQueryQueryStringValueProviderTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/JQueryQueryStringValueProviderTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/BindingSourceMetadataProviderTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/BindingSourceMetadataProviderTests.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/BindingSourceMetadataProviderTests.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/BindingSourceMetadataProviderTests.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/BindingSourceTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/BindingSourceTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/BindingSourceTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/BindingSourceTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/CompositeBindingSourceTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/CompositeBindingSourceTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/CompositeBindingSourceTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/CompositeBindingSourceTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/DefaultBindingMetadataProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/DefaultBindingMetadataProviderTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/DefaultBindingMetadataProviderTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/DefaultBindingMetadataProviderTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/DefaultModelMetadataProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/DefaultModelMetadataProviderTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/DefaultModelMetadataProviderTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/DefaultModelMetadataProviderTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/DefaultModelMetadataTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/DefaultModelMetadataTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/DefaultModelMetadataTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/DefaultModelMetadataTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/DefaultValidationMetadataProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/DefaultValidationMetadataProviderTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/DefaultValidationMetadataProviderTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/DefaultValidationMetadataProviderTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/DisplayMetadataTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/DisplayMetadataTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/DisplayMetadataTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/DisplayMetadataTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/EmptyCompositeMetadataDetailsProvider.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/EmptyCompositeMetadataDetailsProvider.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/EmptyCompositeMetadataDetailsProvider.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/EmptyCompositeMetadataDetailsProvider.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/ExcludeBindingMetadataProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/ExcludeBindingMetadataProviderTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/ExcludeBindingMetadataProviderTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/ExcludeBindingMetadataProviderTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/HasValidatorsValidationMetadataProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/HasValidatorsValidationMetadataProviderTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/HasValidatorsValidationMetadataProviderTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/HasValidatorsValidationMetadataProviderTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/MetadataDetailsProviderExtensionsTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/MetadataDetailsProviderExtensionsTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/MetadataDetailsProviderExtensionsTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/MetadataDetailsProviderExtensionsTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/ModelAttributesTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/ModelAttributesTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/ModelAttributesTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/ModelAttributesTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/ModelBinderAttributeTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/ModelBinderAttributeTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/ModelBinderAttributeTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/ModelBinderAttributeTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/ModelMetadataProviderExtensionsTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/ModelMetadataProviderExtensionsTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/ModelMetadataProviderExtensionsTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Metadata/ModelMetadataProviderExtensionsTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/ModelBinderFactoryTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/ModelBinderFactoryTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/ModelBinderFactoryTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/ModelBinderFactoryTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/ModelBinderProviderExtensionsTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/ModelBinderProviderExtensionsTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/ModelBinderProviderExtensionsTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/ModelBinderProviderExtensionsTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/ModelBindingHelperTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/ModelBindingHelperTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/ModelBindingHelperTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/ModelBindingHelperTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/ModelBindingResultTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/ModelBindingResultTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/ModelBindingResultTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/ModelBindingResultTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/ParameterBinderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/ParameterBinderTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/ParameterBinderTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/ParameterBinderTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/PrefixContainerTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/PrefixContainerTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/PrefixContainerTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/PrefixContainerTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/QueryStringValueProviderFactoryTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/QueryStringValueProviderFactoryTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/QueryStringValueProviderFactoryTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/QueryStringValueProviderFactoryTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/QueryStringValueProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/QueryStringValueProviderTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/QueryStringValueProviderTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/QueryStringValueProviderTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/ReferenceEqualityComparerTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/ReferenceEqualityComparerTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/ReferenceEqualityComparerTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/ReferenceEqualityComparerTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/RouteValueProviderTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/RouteValueProviderTests.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/RouteValueProviderTests.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/RouteValueProviderTests.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/StubModelBinder.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/StubModelBinder.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/StubModelBinder.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/StubModelBinder.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/TestModelBinderProviderContext.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/TestModelBinderProviderContext.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/TestModelBinderProviderContext.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/TestModelBinderProviderContext.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/TestValueProvider.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/TestValueProvider.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/TestValueProvider.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/TestValueProvider.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/UnsupportedContentTypeFilterTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/UnsupportedContentTypeFilterTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/UnsupportedContentTypeFilterTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/UnsupportedContentTypeFilterTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Validation/ClientValidatorCacheTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Validation/ClientValidatorCacheTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Validation/ClientValidatorCacheTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Validation/ClientValidatorCacheTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Validation/CompositeModelValidatorProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Validation/CompositeModelValidatorProviderTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Validation/CompositeModelValidatorProviderTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Validation/CompositeModelValidatorProviderTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Validation/DefaultCollectionValidationStrategyTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Validation/DefaultCollectionValidationStrategyTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Validation/DefaultCollectionValidationStrategyTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Validation/DefaultCollectionValidationStrategyTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Validation/DefaultComplexObjectValidationStrategyTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Validation/DefaultComplexObjectValidationStrategyTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Validation/DefaultComplexObjectValidationStrategyTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Validation/DefaultComplexObjectValidationStrategyTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Validation/DefaultModelValidatorProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Validation/DefaultModelValidatorProviderTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Validation/DefaultModelValidatorProviderTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Validation/DefaultModelValidatorProviderTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Validation/DefaultObjectValidatorTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Validation/DefaultObjectValidatorTests.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Validation/DefaultObjectValidatorTests.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Validation/DefaultObjectValidatorTests.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Validation/ExplicitIndexCollectionValidationStrategyTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Validation/ExplicitIndexCollectionValidationStrategyTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Validation/ExplicitIndexCollectionValidationStrategyTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Validation/ExplicitIndexCollectionValidationStrategyTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Validation/ModelValidatorProviderExtensionsTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Validation/ModelValidatorProviderExtensionsTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Validation/ModelValidatorProviderExtensionsTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Validation/ModelValidatorProviderExtensionsTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Validation/ShortFormDictionaryValidationStrategyTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Validation/ShortFormDictionaryValidationStrategyTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Validation/ShortFormDictionaryValidationStrategyTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Validation/ShortFormDictionaryValidationStrategyTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Validation/ValidationStackTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Validation/ValidationStackTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Validation/ValidationStackTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Validation/ValidationStackTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Validation/ValidatorCacheTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Validation/ValidatorCacheTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Validation/ValidatorCacheTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/Validation/ValidatorCacheTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/ValueProviderFactoryExtensionsTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/ValueProviderFactoryExtensionsTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/ValueProviderFactoryExtensionsTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ModelBinding/ValueProviderFactoryExtensionsTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/MvcCoreLoggerExtensionsTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/MvcCoreLoggerExtensionsTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/MvcCoreLoggerExtensionsTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/MvcCoreLoggerExtensionsTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/MvcOptionsTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/MvcOptionsTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/MvcOptionsTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/MvcOptionsTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ObjectResultTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ObjectResultTests.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ObjectResultTests.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ObjectResultTests.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/PhysicalFileResultTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/PhysicalFileResultTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/PhysicalFileResultTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/PhysicalFileResultTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ProducesAttributeTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ProducesAttributeTests.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ProducesAttributeTests.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ProducesAttributeTests.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/Properties/AssemblyInfo.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Properties/AssemblyInfo.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/Properties/AssemblyInfo.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Properties/AssemblyInfo.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/RedirectResultTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/RedirectResultTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/RedirectResultTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/RedirectResultTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/RedirectToActionResultTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/RedirectToActionResultTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/RedirectToActionResultTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/RedirectToActionResultTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/RedirectToPageResultTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/RedirectToPageResultTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/RedirectToPageResultTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/RedirectToPageResultTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/RedirectToRouteResultTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/RedirectToRouteResultTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/RedirectToRouteResultTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/RedirectToRouteResultTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/RequestFormLimitsAttributeTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/RequestFormLimitsAttributeTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/RequestFormLimitsAttributeTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/RequestFormLimitsAttributeTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/RequireHttpsAttributeTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/RequireHttpsAttributeTests.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/RequireHttpsAttributeTests.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/RequireHttpsAttributeTests.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ResponseCacheAttributeTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ResponseCacheAttributeTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ResponseCacheAttributeTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ResponseCacheAttributeTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/AttributeRouteTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/AttributeRouteTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/AttributeRouteTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/AttributeRouteTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/AttributeRoutingTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/AttributeRoutingTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/AttributeRoutingTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/AttributeRoutingTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/ConsumesMatcherPolicyTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/ConsumesMatcherPolicyTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/ConsumesMatcherPolicyTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/ConsumesMatcherPolicyTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/ControllerLinkGeneratorExtensionsTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/ControllerLinkGeneratorExtensionsTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/ControllerLinkGeneratorExtensionsTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/ControllerLinkGeneratorExtensionsTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/EndpointRoutingUrlHelperTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/EndpointRoutingUrlHelperTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/EndpointRoutingUrlHelperTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/EndpointRoutingUrlHelperTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/HttpMethodProviderAttributesTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/HttpMethodProviderAttributesTests.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/HttpMethodProviderAttributesTests.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/HttpMethodProviderAttributesTests.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/KnownRouteValueConstraintTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/KnownRouteValueConstraintTests.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/KnownRouteValueConstraintTests.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/KnownRouteValueConstraintTests.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/MvcEndpointDataSourceTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/MvcEndpointDataSourceTests.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/MvcEndpointDataSourceTests.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/MvcEndpointDataSourceTests.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/MvcRouteHandlerTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/MvcRouteHandlerTests.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/MvcRouteHandlerTests.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/MvcRouteHandlerTests.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/PageLinkGeneratorExtensionsTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/PageLinkGeneratorExtensionsTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/PageLinkGeneratorExtensionsTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/PageLinkGeneratorExtensionsTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/RoutePatternWriterTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/RoutePatternWriterTests.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/RoutePatternWriterTests.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/RoutePatternWriterTests.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/RouteTemplateProviderAttributesTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/RouteTemplateProviderAttributesTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/RouteTemplateProviderAttributesTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/RouteTemplateProviderAttributesTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/UrlHelperBaseTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/UrlHelperBaseTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/UrlHelperBaseTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/UrlHelperBaseTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/UrlHelperExtensionsTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/UrlHelperExtensionsTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/UrlHelperExtensionsTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/UrlHelperExtensionsTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/UrlHelperTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/UrlHelperTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/UrlHelperTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/UrlHelperTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/UrlHelperTestBase.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/UrlHelperTestBase.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/UrlHelperTestBase.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/UrlHelperTestBase.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/ViewEnginePathTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/ViewEnginePathTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/ViewEnginePathTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/Routing/ViewEnginePathTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/SerializableErrorTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/SerializableErrorTests.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/SerializableErrorTests.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/SerializableErrorTests.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ServiceFilterAttributeTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ServiceFilterAttributeTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ServiceFilterAttributeTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ServiceFilterAttributeTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/SignInResultTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/SignInResultTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/SignInResultTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/SignInResultTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/SignOutResultTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/SignOutResultTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/SignOutResultTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/SignOutResultTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/TestApplicationPart.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/TestApplicationPart.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/TestApplicationPart.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/TestApplicationPart.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/TestFeatureProvider.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/TestFeatureProvider.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/TestFeatureProvider.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/TestFeatureProvider.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/TypeFilterAttributeTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/TypeFilterAttributeTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/TypeFilterAttributeTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/TypeFilterAttributeTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/UnprocessableEntityObjectResultTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/UnprocessableEntityObjectResultTests.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/UnprocessableEntityObjectResultTests.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/UnprocessableEntityObjectResultTests.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/UnprocessableEntityResultTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/UnprocessableEntityResultTests.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/UnprocessableEntityResultTests.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/UnprocessableEntityResultTests.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ValidationProblemDetailsTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ValidationProblemDetailsTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/ValidationProblemDetailsTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/ValidationProblemDetailsTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/VirtualFileResultTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/VirtualFileResultTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/VirtualFileResultTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/VirtualFileResultTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/xunit.runner.json b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/xunit.runner.json
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.Test/xunit.runner.json
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.Test/xunit.runner.json
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.TestCommon/ActivityReplacer.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.TestCommon/ActivityReplacer.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.TestCommon/ActivityReplacer.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.TestCommon/ActivityReplacer.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.TestCommon/CommonFilterTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.TestCommon/CommonFilterTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.TestCommon/CommonFilterTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.TestCommon/CommonFilterTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.TestCommon/CommonResourceInvokerTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.TestCommon/CommonResourceInvokerTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.TestCommon/CommonResourceInvokerTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.TestCommon/CommonResourceInvokerTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.TestCommon/LinkBuilder.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.TestCommon/LinkBuilder.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.TestCommon/LinkBuilder.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.TestCommon/LinkBuilder.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.TestCommon/MediaTypeAssert.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.TestCommon/MediaTypeAssert.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.TestCommon/MediaTypeAssert.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.TestCommon/MediaTypeAssert.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.TestCommon/Microsoft.AspNetCore.Mvc.Core.TestCommon.csproj b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.TestCommon/Microsoft.AspNetCore.Mvc.Core.TestCommon.csproj
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.TestCommon/Microsoft.AspNetCore.Mvc.Core.TestCommon.csproj
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.TestCommon/Microsoft.AspNetCore.Mvc.Core.TestCommon.csproj
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.TestCommon/NonSeekableReadableStream.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.TestCommon/NonSeekableReadableStream.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.TestCommon/NonSeekableReadableStream.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.TestCommon/NonSeekableReadableStream.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.TestCommon/RoutingResult.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.TestCommon/RoutingResult.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.TestCommon/RoutingResult.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.TestCommon/RoutingResult.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.TestCommon/SimpleValueProvider.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.TestCommon/SimpleValueProvider.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.TestCommon/SimpleValueProvider.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.TestCommon/SimpleValueProvider.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.TestCommon/SimpleValueProviderFactory.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.TestCommon/SimpleValueProviderFactory.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.TestCommon/SimpleValueProviderFactory.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.TestCommon/SimpleValueProviderFactory.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.TestCommon/TestClientModelValidatorProvider.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.TestCommon/TestClientModelValidatorProvider.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.TestCommon/TestClientModelValidatorProvider.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.TestCommon/TestClientModelValidatorProvider.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.TestCommon/TestHttpRequestStreamReaderFactory.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.TestCommon/TestHttpRequestStreamReaderFactory.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.TestCommon/TestHttpRequestStreamReaderFactory.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.TestCommon/TestHttpRequestStreamReaderFactory.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.TestCommon/TestHttpResponseStreamWriterFactory.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.TestCommon/TestHttpResponseStreamWriterFactory.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.TestCommon/TestHttpResponseStreamWriterFactory.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.TestCommon/TestHttpResponseStreamWriterFactory.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.TestCommon/TestModelBinderFactory.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.TestCommon/TestModelBinderFactory.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.TestCommon/TestModelBinderFactory.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.TestCommon/TestModelBinderFactory.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.TestCommon/TestModelMetadataProvider.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.TestCommon/TestModelMetadataProvider.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.TestCommon/TestModelMetadataProvider.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.TestCommon/TestModelMetadataProvider.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.TestCommon/TestModelValidatorProvider.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.TestCommon/TestModelValidatorProvider.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.TestCommon/TestModelValidatorProvider.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.TestCommon/TestModelValidatorProvider.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Core.TestCommon/ValidationAttributeUtil.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.TestCommon/ValidationAttributeUtil.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Core.TestCommon/ValidationAttributeUtil.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Core.TestCommon/ValidationAttributeUtil.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Cors.Test/CorsApplicationModelProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Cors.Test/CorsApplicationModelProviderTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Cors.Test/CorsApplicationModelProviderTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Cors.Test/CorsApplicationModelProviderTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Cors.Test/CorsAuthorizationFilterTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Cors.Test/CorsAuthorizationFilterTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Cors.Test/CorsAuthorizationFilterTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Cors.Test/CorsAuthorizationFilterTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Cors.Test/CorsHttpMethodActionConstraintTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Cors.Test/CorsHttpMethodActionConstraintTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Cors.Test/CorsHttpMethodActionConstraintTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Cors.Test/CorsHttpMethodActionConstraintTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Cors.Test/DisableCorsAuthorizationFilterTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Cors.Test/DisableCorsAuthorizationFilterTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Cors.Test/DisableCorsAuthorizationFilterTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Cors.Test/DisableCorsAuthorizationFilterTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Cors.Test/Microsoft.AspNetCore.Mvc.Cors.Test.csproj b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Cors.Test/Microsoft.AspNetCore.Mvc.Cors.Test.csproj
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Cors.Test/Microsoft.AspNetCore.Mvc.Cors.Test.csproj
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Cors.Test/Microsoft.AspNetCore.Mvc.Cors.Test.csproj
diff --git a/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/CompareAttributeAdapterTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/CompareAttributeAdapterTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/CompareAttributeAdapterTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/CompareAttributeAdapterTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/DataAnnotationsClientModelValidatorProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/DataAnnotationsClientModelValidatorProviderTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/DataAnnotationsClientModelValidatorProviderTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/DataAnnotationsClientModelValidatorProviderTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/DataAnnotationsMetadataProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/DataAnnotationsMetadataProviderTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/DataAnnotationsMetadataProviderTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/DataAnnotationsMetadataProviderTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/DataAnnotationsModelValidatorProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/DataAnnotationsModelValidatorProviderTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/DataAnnotationsModelValidatorProviderTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/DataAnnotationsModelValidatorProviderTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/DataAnnotationsModelValidatorTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/DataAnnotationsModelValidatorTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/DataAnnotationsModelValidatorTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/DataAnnotationsModelValidatorTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/DataMemberRequiredBindingMetadataProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/DataMemberRequiredBindingMetadataProviderTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/DataMemberRequiredBindingMetadataProviderTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/DataMemberRequiredBindingMetadataProviderTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/DataTypeClientModelValidatorProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/DataTypeClientModelValidatorProviderTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/DataTypeClientModelValidatorProviderTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/DataTypeClientModelValidatorProviderTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/DefaultModelClientValidatorProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/DefaultModelClientValidatorProviderTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/DefaultModelClientValidatorProviderTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/DefaultModelClientValidatorProviderTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/FileExtensionsAttributeAdapterTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/FileExtensionsAttributeAdapterTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/FileExtensionsAttributeAdapterTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/FileExtensionsAttributeAdapterTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/MaxLengthAttributeAdapterTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/MaxLengthAttributeAdapterTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/MaxLengthAttributeAdapterTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/MaxLengthAttributeAdapterTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test.csproj b/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test.csproj
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test.csproj
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test.csproj
diff --git a/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/MinLengthAttributeAdapterTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/MinLengthAttributeAdapterTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/MinLengthAttributeAdapterTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/MinLengthAttributeAdapterTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/ModelMetadataProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/ModelMetadataProviderTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/ModelMetadataProviderTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/ModelMetadataProviderTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/ModelValidationResultComparer.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/ModelValidationResultComparer.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/ModelValidationResultComparer.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/ModelValidationResultComparer.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/MvcDataAnnotationsMvcOptionsSetup.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/MvcDataAnnotationsMvcOptionsSetup.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/MvcDataAnnotationsMvcOptionsSetup.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/MvcDataAnnotationsMvcOptionsSetup.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/NumericClientModelValidatorTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/NumericClientModelValidatorTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/NumericClientModelValidatorTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/NumericClientModelValidatorTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Properties/Resources.Designer.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Properties/Resources.Designer.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Properties/Resources.Designer.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Properties/Resources.Designer.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/RangeAttributeAdapterTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/RangeAttributeAdapterTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/RangeAttributeAdapterTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/RangeAttributeAdapterTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/RequiredAttributeAdapterTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/RequiredAttributeAdapterTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/RequiredAttributeAdapterTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/RequiredAttributeAdapterTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Resources.resx b/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Resources.resx
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Resources.resx
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Resources.resx
diff --git a/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/StringLengthAttributeAdapterTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/StringLengthAttributeAdapterTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/StringLengthAttributeAdapterTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/StringLengthAttributeAdapterTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/TestModelNameProvider.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/TestModelNameProvider.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/TestModelNameProvider.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/TestModelNameProvider.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/TestResources.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/TestResources.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/TestResources.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/TestResources.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/ValidatableObjectAdapterTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/ValidatableObjectAdapterTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/ValidatableObjectAdapterTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/ValidatableObjectAdapterTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/ValidationAttributeAdapterOfTAttributeTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/ValidationAttributeAdapterOfTAttributeTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/ValidationAttributeAdapterOfTAttributeTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/ValidationAttributeAdapterOfTAttributeTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/ValidationAttributeAdapterProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/ValidationAttributeAdapterProviderTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/ValidationAttributeAdapterProviderTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/ValidationAttributeAdapterProviderTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/JsonInputFormatterTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/JsonInputFormatterTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/JsonInputFormatterTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/JsonInputFormatterTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/JsonOutputFormatterTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/JsonOutputFormatterTests.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/JsonOutputFormatterTests.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/JsonOutputFormatterTests.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/JsonPatchInputFormatterTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/JsonPatchInputFormatterTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/JsonPatchInputFormatterTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/JsonPatchInputFormatterTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/JsonPatchOperationsArrayProviderTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/JsonPatchOperationsArrayProviderTests.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/JsonPatchOperationsArrayProviderTests.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/JsonPatchOperationsArrayProviderTests.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/JsonResultExecutorTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/JsonResultExecutorTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/JsonResultExecutorTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/JsonResultExecutorTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/JsonResultTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/JsonResultTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/JsonResultTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/JsonResultTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test.csproj b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test.csproj
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test.csproj
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test.csproj
diff --git a/test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/MvcJsonOptionsExtensionsTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/MvcJsonOptionsExtensionsTests.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/MvcJsonOptionsExtensionsTests.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/MvcJsonOptionsExtensionsTests.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/DelegatingEnumerableTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/DelegatingEnumerableTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/DelegatingEnumerableTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/DelegatingEnumerableTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/DelegatingEnumeratorTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/DelegatingEnumeratorTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/DelegatingEnumeratorTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/DelegatingEnumeratorTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/DependencyInjection/XmlDataContractSerializerMvcOptionsSetupTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/DependencyInjection/XmlDataContractSerializerMvcOptionsSetupTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/DependencyInjection/XmlDataContractSerializerMvcOptionsSetupTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/DependencyInjection/XmlDataContractSerializerMvcOptionsSetupTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/DependencyInjection/XmlSerializerMvcOptionsSetupTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/DependencyInjection/XmlSerializerMvcOptionsSetupTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/DependencyInjection/XmlSerializerMvcOptionsSetupTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/DependencyInjection/XmlSerializerMvcOptionsSetupTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/EnumerableWrapperProviderFactoryTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/EnumerableWrapperProviderFactoryTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/EnumerableWrapperProviderFactoryTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/EnumerableWrapperProviderFactoryTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/EnumerableWrapperProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/EnumerableWrapperProviderTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/EnumerableWrapperProviderTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/EnumerableWrapperProviderTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/FlushReportingStream.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/FlushReportingStream.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/FlushReportingStream.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/FlushReportingStream.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test.csproj b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test.csproj
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test.csproj
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test.csproj
diff --git a/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/Models/Person.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/Models/Person.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/Models/Person.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/Models/Person.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/Models/PersonList.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/Models/PersonList.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/Models/PersonList.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/Models/PersonList.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/PersonWrapper.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/PersonWrapper.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/PersonWrapper.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/PersonWrapper.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/PersonWrapperProvider.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/PersonWrapperProvider.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/PersonWrapperProvider.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/PersonWrapperProvider.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/PersonWrapperProviderFactory.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/PersonWrapperProviderFactory.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/PersonWrapperProviderFactory.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/PersonWrapperProviderFactory.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/ProblemDetails21WrapperTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/ProblemDetails21WrapperTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/ProblemDetails21WrapperTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/ProblemDetails21WrapperTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/ProblemDetailsWrapperProviderFactoryTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/ProblemDetailsWrapperProviderFactoryTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/ProblemDetailsWrapperProviderFactoryTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/ProblemDetailsWrapperProviderFactoryTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/ProblemDetailsWrapperTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/ProblemDetailsWrapperTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/ProblemDetailsWrapperTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/ProblemDetailsWrapperTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/SerializableErrorWrapperProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/SerializableErrorWrapperProviderTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/SerializableErrorWrapperProviderTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/SerializableErrorWrapperProviderTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/SerializableErrorWrapperTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/SerializableErrorWrapperTests.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/SerializableErrorWrapperTests.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/SerializableErrorWrapperTests.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/SerializableWrapperProviderFactoryTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/SerializableWrapperProviderFactoryTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/SerializableWrapperProviderFactoryTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/SerializableWrapperProviderFactoryTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/ValidationProblemDetails21WrapperTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/ValidationProblemDetails21WrapperTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/ValidationProblemDetails21WrapperTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/ValidationProblemDetails21WrapperTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/ValidationProblemDetailsWrapperTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/ValidationProblemDetailsWrapperTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/ValidationProblemDetailsWrapperTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/ValidationProblemDetailsWrapperTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/XmlAssert.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/XmlAssert.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/XmlAssert.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/XmlAssert.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/XmlAssertTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/XmlAssertTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/XmlAssertTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/XmlAssertTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/XmlDataContractSerializerInputFormatterTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/XmlDataContractSerializerInputFormatterTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/XmlDataContractSerializerInputFormatterTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/XmlDataContractSerializerInputFormatterTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/XmlDataContractSerializerOutputFormatterTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/XmlDataContractSerializerOutputFormatterTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/XmlDataContractSerializerOutputFormatterTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/XmlDataContractSerializerOutputFormatterTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/XmlSerializerInputFormatterTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/XmlSerializerInputFormatterTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/XmlSerializerInputFormatterTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/XmlSerializerInputFormatterTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/XmlSerializerOutputFormatterTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/XmlSerializerOutputFormatterTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/XmlSerializerOutputFormatterTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/XmlSerializerOutputFormatterTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/AntiforgeryAuthTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/AntiforgeryAuthTests.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/AntiforgeryAuthTests.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/AntiforgeryAuthTests.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/AntiforgeryTestHelper.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/AntiforgeryTestHelper.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/AntiforgeryTestHelper.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/AntiforgeryTestHelper.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/AntiforgeryTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/AntiforgeryTests.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/AntiforgeryTests.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/AntiforgeryTests.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/ApiBehaviorTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/ApiBehaviorTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/ApiBehaviorTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/ApiBehaviorTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/ApiExplorerTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/ApiExplorerTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/ApiExplorerTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/ApiExplorerTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/ApplicationModelTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/ApplicationModelTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/ApplicationModelTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/ApplicationModelTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/AsyncActionsTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/AsyncActionsTests.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/AsyncActionsTests.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/AsyncActionsTests.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/BasicApiTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/BasicApiTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/BasicApiTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/BasicApiTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/BasicTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/BasicTests.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/BasicTests.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/BasicTests.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/BasicViewsTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/BasicViewsTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/BasicViewsTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/BasicViewsTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/CompilationOptionsTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/CompilationOptionsTests.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/CompilationOptionsTests.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/CompilationOptionsTests.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/ConsumesAttributeEndpointRoutingTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/ConsumesAttributeEndpointRoutingTests.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/ConsumesAttributeEndpointRoutingTests.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/ConsumesAttributeEndpointRoutingTests.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/ConsumesAttributeTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/ConsumesAttributeTests.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/ConsumesAttributeTests.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/ConsumesAttributeTests.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/ConsumesAttributeTestsBase.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/ConsumesAttributeTestsBase.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/ConsumesAttributeTestsBase.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/ConsumesAttributeTestsBase.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/ContentNegotiationTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/ContentNegotiationTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/ContentNegotiationTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/ContentNegotiationTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/ControllerFromServicesTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/ControllerFromServicesTests.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/ControllerFromServicesTests.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/ControllerFromServicesTests.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/CorsEndpointRoutingTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/CorsEndpointRoutingTests.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/CorsEndpointRoutingTests.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/CorsEndpointRoutingTests.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/CorsTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/CorsTests.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/CorsTests.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/CorsTests.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/CorsTestsBase.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/CorsTestsBase.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/CorsTestsBase.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/CorsTestsBase.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/DataAnnotationTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/DataAnnotationTests.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/DataAnnotationTests.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/DataAnnotationTests.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/DefaultValuesTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/DefaultValuesTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/DefaultValuesTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/DefaultValuesTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/DirectivesTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/DirectivesTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/DirectivesTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/DirectivesTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/DoNotRespectBrowserAcceptHeaderTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/DoNotRespectBrowserAcceptHeaderTests.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/DoNotRespectBrowserAcceptHeaderTests.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/DoNotRespectBrowserAcceptHeaderTests.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/ErrorPageTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/ErrorPageTests.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/ErrorPageTests.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/ErrorPageTests.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/ExceptionInfo.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/ExceptionInfo.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/ExceptionInfo.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/ExceptionInfo.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/FileResultTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/FileResultTests.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/FileResultTests.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/FileResultTests.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/FiltersTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/FiltersTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/FiltersTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/FiltersTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/FlushPointTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/FlushPointTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/FlushPointTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/FlushPointTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/FormFileUploadTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/FormFileUploadTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/FormFileUploadTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/FormFileUploadTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/GlobalAuthorizationFilterTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/GlobalAuthorizationFilterTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/GlobalAuthorizationFilterTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/GlobalAuthorizationFilterTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/HtmlGenerationTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/HtmlGenerationTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/HtmlGenerationTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/HtmlGenerationTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/HtmlGenerationWithCultureTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/HtmlGenerationWithCultureTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/HtmlGenerationWithCultureTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/HtmlGenerationWithCultureTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/HtmlHelperOptionsTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/HtmlHelperOptionsTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/HtmlHelperOptionsTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/HtmlHelperOptionsTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Infrastructure/BasicApiFixture.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Infrastructure/BasicApiFixture.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/Infrastructure/BasicApiFixture.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Infrastructure/BasicApiFixture.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Infrastructure/BasicViewsFixture.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Infrastructure/BasicViewsFixture.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/Infrastructure/BasicViewsFixture.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Infrastructure/BasicViewsFixture.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Infrastructure/CultureReplacerMiddleware.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Infrastructure/CultureReplacerMiddleware.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/Infrastructure/CultureReplacerMiddleware.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Infrastructure/CultureReplacerMiddleware.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Infrastructure/CultureReplacerStartupFilter.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Infrastructure/CultureReplacerStartupFilter.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/Infrastructure/CultureReplacerStartupFilter.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Infrastructure/CultureReplacerStartupFilter.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Infrastructure/HttpClientExtensions.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Infrastructure/HttpClientExtensions.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/Infrastructure/HttpClientExtensions.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Infrastructure/HttpClientExtensions.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Infrastructure/IHtmlDocumentExtensions.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Infrastructure/IHtmlDocumentExtensions.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/Infrastructure/IHtmlDocumentExtensions.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Infrastructure/IHtmlDocumentExtensions.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Infrastructure/MvcEncodedTestFixtureOfT.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Infrastructure/MvcEncodedTestFixtureOfT.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/Infrastructure/MvcEncodedTestFixtureOfT.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Infrastructure/MvcEncodedTestFixtureOfT.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Infrastructure/MvcTestFixture.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Infrastructure/MvcTestFixture.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/Infrastructure/MvcTestFixture.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Infrastructure/MvcTestFixture.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Infrastructure/MvcWebApplicationBuilderExtensions.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Infrastructure/MvcWebApplicationBuilderExtensions.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/Infrastructure/MvcWebApplicationBuilderExtensions.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Infrastructure/MvcWebApplicationBuilderExtensions.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Infrastructure/ResourceFile.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Infrastructure/ResourceFile.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/Infrastructure/ResourceFile.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Infrastructure/ResourceFile.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Infrastructure/TestCulture.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Infrastructure/TestCulture.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/Infrastructure/TestCulture.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Infrastructure/TestCulture.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/InputFormatterTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/InputFormatterTests.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/InputFormatterTests.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/InputFormatterTests.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/InputObjectValidationTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/InputObjectValidationTests.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/InputObjectValidationTests.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/InputObjectValidationTests.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/InputValidationTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/InputValidationTests.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/InputValidationTests.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/InputValidationTests.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/JsonOutputFormatterTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/JsonOutputFormatterTests.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/JsonOutputFormatterTests.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/JsonOutputFormatterTests.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/JsonPatchInputFormatterTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/JsonPatchInputFormatterTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/JsonPatchInputFormatterTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/JsonPatchInputFormatterTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/JsonResultTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/JsonResultTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/JsonResultTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/JsonResultTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/LinkGenerationTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/LinkGenerationTests.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/LinkGenerationTests.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/LinkGenerationTests.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/LinkGeneratorTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/LinkGeneratorTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/LinkGeneratorTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/LinkGeneratorTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Microsoft.AspNetCore.Mvc.FunctionalTests.csproj b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Microsoft.AspNetCore.Mvc.FunctionalTests.csproj
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/Microsoft.AspNetCore.Mvc.FunctionalTests.csproj
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Microsoft.AspNetCore.Mvc.FunctionalTests.csproj
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/MvcSandboxTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/MvcSandboxTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/MvcSandboxTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/MvcSandboxTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/OutputFormatterTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/OutputFormatterTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/OutputFormatterTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/OutputFormatterTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RazorBuildTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RazorBuildTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/RazorBuildTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RazorBuildTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RazorPageModelTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RazorPageModelTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/RazorPageModelTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RazorPageModelTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RazorPagesNamespaceTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RazorPagesNamespaceTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/RazorPagesNamespaceTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RazorPagesNamespaceTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RazorPagesTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RazorPagesTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/RazorPagesTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RazorPagesTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RazorPagesViewSearchTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RazorPagesViewSearchTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/RazorPagesViewSearchTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RazorPagesViewSearchTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RazorPagesWithBasePathTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RazorPagesWithBasePathTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/RazorPagesWithBasePathTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RazorPagesWithBasePathTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RazorViewLocationSpecificationTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RazorViewLocationSpecificationTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/RazorViewLocationSpecificationTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RazorViewLocationSpecificationTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RemoteAttributeValidationTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RemoteAttributeValidationTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/RemoteAttributeValidationTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RemoteAttributeValidationTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RequestFormLimitsTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RequestFormLimitsTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/RequestFormLimitsTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RequestFormLimitsTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RequestServicesEndpointRoutingTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RequestServicesEndpointRoutingTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/RequestServicesEndpointRoutingTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RequestServicesEndpointRoutingTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RequestServicesTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RequestServicesTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/RequestServicesTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RequestServicesTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RequestServicesTestBase.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RequestServicesTestBase.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/RequestServicesTestBase.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RequestServicesTestBase.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RequestSizeLimitTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RequestSizeLimitTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/RequestSizeLimitTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RequestSizeLimitTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RespectBrowserAcceptHeaderTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RespectBrowserAcceptHeaderTests.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/RespectBrowserAcceptHeaderTests.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RespectBrowserAcceptHeaderTests.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RoutingEndpointRoutingTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RoutingEndpointRoutingTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/RoutingEndpointRoutingTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RoutingEndpointRoutingTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RoutingEndpointRoutingWithoutRazorPagesTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RoutingEndpointRoutingWithoutRazorPagesTests.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/RoutingEndpointRoutingWithoutRazorPagesTests.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RoutingEndpointRoutingWithoutRazorPagesTests.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RoutingTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RoutingTests.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/RoutingTests.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RoutingTests.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RoutingTestsBase.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RoutingTestsBase.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/RoutingTestsBase.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RoutingTestsBase.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RoutingWithoutRazorPagesTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RoutingWithoutRazorPagesTests.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/RoutingWithoutRazorPagesTests.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RoutingWithoutRazorPagesTests.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RoutingWithoutRazorPagesTestsBase.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RoutingWithoutRazorPagesTestsBase.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/RoutingWithoutRazorPagesTestsBase.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RoutingWithoutRazorPagesTestsBase.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/SerializableErrorTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/SerializableErrorTests.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/SerializableErrorTests.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/SerializableErrorTests.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/SimpleTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/SimpleTests.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/SimpleTests.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/SimpleTests.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/StreamOutputFormatterTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/StreamOutputFormatterTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/StreamOutputFormatterTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/StreamOutputFormatterTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/TagHelperComponentTagHelperTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/TagHelperComponentTagHelperTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/TagHelperComponentTagHelperTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/TagHelperComponentTagHelperTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/TagHelpersFromServicesTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/TagHelpersFromServicesTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/TagHelpersFromServicesTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/TagHelpersFromServicesTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/TagHelpersTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/TagHelpersTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/TagHelpersTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/TagHelpersTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/TempDataInCookiesTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/TempDataInCookiesTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/TempDataInCookiesTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/TempDataInCookiesTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/TempDataInCookiesUsingCookieConsentTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/TempDataInCookiesUsingCookieConsentTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/TempDataInCookiesUsingCookieConsentTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/TempDataInCookiesUsingCookieConsentTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/TempDataInSessionTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/TempDataInSessionTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/TempDataInSessionTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/TempDataInSessionTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/TempDataPropertyTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/TempDataPropertyTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/TempDataPropertyTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/TempDataPropertyTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/TempDataTestBase.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/TempDataTestBase.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/TempDataTestBase.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/TempDataTestBase.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/TestingInfrastructureInheritanceTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/TestingInfrastructureInheritanceTests.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/TestingInfrastructureInheritanceTests.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/TestingInfrastructureInheritanceTests.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/TestingInfrastructureTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/TestingInfrastructureTests.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/TestingInfrastructureTests.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/TestingInfrastructureTests.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/UrlResolutionTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/UrlResolutionTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/UrlResolutionTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/UrlResolutionTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/VersioningEndpointRoutingTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/VersioningEndpointRoutingTests.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/VersioningEndpointRoutingTests.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/VersioningEndpointRoutingTests.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/VersioningTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/VersioningTests.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/VersioningTests.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/VersioningTests.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/VersioningTestsBase.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/VersioningTestsBase.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/VersioningTestsBase.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/VersioningTestsBase.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/ViewComponentFromServicesTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/ViewComponentFromServicesTests.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/ViewComponentFromServicesTests.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/ViewComponentFromServicesTests.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/ViewEngineTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/ViewEngineTests.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/ViewEngineTests.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/ViewEngineTests.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/XmlDataContractSerializerFormattersWrappingTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/XmlDataContractSerializerFormattersWrappingTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/XmlDataContractSerializerFormattersWrappingTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/XmlDataContractSerializerFormattersWrappingTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/XmlDataContractSerializerInputFormatterTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/XmlDataContractSerializerInputFormatterTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/XmlDataContractSerializerInputFormatterTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/XmlDataContractSerializerInputFormatterTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/XmlOutputFormatterTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/XmlOutputFormatterTests.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/XmlOutputFormatterTests.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/XmlOutputFormatterTests.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/XmlSerializerFormattersWrappingTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/XmlSerializerFormattersWrappingTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/XmlSerializerFormattersWrappingTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/XmlSerializerFormattersWrappingTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/XmlSerializerInputFormatterTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/XmlSerializerInputFormatterTests.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/XmlSerializerInputFormatterTests.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/XmlSerializerInputFormatterTests.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/BasicWebSite.Area1.RemoteAttribute_Home.Create.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/BasicWebSite.Area1.RemoteAttribute_Home.Create.html
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/BasicWebSite.Area1.RemoteAttribute_Home.Create.html
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/BasicWebSite.Area1.RemoteAttribute_Home.Create.html
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/BasicWebSite.Home.ActionLinkView.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/BasicWebSite.Home.ActionLinkView.html
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/BasicWebSite.Home.ActionLinkView.html
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/BasicWebSite.Home.ActionLinkView.html
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/BasicWebSite.Home.CSharp7View.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/BasicWebSite.Home.CSharp7View.html
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/BasicWebSite.Home.CSharp7View.html
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/BasicWebSite.Home.CSharp7View.html
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/BasicWebSite.Home.Index.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/BasicWebSite.Home.Index.html
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/BasicWebSite.Home.Index.html
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/BasicWebSite.Home.Index.html
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/BasicWebSite.Home.PlainView.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/BasicWebSite.Home.PlainView.html
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/BasicWebSite.Home.PlainView.html
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/BasicWebSite.Home.PlainView.html
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/BasicWebSite.Home.ViewWithPrefixedAttributeValue.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/BasicWebSite.Home.ViewWithPrefixedAttributeValue.html
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/BasicWebSite.Home.ViewWithPrefixedAttributeValue.html
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/BasicWebSite.Home.ViewWithPrefixedAttributeValue.html
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/BasicWebSite.PassThrough.Index.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/BasicWebSite.PassThrough.Index.html
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/BasicWebSite.PassThrough.Index.html
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/BasicWebSite.PassThrough.Index.html
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/BasicWebSite.Root.RemoteAttribute_Home.Create.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/BasicWebSite.Root.RemoteAttribute_Home.Create.html
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/BasicWebSite.Root.RemoteAttribute_Home.Create.html
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/BasicWebSite.Root.RemoteAttribute_Home.Create.html
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/CacheTagHelper_CanCachePortionsOfViewsPartialViewsAndViewComponents.Assert1.txt b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/CacheTagHelper_CanCachePortionsOfViewsPartialViewsAndViewComponents.Assert1.txt
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/CacheTagHelper_CanCachePortionsOfViewsPartialViewsAndViewComponents.Assert1.txt
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/CacheTagHelper_CanCachePortionsOfViewsPartialViewsAndViewComponents.Assert1.txt
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/CacheTagHelper_CanCachePortionsOfViewsPartialViewsAndViewComponents.Assert2.txt b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/CacheTagHelper_CanCachePortionsOfViewsPartialViewsAndViewComponents.Assert2.txt
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/CacheTagHelper_CanCachePortionsOfViewsPartialViewsAndViewComponents.Assert2.txt
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/CacheTagHelper_CanCachePortionsOfViewsPartialViewsAndViewComponents.Assert2.txt
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/CacheTagHelper_CanCachePortionsOfViewsPartialViewsAndViewComponents.Assert3.txt b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/CacheTagHelper_CanCachePortionsOfViewsPartialViewsAndViewComponents.Assert3.txt
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/CacheTagHelper_CanCachePortionsOfViewsPartialViewsAndViewComponents.Assert3.txt
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/CacheTagHelper_CanCachePortionsOfViewsPartialViewsAndViewComponents.Assert3.txt
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.CheckViewData.AtViewModel.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.CheckViewData.AtViewModel.html
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.CheckViewData.AtViewModel.html
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.CheckViewData.AtViewModel.html
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.CheckViewData.NullViewModel.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.CheckViewData.NullViewModel.html
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.CheckViewData.NullViewModel.html
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.CheckViewData.NullViewModel.html
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.CheckViewData.ViewModel.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.CheckViewData.ViewModel.html
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.CheckViewData.ViewModel.html
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.CheckViewData.ViewModel.html
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Customer.Index.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Customer.Index.html
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Customer.Index.html
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Customer.Index.html
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.AttributesWithBooleanValues.Encoded.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.AttributesWithBooleanValues.Encoded.html
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.AttributesWithBooleanValues.Encoded.html
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.AttributesWithBooleanValues.Encoded.html
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.AttributesWithBooleanValues.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.AttributesWithBooleanValues.html
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.AttributesWithBooleanValues.html
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.AttributesWithBooleanValues.html
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.CreateWarehouse.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.CreateWarehouse.html
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.CreateWarehouse.html
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.CreateWarehouse.html
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Customer.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Customer.html
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Customer.html
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Customer.html
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.EditWarehouse.Encoded.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.EditWarehouse.Encoded.html
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.EditWarehouse.Encoded.html
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.EditWarehouse.Encoded.html
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.EditWarehouse.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.EditWarehouse.html
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.EditWarehouse.html
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.EditWarehouse.html
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.EmployeeList.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.EmployeeList.html
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.EmployeeList.html
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.EmployeeList.html
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Environment.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Environment.html
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Environment.html
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Environment.html
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Form.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Form.html
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Form.html
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Form.html
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Image.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Image.html
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Image.html
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Image.html
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Index.Encoded.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Index.Encoded.html
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Index.Encoded.html
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Index.Encoded.html
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Index.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Index.html
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Index.html
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Index.html
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Index21Compat.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Index21Compat.html
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Index21Compat.html
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Index21Compat.html
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Input.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Input.html
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Input.html
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Input.html
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Link.Encoded.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Link.Encoded.html
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Link.Encoded.html
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Link.Encoded.html
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Link.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Link.html
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Link.html
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Link.html
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Order.Encoded.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Order.Encoded.html
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Order.Encoded.html
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Order.Encoded.html
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Order.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Order.html
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Order.html
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Order.html
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.OrderUsingHtmlHelpers.Encoded.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.OrderUsingHtmlHelpers.Encoded.html
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.OrderUsingHtmlHelpers.Encoded.html
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.OrderUsingHtmlHelpers.Encoded.html
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.OrderUsingHtmlHelpers.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.OrderUsingHtmlHelpers.html
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.OrderUsingHtmlHelpers.html
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.OrderUsingHtmlHelpers.html
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.PartialTagHelperWithoutModel.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.PartialTagHelperWithoutModel.html
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.PartialTagHelperWithoutModel.html
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.PartialTagHelperWithoutModel.html
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Product.Encoded.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Product.Encoded.html
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Product.Encoded.html
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Product.Encoded.html
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Product.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Product.html
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Product.html
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Product.html
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.ProductList.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.ProductList.html
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.ProductList.html
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.ProductList.html
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.ProductListUsingTagHelpers.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.ProductListUsingTagHelpers.html
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.ProductListUsingTagHelpers.html
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.ProductListUsingTagHelpers.html
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.ProductListUsingTagHelpersWithNullModel.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.ProductListUsingTagHelpersWithNullModel.html
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.ProductListUsingTagHelpersWithNullModel.html
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.ProductListUsingTagHelpersWithNullModel.html
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Script.Encoded.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Script.Encoded.html
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Script.Encoded.html
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Script.Encoded.html
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Script.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Script.html
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Script.html
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Script.html
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Warehouse.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Warehouse.html
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Warehouse.html
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/HtmlGenerationWebSite.HtmlGeneration_Home.Warehouse.html
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/ModelBindingWebSite.Vehicle.Details.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/ModelBindingWebSite.Vehicle.Details.html
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/ModelBindingWebSite.Vehicle.Details.html
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/ModelBindingWebSite.Vehicle.Details.html
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/ModelBindingWebSite.Vehicle.Edit.Invalid.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/ModelBindingWebSite.Vehicle.Edit.Invalid.html
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/ModelBindingWebSite.Vehicle.Edit.Invalid.html
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/ModelBindingWebSite.Vehicle.Edit.Invalid.html
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/ModelBindingWebSite.Vehicle.Edit.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/ModelBindingWebSite.Vehicle.Edit.html
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/ModelBindingWebSite.Vehicle.Edit.html
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/ModelBindingWebSite.Vehicle.Edit.html
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/RazorPagesWebSite.SimpleForms.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/RazorPagesWebSite.SimpleForms.html
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/RazorPagesWebSite.SimpleForms.html
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/RazorPagesWebSite.SimpleForms.html
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/RazorWebSite.AddTagHelperComponent.AddComponent.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/RazorWebSite.AddTagHelperComponent.AddComponent.html
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/RazorWebSite.AddTagHelperComponent.AddComponent.html
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/RazorWebSite.AddTagHelperComponent.AddComponent.html
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/RazorWebSite.TagHelperComponent.Body.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/RazorWebSite.TagHelperComponent.Body.html
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/RazorWebSite.TagHelperComponent.Body.html
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/RazorWebSite.TagHelperComponent.Body.html
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/RazorWebSite.TagHelperComponent.Head.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/RazorWebSite.TagHelperComponent.Head.html
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/RazorWebSite.TagHelperComponent.Head.html
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/RazorWebSite.TagHelperComponent.Head.html
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/RazorWebSite.UrlResolution.Index.Encoded.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/RazorWebSite.UrlResolution.Index.Encoded.html
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/RazorWebSite.UrlResolution.Index.Encoded.html
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/RazorWebSite.UrlResolution.Index.Encoded.html
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/RazorWebSite.UrlResolution.Index.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/RazorWebSite.UrlResolution.Index.html
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/RazorWebSite.UrlResolution.Index.html
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/RazorWebSite.UrlResolution.Index.html
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Employee.Create.Invalid.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Employee.Create.Invalid.html
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Employee.Create.Invalid.html
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Employee.Create.Invalid.html
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Employee.Create.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Employee.Create.html
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Employee.Create.html
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Employee.Create.html
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Employee.Details.AfterCreate.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Employee.Details.AfterCreate.html
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Employee.Details.AfterCreate.html
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Employee.Details.AfterCreate.html
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Employee.DuplicateAntiforgeryTokenRegistration.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Employee.DuplicateAntiforgeryTokenRegistration.html
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Employee.DuplicateAntiforgeryTokenRegistration.html
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Employee.DuplicateAntiforgeryTokenRegistration.html
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Encoders.CustomEncoder.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Encoders.CustomEncoder.html
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Encoders.CustomEncoder.html
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Encoders.CustomEncoder.html
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Encoders.Index.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Encoders.Index.html
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Encoders.Index.html
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Encoders.Index.html
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Encoders.NullEncoder.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Encoders.NullEncoder.html
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Encoders.NullEncoder.html
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Encoders.NullEncoder.html
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Encoders.ThreeEncoders.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Encoders.ThreeEncoders.html
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Encoders.ThreeEncoders.html
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Encoders.ThreeEncoders.html
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Encoders.TwoEncoders.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Encoders.TwoEncoders.html
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Encoders.TwoEncoders.html
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Encoders.TwoEncoders.html
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Home.About.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Home.About.html
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Home.About.html
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Home.About.html
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Home.Help.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Home.Help.html
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Home.Help.html
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Home.Help.html
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Home.Index.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Home.Index.html
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Home.Index.html
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Home.Index.html
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Home.UnboundDynamicAttributes.Encoded.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Home.UnboundDynamicAttributes.Encoded.html
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Home.UnboundDynamicAttributes.Encoded.html
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Home.UnboundDynamicAttributes.Encoded.html
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Home.UnboundDynamicAttributes.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Home.UnboundDynamicAttributes.html
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Home.UnboundDynamicAttributes.html
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Home.UnboundDynamicAttributes.html
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Home.ViewComponentTagHelpers.html b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Home.ViewComponentTagHelpers.html
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Home.ViewComponentTagHelpers.html
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/TagHelpersWebSite.Home.ViewComponentTagHelpers.html
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/UpdateDealerVehicle_PopulatesPropertyErrorsInViews.txt b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/UpdateDealerVehicle_PopulatesPropertyErrorsInViews.txt
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/UpdateDealerVehicle_PopulatesPropertyErrorsInViews.txt
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/UpdateDealerVehicle_PopulatesPropertyErrorsInViews.txt
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/UpdateDealerVehicle_PopulatesValidationSummary.txt b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/UpdateDealerVehicle_PopulatesValidationSummary.txt
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/UpdateDealerVehicle_PopulatesValidationSummary.txt
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/UpdateDealerVehicle_PopulatesValidationSummary.txt
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/UpdateDealerVehicle_UpdateSuccessful.txt b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/UpdateDealerVehicle_UpdateSuccessful.txt
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/UpdateDealerVehicle_UpdateSuccessful.txt
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/UpdateDealerVehicle_UpdateSuccessful.txt
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/ViewEngineController.ViewWithPaths.txt b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/ViewEngineController.ViewWithPaths.txt
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/ViewEngineController.ViewWithPaths.txt
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/compiler/resources/ViewEngineController.ViewWithPaths.txt
diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/xunit.runner.json b/src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/xunit.runner.json
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.FunctionalTests/xunit.runner.json
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.FunctionalTests/xunit.runner.json
diff --git a/test/Microsoft.AspNetCore.Mvc.IntegrationTests/ActionParametersIntegrationTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/ActionParametersIntegrationTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.IntegrationTests/ActionParametersIntegrationTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/ActionParametersIntegrationTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.IntegrationTests/ArrayModelBinderIntegrationTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/ArrayModelBinderIntegrationTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.IntegrationTests/ArrayModelBinderIntegrationTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/ArrayModelBinderIntegrationTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.IntegrationTests/AuthorizeFilterIntegrationTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/AuthorizeFilterIntegrationTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.IntegrationTests/AuthorizeFilterIntegrationTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/AuthorizeFilterIntegrationTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.IntegrationTests/BindPropertyIntegrationTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/BindPropertyIntegrationTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.IntegrationTests/BindPropertyIntegrationTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/BindPropertyIntegrationTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.IntegrationTests/BinderTypeBasedModelBinderIntegrationTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/BinderTypeBasedModelBinderIntegrationTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.IntegrationTests/BinderTypeBasedModelBinderIntegrationTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/BinderTypeBasedModelBinderIntegrationTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.IntegrationTests/BindingSourceMetadataProviderIntegrationTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/BindingSourceMetadataProviderIntegrationTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.IntegrationTests/BindingSourceMetadataProviderIntegrationTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/BindingSourceMetadataProviderIntegrationTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.IntegrationTests/BodyValidationIntegrationTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/BodyValidationIntegrationTests.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.IntegrationTests/BodyValidationIntegrationTests.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/BodyValidationIntegrationTests.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.IntegrationTests/ByteArrayModelBinderIntegrationTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/ByteArrayModelBinderIntegrationTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.IntegrationTests/ByteArrayModelBinderIntegrationTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/ByteArrayModelBinderIntegrationTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.IntegrationTests/CancellationTokenModelBinderIntegrationTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/CancellationTokenModelBinderIntegrationTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.IntegrationTests/CancellationTokenModelBinderIntegrationTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/CancellationTokenModelBinderIntegrationTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.IntegrationTests/CollectionModelBinderIntegrationTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/CollectionModelBinderIntegrationTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.IntegrationTests/CollectionModelBinderIntegrationTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/CollectionModelBinderIntegrationTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.IntegrationTests/CompanyNameAttribute.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/CompanyNameAttribute.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.IntegrationTests/CompanyNameAttribute.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/CompanyNameAttribute.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.IntegrationTests/ComplexTypeModelBinderIntegrationTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/ComplexTypeModelBinderIntegrationTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.IntegrationTests/ComplexTypeModelBinderIntegrationTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/ComplexTypeModelBinderIntegrationTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.IntegrationTests/DictionaryModelBinderIntegrationTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/DictionaryModelBinderIntegrationTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.IntegrationTests/DictionaryModelBinderIntegrationTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/DictionaryModelBinderIntegrationTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.IntegrationTests/ExcludeBindingMetadataProviderIntegrationTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/ExcludeBindingMetadataProviderIntegrationTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.IntegrationTests/ExcludeBindingMetadataProviderIntegrationTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/ExcludeBindingMetadataProviderIntegrationTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.IntegrationTests/FormCollectionModelBindingIntegrationTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/FormCollectionModelBindingIntegrationTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.IntegrationTests/FormCollectionModelBindingIntegrationTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/FormCollectionModelBindingIntegrationTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.IntegrationTests/FormFileModelBindingIntegrationTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/FormFileModelBindingIntegrationTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.IntegrationTests/FormFileModelBindingIntegrationTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/FormFileModelBindingIntegrationTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.IntegrationTests/GenericModelBinderIntegrationTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/GenericModelBinderIntegrationTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.IntegrationTests/GenericModelBinderIntegrationTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/GenericModelBinderIntegrationTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.IntegrationTests/HasValidatorsValidationMetadataProviderIntegrationTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/HasValidatorsValidationMetadataProviderIntegrationTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.IntegrationTests/HasValidatorsValidationMetadataProviderIntegrationTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/HasValidatorsValidationMetadataProviderIntegrationTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.IntegrationTests/HeaderModelBinderIntegrationTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/HeaderModelBinderIntegrationTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.IntegrationTests/HeaderModelBinderIntegrationTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/HeaderModelBinderIntegrationTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.IntegrationTests/JQueryFormatModelBindingIntegrationTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/JQueryFormatModelBindingIntegrationTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.IntegrationTests/JQueryFormatModelBindingIntegrationTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/JQueryFormatModelBindingIntegrationTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.IntegrationTests/KeyValuePairModelBinderIntegrationTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/KeyValuePairModelBinderIntegrationTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.IntegrationTests/KeyValuePairModelBinderIntegrationTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/KeyValuePairModelBinderIntegrationTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.IntegrationTests/Microsoft.AspNetCore.Mvc.IntegrationTests.csproj b/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/Microsoft.AspNetCore.Mvc.IntegrationTests.csproj
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.IntegrationTests/Microsoft.AspNetCore.Mvc.IntegrationTests.csproj
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/Microsoft.AspNetCore.Mvc.IntegrationTests.csproj
diff --git a/test/Microsoft.AspNetCore.Mvc.IntegrationTests/ModelBindingTestContext.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/ModelBindingTestContext.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.IntegrationTests/ModelBindingTestContext.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/ModelBindingTestContext.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.IntegrationTests/ModelBindingTestHelper.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/ModelBindingTestHelper.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.IntegrationTests/ModelBindingTestHelper.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/ModelBindingTestHelper.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.IntegrationTests/ModelPrefixSelectionIntegrationTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/ModelPrefixSelectionIntegrationTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.IntegrationTests/ModelPrefixSelectionIntegrationTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/ModelPrefixSelectionIntegrationTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.IntegrationTests/Models/Product.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/Models/Product.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.IntegrationTests/Models/Product.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/Models/Product.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.IntegrationTests/Models/ProductDetails.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/Models/ProductDetails.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.IntegrationTests/Models/ProductDetails.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/Models/ProductDetails.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.IntegrationTests/Models/ProductViewModel.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/Models/ProductViewModel.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.IntegrationTests/Models/ProductViewModel.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/Models/ProductViewModel.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.IntegrationTests/Models/Software.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/Models/Software.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.IntegrationTests/Models/Software.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/Models/Software.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.IntegrationTests/Models/SoftwareViewModel.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/Models/SoftwareViewModel.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.IntegrationTests/Models/SoftwareViewModel.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/Models/SoftwareViewModel.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.IntegrationTests/ParameterBinderExtensions.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/ParameterBinderExtensions.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.IntegrationTests/ParameterBinderExtensions.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/ParameterBinderExtensions.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.IntegrationTests/ProductValidatorAttribute.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/ProductValidatorAttribute.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.IntegrationTests/ProductValidatorAttribute.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/ProductValidatorAttribute.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.IntegrationTests/ServicesModelBinderIntegrationTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/ServicesModelBinderIntegrationTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.IntegrationTests/ServicesModelBinderIntegrationTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/ServicesModelBinderIntegrationTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.IntegrationTests/SimpleTypeModelBinderIntegrationTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/SimpleTypeModelBinderIntegrationTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.IntegrationTests/SimpleTypeModelBinderIntegrationTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/SimpleTypeModelBinderIntegrationTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.IntegrationTests/TestMvcOptions.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/TestMvcOptions.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.IntegrationTests/TestMvcOptions.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/TestMvcOptions.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.IntegrationTests/TryUpdateModelIntegrationTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/TryUpdateModelIntegrationTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.IntegrationTests/TryUpdateModelIntegrationTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/TryUpdateModelIntegrationTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.IntegrationTests/TryValidateModelIntegrationTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/TryValidateModelIntegrationTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.IntegrationTests/TryValidateModelIntegrationTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/TryValidateModelIntegrationTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.IntegrationTests/ValidationIntegrationTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/ValidationIntegrationTests.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.IntegrationTests/ValidationIntegrationTests.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.IntegrationTests/ValidationIntegrationTests.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Localization.Test/HtmlLocalizerOfTTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Localization.Test/HtmlLocalizerOfTTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Localization.Test/HtmlLocalizerOfTTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Localization.Test/HtmlLocalizerOfTTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Localization.Test/HtmlLocalizerTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Localization.Test/HtmlLocalizerTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Localization.Test/HtmlLocalizerTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Localization.Test/HtmlLocalizerTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Localization.Test/Microsoft.AspNetCore.Mvc.Localization.Test.csproj b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Localization.Test/Microsoft.AspNetCore.Mvc.Localization.Test.csproj
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Localization.Test/Microsoft.AspNetCore.Mvc.Localization.Test.csproj
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Localization.Test/Microsoft.AspNetCore.Mvc.Localization.Test.csproj
diff --git a/test/Microsoft.AspNetCore.Mvc.Localization.Test/MvcLocalizationMvcBuilderExtensionsTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Localization.Test/MvcLocalizationMvcBuilderExtensionsTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Localization.Test/MvcLocalizationMvcBuilderExtensionsTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Localization.Test/MvcLocalizationMvcBuilderExtensionsTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Localization.Test/MvcLocalizationMvcCoreBuilderExtensionsTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Localization.Test/MvcLocalizationMvcCoreBuilderExtensionsTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Localization.Test/MvcLocalizationMvcCoreBuilderExtensionsTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Localization.Test/MvcLocalizationMvcCoreBuilderExtensionsTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Localization.Test/MvcLocalizationServiceCollectionExtensionsTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Localization.Test/MvcLocalizationServiceCollectionExtensionsTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Localization.Test/MvcLocalizationServiceCollectionExtensionsTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Localization.Test/MvcLocalizationServiceCollectionExtensionsTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Localization.Test/TestStringLocalizer.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Localization.Test/TestStringLocalizer.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Localization.Test/TestStringLocalizer.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Localization.Test/TestStringLocalizer.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Localization.Test/ViewLocalizerTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Localization.Test/ViewLocalizerTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Localization.Test/ViewLocalizerTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Localization.Test/ViewLocalizerTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Test/ApplicationParts/RazorCompiledItemFeatureProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/ApplicationParts/RazorCompiledItemFeatureProviderTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Razor.Test/ApplicationParts/RazorCompiledItemFeatureProviderTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/ApplicationParts/RazorCompiledItemFeatureProviderTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Test/Compilation/DefaultRazorPageFactoryProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Compilation/DefaultRazorPageFactoryProviderTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Razor.Test/Compilation/DefaultRazorPageFactoryProviderTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Compilation/DefaultRazorPageFactoryProviderTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Test/Compilation/RazorPagePropertyActivatorTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Compilation/RazorPagePropertyActivatorTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Razor.Test/Compilation/RazorPagePropertyActivatorTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Compilation/RazorPagePropertyActivatorTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Test/Compilation/RazorViewCompilerTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Compilation/RazorViewCompilerTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Razor.Test/Compilation/RazorViewCompilerTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Compilation/RazorViewCompilerTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Test/Compilation/ViewsFeatureProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Compilation/ViewsFeatureProviderTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Razor.Test/Compilation/ViewsFeatureProviderTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Compilation/ViewsFeatureProviderTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Test/DefaultTagHelperFactoryTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/DefaultTagHelperFactoryTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Razor.Test/DefaultTagHelperFactoryTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/DefaultTagHelperFactoryTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Test/DependencyInjection/MvcRazorMvcBuilderExtensionsTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/DependencyInjection/MvcRazorMvcBuilderExtensionsTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Razor.Test/DependencyInjection/MvcRazorMvcBuilderExtensionsTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/DependencyInjection/MvcRazorMvcBuilderExtensionsTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Test/DependencyInjection/MvcRazorMvcCoreBuilderExtensionsTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/DependencyInjection/MvcRazorMvcCoreBuilderExtensionsTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Razor.Test/DependencyInjection/MvcRazorMvcCoreBuilderExtensionsTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/DependencyInjection/MvcRazorMvcCoreBuilderExtensionsTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Test/Infrastructure/DefaultTagHelperActivatorTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Infrastructure/DefaultTagHelperActivatorTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Razor.Test/Infrastructure/DefaultTagHelperActivatorTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Infrastructure/DefaultTagHelperActivatorTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Test/LanguageViewLocationExpanderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/LanguageViewLocationExpanderTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Razor.Test/LanguageViewLocationExpanderTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/LanguageViewLocationExpanderTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Test/Microsoft.AspNetCore.Mvc.Razor.Test.csproj b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Microsoft.AspNetCore.Mvc.Razor.Test.csproj
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Razor.Test/Microsoft.AspNetCore.Mvc.Razor.Test.csproj
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Microsoft.AspNetCore.Mvc.Razor.Test.csproj
diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Test/Properties/AssemblyInfo.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Properties/AssemblyInfo.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Razor.Test/Properties/AssemblyInfo.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Properties/AssemblyInfo.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Test/RazorFileHierarchyTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/RazorFileHierarchyTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Razor.Test/RazorFileHierarchyTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/RazorFileHierarchyTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Test/RazorPageActivatorTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/RazorPageActivatorTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Razor.Test/RazorPageActivatorTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/RazorPageActivatorTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Test/RazorPageCreateModelExpressionTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/RazorPageCreateModelExpressionTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Razor.Test/RazorPageCreateModelExpressionTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/RazorPageCreateModelExpressionTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Test/RazorPageCreateTagHelperTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/RazorPageCreateTagHelperTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Razor.Test/RazorPageCreateTagHelperTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/RazorPageCreateTagHelperTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Test/RazorPageTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/RazorPageTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Razor.Test/RazorPageTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/RazorPageTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Test/RazorViewEngineOptionsTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/RazorViewEngineOptionsTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Razor.Test/RazorViewEngineOptionsTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/RazorViewEngineOptionsTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Test/RazorViewEngineTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/RazorViewEngineTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Razor.Test/RazorViewEngineTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/RazorViewEngineTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Test/RazorViewTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/RazorViewTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Razor.Test/RazorViewTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/RazorViewTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Test/TagHelpers/TagHelperComponentPropertyActivatorTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/TagHelpers/TagHelperComponentPropertyActivatorTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Razor.Test/TagHelpers/TagHelperComponentPropertyActivatorTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/TagHelpers/TagHelperComponentPropertyActivatorTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Test/TagHelpers/TagHelperComponentTagHelperTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/TagHelpers/TagHelperComponentTagHelperTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Razor.Test/TagHelpers/TagHelperComponentTagHelperTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/TagHelpers/TagHelperComponentTagHelperTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Test/TagHelpers/UrlResolutionTagHelperTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/TagHelpers/UrlResolutionTagHelperTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Razor.Test/TagHelpers/UrlResolutionTagHelperTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/TagHelpers/UrlResolutionTagHelperTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Test/TestApplicationPart.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/TestApplicationPart.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Razor.Test/TestApplicationPart.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/TestApplicationPart.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Test/ViewPathTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/ViewPathTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Razor.Test/ViewPathTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/ViewPathTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Test/xunit.runner.json b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/xunit.runner.json
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Razor.Test/xunit.runner.json
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/xunit.runner.json
diff --git a/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/ApplicationModels/AuthorizationPageApplicationModelProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/ApplicationModels/AuthorizationPageApplicationModelProviderTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.RazorPages.Test/ApplicationModels/AuthorizationPageApplicationModelProviderTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/ApplicationModels/AuthorizationPageApplicationModelProviderTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/ApplicationModels/CompiledPageActionDescriptorBuilderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/ApplicationModels/CompiledPageActionDescriptorBuilderTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.RazorPages.Test/ApplicationModels/CompiledPageActionDescriptorBuilderTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/ApplicationModels/CompiledPageActionDescriptorBuilderTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/ApplicationModels/CompiledPageRouteModelProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/ApplicationModels/CompiledPageRouteModelProviderTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.RazorPages.Test/ApplicationModels/CompiledPageRouteModelProviderTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/ApplicationModels/CompiledPageRouteModelProviderTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/ApplicationModels/DefaultPageApplicationModelProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/ApplicationModels/DefaultPageApplicationModelProviderTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.RazorPages.Test/ApplicationModels/DefaultPageApplicationModelProviderTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/ApplicationModels/DefaultPageApplicationModelProviderTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/ApplicationModels/PageConventionCollectionTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/ApplicationModels/PageConventionCollectionTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.RazorPages.Test/ApplicationModels/PageConventionCollectionTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/ApplicationModels/PageConventionCollectionTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/ApplicationModels/PageRouteModelFactoryTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/ApplicationModels/PageRouteModelFactoryTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.RazorPages.Test/ApplicationModels/PageRouteModelFactoryTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/ApplicationModels/PageRouteModelFactoryTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/ApplicationModels/PageRouteTransformerConventionTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/ApplicationModels/PageRouteTransformerConventionTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.RazorPages.Test/ApplicationModels/PageRouteTransformerConventionTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/ApplicationModels/PageRouteTransformerConventionTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/ApplicationModels/ResponseCacheFilterApplicationModelProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/ApplicationModels/ResponseCacheFilterApplicationModelProviderTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.RazorPages.Test/ApplicationModels/ResponseCacheFilterApplicationModelProviderTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/ApplicationModels/ResponseCacheFilterApplicationModelProviderTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/ApplicationModels/TempDataFilterPageApplicationModelProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/ApplicationModels/TempDataFilterPageApplicationModelProviderTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.RazorPages.Test/ApplicationModels/TempDataFilterPageApplicationModelProviderTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/ApplicationModels/TempDataFilterPageApplicationModelProviderTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/ApplicationModels/ViewDataAttributePageApplicationModelProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/ApplicationModels/ViewDataAttributePageApplicationModelProviderTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.RazorPages.Test/ApplicationModels/ViewDataAttributePageApplicationModelProviderTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/ApplicationModels/ViewDataAttributePageApplicationModelProviderTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/DependencyInjection/MvcRazorPagesMvcBuilderExtensionsTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/DependencyInjection/MvcRazorPagesMvcBuilderExtensionsTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.RazorPages.Test/DependencyInjection/MvcRazorPagesMvcBuilderExtensionsTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/DependencyInjection/MvcRazorPagesMvcBuilderExtensionsTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/DependencyInjection/PageConventionCollectionExtensionsTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/DependencyInjection/PageConventionCollectionExtensionsTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.RazorPages.Test/DependencyInjection/PageConventionCollectionExtensionsTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/DependencyInjection/PageConventionCollectionExtensionsTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/DependencyInjection/RazorPagesRazorViewEngineOptionsSetupTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/DependencyInjection/RazorPagesRazorViewEngineOptionsSetupTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.RazorPages.Test/DependencyInjection/RazorPagesRazorViewEngineOptionsSetupTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/DependencyInjection/RazorPagesRazorViewEngineOptionsSetupTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Filters/AutoValidateAntiforgeryPageApplicationModelProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Filters/AutoValidateAntiforgeryPageApplicationModelProviderTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Filters/AutoValidateAntiforgeryPageApplicationModelProviderTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Filters/AutoValidateAntiforgeryPageApplicationModelProviderTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Filters/PageHandlerResultFilterTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Filters/PageHandlerResultFilterTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Filters/PageHandlerResultFilterTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Filters/PageHandlerResultFilterTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Filters/PageSaveTempDataPropertyFilterFactoryTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Filters/PageSaveTempDataPropertyFilterFactoryTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Filters/PageSaveTempDataPropertyFilterFactoryTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Filters/PageSaveTempDataPropertyFilterFactoryTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Filters/PageSaveTempDataPropertyFilterTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Filters/PageSaveTempDataPropertyFilterTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Filters/PageSaveTempDataPropertyFilterTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Filters/PageSaveTempDataPropertyFilterTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Filters/PageViewDataAttributeFilterFactoryTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Filters/PageViewDataAttributeFilterFactoryTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Filters/PageViewDataAttributeFilterFactoryTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Filters/PageViewDataAttributeFilterFactoryTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Filters/PageViewDataAttributeFilterTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Filters/PageViewDataAttributeFilterTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Filters/PageViewDataAttributeFilterTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Filters/PageViewDataAttributeFilterTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/DefaultPageActivatorProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/DefaultPageActivatorProviderTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/DefaultPageActivatorProviderTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/DefaultPageActivatorProviderTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/DefaultPageFactoryProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/DefaultPageFactoryProviderTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/DefaultPageFactoryProviderTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/DefaultPageFactoryProviderTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/DefaultPageHandlerMethodSelectorTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/DefaultPageHandlerMethodSelectorTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/DefaultPageHandlerMethodSelectorTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/DefaultPageHandlerMethodSelectorTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/DefaultPageLoaderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/DefaultPageLoaderTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/DefaultPageLoaderTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/DefaultPageLoaderTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/DefaultPageModelActivatorProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/DefaultPageModelActivatorProviderTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/DefaultPageModelActivatorProviderTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/DefaultPageModelActivatorProviderTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/DefaultPageModelFactoryProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/DefaultPageModelFactoryProviderTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/DefaultPageModelFactoryProviderTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/DefaultPageModelFactoryProviderTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/DisallowOptionsRequestsPageFilterTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/DisallowOptionsRequestsPageFilterTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/DisallowOptionsRequestsPageFilterTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/DisallowOptionsRequestsPageFilterTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/ExecutorFactoryTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/ExecutorFactoryTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/ExecutorFactoryTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/ExecutorFactoryTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/PageActionDescriptorProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/PageActionDescriptorProviderTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/PageActionDescriptorProviderTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/PageActionDescriptorProviderTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/PageActionInvokerProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/PageActionInvokerProviderTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/PageActionInvokerProviderTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/PageActionInvokerProviderTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/PageActionInvokerTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/PageActionInvokerTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/PageActionInvokerTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/PageActionInvokerTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/PageBinderFactoryTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/PageBinderFactoryTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/PageBinderFactoryTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/PageBinderFactoryTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/PageHandlerPageFilterTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/PageHandlerPageFilterTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/PageHandlerPageFilterTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/PageHandlerPageFilterTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/PageViewLocationExpanderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/PageViewLocationExpanderTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/PageViewLocationExpanderTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/PageViewLocationExpanderTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/ServiceBasedPageModelActivatorProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/ServiceBasedPageModelActivatorProviderTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/ServiceBasedPageModelActivatorProviderTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Infrastructure/ServiceBasedPageModelActivatorProviderTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Microsoft.AspNetCore.Mvc.RazorPages.Test.csproj b/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Microsoft.AspNetCore.Mvc.RazorPages.Test.csproj
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Microsoft.AspNetCore.Mvc.RazorPages.Test.csproj
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Microsoft.AspNetCore.Mvc.RazorPages.Test.csproj
diff --git a/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/PageModelTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/PageModelTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.RazorPages.Test/PageModelTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/PageModelTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/PageTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/PageTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.RazorPages.Test/PageTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/PageTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/AnchorTagHelperTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/AnchorTagHelperTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/AnchorTagHelperTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/AnchorTagHelperTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/AttributeMatcherTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/AttributeMatcherTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/AttributeMatcherTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/AttributeMatcherTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/CacheTagHelperTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/CacheTagHelperTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/CacheTagHelperTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/CacheTagHelperTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/CacheTagKeyTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/CacheTagKeyTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/CacheTagKeyTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/CacheTagKeyTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/DefaultFileVersionProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/DefaultFileVersionProviderTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/DefaultFileVersionProviderTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/DefaultFileVersionProviderTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/DefaultTagHelperActivatorTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/DefaultTagHelperActivatorTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/DefaultTagHelperActivatorTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/DefaultTagHelperActivatorTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/DistributedCacheTagHelperTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/DistributedCacheTagHelperTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/DistributedCacheTagHelperTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/DistributedCacheTagHelperTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/EnvironmentTagHelperTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/EnvironmentTagHelperTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/EnvironmentTagHelperTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/EnvironmentTagHelperTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/FormActionTagHelperTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/FormActionTagHelperTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/FormActionTagHelperTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/FormActionTagHelperTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/FormTagHelperTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/FormTagHelperTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/FormTagHelperTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/FormTagHelperTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/GlobbingUrlBuilderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/GlobbingUrlBuilderTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/GlobbingUrlBuilderTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/GlobbingUrlBuilderTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/ImageTagHelperTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/ImageTagHelperTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/ImageTagHelperTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/ImageTagHelperTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/InputTagHelperTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/InputTagHelperTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/InputTagHelperTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/InputTagHelperTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/JavaScriptResourcesTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/JavaScriptResourcesTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/JavaScriptResourcesTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/JavaScriptResourcesTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/LabelTagHelperTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/LabelTagHelperTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/LabelTagHelperTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/LabelTagHelperTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/LinkTagHelperTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/LinkTagHelperTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/LinkTagHelperTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/LinkTagHelperTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/Microsoft.AspNetCore.Mvc.TagHelpers.Test.csproj b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/Microsoft.AspNetCore.Mvc.TagHelpers.Test.csproj
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/Microsoft.AspNetCore.Mvc.TagHelpers.Test.csproj
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/Microsoft.AspNetCore.Mvc.TagHelpers.Test.csproj
diff --git a/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/OptionTagHelperTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/OptionTagHelperTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/OptionTagHelperTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/OptionTagHelperTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/PartialTagHelperTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/PartialTagHelperTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/PartialTagHelperTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/PartialTagHelperTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/RenderAtEndOfFormTagHelperTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/RenderAtEndOfFormTagHelperTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/RenderAtEndOfFormTagHelperTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/RenderAtEndOfFormTagHelperTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/ScriptTagHelperTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/ScriptTagHelperTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/ScriptTagHelperTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/ScriptTagHelperTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/SelectTagHelperTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/SelectTagHelperTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/SelectTagHelperTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/SelectTagHelperTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/TagHelperLogger.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/TagHelperLogger.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/TagHelperLogger.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/TagHelperLogger.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/TagHelperOutputExtensionsTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/TagHelperOutputExtensionsTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/TagHelperOutputExtensionsTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/TagHelperOutputExtensionsTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/TestableHtmlGenerator.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/TestableHtmlGenerator.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/TestableHtmlGenerator.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/TestableHtmlGenerator.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/TextAreaTagHelperTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/TextAreaTagHelperTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/TextAreaTagHelperTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/TextAreaTagHelperTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/ValidationMessageTagHelperTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/ValidationMessageTagHelperTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/ValidationMessageTagHelperTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/ValidationMessageTagHelperTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/ValidationSummaryTagHelperTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/ValidationSummaryTagHelperTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/ValidationSummaryTagHelperTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/ValidationSummaryTagHelperTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Test/ApplicationParts/ApplicationAssembliesProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Test/ApplicationParts/ApplicationAssembliesProviderTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Test/ApplicationParts/ApplicationAssembliesProviderTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Test/ApplicationParts/ApplicationAssembliesProviderTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Test/IntegrationTest/CompatibilitySwitchIntegrationTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Test/IntegrationTest/CompatibilitySwitchIntegrationTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Test/IntegrationTest/CompatibilitySwitchIntegrationTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Test/IntegrationTest/CompatibilitySwitchIntegrationTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Test/JsonPatchExtensionsTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Test/JsonPatchExtensionsTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Test/JsonPatchExtensionsTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Test/JsonPatchExtensionsTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Test/Microsoft.AspNetCore.Mvc.Test.csproj b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Test/Microsoft.AspNetCore.Mvc.Test.csproj
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Test/Microsoft.AspNetCore.Mvc.Test.csproj
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Test/Microsoft.AspNetCore.Mvc.Test.csproj
diff --git a/test/Microsoft.AspNetCore.Mvc.Test/MvcOptionsSetupTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Test/MvcOptionsSetupTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Test/MvcOptionsSetupTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Test/MvcOptionsSetupTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Test/MvcServiceCollectionExtensionsTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Test/MvcServiceCollectionExtensionsTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Test/MvcServiceCollectionExtensionsTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Test/MvcServiceCollectionExtensionsTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Test/Routing/ActionConstraintMatcherPolicyTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Test/Routing/ActionConstraintMatcherPolicyTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Test/Routing/ActionConstraintMatcherPolicyTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Test/Routing/ActionConstraintMatcherPolicyTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Test/xunit.runner.json b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Test/xunit.runner.json
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Test/xunit.runner.json
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Test/xunit.runner.json
diff --git a/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/IProxyActionContext.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/IProxyActionContext.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/IProxyActionContext.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/IProxyActionContext.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/IProxyActionDescriptor.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/IProxyActionDescriptor.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/IProxyActionDescriptor.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/IProxyActionDescriptor.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/IProxyActionResult.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/IProxyActionResult.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/IProxyActionResult.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/IProxyActionResult.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/IProxyHttpContext.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/IProxyHttpContext.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/IProxyHttpContext.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/IProxyHttpContext.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/IProxyPage.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/IProxyPage.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/IProxyPage.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/IProxyPage.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/IProxyRouteData.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/IProxyRouteData.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/IProxyRouteData.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/IProxyRouteData.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/IProxyView.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/IProxyView.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/IProxyView.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/IProxyView.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/IProxyViewComponentContext.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/IProxyViewComponentContext.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/IProxyViewComponentContext.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/IProxyViewComponentContext.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/IProxyViewComponentResult.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/IProxyViewComponentResult.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/IProxyViewComponentResult.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/IProxyViewComponentResult.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/IProxyViewContext.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/IProxyViewContext.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/IProxyViewContext.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/IProxyViewContext.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/Microsoft.AspNetCore.Mvc.TestDiagnosticListener.csproj b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/Microsoft.AspNetCore.Mvc.TestDiagnosticListener.csproj
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/Microsoft.AspNetCore.Mvc.TestDiagnosticListener.csproj
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/Microsoft.AspNetCore.Mvc.TestDiagnosticListener.csproj
diff --git a/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/TestDiagnosticListener.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/TestDiagnosticListener.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/TestDiagnosticListener.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/TestDiagnosticListener.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/AntiforgeryExtensionsTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/AntiforgeryExtensionsTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/AntiforgeryExtensionsTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/AntiforgeryExtensionsTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/AttributeDictionaryTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/AttributeDictionaryTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/AttributeDictionaryTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/AttributeDictionaryTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Buffers/PagedBufferedTextWriterTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Buffers/PagedBufferedTextWriterTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Buffers/PagedBufferedTextWriterTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Buffers/PagedBufferedTextWriterTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Buffers/PagedCharBufferTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Buffers/PagedCharBufferTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Buffers/PagedCharBufferTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Buffers/PagedCharBufferTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Buffers/ViewBufferTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Buffers/ViewBufferTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Buffers/ViewBufferTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Buffers/ViewBufferTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Buffers/ViewBufferTextWriterTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Buffers/ViewBufferTextWriterTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Buffers/ViewBufferTextWriterTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Buffers/ViewBufferTextWriterTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/CachedExpressionCompilerTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/CachedExpressionCompilerTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/CachedExpressionCompilerTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/CachedExpressionCompilerTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ControllerTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ControllerTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ControllerTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ControllerTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ControllerUnitTestabilityTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ControllerUnitTestabilityTests.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ControllerUnitTestabilityTests.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ControllerUnitTestabilityTests.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/CookieTempDataProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/CookieTempDataProviderTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/CookieTempDataProviderTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/CookieTempDataProviderTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/DefaultDisplayTemplatesTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/DefaultDisplayTemplatesTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/DefaultDisplayTemplatesTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/DefaultDisplayTemplatesTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/DefaultEditorTemplatesTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/DefaultEditorTemplatesTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/DefaultEditorTemplatesTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/DefaultEditorTemplatesTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/DefaultHtmlGeneratorTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/DefaultHtmlGeneratorTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/DefaultHtmlGeneratorTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/DefaultHtmlGeneratorTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/DefaultValidationHtmlAttributeProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/DefaultValidationHtmlAttributeProviderTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/DefaultValidationHtmlAttributeProviderTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/DefaultValidationHtmlAttributeProviderTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/DependencyInjection/MvcViewFeaturesMvcBuilderExtensionsTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/DependencyInjection/MvcViewFeaturesMvcBuilderExtensionsTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/DependencyInjection/MvcViewFeaturesMvcBuilderExtensionsTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/DependencyInjection/MvcViewFeaturesMvcBuilderExtensionsTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/DependencyInjection/MvcViewFeaturesMvcCoreBuilderExtensionsTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/DependencyInjection/MvcViewFeaturesMvcCoreBuilderExtensionsTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/DependencyInjection/MvcViewFeaturesMvcCoreBuilderExtensionsTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/DependencyInjection/MvcViewFeaturesMvcCoreBuilderExtensionsTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ExpressionHelperTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ExpressionHelperTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ExpressionHelperTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ExpressionHelperTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ExpressionMetadataProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ExpressionMetadataProviderTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ExpressionMetadataProviderTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ExpressionMetadataProviderTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Filters/AutoValidateAntiforgeryTokenAuthorizationFilterTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Filters/AutoValidateAntiforgeryTokenAuthorizationFilterTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Filters/AutoValidateAntiforgeryTokenAuthorizationFilterTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Filters/AutoValidateAntiforgeryTokenAuthorizationFilterTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Filters/ControllerSaveTempDataPropertyFilterFactoryTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Filters/ControllerSaveTempDataPropertyFilterFactoryTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Filters/ControllerSaveTempDataPropertyFilterFactoryTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Filters/ControllerSaveTempDataPropertyFilterFactoryTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Filters/ControllerSaveTempDataPropertyFilterTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Filters/ControllerSaveTempDataPropertyFilterTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Filters/ControllerSaveTempDataPropertyFilterTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Filters/ControllerSaveTempDataPropertyFilterTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Filters/ControllerViewDataAttributeFilterFactoryTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Filters/ControllerViewDataAttributeFilterFactoryTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Filters/ControllerViewDataAttributeFilterFactoryTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Filters/ControllerViewDataAttributeFilterFactoryTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Filters/ControllerViewDataAttributeFilterTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Filters/ControllerViewDataAttributeFilterTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Filters/ControllerViewDataAttributeFilterTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Filters/ControllerViewDataAttributeFilterTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Filters/LifecyclePropertyTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Filters/LifecyclePropertyTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Filters/LifecyclePropertyTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Filters/LifecyclePropertyTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Filters/SaveTempDataFilterTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Filters/SaveTempDataFilterTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Filters/SaveTempDataFilterTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Filters/SaveTempDataFilterTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Filters/TempDataApplicationModelProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Filters/TempDataApplicationModelProviderTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Filters/TempDataApplicationModelProviderTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Filters/TempDataApplicationModelProviderTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Filters/TempDataSerializerTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Filters/TempDataSerializerTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Filters/TempDataSerializerTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Filters/TempDataSerializerTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Filters/ValidateAntiforgeryTokenAuthorizationFilterTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Filters/ValidateAntiforgeryTokenAuthorizationFilterTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Filters/ValidateAntiforgeryTokenAuthorizationFilterTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Filters/ValidateAntiforgeryTokenAuthorizationFilterTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Filters/ViewDataAttributeApplicationModelProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Filters/ViewDataAttributeApplicationModelProviderTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Filters/ViewDataAttributeApplicationModelProviderTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Filters/ViewDataAttributeApplicationModelProviderTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Filters/ViewDataAttributePropertyProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Filters/ViewDataAttributePropertyProviderTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Filters/ViewDataAttributePropertyProviderTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Filters/ViewDataAttributePropertyProviderTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/FormatWeekHelperTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/FormatWeekHelperTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/FormatWeekHelperTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/FormatWeekHelperTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/HtmlAttributePropertyHelperTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/HtmlAttributePropertyHelperTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/HtmlAttributePropertyHelperTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/HtmlAttributePropertyHelperTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/JsonHelperTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/JsonHelperTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/JsonHelperTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/JsonHelperTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/MemberExpressionCacheKeyComparerTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/MemberExpressionCacheKeyComparerTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/MemberExpressionCacheKeyComparerTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/MemberExpressionCacheKeyComparerTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/MemberExpressionCacheKeyTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/MemberExpressionCacheKeyTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/MemberExpressionCacheKeyTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/MemberExpressionCacheKeyTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test.csproj b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test.csproj
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test.csproj
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test.csproj
diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Model/Constants.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Model/Constants.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Model/Constants.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Model/Constants.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Model/Model.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Model/Model.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Model/Model.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Model/Model.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ModelExplorerExtensionsTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ModelExplorerExtensionsTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ModelExplorerExtensionsTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ModelExplorerExtensionsTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ModelExplorerTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ModelExplorerTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ModelExplorerTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ModelExplorerTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ModelStateDictionaryExtensionsTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ModelStateDictionaryExtensionsTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ModelStateDictionaryExtensionsTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ModelStateDictionaryExtensionsTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/PageRemoteAttributeTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/PageRemoteAttributeTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/PageRemoteAttributeTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/PageRemoteAttributeTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/PartialViewResultExecutorTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/PartialViewResultExecutorTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/PartialViewResultExecutorTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/PartialViewResultExecutorTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/PartialViewResultTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/PartialViewResultTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/PartialViewResultTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/PartialViewResultTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Properties/AssemblyInfo.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Properties/AssemblyInfo.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Properties/AssemblyInfo.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Properties/AssemblyInfo.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Properties/Resources.Designer.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Properties/Resources.Designer.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Properties/Resources.Designer.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Properties/Resources.Designer.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/RemoteAttributeBaseTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/RemoteAttributeBaseTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/RemoteAttributeBaseTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/RemoteAttributeBaseTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/RemoteAttributeTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/RemoteAttributeTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/RemoteAttributeTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/RemoteAttributeTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/DefaultTemplatesUtilities.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/DefaultTemplatesUtilities.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/DefaultTemplatesUtilities.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/DefaultTemplatesUtilities.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperCheckboxTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperCheckboxTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperCheckboxTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperCheckboxTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperDisplayExtensionsTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperDisplayExtensionsTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperDisplayExtensionsTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperDisplayExtensionsTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperDisplayNameExtensionsTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperDisplayNameExtensionsTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperDisplayNameExtensionsTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperDisplayNameExtensionsTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperDisplayTextTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperDisplayTextTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperDisplayTextTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperDisplayTextTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperDropDownListExtensionsTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperDropDownListExtensionsTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperDropDownListExtensionsTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperDropDownListExtensionsTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperEditorExtensionsTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperEditorExtensionsTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperEditorExtensionsTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperEditorExtensionsTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperFormExtensionsTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperFormExtensionsTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperFormExtensionsTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperFormExtensionsTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperFormTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperFormTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperFormTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperFormTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperHiddenTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperHiddenTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperHiddenTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperHiddenTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperLabelExtensionsTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperLabelExtensionsTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperLabelExtensionsTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperLabelExtensionsTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperLinkGenerationTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperLinkGenerationTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperLinkGenerationTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperLinkGenerationTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperListBoxExtensionsTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperListBoxExtensionsTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperListBoxExtensionsTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperListBoxExtensionsTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperNameExtensionsTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperNameExtensionsTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperNameExtensionsTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperNameExtensionsTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperPartialExtensionsTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperPartialExtensionsTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperPartialExtensionsTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperPartialExtensionsTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperPasswordTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperPasswordTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperPasswordTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperPasswordTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperRadioButtonExtensionsTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperRadioButtonExtensionsTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperRadioButtonExtensionsTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperRadioButtonExtensionsTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperSelectTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperSelectTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperSelectTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperSelectTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperTextAreaExtensionsTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperTextAreaExtensionsTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperTextAreaExtensionsTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperTextAreaExtensionsTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperTextAreaTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperTextAreaTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperTextAreaTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperTextAreaTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperTextBoxExtensionsTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperTextBoxExtensionsTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperTextBoxExtensionsTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperTextBoxExtensionsTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperTextBoxTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperTextBoxTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperTextBoxTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperTextBoxTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperValidationMessageExtensionsTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperValidationMessageExtensionsTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperValidationMessageExtensionsTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperValidationMessageExtensionsTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperValidationSummaryTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperValidationSummaryTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperValidationSummaryTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperValidationSummaryTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperValueExtensionsTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperValueExtensionsTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperValueExtensionsTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperValueExtensionsTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperValueTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperValueTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperValueTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlHelperValueTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlStringTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlStringTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlStringTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/HtmlStringTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/TagBuilderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/TagBuilderTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/TagBuilderTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/TagBuilderTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/TestResources.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/TestResources.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/TestResources.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/TestResources.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/ViewContextTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/ViewContextTests.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/ViewContextTests.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Rendering/ViewContextTests.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Resources.resx b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Resources.resx
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Resources.resx
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Resources.resx
diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/SessionStateTempDataProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/SessionStateTempDataProviderTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/SessionStateTempDataProviderTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/SessionStateTempDataProviderTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/SkipStatusCodePagesAttributeTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/SkipStatusCodePagesAttributeTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/SkipStatusCodePagesAttributeTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/SkipStatusCodePagesAttributeTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/StringHtmlContentTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/StringHtmlContentTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/StringHtmlContentTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/StringHtmlContentTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/TempDataDictionaryFactoryTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/TempDataDictionaryFactoryTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/TempDataDictionaryFactoryTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/TempDataDictionaryFactoryTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/TempDataDictionaryTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/TempDataDictionaryTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/TempDataDictionaryTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/TempDataDictionaryTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/TemplateRendererTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/TemplateRendererTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/TemplateRendererTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/TemplateRendererTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/TestApplicationPart.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/TestApplicationPart.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/TestApplicationPart.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/TestApplicationPart.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponentResultTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponentResultTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponentResultTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponentResultTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponentTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponentTests.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponentTests.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponentTests.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponents/ContentViewComponentResultTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponents/ContentViewComponentResultTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponents/ContentViewComponentResultTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponents/ContentViewComponentResultTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponents/DefaultViewComponentActivatorTests.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponents/DefaultViewComponentActivatorTests.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponents/DefaultViewComponentActivatorTests.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponents/DefaultViewComponentActivatorTests.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponents/DefaultViewComponentDescriptorProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponents/DefaultViewComponentDescriptorProviderTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponents/DefaultViewComponentDescriptorProviderTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponents/DefaultViewComponentDescriptorProviderTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponents/DefaultViewComponentFactoryTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponents/DefaultViewComponentFactoryTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponents/DefaultViewComponentFactoryTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponents/DefaultViewComponentFactoryTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponents/DefaultViewComponentHelperTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponents/DefaultViewComponentHelperTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponents/DefaultViewComponentHelperTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponents/DefaultViewComponentHelperTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponents/DefaultViewComponentSelectorTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponents/DefaultViewComponentSelectorTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponents/DefaultViewComponentSelectorTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponents/DefaultViewComponentSelectorTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponents/HtmlContentViewComponentResultTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponents/HtmlContentViewComponentResultTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponents/HtmlContentViewComponentResultTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponents/HtmlContentViewComponentResultTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponents/ViewComponentContextTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponents/ViewComponentContextTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponents/ViewComponentContextTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponents/ViewComponentContextTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponents/ViewComponentConventionsTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponents/ViewComponentConventionsTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponents/ViewComponentConventionsTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponents/ViewComponentConventionsTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponents/ViewComponentFeatureProviderTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponents/ViewComponentFeatureProviderTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponents/ViewComponentFeatureProviderTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponents/ViewComponentFeatureProviderTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponents/ViewViewComponentResultTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponents/ViewViewComponentResultTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponents/ViewViewComponentResultTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewComponents/ViewViewComponentResultTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewDataDictionaryOfTModelTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewDataDictionaryOfTModelTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewDataDictionaryOfTModelTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewDataDictionaryOfTModelTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewDataDictionaryTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewDataDictionaryTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewDataDictionaryTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewDataDictionaryTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewDataOfTTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewDataOfTTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewDataOfTTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewDataOfTTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewEngines/CompositeViewEngineTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewEngines/CompositeViewEngineTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewEngines/CompositeViewEngineTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewEngines/CompositeViewEngineTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewExecutorTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewExecutorTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewExecutorTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewExecutorTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewResultExecutorTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewResultExecutorTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewResultExecutorTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewResultExecutorTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewResultTest.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewResultTest.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewResultTest.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/ViewResultTest.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Views.TestCommon/HtmlContentUtilities.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Views.TestCommon/HtmlContentUtilities.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Views.TestCommon/HtmlContentUtilities.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Views.TestCommon/HtmlContentUtilities.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Views.TestCommon/HtmlGeneratorUtilities.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Views.TestCommon/HtmlGeneratorUtilities.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Views.TestCommon/HtmlGeneratorUtilities.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Views.TestCommon/HtmlGeneratorUtilities.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Views.TestCommon/Microsoft.AspNetCore.Mvc.Views.TestCommon.csproj b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Views.TestCommon/Microsoft.AspNetCore.Mvc.Views.TestCommon.csproj
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Views.TestCommon/Microsoft.AspNetCore.Mvc.Views.TestCommon.csproj
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Views.TestCommon/Microsoft.AspNetCore.Mvc.Views.TestCommon.csproj
diff --git a/test/Microsoft.AspNetCore.Mvc.Views.TestCommon/TestDirectoryContent.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Views.TestCommon/TestDirectoryContent.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Views.TestCommon/TestDirectoryContent.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Views.TestCommon/TestDirectoryContent.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Views.TestCommon/TestDirectoryFileInfo.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Views.TestCommon/TestDirectoryFileInfo.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Views.TestCommon/TestDirectoryFileInfo.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Views.TestCommon/TestDirectoryFileInfo.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Views.TestCommon/TestFileChangeToken.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Views.TestCommon/TestFileChangeToken.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Views.TestCommon/TestFileChangeToken.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Views.TestCommon/TestFileChangeToken.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Views.TestCommon/TestFileInfo.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Views.TestCommon/TestFileInfo.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Views.TestCommon/TestFileInfo.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Views.TestCommon/TestFileInfo.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Views.TestCommon/TestFileProvider.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Views.TestCommon/TestFileProvider.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Views.TestCommon/TestFileProvider.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Views.TestCommon/TestFileProvider.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Views.TestCommon/TestRazorCompiledItem.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Views.TestCommon/TestRazorCompiledItem.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Views.TestCommon/TestRazorCompiledItem.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Views.TestCommon/TestRazorCompiledItem.cs
diff --git a/test/Microsoft.AspNetCore.Mvc.Views.TestCommon/TestViewBufferScope.cs b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Views.TestCommon/TestViewBufferScope.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Mvc.Views.TestCommon/TestViewBufferScope.cs
rename to src/Mvc/test/Microsoft.AspNetCore.Mvc.Views.TestCommon/TestViewBufferScope.cs
diff --git a/test/Mvc.Analyzers.Test/AttributesShouldNotBeAppliedToPageModelAnalyzerTest.cs b/src/Mvc/test/Mvc.Analyzers.Test/AttributesShouldNotBeAppliedToPageModelAnalyzerTest.cs
similarity index 100%
rename from test/Mvc.Analyzers.Test/AttributesShouldNotBeAppliedToPageModelAnalyzerTest.cs
rename to src/Mvc/test/Mvc.Analyzers.Test/AttributesShouldNotBeAppliedToPageModelAnalyzerTest.cs
diff --git a/test/Mvc.Analyzers.Test/AvoidHtmlPartialAnalyzerTest.cs b/src/Mvc/test/Mvc.Analyzers.Test/AvoidHtmlPartialAnalyzerTest.cs
similarity index 100%
rename from test/Mvc.Analyzers.Test/AvoidHtmlPartialAnalyzerTest.cs
rename to src/Mvc/test/Mvc.Analyzers.Test/AvoidHtmlPartialAnalyzerTest.cs
diff --git a/test/Mvc.Analyzers.Test/CodeAnalysisExtensionsTest.cs b/src/Mvc/test/Mvc.Analyzers.Test/CodeAnalysisExtensionsTest.cs
similarity index 100%
rename from test/Mvc.Analyzers.Test/CodeAnalysisExtensionsTest.cs
rename to src/Mvc/test/Mvc.Analyzers.Test/CodeAnalysisExtensionsTest.cs
diff --git a/test/Mvc.Analyzers.Test/Infrastructure/MvcDiagnosticAnalyzerRunner.cs b/src/Mvc/test/Mvc.Analyzers.Test/Infrastructure/MvcDiagnosticAnalyzerRunner.cs
similarity index 100%
rename from test/Mvc.Analyzers.Test/Infrastructure/MvcDiagnosticAnalyzerRunner.cs
rename to src/Mvc/test/Mvc.Analyzers.Test/Infrastructure/MvcDiagnosticAnalyzerRunner.cs
diff --git a/test/Mvc.Analyzers.Test/Infrastructure/MvcTestSource.cs b/src/Mvc/test/Mvc.Analyzers.Test/Infrastructure/MvcTestSource.cs
similarity index 100%
rename from test/Mvc.Analyzers.Test/Infrastructure/MvcTestSource.cs
rename to src/Mvc/test/Mvc.Analyzers.Test/Infrastructure/MvcTestSource.cs
diff --git a/test/Mvc.Analyzers.Test/Mvc.Analyzers.Test.csproj b/src/Mvc/test/Mvc.Analyzers.Test/Mvc.Analyzers.Test.csproj
similarity index 100%
rename from test/Mvc.Analyzers.Test/Mvc.Analyzers.Test.csproj
rename to src/Mvc/test/Mvc.Analyzers.Test/Mvc.Analyzers.Test.csproj
diff --git a/test/Mvc.Analyzers.Test/TestFiles/AttributesShouldNotBeAppliedToPageModelAnalyzerTest/DiagnosticsAreReturned_IfAllowAnonymousIsAppliedToPageHandlerMethod.cs b/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/AttributesShouldNotBeAppliedToPageModelAnalyzerTest/DiagnosticsAreReturned_IfAllowAnonymousIsAppliedToPageHandlerMethod.cs
similarity index 100%
rename from test/Mvc.Analyzers.Test/TestFiles/AttributesShouldNotBeAppliedToPageModelAnalyzerTest/DiagnosticsAreReturned_IfAllowAnonymousIsAppliedToPageHandlerMethod.cs
rename to src/Mvc/test/Mvc.Analyzers.Test/TestFiles/AttributesShouldNotBeAppliedToPageModelAnalyzerTest/DiagnosticsAreReturned_IfAllowAnonymousIsAppliedToPageHandlerMethod.cs
diff --git a/test/Mvc.Analyzers.Test/TestFiles/AttributesShouldNotBeAppliedToPageModelAnalyzerTest/DiagnosticsAreReturned_IfAttributeIsAppliedToBaseType.cs b/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/AttributesShouldNotBeAppliedToPageModelAnalyzerTest/DiagnosticsAreReturned_IfAttributeIsAppliedToBaseType.cs
similarity index 100%
rename from test/Mvc.Analyzers.Test/TestFiles/AttributesShouldNotBeAppliedToPageModelAnalyzerTest/DiagnosticsAreReturned_IfAttributeIsAppliedToBaseType.cs
rename to src/Mvc/test/Mvc.Analyzers.Test/TestFiles/AttributesShouldNotBeAppliedToPageModelAnalyzerTest/DiagnosticsAreReturned_IfAttributeIsAppliedToBaseType.cs
diff --git a/test/Mvc.Analyzers.Test/TestFiles/AttributesShouldNotBeAppliedToPageModelAnalyzerTest/DiagnosticsAreReturned_IfAuthorizeAttributeIsAppliedToPageHandlerMethod.cs b/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/AttributesShouldNotBeAppliedToPageModelAnalyzerTest/DiagnosticsAreReturned_IfAuthorizeAttributeIsAppliedToPageHandlerMethod.cs
similarity index 100%
rename from test/Mvc.Analyzers.Test/TestFiles/AttributesShouldNotBeAppliedToPageModelAnalyzerTest/DiagnosticsAreReturned_IfAuthorizeAttributeIsAppliedToPageHandlerMethod.cs
rename to src/Mvc/test/Mvc.Analyzers.Test/TestFiles/AttributesShouldNotBeAppliedToPageModelAnalyzerTest/DiagnosticsAreReturned_IfAuthorizeAttributeIsAppliedToPageHandlerMethod.cs
diff --git a/test/Mvc.Analyzers.Test/TestFiles/AttributesShouldNotBeAppliedToPageModelAnalyzerTest/DiagnosticsAreReturned_IfFiltersAreAppliedToPageHandlerMethod.cs b/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/AttributesShouldNotBeAppliedToPageModelAnalyzerTest/DiagnosticsAreReturned_IfFiltersAreAppliedToPageHandlerMethod.cs
similarity index 100%
rename from test/Mvc.Analyzers.Test/TestFiles/AttributesShouldNotBeAppliedToPageModelAnalyzerTest/DiagnosticsAreReturned_IfFiltersAreAppliedToPageHandlerMethod.cs
rename to src/Mvc/test/Mvc.Analyzers.Test/TestFiles/AttributesShouldNotBeAppliedToPageModelAnalyzerTest/DiagnosticsAreReturned_IfFiltersAreAppliedToPageHandlerMethod.cs
diff --git a/test/Mvc.Analyzers.Test/TestFiles/AttributesShouldNotBeAppliedToPageModelAnalyzerTest/DiagnosticsAreReturned_IfFiltersAreAppliedToPageHandlerMethodDerivingFromCustomModel.cs b/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/AttributesShouldNotBeAppliedToPageModelAnalyzerTest/DiagnosticsAreReturned_IfFiltersAreAppliedToPageHandlerMethodDerivingFromCustomModel.cs
similarity index 100%
rename from test/Mvc.Analyzers.Test/TestFiles/AttributesShouldNotBeAppliedToPageModelAnalyzerTest/DiagnosticsAreReturned_IfFiltersAreAppliedToPageHandlerMethodDerivingFromCustomModel.cs
rename to src/Mvc/test/Mvc.Analyzers.Test/TestFiles/AttributesShouldNotBeAppliedToPageModelAnalyzerTest/DiagnosticsAreReturned_IfFiltersAreAppliedToPageHandlerMethodDerivingFromCustomModel.cs
diff --git a/test/Mvc.Analyzers.Test/TestFiles/AttributesShouldNotBeAppliedToPageModelAnalyzerTest/DiagnosticsAreReturned_IfFiltersAreAppliedToPageHandlerMethodForTypeWithPageModelAttribute.cs b/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/AttributesShouldNotBeAppliedToPageModelAnalyzerTest/DiagnosticsAreReturned_IfFiltersAreAppliedToPageHandlerMethodForTypeWithPageModelAttribute.cs
similarity index 100%
rename from test/Mvc.Analyzers.Test/TestFiles/AttributesShouldNotBeAppliedToPageModelAnalyzerTest/DiagnosticsAreReturned_IfFiltersAreAppliedToPageHandlerMethodForTypeWithPageModelAttribute.cs
rename to src/Mvc/test/Mvc.Analyzers.Test/TestFiles/AttributesShouldNotBeAppliedToPageModelAnalyzerTest/DiagnosticsAreReturned_IfFiltersAreAppliedToPageHandlerMethodForTypeWithPageModelAttribute.cs
diff --git a/test/Mvc.Analyzers.Test/TestFiles/AttributesShouldNotBeAppliedToPageModelAnalyzerTest/DiagnosticsAreReturned_IfRouteAttribute_IsAppliedToPageModel.cs b/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/AttributesShouldNotBeAppliedToPageModelAnalyzerTest/DiagnosticsAreReturned_IfRouteAttribute_IsAppliedToPageModel.cs
similarity index 100%
rename from test/Mvc.Analyzers.Test/TestFiles/AttributesShouldNotBeAppliedToPageModelAnalyzerTest/DiagnosticsAreReturned_IfRouteAttribute_IsAppliedToPageModel.cs
rename to src/Mvc/test/Mvc.Analyzers.Test/TestFiles/AttributesShouldNotBeAppliedToPageModelAnalyzerTest/DiagnosticsAreReturned_IfRouteAttribute_IsAppliedToPageModel.cs
diff --git a/test/Mvc.Analyzers.Test/TestFiles/AttributesShouldNotBeAppliedToPageModelAnalyzerTest/DiagnosticsAreReturned_IfRouteAttributesAreAppliedToPageHandlerMethod.cs b/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/AttributesShouldNotBeAppliedToPageModelAnalyzerTest/DiagnosticsAreReturned_IfRouteAttributesAreAppliedToPageHandlerMethod.cs
similarity index 100%
rename from test/Mvc.Analyzers.Test/TestFiles/AttributesShouldNotBeAppliedToPageModelAnalyzerTest/DiagnosticsAreReturned_IfRouteAttributesAreAppliedToPageHandlerMethod.cs
rename to src/Mvc/test/Mvc.Analyzers.Test/TestFiles/AttributesShouldNotBeAppliedToPageModelAnalyzerTest/DiagnosticsAreReturned_IfRouteAttributesAreAppliedToPageHandlerMethod.cs
diff --git a/test/Mvc.Analyzers.Test/TestFiles/AttributesShouldNotBeAppliedToPageModelAnalyzerTest/NoDiagnosticsAreReturned_ForControllerActions.cs b/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/AttributesShouldNotBeAppliedToPageModelAnalyzerTest/NoDiagnosticsAreReturned_ForControllerActions.cs
similarity index 100%
rename from test/Mvc.Analyzers.Test/TestFiles/AttributesShouldNotBeAppliedToPageModelAnalyzerTest/NoDiagnosticsAreReturned_ForControllerActions.cs
rename to src/Mvc/test/Mvc.Analyzers.Test/TestFiles/AttributesShouldNotBeAppliedToPageModelAnalyzerTest/NoDiagnosticsAreReturned_ForControllerActions.cs
diff --git a/test/Mvc.Analyzers.Test/TestFiles/AttributesShouldNotBeAppliedToPageModelAnalyzerTest/NoDiagnosticsAreReturned_ForControllerBaseActions.cs b/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/AttributesShouldNotBeAppliedToPageModelAnalyzerTest/NoDiagnosticsAreReturned_ForControllerBaseActions.cs
similarity index 100%
rename from test/Mvc.Analyzers.Test/TestFiles/AttributesShouldNotBeAppliedToPageModelAnalyzerTest/NoDiagnosticsAreReturned_ForControllerBaseActions.cs
rename to src/Mvc/test/Mvc.Analyzers.Test/TestFiles/AttributesShouldNotBeAppliedToPageModelAnalyzerTest/NoDiagnosticsAreReturned_ForControllerBaseActions.cs
diff --git a/test/Mvc.Analyzers.Test/TestFiles/AttributesShouldNotBeAppliedToPageModelAnalyzerTest/NoDiagnosticsAreReturned_ForNonHandlerMethodsWithAttributes.cs b/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/AttributesShouldNotBeAppliedToPageModelAnalyzerTest/NoDiagnosticsAreReturned_ForNonHandlerMethodsWithAttributes.cs
similarity index 100%
rename from test/Mvc.Analyzers.Test/TestFiles/AttributesShouldNotBeAppliedToPageModelAnalyzerTest/NoDiagnosticsAreReturned_ForNonHandlerMethodsWithAttributes.cs
rename to src/Mvc/test/Mvc.Analyzers.Test/TestFiles/AttributesShouldNotBeAppliedToPageModelAnalyzerTest/NoDiagnosticsAreReturned_ForNonHandlerMethodsWithAttributes.cs
diff --git a/test/Mvc.Analyzers.Test/TestFiles/AttributesShouldNotBeAppliedToPageModelAnalyzerTest/NoDiagnosticsAreReturned_ForPageHandlersWithNonFilterAttributes.cs b/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/AttributesShouldNotBeAppliedToPageModelAnalyzerTest/NoDiagnosticsAreReturned_ForPageHandlersWithNonFilterAttributes.cs
similarity index 100%
rename from test/Mvc.Analyzers.Test/TestFiles/AttributesShouldNotBeAppliedToPageModelAnalyzerTest/NoDiagnosticsAreReturned_ForPageHandlersWithNonFilterAttributes.cs
rename to src/Mvc/test/Mvc.Analyzers.Test/TestFiles/AttributesShouldNotBeAppliedToPageModelAnalyzerTest/NoDiagnosticsAreReturned_ForPageHandlersWithNonFilterAttributes.cs
diff --git a/test/Mvc.Analyzers.Test/TestFiles/AttributesShouldNotBeAppliedToPageModelAnalyzerTest/NoDiagnosticsAreReturned_IfAllowAnonymousIsAppliedToPageModel.cs b/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/AttributesShouldNotBeAppliedToPageModelAnalyzerTest/NoDiagnosticsAreReturned_IfAllowAnonymousIsAppliedToPageModel.cs
similarity index 100%
rename from test/Mvc.Analyzers.Test/TestFiles/AttributesShouldNotBeAppliedToPageModelAnalyzerTest/NoDiagnosticsAreReturned_IfAllowAnonymousIsAppliedToPageModel.cs
rename to src/Mvc/test/Mvc.Analyzers.Test/TestFiles/AttributesShouldNotBeAppliedToPageModelAnalyzerTest/NoDiagnosticsAreReturned_IfAllowAnonymousIsAppliedToPageModel.cs
diff --git a/test/Mvc.Analyzers.Test/TestFiles/AttributesShouldNotBeAppliedToPageModelAnalyzerTest/NoDiagnosticsAreReturned_IfAuthorizeAttributeIsAppliedToPageModel.cs b/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/AttributesShouldNotBeAppliedToPageModelAnalyzerTest/NoDiagnosticsAreReturned_IfAuthorizeAttributeIsAppliedToPageModel.cs
similarity index 100%
rename from test/Mvc.Analyzers.Test/TestFiles/AttributesShouldNotBeAppliedToPageModelAnalyzerTest/NoDiagnosticsAreReturned_IfAuthorizeAttributeIsAppliedToPageModel.cs
rename to src/Mvc/test/Mvc.Analyzers.Test/TestFiles/AttributesShouldNotBeAppliedToPageModelAnalyzerTest/NoDiagnosticsAreReturned_IfAuthorizeAttributeIsAppliedToPageModel.cs
diff --git a/test/Mvc.Analyzers.Test/TestFiles/AttributesShouldNotBeAppliedToPageModelAnalyzerTest/NoDiagnosticsAreReturned_IfFiltersAreAppliedToPageModel.cs b/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/AttributesShouldNotBeAppliedToPageModelAnalyzerTest/NoDiagnosticsAreReturned_IfFiltersAreAppliedToPageModel.cs
similarity index 100%
rename from test/Mvc.Analyzers.Test/TestFiles/AttributesShouldNotBeAppliedToPageModelAnalyzerTest/NoDiagnosticsAreReturned_IfFiltersAreAppliedToPageModel.cs
rename to src/Mvc/test/Mvc.Analyzers.Test/TestFiles/AttributesShouldNotBeAppliedToPageModelAnalyzerTest/NoDiagnosticsAreReturned_IfFiltersAreAppliedToPageModel.cs
diff --git a/test/Mvc.Analyzers.Test/TestFiles/AvoidHtmlPartialAnalyzerTest/DiagnosticsAreReturned_ForUseOfHtmlPartial.cs b/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/AvoidHtmlPartialAnalyzerTest/DiagnosticsAreReturned_ForUseOfHtmlPartial.cs
similarity index 100%
rename from test/Mvc.Analyzers.Test/TestFiles/AvoidHtmlPartialAnalyzerTest/DiagnosticsAreReturned_ForUseOfHtmlPartial.cs
rename to src/Mvc/test/Mvc.Analyzers.Test/TestFiles/AvoidHtmlPartialAnalyzerTest/DiagnosticsAreReturned_ForUseOfHtmlPartial.cs
diff --git a/test/Mvc.Analyzers.Test/TestFiles/AvoidHtmlPartialAnalyzerTest/DiagnosticsAreReturned_ForUseOfHtmlPartial_InSections.cs b/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/AvoidHtmlPartialAnalyzerTest/DiagnosticsAreReturned_ForUseOfHtmlPartial_InSections.cs
similarity index 100%
rename from test/Mvc.Analyzers.Test/TestFiles/AvoidHtmlPartialAnalyzerTest/DiagnosticsAreReturned_ForUseOfHtmlPartial_InSections.cs
rename to src/Mvc/test/Mvc.Analyzers.Test/TestFiles/AvoidHtmlPartialAnalyzerTest/DiagnosticsAreReturned_ForUseOfHtmlPartial_InSections.cs
diff --git a/test/Mvc.Analyzers.Test/TestFiles/AvoidHtmlPartialAnalyzerTest/DiagnosticsAreReturned_ForUseOfHtmlPartial_WithAdditionalParameters.cs b/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/AvoidHtmlPartialAnalyzerTest/DiagnosticsAreReturned_ForUseOfHtmlPartial_WithAdditionalParameters.cs
similarity index 100%
rename from test/Mvc.Analyzers.Test/TestFiles/AvoidHtmlPartialAnalyzerTest/DiagnosticsAreReturned_ForUseOfHtmlPartial_WithAdditionalParameters.cs
rename to src/Mvc/test/Mvc.Analyzers.Test/TestFiles/AvoidHtmlPartialAnalyzerTest/DiagnosticsAreReturned_ForUseOfHtmlPartial_WithAdditionalParameters.cs
diff --git a/test/Mvc.Analyzers.Test/TestFiles/AvoidHtmlPartialAnalyzerTest/DiagnosticsAreReturned_ForUseOfRenderPartial.cs b/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/AvoidHtmlPartialAnalyzerTest/DiagnosticsAreReturned_ForUseOfRenderPartial.cs
similarity index 100%
rename from test/Mvc.Analyzers.Test/TestFiles/AvoidHtmlPartialAnalyzerTest/DiagnosticsAreReturned_ForUseOfRenderPartial.cs
rename to src/Mvc/test/Mvc.Analyzers.Test/TestFiles/AvoidHtmlPartialAnalyzerTest/DiagnosticsAreReturned_ForUseOfRenderPartial.cs
diff --git a/test/Mvc.Analyzers.Test/TestFiles/AvoidHtmlPartialAnalyzerTest/DiagnosticsAreReturned_ForUseOfRenderPartial_InSections.cs b/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/AvoidHtmlPartialAnalyzerTest/DiagnosticsAreReturned_ForUseOfRenderPartial_InSections.cs
similarity index 100%
rename from test/Mvc.Analyzers.Test/TestFiles/AvoidHtmlPartialAnalyzerTest/DiagnosticsAreReturned_ForUseOfRenderPartial_InSections.cs
rename to src/Mvc/test/Mvc.Analyzers.Test/TestFiles/AvoidHtmlPartialAnalyzerTest/DiagnosticsAreReturned_ForUseOfRenderPartial_InSections.cs
diff --git a/test/Mvc.Analyzers.Test/TestFiles/AvoidHtmlPartialAnalyzerTest/DiagnosticsAreReturned_ForUseOfRenderPartial_WithAdditionalParameters.cs b/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/AvoidHtmlPartialAnalyzerTest/DiagnosticsAreReturned_ForUseOfRenderPartial_WithAdditionalParameters.cs
similarity index 100%
rename from test/Mvc.Analyzers.Test/TestFiles/AvoidHtmlPartialAnalyzerTest/DiagnosticsAreReturned_ForUseOfRenderPartial_WithAdditionalParameters.cs
rename to src/Mvc/test/Mvc.Analyzers.Test/TestFiles/AvoidHtmlPartialAnalyzerTest/DiagnosticsAreReturned_ForUseOfRenderPartial_WithAdditionalParameters.cs
diff --git a/test/Mvc.Analyzers.Test/TestFiles/AvoidHtmlPartialAnalyzerTest/NoDiagnosticsAreReturned_ForNonUseOfHtmlPartial.cs b/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/AvoidHtmlPartialAnalyzerTest/NoDiagnosticsAreReturned_ForNonUseOfHtmlPartial.cs
similarity index 100%
rename from test/Mvc.Analyzers.Test/TestFiles/AvoidHtmlPartialAnalyzerTest/NoDiagnosticsAreReturned_ForNonUseOfHtmlPartial.cs
rename to src/Mvc/test/Mvc.Analyzers.Test/TestFiles/AvoidHtmlPartialAnalyzerTest/NoDiagnosticsAreReturned_ForNonUseOfHtmlPartial.cs
diff --git a/test/Mvc.Analyzers.Test/TestFiles/AvoidHtmlPartialAnalyzerTest/NoDiagnosticsAreReturned_ForUseOfHtmlPartialAsync.cs b/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/AvoidHtmlPartialAnalyzerTest/NoDiagnosticsAreReturned_ForUseOfHtmlPartialAsync.cs
similarity index 100%
rename from test/Mvc.Analyzers.Test/TestFiles/AvoidHtmlPartialAnalyzerTest/NoDiagnosticsAreReturned_ForUseOfHtmlPartialAsync.cs
rename to src/Mvc/test/Mvc.Analyzers.Test/TestFiles/AvoidHtmlPartialAnalyzerTest/NoDiagnosticsAreReturned_ForUseOfHtmlPartialAsync.cs
diff --git a/test/Mvc.Analyzers.Test/TestFiles/AvoidHtmlPartialAnalyzerTest/NoDiagnosticsAreReturned_ForUseOfRenderPartialAsync.cs b/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/AvoidHtmlPartialAnalyzerTest/NoDiagnosticsAreReturned_ForUseOfRenderPartialAsync.cs
similarity index 100%
rename from test/Mvc.Analyzers.Test/TestFiles/AvoidHtmlPartialAnalyzerTest/NoDiagnosticsAreReturned_ForUseOfRenderPartialAsync.cs
rename to src/Mvc/test/Mvc.Analyzers.Test/TestFiles/AvoidHtmlPartialAnalyzerTest/NoDiagnosticsAreReturned_ForUseOfRenderPartialAsync.cs
diff --git a/test/Mvc.Analyzers.Test/TestFiles/CodeAnalysisExtensionsTest/GetAttributes_BaseTypeWithAttributes.cs b/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/CodeAnalysisExtensionsTest/GetAttributes_BaseTypeWithAttributes.cs
similarity index 100%
rename from test/Mvc.Analyzers.Test/TestFiles/CodeAnalysisExtensionsTest/GetAttributes_BaseTypeWithAttributes.cs
rename to src/Mvc/test/Mvc.Analyzers.Test/TestFiles/CodeAnalysisExtensionsTest/GetAttributes_BaseTypeWithAttributes.cs
diff --git a/test/Mvc.Analyzers.Test/TestFiles/CodeAnalysisExtensionsTest/GetAttributes_OnMethodWithoutAttributes.cs b/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/CodeAnalysisExtensionsTest/GetAttributes_OnMethodWithoutAttributes.cs
similarity index 100%
rename from test/Mvc.Analyzers.Test/TestFiles/CodeAnalysisExtensionsTest/GetAttributes_OnMethodWithoutAttributes.cs
rename to src/Mvc/test/Mvc.Analyzers.Test/TestFiles/CodeAnalysisExtensionsTest/GetAttributes_OnMethodWithoutAttributes.cs
diff --git a/test/Mvc.Analyzers.Test/TestFiles/CodeAnalysisExtensionsTest/GetAttributes_OnTypeWithAttributes.cs b/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/CodeAnalysisExtensionsTest/GetAttributes_OnTypeWithAttributes.cs
similarity index 100%
rename from test/Mvc.Analyzers.Test/TestFiles/CodeAnalysisExtensionsTest/GetAttributes_OnTypeWithAttributes.cs
rename to src/Mvc/test/Mvc.Analyzers.Test/TestFiles/CodeAnalysisExtensionsTest/GetAttributes_OnTypeWithAttributes.cs
diff --git a/test/Mvc.Analyzers.Test/TestFiles/CodeAnalysisExtensionsTest/GetAttributes_OnTypeWithoutAttributes.cs b/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/CodeAnalysisExtensionsTest/GetAttributes_OnTypeWithoutAttributes.cs
similarity index 100%
rename from test/Mvc.Analyzers.Test/TestFiles/CodeAnalysisExtensionsTest/GetAttributes_OnTypeWithoutAttributes.cs
rename to src/Mvc/test/Mvc.Analyzers.Test/TestFiles/CodeAnalysisExtensionsTest/GetAttributes_OnTypeWithoutAttributes.cs
diff --git a/test/Mvc.Analyzers.Test/TestFiles/CodeAnalysisExtensionsTest/GetAttributes_WithMethodOverridding.cs b/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/CodeAnalysisExtensionsTest/GetAttributes_WithMethodOverridding.cs
similarity index 100%
rename from test/Mvc.Analyzers.Test/TestFiles/CodeAnalysisExtensionsTest/GetAttributes_WithMethodOverridding.cs
rename to src/Mvc/test/Mvc.Analyzers.Test/TestFiles/CodeAnalysisExtensionsTest/GetAttributes_WithMethodOverridding.cs
diff --git a/test/Mvc.Analyzers.Test/TestFiles/CodeAnalysisExtensionsTest/GetAttributes_WithNewMethod.cs b/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/CodeAnalysisExtensionsTest/GetAttributes_WithNewMethod.cs
similarity index 100%
rename from test/Mvc.Analyzers.Test/TestFiles/CodeAnalysisExtensionsTest/GetAttributes_WithNewMethod.cs
rename to src/Mvc/test/Mvc.Analyzers.Test/TestFiles/CodeAnalysisExtensionsTest/GetAttributes_WithNewMethod.cs
diff --git a/test/Mvc.Analyzers.Test/TestFiles/CodeAnalysisExtensionsTest/GetAttributes_WithoutMethodOverriding.cs b/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/CodeAnalysisExtensionsTest/GetAttributes_WithoutMethodOverriding.cs
similarity index 100%
rename from test/Mvc.Analyzers.Test/TestFiles/CodeAnalysisExtensionsTest/GetAttributes_WithoutMethodOverriding.cs
rename to src/Mvc/test/Mvc.Analyzers.Test/TestFiles/CodeAnalysisExtensionsTest/GetAttributes_WithoutMethodOverriding.cs
diff --git a/test/Mvc.Analyzers.Test/TestFiles/CodeAnalysisExtensionsTest/HasAttribute_ReturnsFalseIfSymbolDoesNotHaveAttribute.cs b/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/CodeAnalysisExtensionsTest/HasAttribute_ReturnsFalseIfSymbolDoesNotHaveAttribute.cs
similarity index 100%
rename from test/Mvc.Analyzers.Test/TestFiles/CodeAnalysisExtensionsTest/HasAttribute_ReturnsFalseIfSymbolDoesNotHaveAttribute.cs
rename to src/Mvc/test/Mvc.Analyzers.Test/TestFiles/CodeAnalysisExtensionsTest/HasAttribute_ReturnsFalseIfSymbolDoesNotHaveAttribute.cs
diff --git a/test/Mvc.Analyzers.Test/TestFiles/CodeAnalysisExtensionsTest/HasAttribute_ReturnsTrueForAttributesOnMethods.cs b/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/CodeAnalysisExtensionsTest/HasAttribute_ReturnsTrueForAttributesOnMethods.cs
similarity index 100%
rename from test/Mvc.Analyzers.Test/TestFiles/CodeAnalysisExtensionsTest/HasAttribute_ReturnsTrueForAttributesOnMethods.cs
rename to src/Mvc/test/Mvc.Analyzers.Test/TestFiles/CodeAnalysisExtensionsTest/HasAttribute_ReturnsTrueForAttributesOnMethods.cs
diff --git a/test/Mvc.Analyzers.Test/TestFiles/CodeAnalysisExtensionsTest/HasAttribute_ReturnsTrueForAttributesOnOverriddenMethods.cs b/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/CodeAnalysisExtensionsTest/HasAttribute_ReturnsTrueForAttributesOnOverriddenMethods.cs
similarity index 100%
rename from test/Mvc.Analyzers.Test/TestFiles/CodeAnalysisExtensionsTest/HasAttribute_ReturnsTrueForAttributesOnOverriddenMethods.cs
rename to src/Mvc/test/Mvc.Analyzers.Test/TestFiles/CodeAnalysisExtensionsTest/HasAttribute_ReturnsTrueForAttributesOnOverriddenMethods.cs
diff --git a/test/Mvc.Analyzers.Test/TestFiles/CodeAnalysisExtensionsTest/HasAttribute_ReturnsTrueForAttributesOnOverridenProperties.cs b/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/CodeAnalysisExtensionsTest/HasAttribute_ReturnsTrueForAttributesOnOverridenProperties.cs
similarity index 100%
rename from test/Mvc.Analyzers.Test/TestFiles/CodeAnalysisExtensionsTest/HasAttribute_ReturnsTrueForAttributesOnOverridenProperties.cs
rename to src/Mvc/test/Mvc.Analyzers.Test/TestFiles/CodeAnalysisExtensionsTest/HasAttribute_ReturnsTrueForAttributesOnOverridenProperties.cs
diff --git a/test/Mvc.Analyzers.Test/TestFiles/CodeAnalysisExtensionsTest/HasAttribute_ReturnsTrueForAttributesOnProperties.cs b/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/CodeAnalysisExtensionsTest/HasAttribute_ReturnsTrueForAttributesOnProperties.cs
similarity index 100%
rename from test/Mvc.Analyzers.Test/TestFiles/CodeAnalysisExtensionsTest/HasAttribute_ReturnsTrueForAttributesOnProperties.cs
rename to src/Mvc/test/Mvc.Analyzers.Test/TestFiles/CodeAnalysisExtensionsTest/HasAttribute_ReturnsTrueForAttributesOnProperties.cs
diff --git a/test/Mvc.Analyzers.Test/TestFiles/CodeAnalysisExtensionsTest/HasAttribute_ReturnsTrueForInterfaceContractOnAttribute.cs b/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/CodeAnalysisExtensionsTest/HasAttribute_ReturnsTrueForInterfaceContractOnAttribute.cs
similarity index 100%
rename from test/Mvc.Analyzers.Test/TestFiles/CodeAnalysisExtensionsTest/HasAttribute_ReturnsTrueForInterfaceContractOnAttribute.cs
rename to src/Mvc/test/Mvc.Analyzers.Test/TestFiles/CodeAnalysisExtensionsTest/HasAttribute_ReturnsTrueForInterfaceContractOnAttribute.cs
diff --git a/test/Mvc.Analyzers.Test/TestFiles/CodeAnalysisExtensionsTest/HasAttribute_ReturnsTrueIfBaseTypeHasAttribute.cs b/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/CodeAnalysisExtensionsTest/HasAttribute_ReturnsTrueIfBaseTypeHasAttribute.cs
similarity index 100%
rename from test/Mvc.Analyzers.Test/TestFiles/CodeAnalysisExtensionsTest/HasAttribute_ReturnsTrueIfBaseTypeHasAttribute.cs
rename to src/Mvc/test/Mvc.Analyzers.Test/TestFiles/CodeAnalysisExtensionsTest/HasAttribute_ReturnsTrueIfBaseTypeHasAttribute.cs
diff --git a/test/Mvc.Analyzers.Test/TestFiles/CodeAnalysisExtensionsTest/HasAttribute_ReturnsTrueIfTypeHasAttribute.cs b/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/CodeAnalysisExtensionsTest/HasAttribute_ReturnsTrueIfTypeHasAttribute.cs
similarity index 100%
rename from test/Mvc.Analyzers.Test/TestFiles/CodeAnalysisExtensionsTest/HasAttribute_ReturnsTrueIfTypeHasAttribute.cs
rename to src/Mvc/test/Mvc.Analyzers.Test/TestFiles/CodeAnalysisExtensionsTest/HasAttribute_ReturnsTrueIfTypeHasAttribute.cs
diff --git a/test/Mvc.Analyzers.Test/TestFiles/CodeAnalysisExtensionsTest/IsAssignable_ReturnsFalseForDifferentTypes.cs b/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/CodeAnalysisExtensionsTest/IsAssignable_ReturnsFalseForDifferentTypes.cs
similarity index 100%
rename from test/Mvc.Analyzers.Test/TestFiles/CodeAnalysisExtensionsTest/IsAssignable_ReturnsFalseForDifferentTypes.cs
rename to src/Mvc/test/Mvc.Analyzers.Test/TestFiles/CodeAnalysisExtensionsTest/IsAssignable_ReturnsFalseForDifferentTypes.cs
diff --git a/test/Mvc.Analyzers.Test/TestFiles/CodeAnalysisExtensionsTest/IsAssignable_ReturnsTrueIfAncestorTypeImplementsInterface.cs b/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/CodeAnalysisExtensionsTest/IsAssignable_ReturnsTrueIfAncestorTypeImplementsInterface.cs
similarity index 100%
rename from test/Mvc.Analyzers.Test/TestFiles/CodeAnalysisExtensionsTest/IsAssignable_ReturnsTrueIfAncestorTypeImplementsInterface.cs
rename to src/Mvc/test/Mvc.Analyzers.Test/TestFiles/CodeAnalysisExtensionsTest/IsAssignable_ReturnsTrueIfAncestorTypeImplementsInterface.cs
diff --git a/test/Mvc.Analyzers.Test/TestFiles/CodeAnalysisExtensionsTest/IsAssignable_ReturnsTrueIfTypeImplementsInterface.cs b/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/CodeAnalysisExtensionsTest/IsAssignable_ReturnsTrueIfTypeImplementsInterface.cs
similarity index 100%
rename from test/Mvc.Analyzers.Test/TestFiles/CodeAnalysisExtensionsTest/IsAssignable_ReturnsTrueIfTypeImplementsInterface.cs
rename to src/Mvc/test/Mvc.Analyzers.Test/TestFiles/CodeAnalysisExtensionsTest/IsAssignable_ReturnsTrueIfTypeImplementsInterface.cs
diff --git a/test/Mvc.Analyzers.Test/TestFiles/CodeAnalysisExtensionsTest/IsAssignable_ReturnsTrueIfTypeIsBaseClass.cs b/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/CodeAnalysisExtensionsTest/IsAssignable_ReturnsTrueIfTypeIsBaseClass.cs
similarity index 100%
rename from test/Mvc.Analyzers.Test/TestFiles/CodeAnalysisExtensionsTest/IsAssignable_ReturnsTrueIfTypeIsBaseClass.cs
rename to src/Mvc/test/Mvc.Analyzers.Test/TestFiles/CodeAnalysisExtensionsTest/IsAssignable_ReturnsTrueIfTypeIsBaseClass.cs
diff --git a/test/Mvc.Analyzers.Test/TestFiles/CodeAnalysisExtensionsTest/IsAssignable_ReturnsTrueIfTypesAreExact.cs b/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/CodeAnalysisExtensionsTest/IsAssignable_ReturnsTrueIfTypesAreExact.cs
similarity index 100%
rename from test/Mvc.Analyzers.Test/TestFiles/CodeAnalysisExtensionsTest/IsAssignable_ReturnsTrueIfTypesAreExact.cs
rename to src/Mvc/test/Mvc.Analyzers.Test/TestFiles/CodeAnalysisExtensionsTest/IsAssignable_ReturnsTrueIfTypesAreExact.cs
diff --git a/test/Mvc.Analyzers.Test/TestFiles/TopLevelParameterNameAnalyzerTest/DiagnosticsAreReturned_ForControllerActionsWithParametersThatMatchProperties.cs b/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/TopLevelParameterNameAnalyzerTest/DiagnosticsAreReturned_ForControllerActionsWithParametersThatMatchProperties.cs
similarity index 100%
rename from test/Mvc.Analyzers.Test/TestFiles/TopLevelParameterNameAnalyzerTest/DiagnosticsAreReturned_ForControllerActionsWithParametersThatMatchProperties.cs
rename to src/Mvc/test/Mvc.Analyzers.Test/TestFiles/TopLevelParameterNameAnalyzerTest/DiagnosticsAreReturned_ForControllerActionsWithParametersThatMatchProperties.cs
diff --git a/test/Mvc.Analyzers.Test/TestFiles/TopLevelParameterNameAnalyzerTest/DiagnosticsAreReturned_ForModelBoundParameters.cs b/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/TopLevelParameterNameAnalyzerTest/DiagnosticsAreReturned_ForModelBoundParameters.cs
similarity index 100%
rename from test/Mvc.Analyzers.Test/TestFiles/TopLevelParameterNameAnalyzerTest/DiagnosticsAreReturned_ForModelBoundParameters.cs
rename to src/Mvc/test/Mvc.Analyzers.Test/TestFiles/TopLevelParameterNameAnalyzerTest/DiagnosticsAreReturned_ForModelBoundParameters.cs
diff --git a/test/Mvc.Analyzers.Test/TestFiles/TopLevelParameterNameAnalyzerTest/DiagnosticsAreReturned_IfModelNameProviderIsUsedToModifyParameterName.cs b/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/TopLevelParameterNameAnalyzerTest/DiagnosticsAreReturned_IfModelNameProviderIsUsedToModifyParameterName.cs
similarity index 100%
rename from test/Mvc.Analyzers.Test/TestFiles/TopLevelParameterNameAnalyzerTest/DiagnosticsAreReturned_IfModelNameProviderIsUsedToModifyParameterName.cs
rename to src/Mvc/test/Mvc.Analyzers.Test/TestFiles/TopLevelParameterNameAnalyzerTest/DiagnosticsAreReturned_IfModelNameProviderIsUsedToModifyParameterName.cs
diff --git a/test/Mvc.Analyzers.Test/TestFiles/TopLevelParameterNameAnalyzerTest/GetNameTests.cs b/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/TopLevelParameterNameAnalyzerTest/GetNameTests.cs
similarity index 100%
rename from test/Mvc.Analyzers.Test/TestFiles/TopLevelParameterNameAnalyzerTest/GetNameTests.cs
rename to src/Mvc/test/Mvc.Analyzers.Test/TestFiles/TopLevelParameterNameAnalyzerTest/GetNameTests.cs
diff --git a/test/Mvc.Analyzers.Test/TestFiles/TopLevelParameterNameAnalyzerTest/IsProblematicParameter_IgnoresFields.cs b/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/TopLevelParameterNameAnalyzerTest/IsProblematicParameter_IgnoresFields.cs
similarity index 100%
rename from test/Mvc.Analyzers.Test/TestFiles/TopLevelParameterNameAnalyzerTest/IsProblematicParameter_IgnoresFields.cs
rename to src/Mvc/test/Mvc.Analyzers.Test/TestFiles/TopLevelParameterNameAnalyzerTest/IsProblematicParameter_IgnoresFields.cs
diff --git a/test/Mvc.Analyzers.Test/TestFiles/TopLevelParameterNameAnalyzerTest/IsProblematicParameter_IgnoresMethods.cs b/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/TopLevelParameterNameAnalyzerTest/IsProblematicParameter_IgnoresMethods.cs
similarity index 100%
rename from test/Mvc.Analyzers.Test/TestFiles/TopLevelParameterNameAnalyzerTest/IsProblematicParameter_IgnoresMethods.cs
rename to src/Mvc/test/Mvc.Analyzers.Test/TestFiles/TopLevelParameterNameAnalyzerTest/IsProblematicParameter_IgnoresMethods.cs
diff --git a/test/Mvc.Analyzers.Test/TestFiles/TopLevelParameterNameAnalyzerTest/IsProblematicParameter_IgnoresNonPublicProperties.cs b/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/TopLevelParameterNameAnalyzerTest/IsProblematicParameter_IgnoresNonPublicProperties.cs
similarity index 100%
rename from test/Mvc.Analyzers.Test/TestFiles/TopLevelParameterNameAnalyzerTest/IsProblematicParameter_IgnoresNonPublicProperties.cs
rename to src/Mvc/test/Mvc.Analyzers.Test/TestFiles/TopLevelParameterNameAnalyzerTest/IsProblematicParameter_IgnoresNonPublicProperties.cs
diff --git a/test/Mvc.Analyzers.Test/TestFiles/TopLevelParameterNameAnalyzerTest/IsProblematicParameter_IgnoresStaticProperties.cs b/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/TopLevelParameterNameAnalyzerTest/IsProblematicParameter_IgnoresStaticProperties.cs
similarity index 100%
rename from test/Mvc.Analyzers.Test/TestFiles/TopLevelParameterNameAnalyzerTest/IsProblematicParameter_IgnoresStaticProperties.cs
rename to src/Mvc/test/Mvc.Analyzers.Test/TestFiles/TopLevelParameterNameAnalyzerTest/IsProblematicParameter_IgnoresStaticProperties.cs
diff --git a/test/Mvc.Analyzers.Test/TestFiles/TopLevelParameterNameAnalyzerTest/IsProblematicParameter_ReturnsFalse_ForFromBodyParameter.cs b/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/TopLevelParameterNameAnalyzerTest/IsProblematicParameter_ReturnsFalse_ForFromBodyParameter.cs
similarity index 100%
rename from test/Mvc.Analyzers.Test/TestFiles/TopLevelParameterNameAnalyzerTest/IsProblematicParameter_ReturnsFalse_ForFromBodyParameter.cs
rename to src/Mvc/test/Mvc.Analyzers.Test/TestFiles/TopLevelParameterNameAnalyzerTest/IsProblematicParameter_ReturnsFalse_ForFromBodyParameter.cs
diff --git a/test/Mvc.Analyzers.Test/TestFiles/TopLevelParameterNameAnalyzerTest/IsProblematicParameter_ReturnsFalse_ForParametersWithCustomModelBinder.cs b/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/TopLevelParameterNameAnalyzerTest/IsProblematicParameter_ReturnsFalse_ForParametersWithCustomModelBinder.cs
similarity index 100%
rename from test/Mvc.Analyzers.Test/TestFiles/TopLevelParameterNameAnalyzerTest/IsProblematicParameter_ReturnsFalse_ForParametersWithCustomModelBinder.cs
rename to src/Mvc/test/Mvc.Analyzers.Test/TestFiles/TopLevelParameterNameAnalyzerTest/IsProblematicParameter_ReturnsFalse_ForParametersWithCustomModelBinder.cs
diff --git a/test/Mvc.Analyzers.Test/TestFiles/TopLevelParameterNameAnalyzerTest/IsProblematicParameter_ReturnsFalse_IfBindingSourceAttributeIsUsedToRenameParameter.cs b/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/TopLevelParameterNameAnalyzerTest/IsProblematicParameter_ReturnsFalse_IfBindingSourceAttributeIsUsedToRenameParameter.cs
similarity index 100%
rename from test/Mvc.Analyzers.Test/TestFiles/TopLevelParameterNameAnalyzerTest/IsProblematicParameter_ReturnsFalse_IfBindingSourceAttributeIsUsedToRenameParameter.cs
rename to src/Mvc/test/Mvc.Analyzers.Test/TestFiles/TopLevelParameterNameAnalyzerTest/IsProblematicParameter_ReturnsFalse_IfBindingSourceAttributeIsUsedToRenameParameter.cs
diff --git a/test/Mvc.Analyzers.Test/TestFiles/TopLevelParameterNameAnalyzerTest/IsProblematicParameter_ReturnsFalse_IfBindingSourceAttributeIsUsedToRenameProperty.cs b/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/TopLevelParameterNameAnalyzerTest/IsProblematicParameter_ReturnsFalse_IfBindingSourceAttributeIsUsedToRenameProperty.cs
similarity index 100%
rename from test/Mvc.Analyzers.Test/TestFiles/TopLevelParameterNameAnalyzerTest/IsProblematicParameter_ReturnsFalse_IfBindingSourceAttributeIsUsedToRenameProperty.cs
rename to src/Mvc/test/Mvc.Analyzers.Test/TestFiles/TopLevelParameterNameAnalyzerTest/IsProblematicParameter_ReturnsFalse_IfBindingSourceAttributeIsUsedToRenameProperty.cs
diff --git a/test/Mvc.Analyzers.Test/TestFiles/TopLevelParameterNameAnalyzerTest/IsProblematicParameter_ReturnsTrue_IfModelBinderAttributeIsUsedToRenameParameter.cs b/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/TopLevelParameterNameAnalyzerTest/IsProblematicParameter_ReturnsTrue_IfModelBinderAttributeIsUsedToRenameParameter.cs
similarity index 100%
rename from test/Mvc.Analyzers.Test/TestFiles/TopLevelParameterNameAnalyzerTest/IsProblematicParameter_ReturnsTrue_IfModelBinderAttributeIsUsedToRenameParameter.cs
rename to src/Mvc/test/Mvc.Analyzers.Test/TestFiles/TopLevelParameterNameAnalyzerTest/IsProblematicParameter_ReturnsTrue_IfModelBinderAttributeIsUsedToRenameParameter.cs
diff --git a/test/Mvc.Analyzers.Test/TestFiles/TopLevelParameterNameAnalyzerTest/IsProblematicParameter_ReturnsTrue_IfParameterNameIsTheSameAsModelProperty.cs b/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/TopLevelParameterNameAnalyzerTest/IsProblematicParameter_ReturnsTrue_IfParameterNameIsTheSameAsModelProperty.cs
similarity index 100%
rename from test/Mvc.Analyzers.Test/TestFiles/TopLevelParameterNameAnalyzerTest/IsProblematicParameter_ReturnsTrue_IfParameterNameIsTheSameAsModelProperty.cs
rename to src/Mvc/test/Mvc.Analyzers.Test/TestFiles/TopLevelParameterNameAnalyzerTest/IsProblematicParameter_ReturnsTrue_IfParameterNameIsTheSameAsModelProperty.cs
diff --git a/test/Mvc.Analyzers.Test/TestFiles/TopLevelParameterNameAnalyzerTest/IsProblematicParameter_ReturnsTrue_IfParameterNameWithBinderAttributeIsTheSameNameAsModelProperty.cs b/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/TopLevelParameterNameAnalyzerTest/IsProblematicParameter_ReturnsTrue_IfParameterNameWithBinderAttributeIsTheSameNameAsModelProperty.cs
similarity index 100%
rename from test/Mvc.Analyzers.Test/TestFiles/TopLevelParameterNameAnalyzerTest/IsProblematicParameter_ReturnsTrue_IfParameterNameWithBinderAttributeIsTheSameNameAsModelProperty.cs
rename to src/Mvc/test/Mvc.Analyzers.Test/TestFiles/TopLevelParameterNameAnalyzerTest/IsProblematicParameter_ReturnsTrue_IfParameterNameWithBinderAttributeIsTheSameNameAsModelProperty.cs
diff --git a/test/Mvc.Analyzers.Test/TestFiles/TopLevelParameterNameAnalyzerTest/IsProblematicParameter_ReturnsTrue_IfPropertyWithModelBindingAttributeHasSameNameAsParameter.cs b/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/TopLevelParameterNameAnalyzerTest/IsProblematicParameter_ReturnsTrue_IfPropertyWithModelBindingAttributeHasSameNameAsParameter.cs
similarity index 100%
rename from test/Mvc.Analyzers.Test/TestFiles/TopLevelParameterNameAnalyzerTest/IsProblematicParameter_ReturnsTrue_IfPropertyWithModelBindingAttributeHasSameNameAsParameter.cs
rename to src/Mvc/test/Mvc.Analyzers.Test/TestFiles/TopLevelParameterNameAnalyzerTest/IsProblematicParameter_ReturnsTrue_IfPropertyWithModelBindingAttributeHasSameNameAsParameter.cs
diff --git a/test/Mvc.Analyzers.Test/TestFiles/TopLevelParameterNameAnalyzerTest/NoDiagnosticsAreReturnedForApiControllers.cs b/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/TopLevelParameterNameAnalyzerTest/NoDiagnosticsAreReturnedForApiControllers.cs
similarity index 100%
rename from test/Mvc.Analyzers.Test/TestFiles/TopLevelParameterNameAnalyzerTest/NoDiagnosticsAreReturnedForApiControllers.cs
rename to src/Mvc/test/Mvc.Analyzers.Test/TestFiles/TopLevelParameterNameAnalyzerTest/NoDiagnosticsAreReturnedForApiControllers.cs
diff --git a/test/Mvc.Analyzers.Test/TestFiles/TopLevelParameterNameAnalyzerTest/NoDiagnosticsAreReturnedForNonActions.cs b/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/TopLevelParameterNameAnalyzerTest/NoDiagnosticsAreReturnedForNonActions.cs
similarity index 100%
rename from test/Mvc.Analyzers.Test/TestFiles/TopLevelParameterNameAnalyzerTest/NoDiagnosticsAreReturnedForNonActions.cs
rename to src/Mvc/test/Mvc.Analyzers.Test/TestFiles/TopLevelParameterNameAnalyzerTest/NoDiagnosticsAreReturnedForNonActions.cs
diff --git a/test/Mvc.Analyzers.Test/TestFiles/TopLevelParameterNameAnalyzerTest/NoDiagnosticsAreReturnedIfParameterIsRenamedUsingBindingAttribute.cs b/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/TopLevelParameterNameAnalyzerTest/NoDiagnosticsAreReturnedIfParameterIsRenamedUsingBindingAttribute.cs
similarity index 100%
rename from test/Mvc.Analyzers.Test/TestFiles/TopLevelParameterNameAnalyzerTest/NoDiagnosticsAreReturnedIfParameterIsRenamedUsingBindingAttribute.cs
rename to src/Mvc/test/Mvc.Analyzers.Test/TestFiles/TopLevelParameterNameAnalyzerTest/NoDiagnosticsAreReturnedIfParameterIsRenamedUsingBindingAttribute.cs
diff --git a/test/Mvc.Analyzers.Test/TestFiles/TopLevelParameterNameAnalyzerTest/SpecifiesModelTypeTests.cs b/src/Mvc/test/Mvc.Analyzers.Test/TestFiles/TopLevelParameterNameAnalyzerTest/SpecifiesModelTypeTests.cs
similarity index 100%
rename from test/Mvc.Analyzers.Test/TestFiles/TopLevelParameterNameAnalyzerTest/SpecifiesModelTypeTests.cs
rename to src/Mvc/test/Mvc.Analyzers.Test/TestFiles/TopLevelParameterNameAnalyzerTest/SpecifiesModelTypeTests.cs
diff --git a/test/Mvc.Analyzers.Test/TopLevelParameterNameAnalyzerTest.cs b/src/Mvc/test/Mvc.Analyzers.Test/TopLevelParameterNameAnalyzerTest.cs
similarity index 100%
rename from test/Mvc.Analyzers.Test/TopLevelParameterNameAnalyzerTest.cs
rename to src/Mvc/test/Mvc.Analyzers.Test/TopLevelParameterNameAnalyzerTest.cs
diff --git a/test/Mvc.Analyzers.Test/xunit.runner.json b/src/Mvc/test/Mvc.Analyzers.Test/xunit.runner.json
similarity index 100%
rename from test/Mvc.Analyzers.Test/xunit.runner.json
rename to src/Mvc/test/Mvc.Analyzers.Test/xunit.runner.json
diff --git a/test/Mvc.Api.Analyzers.Test/ActualApiResponseMetadataFactoryTest.cs b/src/Mvc/test/Mvc.Api.Analyzers.Test/ActualApiResponseMetadataFactoryTest.cs
similarity index 100%
rename from test/Mvc.Api.Analyzers.Test/ActualApiResponseMetadataFactoryTest.cs
rename to src/Mvc/test/Mvc.Api.Analyzers.Test/ActualApiResponseMetadataFactoryTest.cs
diff --git a/test/Mvc.Api.Analyzers.Test/AddResponseTypeAttributeCodeFixProviderIntegrationTest.cs b/src/Mvc/test/Mvc.Api.Analyzers.Test/AddResponseTypeAttributeCodeFixProviderIntegrationTest.cs
similarity index 100%
rename from test/Mvc.Api.Analyzers.Test/AddResponseTypeAttributeCodeFixProviderIntegrationTest.cs
rename to src/Mvc/test/Mvc.Api.Analyzers.Test/AddResponseTypeAttributeCodeFixProviderIntegrationTest.cs
diff --git a/test/Mvc.Api.Analyzers.Test/ApiActionsDoNotRequireExplicitModelValidationCheckAnalyzerIntegrationTest.cs b/src/Mvc/test/Mvc.Api.Analyzers.Test/ApiActionsDoNotRequireExplicitModelValidationCheckAnalyzerIntegrationTest.cs
similarity index 100%
rename from test/Mvc.Api.Analyzers.Test/ApiActionsDoNotRequireExplicitModelValidationCheckAnalyzerIntegrationTest.cs
rename to src/Mvc/test/Mvc.Api.Analyzers.Test/ApiActionsDoNotRequireExplicitModelValidationCheckAnalyzerIntegrationTest.cs
diff --git a/test/Mvc.Api.Analyzers.Test/ApiActionsDoNotRequireExplicitModelValidationCheckCodeFixProviderTest.cs b/src/Mvc/test/Mvc.Api.Analyzers.Test/ApiActionsDoNotRequireExplicitModelValidationCheckCodeFixProviderTest.cs
similarity index 100%
rename from test/Mvc.Api.Analyzers.Test/ApiActionsDoNotRequireExplicitModelValidationCheckCodeFixProviderTest.cs
rename to src/Mvc/test/Mvc.Api.Analyzers.Test/ApiActionsDoNotRequireExplicitModelValidationCheckCodeFixProviderTest.cs
diff --git a/test/Mvc.Api.Analyzers.Test/ApiControllerFactsTest.cs b/src/Mvc/test/Mvc.Api.Analyzers.Test/ApiControllerFactsTest.cs
similarity index 100%
rename from test/Mvc.Api.Analyzers.Test/ApiControllerFactsTest.cs
rename to src/Mvc/test/Mvc.Api.Analyzers.Test/ApiControllerFactsTest.cs
diff --git a/test/Mvc.Api.Analyzers.Test/ApiConventionAnalyzerIntegrationTest.cs b/src/Mvc/test/Mvc.Api.Analyzers.Test/ApiConventionAnalyzerIntegrationTest.cs
similarity index 100%
rename from test/Mvc.Api.Analyzers.Test/ApiConventionAnalyzerIntegrationTest.cs
rename to src/Mvc/test/Mvc.Api.Analyzers.Test/ApiConventionAnalyzerIntegrationTest.cs
diff --git a/test/Mvc.Api.Analyzers.Test/DeclaredApiResponseMetadataTest.cs b/src/Mvc/test/Mvc.Api.Analyzers.Test/DeclaredApiResponseMetadataTest.cs
similarity index 100%
rename from test/Mvc.Api.Analyzers.Test/DeclaredApiResponseMetadataTest.cs
rename to src/Mvc/test/Mvc.Api.Analyzers.Test/DeclaredApiResponseMetadataTest.cs
diff --git a/test/Mvc.Api.Analyzers.Test/Mvc.Api.Analyzers.Test.csproj b/src/Mvc/test/Mvc.Api.Analyzers.Test/Mvc.Api.Analyzers.Test.csproj
similarity index 100%
rename from test/Mvc.Api.Analyzers.Test/Mvc.Api.Analyzers.Test.csproj
rename to src/Mvc/test/Mvc.Api.Analyzers.Test/Mvc.Api.Analyzers.Test.csproj
diff --git a/test/Mvc.Api.Analyzers.Test/MvcFactsTest.cs b/src/Mvc/test/Mvc.Api.Analyzers.Test/MvcFactsTest.cs
similarity index 100%
rename from test/Mvc.Api.Analyzers.Test/MvcFactsTest.cs
rename to src/Mvc/test/Mvc.Api.Analyzers.Test/MvcFactsTest.cs
diff --git a/test/Mvc.Api.Analyzers.Test/SymbolApiConventionMatcherTest.cs b/src/Mvc/test/Mvc.Api.Analyzers.Test/SymbolApiConventionMatcherTest.cs
similarity index 100%
rename from test/Mvc.Api.Analyzers.Test/SymbolApiConventionMatcherTest.cs
rename to src/Mvc/test/Mvc.Api.Analyzers.Test/SymbolApiConventionMatcherTest.cs
diff --git a/test/Mvc.Api.Analyzers.Test/SymbolApiResponseMetadataProviderTest.cs b/src/Mvc/test/Mvc.Api.Analyzers.Test/SymbolApiResponseMetadataProviderTest.cs
similarity index 100%
rename from test/Mvc.Api.Analyzers.Test/SymbolApiResponseMetadataProviderTest.cs
rename to src/Mvc/test/Mvc.Api.Analyzers.Test/SymbolApiResponseMetadataProviderTest.cs
diff --git a/test/Mvc.Api.Analyzers.Test/TestFiles/ActualApiResponseMetadataFactoryTest/GetDefaultStatusCodeTest.cs b/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ActualApiResponseMetadataFactoryTest/GetDefaultStatusCodeTest.cs
similarity index 100%
rename from test/Mvc.Api.Analyzers.Test/TestFiles/ActualApiResponseMetadataFactoryTest/GetDefaultStatusCodeTest.cs
rename to src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ActualApiResponseMetadataFactoryTest/GetDefaultStatusCodeTest.cs
diff --git a/test/Mvc.Api.Analyzers.Test/TestFiles/ActualApiResponseMetadataFactoryTest/InspectReturnExpressionTests.cs b/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ActualApiResponseMetadataFactoryTest/InspectReturnExpressionTests.cs
similarity index 100%
rename from test/Mvc.Api.Analyzers.Test/TestFiles/ActualApiResponseMetadataFactoryTest/InspectReturnExpressionTests.cs
rename to src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ActualApiResponseMetadataFactoryTest/InspectReturnExpressionTests.cs
diff --git a/test/Mvc.Api.Analyzers.Test/TestFiles/ActualApiResponseMetadataFactoryTest/TryGetActualResponseMetadataTests.cs b/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ActualApiResponseMetadataFactoryTest/TryGetActualResponseMetadataTests.cs
similarity index 100%
rename from test/Mvc.Api.Analyzers.Test/TestFiles/ActualApiResponseMetadataFactoryTest/TryGetActualResponseMetadataTests.cs
rename to src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ActualApiResponseMetadataFactoryTest/TryGetActualResponseMetadataTests.cs
diff --git a/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsFullyQualifiedProducesResponseType.Input.cs b/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsFullyQualifiedProducesResponseType.Input.cs
similarity index 100%
rename from test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsFullyQualifiedProducesResponseType.Input.cs
rename to src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsFullyQualifiedProducesResponseType.Input.cs
diff --git a/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsFullyQualifiedProducesResponseType.Output.cs b/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsFullyQualifiedProducesResponseType.Output.cs
similarity index 100%
rename from test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsFullyQualifiedProducesResponseType.Output.cs
rename to src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsFullyQualifiedProducesResponseType.Output.cs
diff --git a/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsMissingStatusCodes.Input.cs b/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsMissingStatusCodes.Input.cs
similarity index 100%
rename from test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsMissingStatusCodes.Input.cs
rename to src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsMissingStatusCodes.Input.cs
diff --git a/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsMissingStatusCodes.Output.cs b/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsMissingStatusCodes.Output.cs
similarity index 100%
rename from test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsMissingStatusCodes.Output.cs
rename to src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsMissingStatusCodes.Output.cs
diff --git a/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsMissingStatusCodesAndTypes.Input.cs b/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsMissingStatusCodesAndTypes.Input.cs
similarity index 100%
rename from test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsMissingStatusCodesAndTypes.Input.cs
rename to src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsMissingStatusCodesAndTypes.Input.cs
diff --git a/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsMissingStatusCodesAndTypes.Output.cs b/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsMissingStatusCodesAndTypes.Output.cs
similarity index 100%
rename from test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsMissingStatusCodesAndTypes.Output.cs
rename to src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsMissingStatusCodesAndTypes.Output.cs
diff --git a/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsNumericLiteralForNonExistingStatusCodeConstants.Input.cs b/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsNumericLiteralForNonExistingStatusCodeConstants.Input.cs
similarity index 100%
rename from test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsNumericLiteralForNonExistingStatusCodeConstants.Input.cs
rename to src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsNumericLiteralForNonExistingStatusCodeConstants.Input.cs
diff --git a/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsNumericLiteralForNonExistingStatusCodeConstants.Output.cs b/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsNumericLiteralForNonExistingStatusCodeConstants.Output.cs
similarity index 100%
rename from test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsNumericLiteralForNonExistingStatusCodeConstants.Output.cs
rename to src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsNumericLiteralForNonExistingStatusCodeConstants.Output.cs
diff --git a/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsResponseTypeWhenDifferentFromErrorType.Input.cs b/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsResponseTypeWhenDifferentFromErrorType.Input.cs
similarity index 100%
rename from test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsResponseTypeWhenDifferentFromErrorType.Input.cs
rename to src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsResponseTypeWhenDifferentFromErrorType.Input.cs
diff --git a/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsResponseTypeWhenDifferentFromErrorType.Output.cs b/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsResponseTypeWhenDifferentFromErrorType.Output.cs
similarity index 100%
rename from test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsResponseTypeWhenDifferentFromErrorType.Output.cs
rename to src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsResponseTypeWhenDifferentFromErrorType.Output.cs
diff --git a/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsStatusCodes.Input.cs b/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsStatusCodes.Input.cs
similarity index 100%
rename from test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsStatusCodes.Input.cs
rename to src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsStatusCodes.Input.cs
diff --git a/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsStatusCodes.Output.cs b/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsStatusCodes.Output.cs
similarity index 100%
rename from test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsStatusCodes.Output.cs
rename to src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsStatusCodes.Output.cs
diff --git a/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsStatusCodesFromConstructorParameters.Input.cs b/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsStatusCodesFromConstructorParameters.Input.cs
similarity index 100%
rename from test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsStatusCodesFromConstructorParameters.Input.cs
rename to src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsStatusCodesFromConstructorParameters.Input.cs
diff --git a/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsStatusCodesFromConstructorParameters.Output.cs b/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsStatusCodesFromConstructorParameters.Output.cs
similarity index 100%
rename from test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsStatusCodesFromConstructorParameters.Output.cs
rename to src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsStatusCodesFromConstructorParameters.Output.cs
diff --git a/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsStatusCodesFromMethodParameters.Input.cs b/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsStatusCodesFromMethodParameters.Input.cs
similarity index 100%
rename from test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsStatusCodesFromMethodParameters.Input.cs
rename to src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsStatusCodesFromMethodParameters.Input.cs
diff --git a/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsStatusCodesFromMethodParameters.Output.cs b/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsStatusCodesFromMethodParameters.Output.cs
similarity index 100%
rename from test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsStatusCodesFromMethodParameters.Output.cs
rename to src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsStatusCodesFromMethodParameters.Output.cs
diff --git a/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsStatusCodesFromObjectInitializer.Input.cs b/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsStatusCodesFromObjectInitializer.Input.cs
similarity index 100%
rename from test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsStatusCodesFromObjectInitializer.Input.cs
rename to src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsStatusCodesFromObjectInitializer.Input.cs
diff --git a/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsStatusCodesFromObjectInitializer.Output.cs b/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsStatusCodesFromObjectInitializer.Output.cs
similarity index 100%
rename from test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsStatusCodesFromObjectInitializer.Output.cs
rename to src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsStatusCodesFromObjectInitializer.Output.cs
diff --git a/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsSuccessStatusCode.Input.cs b/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsSuccessStatusCode.Input.cs
similarity index 100%
rename from test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsSuccessStatusCode.Input.cs
rename to src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsSuccessStatusCode.Input.cs
diff --git a/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsSuccessStatusCode.Output.cs b/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsSuccessStatusCode.Output.cs
similarity index 100%
rename from test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsSuccessStatusCode.Output.cs
rename to src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixAddsSuccessStatusCode.Output.cs
diff --git a/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixWithConventionAddsMissingStatusCodes.Input.cs b/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixWithConventionAddsMissingStatusCodes.Input.cs
similarity index 100%
rename from test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixWithConventionAddsMissingStatusCodes.Input.cs
rename to src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixWithConventionAddsMissingStatusCodes.Input.cs
diff --git a/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixWithConventionAddsMissingStatusCodes.Output.cs b/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixWithConventionAddsMissingStatusCodes.Output.cs
similarity index 100%
rename from test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixWithConventionAddsMissingStatusCodes.Output.cs
rename to src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixWithConventionAddsMissingStatusCodes.Output.cs
diff --git a/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixWithConventionMethodAddsMissingStatusCodes.Input.cs b/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixWithConventionMethodAddsMissingStatusCodes.Input.cs
similarity index 100%
rename from test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixWithConventionMethodAddsMissingStatusCodes.Input.cs
rename to src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixWithConventionMethodAddsMissingStatusCodes.Input.cs
diff --git a/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixWithConventionMethodAddsMissingStatusCodes.Output.cs b/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixWithConventionMethodAddsMissingStatusCodes.Output.cs
similarity index 100%
rename from test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixWithConventionMethodAddsMissingStatusCodes.Output.cs
rename to src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/AddResponseTypeAttributeCodeFixProviderIntegrationTest/CodeFixWithConventionMethodAddsMissingStatusCodes.Output.cs
diff --git a/test/Mvc.Api.Analyzers.Test/TestFiles/ApiActionsDoNotRequireExplicitModelValidationCheckAnalyzerIntegrationTest/DiagnosticsAreReturned_ForApiActionsWithModelStateChecks.cs b/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiActionsDoNotRequireExplicitModelValidationCheckAnalyzerIntegrationTest/DiagnosticsAreReturned_ForApiActionsWithModelStateChecks.cs
similarity index 100%
rename from test/Mvc.Api.Analyzers.Test/TestFiles/ApiActionsDoNotRequireExplicitModelValidationCheckAnalyzerIntegrationTest/DiagnosticsAreReturned_ForApiActionsWithModelStateChecks.cs
rename to src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiActionsDoNotRequireExplicitModelValidationCheckAnalyzerIntegrationTest/DiagnosticsAreReturned_ForApiActionsWithModelStateChecks.cs
diff --git a/test/Mvc.Api.Analyzers.Test/TestFiles/ApiActionsDoNotRequireExplicitModelValidationCheckAnalyzerIntegrationTest/DiagnosticsAreReturned_ForApiActionsWithModelStateChecksUsingEquality.cs b/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiActionsDoNotRequireExplicitModelValidationCheckAnalyzerIntegrationTest/DiagnosticsAreReturned_ForApiActionsWithModelStateChecksUsingEquality.cs
similarity index 100%
rename from test/Mvc.Api.Analyzers.Test/TestFiles/ApiActionsDoNotRequireExplicitModelValidationCheckAnalyzerIntegrationTest/DiagnosticsAreReturned_ForApiActionsWithModelStateChecksUsingEquality.cs
rename to src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiActionsDoNotRequireExplicitModelValidationCheckAnalyzerIntegrationTest/DiagnosticsAreReturned_ForApiActionsWithModelStateChecksUsingEquality.cs
diff --git a/test/Mvc.Api.Analyzers.Test/TestFiles/ApiActionsDoNotRequireExplicitModelValidationCheckAnalyzerIntegrationTest/DiagnosticsAreReturned_ForApiActionsWithModelStateChecksWithoutBracing.cs b/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiActionsDoNotRequireExplicitModelValidationCheckAnalyzerIntegrationTest/DiagnosticsAreReturned_ForApiActionsWithModelStateChecksWithoutBracing.cs
similarity index 100%
rename from test/Mvc.Api.Analyzers.Test/TestFiles/ApiActionsDoNotRequireExplicitModelValidationCheckAnalyzerIntegrationTest/DiagnosticsAreReturned_ForApiActionsWithModelStateChecksWithoutBracing.cs
rename to src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiActionsDoNotRequireExplicitModelValidationCheckAnalyzerIntegrationTest/DiagnosticsAreReturned_ForApiActionsWithModelStateChecksWithoutBracing.cs
diff --git a/test/Mvc.Api.Analyzers.Test/TestFiles/ApiActionsDoNotRequireExplicitModelValidationCheckAnalyzerIntegrationTest/NoDiagnosticsAreReturned_ForApiActionsCheckingAdditionalConditions.cs b/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiActionsDoNotRequireExplicitModelValidationCheckAnalyzerIntegrationTest/NoDiagnosticsAreReturned_ForApiActionsCheckingAdditionalConditions.cs
similarity index 100%
rename from test/Mvc.Api.Analyzers.Test/TestFiles/ApiActionsDoNotRequireExplicitModelValidationCheckAnalyzerIntegrationTest/NoDiagnosticsAreReturned_ForApiActionsCheckingAdditionalConditions.cs
rename to src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiActionsDoNotRequireExplicitModelValidationCheckAnalyzerIntegrationTest/NoDiagnosticsAreReturned_ForApiActionsCheckingAdditionalConditions.cs
diff --git a/test/Mvc.Api.Analyzers.Test/TestFiles/ApiActionsDoNotRequireExplicitModelValidationCheckAnalyzerIntegrationTest/NoDiagnosticsAreReturned_ForApiActionsReturning400FromNonModelStateIsValidBlocks.cs b/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiActionsDoNotRequireExplicitModelValidationCheckAnalyzerIntegrationTest/NoDiagnosticsAreReturned_ForApiActionsReturning400FromNonModelStateIsValidBlocks.cs
similarity index 100%
rename from test/Mvc.Api.Analyzers.Test/TestFiles/ApiActionsDoNotRequireExplicitModelValidationCheckAnalyzerIntegrationTest/NoDiagnosticsAreReturned_ForApiActionsReturning400FromNonModelStateIsValidBlocks.cs
rename to src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiActionsDoNotRequireExplicitModelValidationCheckAnalyzerIntegrationTest/NoDiagnosticsAreReturned_ForApiActionsReturning400FromNonModelStateIsValidBlocks.cs
diff --git a/test/Mvc.Api.Analyzers.Test/TestFiles/ApiActionsDoNotRequireExplicitModelValidationCheckAnalyzerIntegrationTest/NoDiagnosticsAreReturned_ForApiActionsReturningNot400FromNonModelStateIsValidBlock.cs b/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiActionsDoNotRequireExplicitModelValidationCheckAnalyzerIntegrationTest/NoDiagnosticsAreReturned_ForApiActionsReturningNot400FromNonModelStateIsValidBlock.cs
similarity index 100%
rename from test/Mvc.Api.Analyzers.Test/TestFiles/ApiActionsDoNotRequireExplicitModelValidationCheckAnalyzerIntegrationTest/NoDiagnosticsAreReturned_ForApiActionsReturningNot400FromNonModelStateIsValidBlock.cs
rename to src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiActionsDoNotRequireExplicitModelValidationCheckAnalyzerIntegrationTest/NoDiagnosticsAreReturned_ForApiActionsReturningNot400FromNonModelStateIsValidBlock.cs
diff --git a/test/Mvc.Api.Analyzers.Test/TestFiles/ApiActionsDoNotRequireExplicitModelValidationCheckAnalyzerIntegrationTest/NoDiagnosticsAreReturned_ForApiActionsWithoutModelStateChecks.cs b/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiActionsDoNotRequireExplicitModelValidationCheckAnalyzerIntegrationTest/NoDiagnosticsAreReturned_ForApiActionsWithoutModelStateChecks.cs
similarity index 100%
rename from test/Mvc.Api.Analyzers.Test/TestFiles/ApiActionsDoNotRequireExplicitModelValidationCheckAnalyzerIntegrationTest/NoDiagnosticsAreReturned_ForApiActionsWithoutModelStateChecks.cs
rename to src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiActionsDoNotRequireExplicitModelValidationCheckAnalyzerIntegrationTest/NoDiagnosticsAreReturned_ForApiActionsWithoutModelStateChecks.cs
diff --git a/test/Mvc.Api.Analyzers.Test/TestFiles/ApiActionsDoNotRequireExplicitModelValidationCheckAnalyzerIntegrationTest/NoDiagnosticsAreReturned_ForNonApiController.cs b/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiActionsDoNotRequireExplicitModelValidationCheckAnalyzerIntegrationTest/NoDiagnosticsAreReturned_ForNonApiController.cs
similarity index 100%
rename from test/Mvc.Api.Analyzers.Test/TestFiles/ApiActionsDoNotRequireExplicitModelValidationCheckAnalyzerIntegrationTest/NoDiagnosticsAreReturned_ForNonApiController.cs
rename to src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiActionsDoNotRequireExplicitModelValidationCheckAnalyzerIntegrationTest/NoDiagnosticsAreReturned_ForNonApiController.cs
diff --git a/test/Mvc.Api.Analyzers.Test/TestFiles/ApiActionsDoNotRequireExplicitModelValidationCheckAnalyzerIntegrationTest/NoDiagnosticsAreReturned_ForRazorPageModels.cs b/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiActionsDoNotRequireExplicitModelValidationCheckAnalyzerIntegrationTest/NoDiagnosticsAreReturned_ForRazorPageModels.cs
similarity index 100%
rename from test/Mvc.Api.Analyzers.Test/TestFiles/ApiActionsDoNotRequireExplicitModelValidationCheckAnalyzerIntegrationTest/NoDiagnosticsAreReturned_ForRazorPageModels.cs
rename to src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiActionsDoNotRequireExplicitModelValidationCheckAnalyzerIntegrationTest/NoDiagnosticsAreReturned_ForRazorPageModels.cs
diff --git a/test/Mvc.Api.Analyzers.Test/TestFiles/ApiActionsDoNotRequireExplicitModelValidationCheckCodeFixProviderTest/CodeFixRemovesIfBlockWithoutBraces.Input.cs b/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiActionsDoNotRequireExplicitModelValidationCheckCodeFixProviderTest/CodeFixRemovesIfBlockWithoutBraces.Input.cs
similarity index 100%
rename from test/Mvc.Api.Analyzers.Test/TestFiles/ApiActionsDoNotRequireExplicitModelValidationCheckCodeFixProviderTest/CodeFixRemovesIfBlockWithoutBraces.Input.cs
rename to src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiActionsDoNotRequireExplicitModelValidationCheckCodeFixProviderTest/CodeFixRemovesIfBlockWithoutBraces.Input.cs
diff --git a/test/Mvc.Api.Analyzers.Test/TestFiles/ApiActionsDoNotRequireExplicitModelValidationCheckCodeFixProviderTest/CodeFixRemovesIfBlockWithoutBraces.Output.cs b/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiActionsDoNotRequireExplicitModelValidationCheckCodeFixProviderTest/CodeFixRemovesIfBlockWithoutBraces.Output.cs
similarity index 100%
rename from test/Mvc.Api.Analyzers.Test/TestFiles/ApiActionsDoNotRequireExplicitModelValidationCheckCodeFixProviderTest/CodeFixRemovesIfBlockWithoutBraces.Output.cs
rename to src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiActionsDoNotRequireExplicitModelValidationCheckCodeFixProviderTest/CodeFixRemovesIfBlockWithoutBraces.Output.cs
diff --git a/test/Mvc.Api.Analyzers.Test/TestFiles/ApiActionsDoNotRequireExplicitModelValidationCheckCodeFixProviderTest/CodeFixRemovesModelStateIsInvalidBlockWithEqualityCheck.Input.cs b/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiActionsDoNotRequireExplicitModelValidationCheckCodeFixProviderTest/CodeFixRemovesModelStateIsInvalidBlockWithEqualityCheck.Input.cs
similarity index 100%
rename from test/Mvc.Api.Analyzers.Test/TestFiles/ApiActionsDoNotRequireExplicitModelValidationCheckCodeFixProviderTest/CodeFixRemovesModelStateIsInvalidBlockWithEqualityCheck.Input.cs
rename to src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiActionsDoNotRequireExplicitModelValidationCheckCodeFixProviderTest/CodeFixRemovesModelStateIsInvalidBlockWithEqualityCheck.Input.cs
diff --git a/test/Mvc.Api.Analyzers.Test/TestFiles/ApiActionsDoNotRequireExplicitModelValidationCheckCodeFixProviderTest/CodeFixRemovesModelStateIsInvalidBlockWithEqualityCheck.Output.cs b/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiActionsDoNotRequireExplicitModelValidationCheckCodeFixProviderTest/CodeFixRemovesModelStateIsInvalidBlockWithEqualityCheck.Output.cs
similarity index 100%
rename from test/Mvc.Api.Analyzers.Test/TestFiles/ApiActionsDoNotRequireExplicitModelValidationCheckCodeFixProviderTest/CodeFixRemovesModelStateIsInvalidBlockWithEqualityCheck.Output.cs
rename to src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiActionsDoNotRequireExplicitModelValidationCheckCodeFixProviderTest/CodeFixRemovesModelStateIsInvalidBlockWithEqualityCheck.Output.cs
diff --git a/test/Mvc.Api.Analyzers.Test/TestFiles/ApiActionsDoNotRequireExplicitModelValidationCheckCodeFixProviderTest/CodeFixRemovesModelStateIsInvalidBlockWithIfNotCheck.Input.cs b/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiActionsDoNotRequireExplicitModelValidationCheckCodeFixProviderTest/CodeFixRemovesModelStateIsInvalidBlockWithIfNotCheck.Input.cs
similarity index 100%
rename from test/Mvc.Api.Analyzers.Test/TestFiles/ApiActionsDoNotRequireExplicitModelValidationCheckCodeFixProviderTest/CodeFixRemovesModelStateIsInvalidBlockWithIfNotCheck.Input.cs
rename to src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiActionsDoNotRequireExplicitModelValidationCheckCodeFixProviderTest/CodeFixRemovesModelStateIsInvalidBlockWithIfNotCheck.Input.cs
diff --git a/test/Mvc.Api.Analyzers.Test/TestFiles/ApiActionsDoNotRequireExplicitModelValidationCheckCodeFixProviderTest/CodeFixRemovesModelStateIsInvalidBlockWithIfNotCheck.Output.cs b/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiActionsDoNotRequireExplicitModelValidationCheckCodeFixProviderTest/CodeFixRemovesModelStateIsInvalidBlockWithIfNotCheck.Output.cs
similarity index 100%
rename from test/Mvc.Api.Analyzers.Test/TestFiles/ApiActionsDoNotRequireExplicitModelValidationCheckCodeFixProviderTest/CodeFixRemovesModelStateIsInvalidBlockWithIfNotCheck.Output.cs
rename to src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiActionsDoNotRequireExplicitModelValidationCheckCodeFixProviderTest/CodeFixRemovesModelStateIsInvalidBlockWithIfNotCheck.Output.cs
diff --git a/test/Mvc.Api.Analyzers.Test/TestFiles/ApiControllerFactsTest/IsApiControllerAction_ReturnsTrue_IfAttributeIsDeclaredOnAssembly.cs b/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiControllerFactsTest/IsApiControllerAction_ReturnsTrue_IfAttributeIsDeclaredOnAssembly.cs
similarity index 100%
rename from test/Mvc.Api.Analyzers.Test/TestFiles/ApiControllerFactsTest/IsApiControllerAction_ReturnsTrue_IfAttributeIsDeclaredOnAssembly.cs
rename to src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiControllerFactsTest/IsApiControllerAction_ReturnsTrue_IfAttributeIsDeclaredOnAssembly.cs
diff --git a/test/Mvc.Api.Analyzers.Test/TestFiles/ApiControllerFactsTest/TestFile.cs b/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiControllerFactsTest/TestFile.cs
similarity index 100%
rename from test/Mvc.Api.Analyzers.Test/TestFiles/ApiControllerFactsTest/TestFile.cs
rename to src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiControllerFactsTest/TestFile.cs
diff --git a/test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/DiagnosticsAreReturned_ForActionResultOfTReturningMethodWithoutAnyAttributes.cs b/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/DiagnosticsAreReturned_ForActionResultOfTReturningMethodWithoutAnyAttributes.cs
similarity index 100%
rename from test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/DiagnosticsAreReturned_ForActionResultOfTReturningMethodWithoutAnyAttributes.cs
rename to src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/DiagnosticsAreReturned_ForActionResultOfTReturningMethodWithoutAnyAttributes.cs
diff --git a/test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/DiagnosticsAreReturned_ForActionResultOfTReturningMethodWithoutSomeAttributes.cs b/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/DiagnosticsAreReturned_ForActionResultOfTReturningMethodWithoutSomeAttributes.cs
similarity index 100%
rename from test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/DiagnosticsAreReturned_ForActionResultOfTReturningMethodWithoutSomeAttributes.cs
rename to src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/DiagnosticsAreReturned_ForActionResultOfTReturningMethodWithoutSomeAttributes.cs
diff --git a/test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/DiagnosticsAreReturned_ForControllerWithCustomConvention.cs b/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/DiagnosticsAreReturned_ForControllerWithCustomConvention.cs
similarity index 100%
rename from test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/DiagnosticsAreReturned_ForControllerWithCustomConvention.cs
rename to src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/DiagnosticsAreReturned_ForControllerWithCustomConvention.cs
diff --git a/test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/DiagnosticsAreReturned_IfAsyncMethodReturningValueTaskWithProducesResponseTypeAttribute_ReturnsUndocumentedStatusCode.cs b/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/DiagnosticsAreReturned_IfAsyncMethodReturningValueTaskWithProducesResponseTypeAttribute_ReturnsUndocumentedStatusCode.cs
similarity index 100%
rename from test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/DiagnosticsAreReturned_IfAsyncMethodReturningValueTaskWithProducesResponseTypeAttribute_ReturnsUndocumentedStatusCode.cs
rename to src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/DiagnosticsAreReturned_IfAsyncMethodReturningValueTaskWithProducesResponseTypeAttribute_ReturnsUndocumentedStatusCode.cs
diff --git a/test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/DiagnosticsAreReturned_IfAsyncMethodWithProducesResponseTypeAttribute_ReturnsUndocumentedStatusCode.cs b/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/DiagnosticsAreReturned_IfAsyncMethodWithProducesResponseTypeAttribute_ReturnsUndocumentedStatusCode.cs
similarity index 100%
rename from test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/DiagnosticsAreReturned_IfAsyncMethodWithProducesResponseTypeAttribute_ReturnsUndocumentedStatusCode.cs
rename to src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/DiagnosticsAreReturned_IfAsyncMethodWithProducesResponseTypeAttribute_ReturnsUndocumentedStatusCode.cs
diff --git a/test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/DiagnosticsAreReturned_IfMethodWithApiConventionMethod_ReturnsUndocumentedStatusCode.cs b/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/DiagnosticsAreReturned_IfMethodWithApiConventionMethod_ReturnsUndocumentedStatusCode.cs
similarity index 100%
rename from test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/DiagnosticsAreReturned_IfMethodWithApiConventionMethod_ReturnsUndocumentedStatusCode.cs
rename to src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/DiagnosticsAreReturned_IfMethodWithApiConventionMethod_ReturnsUndocumentedStatusCode.cs
diff --git a/test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/DiagnosticsAreReturned_IfMethodWithAttributeAsynchronouslyReturnsValue_WithoutDocumentation.cs b/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/DiagnosticsAreReturned_IfMethodWithAttributeAsynchronouslyReturnsValue_WithoutDocumentation.cs
similarity index 100%
rename from test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/DiagnosticsAreReturned_IfMethodWithAttributeAsynchronouslyReturnsValue_WithoutDocumentation.cs
rename to src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/DiagnosticsAreReturned_IfMethodWithAttributeAsynchronouslyReturnsValue_WithoutDocumentation.cs
diff --git a/test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/DiagnosticsAreReturned_IfMethodWithAttributeReturnsValue_WithoutDocumentation.cs b/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/DiagnosticsAreReturned_IfMethodWithAttributeReturnsValue_WithoutDocumentation.cs
similarity index 100%
rename from test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/DiagnosticsAreReturned_IfMethodWithAttributeReturnsValue_WithoutDocumentation.cs
rename to src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/DiagnosticsAreReturned_IfMethodWithAttributeReturnsValue_WithoutDocumentation.cs
diff --git a/test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/DiagnosticsAreReturned_IfMethodWithAttribute_ReturnsDerivedType.cs b/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/DiagnosticsAreReturned_IfMethodWithAttribute_ReturnsDerivedType.cs
similarity index 100%
rename from test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/DiagnosticsAreReturned_IfMethodWithAttribute_ReturnsDerivedType.cs
rename to src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/DiagnosticsAreReturned_IfMethodWithAttribute_ReturnsDerivedType.cs
diff --git a/test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/DiagnosticsAreReturned_IfMethodWithConvention_DoesNotReturnDocumentedStatusCode.cs b/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/DiagnosticsAreReturned_IfMethodWithConvention_DoesNotReturnDocumentedStatusCode.cs
similarity index 100%
rename from test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/DiagnosticsAreReturned_IfMethodWithConvention_DoesNotReturnDocumentedStatusCode.cs
rename to src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/DiagnosticsAreReturned_IfMethodWithConvention_DoesNotReturnDocumentedStatusCode.cs
diff --git a/test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/DiagnosticsAreReturned_IfMethodWithConvention_ReturnsUndocumentedStatusCode.cs b/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/DiagnosticsAreReturned_IfMethodWithConvention_ReturnsUndocumentedStatusCode.cs
similarity index 100%
rename from test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/DiagnosticsAreReturned_IfMethodWithConvention_ReturnsUndocumentedStatusCode.cs
rename to src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/DiagnosticsAreReturned_IfMethodWithConvention_ReturnsUndocumentedStatusCode.cs
diff --git a/test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/DiagnosticsAreReturned_IfMethodWithProducesResponseTypeAttribute_DoesNotDocumentSuccessStatusCode.cs b/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/DiagnosticsAreReturned_IfMethodWithProducesResponseTypeAttribute_DoesNotDocumentSuccessStatusCode.cs
similarity index 100%
rename from test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/DiagnosticsAreReturned_IfMethodWithProducesResponseTypeAttribute_DoesNotDocumentSuccessStatusCode.cs
rename to src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/DiagnosticsAreReturned_IfMethodWithProducesResponseTypeAttribute_DoesNotDocumentSuccessStatusCode.cs
diff --git a/test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/DiagnosticsAreReturned_IfMethodWithProducesResponseTypeAttribute_DoesNotReturnDocumentedStatusCode.cs b/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/DiagnosticsAreReturned_IfMethodWithProducesResponseTypeAttribute_DoesNotReturnDocumentedStatusCode.cs
similarity index 100%
rename from test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/DiagnosticsAreReturned_IfMethodWithProducesResponseTypeAttribute_DoesNotReturnDocumentedStatusCode.cs
rename to src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/DiagnosticsAreReturned_IfMethodWithProducesResponseTypeAttribute_DoesNotReturnDocumentedStatusCode.cs
diff --git a/test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/DiagnosticsAreReturned_IfMethodWithProducesResponseTypeAttribute_ReturnsUndocumentedStatusCode.cs b/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/DiagnosticsAreReturned_IfMethodWithProducesResponseTypeAttribute_ReturnsUndocumentedStatusCode.cs
similarity index 100%
rename from test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/DiagnosticsAreReturned_IfMethodWithProducesResponseTypeAttribute_ReturnsUndocumentedStatusCode.cs
rename to src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/DiagnosticsAreReturned_IfMethodWithProducesResponseTypeAttribute_ReturnsUndocumentedStatusCode.cs
diff --git a/test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/NoDiagnosticsAreReturned_ForApiController_IfStatusCodesCannotBeInferred.cs b/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/NoDiagnosticsAreReturned_ForApiController_IfStatusCodesCannotBeInferred.cs
similarity index 100%
rename from test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/NoDiagnosticsAreReturned_ForApiController_IfStatusCodesCannotBeInferred.cs
rename to src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/NoDiagnosticsAreReturned_ForApiController_IfStatusCodesCannotBeInferred.cs
diff --git a/test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/NoDiagnosticsAreReturned_ForApiController_WithAllDocumentedStatusCodes.cs b/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/NoDiagnosticsAreReturned_ForApiController_WithAllDocumentedStatusCodes.cs
similarity index 100%
rename from test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/NoDiagnosticsAreReturned_ForApiController_WithAllDocumentedStatusCodes.cs
rename to src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/NoDiagnosticsAreReturned_ForApiController_WithAllDocumentedStatusCodes.cs
diff --git a/test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/NoDiagnosticsAreReturned_ForNonApiController.cs b/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/NoDiagnosticsAreReturned_ForNonApiController.cs
similarity index 100%
rename from test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/NoDiagnosticsAreReturned_ForNonApiController.cs
rename to src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/NoDiagnosticsAreReturned_ForNonApiController.cs
diff --git a/test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/NoDiagnosticsAreReturned_ForOkResultReturningAction.cs b/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/NoDiagnosticsAreReturned_ForOkResultReturningAction.cs
similarity index 100%
rename from test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/NoDiagnosticsAreReturned_ForOkResultReturningAction.cs
rename to src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/NoDiagnosticsAreReturned_ForOkResultReturningAction.cs
diff --git a/test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/NoDiagnosticsAreReturned_ForRazorPageModels.cs b/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/NoDiagnosticsAreReturned_ForRazorPageModels.cs
similarity index 100%
rename from test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/NoDiagnosticsAreReturned_ForRazorPageModels.cs
rename to src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/NoDiagnosticsAreReturned_ForRazorPageModels.cs
diff --git a/test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/NoDiagnosticsAreReturned_ForReturnStatementsInLambdas.cs b/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/NoDiagnosticsAreReturned_ForReturnStatementsInLambdas.cs
similarity index 100%
rename from test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/NoDiagnosticsAreReturned_ForReturnStatementsInLambdas.cs
rename to src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/NoDiagnosticsAreReturned_ForReturnStatementsInLambdas.cs
diff --git a/test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/NoDiagnosticsAreReturned_ForReturnStatementsInLocalFunctions.cs b/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/NoDiagnosticsAreReturned_ForReturnStatementsInLocalFunctions.cs
similarity index 100%
rename from test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/NoDiagnosticsAreReturned_ForReturnStatementsInLocalFunctions.cs
rename to src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/ApiConventionAnalyzerIntegrationTest/NoDiagnosticsAreReturned_ForReturnStatementsInLocalFunctions.cs
diff --git a/test/Mvc.Api.Analyzers.Test/TestFiles/MvcFactsTest/IsControllerActionTests.cs b/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/MvcFactsTest/IsControllerActionTests.cs
similarity index 100%
rename from test/Mvc.Api.Analyzers.Test/TestFiles/MvcFactsTest/IsControllerActionTests.cs
rename to src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/MvcFactsTest/IsControllerActionTests.cs
diff --git a/test/Mvc.Api.Analyzers.Test/TestFiles/MvcFactsTest/IsControllerTests.cs b/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/MvcFactsTest/IsControllerTests.cs
similarity index 100%
rename from test/Mvc.Api.Analyzers.Test/TestFiles/MvcFactsTest/IsControllerTests.cs
rename to src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/MvcFactsTest/IsControllerTests.cs
diff --git a/test/Mvc.Api.Analyzers.Test/TestFiles/SymbolApiConventionMatcherTest/SymbolApiConventionMatcherTestFile.cs b/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/SymbolApiConventionMatcherTest/SymbolApiConventionMatcherTestFile.cs
similarity index 100%
rename from test/Mvc.Api.Analyzers.Test/TestFiles/SymbolApiConventionMatcherTest/SymbolApiConventionMatcherTestFile.cs
rename to src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/SymbolApiConventionMatcherTest/SymbolApiConventionMatcherTestFile.cs
diff --git a/test/Mvc.Api.Analyzers.Test/TestFiles/SymbolApiResponseMetadataProviderTest/GetErrorResponseType_ReturnsProblemDetails_IfNoAttributeIsDiscovered.cs b/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/SymbolApiResponseMetadataProviderTest/GetErrorResponseType_ReturnsProblemDetails_IfNoAttributeIsDiscovered.cs
similarity index 100%
rename from test/Mvc.Api.Analyzers.Test/TestFiles/SymbolApiResponseMetadataProviderTest/GetErrorResponseType_ReturnsProblemDetails_IfNoAttributeIsDiscovered.cs
rename to src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/SymbolApiResponseMetadataProviderTest/GetErrorResponseType_ReturnsProblemDetails_IfNoAttributeIsDiscovered.cs
diff --git a/test/Mvc.Api.Analyzers.Test/TestFiles/SymbolApiResponseMetadataProviderTest/GetErrorResponseType_ReturnsTypeDefinedAtAction.cs b/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/SymbolApiResponseMetadataProviderTest/GetErrorResponseType_ReturnsTypeDefinedAtAction.cs
similarity index 100%
rename from test/Mvc.Api.Analyzers.Test/TestFiles/SymbolApiResponseMetadataProviderTest/GetErrorResponseType_ReturnsTypeDefinedAtAction.cs
rename to src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/SymbolApiResponseMetadataProviderTest/GetErrorResponseType_ReturnsTypeDefinedAtAction.cs
diff --git a/test/Mvc.Api.Analyzers.Test/TestFiles/SymbolApiResponseMetadataProviderTest/GetErrorResponseType_ReturnsTypeDefinedAtAssembly.cs b/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/SymbolApiResponseMetadataProviderTest/GetErrorResponseType_ReturnsTypeDefinedAtAssembly.cs
similarity index 100%
rename from test/Mvc.Api.Analyzers.Test/TestFiles/SymbolApiResponseMetadataProviderTest/GetErrorResponseType_ReturnsTypeDefinedAtAssembly.cs
rename to src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/SymbolApiResponseMetadataProviderTest/GetErrorResponseType_ReturnsTypeDefinedAtAssembly.cs
diff --git a/test/Mvc.Api.Analyzers.Test/TestFiles/SymbolApiResponseMetadataProviderTest/GetErrorResponseType_ReturnsTypeDefinedAtController.cs b/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/SymbolApiResponseMetadataProviderTest/GetErrorResponseType_ReturnsTypeDefinedAtController.cs
similarity index 100%
rename from test/Mvc.Api.Analyzers.Test/TestFiles/SymbolApiResponseMetadataProviderTest/GetErrorResponseType_ReturnsTypeDefinedAtController.cs
rename to src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/SymbolApiResponseMetadataProviderTest/GetErrorResponseType_ReturnsTypeDefinedAtController.cs
diff --git a/test/Mvc.Api.Analyzers.Test/TestFiles/SymbolApiResponseMetadataProviderTest/GetResponseMetadataTests.cs b/src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/SymbolApiResponseMetadataProviderTest/GetResponseMetadataTests.cs
similarity index 100%
rename from test/Mvc.Api.Analyzers.Test/TestFiles/SymbolApiResponseMetadataProviderTest/GetResponseMetadataTests.cs
rename to src/Mvc/test/Mvc.Api.Analyzers.Test/TestFiles/SymbolApiResponseMetadataProviderTest/GetResponseMetadataTests.cs
diff --git a/test/MvcTests.ruleset b/src/Mvc/test/MvcTests.ruleset
similarity index 100%
rename from test/MvcTests.ruleset
rename to src/Mvc/test/MvcTests.ruleset
diff --git a/test/WebSites/ApiExplorerWebSite/ActionDescriptorChangeProvider.cs b/src/Mvc/test/WebSites/ApiExplorerWebSite/ActionDescriptorChangeProvider.cs
similarity index 100%
rename from test/WebSites/ApiExplorerWebSite/ActionDescriptorChangeProvider.cs
rename to src/Mvc/test/WebSites/ApiExplorerWebSite/ActionDescriptorChangeProvider.cs
diff --git a/test/WebSites/ApiExplorerWebSite/ApiExplorerDataFilter.cs b/src/Mvc/test/WebSites/ApiExplorerWebSite/ApiExplorerDataFilter.cs
similarity index 100%
rename from test/WebSites/ApiExplorerWebSite/ApiExplorerDataFilter.cs
rename to src/Mvc/test/WebSites/ApiExplorerWebSite/ApiExplorerDataFilter.cs
diff --git a/test/WebSites/ApiExplorerWebSite/ApiExplorerInboundOutboundConvention.cs b/src/Mvc/test/WebSites/ApiExplorerWebSite/ApiExplorerInboundOutboundConvention.cs
similarity index 100%
rename from test/WebSites/ApiExplorerWebSite/ApiExplorerInboundOutboundConvention.cs
rename to src/Mvc/test/WebSites/ApiExplorerWebSite/ApiExplorerInboundOutboundConvention.cs
diff --git a/test/WebSites/ApiExplorerWebSite/ApiExplorerRouteChangeConvention.cs b/src/Mvc/test/WebSites/ApiExplorerWebSite/ApiExplorerRouteChangeConvention.cs
similarity index 100%
rename from test/WebSites/ApiExplorerWebSite/ApiExplorerRouteChangeConvention.cs
rename to src/Mvc/test/WebSites/ApiExplorerWebSite/ApiExplorerRouteChangeConvention.cs
diff --git a/test/WebSites/ApiExplorerWebSite/ApiExplorerVisibilityDisabledConvention.cs b/src/Mvc/test/WebSites/ApiExplorerWebSite/ApiExplorerVisibilityDisabledConvention.cs
similarity index 100%
rename from test/WebSites/ApiExplorerWebSite/ApiExplorerVisibilityDisabledConvention.cs
rename to src/Mvc/test/WebSites/ApiExplorerWebSite/ApiExplorerVisibilityDisabledConvention.cs
diff --git a/test/WebSites/ApiExplorerWebSite/ApiExplorerVisibilityEnabledConvention.cs b/src/Mvc/test/WebSites/ApiExplorerWebSite/ApiExplorerVisibilityEnabledConvention.cs
similarity index 100%
rename from test/WebSites/ApiExplorerWebSite/ApiExplorerVisibilityEnabledConvention.cs
rename to src/Mvc/test/WebSites/ApiExplorerWebSite/ApiExplorerVisibilityEnabledConvention.cs
diff --git a/test/WebSites/ApiExplorerWebSite/ApiExplorerWebSite.csproj b/src/Mvc/test/WebSites/ApiExplorerWebSite/ApiExplorerWebSite.csproj
similarity index 100%
rename from test/WebSites/ApiExplorerWebSite/ApiExplorerWebSite.csproj
rename to src/Mvc/test/WebSites/ApiExplorerWebSite/ApiExplorerWebSite.csproj
diff --git a/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerApiController.cs b/src/Mvc/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerApiController.cs
similarity index 100%
rename from test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerApiController.cs
rename to src/Mvc/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerApiController.cs
diff --git a/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerHttpMethodController.cs b/src/Mvc/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerHttpMethodController.cs
similarity index 100%
rename from test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerHttpMethodController.cs
rename to src/Mvc/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerHttpMethodController.cs
diff --git a/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerInboundOutboundController.cs b/src/Mvc/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerInboundOutboundController.cs
similarity index 100%
rename from test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerInboundOutboundController.cs
rename to src/Mvc/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerInboundOutboundController.cs
diff --git a/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerNameSetByConventionController.cs b/src/Mvc/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerNameSetByConventionController.cs
similarity index 100%
rename from test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerNameSetByConventionController.cs
rename to src/Mvc/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerNameSetByConventionController.cs
diff --git a/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerNameSetExplicitlyController.cs b/src/Mvc/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerNameSetExplicitlyController.cs
similarity index 100%
rename from test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerNameSetExplicitlyController.cs
rename to src/Mvc/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerNameSetExplicitlyController.cs
diff --git a/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerParametersController.cs b/src/Mvc/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerParametersController.cs
similarity index 100%
rename from test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerParametersController.cs
rename to src/Mvc/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerParametersController.cs
diff --git a/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerReloadableController.cs b/src/Mvc/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerReloadableController.cs
similarity index 100%
rename from test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerReloadableController.cs
rename to src/Mvc/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerReloadableController.cs
diff --git a/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerResponseContentTypeController.cs b/src/Mvc/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerResponseContentTypeController.cs
similarity index 100%
rename from test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerResponseContentTypeController.cs
rename to src/Mvc/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerResponseContentTypeController.cs
diff --git a/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerResponseContentTypeOverrideOnActionController.cs b/src/Mvc/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerResponseContentTypeOverrideOnActionController.cs
similarity index 100%
rename from test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerResponseContentTypeOverrideOnActionController.cs
rename to src/Mvc/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerResponseContentTypeOverrideOnActionController.cs
diff --git a/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerResponseTypeOverrideOnActionController.cs b/src/Mvc/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerResponseTypeOverrideOnActionController.cs
similarity index 100%
rename from test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerResponseTypeOverrideOnActionController.cs
rename to src/Mvc/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerResponseTypeOverrideOnActionController.cs
diff --git a/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerResponseTypeWithApiConventionController.cs b/src/Mvc/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerResponseTypeWithApiConventionController.cs
similarity index 100%
rename from test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerResponseTypeWithApiConventionController.cs
rename to src/Mvc/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerResponseTypeWithApiConventionController.cs
diff --git a/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerResponseTypeWithAttributeController.cs b/src/Mvc/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerResponseTypeWithAttributeController.cs
similarity index 100%
rename from test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerResponseTypeWithAttributeController.cs
rename to src/Mvc/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerResponseTypeWithAttributeController.cs
diff --git a/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerResponseTypeWithoutAttributeController.cs b/src/Mvc/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerResponseTypeWithoutAttributeController.cs
similarity index 100%
rename from test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerResponseTypeWithoutAttributeController.cs
rename to src/Mvc/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerResponseTypeWithoutAttributeController.cs
diff --git a/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerRouteAndPathParametersInformationController.cs b/src/Mvc/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerRouteAndPathParametersInformationController.cs
similarity index 100%
rename from test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerRouteAndPathParametersInformationController.cs
rename to src/Mvc/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerRouteAndPathParametersInformationController.cs
diff --git a/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerVisibilityDisabledByConventionController.cs b/src/Mvc/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerVisibilityDisabledByConventionController.cs
similarity index 100%
rename from test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerVisibilityDisabledByConventionController.cs
rename to src/Mvc/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerVisibilityDisabledByConventionController.cs
diff --git a/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerVisibilityEnabledByConventionController.cs b/src/Mvc/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerVisibilityEnabledByConventionController.cs
similarity index 100%
rename from test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerVisibilityEnabledByConventionController.cs
rename to src/Mvc/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerVisibilityEnabledByConventionController.cs
diff --git a/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerVisibilitySetExplicitlyController.cs b/src/Mvc/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerVisibilitySetExplicitlyController.cs
similarity index 100%
rename from test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerVisibilitySetExplicitlyController.cs
rename to src/Mvc/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerVisibilitySetExplicitlyController.cs
diff --git a/test/WebSites/ApiExplorerWebSite/Models/Customer.cs b/src/Mvc/test/WebSites/ApiExplorerWebSite/Models/Customer.cs
similarity index 100%
rename from test/WebSites/ApiExplorerWebSite/Models/Customer.cs
rename to src/Mvc/test/WebSites/ApiExplorerWebSite/Models/Customer.cs
diff --git a/test/WebSites/ApiExplorerWebSite/Models/CustomerCommentsDTO.cs b/src/Mvc/test/WebSites/ApiExplorerWebSite/Models/CustomerCommentsDTO.cs
similarity index 100%
rename from test/WebSites/ApiExplorerWebSite/Models/CustomerCommentsDTO.cs
rename to src/Mvc/test/WebSites/ApiExplorerWebSite/Models/CustomerCommentsDTO.cs
diff --git a/test/WebSites/ApiExplorerWebSite/Models/OrderDTO.cs b/src/Mvc/test/WebSites/ApiExplorerWebSite/Models/OrderDTO.cs
similarity index 100%
rename from test/WebSites/ApiExplorerWebSite/Models/OrderDTO.cs
rename to src/Mvc/test/WebSites/ApiExplorerWebSite/Models/OrderDTO.cs
diff --git a/test/WebSites/ApiExplorerWebSite/Models/OrderDetailsDTO.cs b/src/Mvc/test/WebSites/ApiExplorerWebSite/Models/OrderDetailsDTO.cs
similarity index 100%
rename from test/WebSites/ApiExplorerWebSite/Models/OrderDetailsDTO.cs
rename to src/Mvc/test/WebSites/ApiExplorerWebSite/Models/OrderDetailsDTO.cs
diff --git a/test/WebSites/ApiExplorerWebSite/Models/Product.cs b/src/Mvc/test/WebSites/ApiExplorerWebSite/Models/Product.cs
similarity index 100%
rename from test/WebSites/ApiExplorerWebSite/Models/Product.cs
rename to src/Mvc/test/WebSites/ApiExplorerWebSite/Models/Product.cs
diff --git a/test/WebSites/ApiExplorerWebSite/PassThruAttribute.cs b/src/Mvc/test/WebSites/ApiExplorerWebSite/PassThruAttribute.cs
similarity index 100%
rename from test/WebSites/ApiExplorerWebSite/PassThruAttribute.cs
rename to src/Mvc/test/WebSites/ApiExplorerWebSite/PassThruAttribute.cs
diff --git a/test/WebSites/ApiExplorerWebSite/ReloadAttribute.cs b/src/Mvc/test/WebSites/ApiExplorerWebSite/ReloadAttribute.cs
similarity index 100%
rename from test/WebSites/ApiExplorerWebSite/ReloadAttribute.cs
rename to src/Mvc/test/WebSites/ApiExplorerWebSite/ReloadAttribute.cs
diff --git a/test/WebSites/ApiExplorerWebSite/Startup.cs b/src/Mvc/test/WebSites/ApiExplorerWebSite/Startup.cs
similarity index 100%
rename from test/WebSites/ApiExplorerWebSite/Startup.cs
rename to src/Mvc/test/WebSites/ApiExplorerWebSite/Startup.cs
diff --git a/test/WebSites/ApiExplorerWebSite/WellKnownChangeToken.cs b/src/Mvc/test/WebSites/ApiExplorerWebSite/WellKnownChangeToken.cs
similarity index 100%
rename from test/WebSites/ApiExplorerWebSite/WellKnownChangeToken.cs
rename to src/Mvc/test/WebSites/ApiExplorerWebSite/WellKnownChangeToken.cs
diff --git a/test/WebSites/ApiExplorerWebSite/readme.md b/src/Mvc/test/WebSites/ApiExplorerWebSite/readme.md
similarity index 100%
rename from test/WebSites/ApiExplorerWebSite/readme.md
rename to src/Mvc/test/WebSites/ApiExplorerWebSite/readme.md
diff --git a/test/WebSites/ApplicationModelWebSite/ApplicationModelWebSite.csproj b/src/Mvc/test/WebSites/ApplicationModelWebSite/ApplicationModelWebSite.csproj
similarity index 100%
rename from test/WebSites/ApplicationModelWebSite/ApplicationModelWebSite.csproj
rename to src/Mvc/test/WebSites/ApplicationModelWebSite/ApplicationModelWebSite.csproj
diff --git a/test/WebSites/ApplicationModelWebSite/Areas/Manage/Views/MultipleAreas/Index.cshtml b/src/Mvc/test/WebSites/ApplicationModelWebSite/Areas/Manage/Views/MultipleAreas/Index.cshtml
similarity index 100%
rename from test/WebSites/ApplicationModelWebSite/Areas/Manage/Views/MultipleAreas/Index.cshtml
rename to src/Mvc/test/WebSites/ApplicationModelWebSite/Areas/Manage/Views/MultipleAreas/Index.cshtml
diff --git a/test/WebSites/ApplicationModelWebSite/Areas/Products/Views/MultipleAreas/Index.cshtml b/src/Mvc/test/WebSites/ApplicationModelWebSite/Areas/Products/Views/MultipleAreas/Index.cshtml
similarity index 100%
rename from test/WebSites/ApplicationModelWebSite/Areas/Products/Views/MultipleAreas/Index.cshtml
rename to src/Mvc/test/WebSites/ApplicationModelWebSite/Areas/Products/Views/MultipleAreas/Index.cshtml
diff --git a/test/WebSites/ApplicationModelWebSite/Areas/Services/Views/MultipleAreas/Index.cshtml b/src/Mvc/test/WebSites/ApplicationModelWebSite/Areas/Services/Views/MultipleAreas/Index.cshtml
similarity index 100%
rename from test/WebSites/ApplicationModelWebSite/Areas/Services/Views/MultipleAreas/Index.cshtml
rename to src/Mvc/test/WebSites/ApplicationModelWebSite/Areas/Services/Views/MultipleAreas/Index.cshtml
diff --git a/test/WebSites/ApplicationModelWebSite/Controllers/ActionModelController.cs b/src/Mvc/test/WebSites/ApplicationModelWebSite/Controllers/ActionModelController.cs
similarity index 100%
rename from test/WebSites/ApplicationModelWebSite/Controllers/ActionModelController.cs
rename to src/Mvc/test/WebSites/ApplicationModelWebSite/Controllers/ActionModelController.cs
diff --git a/test/WebSites/ApplicationModelWebSite/Controllers/ApplicationModelController.cs b/src/Mvc/test/WebSites/ApplicationModelWebSite/Controllers/ApplicationModelController.cs
similarity index 100%
rename from test/WebSites/ApplicationModelWebSite/Controllers/ApplicationModelController.cs
rename to src/Mvc/test/WebSites/ApplicationModelWebSite/Controllers/ApplicationModelController.cs
diff --git a/test/WebSites/ApplicationModelWebSite/Controllers/ControllerModelController.cs b/src/Mvc/test/WebSites/ApplicationModelWebSite/Controllers/ControllerModelController.cs
similarity index 100%
rename from test/WebSites/ApplicationModelWebSite/Controllers/ControllerModelController.cs
rename to src/Mvc/test/WebSites/ApplicationModelWebSite/Controllers/ControllerModelController.cs
diff --git a/test/WebSites/ApplicationModelWebSite/Controllers/HomeController.cs b/src/Mvc/test/WebSites/ApplicationModelWebSite/Controllers/HomeController.cs
similarity index 100%
rename from test/WebSites/ApplicationModelWebSite/Controllers/HomeController.cs
rename to src/Mvc/test/WebSites/ApplicationModelWebSite/Controllers/HomeController.cs
diff --git a/test/WebSites/ApplicationModelWebSite/Controllers/LicenseController.cs b/src/Mvc/test/WebSites/ApplicationModelWebSite/Controllers/LicenseController.cs
similarity index 100%
rename from test/WebSites/ApplicationModelWebSite/Controllers/LicenseController.cs
rename to src/Mvc/test/WebSites/ApplicationModelWebSite/Controllers/LicenseController.cs
diff --git a/test/WebSites/ApplicationModelWebSite/Controllers/MultipleAreasController.cs b/src/Mvc/test/WebSites/ApplicationModelWebSite/Controllers/MultipleAreasController.cs
similarity index 100%
rename from test/WebSites/ApplicationModelWebSite/Controllers/MultipleAreasController.cs
rename to src/Mvc/test/WebSites/ApplicationModelWebSite/Controllers/MultipleAreasController.cs
diff --git a/test/WebSites/ApplicationModelWebSite/Controllers/ParameterModelController.cs b/src/Mvc/test/WebSites/ApplicationModelWebSite/Controllers/ParameterModelController.cs
similarity index 100%
rename from test/WebSites/ApplicationModelWebSite/Controllers/ParameterModelController.cs
rename to src/Mvc/test/WebSites/ApplicationModelWebSite/Controllers/ParameterModelController.cs
diff --git a/test/WebSites/ApplicationModelWebSite/Conventions/ActionDescriptionAttribute.cs b/src/Mvc/test/WebSites/ApplicationModelWebSite/Conventions/ActionDescriptionAttribute.cs
similarity index 100%
rename from test/WebSites/ApplicationModelWebSite/Conventions/ActionDescriptionAttribute.cs
rename to src/Mvc/test/WebSites/ApplicationModelWebSite/Conventions/ActionDescriptionAttribute.cs
diff --git a/test/WebSites/ApplicationModelWebSite/Conventions/ApplicationDescription.cs b/src/Mvc/test/WebSites/ApplicationModelWebSite/Conventions/ApplicationDescription.cs
similarity index 100%
rename from test/WebSites/ApplicationModelWebSite/Conventions/ApplicationDescription.cs
rename to src/Mvc/test/WebSites/ApplicationModelWebSite/Conventions/ApplicationDescription.cs
diff --git a/test/WebSites/ApplicationModelWebSite/Conventions/CloneActionAttribute.cs b/src/Mvc/test/WebSites/ApplicationModelWebSite/Conventions/CloneActionAttribute.cs
similarity index 100%
rename from test/WebSites/ApplicationModelWebSite/Conventions/CloneActionAttribute.cs
rename to src/Mvc/test/WebSites/ApplicationModelWebSite/Conventions/CloneActionAttribute.cs
diff --git a/test/WebSites/ApplicationModelWebSite/Conventions/CloneActionConvention.cs b/src/Mvc/test/WebSites/ApplicationModelWebSite/Conventions/CloneActionConvention.cs
similarity index 100%
rename from test/WebSites/ApplicationModelWebSite/Conventions/CloneActionConvention.cs
rename to src/Mvc/test/WebSites/ApplicationModelWebSite/Conventions/CloneActionConvention.cs
diff --git a/test/WebSites/ApplicationModelWebSite/Conventions/ControllerDescriptionAttribute.cs b/src/Mvc/test/WebSites/ApplicationModelWebSite/Conventions/ControllerDescriptionAttribute.cs
similarity index 100%
rename from test/WebSites/ApplicationModelWebSite/Conventions/ControllerDescriptionAttribute.cs
rename to src/Mvc/test/WebSites/ApplicationModelWebSite/Conventions/ControllerDescriptionAttribute.cs
diff --git a/test/WebSites/ApplicationModelWebSite/Conventions/ControllerLicenseConvention.cs b/src/Mvc/test/WebSites/ApplicationModelWebSite/Conventions/ControllerLicenseConvention.cs
similarity index 100%
rename from test/WebSites/ApplicationModelWebSite/Conventions/ControllerLicenseConvention.cs
rename to src/Mvc/test/WebSites/ApplicationModelWebSite/Conventions/ControllerLicenseConvention.cs
diff --git a/test/WebSites/ApplicationModelWebSite/Conventions/FromHeaderConvention.cs b/src/Mvc/test/WebSites/ApplicationModelWebSite/Conventions/FromHeaderConvention.cs
similarity index 100%
rename from test/WebSites/ApplicationModelWebSite/Conventions/FromHeaderConvention.cs
rename to src/Mvc/test/WebSites/ApplicationModelWebSite/Conventions/FromHeaderConvention.cs
diff --git a/test/WebSites/ApplicationModelWebSite/Conventions/MultipleAreasAttribute.cs b/src/Mvc/test/WebSites/ApplicationModelWebSite/Conventions/MultipleAreasAttribute.cs
similarity index 100%
rename from test/WebSites/ApplicationModelWebSite/Conventions/MultipleAreasAttribute.cs
rename to src/Mvc/test/WebSites/ApplicationModelWebSite/Conventions/MultipleAreasAttribute.cs
diff --git a/test/WebSites/ApplicationModelWebSite/Conventions/MultipleAreasControllerConvention.cs b/src/Mvc/test/WebSites/ApplicationModelWebSite/Conventions/MultipleAreasControllerConvention.cs
similarity index 100%
rename from test/WebSites/ApplicationModelWebSite/Conventions/MultipleAreasControllerConvention.cs
rename to src/Mvc/test/WebSites/ApplicationModelWebSite/Conventions/MultipleAreasControllerConvention.cs
diff --git a/test/WebSites/ApplicationModelWebSite/Startup.cs b/src/Mvc/test/WebSites/ApplicationModelWebSite/Startup.cs
similarity index 100%
rename from test/WebSites/ApplicationModelWebSite/Startup.cs
rename to src/Mvc/test/WebSites/ApplicationModelWebSite/Startup.cs
diff --git a/test/WebSites/ApplicationModelWebSite/Views/ActionModel/Help.cshtml b/src/Mvc/test/WebSites/ApplicationModelWebSite/Views/ActionModel/Help.cshtml
similarity index 100%
rename from test/WebSites/ApplicationModelWebSite/Views/ActionModel/Help.cshtml
rename to src/Mvc/test/WebSites/ApplicationModelWebSite/Views/ActionModel/Help.cshtml
diff --git a/test/WebSites/ApplicationModelWebSite/Views/ActionModel/MoreHelp.cshtml b/src/Mvc/test/WebSites/ApplicationModelWebSite/Views/ActionModel/MoreHelp.cshtml
similarity index 100%
rename from test/WebSites/ApplicationModelWebSite/Views/ActionModel/MoreHelp.cshtml
rename to src/Mvc/test/WebSites/ApplicationModelWebSite/Views/ActionModel/MoreHelp.cshtml
diff --git a/test/WebSites/ApplicationModelWebSite/readme.md b/src/Mvc/test/WebSites/ApplicationModelWebSite/readme.md
similarity index 100%
rename from test/WebSites/ApplicationModelWebSite/readme.md
rename to src/Mvc/test/WebSites/ApplicationModelWebSite/readme.md
diff --git a/test/WebSites/BasicWebSite/ActionDescriptorCreationCounter.cs b/src/Mvc/test/WebSites/BasicWebSite/ActionDescriptorCreationCounter.cs
similarity index 100%
rename from test/WebSites/BasicWebSite/ActionDescriptorCreationCounter.cs
rename to src/Mvc/test/WebSites/BasicWebSite/ActionDescriptorCreationCounter.cs
diff --git a/test/WebSites/BasicWebSite/Areas/Area1/Controllers/RemoteAttribute_HomeController.cs b/src/Mvc/test/WebSites/BasicWebSite/Areas/Area1/Controllers/RemoteAttribute_HomeController.cs
similarity index 100%
rename from test/WebSites/BasicWebSite/Areas/Area1/Controllers/RemoteAttribute_HomeController.cs
rename to src/Mvc/test/WebSites/BasicWebSite/Areas/Area1/Controllers/RemoteAttribute_HomeController.cs
diff --git a/test/WebSites/BasicWebSite/Areas/Area1/Controllers/RemoteAttribute_VerifyController.cs b/src/Mvc/test/WebSites/BasicWebSite/Areas/Area1/Controllers/RemoteAttribute_VerifyController.cs
similarity index 100%
rename from test/WebSites/BasicWebSite/Areas/Area1/Controllers/RemoteAttribute_VerifyController.cs
rename to src/Mvc/test/WebSites/BasicWebSite/Areas/Area1/Controllers/RemoteAttribute_VerifyController.cs
diff --git a/test/WebSites/BasicWebSite/Areas/Area1/Views/RemoteAttribute_Home/Create.cshtml b/src/Mvc/test/WebSites/BasicWebSite/Areas/Area1/Views/RemoteAttribute_Home/Create.cshtml
similarity index 100%
rename from test/WebSites/BasicWebSite/Areas/Area1/Views/RemoteAttribute_Home/Create.cshtml
rename to src/Mvc/test/WebSites/BasicWebSite/Areas/Area1/Views/RemoteAttribute_Home/Create.cshtml
diff --git a/test/WebSites/BasicWebSite/Areas/Area1/Views/RemoteAttribute_Home/Details.cshtml b/src/Mvc/test/WebSites/BasicWebSite/Areas/Area1/Views/RemoteAttribute_Home/Details.cshtml
similarity index 100%
rename from test/WebSites/BasicWebSite/Areas/Area1/Views/RemoteAttribute_Home/Details.cshtml
rename to src/Mvc/test/WebSites/BasicWebSite/Areas/Area1/Views/RemoteAttribute_Home/Details.cshtml
diff --git a/test/WebSites/BasicWebSite/Areas/Area1/Views/RemoteAttribute_Home/_Layout.cshtml b/src/Mvc/test/WebSites/BasicWebSite/Areas/Area1/Views/RemoteAttribute_Home/_Layout.cshtml
similarity index 100%
rename from test/WebSites/BasicWebSite/Areas/Area1/Views/RemoteAttribute_Home/_Layout.cshtml
rename to src/Mvc/test/WebSites/BasicWebSite/Areas/Area1/Views/RemoteAttribute_Home/_Layout.cshtml
diff --git a/test/WebSites/BasicWebSite/Areas/Area2/Controllers/RemoteAttribute_VerifyController.cs b/src/Mvc/test/WebSites/BasicWebSite/Areas/Area2/Controllers/RemoteAttribute_VerifyController.cs
similarity index 100%
rename from test/WebSites/BasicWebSite/Areas/Area2/Controllers/RemoteAttribute_VerifyController.cs
rename to src/Mvc/test/WebSites/BasicWebSite/Areas/Area2/Controllers/RemoteAttribute_VerifyController.cs
diff --git a/test/WebSites/BasicWebSite/BasicAuthenticationHandler.cs b/src/Mvc/test/WebSites/BasicWebSite/BasicAuthenticationHandler.cs
similarity index 100%
rename from test/WebSites/BasicWebSite/BasicAuthenticationHandler.cs
rename to src/Mvc/test/WebSites/BasicWebSite/BasicAuthenticationHandler.cs
diff --git a/test/WebSites/BasicWebSite/BasicWebSite.csproj b/src/Mvc/test/WebSites/BasicWebSite/BasicWebSite.csproj
similarity index 100%
rename from test/WebSites/BasicWebSite/BasicWebSite.csproj
rename to src/Mvc/test/WebSites/BasicWebSite/BasicWebSite.csproj
diff --git a/test/WebSites/BasicWebSite/Components/PassThroughViewComponent.cs b/src/Mvc/test/WebSites/BasicWebSite/Components/PassThroughViewComponent.cs
similarity index 100%
rename from test/WebSites/BasicWebSite/Components/PassThroughViewComponent.cs
rename to src/Mvc/test/WebSites/BasicWebSite/Components/PassThroughViewComponent.cs
diff --git a/test/WebSites/BasicWebSite/Components/ViewDataViewComponent.cs b/src/Mvc/test/WebSites/BasicWebSite/Components/ViewDataViewComponent.cs
similarity index 100%
rename from test/WebSites/BasicWebSite/Components/ViewDataViewComponent.cs
rename to src/Mvc/test/WebSites/BasicWebSite/Components/ViewDataViewComponent.cs
diff --git a/test/WebSites/BasicWebSite/ConfigureAuthPolicies.cs b/src/Mvc/test/WebSites/BasicWebSite/ConfigureAuthPolicies.cs
similarity index 100%
rename from test/WebSites/BasicWebSite/ConfigureAuthPolicies.cs
rename to src/Mvc/test/WebSites/BasicWebSite/ConfigureAuthPolicies.cs
diff --git a/test/WebSites/BasicWebSite/ContactsRepository.cs b/src/Mvc/test/WebSites/BasicWebSite/ContactsRepository.cs
similarity index 100%
rename from test/WebSites/BasicWebSite/ContactsRepository.cs
rename to src/Mvc/test/WebSites/BasicWebSite/ContactsRepository.cs
diff --git a/test/WebSites/BasicWebSite/Controllers/ActionConstraints/ConsumesAttribute_MediaTypeSuffix.cs b/src/Mvc/test/WebSites/BasicWebSite/Controllers/ActionConstraints/ConsumesAttribute_MediaTypeSuffix.cs
similarity index 100%
rename from test/WebSites/BasicWebSite/Controllers/ActionConstraints/ConsumesAttribute_MediaTypeSuffix.cs
rename to src/Mvc/test/WebSites/BasicWebSite/Controllers/ActionConstraints/ConsumesAttribute_MediaTypeSuffix.cs
diff --git a/test/WebSites/BasicWebSite/Controllers/ActionConstraints/ConsumesAttribute_NoFallBackActionController.cs b/src/Mvc/test/WebSites/BasicWebSite/Controllers/ActionConstraints/ConsumesAttribute_NoFallBackActionController.cs
similarity index 100%
rename from test/WebSites/BasicWebSite/Controllers/ActionConstraints/ConsumesAttribute_NoFallBackActionController.cs
rename to src/Mvc/test/WebSites/BasicWebSite/Controllers/ActionConstraints/ConsumesAttribute_NoFallBackActionController.cs
diff --git a/test/WebSites/BasicWebSite/Controllers/ActionConstraints/ConsumesAttribute_OveridesBaseController.cs b/src/Mvc/test/WebSites/BasicWebSite/Controllers/ActionConstraints/ConsumesAttribute_OveridesBaseController.cs
similarity index 100%
rename from test/WebSites/BasicWebSite/Controllers/ActionConstraints/ConsumesAttribute_OveridesBaseController.cs
rename to src/Mvc/test/WebSites/BasicWebSite/Controllers/ActionConstraints/ConsumesAttribute_OveridesBaseController.cs
diff --git a/test/WebSites/BasicWebSite/Controllers/ActionConstraints/ConsumesAttribute_OveridesController.cs b/src/Mvc/test/WebSites/BasicWebSite/Controllers/ActionConstraints/ConsumesAttribute_OveridesController.cs
similarity index 100%
rename from test/WebSites/BasicWebSite/Controllers/ActionConstraints/ConsumesAttribute_OveridesController.cs
rename to src/Mvc/test/WebSites/BasicWebSite/Controllers/ActionConstraints/ConsumesAttribute_OveridesController.cs
diff --git a/test/WebSites/BasicWebSite/Controllers/ActionConstraints/ConsumesAttribute_PassThroughController.cs b/src/Mvc/test/WebSites/BasicWebSite/Controllers/ActionConstraints/ConsumesAttribute_PassThroughController.cs
similarity index 100%
rename from test/WebSites/BasicWebSite/Controllers/ActionConstraints/ConsumesAttribute_PassThroughController.cs
rename to src/Mvc/test/WebSites/BasicWebSite/Controllers/ActionConstraints/ConsumesAttribute_PassThroughController.cs
diff --git a/test/WebSites/BasicWebSite/Controllers/ActionConstraints/ConsumesAttribute_WithFallbackActionController.cs b/src/Mvc/test/WebSites/BasicWebSite/Controllers/ActionConstraints/ConsumesAttribute_WithFallbackActionController.cs
similarity index 100%
rename from test/WebSites/BasicWebSite/Controllers/ActionConstraints/ConsumesAttribute_WithFallbackActionController.cs
rename to src/Mvc/test/WebSites/BasicWebSite/Controllers/ActionConstraints/ConsumesAttribute_WithFallbackActionController.cs
diff --git a/test/WebSites/BasicWebSite/Controllers/ActionResultOfTController.cs b/src/Mvc/test/WebSites/BasicWebSite/Controllers/ActionResultOfTController.cs
similarity index 100%
rename from test/WebSites/BasicWebSite/Controllers/ActionResultOfTController.cs
rename to src/Mvc/test/WebSites/BasicWebSite/Controllers/ActionResultOfTController.cs
diff --git a/test/WebSites/BasicWebSite/Controllers/AntiforgeryController.cs b/src/Mvc/test/WebSites/BasicWebSite/Controllers/AntiforgeryController.cs
similarity index 100%
rename from test/WebSites/BasicWebSite/Controllers/AntiforgeryController.cs
rename to src/Mvc/test/WebSites/BasicWebSite/Controllers/AntiforgeryController.cs
diff --git a/test/WebSites/BasicWebSite/Controllers/AsyncActionsController.cs b/src/Mvc/test/WebSites/BasicWebSite/Controllers/AsyncActionsController.cs
similarity index 100%
rename from test/WebSites/BasicWebSite/Controllers/AsyncActionsController.cs
rename to src/Mvc/test/WebSites/BasicWebSite/Controllers/AsyncActionsController.cs
diff --git a/test/WebSites/BasicWebSite/Controllers/AuthorizeUserController.cs b/src/Mvc/test/WebSites/BasicWebSite/Controllers/AuthorizeUserController.cs
similarity index 100%
rename from test/WebSites/BasicWebSite/Controllers/AuthorizeUserController.cs
rename to src/Mvc/test/WebSites/BasicWebSite/Controllers/AuthorizeUserController.cs
diff --git a/test/WebSites/BasicWebSite/Controllers/BindPropertiesController.cs b/src/Mvc/test/WebSites/BasicWebSite/Controllers/BindPropertiesController.cs
similarity index 100%
rename from test/WebSites/BasicWebSite/Controllers/BindPropertiesController.cs
rename to src/Mvc/test/WebSites/BasicWebSite/Controllers/BindPropertiesController.cs
diff --git a/test/WebSites/BasicWebSite/Controllers/BindPropertiesSupportsGetController.cs b/src/Mvc/test/WebSites/BasicWebSite/Controllers/BindPropertiesSupportsGetController.cs
similarity index 100%
rename from test/WebSites/BasicWebSite/Controllers/BindPropertiesSupportsGetController.cs
rename to src/Mvc/test/WebSites/BasicWebSite/Controllers/BindPropertiesSupportsGetController.cs
diff --git a/test/WebSites/BasicWebSite/Controllers/ContactApiController.cs b/src/Mvc/test/WebSites/BasicWebSite/Controllers/ContactApiController.cs
similarity index 100%
rename from test/WebSites/BasicWebSite/Controllers/ContactApiController.cs
rename to src/Mvc/test/WebSites/BasicWebSite/Controllers/ContactApiController.cs
diff --git a/test/WebSites/BasicWebSite/Controllers/ContentNegotiation/ContentNegotiationController.cs b/src/Mvc/test/WebSites/BasicWebSite/Controllers/ContentNegotiation/ContentNegotiationController.cs
similarity index 100%
rename from test/WebSites/BasicWebSite/Controllers/ContentNegotiation/ContentNegotiationController.cs
rename to src/Mvc/test/WebSites/BasicWebSite/Controllers/ContentNegotiation/ContentNegotiationController.cs
diff --git a/test/WebSites/BasicWebSite/Controllers/ContentNegotiation/FallbackOnTypeBasedMatchController.cs b/src/Mvc/test/WebSites/BasicWebSite/Controllers/ContentNegotiation/FallbackOnTypeBasedMatchController.cs
similarity index 100%
rename from test/WebSites/BasicWebSite/Controllers/ContentNegotiation/FallbackOnTypeBasedMatchController.cs
rename to src/Mvc/test/WebSites/BasicWebSite/Controllers/ContentNegotiation/FallbackOnTypeBasedMatchController.cs
diff --git a/test/WebSites/BasicWebSite/Controllers/ContentNegotiation/FormatFilterController.cs b/src/Mvc/test/WebSites/BasicWebSite/Controllers/ContentNegotiation/FormatFilterController.cs
similarity index 100%
rename from test/WebSites/BasicWebSite/Controllers/ContentNegotiation/FormatFilterController.cs
rename to src/Mvc/test/WebSites/BasicWebSite/Controllers/ContentNegotiation/FormatFilterController.cs
diff --git a/test/WebSites/BasicWebSite/Controllers/ContentNegotiation/InvalidContentTypeController.cs b/src/Mvc/test/WebSites/BasicWebSite/Controllers/ContentNegotiation/InvalidContentTypeController.cs
similarity index 100%
rename from test/WebSites/BasicWebSite/Controllers/ContentNegotiation/InvalidContentTypeController.cs
rename to src/Mvc/test/WebSites/BasicWebSite/Controllers/ContentNegotiation/InvalidContentTypeController.cs
diff --git a/test/WebSites/BasicWebSite/Controllers/ContentNegotiation/NoContentController.cs b/src/Mvc/test/WebSites/BasicWebSite/Controllers/ContentNegotiation/NoContentController.cs
similarity index 100%
rename from test/WebSites/BasicWebSite/Controllers/ContentNegotiation/NoContentController.cs
rename to src/Mvc/test/WebSites/BasicWebSite/Controllers/ContentNegotiation/NoContentController.cs
diff --git a/test/WebSites/BasicWebSite/Controllers/ContentNegotiation/NoContentDoNotTreatNullValueAsNoContentController.cs b/src/Mvc/test/WebSites/BasicWebSite/Controllers/ContentNegotiation/NoContentDoNotTreatNullValueAsNoContentController.cs
similarity index 100%
rename from test/WebSites/BasicWebSite/Controllers/ContentNegotiation/NoContentDoNotTreatNullValueAsNoContentController.cs
rename to src/Mvc/test/WebSites/BasicWebSite/Controllers/ContentNegotiation/NoContentDoNotTreatNullValueAsNoContentController.cs
diff --git a/test/WebSites/BasicWebSite/Controllers/ContentNegotiation/NoProducesContentOnClassController.cs b/src/Mvc/test/WebSites/BasicWebSite/Controllers/ContentNegotiation/NoProducesContentOnClassController.cs
similarity index 100%
rename from test/WebSites/BasicWebSite/Controllers/ContentNegotiation/NoProducesContentOnClassController.cs
rename to src/Mvc/test/WebSites/BasicWebSite/Controllers/ContentNegotiation/NoProducesContentOnClassController.cs
diff --git a/test/WebSites/BasicWebSite/Controllers/ContentNegotiation/NormalController.cs b/src/Mvc/test/WebSites/BasicWebSite/Controllers/ContentNegotiation/NormalController.cs
similarity index 100%
rename from test/WebSites/BasicWebSite/Controllers/ContentNegotiation/NormalController.cs
rename to src/Mvc/test/WebSites/BasicWebSite/Controllers/ContentNegotiation/NormalController.cs
diff --git a/test/WebSites/BasicWebSite/Controllers/ContentNegotiation/ProducesContentBaseController.cs b/src/Mvc/test/WebSites/BasicWebSite/Controllers/ContentNegotiation/ProducesContentBaseController.cs
similarity index 100%
rename from test/WebSites/BasicWebSite/Controllers/ContentNegotiation/ProducesContentBaseController.cs
rename to src/Mvc/test/WebSites/BasicWebSite/Controllers/ContentNegotiation/ProducesContentBaseController.cs
diff --git a/test/WebSites/BasicWebSite/Controllers/ContentNegotiation/ProducesContentOnClassController.cs b/src/Mvc/test/WebSites/BasicWebSite/Controllers/ContentNegotiation/ProducesContentOnClassController.cs
similarity index 100%
rename from test/WebSites/BasicWebSite/Controllers/ContentNegotiation/ProducesContentOnClassController.cs
rename to src/Mvc/test/WebSites/BasicWebSite/Controllers/ContentNegotiation/ProducesContentOnClassController.cs
diff --git a/test/WebSites/BasicWebSite/Controllers/ContentNegotiation/ProducesJsonController.cs b/src/Mvc/test/WebSites/BasicWebSite/Controllers/ContentNegotiation/ProducesJsonController.cs
similarity index 100%
rename from test/WebSites/BasicWebSite/Controllers/ContentNegotiation/ProducesJsonController.cs
rename to src/Mvc/test/WebSites/BasicWebSite/Controllers/ContentNegotiation/ProducesJsonController.cs
diff --git a/test/WebSites/BasicWebSite/Controllers/ContentNegotiation/ProducesWithMediaTypeParametersController.cs b/src/Mvc/test/WebSites/BasicWebSite/Controllers/ContentNegotiation/ProducesWithMediaTypeParametersController.cs
similarity index 100%
rename from test/WebSites/BasicWebSite/Controllers/ContentNegotiation/ProducesWithMediaTypeParametersController.cs
rename to src/Mvc/test/WebSites/BasicWebSite/Controllers/ContentNegotiation/ProducesWithMediaTypeParametersController.cs
diff --git a/test/WebSites/BasicWebSite/Controllers/ContentNegotiation/ProducesWithMediaTypeSuffixesController.cs b/src/Mvc/test/WebSites/BasicWebSite/Controllers/ContentNegotiation/ProducesWithMediaTypeSuffixesController.cs
similarity index 100%
rename from test/WebSites/BasicWebSite/Controllers/ContentNegotiation/ProducesWithMediaTypeSuffixesController.cs
rename to src/Mvc/test/WebSites/BasicWebSite/Controllers/ContentNegotiation/ProducesWithMediaTypeSuffixesController.cs
diff --git a/test/WebSites/BasicWebSite/Controllers/ContentNegotiation/TextPlainController.cs b/src/Mvc/test/WebSites/BasicWebSite/Controllers/ContentNegotiation/TextPlainController.cs
similarity index 100%
rename from test/WebSites/BasicWebSite/Controllers/ContentNegotiation/TextPlainController.cs
rename to src/Mvc/test/WebSites/BasicWebSite/Controllers/ContentNegotiation/TextPlainController.cs
diff --git a/test/WebSites/BasicWebSite/Controllers/DefaultValuesController.cs b/src/Mvc/test/WebSites/BasicWebSite/Controllers/DefaultValuesController.cs
similarity index 100%
rename from test/WebSites/BasicWebSite/Controllers/DefaultValuesController.cs
rename to src/Mvc/test/WebSites/BasicWebSite/Controllers/DefaultValuesController.cs
diff --git a/test/WebSites/BasicWebSite/Controllers/FiltersController.cs b/src/Mvc/test/WebSites/BasicWebSite/Controllers/FiltersController.cs
similarity index 100%
rename from test/WebSites/BasicWebSite/Controllers/FiltersController.cs
rename to src/Mvc/test/WebSites/BasicWebSite/Controllers/FiltersController.cs
diff --git a/test/WebSites/BasicWebSite/Controllers/HomeController.cs b/src/Mvc/test/WebSites/BasicWebSite/Controllers/HomeController.cs
similarity index 100%
rename from test/WebSites/BasicWebSite/Controllers/HomeController.cs
rename to src/Mvc/test/WebSites/BasicWebSite/Controllers/HomeController.cs
diff --git a/test/WebSites/BasicWebSite/Controllers/JsonResultController.cs b/src/Mvc/test/WebSites/BasicWebSite/Controllers/JsonResultController.cs
similarity index 100%
rename from test/WebSites/BasicWebSite/Controllers/JsonResultController.cs
rename to src/Mvc/test/WebSites/BasicWebSite/Controllers/JsonResultController.cs
diff --git a/test/WebSites/BasicWebSite/Controllers/LinkGeneration/LinksController.cs b/src/Mvc/test/WebSites/BasicWebSite/Controllers/LinkGeneration/LinksController.cs
similarity index 100%
rename from test/WebSites/BasicWebSite/Controllers/LinkGeneration/LinksController.cs
rename to src/Mvc/test/WebSites/BasicWebSite/Controllers/LinkGeneration/LinksController.cs
diff --git a/test/WebSites/BasicWebSite/Controllers/LinkGeneration/OrdersController.cs b/src/Mvc/test/WebSites/BasicWebSite/Controllers/LinkGeneration/OrdersController.cs
similarity index 100%
rename from test/WebSites/BasicWebSite/Controllers/LinkGeneration/OrdersController.cs
rename to src/Mvc/test/WebSites/BasicWebSite/Controllers/LinkGeneration/OrdersController.cs
diff --git a/test/WebSites/BasicWebSite/Controllers/LinkGeneration/ProductsController.cs b/src/Mvc/test/WebSites/BasicWebSite/Controllers/LinkGeneration/ProductsController.cs
similarity index 100%
rename from test/WebSites/BasicWebSite/Controllers/LinkGeneration/ProductsController.cs
rename to src/Mvc/test/WebSites/BasicWebSite/Controllers/LinkGeneration/ProductsController.cs
diff --git a/test/WebSites/BasicWebSite/Controllers/MonitorController.cs b/src/Mvc/test/WebSites/BasicWebSite/Controllers/MonitorController.cs
similarity index 100%
rename from test/WebSites/BasicWebSite/Controllers/MonitorController.cs
rename to src/Mvc/test/WebSites/BasicWebSite/Controllers/MonitorController.cs
diff --git a/test/WebSites/BasicWebSite/Controllers/PageRouteController.cs b/src/Mvc/test/WebSites/BasicWebSite/Controllers/PageRouteController.cs
similarity index 100%
rename from test/WebSites/BasicWebSite/Controllers/PageRouteController.cs
rename to src/Mvc/test/WebSites/BasicWebSite/Controllers/PageRouteController.cs
diff --git a/test/WebSites/BasicWebSite/Controllers/PassThroughController.cs b/src/Mvc/test/WebSites/BasicWebSite/Controllers/PassThroughController.cs
similarity index 100%
rename from test/WebSites/BasicWebSite/Controllers/PassThroughController.cs
rename to src/Mvc/test/WebSites/BasicWebSite/Controllers/PassThroughController.cs
diff --git a/test/WebSites/BasicWebSite/Controllers/RemoteAttribute_HomeController.cs b/src/Mvc/test/WebSites/BasicWebSite/Controllers/RemoteAttribute_HomeController.cs
similarity index 100%
rename from test/WebSites/BasicWebSite/Controllers/RemoteAttribute_HomeController.cs
rename to src/Mvc/test/WebSites/BasicWebSite/Controllers/RemoteAttribute_HomeController.cs
diff --git a/test/WebSites/BasicWebSite/Controllers/RemoteAttribute_VerifyController.cs b/src/Mvc/test/WebSites/BasicWebSite/Controllers/RemoteAttribute_VerifyController.cs
similarity index 100%
rename from test/WebSites/BasicWebSite/Controllers/RemoteAttribute_VerifyController.cs
rename to src/Mvc/test/WebSites/BasicWebSite/Controllers/RemoteAttribute_VerifyController.cs
diff --git a/test/WebSites/BasicWebSite/Controllers/RequestFormLimitsController.cs b/src/Mvc/test/WebSites/BasicWebSite/Controllers/RequestFormLimitsController.cs
similarity index 100%
rename from test/WebSites/BasicWebSite/Controllers/RequestFormLimitsController.cs
rename to src/Mvc/test/WebSites/BasicWebSite/Controllers/RequestFormLimitsController.cs
diff --git a/test/WebSites/BasicWebSite/Controllers/RequestScopedServiceController.cs b/src/Mvc/test/WebSites/BasicWebSite/Controllers/RequestScopedServiceController.cs
similarity index 100%
rename from test/WebSites/BasicWebSite/Controllers/RequestScopedServiceController.cs
rename to src/Mvc/test/WebSites/BasicWebSite/Controllers/RequestScopedServiceController.cs
diff --git a/test/WebSites/BasicWebSite/Controllers/RequestSizeLimitController.cs b/src/Mvc/test/WebSites/BasicWebSite/Controllers/RequestSizeLimitController.cs
similarity index 100%
rename from test/WebSites/BasicWebSite/Controllers/RequestSizeLimitController.cs
rename to src/Mvc/test/WebSites/BasicWebSite/Controllers/RequestSizeLimitController.cs
diff --git a/test/WebSites/BasicWebSite/Controllers/RoutingController.cs b/src/Mvc/test/WebSites/BasicWebSite/Controllers/RoutingController.cs
similarity index 100%
rename from test/WebSites/BasicWebSite/Controllers/RoutingController.cs
rename to src/Mvc/test/WebSites/BasicWebSite/Controllers/RoutingController.cs
diff --git a/test/WebSites/BasicWebSite/Controllers/SqlDataController.cs b/src/Mvc/test/WebSites/BasicWebSite/Controllers/SqlDataController.cs
similarity index 100%
rename from test/WebSites/BasicWebSite/Controllers/SqlDataController.cs
rename to src/Mvc/test/WebSites/BasicWebSite/Controllers/SqlDataController.cs
diff --git a/test/WebSites/BasicWebSite/Controllers/TempDataController.cs b/src/Mvc/test/WebSites/BasicWebSite/Controllers/TempDataController.cs
similarity index 100%
rename from test/WebSites/BasicWebSite/Controllers/TempDataController.cs
rename to src/Mvc/test/WebSites/BasicWebSite/Controllers/TempDataController.cs
diff --git a/test/WebSites/BasicWebSite/Controllers/TempDataPropertyController.cs b/src/Mvc/test/WebSites/BasicWebSite/Controllers/TempDataPropertyController.cs
similarity index 100%
rename from test/WebSites/BasicWebSite/Controllers/TempDataPropertyController.cs
rename to src/Mvc/test/WebSites/BasicWebSite/Controllers/TempDataPropertyController.cs
diff --git a/test/WebSites/BasicWebSite/Controllers/TestingController.cs b/src/Mvc/test/WebSites/BasicWebSite/Controllers/TestingController.cs
similarity index 100%
rename from test/WebSites/BasicWebSite/Controllers/TestingController.cs
rename to src/Mvc/test/WebSites/BasicWebSite/Controllers/TestingController.cs
diff --git a/test/WebSites/BasicWebSite/Controllers/UsersController.cs b/src/Mvc/test/WebSites/BasicWebSite/Controllers/UsersController.cs
similarity index 100%
rename from test/WebSites/BasicWebSite/Controllers/UsersController.cs
rename to src/Mvc/test/WebSites/BasicWebSite/Controllers/UsersController.cs
diff --git a/test/WebSites/BasicWebSite/Controllers/ViewDataPropertyController.cs b/src/Mvc/test/WebSites/BasicWebSite/Controllers/ViewDataPropertyController.cs
similarity index 100%
rename from test/WebSites/BasicWebSite/Controllers/ViewDataPropertyController.cs
rename to src/Mvc/test/WebSites/BasicWebSite/Controllers/ViewDataPropertyController.cs
diff --git a/test/WebSites/BasicWebSite/Conventions/ApplicationDescription.cs b/src/Mvc/test/WebSites/BasicWebSite/Conventions/ApplicationDescription.cs
similarity index 100%
rename from test/WebSites/BasicWebSite/Conventions/ApplicationDescription.cs
rename to src/Mvc/test/WebSites/BasicWebSite/Conventions/ApplicationDescription.cs
diff --git a/test/WebSites/BasicWebSite/Filters/RedirectAntiforgeryValidationFailedResultFilter.cs b/src/Mvc/test/WebSites/BasicWebSite/Filters/RedirectAntiforgeryValidationFailedResultFilter.cs
similarity index 100%
rename from test/WebSites/BasicWebSite/Filters/RedirectAntiforgeryValidationFailedResultFilter.cs
rename to src/Mvc/test/WebSites/BasicWebSite/Filters/RedirectAntiforgeryValidationFailedResultFilter.cs
diff --git a/test/WebSites/BasicWebSite/Filters/RequestIdService.cs b/src/Mvc/test/WebSites/BasicWebSite/Filters/RequestIdService.cs
similarity index 100%
rename from test/WebSites/BasicWebSite/Filters/RequestIdService.cs
rename to src/Mvc/test/WebSites/BasicWebSite/Filters/RequestIdService.cs
diff --git a/test/WebSites/BasicWebSite/Filters/ServiceActionFilter.cs b/src/Mvc/test/WebSites/BasicWebSite/Filters/ServiceActionFilter.cs
similarity index 100%
rename from test/WebSites/BasicWebSite/Filters/ServiceActionFilter.cs
rename to src/Mvc/test/WebSites/BasicWebSite/Filters/ServiceActionFilter.cs
diff --git a/test/WebSites/BasicWebSite/Filters/TestExceptionFilter.cs b/src/Mvc/test/WebSites/BasicWebSite/Filters/TestExceptionFilter.cs
similarity index 100%
rename from test/WebSites/BasicWebSite/Filters/TestExceptionFilter.cs
rename to src/Mvc/test/WebSites/BasicWebSite/Filters/TestExceptionFilter.cs
diff --git a/test/WebSites/BasicWebSite/Filters/TraceOutputResultFilter.cs b/src/Mvc/test/WebSites/BasicWebSite/Filters/TraceOutputResultFilter.cs
similarity index 100%
rename from test/WebSites/BasicWebSite/Filters/TraceOutputResultFilter.cs
rename to src/Mvc/test/WebSites/BasicWebSite/Filters/TraceOutputResultFilter.cs
diff --git a/test/WebSites/BasicWebSite/Filters/TraceResourceFilter.cs b/src/Mvc/test/WebSites/BasicWebSite/Filters/TraceResourceFilter.cs
similarity index 100%
rename from test/WebSites/BasicWebSite/Filters/TraceResourceFilter.cs
rename to src/Mvc/test/WebSites/BasicWebSite/Filters/TraceResourceFilter.cs
diff --git a/test/WebSites/BasicWebSite/Filters/UnprocessableResultFilter.cs b/src/Mvc/test/WebSites/BasicWebSite/Filters/UnprocessableResultFilter.cs
similarity index 100%
rename from test/WebSites/BasicWebSite/Filters/UnprocessableResultFilter.cs
rename to src/Mvc/test/WebSites/BasicWebSite/Filters/UnprocessableResultFilter.cs
diff --git a/test/WebSites/BasicWebSite/Formatters/CustomFormatter.cs b/src/Mvc/test/WebSites/BasicWebSite/Formatters/CustomFormatter.cs
similarity index 100%
rename from test/WebSites/BasicWebSite/Formatters/CustomFormatter.cs
rename to src/Mvc/test/WebSites/BasicWebSite/Formatters/CustomFormatter.cs
diff --git a/test/WebSites/BasicWebSite/Formatters/PlainTextFormatter.cs b/src/Mvc/test/WebSites/BasicWebSite/Formatters/PlainTextFormatter.cs
similarity index 100%
rename from test/WebSites/BasicWebSite/Formatters/PlainTextFormatter.cs
rename to src/Mvc/test/WebSites/BasicWebSite/Formatters/PlainTextFormatter.cs
diff --git a/test/WebSites/BasicWebSite/Formatters/VCardFormatter_V3.cs b/src/Mvc/test/WebSites/BasicWebSite/Formatters/VCardFormatter_V3.cs
similarity index 100%
rename from test/WebSites/BasicWebSite/Formatters/VCardFormatter_V3.cs
rename to src/Mvc/test/WebSites/BasicWebSite/Formatters/VCardFormatter_V3.cs
diff --git a/test/WebSites/BasicWebSite/Formatters/VCardFormatter_V4.cs b/src/Mvc/test/WebSites/BasicWebSite/Formatters/VCardFormatter_V4.cs
similarity index 100%
rename from test/WebSites/BasicWebSite/Formatters/VCardFormatter_V4.cs
rename to src/Mvc/test/WebSites/BasicWebSite/Formatters/VCardFormatter_V4.cs
diff --git a/test/WebSites/BasicWebSite/LocalizationPipeline.cs b/src/Mvc/test/WebSites/BasicWebSite/LocalizationPipeline.cs
similarity index 100%
rename from test/WebSites/BasicWebSite/LocalizationPipeline.cs
rename to src/Mvc/test/WebSites/BasicWebSite/LocalizationPipeline.cs
diff --git a/test/WebSites/BasicWebSite/ManagerHandler.cs b/src/Mvc/test/WebSites/BasicWebSite/ManagerHandler.cs
similarity index 100%
rename from test/WebSites/BasicWebSite/ManagerHandler.cs
rename to src/Mvc/test/WebSites/BasicWebSite/ManagerHandler.cs
diff --git a/test/WebSites/BasicWebSite/Models/Contact.cs b/src/Mvc/test/WebSites/BasicWebSite/Models/Contact.cs
similarity index 100%
rename from test/WebSites/BasicWebSite/Models/Contact.cs
rename to src/Mvc/test/WebSites/BasicWebSite/Models/Contact.cs
diff --git a/test/WebSites/BasicWebSite/Models/GenderType.cs b/src/Mvc/test/WebSites/BasicWebSite/Models/GenderType.cs
similarity index 100%
rename from test/WebSites/BasicWebSite/Models/GenderType.cs
rename to src/Mvc/test/WebSites/BasicWebSite/Models/GenderType.cs
diff --git a/test/WebSites/BasicWebSite/Models/LoginViewModel.cs b/src/Mvc/test/WebSites/BasicWebSite/Models/LoginViewModel.cs
similarity index 100%
rename from test/WebSites/BasicWebSite/Models/LoginViewModel.cs
rename to src/Mvc/test/WebSites/BasicWebSite/Models/LoginViewModel.cs
diff --git a/test/WebSites/BasicWebSite/Models/Person.cs b/src/Mvc/test/WebSites/BasicWebSite/Models/Person.cs
similarity index 100%
rename from test/WebSites/BasicWebSite/Models/Person.cs
rename to src/Mvc/test/WebSites/BasicWebSite/Models/Person.cs
diff --git a/test/WebSites/BasicWebSite/Models/Product.cs b/src/Mvc/test/WebSites/BasicWebSite/Models/Product.cs
similarity index 100%
rename from test/WebSites/BasicWebSite/Models/Product.cs
rename to src/Mvc/test/WebSites/BasicWebSite/Models/Product.cs
diff --git a/test/WebSites/BasicWebSite/Models/Product_Json.cs b/src/Mvc/test/WebSites/BasicWebSite/Models/Product_Json.cs
similarity index 100%
rename from test/WebSites/BasicWebSite/Models/Product_Json.cs
rename to src/Mvc/test/WebSites/BasicWebSite/Models/Product_Json.cs
diff --git a/test/WebSites/BasicWebSite/Models/Product_Xml.cs b/src/Mvc/test/WebSites/BasicWebSite/Models/Product_Xml.cs
similarity index 100%
rename from test/WebSites/BasicWebSite/Models/Product_Xml.cs
rename to src/Mvc/test/WebSites/BasicWebSite/Models/Product_Xml.cs
diff --git a/test/WebSites/BasicWebSite/Models/Product_text.cs b/src/Mvc/test/WebSites/BasicWebSite/Models/Product_text.cs
similarity index 100%
rename from test/WebSites/BasicWebSite/Models/Product_text.cs
rename to src/Mvc/test/WebSites/BasicWebSite/Models/Product_text.cs
diff --git a/test/WebSites/BasicWebSite/Models/RemoteAttributeUser.cs b/src/Mvc/test/WebSites/BasicWebSite/Models/RemoteAttributeUser.cs
similarity index 100%
rename from test/WebSites/BasicWebSite/Models/RemoteAttributeUser.cs
rename to src/Mvc/test/WebSites/BasicWebSite/Models/RemoteAttributeUser.cs
diff --git a/test/WebSites/BasicWebSite/Models/User.cs b/src/Mvc/test/WebSites/BasicWebSite/Models/User.cs
similarity index 100%
rename from test/WebSites/BasicWebSite/Models/User.cs
rename to src/Mvc/test/WebSites/BasicWebSite/Models/User.cs
diff --git a/test/WebSites/BasicWebSite/Operations.cs b/src/Mvc/test/WebSites/BasicWebSite/Operations.cs
similarity index 100%
rename from test/WebSites/BasicWebSite/Operations.cs
rename to src/Mvc/test/WebSites/BasicWebSite/Operations.cs
diff --git a/test/WebSites/BasicWebSite/Program.cs b/src/Mvc/test/WebSites/BasicWebSite/Program.cs
similarity index 100%
rename from test/WebSites/BasicWebSite/Program.cs
rename to src/Mvc/test/WebSites/BasicWebSite/Program.cs
diff --git a/test/WebSites/BasicWebSite/RequestIdMiddleware.cs b/src/Mvc/test/WebSites/BasicWebSite/RequestIdMiddleware.cs
similarity index 100%
rename from test/WebSites/BasicWebSite/RequestIdMiddleware.cs
rename to src/Mvc/test/WebSites/BasicWebSite/RequestIdMiddleware.cs
diff --git a/test/WebSites/BasicWebSite/RequestIdViewComponent.cs b/src/Mvc/test/WebSites/BasicWebSite/RequestIdViewComponent.cs
similarity index 100%
rename from test/WebSites/BasicWebSite/RequestIdViewComponent.cs
rename to src/Mvc/test/WebSites/BasicWebSite/RequestIdViewComponent.cs
diff --git a/test/WebSites/BasicWebSite/RequestScopedActionConstraint.cs b/src/Mvc/test/WebSites/BasicWebSite/RequestScopedActionConstraint.cs
similarity index 100%
rename from test/WebSites/BasicWebSite/RequestScopedActionConstraint.cs
rename to src/Mvc/test/WebSites/BasicWebSite/RequestScopedActionConstraint.cs
diff --git a/test/WebSites/BasicWebSite/RequestScopedFilter.cs b/src/Mvc/test/WebSites/BasicWebSite/RequestScopedFilter.cs
similarity index 100%
rename from test/WebSites/BasicWebSite/RequestScopedFilter.cs
rename to src/Mvc/test/WebSites/BasicWebSite/RequestScopedFilter.cs
diff --git a/test/WebSites/BasicWebSite/RequestScopedTagHelper.cs b/src/Mvc/test/WebSites/BasicWebSite/RequestScopedTagHelper.cs
similarity index 100%
rename from test/WebSites/BasicWebSite/RequestScopedTagHelper.cs
rename to src/Mvc/test/WebSites/BasicWebSite/RequestScopedTagHelper.cs
diff --git a/test/WebSites/BasicWebSite/Startup.cs b/src/Mvc/test/WebSites/BasicWebSite/Startup.cs
similarity index 100%
rename from test/WebSites/BasicWebSite/Startup.cs
rename to src/Mvc/test/WebSites/BasicWebSite/Startup.cs
diff --git a/test/WebSites/BasicWebSite/StartupRequestLimitSize.cs b/src/Mvc/test/WebSites/BasicWebSite/StartupRequestLimitSize.cs
similarity index 100%
rename from test/WebSites/BasicWebSite/StartupRequestLimitSize.cs
rename to src/Mvc/test/WebSites/BasicWebSite/StartupRequestLimitSize.cs
diff --git a/test/WebSites/BasicWebSite/StartupWithCookieTempDataProviderAndCookieConsent.cs b/src/Mvc/test/WebSites/BasicWebSite/StartupWithCookieTempDataProviderAndCookieConsent.cs
similarity index 100%
rename from test/WebSites/BasicWebSite/StartupWithCookieTempDataProviderAndCookieConsent.cs
rename to src/Mvc/test/WebSites/BasicWebSite/StartupWithCookieTempDataProviderAndCookieConsent.cs
diff --git a/test/WebSites/BasicWebSite/StartupWithCustomInvalidModelStateFactory.cs b/src/Mvc/test/WebSites/BasicWebSite/StartupWithCustomInvalidModelStateFactory.cs
similarity index 100%
rename from test/WebSites/BasicWebSite/StartupWithCustomInvalidModelStateFactory.cs
rename to src/Mvc/test/WebSites/BasicWebSite/StartupWithCustomInvalidModelStateFactory.cs
diff --git a/test/WebSites/BasicWebSite/StartupWithEndpointRouting.cs b/src/Mvc/test/WebSites/BasicWebSite/StartupWithEndpointRouting.cs
similarity index 100%
rename from test/WebSites/BasicWebSite/StartupWithEndpointRouting.cs
rename to src/Mvc/test/WebSites/BasicWebSite/StartupWithEndpointRouting.cs
diff --git a/test/WebSites/BasicWebSite/StartupWithSessionTempDataProvider.cs b/src/Mvc/test/WebSites/BasicWebSite/StartupWithSessionTempDataProvider.cs
similarity index 100%
rename from test/WebSites/BasicWebSite/StartupWithSessionTempDataProvider.cs
rename to src/Mvc/test/WebSites/BasicWebSite/StartupWithSessionTempDataProvider.cs
diff --git a/test/WebSites/BasicWebSite/StoreIntoTempDataActionResult.cs b/src/Mvc/test/WebSites/BasicWebSite/StoreIntoTempDataActionResult.cs
similarity index 100%
rename from test/WebSites/BasicWebSite/StoreIntoTempDataActionResult.cs
rename to src/Mvc/test/WebSites/BasicWebSite/StoreIntoTempDataActionResult.cs
diff --git a/test/WebSites/BasicWebSite/Views/Antiforgery/AntiforgeryTokenAndResponseCaching.cshtml b/src/Mvc/test/WebSites/BasicWebSite/Views/Antiforgery/AntiforgeryTokenAndResponseCaching.cshtml
similarity index 100%
rename from test/WebSites/BasicWebSite/Views/Antiforgery/AntiforgeryTokenAndResponseCaching.cshtml
rename to src/Mvc/test/WebSites/BasicWebSite/Views/Antiforgery/AntiforgeryTokenAndResponseCaching.cshtml
diff --git a/test/WebSites/BasicWebSite/Views/Antiforgery/FlushAsyncLogin.cshtml b/src/Mvc/test/WebSites/BasicWebSite/Views/Antiforgery/FlushAsyncLogin.cshtml
similarity index 100%
rename from test/WebSites/BasicWebSite/Views/Antiforgery/FlushAsyncLogin.cshtml
rename to src/Mvc/test/WebSites/BasicWebSite/Views/Antiforgery/FlushAsyncLogin.cshtml
diff --git a/test/WebSites/BasicWebSite/Views/Antiforgery/Index.cshtml b/src/Mvc/test/WebSites/BasicWebSite/Views/Antiforgery/Index.cshtml
similarity index 100%
rename from test/WebSites/BasicWebSite/Views/Antiforgery/Index.cshtml
rename to src/Mvc/test/WebSites/BasicWebSite/Views/Antiforgery/Index.cshtml
diff --git a/test/WebSites/BasicWebSite/Views/Antiforgery/Login.cshtml b/src/Mvc/test/WebSites/BasicWebSite/Views/Antiforgery/Login.cshtml
similarity index 100%
rename from test/WebSites/BasicWebSite/Views/Antiforgery/Login.cshtml
rename to src/Mvc/test/WebSites/BasicWebSite/Views/Antiforgery/Login.cshtml
diff --git a/test/WebSites/BasicWebSite/Views/Antiforgery/_FlushAsyncLayout.cshtml b/src/Mvc/test/WebSites/BasicWebSite/Views/Antiforgery/_FlushAsyncLayout.cshtml
similarity index 100%
rename from test/WebSites/BasicWebSite/Views/Antiforgery/_FlushAsyncLayout.cshtml
rename to src/Mvc/test/WebSites/BasicWebSite/Views/Antiforgery/_FlushAsyncLayout.cshtml
diff --git a/test/WebSites/BasicWebSite/Views/Antiforgery/_Layout.cshtml b/src/Mvc/test/WebSites/BasicWebSite/Views/Antiforgery/_Layout.cshtml
similarity index 100%
rename from test/WebSites/BasicWebSite/Views/Antiforgery/_Layout.cshtml
rename to src/Mvc/test/WebSites/BasicWebSite/Views/Antiforgery/_Layout.cshtml
diff --git a/test/WebSites/BasicWebSite/Views/Antiforgery/_LoginPartial.cshtml b/src/Mvc/test/WebSites/BasicWebSite/Views/Antiforgery/_LoginPartial.cshtml
similarity index 100%
rename from test/WebSites/BasicWebSite/Views/Antiforgery/_LoginPartial.cshtml
rename to src/Mvc/test/WebSites/BasicWebSite/Views/Antiforgery/_LoginPartial.cshtml
diff --git a/test/WebSites/BasicWebSite/Views/Home/ActionLinkView.cshtml b/src/Mvc/test/WebSites/BasicWebSite/Views/Home/ActionLinkView.cshtml
similarity index 100%
rename from test/WebSites/BasicWebSite/Views/Home/ActionLinkView.cshtml
rename to src/Mvc/test/WebSites/BasicWebSite/Views/Home/ActionLinkView.cshtml
diff --git a/test/WebSites/BasicWebSite/Views/Home/CSharp7View.cshtml b/src/Mvc/test/WebSites/BasicWebSite/Views/Home/CSharp7View.cshtml
similarity index 100%
rename from test/WebSites/BasicWebSite/Views/Home/CSharp7View.cshtml
rename to src/Mvc/test/WebSites/BasicWebSite/Views/Home/CSharp7View.cshtml
diff --git a/test/WebSites/BasicWebSite/Views/Home/Index.cshtml b/src/Mvc/test/WebSites/BasicWebSite/Views/Home/Index.cshtml
similarity index 100%
rename from test/WebSites/BasicWebSite/Views/Home/Index.cshtml
rename to src/Mvc/test/WebSites/BasicWebSite/Views/Home/Index.cshtml
diff --git a/test/WebSites/BasicWebSite/Views/Home/JsonHelperInView.cshtml b/src/Mvc/test/WebSites/BasicWebSite/Views/Home/JsonHelperInView.cshtml
similarity index 100%
rename from test/WebSites/BasicWebSite/Views/Home/JsonHelperInView.cshtml
rename to src/Mvc/test/WebSites/BasicWebSite/Views/Home/JsonHelperInView.cshtml
diff --git a/test/WebSites/BasicWebSite/Views/Home/JsonHelperWithSettingsInView.cshtml b/src/Mvc/test/WebSites/BasicWebSite/Views/Home/JsonHelperWithSettingsInView.cshtml
similarity index 100%
rename from test/WebSites/BasicWebSite/Views/Home/JsonHelperWithSettingsInView.cshtml
rename to src/Mvc/test/WebSites/BasicWebSite/Views/Home/JsonHelperWithSettingsInView.cshtml
diff --git a/test/WebSites/BasicWebSite/Views/Home/PlainView.cshtml b/src/Mvc/test/WebSites/BasicWebSite/Views/Home/PlainView.cshtml
similarity index 100%
rename from test/WebSites/BasicWebSite/Views/Home/PlainView.cshtml
rename to src/Mvc/test/WebSites/BasicWebSite/Views/Home/PlainView.cshtml
diff --git a/test/WebSites/BasicWebSite/Views/Home/ViewWithPrefixedAttributeValue.cshtml b/src/Mvc/test/WebSites/BasicWebSite/Views/Home/ViewWithPrefixedAttributeValue.cshtml
similarity index 100%
rename from test/WebSites/BasicWebSite/Views/Home/ViewWithPrefixedAttributeValue.cshtml
rename to src/Mvc/test/WebSites/BasicWebSite/Views/Home/ViewWithPrefixedAttributeValue.cshtml
diff --git a/test/WebSites/BasicWebSite/Views/Links/ActionLink_ActionOnOtherController.cshtml b/src/Mvc/test/WebSites/BasicWebSite/Views/Links/ActionLink_ActionOnOtherController.cshtml
similarity index 100%
rename from test/WebSites/BasicWebSite/Views/Links/ActionLink_ActionOnOtherController.cshtml
rename to src/Mvc/test/WebSites/BasicWebSite/Views/Links/ActionLink_ActionOnOtherController.cshtml
diff --git a/test/WebSites/BasicWebSite/Views/Links/ActionLink_ActionOnSameController.cshtml b/src/Mvc/test/WebSites/BasicWebSite/Views/Links/ActionLink_ActionOnSameController.cshtml
similarity index 100%
rename from test/WebSites/BasicWebSite/Views/Links/ActionLink_ActionOnSameController.cshtml
rename to src/Mvc/test/WebSites/BasicWebSite/Views/Links/ActionLink_ActionOnSameController.cshtml
diff --git a/test/WebSites/BasicWebSite/Views/Links/ActionLink_HostNameFragmentAttributes.cshtml b/src/Mvc/test/WebSites/BasicWebSite/Views/Links/ActionLink_HostNameFragmentAttributes.cshtml
similarity index 100%
rename from test/WebSites/BasicWebSite/Views/Links/ActionLink_HostNameFragmentAttributes.cshtml
rename to src/Mvc/test/WebSites/BasicWebSite/Views/Links/ActionLink_HostNameFragmentAttributes.cshtml
diff --git a/test/WebSites/BasicWebSite/Views/Links/ActionLink_SecurePage_ImplicitHostName.cshtml b/src/Mvc/test/WebSites/BasicWebSite/Views/Links/ActionLink_SecurePage_ImplicitHostName.cshtml
similarity index 100%
rename from test/WebSites/BasicWebSite/Views/Links/ActionLink_SecurePage_ImplicitHostName.cshtml
rename to src/Mvc/test/WebSites/BasicWebSite/Views/Links/ActionLink_SecurePage_ImplicitHostName.cshtml
diff --git a/test/WebSites/BasicWebSite/Views/Links/RouteLink_HostNameFragmentAttributes.cshtml b/src/Mvc/test/WebSites/BasicWebSite/Views/Links/RouteLink_HostNameFragmentAttributes.cshtml
similarity index 100%
rename from test/WebSites/BasicWebSite/Views/Links/RouteLink_HostNameFragmentAttributes.cshtml
rename to src/Mvc/test/WebSites/BasicWebSite/Views/Links/RouteLink_HostNameFragmentAttributes.cshtml
diff --git a/test/WebSites/BasicWebSite/Views/Links/RouteLink_RestLinkToOtherController.cshtml b/src/Mvc/test/WebSites/BasicWebSite/Views/Links/RouteLink_RestLinkToOtherController.cshtml
similarity index 100%
rename from test/WebSites/BasicWebSite/Views/Links/RouteLink_RestLinkToOtherController.cshtml
rename to src/Mvc/test/WebSites/BasicWebSite/Views/Links/RouteLink_RestLinkToOtherController.cshtml
diff --git a/test/WebSites/BasicWebSite/Views/Links/RouteLink_SecureApi_ImplicitHostName.cshtml b/src/Mvc/test/WebSites/BasicWebSite/Views/Links/RouteLink_SecureApi_ImplicitHostName.cshtml
similarity index 100%
rename from test/WebSites/BasicWebSite/Views/Links/RouteLink_SecureApi_ImplicitHostName.cshtml
rename to src/Mvc/test/WebSites/BasicWebSite/Views/Links/RouteLink_SecureApi_ImplicitHostName.cshtml
diff --git a/test/WebSites/BasicWebSite/Views/PageRoute/AttributeRouteView.cshtml b/src/Mvc/test/WebSites/BasicWebSite/Views/PageRoute/AttributeRouteView.cshtml
similarity index 100%
rename from test/WebSites/BasicWebSite/Views/PageRoute/AttributeRouteView.cshtml
rename to src/Mvc/test/WebSites/BasicWebSite/Views/PageRoute/AttributeRouteView.cshtml
diff --git a/test/WebSites/BasicWebSite/Views/PageRoute/ConventionalRouteView.cshtml b/src/Mvc/test/WebSites/BasicWebSite/Views/PageRoute/ConventionalRouteView.cshtml
similarity index 100%
rename from test/WebSites/BasicWebSite/Views/PageRoute/ConventionalRouteView.cshtml
rename to src/Mvc/test/WebSites/BasicWebSite/Views/PageRoute/ConventionalRouteView.cshtml
diff --git a/test/WebSites/BasicWebSite/Views/RemoteAttribute_Home/Create.cshtml b/src/Mvc/test/WebSites/BasicWebSite/Views/RemoteAttribute_Home/Create.cshtml
similarity index 100%
rename from test/WebSites/BasicWebSite/Views/RemoteAttribute_Home/Create.cshtml
rename to src/Mvc/test/WebSites/BasicWebSite/Views/RemoteAttribute_Home/Create.cshtml
diff --git a/test/WebSites/BasicWebSite/Views/RemoteAttribute_Home/_Layout.cshtml b/src/Mvc/test/WebSites/BasicWebSite/Views/RemoteAttribute_Home/_Layout.cshtml
similarity index 100%
rename from test/WebSites/BasicWebSite/Views/RemoteAttribute_Home/_Layout.cshtml
rename to src/Mvc/test/WebSites/BasicWebSite/Views/RemoteAttribute_Home/_Layout.cshtml
diff --git a/test/WebSites/BasicWebSite/Views/RequestScopedService/TagHelper.cshtml b/src/Mvc/test/WebSites/BasicWebSite/Views/RequestScopedService/TagHelper.cshtml
similarity index 100%
rename from test/WebSites/BasicWebSite/Views/RequestScopedService/TagHelper.cshtml
rename to src/Mvc/test/WebSites/BasicWebSite/Views/RequestScopedService/TagHelper.cshtml
diff --git a/test/WebSites/BasicWebSite/Views/RequestScopedService/View.cshtml b/src/Mvc/test/WebSites/BasicWebSite/Views/RequestScopedService/View.cshtml
similarity index 100%
rename from test/WebSites/BasicWebSite/Views/RequestScopedService/View.cshtml
rename to src/Mvc/test/WebSites/BasicWebSite/Views/RequestScopedService/View.cshtml
diff --git a/test/WebSites/BasicWebSite/Views/RequestScopedService/ViewComponent.cshtml b/src/Mvc/test/WebSites/BasicWebSite/Views/RequestScopedService/ViewComponent.cshtml
similarity index 100%
rename from test/WebSites/BasicWebSite/Views/RequestScopedService/ViewComponent.cshtml
rename to src/Mvc/test/WebSites/BasicWebSite/Views/RequestScopedService/ViewComponent.cshtml
diff --git a/test/WebSites/BasicWebSite/Views/Shared/Components/PassThrough/Default.cshtml b/src/Mvc/test/WebSites/BasicWebSite/Views/Shared/Components/PassThrough/Default.cshtml
similarity index 100%
rename from test/WebSites/BasicWebSite/Views/Shared/Components/PassThrough/Default.cshtml
rename to src/Mvc/test/WebSites/BasicWebSite/Views/Shared/Components/PassThrough/Default.cshtml
diff --git a/test/WebSites/BasicWebSite/Views/Shared/Components/ViewData/Default.cshtml b/src/Mvc/test/WebSites/BasicWebSite/Views/Shared/Components/ViewData/Default.cshtml
similarity index 100%
rename from test/WebSites/BasicWebSite/Views/Shared/Components/ViewData/Default.cshtml
rename to src/Mvc/test/WebSites/BasicWebSite/Views/Shared/Components/ViewData/Default.cshtml
diff --git a/test/WebSites/BasicWebSite/Views/Shared/Error.cshtml b/src/Mvc/test/WebSites/BasicWebSite/Views/Shared/Error.cshtml
similarity index 100%
rename from test/WebSites/BasicWebSite/Views/Shared/Error.cshtml
rename to src/Mvc/test/WebSites/BasicWebSite/Views/Shared/Error.cshtml
diff --git a/test/WebSites/BasicWebSite/Views/Shared/_Layout.cshtml b/src/Mvc/test/WebSites/BasicWebSite/Views/Shared/_Layout.cshtml
similarity index 100%
rename from test/WebSites/BasicWebSite/Views/Shared/_Layout.cshtml
rename to src/Mvc/test/WebSites/BasicWebSite/Views/Shared/_Layout.cshtml
diff --git a/test/WebSites/BasicWebSite/Views/TempData/DisplayTempData.cshtml b/src/Mvc/test/WebSites/BasicWebSite/Views/TempData/DisplayTempData.cshtml
similarity index 100%
rename from test/WebSites/BasicWebSite/Views/TempData/DisplayTempData.cshtml
rename to src/Mvc/test/WebSites/BasicWebSite/Views/TempData/DisplayTempData.cshtml
diff --git a/test/WebSites/BasicWebSite/Views/TempData/Index.cshtml b/src/Mvc/test/WebSites/BasicWebSite/Views/TempData/Index.cshtml
similarity index 100%
rename from test/WebSites/BasicWebSite/Views/TempData/Index.cshtml
rename to src/Mvc/test/WebSites/BasicWebSite/Views/TempData/Index.cshtml
diff --git a/test/WebSites/BasicWebSite/Views/TempDataProperty/DetailsView.cshtml b/src/Mvc/test/WebSites/BasicWebSite/Views/TempDataProperty/DetailsView.cshtml
similarity index 100%
rename from test/WebSites/BasicWebSite/Views/TempDataProperty/DetailsView.cshtml
rename to src/Mvc/test/WebSites/BasicWebSite/Views/TempDataProperty/DetailsView.cshtml
diff --git a/test/WebSites/BasicWebSite/Views/ViewDataProperty/ViewDataInViewComponent.cshtml b/src/Mvc/test/WebSites/BasicWebSite/Views/ViewDataProperty/ViewDataInViewComponent.cshtml
similarity index 100%
rename from test/WebSites/BasicWebSite/Views/ViewDataProperty/ViewDataInViewComponent.cshtml
rename to src/Mvc/test/WebSites/BasicWebSite/Views/ViewDataProperty/ViewDataInViewComponent.cshtml
diff --git a/test/WebSites/BasicWebSite/Views/ViewDataProperty/ViewDataPropertyToView.cshtml b/src/Mvc/test/WebSites/BasicWebSite/Views/ViewDataProperty/ViewDataPropertyToView.cshtml
similarity index 100%
rename from test/WebSites/BasicWebSite/Views/ViewDataProperty/ViewDataPropertyToView.cshtml
rename to src/Mvc/test/WebSites/BasicWebSite/Views/ViewDataProperty/ViewDataPropertyToView.cshtml
diff --git a/test/WebSites/BasicWebSite/Views/ViewDataProperty/_Layout.cshtml b/src/Mvc/test/WebSites/BasicWebSite/Views/ViewDataProperty/_Layout.cshtml
similarity index 100%
rename from test/WebSites/BasicWebSite/Views/ViewDataProperty/_Layout.cshtml
rename to src/Mvc/test/WebSites/BasicWebSite/Views/ViewDataProperty/_Layout.cshtml
diff --git a/test/WebSites/BasicWebSite/VndErrorAttribute.cs b/src/Mvc/test/WebSites/BasicWebSite/VndErrorAttribute.cs
similarity index 100%
rename from test/WebSites/BasicWebSite/VndErrorAttribute.cs
rename to src/Mvc/test/WebSites/BasicWebSite/VndErrorAttribute.cs
diff --git a/test/WebSites/BasicWebSite/_bower.json b/src/Mvc/test/WebSites/BasicWebSite/_bower.json
similarity index 100%
rename from test/WebSites/BasicWebSite/_bower.json
rename to src/Mvc/test/WebSites/BasicWebSite/_bower.json
diff --git a/test/WebSites/BasicWebSite/_bower.readme b/src/Mvc/test/WebSites/BasicWebSite/_bower.readme
similarity index 100%
rename from test/WebSites/BasicWebSite/_bower.readme
rename to src/Mvc/test/WebSites/BasicWebSite/_bower.readme
diff --git a/test/WebSites/BasicWebSite/_gruntfile.js b/src/Mvc/test/WebSites/BasicWebSite/_gruntfile.js
similarity index 100%
rename from test/WebSites/BasicWebSite/_gruntfile.js
rename to src/Mvc/test/WebSites/BasicWebSite/_gruntfile.js
diff --git a/test/WebSites/BasicWebSite/_package.json b/src/Mvc/test/WebSites/BasicWebSite/_package.json
similarity index 100%
rename from test/WebSites/BasicWebSite/_package.json
rename to src/Mvc/test/WebSites/BasicWebSite/_package.json
diff --git a/test/WebSites/BasicWebSite/readme.md b/src/Mvc/test/WebSites/BasicWebSite/readme.md
similarity index 100%
rename from test/WebSites/BasicWebSite/readme.md
rename to src/Mvc/test/WebSites/BasicWebSite/readme.md
diff --git a/test/WebSites/BasicWebSite/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js b/src/Mvc/test/WebSites/BasicWebSite/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js
similarity index 100%
rename from test/WebSites/BasicWebSite/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js
rename to src/Mvc/test/WebSites/BasicWebSite/wwwroot/lib/jquery-validation-unobtrusive/jquery.validate.unobtrusive.min.js
diff --git a/test/WebSites/Common/TestResponseGenerator.cs b/src/Mvc/test/WebSites/Common/TestResponseGenerator.cs
similarity index 100%
rename from test/WebSites/Common/TestResponseGenerator.cs
rename to src/Mvc/test/WebSites/Common/TestResponseGenerator.cs
diff --git a/test/WebSites/ControllersFromServicesClassLibrary/ClientUIStubController.cs b/src/Mvc/test/WebSites/ControllersFromServicesClassLibrary/ClientUIStubController.cs
similarity index 100%
rename from test/WebSites/ControllersFromServicesClassLibrary/ClientUIStubController.cs
rename to src/Mvc/test/WebSites/ControllersFromServicesClassLibrary/ClientUIStubController.cs
diff --git a/test/WebSites/ControllersFromServicesClassLibrary/ControllerWithConstructorInjection.cs b/src/Mvc/test/WebSites/ControllersFromServicesClassLibrary/ControllerWithConstructorInjection.cs
similarity index 100%
rename from test/WebSites/ControllersFromServicesClassLibrary/ControllerWithConstructorInjection.cs
rename to src/Mvc/test/WebSites/ControllersFromServicesClassLibrary/ControllerWithConstructorInjection.cs
diff --git a/test/WebSites/ControllersFromServicesClassLibrary/ControllersFromServicesClassLibrary.csproj b/src/Mvc/test/WebSites/ControllersFromServicesClassLibrary/ControllersFromServicesClassLibrary.csproj
similarity index 100%
rename from test/WebSites/ControllersFromServicesClassLibrary/ControllersFromServicesClassLibrary.csproj
rename to src/Mvc/test/WebSites/ControllersFromServicesClassLibrary/ControllersFromServicesClassLibrary.csproj
diff --git a/test/WebSites/ControllersFromServicesClassLibrary/EmployeeRecords.cs b/src/Mvc/test/WebSites/ControllersFromServicesClassLibrary/EmployeeRecords.cs
similarity index 100%
rename from test/WebSites/ControllersFromServicesClassLibrary/EmployeeRecords.cs
rename to src/Mvc/test/WebSites/ControllersFromServicesClassLibrary/EmployeeRecords.cs
diff --git a/test/WebSites/ControllersFromServicesClassLibrary/GenericController.cs b/src/Mvc/test/WebSites/ControllersFromServicesClassLibrary/GenericController.cs
similarity index 100%
rename from test/WebSites/ControllersFromServicesClassLibrary/GenericController.cs
rename to src/Mvc/test/WebSites/ControllersFromServicesClassLibrary/GenericController.cs
diff --git a/test/WebSites/ControllersFromServicesClassLibrary/Inventory.cs b/src/Mvc/test/WebSites/ControllersFromServicesClassLibrary/Inventory.cs
similarity index 100%
rename from test/WebSites/ControllersFromServicesClassLibrary/Inventory.cs
rename to src/Mvc/test/WebSites/ControllersFromServicesClassLibrary/Inventory.cs
diff --git a/test/WebSites/ControllersFromServicesClassLibrary/NestedControllerOwner.cs b/src/Mvc/test/WebSites/ControllersFromServicesClassLibrary/NestedControllerOwner.cs
similarity index 100%
rename from test/WebSites/ControllersFromServicesClassLibrary/NestedControllerOwner.cs
rename to src/Mvc/test/WebSites/ControllersFromServicesClassLibrary/NestedControllerOwner.cs
diff --git a/test/WebSites/ControllersFromServicesClassLibrary/QueryValueService.cs b/src/Mvc/test/WebSites/ControllersFromServicesClassLibrary/QueryValueService.cs
similarity index 100%
rename from test/WebSites/ControllersFromServicesClassLibrary/QueryValueService.cs
rename to src/Mvc/test/WebSites/ControllersFromServicesClassLibrary/QueryValueService.cs
diff --git a/test/WebSites/ControllersFromServicesClassLibrary/ResourcesController.cs b/src/Mvc/test/WebSites/ControllersFromServicesClassLibrary/ResourcesController.cs
similarity index 100%
rename from test/WebSites/ControllersFromServicesClassLibrary/ResourcesController.cs
rename to src/Mvc/test/WebSites/ControllersFromServicesClassLibrary/ResourcesController.cs
diff --git a/test/WebSites/ControllersFromServicesClassLibrary/TimeScheduleController.cs b/src/Mvc/test/WebSites/ControllersFromServicesClassLibrary/TimeScheduleController.cs
similarity index 100%
rename from test/WebSites/ControllersFromServicesClassLibrary/TimeScheduleController.cs
rename to src/Mvc/test/WebSites/ControllersFromServicesClassLibrary/TimeScheduleController.cs
diff --git a/test/WebSites/ControllersFromServicesWebSite/AnotherController.cs b/src/Mvc/test/WebSites/ControllersFromServicesWebSite/AnotherController.cs
similarity index 100%
rename from test/WebSites/ControllersFromServicesWebSite/AnotherController.cs
rename to src/Mvc/test/WebSites/ControllersFromServicesWebSite/AnotherController.cs
diff --git a/test/WebSites/ControllersFromServicesWebSite/Components/ComponentFromServicesViewComponent.cs b/src/Mvc/test/WebSites/ControllersFromServicesWebSite/Components/ComponentFromServicesViewComponent.cs
similarity index 100%
rename from test/WebSites/ControllersFromServicesWebSite/Components/ComponentFromServicesViewComponent.cs
rename to src/Mvc/test/WebSites/ControllersFromServicesWebSite/Components/ComponentFromServicesViewComponent.cs
diff --git a/test/WebSites/ControllersFromServicesWebSite/ControllersFromServicesWebSite.csproj b/src/Mvc/test/WebSites/ControllersFromServicesWebSite/ControllersFromServicesWebSite.csproj
similarity index 100%
rename from test/WebSites/ControllersFromServicesWebSite/ControllersFromServicesWebSite.csproj
rename to src/Mvc/test/WebSites/ControllersFromServicesWebSite/ControllersFromServicesWebSite.csproj
diff --git a/test/WebSites/ControllersFromServicesWebSite/NotInServicesController.cs b/src/Mvc/test/WebSites/ControllersFromServicesWebSite/NotInServicesController.cs
similarity index 100%
rename from test/WebSites/ControllersFromServicesWebSite/NotInServicesController.cs
rename to src/Mvc/test/WebSites/ControllersFromServicesWebSite/NotInServicesController.cs
diff --git a/test/WebSites/ControllersFromServicesWebSite/Startup.cs b/src/Mvc/test/WebSites/ControllersFromServicesWebSite/Startup.cs
similarity index 100%
rename from test/WebSites/ControllersFromServicesWebSite/Startup.cs
rename to src/Mvc/test/WebSites/ControllersFromServicesWebSite/Startup.cs
diff --git a/test/WebSites/ControllersFromServicesWebSite/TagHelpers/InServicesTagHelper.cs b/src/Mvc/test/WebSites/ControllersFromServicesWebSite/TagHelpers/InServicesTagHelper.cs
similarity index 100%
rename from test/WebSites/ControllersFromServicesWebSite/TagHelpers/InServicesTagHelper.cs
rename to src/Mvc/test/WebSites/ControllersFromServicesWebSite/TagHelpers/InServicesTagHelper.cs
diff --git a/test/WebSites/ControllersFromServicesWebSite/ValueService.cs b/src/Mvc/test/WebSites/ControllersFromServicesWebSite/ValueService.cs
similarity index 100%
rename from test/WebSites/ControllersFromServicesWebSite/ValueService.cs
rename to src/Mvc/test/WebSites/ControllersFromServicesWebSite/ValueService.cs
diff --git a/test/WebSites/ControllersFromServicesWebSite/ViewData.cshtml b/src/Mvc/test/WebSites/ControllersFromServicesWebSite/ViewData.cshtml
similarity index 100%
rename from test/WebSites/ControllersFromServicesWebSite/ViewData.cshtml
rename to src/Mvc/test/WebSites/ControllersFromServicesWebSite/ViewData.cshtml
diff --git a/test/WebSites/ControllersFromServicesWebSite/Views/Another/InServicesTagHelper.cshtml b/src/Mvc/test/WebSites/ControllersFromServicesWebSite/Views/Another/InServicesTagHelper.cshtml
similarity index 100%
rename from test/WebSites/ControllersFromServicesWebSite/Views/Another/InServicesTagHelper.cshtml
rename to src/Mvc/test/WebSites/ControllersFromServicesWebSite/Views/Another/InServicesTagHelper.cshtml
diff --git a/test/WebSites/ControllersFromServicesWebSite/readme.md b/src/Mvc/test/WebSites/ControllersFromServicesWebSite/readme.md
similarity index 100%
rename from test/WebSites/ControllersFromServicesWebSite/readme.md
rename to src/Mvc/test/WebSites/ControllersFromServicesWebSite/readme.md
diff --git a/test/WebSites/CorsWebSite/Controllers/BlogController.cs b/src/Mvc/test/WebSites/CorsWebSite/Controllers/BlogController.cs
similarity index 100%
rename from test/WebSites/CorsWebSite/Controllers/BlogController.cs
rename to src/Mvc/test/WebSites/CorsWebSite/Controllers/BlogController.cs
diff --git a/test/WebSites/CorsWebSite/Controllers/CustomerController.cs b/src/Mvc/test/WebSites/CorsWebSite/Controllers/CustomerController.cs
similarity index 100%
rename from test/WebSites/CorsWebSite/Controllers/CustomerController.cs
rename to src/Mvc/test/WebSites/CorsWebSite/Controllers/CustomerController.cs
diff --git a/test/WebSites/CorsWebSite/Controllers/StoreController.cs b/src/Mvc/test/WebSites/CorsWebSite/Controllers/StoreController.cs
similarity index 100%
rename from test/WebSites/CorsWebSite/Controllers/StoreController.cs
rename to src/Mvc/test/WebSites/CorsWebSite/Controllers/StoreController.cs
diff --git a/test/WebSites/CorsWebSite/CorsWebSite.csproj b/src/Mvc/test/WebSites/CorsWebSite/CorsWebSite.csproj
similarity index 100%
rename from test/WebSites/CorsWebSite/CorsWebSite.csproj
rename to src/Mvc/test/WebSites/CorsWebSite/CorsWebSite.csproj
diff --git a/test/WebSites/CorsWebSite/Filters/AllRequestsBlockingAuthorizationFilter.cs b/src/Mvc/test/WebSites/CorsWebSite/Filters/AllRequestsBlockingAuthorizationFilter.cs
similarity index 100%
rename from test/WebSites/CorsWebSite/Filters/AllRequestsBlockingAuthorizationFilter.cs
rename to src/Mvc/test/WebSites/CorsWebSite/Filters/AllRequestsBlockingAuthorizationFilter.cs
diff --git a/test/WebSites/CorsWebSite/Program.cs b/src/Mvc/test/WebSites/CorsWebSite/Program.cs
similarity index 100%
rename from test/WebSites/CorsWebSite/Program.cs
rename to src/Mvc/test/WebSites/CorsWebSite/Program.cs
diff --git a/test/WebSites/CorsWebSite/Startup.cs b/src/Mvc/test/WebSites/CorsWebSite/Startup.cs
similarity index 100%
rename from test/WebSites/CorsWebSite/Startup.cs
rename to src/Mvc/test/WebSites/CorsWebSite/Startup.cs
diff --git a/test/WebSites/CorsWebSite/StartupWith21Compat.cs b/src/Mvc/test/WebSites/CorsWebSite/StartupWith21Compat.cs
similarity index 100%
rename from test/WebSites/CorsWebSite/StartupWith21Compat.cs
rename to src/Mvc/test/WebSites/CorsWebSite/StartupWith21Compat.cs
diff --git a/test/WebSites/CorsWebSite/readme.md b/src/Mvc/test/WebSites/CorsWebSite/readme.md
similarity index 100%
rename from test/WebSites/CorsWebSite/readme.md
rename to src/Mvc/test/WebSites/CorsWebSite/readme.md
diff --git a/test/WebSites/Directory.Build.props b/src/Mvc/test/WebSites/Directory.Build.props
similarity index 100%
rename from test/WebSites/Directory.Build.props
rename to src/Mvc/test/WebSites/Directory.Build.props
diff --git a/test/WebSites/ErrorPageMiddlewareWebSite/AggregateExceptionController.cs b/src/Mvc/test/WebSites/ErrorPageMiddlewareWebSite/AggregateExceptionController.cs
similarity index 100%
rename from test/WebSites/ErrorPageMiddlewareWebSite/AggregateExceptionController.cs
rename to src/Mvc/test/WebSites/ErrorPageMiddlewareWebSite/AggregateExceptionController.cs
diff --git a/test/WebSites/ErrorPageMiddlewareWebSite/ErrorPageMiddlewareController.cs b/src/Mvc/test/WebSites/ErrorPageMiddlewareWebSite/ErrorPageMiddlewareController.cs
similarity index 100%
rename from test/WebSites/ErrorPageMiddlewareWebSite/ErrorPageMiddlewareController.cs
rename to src/Mvc/test/WebSites/ErrorPageMiddlewareWebSite/ErrorPageMiddlewareController.cs
diff --git a/test/WebSites/ErrorPageMiddlewareWebSite/ErrorPageMiddlewareWebSite.csproj b/src/Mvc/test/WebSites/ErrorPageMiddlewareWebSite/ErrorPageMiddlewareWebSite.csproj
similarity index 100%
rename from test/WebSites/ErrorPageMiddlewareWebSite/ErrorPageMiddlewareWebSite.csproj
rename to src/Mvc/test/WebSites/ErrorPageMiddlewareWebSite/ErrorPageMiddlewareWebSite.csproj
diff --git a/test/WebSites/ErrorPageMiddlewareWebSite/README.md b/src/Mvc/test/WebSites/ErrorPageMiddlewareWebSite/README.md
similarity index 100%
rename from test/WebSites/ErrorPageMiddlewareWebSite/README.md
rename to src/Mvc/test/WebSites/ErrorPageMiddlewareWebSite/README.md
diff --git a/test/WebSites/ErrorPageMiddlewareWebSite/Startup.cs b/src/Mvc/test/WebSites/ErrorPageMiddlewareWebSite/Startup.cs
similarity index 100%
rename from test/WebSites/ErrorPageMiddlewareWebSite/Startup.cs
rename to src/Mvc/test/WebSites/ErrorPageMiddlewareWebSite/Startup.cs
diff --git a/test/WebSites/ErrorPageMiddlewareWebSite/Views/ErrorFromViewImports/Index.cshtml b/src/Mvc/test/WebSites/ErrorPageMiddlewareWebSite/Views/ErrorFromViewImports/Index.cshtml
similarity index 100%
rename from test/WebSites/ErrorPageMiddlewareWebSite/Views/ErrorFromViewImports/Index.cshtml
rename to src/Mvc/test/WebSites/ErrorPageMiddlewareWebSite/Views/ErrorFromViewImports/Index.cshtml
diff --git a/test/WebSites/ErrorPageMiddlewareWebSite/Views/ErrorFromViewImports/_ViewImports.cshtml b/src/Mvc/test/WebSites/ErrorPageMiddlewareWebSite/Views/ErrorFromViewImports/_ViewImports.cshtml
similarity index 100%
rename from test/WebSites/ErrorPageMiddlewareWebSite/Views/ErrorFromViewImports/_ViewImports.cshtml
rename to src/Mvc/test/WebSites/ErrorPageMiddlewareWebSite/Views/ErrorFromViewImports/_ViewImports.cshtml
diff --git a/test/WebSites/ErrorPageMiddlewareWebSite/Views/ErrorPageMiddleware/CompilationFailure.cshtml b/src/Mvc/test/WebSites/ErrorPageMiddlewareWebSite/Views/ErrorPageMiddleware/CompilationFailure.cshtml
similarity index 100%
rename from test/WebSites/ErrorPageMiddlewareWebSite/Views/ErrorPageMiddleware/CompilationFailure.cshtml
rename to src/Mvc/test/WebSites/ErrorPageMiddlewareWebSite/Views/ErrorPageMiddleware/CompilationFailure.cshtml
diff --git a/test/WebSites/ErrorPageMiddlewareWebSite/Views/ErrorPageMiddleware/ParserError.cshtml b/src/Mvc/test/WebSites/ErrorPageMiddlewareWebSite/Views/ErrorPageMiddleware/ParserError.cshtml
similarity index 100%
rename from test/WebSites/ErrorPageMiddlewareWebSite/Views/ErrorPageMiddleware/ParserError.cshtml
rename to src/Mvc/test/WebSites/ErrorPageMiddlewareWebSite/Views/ErrorPageMiddleware/ParserError.cshtml
diff --git a/test/WebSites/ErrorPageMiddlewareWebSite/Views/ErrorPageMiddleware/RuntimeError.cshtml b/src/Mvc/test/WebSites/ErrorPageMiddlewareWebSite/Views/ErrorPageMiddleware/RuntimeError.cshtml
similarity index 100%
rename from test/WebSites/ErrorPageMiddlewareWebSite/Views/ErrorPageMiddleware/RuntimeError.cshtml
rename to src/Mvc/test/WebSites/ErrorPageMiddlewareWebSite/Views/ErrorPageMiddleware/RuntimeError.cshtml
diff --git a/test/WebSites/FSharpWebSite/Controllers/HomeController.fs b/src/Mvc/test/WebSites/FSharpWebSite/Controllers/HomeController.fs
similarity index 100%
rename from test/WebSites/FSharpWebSite/Controllers/HomeController.fs
rename to src/Mvc/test/WebSites/FSharpWebSite/Controllers/HomeController.fs
diff --git a/test/WebSites/FSharpWebSite/FSharpWebSite.fsproj b/src/Mvc/test/WebSites/FSharpWebSite/FSharpWebSite.fsproj
similarity index 100%
rename from test/WebSites/FSharpWebSite/FSharpWebSite.fsproj
rename to src/Mvc/test/WebSites/FSharpWebSite/FSharpWebSite.fsproj
diff --git a/test/WebSites/FSharpWebSite/Program.fs b/src/Mvc/test/WebSites/FSharpWebSite/Program.fs
similarity index 100%
rename from test/WebSites/FSharpWebSite/Program.fs
rename to src/Mvc/test/WebSites/FSharpWebSite/Program.fs
diff --git a/test/WebSites/FSharpWebSite/Startup.fs b/src/Mvc/test/WebSites/FSharpWebSite/Startup.fs
similarity index 100%
rename from test/WebSites/FSharpWebSite/Startup.fs
rename to src/Mvc/test/WebSites/FSharpWebSite/Startup.fs
diff --git a/test/WebSites/FSharpWebSite/Views/Home/Index.cshtml b/src/Mvc/test/WebSites/FSharpWebSite/Views/Home/Index.cshtml
similarity index 100%
rename from test/WebSites/FSharpWebSite/Views/Home/Index.cshtml
rename to src/Mvc/test/WebSites/FSharpWebSite/Views/Home/Index.cshtml
diff --git a/test/WebSites/FSharpWebSite/Views/Shared/_Layout.cshtml b/src/Mvc/test/WebSites/FSharpWebSite/Views/Shared/_Layout.cshtml
similarity index 100%
rename from test/WebSites/FSharpWebSite/Views/Shared/_Layout.cshtml
rename to src/Mvc/test/WebSites/FSharpWebSite/Views/Shared/_Layout.cshtml
diff --git a/test/WebSites/FSharpWebSite/Views/_ViewImports.cshtml b/src/Mvc/test/WebSites/FSharpWebSite/Views/_ViewImports.cshtml
similarity index 100%
rename from test/WebSites/FSharpWebSite/Views/_ViewImports.cshtml
rename to src/Mvc/test/WebSites/FSharpWebSite/Views/_ViewImports.cshtml
diff --git a/test/WebSites/FSharpWebSite/Views/_ViewStart.cshtml b/src/Mvc/test/WebSites/FSharpWebSite/Views/_ViewStart.cshtml
similarity index 100%
rename from test/WebSites/FSharpWebSite/Views/_ViewStart.cshtml
rename to src/Mvc/test/WebSites/FSharpWebSite/Views/_ViewStart.cshtml
diff --git a/test/WebSites/FilesWebSite/Controllers/DownloadFilesController.cs b/src/Mvc/test/WebSites/FilesWebSite/Controllers/DownloadFilesController.cs
similarity index 100%
rename from test/WebSites/FilesWebSite/Controllers/DownloadFilesController.cs
rename to src/Mvc/test/WebSites/FilesWebSite/Controllers/DownloadFilesController.cs
diff --git a/test/WebSites/FilesWebSite/Controllers/EmbeddedFilesController.cs b/src/Mvc/test/WebSites/FilesWebSite/Controllers/EmbeddedFilesController.cs
similarity index 100%
rename from test/WebSites/FilesWebSite/Controllers/EmbeddedFilesController.cs
rename to src/Mvc/test/WebSites/FilesWebSite/Controllers/EmbeddedFilesController.cs
diff --git a/test/WebSites/FilesWebSite/Controllers/UploadFilesController.cs b/src/Mvc/test/WebSites/FilesWebSite/Controllers/UploadFilesController.cs
similarity index 100%
rename from test/WebSites/FilesWebSite/Controllers/UploadFilesController.cs
rename to src/Mvc/test/WebSites/FilesWebSite/Controllers/UploadFilesController.cs
diff --git a/test/WebSites/FilesWebSite/EmbeddedResources/Greetings.txt b/src/Mvc/test/WebSites/FilesWebSite/EmbeddedResources/Greetings.txt
similarity index 100%
rename from test/WebSites/FilesWebSite/EmbeddedResources/Greetings.txt
rename to src/Mvc/test/WebSites/FilesWebSite/EmbeddedResources/Greetings.txt
diff --git a/test/WebSites/FilesWebSite/FilesWebSite.csproj b/src/Mvc/test/WebSites/FilesWebSite/FilesWebSite.csproj
similarity index 100%
rename from test/WebSites/FilesWebSite/FilesWebSite.csproj
rename to src/Mvc/test/WebSites/FilesWebSite/FilesWebSite.csproj
diff --git a/test/WebSites/FilesWebSite/Models/Product.cs b/src/Mvc/test/WebSites/FilesWebSite/Models/Product.cs
similarity index 100%
rename from test/WebSites/FilesWebSite/Models/Product.cs
rename to src/Mvc/test/WebSites/FilesWebSite/Models/Product.cs
diff --git a/test/WebSites/FilesWebSite/Models/User.cs b/src/Mvc/test/WebSites/FilesWebSite/Models/User.cs
similarity index 100%
rename from test/WebSites/FilesWebSite/Models/User.cs
rename to src/Mvc/test/WebSites/FilesWebSite/Models/User.cs
diff --git a/test/WebSites/FilesWebSite/Startup.cs b/src/Mvc/test/WebSites/FilesWebSite/Startup.cs
similarity index 100%
rename from test/WebSites/FilesWebSite/Startup.cs
rename to src/Mvc/test/WebSites/FilesWebSite/Startup.cs
diff --git a/test/WebSites/FilesWebSite/readme.md b/src/Mvc/test/WebSites/FilesWebSite/readme.md
similarity index 100%
rename from test/WebSites/FilesWebSite/readme.md
rename to src/Mvc/test/WebSites/FilesWebSite/readme.md
diff --git a/test/WebSites/FilesWebSite/sample.txt b/src/Mvc/test/WebSites/FilesWebSite/sample.txt
similarity index 100%
rename from test/WebSites/FilesWebSite/sample.txt
rename to src/Mvc/test/WebSites/FilesWebSite/sample.txt
diff --git a/test/WebSites/FormatterWebSite/Controllers/DataContractSerializerController.cs b/src/Mvc/test/WebSites/FormatterWebSite/Controllers/DataContractSerializerController.cs
similarity index 100%
rename from test/WebSites/FormatterWebSite/Controllers/DataContractSerializerController.cs
rename to src/Mvc/test/WebSites/FormatterWebSite/Controllers/DataContractSerializerController.cs
diff --git a/test/WebSites/FormatterWebSite/Controllers/DoNotRespectBrowserAcceptHeaderController.cs b/src/Mvc/test/WebSites/FormatterWebSite/Controllers/DoNotRespectBrowserAcceptHeaderController.cs
similarity index 100%
rename from test/WebSites/FormatterWebSite/Controllers/DoNotRespectBrowserAcceptHeaderController.cs
rename to src/Mvc/test/WebSites/FormatterWebSite/Controllers/DoNotRespectBrowserAcceptHeaderController.cs
diff --git a/test/WebSites/FormatterWebSite/Controllers/HomeController.cs b/src/Mvc/test/WebSites/FormatterWebSite/Controllers/HomeController.cs
similarity index 100%
rename from test/WebSites/FormatterWebSite/Controllers/HomeController.cs
rename to src/Mvc/test/WebSites/FormatterWebSite/Controllers/HomeController.cs
diff --git a/test/WebSites/FormatterWebSite/Controllers/InputFormatterController.cs b/src/Mvc/test/WebSites/FormatterWebSite/Controllers/InputFormatterController.cs
similarity index 100%
rename from test/WebSites/FormatterWebSite/Controllers/InputFormatterController.cs
rename to src/Mvc/test/WebSites/FormatterWebSite/Controllers/InputFormatterController.cs
diff --git a/test/WebSites/FormatterWebSite/Controllers/JsonFormatterController.cs b/src/Mvc/test/WebSites/FormatterWebSite/Controllers/JsonFormatterController.cs
similarity index 100%
rename from test/WebSites/FormatterWebSite/Controllers/JsonFormatterController.cs
rename to src/Mvc/test/WebSites/FormatterWebSite/Controllers/JsonFormatterController.cs
diff --git a/test/WebSites/FormatterWebSite/Controllers/JsonPatchController.cs b/src/Mvc/test/WebSites/FormatterWebSite/Controllers/JsonPatchController.cs
similarity index 100%
rename from test/WebSites/FormatterWebSite/Controllers/JsonPatchController.cs
rename to src/Mvc/test/WebSites/FormatterWebSite/Controllers/JsonPatchController.cs
diff --git a/test/WebSites/FormatterWebSite/Controllers/PolymorphicBindingController.cs b/src/Mvc/test/WebSites/FormatterWebSite/Controllers/PolymorphicBindingController.cs
similarity index 100%
rename from test/WebSites/FormatterWebSite/Controllers/PolymorphicBindingController.cs
rename to src/Mvc/test/WebSites/FormatterWebSite/Controllers/PolymorphicBindingController.cs
diff --git a/test/WebSites/FormatterWebSite/Controllers/PolymorphicPropertyBindingController.cs b/src/Mvc/test/WebSites/FormatterWebSite/Controllers/PolymorphicPropertyBindingController.cs
similarity index 100%
rename from test/WebSites/FormatterWebSite/Controllers/PolymorphicPropertyBindingController.cs
rename to src/Mvc/test/WebSites/FormatterWebSite/Controllers/PolymorphicPropertyBindingController.cs
diff --git a/test/WebSites/FormatterWebSite/Controllers/RespectBrowserAcceptHeaderController.cs b/src/Mvc/test/WebSites/FormatterWebSite/Controllers/RespectBrowserAcceptHeaderController.cs
similarity index 100%
rename from test/WebSites/FormatterWebSite/Controllers/RespectBrowserAcceptHeaderController.cs
rename to src/Mvc/test/WebSites/FormatterWebSite/Controllers/RespectBrowserAcceptHeaderController.cs
diff --git a/test/WebSites/FormatterWebSite/Controllers/SerializableErrorController.cs b/src/Mvc/test/WebSites/FormatterWebSite/Controllers/SerializableErrorController.cs
similarity index 100%
rename from test/WebSites/FormatterWebSite/Controllers/SerializableErrorController.cs
rename to src/Mvc/test/WebSites/FormatterWebSite/Controllers/SerializableErrorController.cs
diff --git a/test/WebSites/FormatterWebSite/Controllers/StreamController.cs b/src/Mvc/test/WebSites/FormatterWebSite/Controllers/StreamController.cs
similarity index 100%
rename from test/WebSites/FormatterWebSite/Controllers/StreamController.cs
rename to src/Mvc/test/WebSites/FormatterWebSite/Controllers/StreamController.cs
diff --git a/test/WebSites/FormatterWebSite/Controllers/TestApiController.cs b/src/Mvc/test/WebSites/FormatterWebSite/Controllers/TestApiController.cs
similarity index 100%
rename from test/WebSites/FormatterWebSite/Controllers/TestApiController.cs
rename to src/Mvc/test/WebSites/FormatterWebSite/Controllers/TestApiController.cs
diff --git a/test/WebSites/FormatterWebSite/Controllers/TopLevelValidationController.cs b/src/Mvc/test/WebSites/FormatterWebSite/Controllers/TopLevelValidationController.cs
similarity index 100%
rename from test/WebSites/FormatterWebSite/Controllers/TopLevelValidationController.cs
rename to src/Mvc/test/WebSites/FormatterWebSite/Controllers/TopLevelValidationController.cs
diff --git a/test/WebSites/FormatterWebSite/Controllers/ValidationController.cs b/src/Mvc/test/WebSites/FormatterWebSite/Controllers/ValidationController.cs
similarity index 100%
rename from test/WebSites/FormatterWebSite/Controllers/ValidationController.cs
rename to src/Mvc/test/WebSites/FormatterWebSite/Controllers/ValidationController.cs
diff --git a/test/WebSites/FormatterWebSite/Controllers/XmlSerializerController.cs b/src/Mvc/test/WebSites/FormatterWebSite/Controllers/XmlSerializerController.cs
similarity index 100%
rename from test/WebSites/FormatterWebSite/Controllers/XmlSerializerController.cs
rename to src/Mvc/test/WebSites/FormatterWebSite/Controllers/XmlSerializerController.cs
diff --git a/test/WebSites/FormatterWebSite/Filters/ModelStateValidationFilterAttribute.cs b/src/Mvc/test/WebSites/FormatterWebSite/Filters/ModelStateValidationFilterAttribute.cs
similarity index 100%
rename from test/WebSites/FormatterWebSite/Filters/ModelStateValidationFilterAttribute.cs
rename to src/Mvc/test/WebSites/FormatterWebSite/Filters/ModelStateValidationFilterAttribute.cs
diff --git a/test/WebSites/FormatterWebSite/FormatterWebSite.csproj b/src/Mvc/test/WebSites/FormatterWebSite/FormatterWebSite.csproj
similarity index 100%
rename from test/WebSites/FormatterWebSite/FormatterWebSite.csproj
rename to src/Mvc/test/WebSites/FormatterWebSite/FormatterWebSite.csproj
diff --git a/test/WebSites/FormatterWebSite/IModelConverter.cs b/src/Mvc/test/WebSites/FormatterWebSite/IModelConverter.cs
similarity index 100%
rename from test/WebSites/FormatterWebSite/IModelConverter.cs
rename to src/Mvc/test/WebSites/FormatterWebSite/IModelConverter.cs
diff --git a/test/WebSites/FormatterWebSite/Models/BaseModel.cs b/src/Mvc/test/WebSites/FormatterWebSite/Models/BaseModel.cs
similarity index 100%
rename from test/WebSites/FormatterWebSite/Models/BaseModel.cs
rename to src/Mvc/test/WebSites/FormatterWebSite/Models/BaseModel.cs
diff --git a/test/WebSites/FormatterWebSite/Models/BookModelWithNoValidation.cs b/src/Mvc/test/WebSites/FormatterWebSite/Models/BookModelWithNoValidation.cs
similarity index 100%
rename from test/WebSites/FormatterWebSite/Models/BookModelWithNoValidation.cs
rename to src/Mvc/test/WebSites/FormatterWebSite/Models/BookModelWithNoValidation.cs
diff --git a/test/WebSites/FormatterWebSite/Models/DerivedDummyClass.cs b/src/Mvc/test/WebSites/FormatterWebSite/Models/DerivedDummyClass.cs
similarity index 100%
rename from test/WebSites/FormatterWebSite/Models/DerivedDummyClass.cs
rename to src/Mvc/test/WebSites/FormatterWebSite/Models/DerivedDummyClass.cs
diff --git a/test/WebSites/FormatterWebSite/Models/DerivedModel.cs b/src/Mvc/test/WebSites/FormatterWebSite/Models/DerivedModel.cs
similarity index 100%
rename from test/WebSites/FormatterWebSite/Models/DerivedModel.cs
rename to src/Mvc/test/WebSites/FormatterWebSite/Models/DerivedModel.cs
diff --git a/test/WebSites/FormatterWebSite/Models/Developer.cs b/src/Mvc/test/WebSites/FormatterWebSite/Models/Developer.cs
similarity index 100%
rename from test/WebSites/FormatterWebSite/Models/Developer.cs
rename to src/Mvc/test/WebSites/FormatterWebSite/Models/Developer.cs
diff --git a/test/WebSites/FormatterWebSite/Models/DummyClass.cs b/src/Mvc/test/WebSites/FormatterWebSite/Models/DummyClass.cs
similarity index 100%
rename from test/WebSites/FormatterWebSite/Models/DummyClass.cs
rename to src/Mvc/test/WebSites/FormatterWebSite/Models/DummyClass.cs
diff --git a/test/WebSites/FormatterWebSite/Models/Employee.cs b/src/Mvc/test/WebSites/FormatterWebSite/Models/Employee.cs
similarity index 100%
rename from test/WebSites/FormatterWebSite/Models/Employee.cs
rename to src/Mvc/test/WebSites/FormatterWebSite/Models/Employee.cs
diff --git a/test/WebSites/FormatterWebSite/Models/ErrorInfo.cs b/src/Mvc/test/WebSites/FormatterWebSite/Models/ErrorInfo.cs
similarity index 100%
rename from test/WebSites/FormatterWebSite/Models/ErrorInfo.cs
rename to src/Mvc/test/WebSites/FormatterWebSite/Models/ErrorInfo.cs
diff --git a/test/WebSites/FormatterWebSite/Models/IModel.cs b/src/Mvc/test/WebSites/FormatterWebSite/Models/IModel.cs
similarity index 100%
rename from test/WebSites/FormatterWebSite/Models/IModel.cs
rename to src/Mvc/test/WebSites/FormatterWebSite/Models/IModel.cs
diff --git a/test/WebSites/FormatterWebSite/Models/InfinitelyRecursiveModel.cs b/src/Mvc/test/WebSites/FormatterWebSite/Models/InfinitelyRecursiveModel.cs
similarity index 100%
rename from test/WebSites/FormatterWebSite/Models/InfinitelyRecursiveModel.cs
rename to src/Mvc/test/WebSites/FormatterWebSite/Models/InfinitelyRecursiveModel.cs
diff --git a/test/WebSites/FormatterWebSite/Models/Person.cs b/src/Mvc/test/WebSites/FormatterWebSite/Models/Person.cs
similarity index 100%
rename from test/WebSites/FormatterWebSite/Models/Person.cs
rename to src/Mvc/test/WebSites/FormatterWebSite/Models/Person.cs
diff --git a/test/WebSites/FormatterWebSite/Models/Product.cs b/src/Mvc/test/WebSites/FormatterWebSite/Models/Product.cs
similarity index 100%
rename from test/WebSites/FormatterWebSite/Models/Product.cs
rename to src/Mvc/test/WebSites/FormatterWebSite/Models/Product.cs
diff --git a/test/WebSites/FormatterWebSite/Models/Project.cs b/src/Mvc/test/WebSites/FormatterWebSite/Models/Project.cs
similarity index 100%
rename from test/WebSites/FormatterWebSite/Models/Project.cs
rename to src/Mvc/test/WebSites/FormatterWebSite/Models/Project.cs
diff --git a/test/WebSites/FormatterWebSite/Models/RecursiveIdentifier.cs b/src/Mvc/test/WebSites/FormatterWebSite/Models/RecursiveIdentifier.cs
similarity index 100%
rename from test/WebSites/FormatterWebSite/Models/RecursiveIdentifier.cs
rename to src/Mvc/test/WebSites/FormatterWebSite/Models/RecursiveIdentifier.cs
diff --git a/test/WebSites/FormatterWebSite/Models/Review.cs b/src/Mvc/test/WebSites/FormatterWebSite/Models/Review.cs
similarity index 100%
rename from test/WebSites/FormatterWebSite/Models/Review.cs
rename to src/Mvc/test/WebSites/FormatterWebSite/Models/Review.cs
diff --git a/test/WebSites/FormatterWebSite/Models/SimpleTypePropertiesModel.cs b/src/Mvc/test/WebSites/FormatterWebSite/Models/SimpleTypePropertiesModel.cs
similarity index 100%
rename from test/WebSites/FormatterWebSite/Models/SimpleTypePropertiesModel.cs
rename to src/Mvc/test/WebSites/FormatterWebSite/Models/SimpleTypePropertiesModel.cs
diff --git a/test/WebSites/FormatterWebSite/Models/User.cs b/src/Mvc/test/WebSites/FormatterWebSite/Models/User.cs
similarity index 100%
rename from test/WebSites/FormatterWebSite/Models/User.cs
rename to src/Mvc/test/WebSites/FormatterWebSite/Models/User.cs
diff --git a/test/WebSites/FormatterWebSite/Models/ValidationProviderAttributeModel.cs b/src/Mvc/test/WebSites/FormatterWebSite/Models/ValidationProviderAttributeModel.cs
similarity index 100%
rename from test/WebSites/FormatterWebSite/Models/ValidationProviderAttributeModel.cs
rename to src/Mvc/test/WebSites/FormatterWebSite/Models/ValidationProviderAttributeModel.cs
diff --git a/test/WebSites/FormatterWebSite/PolymorphicBinder.cs b/src/Mvc/test/WebSites/FormatterWebSite/PolymorphicBinder.cs
similarity index 100%
rename from test/WebSites/FormatterWebSite/PolymorphicBinder.cs
rename to src/Mvc/test/WebSites/FormatterWebSite/PolymorphicBinder.cs
diff --git a/test/WebSites/FormatterWebSite/Program.cs b/src/Mvc/test/WebSites/FormatterWebSite/Program.cs
similarity index 100%
rename from test/WebSites/FormatterWebSite/Program.cs
rename to src/Mvc/test/WebSites/FormatterWebSite/Program.cs
diff --git a/test/WebSites/FormatterWebSite/Startup.cs b/src/Mvc/test/WebSites/FormatterWebSite/Startup.cs
similarity index 100%
rename from test/WebSites/FormatterWebSite/Startup.cs
rename to src/Mvc/test/WebSites/FormatterWebSite/Startup.cs
diff --git a/test/WebSites/FormatterWebSite/StartupWithRespectBrowserAcceptHeader.cs b/src/Mvc/test/WebSites/FormatterWebSite/StartupWithRespectBrowserAcceptHeader.cs
similarity index 100%
rename from test/WebSites/FormatterWebSite/StartupWithRespectBrowserAcceptHeader.cs
rename to src/Mvc/test/WebSites/FormatterWebSite/StartupWithRespectBrowserAcceptHeader.cs
diff --git a/test/WebSites/FormatterWebSite/StringInputFormatter.cs b/src/Mvc/test/WebSites/FormatterWebSite/StringInputFormatter.cs
similarity index 100%
rename from test/WebSites/FormatterWebSite/StringInputFormatter.cs
rename to src/Mvc/test/WebSites/FormatterWebSite/StringInputFormatter.cs
diff --git a/test/WebSites/FormatterWebSite/ValidateBodyParameterAttribute.cs b/src/Mvc/test/WebSites/FormatterWebSite/ValidateBodyParameterAttribute.cs
similarity index 100%
rename from test/WebSites/FormatterWebSite/ValidateBodyParameterAttribute.cs
rename to src/Mvc/test/WebSites/FormatterWebSite/ValidateBodyParameterAttribute.cs
diff --git a/test/WebSites/FormatterWebSite/readme.md b/src/Mvc/test/WebSites/FormatterWebSite/readme.md
similarity index 100%
rename from test/WebSites/FormatterWebSite/readme.md
rename to src/Mvc/test/WebSites/FormatterWebSite/readme.md
diff --git a/test/WebSites/HtmlGenerationWebSite/Areas/Customer/Controllers/HtmlGeneration_CustomerController.cs b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Areas/Customer/Controllers/HtmlGeneration_CustomerController.cs
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/Areas/Customer/Controllers/HtmlGeneration_CustomerController.cs
rename to src/Mvc/test/WebSites/HtmlGenerationWebSite/Areas/Customer/Controllers/HtmlGeneration_CustomerController.cs
diff --git a/test/WebSites/HtmlGenerationWebSite/Areas/Customer/Pages/PartialWithFallback.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Areas/Customer/Pages/PartialWithFallback.cshtml
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/Areas/Customer/Pages/PartialWithFallback.cshtml
rename to src/Mvc/test/WebSites/HtmlGenerationWebSite/Areas/Customer/Pages/PartialWithFallback.cshtml
diff --git a/test/WebSites/HtmlGenerationWebSite/Areas/Customer/Pages/PartialWithOptional.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Areas/Customer/Pages/PartialWithOptional.cshtml
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/Areas/Customer/Pages/PartialWithOptional.cshtml
rename to src/Mvc/test/WebSites/HtmlGenerationWebSite/Areas/Customer/Pages/PartialWithOptional.cshtml
diff --git a/test/WebSites/HtmlGenerationWebSite/Areas/Customer/Pages/_Fallback.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Areas/Customer/Pages/_Fallback.cshtml
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/Areas/Customer/Pages/_Fallback.cshtml
rename to src/Mvc/test/WebSites/HtmlGenerationWebSite/Areas/Customer/Pages/_Fallback.cshtml
diff --git a/test/WebSites/HtmlGenerationWebSite/Areas/Customer/Pages/_ViewImports.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Areas/Customer/Pages/_ViewImports.cshtml
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/Areas/Customer/Pages/_ViewImports.cshtml
rename to src/Mvc/test/WebSites/HtmlGenerationWebSite/Areas/Customer/Pages/_ViewImports.cshtml
diff --git a/test/WebSites/HtmlGenerationWebSite/Components/CheckViewData - LackModel.cs b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Components/CheckViewData - LackModel.cs
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/Components/CheckViewData - LackModel.cs
rename to src/Mvc/test/WebSites/HtmlGenerationWebSite/Components/CheckViewData - LackModel.cs
diff --git a/test/WebSites/HtmlGenerationWebSite/Components/CheckViewData.cs b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Components/CheckViewData.cs
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/Components/CheckViewData.cs
rename to src/Mvc/test/WebSites/HtmlGenerationWebSite/Components/CheckViewData.cs
diff --git a/test/WebSites/HtmlGenerationWebSite/Components/SplashViewComponent.cs b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Components/SplashViewComponent.cs
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/Components/SplashViewComponent.cs
rename to src/Mvc/test/WebSites/HtmlGenerationWebSite/Components/SplashViewComponent.cs
diff --git a/test/WebSites/HtmlGenerationWebSite/Controllers/Catalog_CacheTagHelperController.cs b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Controllers/Catalog_CacheTagHelperController.cs
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/Controllers/Catalog_CacheTagHelperController.cs
rename to src/Mvc/test/WebSites/HtmlGenerationWebSite/Controllers/Catalog_CacheTagHelperController.cs
diff --git a/test/WebSites/HtmlGenerationWebSite/Controllers/CheckViewData.cs b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Controllers/CheckViewData.cs
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/Controllers/CheckViewData.cs
rename to src/Mvc/test/WebSites/HtmlGenerationWebSite/Controllers/CheckViewData.cs
diff --git a/test/WebSites/HtmlGenerationWebSite/Controllers/HtmlGeneration_HomeController.cs b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Controllers/HtmlGeneration_HomeController.cs
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/Controllers/HtmlGeneration_HomeController.cs
rename to src/Mvc/test/WebSites/HtmlGenerationWebSite/Controllers/HtmlGeneration_HomeController.cs
diff --git a/test/WebSites/HtmlGenerationWebSite/Controllers/HtmlGeneration_OrderController.cs b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Controllers/HtmlGeneration_OrderController.cs
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/Controllers/HtmlGeneration_OrderController.cs
rename to src/Mvc/test/WebSites/HtmlGenerationWebSite/Controllers/HtmlGeneration_OrderController.cs
diff --git a/test/WebSites/HtmlGenerationWebSite/Controllers/HtmlGeneration_ProductController.cs b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Controllers/HtmlGeneration_ProductController.cs
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/Controllers/HtmlGeneration_ProductController.cs
rename to src/Mvc/test/WebSites/HtmlGenerationWebSite/Controllers/HtmlGeneration_ProductController.cs
diff --git a/test/WebSites/HtmlGenerationWebSite/Controllers/HtmlGeneration_WeirdExpressions.cs b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Controllers/HtmlGeneration_WeirdExpressions.cs
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/Controllers/HtmlGeneration_WeirdExpressions.cs
rename to src/Mvc/test/WebSites/HtmlGenerationWebSite/Controllers/HtmlGeneration_WeirdExpressions.cs
diff --git a/test/WebSites/HtmlGenerationWebSite/HtmlGenerationWebSite.csproj b/src/Mvc/test/WebSites/HtmlGenerationWebSite/HtmlGenerationWebSite.csproj
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/HtmlGenerationWebSite.csproj
rename to src/Mvc/test/WebSites/HtmlGenerationWebSite/HtmlGenerationWebSite.csproj
diff --git a/test/WebSites/HtmlGenerationWebSite/ISignalTokenProviderService.cs b/src/Mvc/test/WebSites/HtmlGenerationWebSite/ISignalTokenProviderService.cs
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/ISignalTokenProviderService.cs
rename to src/Mvc/test/WebSites/HtmlGenerationWebSite/ISignalTokenProviderService.cs
diff --git a/test/WebSites/HtmlGenerationWebSite/Models/AClass.cs b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Models/AClass.cs
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/Models/AClass.cs
rename to src/Mvc/test/WebSites/HtmlGenerationWebSite/Models/AClass.cs
diff --git a/test/WebSites/HtmlGenerationWebSite/Models/Customer.cs b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Models/Customer.cs
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/Models/Customer.cs
rename to src/Mvc/test/WebSites/HtmlGenerationWebSite/Models/Customer.cs
diff --git a/test/WebSites/HtmlGenerationWebSite/Models/DayOfWeek.cs b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Models/DayOfWeek.cs
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/Models/DayOfWeek.cs
rename to src/Mvc/test/WebSites/HtmlGenerationWebSite/Models/DayOfWeek.cs
diff --git a/test/WebSites/HtmlGenerationWebSite/Models/Employee.cs b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Models/Employee.cs
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/Models/Employee.cs
rename to src/Mvc/test/WebSites/HtmlGenerationWebSite/Models/Employee.cs
diff --git a/test/WebSites/HtmlGenerationWebSite/Models/Folder.cs b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Models/Folder.cs
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/Models/Folder.cs
rename to src/Mvc/test/WebSites/HtmlGenerationWebSite/Models/Folder.cs
diff --git a/test/WebSites/HtmlGenerationWebSite/Models/Gender.cs b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Models/Gender.cs
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/Models/Gender.cs
rename to src/Mvc/test/WebSites/HtmlGenerationWebSite/Models/Gender.cs
diff --git a/test/WebSites/HtmlGenerationWebSite/Models/Item.cs b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Models/Item.cs
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/Models/Item.cs
rename to src/Mvc/test/WebSites/HtmlGenerationWebSite/Models/Item.cs
diff --git a/test/WebSites/HtmlGenerationWebSite/Models/Month.cs b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Models/Month.cs
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/Models/Month.cs
rename to src/Mvc/test/WebSites/HtmlGenerationWebSite/Models/Month.cs
diff --git a/test/WebSites/HtmlGenerationWebSite/Models/Order.cs b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Models/Order.cs
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/Models/Order.cs
rename to src/Mvc/test/WebSites/HtmlGenerationWebSite/Models/Order.cs
diff --git a/test/WebSites/HtmlGenerationWebSite/Models/PartialModel.cs b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Models/PartialModel.cs
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/Models/PartialModel.cs
rename to src/Mvc/test/WebSites/HtmlGenerationWebSite/Models/PartialModel.cs
diff --git a/test/WebSites/HtmlGenerationWebSite/Models/Person.cs b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Models/Person.cs
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/Models/Person.cs
rename to src/Mvc/test/WebSites/HtmlGenerationWebSite/Models/Person.cs
diff --git a/test/WebSites/HtmlGenerationWebSite/Models/Product.cs b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Models/Product.cs
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/Models/Product.cs
rename to src/Mvc/test/WebSites/HtmlGenerationWebSite/Models/Product.cs
diff --git a/test/WebSites/HtmlGenerationWebSite/Models/ProductRecommendations.cs b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Models/ProductRecommendations.cs
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/Models/ProductRecommendations.cs
rename to src/Mvc/test/WebSites/HtmlGenerationWebSite/Models/ProductRecommendations.cs
diff --git a/test/WebSites/HtmlGenerationWebSite/Models/StatusMessageModel.cs b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Models/StatusMessageModel.cs
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/Models/StatusMessageModel.cs
rename to src/Mvc/test/WebSites/HtmlGenerationWebSite/Models/StatusMessageModel.cs
diff --git a/test/WebSites/HtmlGenerationWebSite/Models/SuperTemplateModel.cs b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Models/SuperTemplateModel.cs
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/Models/SuperTemplateModel.cs
rename to src/Mvc/test/WebSites/HtmlGenerationWebSite/Models/SuperTemplateModel.cs
diff --git a/test/WebSites/HtmlGenerationWebSite/Models/SuperViewModel.cs b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Models/SuperViewModel.cs
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/Models/SuperViewModel.cs
rename to src/Mvc/test/WebSites/HtmlGenerationWebSite/Models/SuperViewModel.cs
diff --git a/test/WebSites/HtmlGenerationWebSite/Models/TemplateModel.cs b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Models/TemplateModel.cs
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/Models/TemplateModel.cs
rename to src/Mvc/test/WebSites/HtmlGenerationWebSite/Models/TemplateModel.cs
diff --git a/test/WebSites/HtmlGenerationWebSite/Models/ValidationProviderAttributeModel.cs b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Models/ValidationProviderAttributeModel.cs
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/Models/ValidationProviderAttributeModel.cs
rename to src/Mvc/test/WebSites/HtmlGenerationWebSite/Models/ValidationProviderAttributeModel.cs
diff --git a/test/WebSites/HtmlGenerationWebSite/Models/ViewModel.cs b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Models/ViewModel.cs
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/Models/ViewModel.cs
rename to src/Mvc/test/WebSites/HtmlGenerationWebSite/Models/ViewModel.cs
diff --git a/test/WebSites/HtmlGenerationWebSite/Models/Warehouse.cs b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Models/Warehouse.cs
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/Models/Warehouse.cs
rename to src/Mvc/test/WebSites/HtmlGenerationWebSite/Models/Warehouse.cs
diff --git a/test/WebSites/HtmlGenerationWebSite/Models/WeirdModel.cs b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Models/WeirdModel.cs
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/Models/WeirdModel.cs
rename to src/Mvc/test/WebSites/HtmlGenerationWebSite/Models/WeirdModel.cs
diff --git a/test/WebSites/HtmlGenerationWebSite/Pages/CacheTagHelper_VaryByCulture.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Pages/CacheTagHelper_VaryByCulture.cshtml
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/Pages/CacheTagHelper_VaryByCulture.cshtml
rename to src/Mvc/test/WebSites/HtmlGenerationWebSite/Pages/CacheTagHelper_VaryByCulture.cshtml
diff --git a/test/WebSites/HtmlGenerationWebSite/Pages/_ViewImports.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Pages/_ViewImports.cshtml
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/Pages/_ViewImports.cshtml
rename to src/Mvc/test/WebSites/HtmlGenerationWebSite/Pages/_ViewImports.cshtml
diff --git a/test/WebSites/HtmlGenerationWebSite/ProductsService.cs b/src/Mvc/test/WebSites/HtmlGenerationWebSite/ProductsService.cs
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/ProductsService.cs
rename to src/Mvc/test/WebSites/HtmlGenerationWebSite/ProductsService.cs
diff --git a/test/WebSites/HtmlGenerationWebSite/SignalTokenProviderService.cs b/src/Mvc/test/WebSites/HtmlGenerationWebSite/SignalTokenProviderService.cs
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/SignalTokenProviderService.cs
rename to src/Mvc/test/WebSites/HtmlGenerationWebSite/SignalTokenProviderService.cs
diff --git a/test/WebSites/HtmlGenerationWebSite/Startup.cs b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Startup.cs
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/Startup.cs
rename to src/Mvc/test/WebSites/HtmlGenerationWebSite/Startup.cs
diff --git a/test/WebSites/HtmlGenerationWebSite/StartupWith21CompatibilityBehavior.cs b/src/Mvc/test/WebSites/HtmlGenerationWebSite/StartupWith21CompatibilityBehavior.cs
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/StartupWith21CompatibilityBehavior.cs
rename to src/Mvc/test/WebSites/HtmlGenerationWebSite/StartupWith21CompatibilityBehavior.cs
diff --git a/test/WebSites/HtmlGenerationWebSite/StartupWithCultureReplace.cs b/src/Mvc/test/WebSites/HtmlGenerationWebSite/StartupWithCultureReplace.cs
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/StartupWithCultureReplace.cs
rename to src/Mvc/test/WebSites/HtmlGenerationWebSite/StartupWithCultureReplace.cs
diff --git a/test/WebSites/HtmlGenerationWebSite/TestCacheTagHelper.cs b/src/Mvc/test/WebSites/HtmlGenerationWebSite/TestCacheTagHelper.cs
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/TestCacheTagHelper.cs
rename to src/Mvc/test/WebSites/HtmlGenerationWebSite/TestCacheTagHelper.cs
diff --git a/test/WebSites/HtmlGenerationWebSite/Views/Catalog_CacheTagHelper/ConfirmPayment.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/Catalog_CacheTagHelper/ConfirmPayment.cshtml
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/Views/Catalog_CacheTagHelper/ConfirmPayment.cshtml
rename to src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/Catalog_CacheTagHelper/ConfirmPayment.cshtml
diff --git a/test/WebSites/HtmlGenerationWebSite/Views/Catalog_CacheTagHelper/Deals.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/Catalog_CacheTagHelper/Deals.cshtml
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/Views/Catalog_CacheTagHelper/Deals.cshtml
rename to src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/Catalog_CacheTagHelper/Deals.cshtml
diff --git a/test/WebSites/HtmlGenerationWebSite/Views/Catalog_CacheTagHelper/Details.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/Catalog_CacheTagHelper/Details.cshtml
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/Views/Catalog_CacheTagHelper/Details.cshtml
rename to src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/Catalog_CacheTagHelper/Details.cshtml
diff --git a/test/WebSites/HtmlGenerationWebSite/Views/Catalog_CacheTagHelper/ListCategories.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/Catalog_CacheTagHelper/ListCategories.cshtml
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/Views/Catalog_CacheTagHelper/ListCategories.cshtml
rename to src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/Catalog_CacheTagHelper/ListCategories.cshtml
diff --git a/test/WebSites/HtmlGenerationWebSite/Views/Catalog_CacheTagHelper/PastPurchases.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/Catalog_CacheTagHelper/PastPurchases.cshtml
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/Views/Catalog_CacheTagHelper/PastPurchases.cshtml
rename to src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/Catalog_CacheTagHelper/PastPurchases.cshtml
diff --git a/test/WebSites/HtmlGenerationWebSite/Views/Catalog_CacheTagHelper/ShoppingCart.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/Catalog_CacheTagHelper/ShoppingCart.cshtml
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/Views/Catalog_CacheTagHelper/ShoppingCart.cshtml
rename to src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/Catalog_CacheTagHelper/ShoppingCart.cshtml
diff --git a/test/WebSites/HtmlGenerationWebSite/Views/Catalog_CacheTagHelper/Splash.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/Catalog_CacheTagHelper/Splash.cshtml
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/Views/Catalog_CacheTagHelper/Splash.cshtml
rename to src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/Catalog_CacheTagHelper/Splash.cshtml
diff --git a/test/WebSites/HtmlGenerationWebSite/Views/Catalog_CacheTagHelper/_SplashPartial.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/Catalog_CacheTagHelper/_SplashPartial.cshtml
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/Views/Catalog_CacheTagHelper/_SplashPartial.cshtml
rename to src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/Catalog_CacheTagHelper/_SplashPartial.cshtml
diff --git a/test/WebSites/HtmlGenerationWebSite/Views/Catalog_CacheTagHelper/_ViewImports.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/Catalog_CacheTagHelper/_ViewImports.cshtml
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/Views/Catalog_CacheTagHelper/_ViewImports.cshtml
rename to src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/Catalog_CacheTagHelper/_ViewImports.cshtml
diff --git a/test/WebSites/HtmlGenerationWebSite/Views/CheckViewData/AtViewModel.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/CheckViewData/AtViewModel.cshtml
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/Views/CheckViewData/AtViewModel.cshtml
rename to src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/CheckViewData/AtViewModel.cshtml
diff --git a/test/WebSites/HtmlGenerationWebSite/Views/CheckViewData/Components/CheckViewData/Default.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/CheckViewData/Components/CheckViewData/Default.cshtml
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/Views/CheckViewData/Components/CheckViewData/Default.cshtml
rename to src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/CheckViewData/Components/CheckViewData/Default.cshtml
diff --git a/test/WebSites/HtmlGenerationWebSite/Views/CheckViewData/Components/CheckViewData___LackModel/Default.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/CheckViewData/Components/CheckViewData___LackModel/Default.cshtml
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/Views/CheckViewData/Components/CheckViewData___LackModel/Default.cshtml
rename to src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/CheckViewData/Components/CheckViewData___LackModel/Default.cshtml
diff --git a/test/WebSites/HtmlGenerationWebSite/Views/CheckViewData/DisplayTemplates/Int32 - LackModel.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/CheckViewData/DisplayTemplates/Int32 - LackModel.cshtml
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/Views/CheckViewData/DisplayTemplates/Int32 - LackModel.cshtml
rename to src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/CheckViewData/DisplayTemplates/Int32 - LackModel.cshtml
diff --git a/test/WebSites/HtmlGenerationWebSite/Views/CheckViewData/DisplayTemplates/Int32.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/CheckViewData/DisplayTemplates/Int32.cshtml
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/Views/CheckViewData/DisplayTemplates/Int32.cshtml
rename to src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/CheckViewData/DisplayTemplates/Int32.cshtml
diff --git a/test/WebSites/HtmlGenerationWebSite/Views/CheckViewData/DisplayTemplates/Int64 - LackModel.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/CheckViewData/DisplayTemplates/Int64 - LackModel.cshtml
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/Views/CheckViewData/DisplayTemplates/Int64 - LackModel.cshtml
rename to src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/CheckViewData/DisplayTemplates/Int64 - LackModel.cshtml
diff --git a/test/WebSites/HtmlGenerationWebSite/Views/CheckViewData/DisplayTemplates/Int64.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/CheckViewData/DisplayTemplates/Int64.cshtml
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/Views/CheckViewData/DisplayTemplates/Int64.cshtml
rename to src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/CheckViewData/DisplayTemplates/Int64.cshtml
diff --git a/test/WebSites/HtmlGenerationWebSite/Views/CheckViewData/DisplayTemplates/LackModel.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/CheckViewData/DisplayTemplates/LackModel.cshtml
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/Views/CheckViewData/DisplayTemplates/LackModel.cshtml
rename to src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/CheckViewData/DisplayTemplates/LackModel.cshtml
diff --git a/test/WebSites/HtmlGenerationWebSite/Views/CheckViewData/DisplayTemplates/TemplateModel.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/CheckViewData/DisplayTemplates/TemplateModel.cshtml
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/Views/CheckViewData/DisplayTemplates/TemplateModel.cshtml
rename to src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/CheckViewData/DisplayTemplates/TemplateModel.cshtml
diff --git a/test/WebSites/HtmlGenerationWebSite/Views/CheckViewData/DisplayTemplates/ViewModel.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/CheckViewData/DisplayTemplates/ViewModel.cshtml
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/Views/CheckViewData/DisplayTemplates/ViewModel.cshtml
rename to src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/CheckViewData/DisplayTemplates/ViewModel.cshtml
diff --git a/test/WebSites/HtmlGenerationWebSite/Views/CheckViewData/PartialForViewModel.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/CheckViewData/PartialForViewModel.cshtml
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/Views/CheckViewData/PartialForViewModel.cshtml
rename to src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/CheckViewData/PartialForViewModel.cshtml
diff --git a/test/WebSites/HtmlGenerationWebSite/Views/CheckViewData/ViewModel.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/CheckViewData/ViewModel.cshtml
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/Views/CheckViewData/ViewModel.cshtml
rename to src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/CheckViewData/ViewModel.cshtml
diff --git a/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/AttributesWithBooleanValues.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/AttributesWithBooleanValues.cshtml
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/AttributesWithBooleanValues.cshtml
rename to src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/AttributesWithBooleanValues.cshtml
diff --git a/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/CreateWarehouse.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/CreateWarehouse.cshtml
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/CreateWarehouse.cshtml
rename to src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/CreateWarehouse.cshtml
diff --git a/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/EditWarehouse.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/EditWarehouse.cshtml
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/EditWarehouse.cshtml
rename to src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/EditWarehouse.cshtml
diff --git a/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/EditorTemplates/Employee.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/EditorTemplates/Employee.cshtml
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/EditorTemplates/Employee.cshtml
rename to src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/EditorTemplates/Employee.cshtml
diff --git a/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/EditorTemplates/GenderUsingHtmlHelpers.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/EditorTemplates/GenderUsingHtmlHelpers.cshtml
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/EditorTemplates/GenderUsingHtmlHelpers.cshtml
rename to src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/EditorTemplates/GenderUsingHtmlHelpers.cshtml
diff --git a/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/EditorTemplates/GenderUsingTagHelpers.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/EditorTemplates/GenderUsingTagHelpers.cshtml
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/EditorTemplates/GenderUsingTagHelpers.cshtml
rename to src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/EditorTemplates/GenderUsingTagHelpers.cshtml
diff --git a/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/EmployeeList.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/EmployeeList.cshtml
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/EmployeeList.cshtml
rename to src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/EmployeeList.cshtml
diff --git a/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Enum.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Enum.cshtml
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Enum.cshtml
rename to src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Enum.cshtml
diff --git a/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Environment.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Environment.cshtml
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Environment.cshtml
rename to src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Environment.cshtml
diff --git a/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Form.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Form.cshtml
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Form.cshtml
rename to src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Form.cshtml
diff --git a/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Image.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Image.cshtml
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Image.cshtml
rename to src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Image.cshtml
diff --git a/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Index.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Index.cshtml
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Index.cshtml
rename to src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Index.cshtml
diff --git a/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Input.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Input.cshtml
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Input.cshtml
rename to src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Input.cshtml
diff --git a/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/ItemUsingModelSpecificEditorTemplate.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/ItemUsingModelSpecificEditorTemplate.cshtml
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/ItemUsingModelSpecificEditorTemplate.cshtml
rename to src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/ItemUsingModelSpecificEditorTemplate.cshtml
diff --git a/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/ItemUsingSharedEditorTemplate.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/ItemUsingSharedEditorTemplate.cshtml
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/ItemUsingSharedEditorTemplate.cshtml
rename to src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/ItemUsingSharedEditorTemplate.cshtml
diff --git a/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Link.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Link.cshtml
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Link.cshtml
rename to src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Link.cshtml
diff --git a/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Order.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Order.cshtml
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Order.cshtml
rename to src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Order.cshtml
diff --git a/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/OrderUsingHtmlHelpers.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/OrderUsingHtmlHelpers.cshtml
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/OrderUsingHtmlHelpers.cshtml
rename to src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/OrderUsingHtmlHelpers.cshtml
diff --git a/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/PartialTagHelperWithoutModel.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/PartialTagHelperWithoutModel.cshtml
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/PartialTagHelperWithoutModel.cshtml
rename to src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/PartialTagHelperWithoutModel.cshtml
diff --git a/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Product.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Product.cshtml
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Product.cshtml
rename to src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Product.cshtml
diff --git a/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/ProductList.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/ProductList.cshtml
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/ProductList.cshtml
rename to src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/ProductList.cshtml
diff --git a/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/ProductListUsingTagHelpers.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/ProductListUsingTagHelpers.cshtml
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/ProductListUsingTagHelpers.cshtml
rename to src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/ProductListUsingTagHelpers.cshtml
diff --git a/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Script.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Script.cshtml
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Script.cshtml
rename to src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Script.cshtml
diff --git a/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/StatusMessage.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/StatusMessage.cshtml
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/StatusMessage.cshtml
rename to src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/StatusMessage.cshtml
diff --git a/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/ValidationProviderAttribute.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/ValidationProviderAttribute.cshtml
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/ValidationProviderAttribute.cshtml
rename to src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/ValidationProviderAttribute.cshtml
diff --git a/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Warehouse.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Warehouse.cshtml
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Warehouse.cshtml
rename to src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/Warehouse.cshtml
diff --git a/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/_EmployeePartial.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/_EmployeePartial.cshtml
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/_EmployeePartial.cshtml
rename to src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/_EmployeePartial.cshtml
diff --git a/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/_ProductPartial.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/_ProductPartial.cshtml
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/_ProductPartial.cshtml
rename to src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/_ProductPartial.cshtml
diff --git a/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/_ProductRecommendations.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/_ProductRecommendations.cshtml
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/_ProductRecommendations.cshtml
rename to src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/_ProductRecommendations.cshtml
diff --git a/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/_StatusMessagePartial.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/_StatusMessagePartial.cshtml
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/_StatusMessagePartial.cshtml
rename to src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_Home/_StatusMessagePartial.cshtml
diff --git a/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_WeirdExpressions/GetWeirdWithHtmlHelpers.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_WeirdExpressions/GetWeirdWithHtmlHelpers.cshtml
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_WeirdExpressions/GetWeirdWithHtmlHelpers.cshtml
rename to src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_WeirdExpressions/GetWeirdWithHtmlHelpers.cshtml
diff --git a/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_WeirdExpressions/GetWeirdWithTagHelpers.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_WeirdExpressions/GetWeirdWithTagHelpers.cshtml
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_WeirdExpressions/GetWeirdWithTagHelpers.cshtml
rename to src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/HtmlGeneration_WeirdExpressions/GetWeirdWithTagHelpers.cshtml
diff --git a/test/WebSites/HtmlGenerationWebSite/Views/Shared/Components/Splash/Default.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/Shared/Components/Splash/Default.cshtml
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/Views/Shared/Components/Splash/Default.cshtml
rename to src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/Shared/Components/Splash/Default.cshtml
diff --git a/test/WebSites/HtmlGenerationWebSite/Views/Shared/Customer.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/Shared/Customer.cshtml
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/Views/Shared/Customer.cshtml
rename to src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/Shared/Customer.cshtml
diff --git a/test/WebSites/HtmlGenerationWebSite/Views/Shared/DisplayTemplates/DayOfWeek.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/Shared/DisplayTemplates/DayOfWeek.cshtml
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/Views/Shared/DisplayTemplates/DayOfWeek.cshtml
rename to src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/Shared/DisplayTemplates/DayOfWeek.cshtml
diff --git a/test/WebSites/HtmlGenerationWebSite/Views/Shared/EditorTemplates/Common.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/Shared/EditorTemplates/Common.cshtml
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/Views/Shared/EditorTemplates/Common.cshtml
rename to src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/Shared/EditorTemplates/Common.cshtml
diff --git a/test/WebSites/HtmlGenerationWebSite/Views/Shared/EditorTemplates/String.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/Shared/EditorTemplates/String.cshtml
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/Views/Shared/EditorTemplates/String.cshtml
rename to src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/Shared/EditorTemplates/String.cshtml
diff --git a/test/WebSites/HtmlGenerationWebSite/Views/Shared/_Partial.cshtml b/src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/Shared/_Partial.cshtml
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/Views/Shared/_Partial.cshtml
rename to src/Mvc/test/WebSites/HtmlGenerationWebSite/Views/Shared/_Partial.cshtml
diff --git a/test/WebSites/HtmlGenerationWebSite/appRoot.css b/src/Mvc/test/WebSites/HtmlGenerationWebSite/appRoot.css
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/appRoot.css
rename to src/Mvc/test/WebSites/HtmlGenerationWebSite/appRoot.css
diff --git a/test/WebSites/HtmlGenerationWebSite/appRoot.js b/src/Mvc/test/WebSites/HtmlGenerationWebSite/appRoot.js
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/appRoot.js
rename to src/Mvc/test/WebSites/HtmlGenerationWebSite/appRoot.js
diff --git a/test/WebSites/HtmlGenerationWebSite/readme.md b/src/Mvc/test/WebSites/HtmlGenerationWebSite/readme.md
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/readme.md
rename to src/Mvc/test/WebSites/HtmlGenerationWebSite/readme.md
diff --git a/test/WebSites/HtmlGenerationWebSite/wwwroot/images/red.png b/src/Mvc/test/WebSites/HtmlGenerationWebSite/wwwroot/images/red.png
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/wwwroot/images/red.png
rename to src/Mvc/test/WebSites/HtmlGenerationWebSite/wwwroot/images/red.png
diff --git a/test/WebSites/HtmlGenerationWebSite/wwwroot/styles/.gitattributes b/src/Mvc/test/WebSites/HtmlGenerationWebSite/wwwroot/styles/.gitattributes
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/wwwroot/styles/.gitattributes
rename to src/Mvc/test/WebSites/HtmlGenerationWebSite/wwwroot/styles/.gitattributes
diff --git a/test/WebSites/HtmlGenerationWebSite/wwwroot/styles/site.css b/src/Mvc/test/WebSites/HtmlGenerationWebSite/wwwroot/styles/site.css
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/wwwroot/styles/site.css
rename to src/Mvc/test/WebSites/HtmlGenerationWebSite/wwwroot/styles/site.css
diff --git a/test/WebSites/HtmlGenerationWebSite/wwwroot/styles/site.js b/src/Mvc/test/WebSites/HtmlGenerationWebSite/wwwroot/styles/site.js
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/wwwroot/styles/site.js
rename to src/Mvc/test/WebSites/HtmlGenerationWebSite/wwwroot/styles/site.js
diff --git a/test/WebSites/HtmlGenerationWebSite/wwwroot/styles/siteIntegrity.css b/src/Mvc/test/WebSites/HtmlGenerationWebSite/wwwroot/styles/siteIntegrity.css
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/wwwroot/styles/siteIntegrity.css
rename to src/Mvc/test/WebSites/HtmlGenerationWebSite/wwwroot/styles/siteIntegrity.css
diff --git a/test/WebSites/HtmlGenerationWebSite/wwwroot/styles/siteIntegrity.js b/src/Mvc/test/WebSites/HtmlGenerationWebSite/wwwroot/styles/siteIntegrity.js
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/wwwroot/styles/siteIntegrity.js
rename to src/Mvc/test/WebSites/HtmlGenerationWebSite/wwwroot/styles/siteIntegrity.js
diff --git a/test/WebSites/HtmlGenerationWebSite/wwwroot/styles/sub/site2.css b/src/Mvc/test/WebSites/HtmlGenerationWebSite/wwwroot/styles/sub/site2.css
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/wwwroot/styles/sub/site2.css
rename to src/Mvc/test/WebSites/HtmlGenerationWebSite/wwwroot/styles/sub/site2.css
diff --git a/test/WebSites/HtmlGenerationWebSite/wwwroot/styles/sub/site2.js b/src/Mvc/test/WebSites/HtmlGenerationWebSite/wwwroot/styles/sub/site2.js
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/wwwroot/styles/sub/site2.js
rename to src/Mvc/test/WebSites/HtmlGenerationWebSite/wwwroot/styles/sub/site2.js
diff --git a/test/WebSites/HtmlGenerationWebSite/wwwroot/styles/sub/site3.css b/src/Mvc/test/WebSites/HtmlGenerationWebSite/wwwroot/styles/sub/site3.css
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/wwwroot/styles/sub/site3.css
rename to src/Mvc/test/WebSites/HtmlGenerationWebSite/wwwroot/styles/sub/site3.css
diff --git a/test/WebSites/HtmlGenerationWebSite/wwwroot/styles/sub/site3.js b/src/Mvc/test/WebSites/HtmlGenerationWebSite/wwwroot/styles/sub/site3.js
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/wwwroot/styles/sub/site3.js
rename to src/Mvc/test/WebSites/HtmlGenerationWebSite/wwwroot/styles/sub/site3.js
diff --git a/test/WebSites/HtmlGenerationWebSite/wwwroot/styles/sub/site3.min.css b/src/Mvc/test/WebSites/HtmlGenerationWebSite/wwwroot/styles/sub/site3.min.css
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/wwwroot/styles/sub/site3.min.css
rename to src/Mvc/test/WebSites/HtmlGenerationWebSite/wwwroot/styles/sub/site3.min.css
diff --git a/test/WebSites/HtmlGenerationWebSite/wwwroot/styles/sub/siteIntegrity2.js b/src/Mvc/test/WebSites/HtmlGenerationWebSite/wwwroot/styles/sub/siteIntegrity2.js
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/wwwroot/styles/sub/siteIntegrity2.js
rename to src/Mvc/test/WebSites/HtmlGenerationWebSite/wwwroot/styles/sub/siteIntegrity2.js
diff --git a/test/WebSites/HtmlGenerationWebSite/wwwroot/styles/sub/siteIntegrity3.js b/src/Mvc/test/WebSites/HtmlGenerationWebSite/wwwroot/styles/sub/siteIntegrity3.js
similarity index 100%
rename from test/WebSites/HtmlGenerationWebSite/wwwroot/styles/sub/siteIntegrity3.js
rename to src/Mvc/test/WebSites/HtmlGenerationWebSite/wwwroot/styles/sub/siteIntegrity3.js
diff --git a/test/WebSites/RazorBuildWebSite.PrecompiledViews/Pages/Precompilation/Page.cs b/src/Mvc/test/WebSites/RazorBuildWebSite.PrecompiledViews/Pages/Precompilation/Page.cs
similarity index 100%
rename from test/WebSites/RazorBuildWebSite.PrecompiledViews/Pages/Precompilation/Page.cs
rename to src/Mvc/test/WebSites/RazorBuildWebSite.PrecompiledViews/Pages/Precompilation/Page.cs
diff --git a/test/WebSites/RazorBuildWebSite.PrecompiledViews/Pages/Precompilation/Page_Model.cs b/src/Mvc/test/WebSites/RazorBuildWebSite.PrecompiledViews/Pages/Precompilation/Page_Model.cs
similarity index 100%
rename from test/WebSites/RazorBuildWebSite.PrecompiledViews/Pages/Precompilation/Page_Model.cs
rename to src/Mvc/test/WebSites/RazorBuildWebSite.PrecompiledViews/Pages/Precompilation/Page_Model.cs
diff --git a/test/WebSites/RazorBuildWebSite.PrecompiledViews/RazorBuildWebSite.PrecompiledViews.csproj b/src/Mvc/test/WebSites/RazorBuildWebSite.PrecompiledViews/RazorBuildWebSite.PrecompiledViews.csproj
similarity index 100%
rename from test/WebSites/RazorBuildWebSite.PrecompiledViews/RazorBuildWebSite.PrecompiledViews.csproj
rename to src/Mvc/test/WebSites/RazorBuildWebSite.PrecompiledViews/RazorBuildWebSite.PrecompiledViews.csproj
diff --git a/test/WebSites/RazorBuildWebSite.PrecompiledViews/Views/Common/CommonView.cs b/src/Mvc/test/WebSites/RazorBuildWebSite.PrecompiledViews/Views/Common/CommonView.cs
similarity index 100%
rename from test/WebSites/RazorBuildWebSite.PrecompiledViews/Views/Common/CommonView.cs
rename to src/Mvc/test/WebSites/RazorBuildWebSite.PrecompiledViews/Views/Common/CommonView.cs
diff --git a/test/WebSites/RazorBuildWebSite.PrecompiledViews/Views/Precompilation/View.cs b/src/Mvc/test/WebSites/RazorBuildWebSite.PrecompiledViews/Views/Precompilation/View.cs
similarity index 100%
rename from test/WebSites/RazorBuildWebSite.PrecompiledViews/Views/Precompilation/View.cs
rename to src/Mvc/test/WebSites/RazorBuildWebSite.PrecompiledViews/Views/Precompilation/View.cs
diff --git a/test/WebSites/RazorBuildWebSite.Views/AssemblyInfo.cs b/src/Mvc/test/WebSites/RazorBuildWebSite.Views/AssemblyInfo.cs
similarity index 100%
rename from test/WebSites/RazorBuildWebSite.Views/AssemblyInfo.cs
rename to src/Mvc/test/WebSites/RazorBuildWebSite.Views/AssemblyInfo.cs
diff --git a/test/WebSites/RazorBuildWebSite.Views/Pages/Rzc/Page.cs b/src/Mvc/test/WebSites/RazorBuildWebSite.Views/Pages/Rzc/Page.cs
similarity index 100%
rename from test/WebSites/RazorBuildWebSite.Views/Pages/Rzc/Page.cs
rename to src/Mvc/test/WebSites/RazorBuildWebSite.Views/Pages/Rzc/Page.cs
diff --git a/test/WebSites/RazorBuildWebSite.Views/Pages/Rzc/Page_Model.cs b/src/Mvc/test/WebSites/RazorBuildWebSite.Views/Pages/Rzc/Page_Model.cs
similarity index 100%
rename from test/WebSites/RazorBuildWebSite.Views/Pages/Rzc/Page_Model.cs
rename to src/Mvc/test/WebSites/RazorBuildWebSite.Views/Pages/Rzc/Page_Model.cs
diff --git a/test/WebSites/RazorBuildWebSite.Views/RazorBuildWebSite.Views.csproj b/src/Mvc/test/WebSites/RazorBuildWebSite.Views/RazorBuildWebSite.Views.csproj
similarity index 100%
rename from test/WebSites/RazorBuildWebSite.Views/RazorBuildWebSite.Views.csproj
rename to src/Mvc/test/WebSites/RazorBuildWebSite.Views/RazorBuildWebSite.Views.csproj
diff --git a/test/WebSites/RazorBuildWebSite.Views/Views/Common/CommonView.cs b/src/Mvc/test/WebSites/RazorBuildWebSite.Views/Views/Common/CommonView.cs
similarity index 100%
rename from test/WebSites/RazorBuildWebSite.Views/Views/Common/CommonView.cs
rename to src/Mvc/test/WebSites/RazorBuildWebSite.Views/Views/Common/CommonView.cs
diff --git a/test/WebSites/RazorBuildWebSite.Views/Views/Rzc/View.cs b/src/Mvc/test/WebSites/RazorBuildWebSite.Views/Views/Rzc/View.cs
similarity index 100%
rename from test/WebSites/RazorBuildWebSite.Views/Views/Rzc/View.cs
rename to src/Mvc/test/WebSites/RazorBuildWebSite.Views/Views/Rzc/View.cs
diff --git a/test/WebSites/RazorBuildWebSite/Controllers/CommonController.cs b/src/Mvc/test/WebSites/RazorBuildWebSite/Controllers/CommonController.cs
similarity index 100%
rename from test/WebSites/RazorBuildWebSite/Controllers/CommonController.cs
rename to src/Mvc/test/WebSites/RazorBuildWebSite/Controllers/CommonController.cs
diff --git a/test/WebSites/RazorBuildWebSite/Controllers/PrecompilationController.cs b/src/Mvc/test/WebSites/RazorBuildWebSite/Controllers/PrecompilationController.cs
similarity index 100%
rename from test/WebSites/RazorBuildWebSite/Controllers/PrecompilationController.cs
rename to src/Mvc/test/WebSites/RazorBuildWebSite/Controllers/PrecompilationController.cs
diff --git a/test/WebSites/RazorBuildWebSite/Controllers/RzcController.cs b/src/Mvc/test/WebSites/RazorBuildWebSite/Controllers/RzcController.cs
similarity index 100%
rename from test/WebSites/RazorBuildWebSite/Controllers/RzcController.cs
rename to src/Mvc/test/WebSites/RazorBuildWebSite/Controllers/RzcController.cs
diff --git a/test/WebSites/RazorBuildWebSite/Pages/Precompilation/Page.cshtml b/src/Mvc/test/WebSites/RazorBuildWebSite/Pages/Precompilation/Page.cshtml
similarity index 100%
rename from test/WebSites/RazorBuildWebSite/Pages/Precompilation/Page.cshtml
rename to src/Mvc/test/WebSites/RazorBuildWebSite/Pages/Precompilation/Page.cshtml
diff --git a/test/WebSites/RazorBuildWebSite/Pages/Rzc/Page.cshtml b/src/Mvc/test/WebSites/RazorBuildWebSite/Pages/Rzc/Page.cshtml
similarity index 100%
rename from test/WebSites/RazorBuildWebSite/Pages/Rzc/Page.cshtml
rename to src/Mvc/test/WebSites/RazorBuildWebSite/Pages/Rzc/Page.cshtml
diff --git a/test/WebSites/RazorBuildWebSite/Pages/_ViewImports.cshtml b/src/Mvc/test/WebSites/RazorBuildWebSite/Pages/_ViewImports.cshtml
similarity index 100%
rename from test/WebSites/RazorBuildWebSite/Pages/_ViewImports.cshtml
rename to src/Mvc/test/WebSites/RazorBuildWebSite/Pages/_ViewImports.cshtml
diff --git a/test/WebSites/RazorBuildWebSite/RazorBuildWebSite.csproj b/src/Mvc/test/WebSites/RazorBuildWebSite/RazorBuildWebSite.csproj
similarity index 100%
rename from test/WebSites/RazorBuildWebSite/RazorBuildWebSite.csproj
rename to src/Mvc/test/WebSites/RazorBuildWebSite/RazorBuildWebSite.csproj
diff --git a/test/WebSites/RazorBuildWebSite/Startup.cs b/src/Mvc/test/WebSites/RazorBuildWebSite/Startup.cs
similarity index 100%
rename from test/WebSites/RazorBuildWebSite/Startup.cs
rename to src/Mvc/test/WebSites/RazorBuildWebSite/Startup.cs
diff --git a/test/WebSites/RazorBuildWebSite/Views/Precompilation/View.cshtml b/src/Mvc/test/WebSites/RazorBuildWebSite/Views/Precompilation/View.cshtml
similarity index 100%
rename from test/WebSites/RazorBuildWebSite/Views/Precompilation/View.cshtml
rename to src/Mvc/test/WebSites/RazorBuildWebSite/Views/Precompilation/View.cshtml
diff --git a/test/WebSites/RazorBuildWebSite/Views/Rzc/View.cshtml b/src/Mvc/test/WebSites/RazorBuildWebSite/Views/Rzc/View.cshtml
similarity index 100%
rename from test/WebSites/RazorBuildWebSite/Views/Rzc/View.cshtml
rename to src/Mvc/test/WebSites/RazorBuildWebSite/Views/Rzc/View.cshtml
diff --git a/test/WebSites/RazorBuildWebSite/Views/_ViewImports.cshtml b/src/Mvc/test/WebSites/RazorBuildWebSite/Views/_ViewImports.cshtml
similarity index 100%
rename from test/WebSites/RazorBuildWebSite/Views/_ViewImports.cshtml
rename to src/Mvc/test/WebSites/RazorBuildWebSite/Views/_ViewImports.cshtml
diff --git a/test/WebSites/RazorBuildWebSite/readme.md b/src/Mvc/test/WebSites/RazorBuildWebSite/readme.md
similarity index 100%
rename from test/WebSites/RazorBuildWebSite/readme.md
rename to src/Mvc/test/WebSites/RazorBuildWebSite/readme.md
diff --git a/test/WebSites/RazorPagesClassLibrary/ClassLibraryStartup.cs b/src/Mvc/test/WebSites/RazorPagesClassLibrary/ClassLibraryStartup.cs
similarity index 100%
rename from test/WebSites/RazorPagesClassLibrary/ClassLibraryStartup.cs
rename to src/Mvc/test/WebSites/RazorPagesClassLibrary/ClassLibraryStartup.cs
diff --git a/test/WebSites/RazorPagesClassLibrary/Pages/ClassLibraryPages/Overriden.cshtml b/src/Mvc/test/WebSites/RazorPagesClassLibrary/Pages/ClassLibraryPages/Overriden.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesClassLibrary/Pages/ClassLibraryPages/Overriden.cshtml
rename to src/Mvc/test/WebSites/RazorPagesClassLibrary/Pages/ClassLibraryPages/Overriden.cshtml
diff --git a/test/WebSites/RazorPagesClassLibrary/Pages/ClassLibraryPages/Served.cshtml b/src/Mvc/test/WebSites/RazorPagesClassLibrary/Pages/ClassLibraryPages/Served.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesClassLibrary/Pages/ClassLibraryPages/Served.cshtml
rename to src/Mvc/test/WebSites/RazorPagesClassLibrary/Pages/ClassLibraryPages/Served.cshtml
diff --git a/test/WebSites/RazorPagesClassLibrary/RazorPagesClassLibrary.csproj b/src/Mvc/test/WebSites/RazorPagesClassLibrary/RazorPagesClassLibrary.csproj
similarity index 100%
rename from test/WebSites/RazorPagesClassLibrary/RazorPagesClassLibrary.csproj
rename to src/Mvc/test/WebSites/RazorPagesClassLibrary/RazorPagesClassLibrary.csproj
diff --git a/test/WebSites/RazorPagesWebSite/Areas/Accounts/Controllers/HomeController.cs b/src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Accounts/Controllers/HomeController.cs
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Areas/Accounts/Controllers/HomeController.cs
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Accounts/Controllers/HomeController.cs
diff --git a/test/WebSites/RazorPagesWebSite/Areas/Accounts/Pages/About.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Accounts/Pages/About.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Areas/Accounts/Pages/About.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Accounts/Pages/About.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/Areas/Accounts/Pages/Manage/RenderPartials.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Accounts/Pages/Manage/RenderPartials.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Areas/Accounts/Pages/Manage/RenderPartials.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Accounts/Pages/Manage/RenderPartials.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/Areas/Accounts/Pages/Manage/_PartialInManage.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Accounts/Pages/Manage/_PartialInManage.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Areas/Accounts/Pages/Manage/_PartialInManage.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Accounts/Pages/Manage/_PartialInManage.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/Areas/Accounts/Pages/PageWithLinks.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Accounts/Pages/PageWithLinks.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Areas/Accounts/Pages/PageWithLinks.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Accounts/Pages/PageWithLinks.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/Areas/Accounts/Pages/PageWithRouteTemplate.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Accounts/Pages/PageWithRouteTemplate.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Areas/Accounts/Pages/PageWithRouteTemplate.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Accounts/Pages/PageWithRouteTemplate.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/Areas/Accounts/Pages/RelativeLinks/Index.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Accounts/Pages/RelativeLinks/Index.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Areas/Accounts/Pages/RelativeLinks/Index.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Accounts/Pages/RelativeLinks/Index.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/Areas/Accounts/Pages/RequiresAuth/AllowAnonymous.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Accounts/Pages/RequiresAuth/AllowAnonymous.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Areas/Accounts/Pages/RequiresAuth/AllowAnonymous.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Accounts/Pages/RequiresAuth/AllowAnonymous.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/Areas/Accounts/Pages/RequiresAuth/Index.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Accounts/Pages/RequiresAuth/Index.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Areas/Accounts/Pages/RequiresAuth/Index.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Accounts/Pages/RequiresAuth/Index.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/Areas/Accounts/Pages/_PartialInAreaPagesRoot.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Accounts/Pages/_PartialInAreaPagesRoot.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Areas/Accounts/Pages/_PartialInAreaPagesRoot.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Accounts/Pages/_PartialInAreaPagesRoot.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/Areas/Accounts/Views/Home/Index.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Accounts/Views/Home/Index.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Areas/Accounts/Views/Home/Index.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Accounts/Views/Home/Index.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/Areas/Accounts/Views/Shared/_PartialInAreasSharedViews.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Accounts/Views/Shared/_PartialInAreasSharedViews.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Areas/Accounts/Views/Shared/_PartialInAreasSharedViews.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Accounts/Views/Shared/_PartialInAreasSharedViews.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/Areas/Accounts/_ViewImports.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Accounts/_ViewImports.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Areas/Accounts/_ViewImports.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Accounts/_ViewImports.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/Areas/Products/Pages/List.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Products/Pages/List.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Areas/Products/Pages/List.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Areas/Products/Pages/List.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/Components/ViewDataViewComponent.cs b/src/Mvc/test/WebSites/RazorPagesWebSite/Components/ViewDataViewComponent.cs
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Components/ViewDataViewComponent.cs
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Components/ViewDataViewComponent.cs
diff --git a/test/WebSites/RazorPagesWebSite/Controllers/RedirectController.cs b/src/Mvc/test/WebSites/RazorPagesWebSite/Controllers/RedirectController.cs
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Controllers/RedirectController.cs
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Controllers/RedirectController.cs
diff --git a/test/WebSites/RazorPagesWebSite/Conventions/CustomModelTypeConvention.cs b/src/Mvc/test/WebSites/RazorPagesWebSite/Conventions/CustomModelTypeConvention.cs
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Conventions/CustomModelTypeConvention.cs
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Conventions/CustomModelTypeConvention.cs
diff --git a/test/WebSites/RazorPagesWebSite/CustomActionResult.cs b/src/Mvc/test/WebSites/RazorPagesWebSite/CustomActionResult.cs
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/CustomActionResult.cs
rename to src/Mvc/test/WebSites/RazorPagesWebSite/CustomActionResult.cs
diff --git a/test/WebSites/RazorPagesWebSite/DefaultNamespace.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/DefaultNamespace.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/DefaultNamespace.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/DefaultNamespace.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/HandlerTestPage.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/HandlerTestPage.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/HandlerTestPage.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/HandlerTestPage.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/HelloWorld.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/HelloWorld.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/HelloWorld.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/HelloWorld.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/HelloWorldWithAuth.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/HelloWorldWithAuth.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/HelloWorldWithAuth.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/HelloWorldWithAuth.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/HelloWorldWithHandler.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/HelloWorldWithHandler.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/HelloWorldWithHandler.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/HelloWorldWithHandler.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/HelloWorldWithOptionsHandler.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/HelloWorldWithOptionsHandler.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/HelloWorldWithOptionsHandler.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/HelloWorldWithOptionsHandler.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/HelloWorldWithPageModelAttributeModel.cs b/src/Mvc/test/WebSites/RazorPagesWebSite/HelloWorldWithPageModelAttributeModel.cs
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/HelloWorldWithPageModelAttributeModel.cs
rename to src/Mvc/test/WebSites/RazorPagesWebSite/HelloWorldWithPageModelAttributeModel.cs
diff --git a/test/WebSites/RazorPagesWebSite/HelloWorldWithPageModelAttributeModel.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/HelloWorldWithPageModelAttributeModel.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/HelloWorldWithPageModelAttributeModel.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/HelloWorldWithPageModelAttributeModel.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/HelloWorldWithPageModelHandler.cs b/src/Mvc/test/WebSites/RazorPagesWebSite/HelloWorldWithPageModelHandler.cs
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/HelloWorldWithPageModelHandler.cs
rename to src/Mvc/test/WebSites/RazorPagesWebSite/HelloWorldWithPageModelHandler.cs
diff --git a/test/WebSites/RazorPagesWebSite/HelloWorldWithPageModelHandler.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/HelloWorldWithPageModelHandler.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/HelloWorldWithPageModelHandler.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/HelloWorldWithPageModelHandler.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/HelloWorldWithRoute.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/HelloWorldWithRoute.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/HelloWorldWithRoute.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/HelloWorldWithRoute.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/InjectedPageProperties.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/InjectedPageProperties.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/InjectedPageProperties.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/InjectedPageProperties.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/ModelAsFilter.cs b/src/Mvc/test/WebSites/RazorPagesWebSite/ModelAsFilter.cs
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/ModelAsFilter.cs
rename to src/Mvc/test/WebSites/RazorPagesWebSite/ModelAsFilter.cs
diff --git a/test/WebSites/RazorPagesWebSite/ModelAsFilter.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/ModelAsFilter.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/ModelAsFilter.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/ModelAsFilter.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/ModelHandlerTestModel.cs b/src/Mvc/test/WebSites/RazorPagesWebSite/ModelHandlerTestModel.cs
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/ModelHandlerTestModel.cs
rename to src/Mvc/test/WebSites/RazorPagesWebSite/ModelHandlerTestModel.cs
diff --git a/test/WebSites/RazorPagesWebSite/ModelHandlerTestPage.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/ModelHandlerTestPage.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/ModelHandlerTestPage.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/ModelHandlerTestPage.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/ModelWithAuthFilter.cs b/src/Mvc/test/WebSites/RazorPagesWebSite/ModelWithAuthFilter.cs
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/ModelWithAuthFilter.cs
rename to src/Mvc/test/WebSites/RazorPagesWebSite/ModelWithAuthFilter.cs
diff --git a/test/WebSites/RazorPagesWebSite/ModelWithAuthFilter.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/ModelWithAuthFilter.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/ModelWithAuthFilter.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/ModelWithAuthFilter.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/ModelWithPageFilter.cs b/src/Mvc/test/WebSites/RazorPagesWebSite/ModelWithPageFilter.cs
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/ModelWithPageFilter.cs
rename to src/Mvc/test/WebSites/RazorPagesWebSite/ModelWithPageFilter.cs
diff --git a/test/WebSites/RazorPagesWebSite/ModelWithPageFilter.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/ModelWithPageFilter.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/ModelWithPageFilter.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/ModelWithPageFilter.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/ModelWithResponseCache.cs b/src/Mvc/test/WebSites/RazorPagesWebSite/ModelWithResponseCache.cs
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/ModelWithResponseCache.cs
rename to src/Mvc/test/WebSites/RazorPagesWebSite/ModelWithResponseCache.cs
diff --git a/test/WebSites/RazorPagesWebSite/ModelWithResponseCache.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/ModelWithResponseCache.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/ModelWithResponseCache.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/ModelWithResponseCache.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/Models/IUserModel.cs b/src/Mvc/test/WebSites/RazorPagesWebSite/Models/IUserModel.cs
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Models/IUserModel.cs
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Models/IUserModel.cs
diff --git a/test/WebSites/RazorPagesWebSite/Models/UserModel.cs b/src/Mvc/test/WebSites/RazorPagesWebSite/Models/UserModel.cs
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Models/UserModel.cs
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Models/UserModel.cs
diff --git a/test/WebSites/RazorPagesWebSite/NoPage.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/NoPage.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/NoPage.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/NoPage.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/OnGetView.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/OnGetView.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/OnGetView.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/OnGetView.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/PageWithoutContent.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/PageWithoutContent.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/PageWithoutContent.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/PageWithoutContent.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/Pages/Admin/Edit.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Admin/Edit.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Pages/Admin/Edit.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Admin/Edit.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/Pages/Admin/Index.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Admin/Index.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Pages/Admin/Index.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Admin/Index.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/Pages/Admin/Login.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Admin/Login.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Pages/Admin/Login.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Admin/Login.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/Pages/Admin/RouteTemplate.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Admin/RouteTemplate.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Pages/Admin/RouteTemplate.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Admin/RouteTemplate.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/Pages/Antiforgery/AntiforgeryDefault.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Antiforgery/AntiforgeryDefault.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Pages/Antiforgery/AntiforgeryDefault.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Antiforgery/AntiforgeryDefault.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/Pages/Antiforgery/AntiforgeryDefault.cshtml.cs b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Antiforgery/AntiforgeryDefault.cshtml.cs
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Pages/Antiforgery/AntiforgeryDefault.cshtml.cs
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Antiforgery/AntiforgeryDefault.cshtml.cs
diff --git a/test/WebSites/RazorPagesWebSite/Pages/Antiforgery/IgnoreAntiforgery.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Antiforgery/IgnoreAntiforgery.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Pages/Antiforgery/IgnoreAntiforgery.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Antiforgery/IgnoreAntiforgery.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/Pages/Antiforgery/IgnoreAntiforgery.cshtml.cs b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Antiforgery/IgnoreAntiforgery.cshtml.cs
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Pages/Antiforgery/IgnoreAntiforgery.cshtml.cs
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Antiforgery/IgnoreAntiforgery.cshtml.cs
diff --git a/test/WebSites/RazorPagesWebSite/Pages/Antiforgery/_ViewImports.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Antiforgery/_ViewImports.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Pages/Antiforgery/_ViewImports.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Antiforgery/_ViewImports.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/Pages/ClassLibraryPages/Overriden.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ClassLibraryPages/Overriden.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Pages/ClassLibraryPages/Overriden.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ClassLibraryPages/Overriden.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/Pages/Conventions/Auth.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Conventions/Auth.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Pages/Conventions/Auth.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Conventions/Auth.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/Pages/Conventions/AuthFolder/AnonymousModel.cs b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Conventions/AuthFolder/AnonymousModel.cs
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Pages/Conventions/AuthFolder/AnonymousModel.cs
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Conventions/AuthFolder/AnonymousModel.cs
diff --git a/test/WebSites/RazorPagesWebSite/Pages/Conventions/AuthFolder/AnonymousViaModel.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Conventions/AuthFolder/AnonymousViaModel.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Pages/Conventions/AuthFolder/AnonymousViaModel.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Conventions/AuthFolder/AnonymousViaModel.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/Pages/Conventions/AuthFolder/Index.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Conventions/AuthFolder/Index.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Pages/Conventions/AuthFolder/Index.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Conventions/AuthFolder/Index.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/Pages/CustomBaseType/CustomPageBase.cs b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/CustomBaseType/CustomPageBase.cs
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Pages/CustomBaseType/CustomPageBase.cs
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Pages/CustomBaseType/CustomPageBase.cs
diff --git a/test/WebSites/RazorPagesWebSite/Pages/CustomBaseType/Page.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/CustomBaseType/Page.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Pages/CustomBaseType/Page.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Pages/CustomBaseType/Page.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/Pages/CustomBaseType/PageWithModel.cs b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/CustomBaseType/PageWithModel.cs
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Pages/CustomBaseType/PageWithModel.cs
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Pages/CustomBaseType/PageWithModel.cs
diff --git a/test/WebSites/RazorPagesWebSite/Pages/CustomBaseType/PageWithModel.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/CustomBaseType/PageWithModel.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Pages/CustomBaseType/PageWithModel.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Pages/CustomBaseType/PageWithModel.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/Pages/CustomBaseType/_ViewImports.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/CustomBaseType/_ViewImports.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Pages/CustomBaseType/_ViewImports.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Pages/CustomBaseType/_ViewImports.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/Pages/CustomBaseType/_ViewStart.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/CustomBaseType/_ViewStart.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Pages/CustomBaseType/_ViewStart.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Pages/CustomBaseType/_ViewStart.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/Pages/CustomModelTypeModel.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/CustomModelTypeModel.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Pages/CustomModelTypeModel.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Pages/CustomModelTypeModel.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/Pages/CustomModelTypeModel.cshtml.cs b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/CustomModelTypeModel.cshtml.cs
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Pages/CustomModelTypeModel.cshtml.cs
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Pages/CustomModelTypeModel.cshtml.cs
diff --git a/test/WebSites/RazorPagesWebSite/Pages/CustomPrefix/Custom.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/CustomPrefix/Custom.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Pages/CustomPrefix/Custom.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Pages/CustomPrefix/Custom.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/Pages/FileFromShared b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/FileFromShared
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Pages/FileFromShared
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Pages/FileFromShared
diff --git a/test/WebSites/RazorPagesWebSite/Pages/HandlerWithParameter.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/HandlerWithParameter.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Pages/HandlerWithParameter.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Pages/HandlerWithParameter.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/Pages/HandlerWithParameter.cshtml.cs b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/HandlerWithParameter.cshtml.cs
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Pages/HandlerWithParameter.cshtml.cs
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Pages/HandlerWithParameter.cshtml.cs
diff --git a/test/WebSites/RazorPagesWebSite/Pages/Index.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Index.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Pages/Index.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Index.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/Pages/Localized/Page.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Localized/Page.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Pages/Localized/Page.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Localized/Page.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/Pages/Localized/Page.fr-FR.resx b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Localized/Page.fr-FR.resx
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Pages/Localized/Page.fr-FR.resx
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Localized/Page.fr-FR.resx
diff --git a/test/WebSites/RazorPagesWebSite/Pages/Localized/PageWithModel.cs b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Localized/PageWithModel.cs
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Pages/Localized/PageWithModel.cs
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Localized/PageWithModel.cs
diff --git a/test/WebSites/RazorPagesWebSite/Pages/Localized/PageWithModel.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Localized/PageWithModel.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Pages/Localized/PageWithModel.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Localized/PageWithModel.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/Pages/Localized/PageWithModel.fr-FR.resx b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Localized/PageWithModel.fr-FR.resx
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Pages/Localized/PageWithModel.fr-FR.resx
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Localized/PageWithModel.fr-FR.resx
diff --git a/test/WebSites/RazorPagesWebSite/Pages/Namespace/Nested/Folder/Index.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Namespace/Nested/Folder/Index.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Pages/Namespace/Nested/Folder/Index.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Namespace/Nested/Folder/Index.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/Pages/Namespace/Nested/Override/Index.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Namespace/Nested/Override/Index.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Pages/Namespace/Nested/Override/Index.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Namespace/Nested/Override/Index.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/Pages/Namespace/_ViewImports.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Namespace/_ViewImports.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Pages/Namespace/_ViewImports.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Namespace/_ViewImports.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/Pages/NotTheRoot.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/NotTheRoot.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Pages/NotTheRoot.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Pages/NotTheRoot.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/Pages/PropertyBinding/BindFormFile.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/PropertyBinding/BindFormFile.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Pages/PropertyBinding/BindFormFile.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Pages/PropertyBinding/BindFormFile.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/Pages/PropertyBinding/BindFormFile.cshtml.cs b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/PropertyBinding/BindFormFile.cshtml.cs
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Pages/PropertyBinding/BindFormFile.cshtml.cs
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Pages/PropertyBinding/BindFormFile.cshtml.cs
diff --git a/test/WebSites/RazorPagesWebSite/Pages/PropertyBinding/BindPropertiesOnModel.cs b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/PropertyBinding/BindPropertiesOnModel.cs
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Pages/PropertyBinding/BindPropertiesOnModel.cs
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Pages/PropertyBinding/BindPropertiesOnModel.cs
diff --git a/test/WebSites/RazorPagesWebSite/Pages/PropertyBinding/BindPropertiesOnModel.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/PropertyBinding/BindPropertiesOnModel.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Pages/PropertyBinding/BindPropertiesOnModel.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Pages/PropertyBinding/BindPropertiesOnModel.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/Pages/PropertyBinding/BindPropertiesWithSupportsGetOnModel.cs b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/PropertyBinding/BindPropertiesWithSupportsGetOnModel.cs
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Pages/PropertyBinding/BindPropertiesWithSupportsGetOnModel.cs
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Pages/PropertyBinding/BindPropertiesWithSupportsGetOnModel.cs
diff --git a/test/WebSites/RazorPagesWebSite/Pages/PropertyBinding/BindPropertiesWithSupportsGetOnModel.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/PropertyBinding/BindPropertiesWithSupportsGetOnModel.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Pages/PropertyBinding/BindPropertiesWithSupportsGetOnModel.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Pages/PropertyBinding/BindPropertiesWithSupportsGetOnModel.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/Pages/PropertyBinding/BindPropertyWithGet.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/PropertyBinding/BindPropertyWithGet.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Pages/PropertyBinding/BindPropertyWithGet.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Pages/PropertyBinding/BindPropertyWithGet.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/Pages/PropertyBinding/PageModelWithPropertyAndArgumentBinding.cs b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/PropertyBinding/PageModelWithPropertyAndArgumentBinding.cs
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Pages/PropertyBinding/PageModelWithPropertyAndArgumentBinding.cs
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Pages/PropertyBinding/PageModelWithPropertyAndArgumentBinding.cs
diff --git a/test/WebSites/RazorPagesWebSite/Pages/PropertyBinding/PageModelWithPropertyBinding.cs b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/PropertyBinding/PageModelWithPropertyBinding.cs
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Pages/PropertyBinding/PageModelWithPropertyBinding.cs
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Pages/PropertyBinding/PageModelWithPropertyBinding.cs
diff --git a/test/WebSites/RazorPagesWebSite/Pages/PropertyBinding/PageModelWithPropertyBinding.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/PropertyBinding/PageModelWithPropertyBinding.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Pages/PropertyBinding/PageModelWithPropertyBinding.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Pages/PropertyBinding/PageModelWithPropertyBinding.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/Pages/PropertyBinding/PagePropertyBinding.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/PropertyBinding/PagePropertyBinding.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Pages/PropertyBinding/PagePropertyBinding.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Pages/PropertyBinding/PagePropertyBinding.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/Pages/PropertyBinding/PageWithPropertyAndArgumentBinding.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/PropertyBinding/PageWithPropertyAndArgumentBinding.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Pages/PropertyBinding/PageWithPropertyAndArgumentBinding.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Pages/PropertyBinding/PageWithPropertyAndArgumentBinding.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/Pages/PropertyBinding/PolymorphicBinding.cs b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/PropertyBinding/PolymorphicBinding.cs
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Pages/PropertyBinding/PolymorphicBinding.cs
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Pages/PropertyBinding/PolymorphicBinding.cs
diff --git a/test/WebSites/RazorPagesWebSite/Pages/PropertyBinding/PolymorphicBinding.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/PropertyBinding/PolymorphicBinding.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Pages/PropertyBinding/PolymorphicBinding.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Pages/PropertyBinding/PolymorphicBinding.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/Pages/PropertyBinding/_ViewImports.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/PropertyBinding/_ViewImports.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Pages/PropertyBinding/_ViewImports.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Pages/PropertyBinding/_ViewImports.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/Pages/Redirects/Index.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Redirects/Index.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Pages/Redirects/Index.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Redirects/Index.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/Pages/Redirects/Redirect.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Redirects/Redirect.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Pages/Redirects/Redirect.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Redirects/Redirect.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/Pages/Redirects/RedirectFromHandler.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Redirects/RedirectFromHandler.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Pages/Redirects/RedirectFromHandler.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Redirects/RedirectFromHandler.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/Pages/Redirects/RedirectFromModel.cs b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Redirects/RedirectFromModel.cs
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Pages/Redirects/RedirectFromModel.cs
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Redirects/RedirectFromModel.cs
diff --git a/test/WebSites/RazorPagesWebSite/Pages/Redirects/RedirectFromModel.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Redirects/RedirectFromModel.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Pages/Redirects/RedirectFromModel.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Redirects/RedirectFromModel.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/Pages/Redirects/RedirectFromPage.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Redirects/RedirectFromPage.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Pages/Redirects/RedirectFromPage.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Redirects/RedirectFromPage.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/Pages/Redirects/RedirectToSelf.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Redirects/RedirectToSelf.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Pages/Redirects/RedirectToSelf.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Redirects/RedirectToSelf.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/Pages/Redirects/RedirectToSibling.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Redirects/RedirectToSibling.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Pages/Redirects/RedirectToSibling.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Redirects/RedirectToSibling.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/Pages/Redirects/SubDir/SubDirPage.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Redirects/SubDir/SubDirPage.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Pages/Redirects/SubDir/SubDirPage.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Redirects/SubDir/SubDirPage.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/Pages/Routes/RouteUsingDefaultName.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Routes/RouteUsingDefaultName.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Pages/Routes/RouteUsingDefaultName.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Routes/RouteUsingDefaultName.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/Pages/Routes/Sibling.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Routes/Sibling.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Pages/Routes/Sibling.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Routes/Sibling.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/Pages/Routes/_ViewImports.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Routes/_ViewImports.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Pages/Routes/_ViewImports.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Routes/_ViewImports.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/Pages/SearchInPages.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/SearchInPages.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Pages/SearchInPages.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Pages/SearchInPages.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/Pages/Section/Index.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Section/Index.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Pages/Section/Index.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Section/Index.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/Pages/Section/_Layout.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Section/_Layout.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Pages/Section/_Layout.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Section/_Layout.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/Pages/Shared/Components/ViewData/Default.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Shared/Components/ViewData/Default.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Pages/Shared/Components/ViewData/Default.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Shared/Components/ViewData/Default.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/Pages/Shared/_CustomBaseTypeLayout.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Shared/_CustomBaseTypeLayout.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Pages/Shared/_CustomBaseTypeLayout.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Shared/_CustomBaseTypeLayout.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/Pages/Shared/_FileInShared.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Shared/_FileInShared.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Pages/Shared/_FileInShared.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Shared/_FileInShared.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/Pages/ShortCircuitPageAtAuthFilter.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ShortCircuitPageAtAuthFilter.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Pages/ShortCircuitPageAtAuthFilter.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ShortCircuitPageAtAuthFilter.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/Pages/ShortCircuitPageAtAuthFilter.cshtml.cs b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ShortCircuitPageAtAuthFilter.cshtml.cs
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Pages/ShortCircuitPageAtAuthFilter.cshtml.cs
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ShortCircuitPageAtAuthFilter.cshtml.cs
diff --git a/test/WebSites/RazorPagesWebSite/Pages/ShortCircuitPageAtPageFilter.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ShortCircuitPageAtPageFilter.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Pages/ShortCircuitPageAtPageFilter.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ShortCircuitPageAtPageFilter.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/Pages/ShortCircuitPageAtPageFilter.cshtml.cs b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ShortCircuitPageAtPageFilter.cshtml.cs
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Pages/ShortCircuitPageAtPageFilter.cshtml.cs
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ShortCircuitPageAtPageFilter.cshtml.cs
diff --git a/test/WebSites/RazorPagesWebSite/Pages/TagHelper/CrossPost.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/TagHelper/CrossPost.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Pages/TagHelper/CrossPost.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Pages/TagHelper/CrossPost.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/Pages/TagHelper/FormAction.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/TagHelper/FormAction.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Pages/TagHelper/FormAction.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Pages/TagHelper/FormAction.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/Pages/TagHelper/PathTraversalLinks.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/TagHelper/PathTraversalLinks.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Pages/TagHelper/PathTraversalLinks.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Pages/TagHelper/PathTraversalLinks.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/Pages/TagHelper/PostWithHandler.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/TagHelper/PostWithHandler.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Pages/TagHelper/PostWithHandler.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Pages/TagHelper/PostWithHandler.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/Pages/TagHelper/SelfPost.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/TagHelper/SelfPost.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Pages/TagHelper/SelfPost.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Pages/TagHelper/SelfPost.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/Pages/TagHelper/SiblingLinks.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/TagHelper/SiblingLinks.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Pages/TagHelper/SiblingLinks.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Pages/TagHelper/SiblingLinks.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/Pages/TagHelper/SubDir/SubDirPage.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/TagHelper/SubDir/SubDirPage.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Pages/TagHelper/SubDir/SubDirPage.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Pages/TagHelper/SubDir/SubDirPage.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/Pages/TagHelper/SubDirectoryLinks.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/TagHelper/SubDirectoryLinks.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Pages/TagHelper/SubDirectoryLinks.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Pages/TagHelper/SubDirectoryLinks.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/Pages/TagHelper/_ViewImports.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/TagHelper/_ViewImports.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Pages/TagHelper/_ViewImports.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Pages/TagHelper/_ViewImports.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/Pages/TryUpdateModel.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/TryUpdateModel.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Pages/TryUpdateModel.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Pages/TryUpdateModel.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/Pages/TryUpdateModelPageModel.cs b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/TryUpdateModelPageModel.cs
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Pages/TryUpdateModelPageModel.cs
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Pages/TryUpdateModelPageModel.cs
diff --git a/test/WebSites/RazorPagesWebSite/Pages/TryUpdateModelPageModel.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/TryUpdateModelPageModel.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Pages/TryUpdateModelPageModel.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Pages/TryUpdateModelPageModel.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/Pages/TryValidateModel.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/TryValidateModel.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Pages/TryValidateModel.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Pages/TryValidateModel.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/Pages/TryValidateModelPageModel.cs b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/TryValidateModelPageModel.cs
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Pages/TryValidateModelPageModel.cs
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Pages/TryValidateModelPageModel.cs
diff --git a/test/WebSites/RazorPagesWebSite/Pages/TryValidateModelPageModel.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/TryValidateModelPageModel.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Pages/TryValidateModelPageModel.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Pages/TryValidateModelPageModel.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/Pages/Validation/PageHandlerWithValidation.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Validation/PageHandlerWithValidation.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Pages/Validation/PageHandlerWithValidation.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Validation/PageHandlerWithValidation.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/Pages/Validation/PageWithValidation.cs b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Validation/PageWithValidation.cs
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Pages/Validation/PageWithValidation.cs
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Validation/PageWithValidation.cs
diff --git a/test/WebSites/RazorPagesWebSite/Pages/Validation/PageWithValidation.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Validation/PageWithValidation.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Pages/Validation/PageWithValidation.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Validation/PageWithValidation.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/Pages/Validation/_ViewImports.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Validation/_ViewImports.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Pages/Validation/_ViewImports.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Pages/Validation/_ViewImports.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/Pages/ViewData/ViewDataInPage.cs b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ViewData/ViewDataInPage.cs
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Pages/ViewData/ViewDataInPage.cs
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ViewData/ViewDataInPage.cs
diff --git a/test/WebSites/RazorPagesWebSite/Pages/ViewData/ViewDataInPage.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ViewData/ViewDataInPage.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Pages/ViewData/ViewDataInPage.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ViewData/ViewDataInPage.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/Pages/ViewData/ViewDataInPageWithoutModel.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ViewData/ViewDataInPageWithoutModel.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Pages/ViewData/ViewDataInPageWithoutModel.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ViewData/ViewDataInPageWithoutModel.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/Pages/ViewData/ViewDataSetInViewStart/Index.cs b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ViewData/ViewDataSetInViewStart/Index.cs
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Pages/ViewData/ViewDataSetInViewStart/Index.cs
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ViewData/ViewDataSetInViewStart/Index.cs
diff --git a/test/WebSites/RazorPagesWebSite/Pages/ViewData/ViewDataSetInViewStart/Index.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ViewData/ViewDataSetInViewStart/Index.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Pages/ViewData/ViewDataSetInViewStart/Index.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ViewData/ViewDataSetInViewStart/Index.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/Pages/ViewData/ViewDataSetInViewStart/_Layout.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ViewData/ViewDataSetInViewStart/_Layout.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Pages/ViewData/ViewDataSetInViewStart/_Layout.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ViewData/ViewDataSetInViewStart/_Layout.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/Pages/ViewData/ViewDataSetInViewStart/_ViewStart.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ViewData/ViewDataSetInViewStart/_ViewStart.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Pages/ViewData/ViewDataSetInViewStart/_ViewStart.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ViewData/ViewDataSetInViewStart/_ViewStart.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/Pages/ViewData/ViewDataToViewComponentPage.cs b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ViewData/ViewDataToViewComponentPage.cs
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Pages/ViewData/ViewDataToViewComponentPage.cs
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ViewData/ViewDataToViewComponentPage.cs
diff --git a/test/WebSites/RazorPagesWebSite/Pages/ViewData/ViewDataToViewComponentPage.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ViewData/ViewDataToViewComponentPage.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Pages/ViewData/ViewDataToViewComponentPage.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ViewData/ViewDataToViewComponentPage.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/Pages/ViewData/_Layout.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ViewData/_Layout.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Pages/ViewData/_Layout.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ViewData/_Layout.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/Pages/ViewData/_ViewImports.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ViewData/_ViewImports.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Pages/ViewData/_ViewImports.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ViewData/_ViewImports.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/Pages/ViewDataAvailableAfterHandlerExecuted.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ViewDataAvailableAfterHandlerExecuted.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Pages/ViewDataAvailableAfterHandlerExecuted.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ViewDataAvailableAfterHandlerExecuted.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/Pages/ViewDataAvailableAfterHandlerExecuted.cshtml.cs b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ViewDataAvailableAfterHandlerExecuted.cshtml.cs
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Pages/ViewDataAvailableAfterHandlerExecuted.cshtml.cs
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ViewDataAvailableAfterHandlerExecuted.cshtml.cs
diff --git a/test/WebSites/RazorPagesWebSite/Pages/ViewSearch/Index.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ViewSearch/Index.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Pages/ViewSearch/Index.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ViewSearch/Index.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/Pages/ViewSearch/_Sibling.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ViewSearch/_Sibling.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Pages/ViewSearch/_Sibling.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Pages/ViewSearch/_Sibling.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/Pages/WithViewImport/Index.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/WithViewImport/Index.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Pages/WithViewImport/Index.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Pages/WithViewImport/Index.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/Pages/WithViewImport/_ViewImports.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/WithViewImport/_ViewImports.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Pages/WithViewImport/_ViewImports.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Pages/WithViewImport/_ViewImports.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/Pages/WithViewStart/Index.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/WithViewStart/Index.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Pages/WithViewStart/Index.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Pages/WithViewStart/Index.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/Pages/WithViewStart/ViewStartAtRoot.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/WithViewStart/ViewStartAtRoot.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Pages/WithViewStart/ViewStartAtRoot.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Pages/WithViewStart/ViewStartAtRoot.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/Pages/WithViewStart/_ViewStart.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/WithViewStart/_ViewStart.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Pages/WithViewStart/_ViewStart.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Pages/WithViewStart/_ViewStart.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/Pages/_Parent.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/_Parent.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Pages/_Parent.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Pages/_Parent.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/Pages/_ViewImports.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Pages/_ViewImports.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Pages/_ViewImports.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Pages/_ViewImports.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/PathSet.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/PathSet.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/PathSet.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/PathSet.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/PolymorphicModelBinder.cs b/src/Mvc/test/WebSites/RazorPagesWebSite/PolymorphicModelBinder.cs
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/PolymorphicModelBinder.cs
rename to src/Mvc/test/WebSites/RazorPagesWebSite/PolymorphicModelBinder.cs
diff --git a/test/WebSites/RazorPagesWebSite/Program.cs b/src/Mvc/test/WebSites/RazorPagesWebSite/Program.cs
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Program.cs
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Program.cs
diff --git a/test/WebSites/RazorPagesWebSite/RazorPagesWebSite.csproj b/src/Mvc/test/WebSites/RazorPagesWebSite/RazorPagesWebSite.csproj
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/RazorPagesWebSite.csproj
rename to src/Mvc/test/WebSites/RazorPagesWebSite/RazorPagesWebSite.csproj
diff --git a/test/WebSites/RazorPagesWebSite/RedirectToController.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/RedirectToController.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/RedirectToController.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/RedirectToController.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/RenderPartialWithModel.cs b/src/Mvc/test/WebSites/RazorPagesWebSite/RenderPartialWithModel.cs
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/RenderPartialWithModel.cs
rename to src/Mvc/test/WebSites/RazorPagesWebSite/RenderPartialWithModel.cs
diff --git a/test/WebSites/RazorPagesWebSite/RenderPartialWithModel.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/RenderPartialWithModel.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/RenderPartialWithModel.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/RenderPartialWithModel.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/RenderPartialWithoutModel.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/RenderPartialWithoutModel.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/RenderPartialWithoutModel.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/RenderPartialWithoutModel.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/RouteData.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/RouteData.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/RouteData.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/RouteData.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/Services/CustomService.cs b/src/Mvc/test/WebSites/RazorPagesWebSite/Services/CustomService.cs
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Services/CustomService.cs
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Services/CustomService.cs
diff --git a/test/WebSites/RazorPagesWebSite/Show.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Show.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Show.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Show.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/SimpleForms.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/SimpleForms.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/SimpleForms.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/SimpleForms.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/Startup.cs b/src/Mvc/test/WebSites/RazorPagesWebSite/Startup.cs
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Startup.cs
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Startup.cs
diff --git a/test/WebSites/RazorPagesWebSite/StartupWithBasePath.cs b/src/Mvc/test/WebSites/RazorPagesWebSite/StartupWithBasePath.cs
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/StartupWithBasePath.cs
rename to src/Mvc/test/WebSites/RazorPagesWebSite/StartupWithBasePath.cs
diff --git a/test/WebSites/RazorPagesWebSite/TagHelpers.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/TagHelpers.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/TagHelpers.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/TagHelpers.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/TempData/SetMessageAndRedirect.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/TempData/SetMessageAndRedirect.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/TempData/SetMessageAndRedirect.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/TempData/SetMessageAndRedirect.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/TempData/SetTempDataOnPageAndRedirect.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/TempData/SetTempDataOnPageAndRedirect.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/TempData/SetTempDataOnPageAndRedirect.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/TempData/SetTempDataOnPageAndRedirect.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/TempData/SetTempDataOnPageModelAndRedirect.cs b/src/Mvc/test/WebSites/RazorPagesWebSite/TempData/SetTempDataOnPageModelAndRedirect.cs
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/TempData/SetTempDataOnPageModelAndRedirect.cs
rename to src/Mvc/test/WebSites/RazorPagesWebSite/TempData/SetTempDataOnPageModelAndRedirect.cs
diff --git a/test/WebSites/RazorPagesWebSite/TempData/SetTempDataOnPageModelAndRedirect.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/TempData/SetTempDataOnPageModelAndRedirect.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/TempData/SetTempDataOnPageModelAndRedirect.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/TempData/SetTempDataOnPageModelAndRedirect.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/TempData/ShowMessage.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/TempData/ShowMessage.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/TempData/ShowMessage.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/TempData/ShowMessage.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/TempData/TempDataPageModel.cs b/src/Mvc/test/WebSites/RazorPagesWebSite/TempData/TempDataPageModel.cs
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/TempData/TempDataPageModel.cs
rename to src/Mvc/test/WebSites/RazorPagesWebSite/TempData/TempDataPageModel.cs
diff --git a/test/WebSites/RazorPagesWebSite/TempData/TempDataPageModelProperty.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/TempData/TempDataPageModelProperty.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/TempData/TempDataPageModelProperty.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/TempData/TempDataPageModelProperty.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/Views/Shared/_FileInShared.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Views/Shared/_FileInShared.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Views/Shared/_FileInShared.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Views/Shared/_FileInShared.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/Views/Shared/_GlobalLayout.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Views/Shared/_GlobalLayout.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Views/Shared/_GlobalLayout.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Views/Shared/_GlobalLayout.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/Views/Shared/_PartialWithModel.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Views/Shared/_PartialWithModel.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Views/Shared/_PartialWithModel.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Views/Shared/_PartialWithModel.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/Views/Shared/_PartialWithoutModel.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Views/Shared/_PartialWithoutModel.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Views/Shared/_PartialWithoutModel.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Views/Shared/_PartialWithoutModel.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/Views/Shared/_Shared.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/Views/Shared/_Shared.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/Views/Shared/_Shared.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/Views/Shared/_Shared.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/_Root.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/_Root.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/_Root.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/_Root.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/_ViewStart.cshtml b/src/Mvc/test/WebSites/RazorPagesWebSite/_ViewStart.cshtml
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/_ViewStart.cshtml
rename to src/Mvc/test/WebSites/RazorPagesWebSite/_ViewStart.cshtml
diff --git a/test/WebSites/RazorPagesWebSite/readme.md b/src/Mvc/test/WebSites/RazorPagesWebSite/readme.md
similarity index 100%
rename from test/WebSites/RazorPagesWebSite/readme.md
rename to src/Mvc/test/WebSites/RazorPagesWebSite/readme.md
diff --git a/test/WebSites/RazorWebSite/Components/ComponentForViewWithPaths.cs b/src/Mvc/test/WebSites/RazorWebSite/Components/ComponentForViewWithPaths.cs
similarity index 100%
rename from test/WebSites/RazorWebSite/Components/ComponentForViewWithPaths.cs
rename to src/Mvc/test/WebSites/RazorWebSite/Components/ComponentForViewWithPaths.cs
diff --git a/test/WebSites/RazorWebSite/Components/ComponentThatSetsTitle.cs b/src/Mvc/test/WebSites/RazorWebSite/Components/ComponentThatSetsTitle.cs
similarity index 100%
rename from test/WebSites/RazorWebSite/Components/ComponentThatSetsTitle.cs
rename to src/Mvc/test/WebSites/RazorWebSite/Components/ComponentThatSetsTitle.cs
diff --git a/test/WebSites/RazorWebSite/Components/ComponentWithLayout.cs b/src/Mvc/test/WebSites/RazorWebSite/Components/ComponentWithLayout.cs
similarity index 100%
rename from test/WebSites/RazorWebSite/Components/ComponentWithLayout.cs
rename to src/Mvc/test/WebSites/RazorWebSite/Components/ComponentWithLayout.cs
diff --git a/test/WebSites/RazorWebSite/Components/ComponentWithRelativePath.cs b/src/Mvc/test/WebSites/RazorWebSite/Components/ComponentWithRelativePath.cs
similarity index 100%
rename from test/WebSites/RazorWebSite/Components/ComponentWithRelativePath.cs
rename to src/Mvc/test/WebSites/RazorWebSite/Components/ComponentWithRelativePath.cs
diff --git a/test/WebSites/RazorWebSite/Components/ComponentWithViewStart.cs b/src/Mvc/test/WebSites/RazorWebSite/Components/ComponentWithViewStart.cs
similarity index 100%
rename from test/WebSites/RazorWebSite/Components/ComponentWithViewStart.cs
rename to src/Mvc/test/WebSites/RazorWebSite/Components/ComponentWithViewStart.cs
diff --git a/test/WebSites/RazorWebSite/Components/InheritingViewComponent.cs b/src/Mvc/test/WebSites/RazorWebSite/Components/InheritingViewComponent.cs
similarity index 100%
rename from test/WebSites/RazorWebSite/Components/InheritingViewComponent.cs
rename to src/Mvc/test/WebSites/RazorWebSite/Components/InheritingViewComponent.cs
diff --git a/test/WebSites/RazorWebSite/Controllers/AddTagHelperComponentController.cs b/src/Mvc/test/WebSites/RazorWebSite/Controllers/AddTagHelperComponentController.cs
similarity index 100%
rename from test/WebSites/RazorWebSite/Controllers/AddTagHelperComponentController.cs
rename to src/Mvc/test/WebSites/RazorWebSite/Controllers/AddTagHelperComponentController.cs
diff --git a/test/WebSites/RazorWebSite/Controllers/BackSlashController.cs b/src/Mvc/test/WebSites/RazorWebSite/Controllers/BackSlashController.cs
similarity index 100%
rename from test/WebSites/RazorWebSite/Controllers/BackSlashController.cs
rename to src/Mvc/test/WebSites/RazorWebSite/Controllers/BackSlashController.cs
diff --git a/test/WebSites/RazorWebSite/Controllers/DataAnnotationController.cs b/src/Mvc/test/WebSites/RazorWebSite/Controllers/DataAnnotationController.cs
similarity index 100%
rename from test/WebSites/RazorWebSite/Controllers/DataAnnotationController.cs
rename to src/Mvc/test/WebSites/RazorWebSite/Controllers/DataAnnotationController.cs
diff --git a/test/WebSites/RazorWebSite/Controllers/DirectivesController.cs b/src/Mvc/test/WebSites/RazorWebSite/Controllers/DirectivesController.cs
similarity index 100%
rename from test/WebSites/RazorWebSite/Controllers/DirectivesController.cs
rename to src/Mvc/test/WebSites/RazorWebSite/Controllers/DirectivesController.cs
diff --git a/test/WebSites/RazorWebSite/Controllers/EmbeddedViewsController.cs b/src/Mvc/test/WebSites/RazorWebSite/Controllers/EmbeddedViewsController.cs
similarity index 100%
rename from test/WebSites/RazorWebSite/Controllers/EmbeddedViewsController.cs
rename to src/Mvc/test/WebSites/RazorWebSite/Controllers/EmbeddedViewsController.cs
diff --git a/test/WebSites/RazorWebSite/Controllers/ExpanderViewsController.cs b/src/Mvc/test/WebSites/RazorWebSite/Controllers/ExpanderViewsController.cs
similarity index 100%
rename from test/WebSites/RazorWebSite/Controllers/ExpanderViewsController.cs
rename to src/Mvc/test/WebSites/RazorWebSite/Controllers/ExpanderViewsController.cs
diff --git a/test/WebSites/RazorWebSite/Controllers/FlushPoint.cs b/src/Mvc/test/WebSites/RazorWebSite/Controllers/FlushPoint.cs
similarity index 100%
rename from test/WebSites/RazorWebSite/Controllers/FlushPoint.cs
rename to src/Mvc/test/WebSites/RazorWebSite/Controllers/FlushPoint.cs
diff --git a/test/WebSites/RazorWebSite/Controllers/HtmlHelperOptionsController.cs b/src/Mvc/test/WebSites/RazorWebSite/Controllers/HtmlHelperOptionsController.cs
similarity index 100%
rename from test/WebSites/RazorWebSite/Controllers/HtmlHelperOptionsController.cs
rename to src/Mvc/test/WebSites/RazorWebSite/Controllers/HtmlHelperOptionsController.cs
diff --git a/test/WebSites/RazorWebSite/Controllers/NestedViewStartsController.cs b/src/Mvc/test/WebSites/RazorWebSite/Controllers/NestedViewStartsController.cs
similarity index 100%
rename from test/WebSites/RazorWebSite/Controllers/NestedViewStartsController.cs
rename to src/Mvc/test/WebSites/RazorWebSite/Controllers/NestedViewStartsController.cs
diff --git a/test/WebSites/RazorWebSite/Controllers/PartialViewEngineController.cs b/src/Mvc/test/WebSites/RazorWebSite/Controllers/PartialViewEngineController.cs
similarity index 100%
rename from test/WebSites/RazorWebSite/Controllers/PartialViewEngineController.cs
rename to src/Mvc/test/WebSites/RazorWebSite/Controllers/PartialViewEngineController.cs
diff --git a/test/WebSites/RazorWebSite/Controllers/PartialsWithLayoutController.cs b/src/Mvc/test/WebSites/RazorWebSite/Controllers/PartialsWithLayoutController.cs
similarity index 100%
rename from test/WebSites/RazorWebSite/Controllers/PartialsWithLayoutController.cs
rename to src/Mvc/test/WebSites/RazorWebSite/Controllers/PartialsWithLayoutController.cs
diff --git a/test/WebSites/RazorWebSite/Controllers/TagHelperComponentController.cs b/src/Mvc/test/WebSites/RazorWebSite/Controllers/TagHelperComponentController.cs
similarity index 100%
rename from test/WebSites/RazorWebSite/Controllers/TagHelperComponentController.cs
rename to src/Mvc/test/WebSites/RazorWebSite/Controllers/TagHelperComponentController.cs
diff --git a/test/WebSites/RazorWebSite/Controllers/TemplateExpander.cs b/src/Mvc/test/WebSites/RazorWebSite/Controllers/TemplateExpander.cs
similarity index 100%
rename from test/WebSites/RazorWebSite/Controllers/TemplateExpander.cs
rename to src/Mvc/test/WebSites/RazorWebSite/Controllers/TemplateExpander.cs
diff --git a/test/WebSites/RazorWebSite/Controllers/UpdateableFileProviderController.cs b/src/Mvc/test/WebSites/RazorWebSite/Controllers/UpdateableFileProviderController.cs
similarity index 100%
rename from test/WebSites/RazorWebSite/Controllers/UpdateableFileProviderController.cs
rename to src/Mvc/test/WebSites/RazorWebSite/Controllers/UpdateableFileProviderController.cs
diff --git a/test/WebSites/RazorWebSite/Controllers/UrlResolutionController.cs b/src/Mvc/test/WebSites/RazorWebSite/Controllers/UrlResolutionController.cs
similarity index 100%
rename from test/WebSites/RazorWebSite/Controllers/UrlResolutionController.cs
rename to src/Mvc/test/WebSites/RazorWebSite/Controllers/UrlResolutionController.cs
diff --git a/test/WebSites/RazorWebSite/Controllers/ViewEngineController.cs b/src/Mvc/test/WebSites/RazorWebSite/Controllers/ViewEngineController.cs
similarity index 100%
rename from test/WebSites/RazorWebSite/Controllers/ViewEngineController.cs
rename to src/Mvc/test/WebSites/RazorWebSite/Controllers/ViewEngineController.cs
diff --git a/test/WebSites/RazorWebSite/Controllers/ViewNameSpecification_HomeController.cs b/src/Mvc/test/WebSites/RazorWebSite/Controllers/ViewNameSpecification_HomeController.cs
similarity index 100%
rename from test/WebSites/RazorWebSite/Controllers/ViewNameSpecification_HomeController.cs
rename to src/Mvc/test/WebSites/RazorWebSite/Controllers/ViewNameSpecification_HomeController.cs
diff --git a/test/WebSites/RazorWebSite/Controllers/ViewWithPathsController.cs b/src/Mvc/test/WebSites/RazorWebSite/Controllers/ViewWithPathsController.cs
similarity index 100%
rename from test/WebSites/RazorWebSite/Controllers/ViewWithPathsController.cs
rename to src/Mvc/test/WebSites/RazorWebSite/Controllers/ViewWithPathsController.cs
diff --git a/test/WebSites/RazorWebSite/Controllers/ViewsConsumingCompilationOptionsController.cs b/src/Mvc/test/WebSites/RazorWebSite/Controllers/ViewsConsumingCompilationOptionsController.cs
similarity index 100%
rename from test/WebSites/RazorWebSite/Controllers/ViewsConsumingCompilationOptionsController.cs
rename to src/Mvc/test/WebSites/RazorWebSite/Controllers/ViewsConsumingCompilationOptionsController.cs
diff --git a/test/WebSites/RazorWebSite/EmbeddedResources/Views/EmbeddedShared/_Layout.cshtml b/src/Mvc/test/WebSites/RazorWebSite/EmbeddedResources/Views/EmbeddedShared/_Layout.cshtml
similarity index 100%
rename from test/WebSites/RazorWebSite/EmbeddedResources/Views/EmbeddedShared/_Layout.cshtml
rename to src/Mvc/test/WebSites/RazorWebSite/EmbeddedResources/Views/EmbeddedShared/_Layout.cshtml
diff --git a/test/WebSites/RazorWebSite/EmbeddedResources/Views/EmbeddedShared/_Partial.cshtml b/src/Mvc/test/WebSites/RazorWebSite/EmbeddedResources/Views/EmbeddedShared/_Partial.cshtml
similarity index 100%
rename from test/WebSites/RazorWebSite/EmbeddedResources/Views/EmbeddedShared/_Partial.cshtml
rename to src/Mvc/test/WebSites/RazorWebSite/EmbeddedResources/Views/EmbeddedShared/_Partial.cshtml
diff --git a/test/WebSites/RazorWebSite/EmbeddedResources/Views/EmbeddedViews/EmbeddedPartial.cshtml b/src/Mvc/test/WebSites/RazorWebSite/EmbeddedResources/Views/EmbeddedViews/EmbeddedPartial.cshtml
similarity index 100%
rename from test/WebSites/RazorWebSite/EmbeddedResources/Views/EmbeddedViews/EmbeddedPartial.cshtml
rename to src/Mvc/test/WebSites/RazorWebSite/EmbeddedResources/Views/EmbeddedViews/EmbeddedPartial.cshtml
diff --git a/test/WebSites/RazorWebSite/EmbeddedResources/Views/EmbeddedViews/Index.cshtml b/src/Mvc/test/WebSites/RazorWebSite/EmbeddedResources/Views/EmbeddedViews/Index.cshtml
similarity index 100%
rename from test/WebSites/RazorWebSite/EmbeddedResources/Views/EmbeddedViews/Index.cshtml
rename to src/Mvc/test/WebSites/RazorWebSite/EmbeddedResources/Views/EmbeddedViews/Index.cshtml
diff --git a/test/WebSites/RazorWebSite/EmbeddedResources/Views/EmbeddedViews/RelativeNonPath.cshtml b/src/Mvc/test/WebSites/RazorWebSite/EmbeddedResources/Views/EmbeddedViews/RelativeNonPath.cshtml
similarity index 100%
rename from test/WebSites/RazorWebSite/EmbeddedResources/Views/EmbeddedViews/RelativeNonPath.cshtml
rename to src/Mvc/test/WebSites/RazorWebSite/EmbeddedResources/Views/EmbeddedViews/RelativeNonPath.cshtml
diff --git a/test/WebSites/RazorWebSite/EmbeddedResources/Views/EmbeddedViews/_ViewImports.cshtml b/src/Mvc/test/WebSites/RazorWebSite/EmbeddedResources/Views/EmbeddedViews/_ViewImports.cshtml
similarity index 100%
rename from test/WebSites/RazorWebSite/EmbeddedResources/Views/EmbeddedViews/_ViewImports.cshtml
rename to src/Mvc/test/WebSites/RazorWebSite/EmbeddedResources/Views/EmbeddedViews/_ViewImports.cshtml
diff --git a/test/WebSites/RazorWebSite/EmbeddedResources/Views/EmbeddedViews/_ViewStart.cshtml b/src/Mvc/test/WebSites/RazorWebSite/EmbeddedResources/Views/EmbeddedViews/_ViewStart.cshtml
similarity index 100%
rename from test/WebSites/RazorWebSite/EmbeddedResources/Views/EmbeddedViews/_ViewStart.cshtml
rename to src/Mvc/test/WebSites/RazorWebSite/EmbeddedResources/Views/EmbeddedViews/_ViewStart.cshtml
diff --git a/test/WebSites/RazorWebSite/EmbeddedResources/Views/Shared/_EmbeddedPartial.cshtml b/src/Mvc/test/WebSites/RazorWebSite/EmbeddedResources/Views/Shared/_EmbeddedPartial.cshtml
similarity index 100%
rename from test/WebSites/RazorWebSite/EmbeddedResources/Views/Shared/_EmbeddedPartial.cshtml
rename to src/Mvc/test/WebSites/RazorWebSite/EmbeddedResources/Views/Shared/_EmbeddedPartial.cshtml
diff --git a/test/WebSites/RazorWebSite/Models/Address.cs b/src/Mvc/test/WebSites/RazorWebSite/Models/Address.cs
similarity index 100%
rename from test/WebSites/RazorWebSite/Models/Address.cs
rename to src/Mvc/test/WebSites/RazorWebSite/Models/Address.cs
diff --git a/test/WebSites/RazorWebSite/Models/EnumModel.cs b/src/Mvc/test/WebSites/RazorWebSite/Models/EnumModel.cs
similarity index 100%
rename from test/WebSites/RazorWebSite/Models/EnumModel.cs
rename to src/Mvc/test/WebSites/RazorWebSite/Models/EnumModel.cs
diff --git a/test/WebSites/RazorWebSite/Models/Person.cs b/src/Mvc/test/WebSites/RazorWebSite/Models/Person.cs
similarity index 100%
rename from test/WebSites/RazorWebSite/Models/Person.cs
rename to src/Mvc/test/WebSites/RazorWebSite/Models/Person.cs
diff --git a/test/WebSites/RazorWebSite/MyBasePage.cs b/src/Mvc/test/WebSites/RazorWebSite/MyBasePage.cs
similarity index 100%
rename from test/WebSites/RazorWebSite/MyBasePage.cs
rename to src/Mvc/test/WebSites/RazorWebSite/MyBasePage.cs
diff --git a/test/WebSites/RazorWebSite/NestedViewImportsController.cs b/src/Mvc/test/WebSites/RazorWebSite/NestedViewImportsController.cs
similarity index 100%
rename from test/WebSites/RazorWebSite/NestedViewImportsController.cs
rename to src/Mvc/test/WebSites/RazorWebSite/NestedViewImportsController.cs
diff --git a/test/WebSites/RazorWebSite/Pages/Shared/_Layout.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Pages/Shared/_Layout.cshtml
similarity index 100%
rename from test/WebSites/RazorWebSite/Pages/Shared/_Layout.cshtml
rename to src/Mvc/test/WebSites/RazorWebSite/Pages/Shared/_Layout.cshtml
diff --git a/test/WebSites/RazorWebSite/Pages/Shared/_SharedFromPages.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Pages/Shared/_SharedFromPages.cshtml
similarity index 100%
rename from test/WebSites/RazorWebSite/Pages/Shared/_SharedFromPages.cshtml
rename to src/Mvc/test/WebSites/RazorWebSite/Pages/Shared/_SharedFromPages.cshtml
diff --git a/test/WebSites/RazorWebSite/Program.cs b/src/Mvc/test/WebSites/RazorWebSite/Program.cs
similarity index 100%
rename from test/WebSites/RazorWebSite/Program.cs
rename to src/Mvc/test/WebSites/RazorWebSite/Program.cs
diff --git a/test/WebSites/RazorWebSite/RazorWebSite.csproj b/src/Mvc/test/WebSites/RazorWebSite/RazorWebSite.csproj
similarity index 100%
rename from test/WebSites/RazorWebSite/RazorWebSite.csproj
rename to src/Mvc/test/WebSites/RazorWebSite/RazorWebSite.csproj
diff --git a/test/WebSites/RazorWebSite/Resources/Models/ModelEnum.resx b/src/Mvc/test/WebSites/RazorWebSite/Resources/Models/ModelEnum.resx
similarity index 100%
rename from test/WebSites/RazorWebSite/Resources/Models/ModelEnum.resx
rename to src/Mvc/test/WebSites/RazorWebSite/Resources/Models/ModelEnum.resx
diff --git a/test/WebSites/RazorWebSite/Resources/SingleType.resx b/src/Mvc/test/WebSites/RazorWebSite/Resources/SingleType.resx
similarity index 100%
rename from test/WebSites/RazorWebSite/Resources/SingleType.resx
rename to src/Mvc/test/WebSites/RazorWebSite/Resources/SingleType.resx
diff --git a/test/WebSites/RazorWebSite/Services/BackSlashExpander.cs b/src/Mvc/test/WebSites/RazorWebSite/Services/BackSlashExpander.cs
similarity index 100%
rename from test/WebSites/RazorWebSite/Services/BackSlashExpander.cs
rename to src/Mvc/test/WebSites/RazorWebSite/Services/BackSlashExpander.cs
diff --git a/test/WebSites/RazorWebSite/Services/FrameworkSpecificHelper.cs b/src/Mvc/test/WebSites/RazorWebSite/Services/FrameworkSpecificHelper.cs
similarity index 100%
rename from test/WebSites/RazorWebSite/Services/FrameworkSpecificHelper.cs
rename to src/Mvc/test/WebSites/RazorWebSite/Services/FrameworkSpecificHelper.cs
diff --git a/test/WebSites/RazorWebSite/Services/InjectedHelper.cs b/src/Mvc/test/WebSites/RazorWebSite/Services/InjectedHelper.cs
similarity index 100%
rename from test/WebSites/RazorWebSite/Services/InjectedHelper.cs
rename to src/Mvc/test/WebSites/RazorWebSite/Services/InjectedHelper.cs
diff --git a/test/WebSites/RazorWebSite/Services/NonMainPageViewLocationExpander.cs b/src/Mvc/test/WebSites/RazorWebSite/Services/NonMainPageViewLocationExpander.cs
similarity index 100%
rename from test/WebSites/RazorWebSite/Services/NonMainPageViewLocationExpander.cs
rename to src/Mvc/test/WebSites/RazorWebSite/Services/NonMainPageViewLocationExpander.cs
diff --git a/test/WebSites/RazorWebSite/Services/TaskReturningService.cs b/src/Mvc/test/WebSites/RazorWebSite/Services/TaskReturningService.cs
similarity index 100%
rename from test/WebSites/RazorWebSite/Services/TaskReturningService.cs
rename to src/Mvc/test/WebSites/RazorWebSite/Services/TaskReturningService.cs
diff --git a/test/WebSites/RazorWebSite/Services/TestBodyTagHelperComponent.cs b/src/Mvc/test/WebSites/RazorWebSite/Services/TestBodyTagHelperComponent.cs
similarity index 100%
rename from test/WebSites/RazorWebSite/Services/TestBodyTagHelperComponent.cs
rename to src/Mvc/test/WebSites/RazorWebSite/Services/TestBodyTagHelperComponent.cs
diff --git a/test/WebSites/RazorWebSite/Services/TestHeadTagHelperComponent.cs b/src/Mvc/test/WebSites/RazorWebSite/Services/TestHeadTagHelperComponent.cs
similarity index 100%
rename from test/WebSites/RazorWebSite/Services/TestHeadTagHelperComponent.cs
rename to src/Mvc/test/WebSites/RazorWebSite/Services/TestHeadTagHelperComponent.cs
diff --git a/test/WebSites/RazorWebSite/Services/UpdateableFileProvider.cs b/src/Mvc/test/WebSites/RazorWebSite/Services/UpdateableFileProvider.cs
similarity index 100%
rename from test/WebSites/RazorWebSite/Services/UpdateableFileProvider.cs
rename to src/Mvc/test/WebSites/RazorWebSite/Services/UpdateableFileProvider.cs
diff --git a/test/WebSites/RazorWebSite/Shared-Views/ExpanderViews/Index.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Shared-Views/ExpanderViews/Index.cshtml
similarity index 100%
rename from test/WebSites/RazorWebSite/Shared-Views/ExpanderViews/Index.cshtml
rename to src/Mvc/test/WebSites/RazorWebSite/Shared-Views/ExpanderViews/Index.cshtml
diff --git a/test/WebSites/RazorWebSite/Shared-Views/ExpanderViews/_ExpanderPartial.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Shared-Views/ExpanderViews/_ExpanderPartial.cshtml
similarity index 100%
rename from test/WebSites/RazorWebSite/Shared-Views/ExpanderViews/_ExpanderPartial.cshtml
rename to src/Mvc/test/WebSites/RazorWebSite/Shared-Views/ExpanderViews/_ExpanderPartial.cshtml
diff --git a/test/WebSites/RazorWebSite/SingleType.cs b/src/Mvc/test/WebSites/RazorWebSite/SingleType.cs
similarity index 100%
rename from test/WebSites/RazorWebSite/SingleType.cs
rename to src/Mvc/test/WebSites/RazorWebSite/SingleType.cs
diff --git a/test/WebSites/RazorWebSite/Startup.cs b/src/Mvc/test/WebSites/RazorWebSite/Startup.cs
similarity index 100%
rename from test/WebSites/RazorWebSite/Startup.cs
rename to src/Mvc/test/WebSites/RazorWebSite/Startup.cs
diff --git a/test/WebSites/RazorWebSite/StartupDataAnnotations.cs b/src/Mvc/test/WebSites/RazorWebSite/StartupDataAnnotations.cs
similarity index 100%
rename from test/WebSites/RazorWebSite/StartupDataAnnotations.cs
rename to src/Mvc/test/WebSites/RazorWebSite/StartupDataAnnotations.cs
diff --git a/test/WebSites/RazorWebSite/Views/AddTagHelperComponent/AddComponent.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/AddTagHelperComponent/AddComponent.cshtml
similarity index 100%
rename from test/WebSites/RazorWebSite/Views/AddTagHelperComponent/AddComponent.cshtml
rename to src/Mvc/test/WebSites/RazorWebSite/Views/AddTagHelperComponent/AddComponent.cshtml
diff --git a/test/WebSites/RazorWebSite/Views/BackSlash/BackSlashView.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/BackSlash/BackSlashView.cshtml
similarity index 100%
rename from test/WebSites/RazorWebSite/Views/BackSlash/BackSlashView.cshtml
rename to src/Mvc/test/WebSites/RazorWebSite/Views/BackSlash/BackSlashView.cshtml
diff --git a/test/WebSites/RazorWebSite/Views/BackSlash/_BackSlashPartial.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/BackSlash/_BackSlashPartial.cshtml
similarity index 100%
rename from test/WebSites/RazorWebSite/Views/BackSlash/_BackSlashPartial.cshtml
rename to src/Mvc/test/WebSites/RazorWebSite/Views/BackSlash/_BackSlashPartial.cshtml
diff --git a/test/WebSites/RazorWebSite/Views/BackSlash/_Layout.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/BackSlash/_Layout.cshtml
similarity index 100%
rename from test/WebSites/RazorWebSite/Views/BackSlash/_Layout.cshtml
rename to src/Mvc/test/WebSites/RazorWebSite/Views/BackSlash/_Layout.cshtml
diff --git a/test/WebSites/RazorWebSite/Views/Directives/Scoped/ViewInheritsBasePageFromViewImports.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/Directives/Scoped/ViewInheritsBasePageFromViewImports.cshtml
similarity index 100%
rename from test/WebSites/RazorWebSite/Views/Directives/Scoped/ViewInheritsBasePageFromViewImports.cshtml
rename to src/Mvc/test/WebSites/RazorWebSite/Views/Directives/Scoped/ViewInheritsBasePageFromViewImports.cshtml
diff --git a/test/WebSites/RazorWebSite/Views/Directives/Scoped/_Layout.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/Directives/Scoped/_Layout.cshtml
similarity index 100%
rename from test/WebSites/RazorWebSite/Views/Directives/Scoped/_Layout.cshtml
rename to src/Mvc/test/WebSites/RazorWebSite/Views/Directives/Scoped/_Layout.cshtml
diff --git a/test/WebSites/RazorWebSite/Views/Directives/Scoped/_ViewImports.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/Directives/Scoped/_ViewImports.cshtml
similarity index 100%
rename from test/WebSites/RazorWebSite/Views/Directives/Scoped/_ViewImports.cshtml
rename to src/Mvc/test/WebSites/RazorWebSite/Views/Directives/Scoped/_ViewImports.cshtml
diff --git a/test/WebSites/RazorWebSite/Views/Directives/Scoped/_ViewStart.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/Directives/Scoped/_ViewStart.cshtml
similarity index 100%
rename from test/WebSites/RazorWebSite/Views/Directives/Scoped/_ViewStart.cshtml
rename to src/Mvc/test/WebSites/RazorWebSite/Views/Directives/Scoped/_ViewStart.cshtml
diff --git a/test/WebSites/RazorWebSite/Views/Directives/ViewInheritsInjectAndUsingsFromViewImports.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/Directives/ViewInheritsInjectAndUsingsFromViewImports.cshtml
similarity index 100%
rename from test/WebSites/RazorWebSite/Views/Directives/ViewInheritsInjectAndUsingsFromViewImports.cshtml
rename to src/Mvc/test/WebSites/RazorWebSite/Views/Directives/ViewInheritsInjectAndUsingsFromViewImports.cshtml
diff --git a/test/WebSites/RazorWebSite/Views/Directives/_ViewImports.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/Directives/_ViewImports.cshtml
similarity index 100%
rename from test/WebSites/RazorWebSite/Views/Directives/_ViewImports.cshtml
rename to src/Mvc/test/WebSites/RazorWebSite/Views/Directives/_ViewImports.cshtml
diff --git a/test/WebSites/RazorWebSite/Views/Enum/Enum.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/Enum/Enum.cshtml
similarity index 100%
rename from test/WebSites/RazorWebSite/Views/Enum/Enum.cshtml
rename to src/Mvc/test/WebSites/RazorWebSite/Views/Enum/Enum.cshtml
diff --git a/test/WebSites/RazorWebSite/Views/ExpanderViews/Index.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/ExpanderViews/Index.cshtml
similarity index 100%
rename from test/WebSites/RazorWebSite/Views/ExpanderViews/Index.cshtml
rename to src/Mvc/test/WebSites/RazorWebSite/Views/ExpanderViews/Index.cshtml
diff --git a/test/WebSites/RazorWebSite/Views/FlushPoint/PageWithFlushBeforeLayout.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/FlushPoint/PageWithFlushBeforeLayout.cshtml
similarity index 100%
rename from test/WebSites/RazorWebSite/Views/FlushPoint/PageWithFlushBeforeLayout.cshtml
rename to src/Mvc/test/WebSites/RazorWebSite/Views/FlushPoint/PageWithFlushBeforeLayout.cshtml
diff --git a/test/WebSites/RazorWebSite/Views/FlushPoint/PageWithLayout.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/FlushPoint/PageWithLayout.cshtml
similarity index 100%
rename from test/WebSites/RazorWebSite/Views/FlushPoint/PageWithLayout.cshtml
rename to src/Mvc/test/WebSites/RazorWebSite/Views/FlushPoint/PageWithLayout.cshtml
diff --git a/test/WebSites/RazorWebSite/Views/FlushPoint/PageWithNestedLayout.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/FlushPoint/PageWithNestedLayout.cshtml
similarity index 100%
rename from test/WebSites/RazorWebSite/Views/FlushPoint/PageWithNestedLayout.cshtml
rename to src/Mvc/test/WebSites/RazorWebSite/Views/FlushPoint/PageWithNestedLayout.cshtml
diff --git a/test/WebSites/RazorWebSite/Views/FlushPoint/PageWithPartialsAndViewComponents.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/FlushPoint/PageWithPartialsAndViewComponents.cshtml
similarity index 100%
rename from test/WebSites/RazorWebSite/Views/FlushPoint/PageWithPartialsAndViewComponents.cshtml
rename to src/Mvc/test/WebSites/RazorWebSite/Views/FlushPoint/PageWithPartialsAndViewComponents.cshtml
diff --git a/test/WebSites/RazorWebSite/Views/FlushPoint/PageWithSectionInvokedViaRenderSectionAsync.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/FlushPoint/PageWithSectionInvokedViaRenderSectionAsync.cshtml
similarity index 100%
rename from test/WebSites/RazorWebSite/Views/FlushPoint/PageWithSectionInvokedViaRenderSectionAsync.cshtml
rename to src/Mvc/test/WebSites/RazorWebSite/Views/FlushPoint/PageWithSectionInvokedViaRenderSectionAsync.cshtml
diff --git a/test/WebSites/RazorWebSite/Views/FlushPoint/PageWithoutLayout.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/FlushPoint/PageWithoutLayout.cshtml
similarity index 100%
rename from test/WebSites/RazorWebSite/Views/FlushPoint/PageWithoutLayout.cshtml
rename to src/Mvc/test/WebSites/RazorWebSite/Views/FlushPoint/PageWithoutLayout.cshtml
diff --git a/test/WebSites/RazorWebSite/Views/HtmlHelperOptions/HtmlHelperOptionsDefaultsInPartialView.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/HtmlHelperOptions/HtmlHelperOptionsDefaultsInPartialView.cshtml
similarity index 100%
rename from test/WebSites/RazorWebSite/Views/HtmlHelperOptions/HtmlHelperOptionsDefaultsInPartialView.cshtml
rename to src/Mvc/test/WebSites/RazorWebSite/Views/HtmlHelperOptions/HtmlHelperOptionsDefaultsInPartialView.cshtml
diff --git a/test/WebSites/RazorWebSite/Views/HtmlHelperOptions/HtmlHelperOptionsDefaultsInView.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/HtmlHelperOptions/HtmlHelperOptionsDefaultsInView.cshtml
similarity index 100%
rename from test/WebSites/RazorWebSite/Views/HtmlHelperOptions/HtmlHelperOptionsDefaultsInView.cshtml
rename to src/Mvc/test/WebSites/RazorWebSite/Views/HtmlHelperOptions/HtmlHelperOptionsDefaultsInView.cshtml
diff --git a/test/WebSites/RazorWebSite/Views/HtmlHelperOptions/OverrideAppWideDefaultsInPartialView.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/HtmlHelperOptions/OverrideAppWideDefaultsInPartialView.cshtml
similarity index 100%
rename from test/WebSites/RazorWebSite/Views/HtmlHelperOptions/OverrideAppWideDefaultsInPartialView.cshtml
rename to src/Mvc/test/WebSites/RazorWebSite/Views/HtmlHelperOptions/OverrideAppWideDefaultsInPartialView.cshtml
diff --git a/test/WebSites/RazorWebSite/Views/HtmlHelperOptions/OverrideAppWideDefaultsInView.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/HtmlHelperOptions/OverrideAppWideDefaultsInView.cshtml
similarity index 100%
rename from test/WebSites/RazorWebSite/Views/HtmlHelperOptions/OverrideAppWideDefaultsInView.cshtml
rename to src/Mvc/test/WebSites/RazorWebSite/Views/HtmlHelperOptions/OverrideAppWideDefaultsInView.cshtml
diff --git a/test/WebSites/RazorWebSite/Views/InheritingInherits/Index.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/InheritingInherits/Index.cshtml
similarity index 100%
rename from test/WebSites/RazorWebSite/Views/InheritingInherits/Index.cshtml
rename to src/Mvc/test/WebSites/RazorWebSite/Views/InheritingInherits/Index.cshtml
diff --git a/test/WebSites/RazorWebSite/Views/InheritingInherits/_ViewComponent.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/InheritingInherits/_ViewComponent.cshtml
similarity index 100%
rename from test/WebSites/RazorWebSite/Views/InheritingInherits/_ViewComponent.cshtml
rename to src/Mvc/test/WebSites/RazorWebSite/Views/InheritingInherits/_ViewComponent.cshtml
diff --git a/test/WebSites/RazorWebSite/Views/InheritingInherits/_ViewImports.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/InheritingInherits/_ViewImports.cshtml
similarity index 100%
rename from test/WebSites/RazorWebSite/Views/InheritingInherits/_ViewImports.cshtml
rename to src/Mvc/test/WebSites/RazorWebSite/Views/InheritingInherits/_ViewImports.cshtml
diff --git a/test/WebSites/RazorWebSite/Views/NestedViewImports/Nested/Index.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/NestedViewImports/Nested/Index.cshtml
similarity index 100%
rename from test/WebSites/RazorWebSite/Views/NestedViewImports/Nested/Index.cshtml
rename to src/Mvc/test/WebSites/RazorWebSite/Views/NestedViewImports/Nested/Index.cshtml
diff --git a/test/WebSites/RazorWebSite/Views/NestedViewImports/Nested/_ViewImports.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/NestedViewImports/Nested/_ViewImports.cshtml
similarity index 100%
rename from test/WebSites/RazorWebSite/Views/NestedViewImports/Nested/_ViewImports.cshtml
rename to src/Mvc/test/WebSites/RazorWebSite/Views/NestedViewImports/Nested/_ViewImports.cshtml
diff --git a/test/WebSites/RazorWebSite/Views/NestedViewImports/Nested/_ViewStart.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/NestedViewImports/Nested/_ViewStart.cshtml
similarity index 100%
rename from test/WebSites/RazorWebSite/Views/NestedViewImports/Nested/_ViewStart.cshtml
rename to src/Mvc/test/WebSites/RazorWebSite/Views/NestedViewImports/Nested/_ViewStart.cshtml
diff --git a/test/WebSites/RazorWebSite/Views/NestedViewImports/_ViewImports.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/NestedViewImports/_ViewImports.cshtml
similarity index 100%
rename from test/WebSites/RazorWebSite/Views/NestedViewImports/_ViewImports.cshtml
rename to src/Mvc/test/WebSites/RazorWebSite/Views/NestedViewImports/_ViewImports.cshtml
diff --git a/test/WebSites/RazorWebSite/Views/NestedViewStarts/NestedViewStarts/Index.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/NestedViewStarts/NestedViewStarts/Index.cshtml
similarity index 100%
rename from test/WebSites/RazorWebSite/Views/NestedViewStarts/NestedViewStarts/Index.cshtml
rename to src/Mvc/test/WebSites/RazorWebSite/Views/NestedViewStarts/NestedViewStarts/Index.cshtml
diff --git a/test/WebSites/RazorWebSite/Views/NestedViewStarts/NestedViewStarts/Layout.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/NestedViewStarts/NestedViewStarts/Layout.cshtml
similarity index 100%
rename from test/WebSites/RazorWebSite/Views/NestedViewStarts/NestedViewStarts/Layout.cshtml
rename to src/Mvc/test/WebSites/RazorWebSite/Views/NestedViewStarts/NestedViewStarts/Layout.cshtml
diff --git a/test/WebSites/RazorWebSite/Views/NestedViewStarts/NestedViewStarts/_ViewStart.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/NestedViewStarts/NestedViewStarts/_ViewStart.cshtml
similarity index 100%
rename from test/WebSites/RazorWebSite/Views/NestedViewStarts/NestedViewStarts/_ViewStart.cshtml
rename to src/Mvc/test/WebSites/RazorWebSite/Views/NestedViewStarts/NestedViewStarts/_ViewStart.cshtml
diff --git a/test/WebSites/RazorWebSite/Views/NestedViewStarts/_ViewStart.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/NestedViewStarts/_ViewStart.cshtml
similarity index 100%
rename from test/WebSites/RazorWebSite/Views/NestedViewStarts/_ViewStart.cshtml
rename to src/Mvc/test/WebSites/RazorWebSite/Views/NestedViewStarts/_ViewStart.cshtml
diff --git a/test/WebSites/RazorWebSite/Views/PartialViewEngine/PartialMissingSection.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/PartialViewEngine/PartialMissingSection.cshtml
similarity index 100%
rename from test/WebSites/RazorWebSite/Views/PartialViewEngine/PartialMissingSection.cshtml
rename to src/Mvc/test/WebSites/RazorWebSite/Views/PartialViewEngine/PartialMissingSection.cshtml
diff --git a/test/WebSites/RazorWebSite/Views/PartialViewEngine/PartialWithModel.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/PartialViewEngine/PartialWithModel.cshtml
similarity index 100%
rename from test/WebSites/RazorWebSite/Views/PartialViewEngine/PartialWithModel.cshtml
rename to src/Mvc/test/WebSites/RazorWebSite/Views/PartialViewEngine/PartialWithModel.cshtml
diff --git a/test/WebSites/RazorWebSite/Views/PartialViewEngine/ViewPartialMissingSection.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/PartialViewEngine/ViewPartialMissingSection.cshtml
similarity index 100%
rename from test/WebSites/RazorWebSite/Views/PartialViewEngine/ViewPartialMissingSection.cshtml
rename to src/Mvc/test/WebSites/RazorWebSite/Views/PartialViewEngine/ViewPartialMissingSection.cshtml
diff --git a/test/WebSites/RazorWebSite/Views/PartialViewEngine/ViewWithDataFromController.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/PartialViewEngine/ViewWithDataFromController.cshtml
similarity index 100%
rename from test/WebSites/RazorWebSite/Views/PartialViewEngine/ViewWithDataFromController.cshtml
rename to src/Mvc/test/WebSites/RazorWebSite/Views/PartialViewEngine/ViewWithDataFromController.cshtml
diff --git a/test/WebSites/RazorWebSite/Views/PartialViewEngine/ViewWithFullPath.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/PartialViewEngine/ViewWithFullPath.cshtml
similarity index 100%
rename from test/WebSites/RazorWebSite/Views/PartialViewEngine/ViewWithFullPath.cshtml
rename to src/Mvc/test/WebSites/RazorWebSite/Views/PartialViewEngine/ViewWithFullPath.cshtml
diff --git a/test/WebSites/RazorWebSite/Views/PartialViewEngine/ViewWithLayout.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/PartialViewEngine/ViewWithLayout.cshtml
similarity index 100%
rename from test/WebSites/RazorWebSite/Views/PartialViewEngine/ViewWithLayout.cshtml
rename to src/Mvc/test/WebSites/RazorWebSite/Views/PartialViewEngine/ViewWithLayout.cshtml
diff --git a/test/WebSites/RazorWebSite/Views/PartialViewEngine/ViewWithNestedLayout.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/PartialViewEngine/ViewWithNestedLayout.cshtml
similarity index 100%
rename from test/WebSites/RazorWebSite/Views/PartialViewEngine/ViewWithNestedLayout.cshtml
rename to src/Mvc/test/WebSites/RazorWebSite/Views/PartialViewEngine/ViewWithNestedLayout.cshtml
diff --git a/test/WebSites/RazorWebSite/Views/PartialViewEngine/ViewWithoutLayout.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/PartialViewEngine/ViewWithoutLayout.cshtml
similarity index 100%
rename from test/WebSites/RazorWebSite/Views/PartialViewEngine/ViewWithoutLayout.cshtml
rename to src/Mvc/test/WebSites/RazorWebSite/Views/PartialViewEngine/ViewWithoutLayout.cshtml
diff --git a/test/WebSites/RazorWebSite/Views/PartialsWithLayout/LayoutForViewStartWithLayout.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/PartialsWithLayout/LayoutForViewStartWithLayout.cshtml
similarity index 100%
rename from test/WebSites/RazorWebSite/Views/PartialsWithLayout/LayoutForViewStartWithLayout.cshtml
rename to src/Mvc/test/WebSites/RazorWebSite/Views/PartialsWithLayout/LayoutForViewStartWithLayout.cshtml
diff --git a/test/WebSites/RazorWebSite/Views/PartialsWithLayout/PartialThatDoesNotSpecifyLayout.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/PartialsWithLayout/PartialThatDoesNotSpecifyLayout.cshtml
similarity index 100%
rename from test/WebSites/RazorWebSite/Views/PartialsWithLayout/PartialThatDoesNotSpecifyLayout.cshtml
rename to src/Mvc/test/WebSites/RazorWebSite/Views/PartialsWithLayout/PartialThatDoesNotSpecifyLayout.cshtml
diff --git a/test/WebSites/RazorWebSite/Views/PartialsWithLayout/PartialThatSpecifiesLayout.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/PartialsWithLayout/PartialThatSpecifiesLayout.cshtml
similarity index 100%
rename from test/WebSites/RazorWebSite/Views/PartialsWithLayout/PartialThatSpecifiesLayout.cshtml
rename to src/Mvc/test/WebSites/RazorWebSite/Views/PartialsWithLayout/PartialThatSpecifiesLayout.cshtml
diff --git a/test/WebSites/RazorWebSite/Views/PartialsWithLayout/PartialsRenderedViaPartialAsync.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/PartialsWithLayout/PartialsRenderedViaPartialAsync.cshtml
similarity index 100%
rename from test/WebSites/RazorWebSite/Views/PartialsWithLayout/PartialsRenderedViaPartialAsync.cshtml
rename to src/Mvc/test/WebSites/RazorWebSite/Views/PartialsWithLayout/PartialsRenderedViaPartialAsync.cshtml
diff --git a/test/WebSites/RazorWebSite/Views/PartialsWithLayout/PartialsRenderedViaRenderPartial.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/PartialsWithLayout/PartialsRenderedViaRenderPartial.cshtml
similarity index 100%
rename from test/WebSites/RazorWebSite/Views/PartialsWithLayout/PartialsRenderedViaRenderPartial.cshtml
rename to src/Mvc/test/WebSites/RazorWebSite/Views/PartialsWithLayout/PartialsRenderedViaRenderPartial.cshtml
diff --git a/test/WebSites/RazorWebSite/Views/PartialsWithLayout/_ViewStart.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/PartialsWithLayout/_ViewStart.cshtml
similarity index 100%
rename from test/WebSites/RazorWebSite/Views/PartialsWithLayout/_ViewStart.cshtml
rename to src/Mvc/test/WebSites/RazorWebSite/Views/PartialsWithLayout/_ViewStart.cshtml
diff --git a/test/WebSites/RazorWebSite/Views/Shared/Components/ComponentForViewWithPaths/Default.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/Shared/Components/ComponentForViewWithPaths/Default.cshtml
similarity index 100%
rename from test/WebSites/RazorWebSite/Views/Shared/Components/ComponentForViewWithPaths/Default.cshtml
rename to src/Mvc/test/WebSites/RazorWebSite/Views/Shared/Components/ComponentForViewWithPaths/Default.cshtml
diff --git a/test/WebSites/RazorWebSite/Views/Shared/Components/ComponentThatSetsTitle/Default.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/Shared/Components/ComponentThatSetsTitle/Default.cshtml
similarity index 100%
rename from test/WebSites/RazorWebSite/Views/Shared/Components/ComponentThatSetsTitle/Default.cshtml
rename to src/Mvc/test/WebSites/RazorWebSite/Views/Shared/Components/ComponentThatSetsTitle/Default.cshtml
diff --git a/test/WebSites/RazorWebSite/Views/Shared/Components/ComponentWithLayout/Default.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/Shared/Components/ComponentWithLayout/Default.cshtml
similarity index 100%
rename from test/WebSites/RazorWebSite/Views/Shared/Components/ComponentWithLayout/Default.cshtml
rename to src/Mvc/test/WebSites/RazorWebSite/Views/Shared/Components/ComponentWithLayout/Default.cshtml
diff --git a/test/WebSites/RazorWebSite/Views/Shared/Components/ComponentWithRelativePath.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/Shared/Components/ComponentWithRelativePath.cshtml
similarity index 100%
rename from test/WebSites/RazorWebSite/Views/Shared/Components/ComponentWithRelativePath.cshtml
rename to src/Mvc/test/WebSites/RazorWebSite/Views/Shared/Components/ComponentWithRelativePath.cshtml
diff --git a/test/WebSites/RazorWebSite/Views/Shared/Components/ComponentWithViewStart/Default.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/Shared/Components/ComponentWithViewStart/Default.cshtml
similarity index 100%
rename from test/WebSites/RazorWebSite/Views/Shared/Components/ComponentWithViewStart/Default.cshtml
rename to src/Mvc/test/WebSites/RazorWebSite/Views/Shared/Components/ComponentWithViewStart/Default.cshtml
diff --git a/test/WebSites/RazorWebSite/Views/Shared/Components/ComponentWithViewStart/_ViewStart.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/Shared/Components/ComponentWithViewStart/_ViewStart.cshtml
similarity index 100%
rename from test/WebSites/RazorWebSite/Views/Shared/Components/ComponentWithViewStart/_ViewStart.cshtml
rename to src/Mvc/test/WebSites/RazorWebSite/Views/Shared/Components/ComponentWithViewStart/_ViewStart.cshtml
diff --git a/test/WebSites/RazorWebSite/Views/Shared/DisplayTemplates/Name.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/Shared/DisplayTemplates/Name.cshtml
similarity index 100%
rename from test/WebSites/RazorWebSite/Views/Shared/DisplayTemplates/Name.cshtml
rename to src/Mvc/test/WebSites/RazorWebSite/Views/Shared/DisplayTemplates/Name.cshtml
diff --git a/test/WebSites/RazorWebSite/Views/Shared/_ComponentLayout.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/Shared/_ComponentLayout.cshtml
similarity index 100%
rename from test/WebSites/RazorWebSite/Views/Shared/_ComponentLayout.cshtml
rename to src/Mvc/test/WebSites/RazorWebSite/Views/Shared/_ComponentLayout.cshtml
diff --git a/test/WebSites/RazorWebSite/Views/Shared/_Layout.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/Shared/_Layout.cshtml
similarity index 100%
rename from test/WebSites/RazorWebSite/Views/Shared/_Layout.cshtml
rename to src/Mvc/test/WebSites/RazorWebSite/Views/Shared/_Layout.cshtml
diff --git a/test/WebSites/RazorWebSite/Views/Shared/_LayoutWithFlush.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/Shared/_LayoutWithFlush.cshtml
similarity index 100%
rename from test/WebSites/RazorWebSite/Views/Shared/_LayoutWithFlush.cshtml
rename to src/Mvc/test/WebSites/RazorWebSite/Views/Shared/_LayoutWithFlush.cshtml
diff --git a/test/WebSites/RazorWebSite/Views/Shared/_LayoutWithPartialAndFlush.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/Shared/_LayoutWithPartialAndFlush.cshtml
similarity index 100%
rename from test/WebSites/RazorWebSite/Views/Shared/_LayoutWithPartialAndFlush.cshtml
rename to src/Mvc/test/WebSites/RazorWebSite/Views/Shared/_LayoutWithPartialAndFlush.cshtml
diff --git a/test/WebSites/RazorWebSite/Views/Shared/_LayoutWithRenderSectionAsync.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/Shared/_LayoutWithRenderSectionAsync.cshtml
similarity index 100%
rename from test/WebSites/RazorWebSite/Views/Shared/_LayoutWithRenderSectionAsync.cshtml
rename to src/Mvc/test/WebSites/RazorWebSite/Views/Shared/_LayoutWithRenderSectionAsync.cshtml
diff --git a/test/WebSites/RazorWebSite/Views/Shared/_LayoutWithRenderSectionOnly.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/Shared/_LayoutWithRenderSectionOnly.cshtml
similarity index 100%
rename from test/WebSites/RazorWebSite/Views/Shared/_LayoutWithRenderSectionOnly.cshtml
rename to src/Mvc/test/WebSites/RazorWebSite/Views/Shared/_LayoutWithRenderSectionOnly.cshtml
diff --git a/test/WebSites/RazorWebSite/Views/Shared/_LayoutWithTitle.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/Shared/_LayoutWithTitle.cshtml
similarity index 100%
rename from test/WebSites/RazorWebSite/Views/Shared/_LayoutWithTitle.cshtml
rename to src/Mvc/test/WebSites/RazorWebSite/Views/Shared/_LayoutWithTitle.cshtml
diff --git a/test/WebSites/RazorWebSite/Views/Shared/_NestedLayoutWithFlush.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/Shared/_NestedLayoutWithFlush.cshtml
similarity index 100%
rename from test/WebSites/RazorWebSite/Views/Shared/_NestedLayoutWithFlush.cshtml
rename to src/Mvc/test/WebSites/RazorWebSite/Views/Shared/_NestedLayoutWithFlush.cshtml
diff --git a/test/WebSites/RazorWebSite/Views/Shared/_Partial.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/Shared/_Partial.cshtml
similarity index 100%
rename from test/WebSites/RazorWebSite/Views/Shared/_Partial.cshtml
rename to src/Mvc/test/WebSites/RazorWebSite/Views/Shared/_Partial.cshtml
diff --git a/test/WebSites/RazorWebSite/Views/Shared/_PartialLayout.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/Shared/_PartialLayout.cshtml
similarity index 100%
rename from test/WebSites/RazorWebSite/Views/Shared/_PartialLayout.cshtml
rename to src/Mvc/test/WebSites/RazorWebSite/Views/Shared/_PartialLayout.cshtml
diff --git a/test/WebSites/RazorWebSite/Views/Shared/_PartialThatSetsTitle.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/Shared/_PartialThatSetsTitle.cshtml
similarity index 100%
rename from test/WebSites/RazorWebSite/Views/Shared/_PartialThatSetsTitle.cshtml
rename to src/Mvc/test/WebSites/RazorWebSite/Views/Shared/_PartialThatSetsTitle.cshtml
diff --git a/test/WebSites/RazorWebSite/Views/Shared/_PartialWithFlush.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/Shared/_PartialWithFlush.cshtml
similarity index 100%
rename from test/WebSites/RazorWebSite/Views/Shared/_PartialWithFlush.cshtml
rename to src/Mvc/test/WebSites/RazorWebSite/Views/Shared/_PartialWithFlush.cshtml
diff --git a/test/WebSites/RazorWebSite/Views/Shared/_PartialWithModelFromEnumerable.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/Shared/_PartialWithModelFromEnumerable.cshtml
similarity index 100%
rename from test/WebSites/RazorWebSite/Views/Shared/_PartialWithModelFromEnumerable.cshtml
rename to src/Mvc/test/WebSites/RazorWebSite/Views/Shared/_PartialWithModelFromEnumerable.cshtml
diff --git a/test/WebSites/RazorWebSite/Views/TagHelperComponent/Body.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/TagHelperComponent/Body.cshtml
similarity index 100%
rename from test/WebSites/RazorWebSite/Views/TagHelperComponent/Body.cshtml
rename to src/Mvc/test/WebSites/RazorWebSite/Views/TagHelperComponent/Body.cshtml
diff --git a/test/WebSites/RazorWebSite/Views/TagHelperComponent/Head.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/TagHelperComponent/Head.cshtml
similarity index 100%
rename from test/WebSites/RazorWebSite/Views/TagHelperComponent/Head.cshtml
rename to src/Mvc/test/WebSites/RazorWebSite/Views/TagHelperComponent/Head.cshtml
diff --git a/test/WebSites/RazorWebSite/Views/TemplateExpander/Index.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/TemplateExpander/Index.cshtml
similarity index 100%
rename from test/WebSites/RazorWebSite/Views/TemplateExpander/Index.cshtml
rename to src/Mvc/test/WebSites/RazorWebSite/Views/TemplateExpander/Index.cshtml
diff --git a/test/WebSites/RazorWebSite/Views/TemplateExpander/ViewWithLayout.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/TemplateExpander/ViewWithLayout.cshtml
similarity index 100%
rename from test/WebSites/RazorWebSite/Views/TemplateExpander/ViewWithLayout.cshtml
rename to src/Mvc/test/WebSites/RazorWebSite/Views/TemplateExpander/ViewWithLayout.cshtml
diff --git a/test/WebSites/RazorWebSite/Views/TemplateExpander/_LanguageLayout.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/TemplateExpander/_LanguageLayout.cshtml
similarity index 100%
rename from test/WebSites/RazorWebSite/Views/TemplateExpander/_LanguageLayout.cshtml
rename to src/Mvc/test/WebSites/RazorWebSite/Views/TemplateExpander/_LanguageLayout.cshtml
diff --git a/test/WebSites/RazorWebSite/Views/TemplateExpander/_Partial.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/TemplateExpander/_Partial.cshtml
similarity index 100%
rename from test/WebSites/RazorWebSite/Views/TemplateExpander/_Partial.cshtml
rename to src/Mvc/test/WebSites/RazorWebSite/Views/TemplateExpander/_Partial.cshtml
diff --git a/test/WebSites/RazorWebSite/Views/TemplateExpander/en-GB/_Partial.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/TemplateExpander/en-GB/_Partial.cshtml
similarity index 100%
rename from test/WebSites/RazorWebSite/Views/TemplateExpander/en-GB/_Partial.cshtml
rename to src/Mvc/test/WebSites/RazorWebSite/Views/TemplateExpander/en-GB/_Partial.cshtml
diff --git a/test/WebSites/RazorWebSite/Views/TemplateExpander/fr/Index.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/TemplateExpander/fr/Index.cshtml
similarity index 100%
rename from test/WebSites/RazorWebSite/Views/TemplateExpander/fr/Index.cshtml
rename to src/Mvc/test/WebSites/RazorWebSite/Views/TemplateExpander/fr/Index.cshtml
diff --git a/test/WebSites/RazorWebSite/Views/TemplateExpander/fr/_LanguageLayout.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/TemplateExpander/fr/_LanguageLayout.cshtml
similarity index 100%
rename from test/WebSites/RazorWebSite/Views/TemplateExpander/fr/_LanguageLayout.cshtml
rename to src/Mvc/test/WebSites/RazorWebSite/Views/TemplateExpander/fr/_LanguageLayout.cshtml
diff --git a/test/WebSites/RazorWebSite/Views/TemplateExpander/fr/_Partial.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/TemplateExpander/fr/_Partial.cshtml
similarity index 100%
rename from test/WebSites/RazorWebSite/Views/TemplateExpander/fr/_Partial.cshtml
rename to src/Mvc/test/WebSites/RazorWebSite/Views/TemplateExpander/fr/_Partial.cshtml
diff --git a/test/WebSites/RazorWebSite/Views/UrlResolution/Index.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/UrlResolution/Index.cshtml
similarity index 100%
rename from test/WebSites/RazorWebSite/Views/UrlResolution/Index.cshtml
rename to src/Mvc/test/WebSites/RazorWebSite/Views/UrlResolution/Index.cshtml
diff --git a/test/WebSites/RazorWebSite/Views/ViewEngine/SearchInPages.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/ViewEngine/SearchInPages.cshtml
similarity index 100%
rename from test/WebSites/RazorWebSite/Views/ViewEngine/SearchInPages.cshtml
rename to src/Mvc/test/WebSites/RazorWebSite/Views/ViewEngine/SearchInPages.cshtml
diff --git a/test/WebSites/RazorWebSite/Views/ViewEngine/ViewWithComponentThatHasLayout.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/ViewEngine/ViewWithComponentThatHasLayout.cshtml
similarity index 100%
rename from test/WebSites/RazorWebSite/Views/ViewEngine/ViewWithComponentThatHasLayout.cshtml
rename to src/Mvc/test/WebSites/RazorWebSite/Views/ViewEngine/ViewWithComponentThatHasLayout.cshtml
diff --git a/test/WebSites/RazorWebSite/Views/ViewEngine/ViewWithComponentThatHasViewStart.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/ViewEngine/ViewWithComponentThatHasViewStart.cshtml
similarity index 100%
rename from test/WebSites/RazorWebSite/Views/ViewEngine/ViewWithComponentThatHasViewStart.cshtml
rename to src/Mvc/test/WebSites/RazorWebSite/Views/ViewEngine/ViewWithComponentThatHasViewStart.cshtml
diff --git a/test/WebSites/RazorWebSite/Views/ViewEngine/ViewWithDataFromController.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/ViewEngine/ViewWithDataFromController.cshtml
similarity index 100%
rename from test/WebSites/RazorWebSite/Views/ViewEngine/ViewWithDataFromController.cshtml
rename to src/Mvc/test/WebSites/RazorWebSite/Views/ViewEngine/ViewWithDataFromController.cshtml
diff --git a/test/WebSites/RazorWebSite/Views/ViewEngine/ViewWithFullPath.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/ViewEngine/ViewWithFullPath.cshtml
similarity index 100%
rename from test/WebSites/RazorWebSite/Views/ViewEngine/ViewWithFullPath.cshtml
rename to src/Mvc/test/WebSites/RazorWebSite/Views/ViewEngine/ViewWithFullPath.cshtml
diff --git a/test/WebSites/RazorWebSite/Views/ViewEngine/ViewWithLayout.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/ViewEngine/ViewWithLayout.cshtml
similarity index 100%
rename from test/WebSites/RazorWebSite/Views/ViewEngine/ViewWithLayout.cshtml
rename to src/Mvc/test/WebSites/RazorWebSite/Views/ViewEngine/ViewWithLayout.cshtml
diff --git a/test/WebSites/RazorWebSite/Views/ViewEngine/ViewWithNestedLayout.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/ViewEngine/ViewWithNestedLayout.cshtml
similarity index 100%
rename from test/WebSites/RazorWebSite/Views/ViewEngine/ViewWithNestedLayout.cshtml
rename to src/Mvc/test/WebSites/RazorWebSite/Views/ViewEngine/ViewWithNestedLayout.cshtml
diff --git a/test/WebSites/RazorWebSite/Views/ViewEngine/ViewWithPartial.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/ViewEngine/ViewWithPartial.cshtml
similarity index 100%
rename from test/WebSites/RazorWebSite/Views/ViewEngine/ViewWithPartial.cshtml
rename to src/Mvc/test/WebSites/RazorWebSite/Views/ViewEngine/ViewWithPartial.cshtml
diff --git a/test/WebSites/RazorWebSite/Views/ViewEngine/ViewWithPartialTakingModelFromIEnumerable.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/ViewEngine/ViewWithPartialTakingModelFromIEnumerable.cshtml
similarity index 100%
rename from test/WebSites/RazorWebSite/Views/ViewEngine/ViewWithPartialTakingModelFromIEnumerable.cshtml
rename to src/Mvc/test/WebSites/RazorWebSite/Views/ViewEngine/ViewWithPartialTakingModelFromIEnumerable.cshtml
diff --git a/test/WebSites/RazorWebSite/Views/ViewEngine/ViewWithRelativePath.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/ViewEngine/ViewWithRelativePath.cshtml
similarity index 100%
rename from test/WebSites/RazorWebSite/Views/ViewEngine/ViewWithRelativePath.cshtml
rename to src/Mvc/test/WebSites/RazorWebSite/Views/ViewEngine/ViewWithRelativePath.cshtml
diff --git a/test/WebSites/RazorWebSite/Views/ViewEngine/ViewWithTitle.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/ViewEngine/ViewWithTitle.cshtml
similarity index 100%
rename from test/WebSites/RazorWebSite/Views/ViewEngine/ViewWithTitle.cshtml
rename to src/Mvc/test/WebSites/RazorWebSite/Views/ViewEngine/ViewWithTitle.cshtml
diff --git a/test/WebSites/RazorWebSite/Views/ViewEngine/ViewWithoutLayout.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/ViewEngine/ViewWithoutLayout.cshtml
similarity index 100%
rename from test/WebSites/RazorWebSite/Views/ViewEngine/ViewWithoutLayout.cshtml
rename to src/Mvc/test/WebSites/RazorWebSite/Views/ViewEngine/ViewWithoutLayout.cshtml
diff --git a/test/WebSites/RazorWebSite/Views/ViewEngine/_NestedLayout.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/ViewEngine/_NestedLayout.cshtml
similarity index 100%
rename from test/WebSites/RazorWebSite/Views/ViewEngine/_NestedLayout.cshtml
rename to src/Mvc/test/WebSites/RazorWebSite/Views/ViewEngine/_NestedLayout.cshtml
diff --git a/test/WebSites/RazorWebSite/Views/ViewNameSpecification_Home/LayoutSpecifiedWithPartialPathInPage.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/ViewNameSpecification_Home/LayoutSpecifiedWithPartialPathInPage.cshtml
similarity index 100%
rename from test/WebSites/RazorWebSite/Views/ViewNameSpecification_Home/LayoutSpecifiedWithPartialPathInPage.cshtml
rename to src/Mvc/test/WebSites/RazorWebSite/Views/ViewNameSpecification_Home/LayoutSpecifiedWithPartialPathInPage.cshtml
diff --git a/test/WebSites/RazorWebSite/Views/ViewNameSpecification_Home/LayoutSpecifiedWithPartialPathInViewStart.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/ViewNameSpecification_Home/LayoutSpecifiedWithPartialPathInViewStart.cshtml
similarity index 100%
rename from test/WebSites/RazorWebSite/Views/ViewNameSpecification_Home/LayoutSpecifiedWithPartialPathInViewStart.cshtml
rename to src/Mvc/test/WebSites/RazorWebSite/Views/ViewNameSpecification_Home/LayoutSpecifiedWithPartialPathInViewStart.cshtml
diff --git a/test/WebSites/RazorWebSite/Views/ViewNameSpecification_Home/NonSharedPartial.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/ViewNameSpecification_Home/NonSharedPartial.cshtml
similarity index 100%
rename from test/WebSites/RazorWebSite/Views/ViewNameSpecification_Home/NonSharedPartial.cshtml
rename to src/Mvc/test/WebSites/RazorWebSite/Views/ViewNameSpecification_Home/NonSharedPartial.cshtml
diff --git a/test/WebSites/RazorWebSite/Views/ViewNameSpecification_Home/PageWithNonPartialLayoutPath.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/ViewNameSpecification_Home/PageWithNonPartialLayoutPath.cshtml
similarity index 100%
rename from test/WebSites/RazorWebSite/Views/ViewNameSpecification_Home/PageWithNonPartialLayoutPath.cshtml
rename to src/Mvc/test/WebSites/RazorWebSite/Views/ViewNameSpecification_Home/PageWithNonPartialLayoutPath.cshtml
diff --git a/test/WebSites/RazorWebSite/Views/ViewNameSpecification_Home/ViewWithPartials.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/ViewNameSpecification_Home/ViewWithPartials.cshtml
similarity index 100%
rename from test/WebSites/RazorWebSite/Views/ViewNameSpecification_Home/ViewWithPartials.cshtml
rename to src/Mvc/test/WebSites/RazorWebSite/Views/ViewNameSpecification_Home/ViewWithPartials.cshtml
diff --git a/test/WebSites/RazorWebSite/Views/ViewNameSpecification_Home/_NonSharedLayout.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/ViewNameSpecification_Home/_NonSharedLayout.cshtml
similarity index 100%
rename from test/WebSites/RazorWebSite/Views/ViewNameSpecification_Home/_NonSharedLayout.cshtml
rename to src/Mvc/test/WebSites/RazorWebSite/Views/ViewNameSpecification_Home/_NonSharedLayout.cshtml
diff --git a/test/WebSites/RazorWebSite/Views/ViewNameSpecification_Home/_ViewStart.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/ViewNameSpecification_Home/_ViewStart.cshtml
similarity index 100%
rename from test/WebSites/RazorWebSite/Views/ViewNameSpecification_Home/_ViewStart.cshtml
rename to src/Mvc/test/WebSites/RazorWebSite/Views/ViewNameSpecification_Home/_ViewStart.cshtml
diff --git a/test/WebSites/RazorWebSite/Views/ViewWithPaths/Index.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/ViewWithPaths/Index.cshtml
similarity index 100%
rename from test/WebSites/RazorWebSite/Views/ViewWithPaths/Index.cshtml
rename to src/Mvc/test/WebSites/RazorWebSite/Views/ViewWithPaths/Index.cshtml
diff --git a/test/WebSites/RazorWebSite/Views/ViewWithPaths/_Layout.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/ViewWithPaths/_Layout.cshtml
similarity index 100%
rename from test/WebSites/RazorWebSite/Views/ViewWithPaths/_Layout.cshtml
rename to src/Mvc/test/WebSites/RazorWebSite/Views/ViewWithPaths/_Layout.cshtml
diff --git a/test/WebSites/RazorWebSite/Views/ViewWithPaths/_Partial.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/ViewWithPaths/_Partial.cshtml
similarity index 100%
rename from test/WebSites/RazorWebSite/Views/ViewWithPaths/_Partial.cshtml
rename to src/Mvc/test/WebSites/RazorWebSite/Views/ViewWithPaths/_Partial.cshtml
diff --git a/test/WebSites/RazorWebSite/Views/ViewWithPaths/_ViewStart.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/ViewWithPaths/_ViewStart.cshtml
similarity index 100%
rename from test/WebSites/RazorWebSite/Views/ViewWithPaths/_ViewStart.cshtml
rename to src/Mvc/test/WebSites/RazorWebSite/Views/ViewWithPaths/_ViewStart.cshtml
diff --git a/test/WebSites/RazorWebSite/Views/ViewsConsumingCompilationOptions/Index.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/ViewsConsumingCompilationOptions/Index.cshtml
similarity index 100%
rename from test/WebSites/RazorWebSite/Views/ViewsConsumingCompilationOptions/Index.cshtml
rename to src/Mvc/test/WebSites/RazorWebSite/Views/ViewsConsumingCompilationOptions/Index.cshtml
diff --git a/test/WebSites/RazorWebSite/Views/ViewsConsumingCompilationOptions/_Partial.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/ViewsConsumingCompilationOptions/_Partial.cshtml
similarity index 100%
rename from test/WebSites/RazorWebSite/Views/ViewsConsumingCompilationOptions/_Partial.cshtml
rename to src/Mvc/test/WebSites/RazorWebSite/Views/ViewsConsumingCompilationOptions/_Partial.cshtml
diff --git a/test/WebSites/RazorWebSite/Views/_ViewImports.cshtml b/src/Mvc/test/WebSites/RazorWebSite/Views/_ViewImports.cshtml
similarity index 100%
rename from test/WebSites/RazorWebSite/Views/_ViewImports.cshtml
rename to src/Mvc/test/WebSites/RazorWebSite/Views/_ViewImports.cshtml
diff --git a/test/WebSites/RazorWebSite/readme.md b/src/Mvc/test/WebSites/RazorWebSite/readme.md
similarity index 100%
rename from test/WebSites/RazorWebSite/readme.md
rename to src/Mvc/test/WebSites/RazorWebSite/readme.md
diff --git a/test/WebSites/RoutingWebSite/Areas/Admin/LG3Controller.cs b/src/Mvc/test/WebSites/RoutingWebSite/Areas/Admin/LG3Controller.cs
similarity index 100%
rename from test/WebSites/RoutingWebSite/Areas/Admin/LG3Controller.cs
rename to src/Mvc/test/WebSites/RoutingWebSite/Areas/Admin/LG3Controller.cs
diff --git a/test/WebSites/RoutingWebSite/Areas/Admin/Pages/LGAreaPage.cshtml b/src/Mvc/test/WebSites/RoutingWebSite/Areas/Admin/Pages/LGAreaPage.cshtml
similarity index 100%
rename from test/WebSites/RoutingWebSite/Areas/Admin/Pages/LGAreaPage.cshtml
rename to src/Mvc/test/WebSites/RoutingWebSite/Areas/Admin/Pages/LGAreaPage.cshtml
diff --git a/test/WebSites/RoutingWebSite/Areas/Admin/Pages/LGAreaPage.cshtml.cs b/src/Mvc/test/WebSites/RoutingWebSite/Areas/Admin/Pages/LGAreaPage.cshtml.cs
similarity index 100%
rename from test/WebSites/RoutingWebSite/Areas/Admin/Pages/LGAreaPage.cshtml.cs
rename to src/Mvc/test/WebSites/RoutingWebSite/Areas/Admin/Pages/LGAreaPage.cshtml.cs
diff --git a/test/WebSites/RoutingWebSite/Areas/Admin/UserManagementController.cs b/src/Mvc/test/WebSites/RoutingWebSite/Areas/Admin/UserManagementController.cs
similarity index 100%
rename from test/WebSites/RoutingWebSite/Areas/Admin/UserManagementController.cs
rename to src/Mvc/test/WebSites/RoutingWebSite/Areas/Admin/UserManagementController.cs
diff --git a/test/WebSites/RoutingWebSite/Areas/Order/OrderController.cs b/src/Mvc/test/WebSites/RoutingWebSite/Areas/Order/OrderController.cs
similarity index 100%
rename from test/WebSites/RoutingWebSite/Areas/Order/OrderController.cs
rename to src/Mvc/test/WebSites/RoutingWebSite/Areas/Order/OrderController.cs
diff --git a/test/WebSites/RoutingWebSite/Areas/Travel/FlightController.cs b/src/Mvc/test/WebSites/RoutingWebSite/Areas/Travel/FlightController.cs
similarity index 100%
rename from test/WebSites/RoutingWebSite/Areas/Travel/FlightController.cs
rename to src/Mvc/test/WebSites/RoutingWebSite/Areas/Travel/FlightController.cs
diff --git a/test/WebSites/RoutingWebSite/Areas/Travel/HomeController.cs b/src/Mvc/test/WebSites/RoutingWebSite/Areas/Travel/HomeController.cs
similarity index 100%
rename from test/WebSites/RoutingWebSite/Areas/Travel/HomeController.cs
rename to src/Mvc/test/WebSites/RoutingWebSite/Areas/Travel/HomeController.cs
diff --git a/test/WebSites/RoutingWebSite/Areas/Travel/RailController.cs b/src/Mvc/test/WebSites/RoutingWebSite/Areas/Travel/RailController.cs
similarity index 100%
rename from test/WebSites/RoutingWebSite/Areas/Travel/RailController.cs
rename to src/Mvc/test/WebSites/RoutingWebSite/Areas/Travel/RailController.cs
diff --git a/test/WebSites/RoutingWebSite/ControllerRouteTokenTransformerConvention.cs b/src/Mvc/test/WebSites/RoutingWebSite/ControllerRouteTokenTransformerConvention.cs
similarity index 100%
rename from test/WebSites/RoutingWebSite/ControllerRouteTokenTransformerConvention.cs
rename to src/Mvc/test/WebSites/RoutingWebSite/ControllerRouteTokenTransformerConvention.cs
diff --git a/test/WebSites/RoutingWebSite/Controllers/BanksController.cs b/src/Mvc/test/WebSites/RoutingWebSite/Controllers/BanksController.cs
similarity index 100%
rename from test/WebSites/RoutingWebSite/Controllers/BanksController.cs
rename to src/Mvc/test/WebSites/RoutingWebSite/Controllers/BanksController.cs
diff --git a/test/WebSites/RoutingWebSite/Controllers/BlogController.cs b/src/Mvc/test/WebSites/RoutingWebSite/Controllers/BlogController.cs
similarity index 100%
rename from test/WebSites/RoutingWebSite/Controllers/BlogController.cs
rename to src/Mvc/test/WebSites/RoutingWebSite/Controllers/BlogController.cs
diff --git a/test/WebSites/RoutingWebSite/Controllers/CompanyController.cs b/src/Mvc/test/WebSites/RoutingWebSite/Controllers/CompanyController.cs
similarity index 100%
rename from test/WebSites/RoutingWebSite/Controllers/CompanyController.cs
rename to src/Mvc/test/WebSites/RoutingWebSite/Controllers/CompanyController.cs
diff --git a/test/WebSites/RoutingWebSite/Controllers/ConventionalTransformerController.cs b/src/Mvc/test/WebSites/RoutingWebSite/Controllers/ConventionalTransformerController.cs
similarity index 100%
rename from test/WebSites/RoutingWebSite/Controllers/ConventionalTransformerController.cs
rename to src/Mvc/test/WebSites/RoutingWebSite/Controllers/ConventionalTransformerController.cs
diff --git a/test/WebSites/RoutingWebSite/Controllers/DataTokensController.cs b/src/Mvc/test/WebSites/RoutingWebSite/Controllers/DataTokensController.cs
similarity index 100%
rename from test/WebSites/RoutingWebSite/Controllers/DataTokensController.cs
rename to src/Mvc/test/WebSites/RoutingWebSite/Controllers/DataTokensController.cs
diff --git a/test/WebSites/RoutingWebSite/Controllers/DefaultValuesController.cs b/src/Mvc/test/WebSites/RoutingWebSite/Controllers/DefaultValuesController.cs
similarity index 100%
rename from test/WebSites/RoutingWebSite/Controllers/DefaultValuesController.cs
rename to src/Mvc/test/WebSites/RoutingWebSite/Controllers/DefaultValuesController.cs
diff --git a/test/WebSites/RoutingWebSite/Controllers/EmployeeController.cs b/src/Mvc/test/WebSites/RoutingWebSite/Controllers/EmployeeController.cs
similarity index 100%
rename from test/WebSites/RoutingWebSite/Controllers/EmployeeController.cs
rename to src/Mvc/test/WebSites/RoutingWebSite/Controllers/EmployeeController.cs
diff --git a/test/WebSites/RoutingWebSite/Controllers/EndpointRoutingController.cs b/src/Mvc/test/WebSites/RoutingWebSite/Controllers/EndpointRoutingController.cs
similarity index 100%
rename from test/WebSites/RoutingWebSite/Controllers/EndpointRoutingController.cs
rename to src/Mvc/test/WebSites/RoutingWebSite/Controllers/EndpointRoutingController.cs
diff --git a/test/WebSites/RoutingWebSite/Controllers/FriendsController.cs b/src/Mvc/test/WebSites/RoutingWebSite/Controllers/FriendsController.cs
similarity index 100%
rename from test/WebSites/RoutingWebSite/Controllers/FriendsController.cs
rename to src/Mvc/test/WebSites/RoutingWebSite/Controllers/FriendsController.cs
diff --git a/test/WebSites/RoutingWebSite/Controllers/HomeController.cs b/src/Mvc/test/WebSites/RoutingWebSite/Controllers/HomeController.cs
similarity index 100%
rename from test/WebSites/RoutingWebSite/Controllers/HomeController.cs
rename to src/Mvc/test/WebSites/RoutingWebSite/Controllers/HomeController.cs
diff --git a/test/WebSites/RoutingWebSite/Controllers/LG1Controller.cs b/src/Mvc/test/WebSites/RoutingWebSite/Controllers/LG1Controller.cs
similarity index 100%
rename from test/WebSites/RoutingWebSite/Controllers/LG1Controller.cs
rename to src/Mvc/test/WebSites/RoutingWebSite/Controllers/LG1Controller.cs
diff --git a/test/WebSites/RoutingWebSite/Controllers/LG2Controller.cs b/src/Mvc/test/WebSites/RoutingWebSite/Controllers/LG2Controller.cs
similarity index 100%
rename from test/WebSites/RoutingWebSite/Controllers/LG2Controller.cs
rename to src/Mvc/test/WebSites/RoutingWebSite/Controllers/LG2Controller.cs
diff --git a/test/WebSites/RoutingWebSite/Controllers/MapsController.cs b/src/Mvc/test/WebSites/RoutingWebSite/Controllers/MapsController.cs
similarity index 100%
rename from test/WebSites/RoutingWebSite/Controllers/MapsController.cs
rename to src/Mvc/test/WebSites/RoutingWebSite/Controllers/MapsController.cs
diff --git a/test/WebSites/RoutingWebSite/Controllers/OrderController.cs b/src/Mvc/test/WebSites/RoutingWebSite/Controllers/OrderController.cs
similarity index 100%
rename from test/WebSites/RoutingWebSite/Controllers/OrderController.cs
rename to src/Mvc/test/WebSites/RoutingWebSite/Controllers/OrderController.cs
diff --git a/test/WebSites/RoutingWebSite/Controllers/PageRouteController.cs b/src/Mvc/test/WebSites/RoutingWebSite/Controllers/PageRouteController.cs
similarity index 100%
rename from test/WebSites/RoutingWebSite/Controllers/PageRouteController.cs
rename to src/Mvc/test/WebSites/RoutingWebSite/Controllers/PageRouteController.cs
diff --git a/test/WebSites/RoutingWebSite/Controllers/ParameterTransformerController.cs b/src/Mvc/test/WebSites/RoutingWebSite/Controllers/ParameterTransformerController.cs
similarity index 100%
rename from test/WebSites/RoutingWebSite/Controllers/ParameterTransformerController.cs
rename to src/Mvc/test/WebSites/RoutingWebSite/Controllers/ParameterTransformerController.cs
diff --git a/test/WebSites/RoutingWebSite/Controllers/RouteDataController.cs b/src/Mvc/test/WebSites/RoutingWebSite/Controllers/RouteDataController.cs
similarity index 100%
rename from test/WebSites/RoutingWebSite/Controllers/RouteDataController.cs
rename to src/Mvc/test/WebSites/RoutingWebSite/Controllers/RouteDataController.cs
diff --git a/test/WebSites/RoutingWebSite/Controllers/RoutingController.cs b/src/Mvc/test/WebSites/RoutingWebSite/Controllers/RoutingController.cs
similarity index 100%
rename from test/WebSites/RoutingWebSite/Controllers/RoutingController.cs
rename to src/Mvc/test/WebSites/RoutingWebSite/Controllers/RoutingController.cs
diff --git a/test/WebSites/RoutingWebSite/Controllers/StoreController.cs b/src/Mvc/test/WebSites/RoutingWebSite/Controllers/StoreController.cs
similarity index 100%
rename from test/WebSites/RoutingWebSite/Controllers/StoreController.cs
rename to src/Mvc/test/WebSites/RoutingWebSite/Controllers/StoreController.cs
diff --git a/test/WebSites/RoutingWebSite/Controllers/TeamController.cs b/src/Mvc/test/WebSites/RoutingWebSite/Controllers/TeamController.cs
similarity index 100%
rename from test/WebSites/RoutingWebSite/Controllers/TeamController.cs
rename to src/Mvc/test/WebSites/RoutingWebSite/Controllers/TeamController.cs
diff --git a/test/WebSites/RoutingWebSite/HttpMergeAttribute.cs b/src/Mvc/test/WebSites/RoutingWebSite/HttpMergeAttribute.cs
similarity index 100%
rename from test/WebSites/RoutingWebSite/HttpMergeAttribute.cs
rename to src/Mvc/test/WebSites/RoutingWebSite/HttpMergeAttribute.cs
diff --git a/test/WebSites/RoutingWebSite/Pages/Edit.cshtml b/src/Mvc/test/WebSites/RoutingWebSite/Pages/Edit.cshtml
similarity index 100%
rename from test/WebSites/RoutingWebSite/Pages/Edit.cshtml
rename to src/Mvc/test/WebSites/RoutingWebSite/Pages/Edit.cshtml
diff --git a/test/WebSites/RoutingWebSite/Pages/LGAnotherPage.cshtml b/src/Mvc/test/WebSites/RoutingWebSite/Pages/LGAnotherPage.cshtml
similarity index 100%
rename from test/WebSites/RoutingWebSite/Pages/LGAnotherPage.cshtml
rename to src/Mvc/test/WebSites/RoutingWebSite/Pages/LGAnotherPage.cshtml
diff --git a/test/WebSites/RoutingWebSite/Pages/LGAnotherPage.cshtml.cs b/src/Mvc/test/WebSites/RoutingWebSite/Pages/LGAnotherPage.cshtml.cs
similarity index 100%
rename from test/WebSites/RoutingWebSite/Pages/LGAnotherPage.cshtml.cs
rename to src/Mvc/test/WebSites/RoutingWebSite/Pages/LGAnotherPage.cshtml.cs
diff --git a/test/WebSites/RoutingWebSite/Pages/LGPage.cshtml b/src/Mvc/test/WebSites/RoutingWebSite/Pages/LGPage.cshtml
similarity index 100%
rename from test/WebSites/RoutingWebSite/Pages/LGPage.cshtml
rename to src/Mvc/test/WebSites/RoutingWebSite/Pages/LGPage.cshtml
diff --git a/test/WebSites/RoutingWebSite/Pages/LGPage.cshtml.cs b/src/Mvc/test/WebSites/RoutingWebSite/Pages/LGPage.cshtml.cs
similarity index 100%
rename from test/WebSites/RoutingWebSite/Pages/LGPage.cshtml.cs
rename to src/Mvc/test/WebSites/RoutingWebSite/Pages/LGPage.cshtml.cs
diff --git a/test/WebSites/RoutingWebSite/Pages/PageRouteTransformer/Index.cshtml b/src/Mvc/test/WebSites/RoutingWebSite/Pages/PageRouteTransformer/Index.cshtml
similarity index 100%
rename from test/WebSites/RoutingWebSite/Pages/PageRouteTransformer/Index.cshtml
rename to src/Mvc/test/WebSites/RoutingWebSite/Pages/PageRouteTransformer/Index.cshtml
diff --git a/test/WebSites/RoutingWebSite/Pages/PageRouteTransformer/PageWithConfiguredRoute.cshtml b/src/Mvc/test/WebSites/RoutingWebSite/Pages/PageRouteTransformer/PageWithConfiguredRoute.cshtml
similarity index 100%
rename from test/WebSites/RoutingWebSite/Pages/PageRouteTransformer/PageWithConfiguredRoute.cshtml
rename to src/Mvc/test/WebSites/RoutingWebSite/Pages/PageRouteTransformer/PageWithConfiguredRoute.cshtml
diff --git a/test/WebSites/RoutingWebSite/Pages/PageRouteTransformer/TestPage.cshtml b/src/Mvc/test/WebSites/RoutingWebSite/Pages/PageRouteTransformer/TestPage.cshtml
similarity index 100%
rename from test/WebSites/RoutingWebSite/Pages/PageRouteTransformer/TestPage.cshtml
rename to src/Mvc/test/WebSites/RoutingWebSite/Pages/PageRouteTransformer/TestPage.cshtml
diff --git a/test/WebSites/RoutingWebSite/Pages/PageWithLinks.cshtml b/src/Mvc/test/WebSites/RoutingWebSite/Pages/PageWithLinks.cshtml
similarity index 100%
rename from test/WebSites/RoutingWebSite/Pages/PageWithLinks.cshtml
rename to src/Mvc/test/WebSites/RoutingWebSite/Pages/PageWithLinks.cshtml
diff --git a/test/WebSites/RoutingWebSite/Program.cs b/src/Mvc/test/WebSites/RoutingWebSite/Program.cs
similarity index 100%
rename from test/WebSites/RoutingWebSite/Program.cs
rename to src/Mvc/test/WebSites/RoutingWebSite/Program.cs
diff --git a/test/WebSites/RoutingWebSite/RemoveControllerActionDescriptorProvider.cs b/src/Mvc/test/WebSites/RoutingWebSite/RemoveControllerActionDescriptorProvider.cs
similarity index 100%
rename from test/WebSites/RoutingWebSite/RemoveControllerActionDescriptorProvider.cs
rename to src/Mvc/test/WebSites/RoutingWebSite/RemoveControllerActionDescriptorProvider.cs
diff --git a/test/WebSites/RoutingWebSite/RoutingWebSite.csproj b/src/Mvc/test/WebSites/RoutingWebSite/RoutingWebSite.csproj
similarity index 100%
rename from test/WebSites/RoutingWebSite/RoutingWebSite.csproj
rename to src/Mvc/test/WebSites/RoutingWebSite/RoutingWebSite.csproj
diff --git a/test/WebSites/RoutingWebSite/Startup.cs b/src/Mvc/test/WebSites/RoutingWebSite/Startup.cs
similarity index 100%
rename from test/WebSites/RoutingWebSite/Startup.cs
rename to src/Mvc/test/WebSites/RoutingWebSite/Startup.cs
diff --git a/test/WebSites/RoutingWebSite/StartupForLinkGenerator.cs b/src/Mvc/test/WebSites/RoutingWebSite/StartupForLinkGenerator.cs
similarity index 100%
rename from test/WebSites/RoutingWebSite/StartupForLinkGenerator.cs
rename to src/Mvc/test/WebSites/RoutingWebSite/StartupForLinkGenerator.cs
diff --git a/test/WebSites/RoutingWebSite/StartupWith21Compat.cs b/src/Mvc/test/WebSites/RoutingWebSite/StartupWith21Compat.cs
similarity index 100%
rename from test/WebSites/RoutingWebSite/StartupWith21Compat.cs
rename to src/Mvc/test/WebSites/RoutingWebSite/StartupWith21Compat.cs
diff --git a/test/WebSites/RoutingWebSite/TestParameterTransformer.cs b/src/Mvc/test/WebSites/RoutingWebSite/TestParameterTransformer.cs
similarity index 100%
rename from test/WebSites/RoutingWebSite/TestParameterTransformer.cs
rename to src/Mvc/test/WebSites/RoutingWebSite/TestParameterTransformer.cs
diff --git a/test/WebSites/RoutingWebSite/readme.md b/src/Mvc/test/WebSites/RoutingWebSite/readme.md
similarity index 100%
rename from test/WebSites/RoutingWebSite/readme.md
rename to src/Mvc/test/WebSites/RoutingWebSite/readme.md
diff --git a/test/WebSites/SecurityWebSite/Controllers/AdministrationController.cs b/src/Mvc/test/WebSites/SecurityWebSite/Controllers/AdministrationController.cs
similarity index 100%
rename from test/WebSites/SecurityWebSite/Controllers/AdministrationController.cs
rename to src/Mvc/test/WebSites/SecurityWebSite/Controllers/AdministrationController.cs
diff --git a/test/WebSites/SecurityWebSite/Controllers/AntiforgeryController.cs b/src/Mvc/test/WebSites/SecurityWebSite/Controllers/AntiforgeryController.cs
similarity index 100%
rename from test/WebSites/SecurityWebSite/Controllers/AntiforgeryController.cs
rename to src/Mvc/test/WebSites/SecurityWebSite/Controllers/AntiforgeryController.cs
diff --git a/test/WebSites/SecurityWebSite/Controllers/HomeController.cs b/src/Mvc/test/WebSites/SecurityWebSite/Controllers/HomeController.cs
similarity index 100%
rename from test/WebSites/SecurityWebSite/Controllers/HomeController.cs
rename to src/Mvc/test/WebSites/SecurityWebSite/Controllers/HomeController.cs
diff --git a/test/WebSites/SecurityWebSite/Controllers/IgnoreAntiforgeryController.cs b/src/Mvc/test/WebSites/SecurityWebSite/Controllers/IgnoreAntiforgeryController.cs
similarity index 100%
rename from test/WebSites/SecurityWebSite/Controllers/IgnoreAntiforgeryController.cs
rename to src/Mvc/test/WebSites/SecurityWebSite/Controllers/IgnoreAntiforgeryController.cs
diff --git a/test/WebSites/SecurityWebSite/CountingPolicyEvaluator.cs b/src/Mvc/test/WebSites/SecurityWebSite/CountingPolicyEvaluator.cs
similarity index 100%
rename from test/WebSites/SecurityWebSite/CountingPolicyEvaluator.cs
rename to src/Mvc/test/WebSites/SecurityWebSite/CountingPolicyEvaluator.cs
diff --git a/test/WebSites/SecurityWebSite/Program.cs b/src/Mvc/test/WebSites/SecurityWebSite/Program.cs
similarity index 100%
rename from test/WebSites/SecurityWebSite/Program.cs
rename to src/Mvc/test/WebSites/SecurityWebSite/Program.cs
diff --git a/test/WebSites/SecurityWebSite/SecurityWebSite.csproj b/src/Mvc/test/WebSites/SecurityWebSite/SecurityWebSite.csproj
similarity index 100%
rename from test/WebSites/SecurityWebSite/SecurityWebSite.csproj
rename to src/Mvc/test/WebSites/SecurityWebSite/SecurityWebSite.csproj
diff --git a/test/WebSites/SecurityWebSite/Startup.cs b/src/Mvc/test/WebSites/SecurityWebSite/Startup.cs
similarity index 100%
rename from test/WebSites/SecurityWebSite/Startup.cs
rename to src/Mvc/test/WebSites/SecurityWebSite/Startup.cs
diff --git a/test/WebSites/SecurityWebSite/StartupWith20CompatAndGlobalDenyAnonymousFilter.cs b/src/Mvc/test/WebSites/SecurityWebSite/StartupWith20CompatAndGlobalDenyAnonymousFilter.cs
similarity index 100%
rename from test/WebSites/SecurityWebSite/StartupWith20CompatAndGlobalDenyAnonymousFilter.cs
rename to src/Mvc/test/WebSites/SecurityWebSite/StartupWith20CompatAndGlobalDenyAnonymousFilter.cs
diff --git a/test/WebSites/SecurityWebSite/StartupWithGlobalDenyAnonymousFilter.cs b/src/Mvc/test/WebSites/SecurityWebSite/StartupWithGlobalDenyAnonymousFilter.cs
similarity index 100%
rename from test/WebSites/SecurityWebSite/StartupWithGlobalDenyAnonymousFilter.cs
rename to src/Mvc/test/WebSites/SecurityWebSite/StartupWithGlobalDenyAnonymousFilter.cs
diff --git a/test/WebSites/SecurityWebSite/Views/Home/Index.cshtml b/src/Mvc/test/WebSites/SecurityWebSite/Views/Home/Index.cshtml
similarity index 100%
rename from test/WebSites/SecurityWebSite/Views/Home/Index.cshtml
rename to src/Mvc/test/WebSites/SecurityWebSite/Views/Home/Index.cshtml
diff --git a/test/WebSites/SecurityWebSite/Views/Shared/_Layout.cshtml b/src/Mvc/test/WebSites/SecurityWebSite/Views/Shared/_Layout.cshtml
similarity index 100%
rename from test/WebSites/SecurityWebSite/Views/Shared/_Layout.cshtml
rename to src/Mvc/test/WebSites/SecurityWebSite/Views/Shared/_Layout.cshtml
diff --git a/test/WebSites/SecurityWebSite/Views/_ViewImports.cshtml b/src/Mvc/test/WebSites/SecurityWebSite/Views/_ViewImports.cshtml
similarity index 100%
rename from test/WebSites/SecurityWebSite/Views/_ViewImports.cshtml
rename to src/Mvc/test/WebSites/SecurityWebSite/Views/_ViewImports.cshtml
diff --git a/test/WebSites/SecurityWebSite/Views/_ViewStart.cshtml b/src/Mvc/test/WebSites/SecurityWebSite/Views/_ViewStart.cshtml
similarity index 100%
rename from test/WebSites/SecurityWebSite/Views/_ViewStart.cshtml
rename to src/Mvc/test/WebSites/SecurityWebSite/Views/_ViewStart.cshtml
diff --git a/test/WebSites/SecurityWebSite/appsettings.json b/src/Mvc/test/WebSites/SecurityWebSite/appsettings.json
similarity index 100%
rename from test/WebSites/SecurityWebSite/appsettings.json
rename to src/Mvc/test/WebSites/SecurityWebSite/appsettings.json
diff --git a/test/WebSites/SimpleWebSite/Controllers/HomeController.cs b/src/Mvc/test/WebSites/SimpleWebSite/Controllers/HomeController.cs
similarity index 100%
rename from test/WebSites/SimpleWebSite/Controllers/HomeController.cs
rename to src/Mvc/test/WebSites/SimpleWebSite/Controllers/HomeController.cs
diff --git a/test/WebSites/SimpleWebSite/SimpleWebSite.csproj b/src/Mvc/test/WebSites/SimpleWebSite/SimpleWebSite.csproj
similarity index 100%
rename from test/WebSites/SimpleWebSite/SimpleWebSite.csproj
rename to src/Mvc/test/WebSites/SimpleWebSite/SimpleWebSite.csproj
diff --git a/test/WebSites/SimpleWebSite/Startup.cs b/src/Mvc/test/WebSites/SimpleWebSite/Startup.cs
similarity index 100%
rename from test/WebSites/SimpleWebSite/Startup.cs
rename to src/Mvc/test/WebSites/SimpleWebSite/Startup.cs
diff --git a/test/WebSites/SimpleWebSite/readme.md b/src/Mvc/test/WebSites/SimpleWebSite/readme.md
similarity index 100%
rename from test/WebSites/SimpleWebSite/readme.md
rename to src/Mvc/test/WebSites/SimpleWebSite/readme.md
diff --git a/test/WebSites/TagHelpersWebSite/Components/CopyrightViewComponent.cs b/src/Mvc/test/WebSites/TagHelpersWebSite/Components/CopyrightViewComponent.cs
similarity index 100%
rename from test/WebSites/TagHelpersWebSite/Components/CopyrightViewComponent.cs
rename to src/Mvc/test/WebSites/TagHelpersWebSite/Components/CopyrightViewComponent.cs
diff --git a/test/WebSites/TagHelpersWebSite/Components/DanViewComponent.cs b/src/Mvc/test/WebSites/TagHelpersWebSite/Components/DanViewComponent.cs
similarity index 100%
rename from test/WebSites/TagHelpersWebSite/Components/DanViewComponent.cs
rename to src/Mvc/test/WebSites/TagHelpersWebSite/Components/DanViewComponent.cs
diff --git a/test/WebSites/TagHelpersWebSite/Components/GenericViewComponent.cs b/src/Mvc/test/WebSites/TagHelpersWebSite/Components/GenericViewComponent.cs
similarity index 100%
rename from test/WebSites/TagHelpersWebSite/Components/GenericViewComponent.cs
rename to src/Mvc/test/WebSites/TagHelpersWebSite/Components/GenericViewComponent.cs
diff --git a/test/WebSites/TagHelpersWebSite/Components/JacketColor.cs b/src/Mvc/test/WebSites/TagHelpersWebSite/Components/JacketColor.cs
similarity index 100%
rename from test/WebSites/TagHelpersWebSite/Components/JacketColor.cs
rename to src/Mvc/test/WebSites/TagHelpersWebSite/Components/JacketColor.cs
diff --git a/test/WebSites/TagHelpersWebSite/Controllers/EmployeeController.cs b/src/Mvc/test/WebSites/TagHelpersWebSite/Controllers/EmployeeController.cs
similarity index 100%
rename from test/WebSites/TagHelpersWebSite/Controllers/EmployeeController.cs
rename to src/Mvc/test/WebSites/TagHelpersWebSite/Controllers/EmployeeController.cs
diff --git a/test/WebSites/TagHelpersWebSite/Controllers/EncodersController.cs b/src/Mvc/test/WebSites/TagHelpersWebSite/Controllers/EncodersController.cs
similarity index 100%
rename from test/WebSites/TagHelpersWebSite/Controllers/EncodersController.cs
rename to src/Mvc/test/WebSites/TagHelpersWebSite/Controllers/EncodersController.cs
diff --git a/test/WebSites/TagHelpersWebSite/Controllers/HomeController.cs b/src/Mvc/test/WebSites/TagHelpersWebSite/Controllers/HomeController.cs
similarity index 100%
rename from test/WebSites/TagHelpersWebSite/Controllers/HomeController.cs
rename to src/Mvc/test/WebSites/TagHelpersWebSite/Controllers/HomeController.cs
diff --git a/test/WebSites/TagHelpersWebSite/Controllers/RemoveDefaultInheritedTagHelpersController.cs b/src/Mvc/test/WebSites/TagHelpersWebSite/Controllers/RemoveDefaultInheritedTagHelpersController.cs
similarity index 100%
rename from test/WebSites/TagHelpersWebSite/Controllers/RemoveDefaultInheritedTagHelpersController.cs
rename to src/Mvc/test/WebSites/TagHelpersWebSite/Controllers/RemoveDefaultInheritedTagHelpersController.cs
diff --git a/test/WebSites/TagHelpersWebSite/Models/Employee.cs b/src/Mvc/test/WebSites/TagHelpersWebSite/Models/Employee.cs
similarity index 100%
rename from test/WebSites/TagHelpersWebSite/Models/Employee.cs
rename to src/Mvc/test/WebSites/TagHelpersWebSite/Models/Employee.cs
diff --git a/test/WebSites/TagHelpersWebSite/Models/WebsiteContext.cs b/src/Mvc/test/WebSites/TagHelpersWebSite/Models/WebsiteContext.cs
similarity index 100%
rename from test/WebSites/TagHelpersWebSite/Models/WebsiteContext.cs
rename to src/Mvc/test/WebSites/TagHelpersWebSite/Models/WebsiteContext.cs
diff --git a/test/WebSites/TagHelpersWebSite/Startup.cs b/src/Mvc/test/WebSites/TagHelpersWebSite/Startup.cs
similarity index 100%
rename from test/WebSites/TagHelpersWebSite/Startup.cs
rename to src/Mvc/test/WebSites/TagHelpersWebSite/Startup.cs
diff --git a/test/WebSites/TagHelpersWebSite/TagHelpers/ATagHelper.cs b/src/Mvc/test/WebSites/TagHelpersWebSite/TagHelpers/ATagHelper.cs
similarity index 100%
rename from test/WebSites/TagHelpersWebSite/TagHelpers/ATagHelper.cs
rename to src/Mvc/test/WebSites/TagHelpersWebSite/TagHelpers/ATagHelper.cs
diff --git a/test/WebSites/TagHelpersWebSite/TagHelpers/AddProcessedAttributeTagHelper.cs b/src/Mvc/test/WebSites/TagHelpersWebSite/TagHelpers/AddProcessedAttributeTagHelper.cs
similarity index 100%
rename from test/WebSites/TagHelpersWebSite/TagHelpers/AddProcessedAttributeTagHelper.cs
rename to src/Mvc/test/WebSites/TagHelpersWebSite/TagHelpers/AddProcessedAttributeTagHelper.cs
diff --git a/test/WebSites/TagHelpersWebSite/TagHelpers/AutoLinkerTagHelper.cs b/src/Mvc/test/WebSites/TagHelpersWebSite/TagHelpers/AutoLinkerTagHelper.cs
similarity index 100%
rename from test/WebSites/TagHelpersWebSite/TagHelpers/AutoLinkerTagHelper.cs
rename to src/Mvc/test/WebSites/TagHelpersWebSite/TagHelpers/AutoLinkerTagHelper.cs
diff --git a/test/WebSites/TagHelpersWebSite/TagHelpers/BoldTagHelper.cs b/src/Mvc/test/WebSites/TagHelpersWebSite/TagHelpers/BoldTagHelper.cs
similarity index 100%
rename from test/WebSites/TagHelpersWebSite/TagHelpers/BoldTagHelper.cs
rename to src/Mvc/test/WebSites/TagHelpersWebSite/TagHelpers/BoldTagHelper.cs
diff --git a/test/WebSites/TagHelpersWebSite/TagHelpers/ConditionTagHelper.cs b/src/Mvc/test/WebSites/TagHelpersWebSite/TagHelpers/ConditionTagHelper.cs
similarity index 100%
rename from test/WebSites/TagHelpersWebSite/TagHelpers/ConditionTagHelper.cs
rename to src/Mvc/test/WebSites/TagHelpersWebSite/TagHelpers/ConditionTagHelper.cs
diff --git a/test/WebSites/TagHelpersWebSite/TagHelpers/CustomEncoderTagHelper.cs b/src/Mvc/test/WebSites/TagHelpersWebSite/TagHelpers/CustomEncoderTagHelper.cs
similarity index 100%
rename from test/WebSites/TagHelpersWebSite/TagHelpers/CustomEncoderTagHelper.cs
rename to src/Mvc/test/WebSites/TagHelpersWebSite/TagHelpers/CustomEncoderTagHelper.cs
diff --git a/test/WebSites/TagHelpersWebSite/TagHelpers/DefaultEncoderTagHelper.cs b/src/Mvc/test/WebSites/TagHelpersWebSite/TagHelpers/DefaultEncoderTagHelper.cs
similarity index 100%
rename from test/WebSites/TagHelpersWebSite/TagHelpers/DefaultEncoderTagHelper.cs
rename to src/Mvc/test/WebSites/TagHelpersWebSite/TagHelpers/DefaultEncoderTagHelper.cs
diff --git a/test/WebSites/TagHelpersWebSite/TagHelpers/DictionaryPrefixTestTagHelper.cs b/src/Mvc/test/WebSites/TagHelpersWebSite/TagHelpers/DictionaryPrefixTestTagHelper.cs
similarity index 100%
rename from test/WebSites/TagHelpersWebSite/TagHelpers/DictionaryPrefixTestTagHelper.cs
rename to src/Mvc/test/WebSites/TagHelpersWebSite/TagHelpers/DictionaryPrefixTestTagHelper.cs
diff --git a/test/WebSites/TagHelpersWebSite/TagHelpers/NestedViewImportsTagHelper.cs b/src/Mvc/test/WebSites/TagHelpersWebSite/TagHelpers/NestedViewImportsTagHelper.cs
similarity index 100%
rename from test/WebSites/TagHelpersWebSite/TagHelpers/NestedViewImportsTagHelper.cs
rename to src/Mvc/test/WebSites/TagHelpersWebSite/TagHelpers/NestedViewImportsTagHelper.cs
diff --git a/test/WebSites/TagHelpersWebSite/TagHelpers/NullEncoderTagHelper.cs b/src/Mvc/test/WebSites/TagHelpersWebSite/TagHelpers/NullEncoderTagHelper.cs
similarity index 100%
rename from test/WebSites/TagHelpersWebSite/TagHelpers/NullEncoderTagHelper.cs
rename to src/Mvc/test/WebSites/TagHelpersWebSite/TagHelpers/NullEncoderTagHelper.cs
diff --git a/test/WebSites/TagHelpersWebSite/TagHelpers/PrettyTagHelper.cs b/src/Mvc/test/WebSites/TagHelpersWebSite/TagHelpers/PrettyTagHelper.cs
similarity index 100%
rename from test/WebSites/TagHelpersWebSite/TagHelpers/PrettyTagHelper.cs
rename to src/Mvc/test/WebSites/TagHelpersWebSite/TagHelpers/PrettyTagHelper.cs
diff --git a/test/WebSites/TagHelpersWebSite/TagHelpers/RootViewStartTagHelper.cs b/src/Mvc/test/WebSites/TagHelpersWebSite/TagHelpers/RootViewStartTagHelper.cs
similarity index 100%
rename from test/WebSites/TagHelpersWebSite/TagHelpers/RootViewStartTagHelper.cs
rename to src/Mvc/test/WebSites/TagHelpersWebSite/TagHelpers/RootViewStartTagHelper.cs
diff --git a/test/WebSites/TagHelpersWebSite/TagHelpers/SurroundTagHelper.cs b/src/Mvc/test/WebSites/TagHelpersWebSite/TagHelpers/SurroundTagHelper.cs
similarity index 100%
rename from test/WebSites/TagHelpersWebSite/TagHelpers/SurroundTagHelper.cs
rename to src/Mvc/test/WebSites/TagHelpersWebSite/TagHelpers/SurroundTagHelper.cs
diff --git a/test/WebSites/TagHelpersWebSite/TagHelpers/TagCloudViewComponentTagHelper.cs b/src/Mvc/test/WebSites/TagHelpersWebSite/TagHelpers/TagCloudViewComponentTagHelper.cs
similarity index 100%
rename from test/WebSites/TagHelpersWebSite/TagHelpers/TagCloudViewComponentTagHelper.cs
rename to src/Mvc/test/WebSites/TagHelpersWebSite/TagHelpers/TagCloudViewComponentTagHelper.cs
diff --git a/test/WebSites/TagHelpersWebSite/TagHelpers/WebsiteInformationTagHelper.cs b/src/Mvc/test/WebSites/TagHelpersWebSite/TagHelpers/WebsiteInformationTagHelper.cs
similarity index 100%
rename from test/WebSites/TagHelpersWebSite/TagHelpers/WebsiteInformationTagHelper.cs
rename to src/Mvc/test/WebSites/TagHelpersWebSite/TagHelpers/WebsiteInformationTagHelper.cs
diff --git a/test/WebSites/TagHelpersWebSite/TagHelpersWebSite.csproj b/src/Mvc/test/WebSites/TagHelpersWebSite/TagHelpersWebSite.csproj
similarity index 100%
rename from test/WebSites/TagHelpersWebSite/TagHelpersWebSite.csproj
rename to src/Mvc/test/WebSites/TagHelpersWebSite/TagHelpersWebSite.csproj
diff --git a/test/WebSites/TagHelpersWebSite/Views/Employee/Create.cshtml b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/Employee/Create.cshtml
similarity index 100%
rename from test/WebSites/TagHelpersWebSite/Views/Employee/Create.cshtml
rename to src/Mvc/test/WebSites/TagHelpersWebSite/Views/Employee/Create.cshtml
diff --git a/test/WebSites/TagHelpersWebSite/Views/Employee/Details.cshtml b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/Employee/Details.cshtml
similarity index 100%
rename from test/WebSites/TagHelpersWebSite/Views/Employee/Details.cshtml
rename to src/Mvc/test/WebSites/TagHelpersWebSite/Views/Employee/Details.cshtml
diff --git a/test/WebSites/TagHelpersWebSite/Views/Employee/DuplicateAntiforgeryTokenRegistration.cshtml b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/Employee/DuplicateAntiforgeryTokenRegistration.cshtml
similarity index 100%
rename from test/WebSites/TagHelpersWebSite/Views/Employee/DuplicateAntiforgeryTokenRegistration.cshtml
rename to src/Mvc/test/WebSites/TagHelpersWebSite/Views/Employee/DuplicateAntiforgeryTokenRegistration.cshtml
diff --git a/test/WebSites/TagHelpersWebSite/Views/Encoders/CustomEncoder.cshtml b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/Encoders/CustomEncoder.cshtml
similarity index 100%
rename from test/WebSites/TagHelpersWebSite/Views/Encoders/CustomEncoder.cshtml
rename to src/Mvc/test/WebSites/TagHelpersWebSite/Views/Encoders/CustomEncoder.cshtml
diff --git a/test/WebSites/TagHelpersWebSite/Views/Encoders/Index.cshtml b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/Encoders/Index.cshtml
similarity index 100%
rename from test/WebSites/TagHelpersWebSite/Views/Encoders/Index.cshtml
rename to src/Mvc/test/WebSites/TagHelpersWebSite/Views/Encoders/Index.cshtml
diff --git a/test/WebSites/TagHelpersWebSite/Views/Encoders/NullEncoder.cshtml b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/Encoders/NullEncoder.cshtml
similarity index 100%
rename from test/WebSites/TagHelpersWebSite/Views/Encoders/NullEncoder.cshtml
rename to src/Mvc/test/WebSites/TagHelpersWebSite/Views/Encoders/NullEncoder.cshtml
diff --git a/test/WebSites/TagHelpersWebSite/Views/Encoders/ThreeEncoders.cshtml b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/Encoders/ThreeEncoders.cshtml
similarity index 100%
rename from test/WebSites/TagHelpersWebSite/Views/Encoders/ThreeEncoders.cshtml
rename to src/Mvc/test/WebSites/TagHelpersWebSite/Views/Encoders/ThreeEncoders.cshtml
diff --git a/test/WebSites/TagHelpersWebSite/Views/Encoders/TwoEncoders.cshtml b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/Encoders/TwoEncoders.cshtml
similarity index 100%
rename from test/WebSites/TagHelpersWebSite/Views/Encoders/TwoEncoders.cshtml
rename to src/Mvc/test/WebSites/TagHelpersWebSite/Views/Encoders/TwoEncoders.cshtml
diff --git a/test/WebSites/TagHelpersWebSite/Views/Encoders/_Layout.cshtml b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/Encoders/_Layout.cshtml
similarity index 100%
rename from test/WebSites/TagHelpersWebSite/Views/Encoders/_Layout.cshtml
rename to src/Mvc/test/WebSites/TagHelpersWebSite/Views/Encoders/_Layout.cshtml
diff --git a/test/WebSites/TagHelpersWebSite/Views/Encoders/_ViewImports.cshtml b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/Encoders/_ViewImports.cshtml
similarity index 100%
rename from test/WebSites/TagHelpersWebSite/Views/Encoders/_ViewImports.cshtml
rename to src/Mvc/test/WebSites/TagHelpersWebSite/Views/Encoders/_ViewImports.cshtml
diff --git a/test/WebSites/TagHelpersWebSite/Views/Encoders/_ViewStart.cshtml b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/Encoders/_ViewStart.cshtml
similarity index 100%
rename from test/WebSites/TagHelpersWebSite/Views/Encoders/_ViewStart.cshtml
rename to src/Mvc/test/WebSites/TagHelpersWebSite/Views/Encoders/_ViewStart.cshtml
diff --git a/test/WebSites/TagHelpersWebSite/Views/Home/About.cshtml b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/Home/About.cshtml
similarity index 100%
rename from test/WebSites/TagHelpersWebSite/Views/Home/About.cshtml
rename to src/Mvc/test/WebSites/TagHelpersWebSite/Views/Home/About.cshtml
diff --git a/test/WebSites/TagHelpersWebSite/Views/Home/Help.cshtml b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/Home/Help.cshtml
similarity index 100%
rename from test/WebSites/TagHelpersWebSite/Views/Home/Help.cshtml
rename to src/Mvc/test/WebSites/TagHelpersWebSite/Views/Home/Help.cshtml
diff --git a/test/WebSites/TagHelpersWebSite/Views/Home/Index.cshtml b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/Home/Index.cshtml
similarity index 100%
rename from test/WebSites/TagHelpersWebSite/Views/Home/Index.cshtml
rename to src/Mvc/test/WebSites/TagHelpersWebSite/Views/Home/Index.cshtml
diff --git a/test/WebSites/TagHelpersWebSite/Views/Home/NestedViewImportsTagHelper.cshtml b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/Home/NestedViewImportsTagHelper.cshtml
similarity index 100%
rename from test/WebSites/TagHelpersWebSite/Views/Home/NestedViewImportsTagHelper.cshtml
rename to src/Mvc/test/WebSites/TagHelpersWebSite/Views/Home/NestedViewImportsTagHelper.cshtml
diff --git a/test/WebSites/TagHelpersWebSite/Views/Home/UnboundDynamicAttributes.cshtml b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/Home/UnboundDynamicAttributes.cshtml
similarity index 100%
rename from test/WebSites/TagHelpersWebSite/Views/Home/UnboundDynamicAttributes.cshtml
rename to src/Mvc/test/WebSites/TagHelpersWebSite/Views/Home/UnboundDynamicAttributes.cshtml
diff --git a/test/WebSites/TagHelpersWebSite/Views/Home/ViewComponentTagHelpers.cshtml b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/Home/ViewComponentTagHelpers.cshtml
similarity index 100%
rename from test/WebSites/TagHelpersWebSite/Views/Home/ViewComponentTagHelpers.cshtml
rename to src/Mvc/test/WebSites/TagHelpersWebSite/Views/Home/ViewComponentTagHelpers.cshtml
diff --git a/test/WebSites/TagHelpersWebSite/Views/Home/_ViewImports.cshtml b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/Home/_ViewImports.cshtml
similarity index 100%
rename from test/WebSites/TagHelpersWebSite/Views/Home/_ViewImports.cshtml
rename to src/Mvc/test/WebSites/TagHelpersWebSite/Views/Home/_ViewImports.cshtml
diff --git a/test/WebSites/TagHelpersWebSite/Views/InheritedTagHelperPrefix/InheritedTagHelperPrefix.cshtml b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/InheritedTagHelperPrefix/InheritedTagHelperPrefix.cshtml
similarity index 100%
rename from test/WebSites/TagHelpersWebSite/Views/InheritedTagHelperPrefix/InheritedTagHelperPrefix.cshtml
rename to src/Mvc/test/WebSites/TagHelpersWebSite/Views/InheritedTagHelperPrefix/InheritedTagHelperPrefix.cshtml
diff --git a/test/WebSites/TagHelpersWebSite/Views/InheritedTagHelperPrefix/NestedInheritedTagHelperPrefix/NestedInheritedTagHelperPrefix.cshtml b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/InheritedTagHelperPrefix/NestedInheritedTagHelperPrefix/NestedInheritedTagHelperPrefix.cshtml
similarity index 100%
rename from test/WebSites/TagHelpersWebSite/Views/InheritedTagHelperPrefix/NestedInheritedTagHelperPrefix/NestedInheritedTagHelperPrefix.cshtml
rename to src/Mvc/test/WebSites/TagHelpersWebSite/Views/InheritedTagHelperPrefix/NestedInheritedTagHelperPrefix/NestedInheritedTagHelperPrefix.cshtml
diff --git a/test/WebSites/TagHelpersWebSite/Views/InheritedTagHelperPrefix/NestedInheritedTagHelperPrefix/NestedOverriddenTagHelperPrefix.cshtml b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/InheritedTagHelperPrefix/NestedInheritedTagHelperPrefix/NestedOverriddenTagHelperPrefix.cshtml
similarity index 100%
rename from test/WebSites/TagHelpersWebSite/Views/InheritedTagHelperPrefix/NestedInheritedTagHelperPrefix/NestedOverriddenTagHelperPrefix.cshtml
rename to src/Mvc/test/WebSites/TagHelpersWebSite/Views/InheritedTagHelperPrefix/NestedInheritedTagHelperPrefix/NestedOverriddenTagHelperPrefix.cshtml
diff --git a/test/WebSites/TagHelpersWebSite/Views/InheritedTagHelperPrefix/NestedInheritedTagHelperPrefix/_ViewImports.cshtml b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/InheritedTagHelperPrefix/NestedInheritedTagHelperPrefix/_ViewImports.cshtml
similarity index 100%
rename from test/WebSites/TagHelpersWebSite/Views/InheritedTagHelperPrefix/NestedInheritedTagHelperPrefix/_ViewImports.cshtml
rename to src/Mvc/test/WebSites/TagHelpersWebSite/Views/InheritedTagHelperPrefix/NestedInheritedTagHelperPrefix/_ViewImports.cshtml
diff --git a/test/WebSites/TagHelpersWebSite/Views/InheritedTagHelperPrefix/OverriddenTagHelperPrefix.cshtml b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/InheritedTagHelperPrefix/OverriddenTagHelperPrefix.cshtml
similarity index 100%
rename from test/WebSites/TagHelpersWebSite/Views/InheritedTagHelperPrefix/OverriddenTagHelperPrefix.cshtml
rename to src/Mvc/test/WebSites/TagHelpersWebSite/Views/InheritedTagHelperPrefix/OverriddenTagHelperPrefix.cshtml
diff --git a/test/WebSites/TagHelpersWebSite/Views/InheritedTagHelperPrefix/_ViewImports.cshtml b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/InheritedTagHelperPrefix/_ViewImports.cshtml
similarity index 100%
rename from test/WebSites/TagHelpersWebSite/Views/InheritedTagHelperPrefix/_ViewImports.cshtml
rename to src/Mvc/test/WebSites/TagHelpersWebSite/Views/InheritedTagHelperPrefix/_ViewImports.cshtml
diff --git a/test/WebSites/TagHelpersWebSite/Views/InheritedTagHelperPrefix/_ViewStart.cshtml b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/InheritedTagHelperPrefix/_ViewStart.cshtml
similarity index 100%
rename from test/WebSites/TagHelpersWebSite/Views/InheritedTagHelperPrefix/_ViewStart.cshtml
rename to src/Mvc/test/WebSites/TagHelpersWebSite/Views/InheritedTagHelperPrefix/_ViewStart.cshtml
diff --git a/test/WebSites/TagHelpersWebSite/Views/RemoveDefaultInheritedTagHelpers/Index.cshtml b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/RemoveDefaultInheritedTagHelpers/Index.cshtml
similarity index 100%
rename from test/WebSites/TagHelpersWebSite/Views/RemoveDefaultInheritedTagHelpers/Index.cshtml
rename to src/Mvc/test/WebSites/TagHelpersWebSite/Views/RemoveDefaultInheritedTagHelpers/Index.cshtml
diff --git a/test/WebSites/TagHelpersWebSite/Views/RemoveDefaultInheritedTagHelpers/_ViewImports.cshtml b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/RemoveDefaultInheritedTagHelpers/_ViewImports.cshtml
similarity index 100%
rename from test/WebSites/TagHelpersWebSite/Views/RemoveDefaultInheritedTagHelpers/_ViewImports.cshtml
rename to src/Mvc/test/WebSites/TagHelpersWebSite/Views/RemoveDefaultInheritedTagHelpers/_ViewImports.cshtml
diff --git a/test/WebSites/TagHelpersWebSite/Views/RemoveInheritedTagHelpers/ViewWithInheritedRemoveTagHelper.cshtml b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/RemoveInheritedTagHelpers/ViewWithInheritedRemoveTagHelper.cshtml
similarity index 100%
rename from test/WebSites/TagHelpersWebSite/Views/RemoveInheritedTagHelpers/ViewWithInheritedRemoveTagHelper.cshtml
rename to src/Mvc/test/WebSites/TagHelpersWebSite/Views/RemoveInheritedTagHelpers/ViewWithInheritedRemoveTagHelper.cshtml
diff --git a/test/WebSites/TagHelpersWebSite/Views/RemoveInheritedTagHelpers/_ViewImports.cshtml b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/RemoveInheritedTagHelpers/_ViewImports.cshtml
similarity index 100%
rename from test/WebSites/TagHelpersWebSite/Views/RemoveInheritedTagHelpers/_ViewImports.cshtml
rename to src/Mvc/test/WebSites/TagHelpersWebSite/Views/RemoveInheritedTagHelpers/_ViewImports.cshtml
diff --git a/test/WebSites/TagHelpersWebSite/Views/RemoveInheritedTagHelpers/_ViewStart.cshtml b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/RemoveInheritedTagHelpers/_ViewStart.cshtml
similarity index 100%
rename from test/WebSites/TagHelpersWebSite/Views/RemoveInheritedTagHelpers/_ViewStart.cshtml
rename to src/Mvc/test/WebSites/TagHelpersWebSite/Views/RemoveInheritedTagHelpers/_ViewStart.cshtml
diff --git a/test/WebSites/TagHelpersWebSite/Views/Shared/Components/Copyright/Default.cshtml b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/Shared/Components/Copyright/Default.cshtml
similarity index 100%
rename from test/WebSites/TagHelpersWebSite/Views/Shared/Components/Copyright/Default.cshtml
rename to src/Mvc/test/WebSites/TagHelpersWebSite/Views/Shared/Components/Copyright/Default.cshtml
diff --git a/test/WebSites/TagHelpersWebSite/Views/Shared/Components/Dan/Default.cshtml b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/Shared/Components/Dan/Default.cshtml
similarity index 100%
rename from test/WebSites/TagHelpersWebSite/Views/Shared/Components/Dan/Default.cshtml
rename to src/Mvc/test/WebSites/TagHelpersWebSite/Views/Shared/Components/Dan/Default.cshtml
diff --git a/test/WebSites/TagHelpersWebSite/Views/Shared/Components/Generic/Default.cshtml b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/Shared/Components/Generic/Default.cshtml
similarity index 100%
rename from test/WebSites/TagHelpersWebSite/Views/Shared/Components/Generic/Default.cshtml
rename to src/Mvc/test/WebSites/TagHelpersWebSite/Views/Shared/Components/Generic/Default.cshtml
diff --git a/test/WebSites/TagHelpersWebSite/Views/Shared/ViewWithLayoutAndNestedTagHelper.cshtml b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/Shared/ViewWithLayoutAndNestedTagHelper.cshtml
similarity index 100%
rename from test/WebSites/TagHelpersWebSite/Views/Shared/ViewWithLayoutAndNestedTagHelper.cshtml
rename to src/Mvc/test/WebSites/TagHelpersWebSite/Views/Shared/ViewWithLayoutAndNestedTagHelper.cshtml
diff --git a/test/WebSites/TagHelpersWebSite/Views/Shared/_Layout.cshtml b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/Shared/_Layout.cshtml
similarity index 100%
rename from test/WebSites/TagHelpersWebSite/Views/Shared/_Layout.cshtml
rename to src/Mvc/test/WebSites/TagHelpersWebSite/Views/Shared/_Layout.cshtml
diff --git a/test/WebSites/TagHelpersWebSite/Views/Shared/_LayoutWithRootTagHelper.cshtml b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/Shared/_LayoutWithRootTagHelper.cshtml
similarity index 100%
rename from test/WebSites/TagHelpersWebSite/Views/Shared/_LayoutWithRootTagHelper.cshtml
rename to src/Mvc/test/WebSites/TagHelpersWebSite/Views/Shared/_LayoutWithRootTagHelper.cshtml
diff --git a/test/WebSites/TagHelpersWebSite/Views/_ViewImports.cshtml b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/_ViewImports.cshtml
similarity index 100%
rename from test/WebSites/TagHelpersWebSite/Views/_ViewImports.cshtml
rename to src/Mvc/test/WebSites/TagHelpersWebSite/Views/_ViewImports.cshtml
diff --git a/test/WebSites/TagHelpersWebSite/Views/_ViewStart.cshtml b/src/Mvc/test/WebSites/TagHelpersWebSite/Views/_ViewStart.cshtml
similarity index 100%
rename from test/WebSites/TagHelpersWebSite/Views/_ViewStart.cshtml
rename to src/Mvc/test/WebSites/TagHelpersWebSite/Views/_ViewStart.cshtml
diff --git a/test/WebSites/TagHelpersWebSite/readme.md b/src/Mvc/test/WebSites/TagHelpersWebSite/readme.md
similarity index 100%
rename from test/WebSites/TagHelpersWebSite/readme.md
rename to src/Mvc/test/WebSites/TagHelpersWebSite/readme.md
diff --git a/test/WebSites/VersioningWebSite/Controllers/AddressController.cs b/src/Mvc/test/WebSites/VersioningWebSite/Controllers/AddressController.cs
similarity index 100%
rename from test/WebSites/VersioningWebSite/Controllers/AddressController.cs
rename to src/Mvc/test/WebSites/VersioningWebSite/Controllers/AddressController.cs
diff --git a/test/WebSites/VersioningWebSite/Controllers/BooksController.cs b/src/Mvc/test/WebSites/VersioningWebSite/Controllers/BooksController.cs
similarity index 100%
rename from test/WebSites/VersioningWebSite/Controllers/BooksController.cs
rename to src/Mvc/test/WebSites/VersioningWebSite/Controllers/BooksController.cs
diff --git a/test/WebSites/VersioningWebSite/Controllers/CustomersController.cs b/src/Mvc/test/WebSites/VersioningWebSite/Controllers/CustomersController.cs
similarity index 100%
rename from test/WebSites/VersioningWebSite/Controllers/CustomersController.cs
rename to src/Mvc/test/WebSites/VersioningWebSite/Controllers/CustomersController.cs
diff --git a/test/WebSites/VersioningWebSite/Controllers/ItemsController.cs b/src/Mvc/test/WebSites/VersioningWebSite/Controllers/ItemsController.cs
similarity index 100%
rename from test/WebSites/VersioningWebSite/Controllers/ItemsController.cs
rename to src/Mvc/test/WebSites/VersioningWebSite/Controllers/ItemsController.cs
diff --git a/test/WebSites/VersioningWebSite/Controllers/ItemsV2Controller.cs b/src/Mvc/test/WebSites/VersioningWebSite/Controllers/ItemsV2Controller.cs
similarity index 100%
rename from test/WebSites/VersioningWebSite/Controllers/ItemsV2Controller.cs
rename to src/Mvc/test/WebSites/VersioningWebSite/Controllers/ItemsV2Controller.cs
diff --git a/test/WebSites/VersioningWebSite/Controllers/MoviesController.cs b/src/Mvc/test/WebSites/VersioningWebSite/Controllers/MoviesController.cs
similarity index 100%
rename from test/WebSites/VersioningWebSite/Controllers/MoviesController.cs
rename to src/Mvc/test/WebSites/VersioningWebSite/Controllers/MoviesController.cs
diff --git a/test/WebSites/VersioningWebSite/Controllers/MoviesV2Controller.cs b/src/Mvc/test/WebSites/VersioningWebSite/Controllers/MoviesV2Controller.cs
similarity index 100%
rename from test/WebSites/VersioningWebSite/Controllers/MoviesV2Controller.cs
rename to src/Mvc/test/WebSites/VersioningWebSite/Controllers/MoviesV2Controller.cs
diff --git a/test/WebSites/VersioningWebSite/Controllers/PetsController.cs b/src/Mvc/test/WebSites/VersioningWebSite/Controllers/PetsController.cs
similarity index 100%
rename from test/WebSites/VersioningWebSite/Controllers/PetsController.cs
rename to src/Mvc/test/WebSites/VersioningWebSite/Controllers/PetsController.cs
diff --git a/test/WebSites/VersioningWebSite/Controllers/RoutingController.cs b/src/Mvc/test/WebSites/VersioningWebSite/Controllers/RoutingController.cs
similarity index 100%
rename from test/WebSites/VersioningWebSite/Controllers/RoutingController.cs
rename to src/Mvc/test/WebSites/VersioningWebSite/Controllers/RoutingController.cs
diff --git a/test/WebSites/VersioningWebSite/Controllers/TicketsController.cs b/src/Mvc/test/WebSites/VersioningWebSite/Controllers/TicketsController.cs
similarity index 100%
rename from test/WebSites/VersioningWebSite/Controllers/TicketsController.cs
rename to src/Mvc/test/WebSites/VersioningWebSite/Controllers/TicketsController.cs
diff --git a/test/WebSites/VersioningWebSite/Controllers/VouchersController.cs b/src/Mvc/test/WebSites/VersioningWebSite/Controllers/VouchersController.cs
similarity index 100%
rename from test/WebSites/VersioningWebSite/Controllers/VouchersController.cs
rename to src/Mvc/test/WebSites/VersioningWebSite/Controllers/VouchersController.cs
diff --git a/test/WebSites/VersioningWebSite/Program.cs b/src/Mvc/test/WebSites/VersioningWebSite/Program.cs
similarity index 100%
rename from test/WebSites/VersioningWebSite/Program.cs
rename to src/Mvc/test/WebSites/VersioningWebSite/Program.cs
diff --git a/test/WebSites/VersioningWebSite/Startup.cs b/src/Mvc/test/WebSites/VersioningWebSite/Startup.cs
similarity index 100%
rename from test/WebSites/VersioningWebSite/Startup.cs
rename to src/Mvc/test/WebSites/VersioningWebSite/Startup.cs
diff --git a/test/WebSites/VersioningWebSite/StartupWith21Compat.cs b/src/Mvc/test/WebSites/VersioningWebSite/StartupWith21Compat.cs
similarity index 100%
rename from test/WebSites/VersioningWebSite/StartupWith21Compat.cs
rename to src/Mvc/test/WebSites/VersioningWebSite/StartupWith21Compat.cs
diff --git a/test/WebSites/VersioningWebSite/VersionAttribute.cs b/src/Mvc/test/WebSites/VersioningWebSite/VersionAttribute.cs
similarity index 100%
rename from test/WebSites/VersioningWebSite/VersionAttribute.cs
rename to src/Mvc/test/WebSites/VersioningWebSite/VersionAttribute.cs
diff --git a/test/WebSites/VersioningWebSite/VersionDeleteAttribute.cs b/src/Mvc/test/WebSites/VersioningWebSite/VersionDeleteAttribute.cs
similarity index 100%
rename from test/WebSites/VersioningWebSite/VersionDeleteAttribute.cs
rename to src/Mvc/test/WebSites/VersioningWebSite/VersionDeleteAttribute.cs
diff --git a/test/WebSites/VersioningWebSite/VersionGetAttribute.cs b/src/Mvc/test/WebSites/VersioningWebSite/VersionGetAttribute.cs
similarity index 100%
rename from test/WebSites/VersioningWebSite/VersionGetAttribute.cs
rename to src/Mvc/test/WebSites/VersioningWebSite/VersionGetAttribute.cs
diff --git a/test/WebSites/VersioningWebSite/VersionPostAttribute.cs b/src/Mvc/test/WebSites/VersioningWebSite/VersionPostAttribute.cs
similarity index 100%
rename from test/WebSites/VersioningWebSite/VersionPostAttribute.cs
rename to src/Mvc/test/WebSites/VersioningWebSite/VersionPostAttribute.cs
diff --git a/test/WebSites/VersioningWebSite/VersionPutAttribute.cs b/src/Mvc/test/WebSites/VersioningWebSite/VersionPutAttribute.cs
similarity index 100%
rename from test/WebSites/VersioningWebSite/VersionPutAttribute.cs
rename to src/Mvc/test/WebSites/VersioningWebSite/VersionPutAttribute.cs
diff --git a/test/WebSites/VersioningWebSite/VersionRangeValidator.cs b/src/Mvc/test/WebSites/VersioningWebSite/VersionRangeValidator.cs
similarity index 100%
rename from test/WebSites/VersioningWebSite/VersionRangeValidator.cs
rename to src/Mvc/test/WebSites/VersioningWebSite/VersionRangeValidator.cs
diff --git a/test/WebSites/VersioningWebSite/VersionRouteAttribute.cs b/src/Mvc/test/WebSites/VersioningWebSite/VersionRouteAttribute.cs
similarity index 100%
rename from test/WebSites/VersioningWebSite/VersionRouteAttribute.cs
rename to src/Mvc/test/WebSites/VersioningWebSite/VersionRouteAttribute.cs
diff --git a/test/WebSites/VersioningWebSite/VersioningWebSite.csproj b/src/Mvc/test/WebSites/VersioningWebSite/VersioningWebSite.csproj
similarity index 100%
rename from test/WebSites/VersioningWebSite/VersioningWebSite.csproj
rename to src/Mvc/test/WebSites/VersioningWebSite/VersioningWebSite.csproj
diff --git a/test/WebSites/VersioningWebSite/readme.md b/src/Mvc/test/WebSites/VersioningWebSite/readme.md
similarity index 100%
rename from test/WebSites/VersioningWebSite/readme.md
rename to src/Mvc/test/WebSites/VersioningWebSite/readme.md
diff --git a/test/WebSites/WebApiCompatShimWebSite/ActionSelectionFilter.cs b/src/Mvc/test/WebSites/WebApiCompatShimWebSite/ActionSelectionFilter.cs
similarity index 100%
rename from test/WebSites/WebApiCompatShimWebSite/ActionSelectionFilter.cs
rename to src/Mvc/test/WebSites/WebApiCompatShimWebSite/ActionSelectionFilter.cs
diff --git a/test/WebSites/WebApiCompatShimWebSite/Controllers/ActionResults/ActionResultController.cs b/src/Mvc/test/WebSites/WebApiCompatShimWebSite/Controllers/ActionResults/ActionResultController.cs
similarity index 100%
rename from test/WebSites/WebApiCompatShimWebSite/Controllers/ActionResults/ActionResultController.cs
rename to src/Mvc/test/WebSites/WebApiCompatShimWebSite/Controllers/ActionResults/ActionResultController.cs
diff --git a/test/WebSites/WebApiCompatShimWebSite/Controllers/ActionSelection/Legacy/EnumParameterOverloadsController.cs b/src/Mvc/test/WebSites/WebApiCompatShimWebSite/Controllers/ActionSelection/Legacy/EnumParameterOverloadsController.cs
similarity index 100%
rename from test/WebSites/WebApiCompatShimWebSite/Controllers/ActionSelection/Legacy/EnumParameterOverloadsController.cs
rename to src/Mvc/test/WebSites/WebApiCompatShimWebSite/Controllers/ActionSelection/Legacy/EnumParameterOverloadsController.cs
diff --git a/test/WebSites/WebApiCompatShimWebSite/Controllers/ActionSelection/Legacy/ParameterAttributeController.cs b/src/Mvc/test/WebSites/WebApiCompatShimWebSite/Controllers/ActionSelection/Legacy/ParameterAttributeController.cs
similarity index 100%
rename from test/WebSites/WebApiCompatShimWebSite/Controllers/ActionSelection/Legacy/ParameterAttributeController.cs
rename to src/Mvc/test/WebSites/WebApiCompatShimWebSite/Controllers/ActionSelection/Legacy/ParameterAttributeController.cs
diff --git a/test/WebSites/WebApiCompatShimWebSite/Controllers/ActionSelection/Legacy/TestController.cs b/src/Mvc/test/WebSites/WebApiCompatShimWebSite/Controllers/ActionSelection/Legacy/TestController.cs
similarity index 100%
rename from test/WebSites/WebApiCompatShimWebSite/Controllers/ActionSelection/Legacy/TestController.cs
rename to src/Mvc/test/WebSites/WebApiCompatShimWebSite/Controllers/ActionSelection/Legacy/TestController.cs
diff --git a/test/WebSites/WebApiCompatShimWebSite/Controllers/ActionSelection/WebAPIActionConventionsActionNameController.cs b/src/Mvc/test/WebSites/WebApiCompatShimWebSite/Controllers/ActionSelection/WebAPIActionConventionsActionNameController.cs
similarity index 100%
rename from test/WebSites/WebApiCompatShimWebSite/Controllers/ActionSelection/WebAPIActionConventionsActionNameController.cs
rename to src/Mvc/test/WebSites/WebApiCompatShimWebSite/Controllers/ActionSelection/WebAPIActionConventionsActionNameController.cs
diff --git a/test/WebSites/WebApiCompatShimWebSite/Controllers/ActionSelection/WebAPIActionConventionsController.cs b/src/Mvc/test/WebSites/WebApiCompatShimWebSite/Controllers/ActionSelection/WebAPIActionConventionsController.cs
similarity index 100%
rename from test/WebSites/WebApiCompatShimWebSite/Controllers/ActionSelection/WebAPIActionConventionsController.cs
rename to src/Mvc/test/WebSites/WebApiCompatShimWebSite/Controllers/ActionSelection/WebAPIActionConventionsController.cs
diff --git a/test/WebSites/WebApiCompatShimWebSite/Controllers/ActionSelection/WebAPIActionConventionsDefaultPostController.cs b/src/Mvc/test/WebSites/WebApiCompatShimWebSite/Controllers/ActionSelection/WebAPIActionConventionsDefaultPostController.cs
similarity index 100%
rename from test/WebSites/WebApiCompatShimWebSite/Controllers/ActionSelection/WebAPIActionConventionsDefaultPostController.cs
rename to src/Mvc/test/WebSites/WebApiCompatShimWebSite/Controllers/ActionSelection/WebAPIActionConventionsDefaultPostController.cs
diff --git a/test/WebSites/WebApiCompatShimWebSite/Controllers/ActionSelection/WebAPIActionConventionsVerbOverrideController.cs b/src/Mvc/test/WebSites/WebApiCompatShimWebSite/Controllers/ActionSelection/WebAPIActionConventionsVerbOverrideController.cs
similarity index 100%
rename from test/WebSites/WebApiCompatShimWebSite/Controllers/ActionSelection/WebAPIActionConventionsVerbOverrideController.cs
rename to src/Mvc/test/WebSites/WebApiCompatShimWebSite/Controllers/ActionSelection/WebAPIActionConventionsVerbOverrideController.cs
diff --git a/test/WebSites/WebApiCompatShimWebSite/Controllers/BasicApiController.cs b/src/Mvc/test/WebSites/WebApiCompatShimWebSite/Controllers/BasicApiController.cs
similarity index 100%
rename from test/WebSites/WebApiCompatShimWebSite/Controllers/BasicApiController.cs
rename to src/Mvc/test/WebSites/WebApiCompatShimWebSite/Controllers/BasicApiController.cs
diff --git a/test/WebSites/WebApiCompatShimWebSite/Controllers/HttpRequestMessage/HttpRequestMessageController.cs b/src/Mvc/test/WebSites/WebApiCompatShimWebSite/Controllers/HttpRequestMessage/HttpRequestMessageController.cs
similarity index 100%
rename from test/WebSites/WebApiCompatShimWebSite/Controllers/HttpRequestMessage/HttpRequestMessageController.cs
rename to src/Mvc/test/WebSites/WebApiCompatShimWebSite/Controllers/HttpRequestMessage/HttpRequestMessageController.cs
diff --git a/test/WebSites/WebApiCompatShimWebSite/Controllers/HttpResponseExceptionController.cs b/src/Mvc/test/WebSites/WebApiCompatShimWebSite/Controllers/HttpResponseExceptionController.cs
similarity index 100%
rename from test/WebSites/WebApiCompatShimWebSite/Controllers/HttpResponseExceptionController.cs
rename to src/Mvc/test/WebSites/WebApiCompatShimWebSite/Controllers/HttpResponseExceptionController.cs
diff --git a/test/WebSites/WebApiCompatShimWebSite/Controllers/MvcController.cs b/src/Mvc/test/WebSites/WebApiCompatShimWebSite/Controllers/MvcController.cs
similarity index 100%
rename from test/WebSites/WebApiCompatShimWebSite/Controllers/MvcController.cs
rename to src/Mvc/test/WebSites/WebApiCompatShimWebSite/Controllers/MvcController.cs
diff --git a/test/WebSites/WebApiCompatShimWebSite/Controllers/ParameterBinding/EmployeesController.cs b/src/Mvc/test/WebSites/WebApiCompatShimWebSite/Controllers/ParameterBinding/EmployeesController.cs
similarity index 100%
rename from test/WebSites/WebApiCompatShimWebSite/Controllers/ParameterBinding/EmployeesController.cs
rename to src/Mvc/test/WebSites/WebApiCompatShimWebSite/Controllers/ParameterBinding/EmployeesController.cs
diff --git a/test/WebSites/WebApiCompatShimWebSite/Models/Employee.cs b/src/Mvc/test/WebSites/WebApiCompatShimWebSite/Models/Employee.cs
similarity index 100%
rename from test/WebSites/WebApiCompatShimWebSite/Models/Employee.cs
rename to src/Mvc/test/WebSites/WebApiCompatShimWebSite/Models/Employee.cs
diff --git a/test/WebSites/WebApiCompatShimWebSite/Models/User.cs b/src/Mvc/test/WebSites/WebApiCompatShimWebSite/Models/User.cs
similarity index 100%
rename from test/WebSites/WebApiCompatShimWebSite/Models/User.cs
rename to src/Mvc/test/WebSites/WebApiCompatShimWebSite/Models/User.cs
diff --git a/test/WebSites/WebApiCompatShimWebSite/Models/UserAddress.cs b/src/Mvc/test/WebSites/WebApiCompatShimWebSite/Models/UserAddress.cs
similarity index 100%
rename from test/WebSites/WebApiCompatShimWebSite/Models/UserAddress.cs
rename to src/Mvc/test/WebSites/WebApiCompatShimWebSite/Models/UserAddress.cs
diff --git a/test/WebSites/WebApiCompatShimWebSite/Models/UserKind.cs b/src/Mvc/test/WebSites/WebApiCompatShimWebSite/Models/UserKind.cs
similarity index 100%
rename from test/WebSites/WebApiCompatShimWebSite/Models/UserKind.cs
rename to src/Mvc/test/WebSites/WebApiCompatShimWebSite/Models/UserKind.cs
diff --git a/test/WebSites/WebApiCompatShimWebSite/Startup.cs b/src/Mvc/test/WebSites/WebApiCompatShimWebSite/Startup.cs
similarity index 100%
rename from test/WebSites/WebApiCompatShimWebSite/Startup.cs
rename to src/Mvc/test/WebSites/WebApiCompatShimWebSite/Startup.cs
diff --git a/test/WebSites/WebApiCompatShimWebSite/WebApiCompatShimWebSite.csproj b/src/Mvc/test/WebSites/WebApiCompatShimWebSite/WebApiCompatShimWebSite.csproj
similarity index 100%
rename from test/WebSites/WebApiCompatShimWebSite/WebApiCompatShimWebSite.csproj
rename to src/Mvc/test/WebSites/WebApiCompatShimWebSite/WebApiCompatShimWebSite.csproj
diff --git a/test/WebSites/WebApiCompatShimWebSite/readme.md b/src/Mvc/test/WebSites/WebApiCompatShimWebSite/readme.md
similarity index 100%
rename from test/WebSites/WebApiCompatShimWebSite/readme.md
rename to src/Mvc/test/WebSites/WebApiCompatShimWebSite/readme.md
diff --git a/test/WebSites/XmlFormattersWebSite/Controllers/HomeController.cs b/src/Mvc/test/WebSites/XmlFormattersWebSite/Controllers/HomeController.cs
similarity index 100%
rename from test/WebSites/XmlFormattersWebSite/Controllers/HomeController.cs
rename to src/Mvc/test/WebSites/XmlFormattersWebSite/Controllers/HomeController.cs
diff --git a/test/WebSites/XmlFormattersWebSite/Controllers/IEnumerableController.cs b/src/Mvc/test/WebSites/XmlFormattersWebSite/Controllers/IEnumerableController.cs
similarity index 100%
rename from test/WebSites/XmlFormattersWebSite/Controllers/IEnumerableController.cs
rename to src/Mvc/test/WebSites/XmlFormattersWebSite/Controllers/IEnumerableController.cs
diff --git a/test/WebSites/XmlFormattersWebSite/Controllers/IQueryableController.cs b/src/Mvc/test/WebSites/XmlFormattersWebSite/Controllers/IQueryableController.cs
similarity index 100%
rename from test/WebSites/XmlFormattersWebSite/Controllers/IQueryableController.cs
rename to src/Mvc/test/WebSites/XmlFormattersWebSite/Controllers/IQueryableController.cs
diff --git a/test/WebSites/XmlFormattersWebSite/Controllers/SerializableErrorController.cs b/src/Mvc/test/WebSites/XmlFormattersWebSite/Controllers/SerializableErrorController.cs
similarity index 100%
rename from test/WebSites/XmlFormattersWebSite/Controllers/SerializableErrorController.cs
rename to src/Mvc/test/WebSites/XmlFormattersWebSite/Controllers/SerializableErrorController.cs
diff --git a/test/WebSites/XmlFormattersWebSite/Controllers/ValidationController.cs b/src/Mvc/test/WebSites/XmlFormattersWebSite/Controllers/ValidationController.cs
similarity index 100%
rename from test/WebSites/XmlFormattersWebSite/Controllers/ValidationController.cs
rename to src/Mvc/test/WebSites/XmlFormattersWebSite/Controllers/ValidationController.cs
diff --git a/test/WebSites/XmlFormattersWebSite/Controllers/XmlApiControllerBase.cs b/src/Mvc/test/WebSites/XmlFormattersWebSite/Controllers/XmlApiControllerBase.cs
similarity index 100%
rename from test/WebSites/XmlFormattersWebSite/Controllers/XmlApiControllerBase.cs
rename to src/Mvc/test/WebSites/XmlFormattersWebSite/Controllers/XmlApiControllerBase.cs
diff --git a/test/WebSites/XmlFormattersWebSite/Controllers/XmlDataContractApiController.cs b/src/Mvc/test/WebSites/XmlFormattersWebSite/Controllers/XmlDataContractApiController.cs
similarity index 100%
rename from test/WebSites/XmlFormattersWebSite/Controllers/XmlDataContractApiController.cs
rename to src/Mvc/test/WebSites/XmlFormattersWebSite/Controllers/XmlDataContractApiController.cs
diff --git a/test/WebSites/XmlFormattersWebSite/Controllers/XmlSerializedApiController.cs b/src/Mvc/test/WebSites/XmlFormattersWebSite/Controllers/XmlSerializedApiController.cs
similarity index 100%
rename from test/WebSites/XmlFormattersWebSite/Controllers/XmlSerializedApiController.cs
rename to src/Mvc/test/WebSites/XmlFormattersWebSite/Controllers/XmlSerializedApiController.cs
diff --git a/test/WebSites/XmlFormattersWebSite/Models/Address.cs b/src/Mvc/test/WebSites/XmlFormattersWebSite/Models/Address.cs
similarity index 100%
rename from test/WebSites/XmlFormattersWebSite/Models/Address.cs
rename to src/Mvc/test/WebSites/XmlFormattersWebSite/Models/Address.cs
diff --git a/test/WebSites/XmlFormattersWebSite/Models/DummyClass.cs b/src/Mvc/test/WebSites/XmlFormattersWebSite/Models/DummyClass.cs
similarity index 100%
rename from test/WebSites/XmlFormattersWebSite/Models/DummyClass.cs
rename to src/Mvc/test/WebSites/XmlFormattersWebSite/Models/DummyClass.cs
diff --git a/test/WebSites/XmlFormattersWebSite/Models/Employee.cs b/src/Mvc/test/WebSites/XmlFormattersWebSite/Models/Employee.cs
similarity index 100%
rename from test/WebSites/XmlFormattersWebSite/Models/Employee.cs
rename to src/Mvc/test/WebSites/XmlFormattersWebSite/Models/Employee.cs
diff --git a/test/WebSites/XmlFormattersWebSite/Models/Person.cs b/src/Mvc/test/WebSites/XmlFormattersWebSite/Models/Person.cs
similarity index 100%
rename from test/WebSites/XmlFormattersWebSite/Models/Person.cs
rename to src/Mvc/test/WebSites/XmlFormattersWebSite/Models/Person.cs
diff --git a/test/WebSites/XmlFormattersWebSite/Models/Store.cs b/src/Mvc/test/WebSites/XmlFormattersWebSite/Models/Store.cs
similarity index 100%
rename from test/WebSites/XmlFormattersWebSite/Models/Store.cs
rename to src/Mvc/test/WebSites/XmlFormattersWebSite/Models/Store.cs
diff --git a/test/WebSites/XmlFormattersWebSite/PersonWrapper.cs b/src/Mvc/test/WebSites/XmlFormattersWebSite/PersonWrapper.cs
similarity index 100%
rename from test/WebSites/XmlFormattersWebSite/PersonWrapper.cs
rename to src/Mvc/test/WebSites/XmlFormattersWebSite/PersonWrapper.cs
diff --git a/test/WebSites/XmlFormattersWebSite/PersonWrapperProvider.cs b/src/Mvc/test/WebSites/XmlFormattersWebSite/PersonWrapperProvider.cs
similarity index 100%
rename from test/WebSites/XmlFormattersWebSite/PersonWrapperProvider.cs
rename to src/Mvc/test/WebSites/XmlFormattersWebSite/PersonWrapperProvider.cs
diff --git a/test/WebSites/XmlFormattersWebSite/PersonWrapperProviderFactory.cs b/src/Mvc/test/WebSites/XmlFormattersWebSite/PersonWrapperProviderFactory.cs
similarity index 100%
rename from test/WebSites/XmlFormattersWebSite/PersonWrapperProviderFactory.cs
rename to src/Mvc/test/WebSites/XmlFormattersWebSite/PersonWrapperProviderFactory.cs
diff --git a/test/WebSites/XmlFormattersWebSite/Startup.cs b/src/Mvc/test/WebSites/XmlFormattersWebSite/Startup.cs
similarity index 100%
rename from test/WebSites/XmlFormattersWebSite/Startup.cs
rename to src/Mvc/test/WebSites/XmlFormattersWebSite/Startup.cs
diff --git a/test/WebSites/XmlFormattersWebSite/StartupWith21Compat.cs b/src/Mvc/test/WebSites/XmlFormattersWebSite/StartupWith21Compat.cs
similarity index 100%
rename from test/WebSites/XmlFormattersWebSite/StartupWith21Compat.cs
rename to src/Mvc/test/WebSites/XmlFormattersWebSite/StartupWith21Compat.cs
diff --git a/test/WebSites/XmlFormattersWebSite/XmlFormattersWebSite.csproj b/src/Mvc/test/WebSites/XmlFormattersWebSite/XmlFormattersWebSite.csproj
similarity index 100%
rename from test/WebSites/XmlFormattersWebSite/XmlFormattersWebSite.csproj
rename to src/Mvc/test/WebSites/XmlFormattersWebSite/XmlFormattersWebSite.csproj
diff --git a/test/WebSites/XmlFormattersWebSite/readme.md b/src/Mvc/test/WebSites/XmlFormattersWebSite/readme.md
similarity index 100%
rename from test/WebSites/XmlFormattersWebSite/readme.md
rename to src/Mvc/test/WebSites/XmlFormattersWebSite/readme.md
diff --git a/version.props b/src/Mvc/version.props
similarity index 100%
rename from version.props
rename to src/Mvc/version.props