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 1dfc352a0aea2d584ab6888b07854427f76e7340..0000000000000000000000000000000000000000
--- a/korebuild-lock.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-version:2.1.3-rtm-15802
-commithash:a7c08b45b440a7d2058a0aa1eaa3eb6ba811976a
diff --git a/run.sh b/run.sh
deleted file mode 100755
index 834961fc3a5fecd727170838ce043d604829da6a..0000000000000000000000000000000000000000
--- a/run.sh
+++ /dev/null
@@ -1,231 +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
-repo_path="$DIR"
-channel=''
-tools_source=''
-tools_source_suffix=''
-
-#
-# 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 ""
- 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 [ ! -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
- ;;
- --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
- __warn "$config_file is invalid JSON. Its settings will be ignored."
- 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
- __warn "$config_file is invalid JSON. Its settings will be ignored."
- fi
- else
- __warn 'Missing required command: jq or pyton. Could not parse the JSON file. Its settings will be ignored.'
- fi
-
- [ ! -z "${config_channel:-}" ] && channel="$config_channel"
- [ ! -z "${config_tools_source:-}" ] && tools_source="$config_tools_source"
-fi
-
-[ -z "$channel" ] && channel='dev'
-[ -z "$tools_source" ] && tools_source='https://aspnetcore.blob.core.windows.net/buildtools'
-
-get_korebuild
-set_korebuildsettings "$tools_source" "$DOTNET_HOME" "$repo_path" "$config_file"
-invoke_korebuild_command "$command" "$@"
diff --git a/.gitignore b/src/IISIntegration/.gitignore
similarity index 100%
rename from .gitignore
rename to src/IISIntegration/.gitignore
diff --git a/Directory.Build.props b/src/IISIntegration/Directory.Build.props
similarity index 100%
rename from Directory.Build.props
rename to src/IISIntegration/Directory.Build.props
diff --git a/Directory.Build.targets b/src/IISIntegration/Directory.Build.targets
similarity index 100%
rename from Directory.Build.targets
rename to src/IISIntegration/Directory.Build.targets
diff --git a/IISIntegration.sln b/src/IISIntegration/IISIntegration.sln
similarity index 100%
rename from IISIntegration.sln
rename to src/IISIntegration/IISIntegration.sln
diff --git a/NuGetPackageVerifier.json b/src/IISIntegration/NuGetPackageVerifier.json
similarity index 100%
rename from NuGetPackageVerifier.json
rename to src/IISIntegration/NuGetPackageVerifier.json
diff --git a/README.md b/src/IISIntegration/README.md
similarity index 100%
rename from README.md
rename to src/IISIntegration/README.md
diff --git a/build/Build.Settings b/src/IISIntegration/build/Build.Settings
similarity index 100%
rename from build/Build.Settings
rename to src/IISIntegration/build/Build.Settings
diff --git a/build/Config.Definitions.Props b/src/IISIntegration/build/Config.Definitions.Props
similarity index 100%
rename from build/Config.Definitions.Props
rename to src/IISIntegration/build/Config.Definitions.Props
diff --git a/build/Key.snk b/src/IISIntegration/build/Key.snk
similarity index 100%
rename from build/Key.snk
rename to src/IISIntegration/build/Key.snk
diff --git a/build/applicationhost.config b/src/IISIntegration/build/applicationhost.config
similarity index 100%
rename from build/applicationhost.config
rename to src/IISIntegration/build/applicationhost.config
diff --git a/build/applicationhost.iis.config b/src/IISIntegration/build/applicationhost.iis.config
similarity index 100%
rename from build/applicationhost.iis.config
rename to src/IISIntegration/build/applicationhost.iis.config
diff --git a/build/build.msbuild b/src/IISIntegration/build/build.msbuild
similarity index 100%
rename from build/build.msbuild
rename to src/IISIntegration/build/build.msbuild
diff --git a/build/dependencies.props b/src/IISIntegration/build/dependencies.props
similarity index 100%
rename from build/dependencies.props
rename to src/IISIntegration/build/dependencies.props
diff --git a/build/launchSettings.json b/src/IISIntegration/build/launchSettings.json
similarity index 100%
rename from build/launchSettings.json
rename to src/IISIntegration/build/launchSettings.json
diff --git a/build/native.targets b/src/IISIntegration/build/native.targets
similarity index 100%
rename from build/native.targets
rename to src/IISIntegration/build/native.targets
diff --git a/build/repo.props b/src/IISIntegration/build/repo.props
similarity index 100%
rename from build/repo.props
rename to src/IISIntegration/build/repo.props
diff --git a/build/repo.targets b/src/IISIntegration/build/repo.targets
similarity index 100%
rename from build/repo.targets
rename to src/IISIntegration/build/repo.targets
diff --git a/build/sources.props b/src/IISIntegration/build/sources.props
similarity index 100%
rename from build/sources.props
rename to src/IISIntegration/build/sources.props
diff --git a/build/testsite.props b/src/IISIntegration/build/testsite.props
similarity index 100%
rename from build/testsite.props
rename to src/IISIntegration/build/testsite.props
diff --git a/samples/IISSample/IISSample.csproj b/src/IISIntegration/samples/IISSample/IISSample.csproj
similarity index 100%
rename from samples/IISSample/IISSample.csproj
rename to src/IISIntegration/samples/IISSample/IISSample.csproj
diff --git a/samples/IISSample/Properties/launchSettings.json b/src/IISIntegration/samples/IISSample/Properties/launchSettings.json
similarity index 100%
rename from samples/IISSample/Properties/launchSettings.json
rename to src/IISIntegration/samples/IISSample/Properties/launchSettings.json
diff --git a/samples/IISSample/Startup.cs b/src/IISIntegration/samples/IISSample/Startup.cs
similarity index 100%
rename from samples/IISSample/Startup.cs
rename to src/IISIntegration/samples/IISSample/Startup.cs
diff --git a/samples/IISSample/web.config b/src/IISIntegration/samples/IISSample/web.config
similarity index 100%
rename from samples/IISSample/web.config
rename to src/IISIntegration/samples/IISSample/web.config
diff --git a/samples/NativeIISSample/NativeIISSample.csproj b/src/IISIntegration/samples/NativeIISSample/NativeIISSample.csproj
similarity index 100%
rename from samples/NativeIISSample/NativeIISSample.csproj
rename to src/IISIntegration/samples/NativeIISSample/NativeIISSample.csproj
diff --git a/samples/NativeIISSample/Properties/launchSettings.json b/src/IISIntegration/samples/NativeIISSample/Properties/launchSettings.json
similarity index 100%
rename from samples/NativeIISSample/Properties/launchSettings.json
rename to src/IISIntegration/samples/NativeIISSample/Properties/launchSettings.json
diff --git a/samples/NativeIISSample/Startup.cs b/src/IISIntegration/samples/NativeIISSample/Startup.cs
similarity index 100%
rename from samples/NativeIISSample/Startup.cs
rename to src/IISIntegration/samples/NativeIISSample/Startup.cs
diff --git a/samples/NativeIISSample/web.config b/src/IISIntegration/samples/NativeIISSample/web.config
similarity index 100%
rename from samples/NativeIISSample/web.config
rename to src/IISIntegration/samples/NativeIISSample/web.config
diff --git a/src/AspNetCoreModuleV1/AspNetCore/AspNetCore.vcxproj b/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/AspNetCore.vcxproj
similarity index 100%
rename from src/AspNetCoreModuleV1/AspNetCore/AspNetCore.vcxproj
rename to src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/AspNetCore.vcxproj
diff --git a/src/AspNetCoreModuleV1/AspNetCore/Inc/application.h b/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/application.h
similarity index 100%
rename from src/AspNetCoreModuleV1/AspNetCore/Inc/application.h
rename to src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/application.h
diff --git a/src/AspNetCoreModuleV1/AspNetCore/Inc/applicationmanager.h b/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/applicationmanager.h
similarity index 100%
rename from src/AspNetCoreModuleV1/AspNetCore/Inc/applicationmanager.h
rename to src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/applicationmanager.h
diff --git a/src/AspNetCoreModuleV1/AspNetCore/Inc/aspnetcoreconfig.h b/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/aspnetcoreconfig.h
similarity index 100%
rename from src/AspNetCoreModuleV1/AspNetCore/Inc/aspnetcoreconfig.h
rename to src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/aspnetcoreconfig.h
diff --git a/src/AspNetCoreModuleV1/AspNetCore/Inc/debugutil.h b/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/debugutil.h
similarity index 100%
rename from src/AspNetCoreModuleV1/AspNetCore/Inc/debugutil.h
rename to src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/debugutil.h
diff --git a/src/AspNetCoreModuleV1/AspNetCore/Inc/environmentvariablehash.h b/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/environmentvariablehash.h
similarity index 100%
rename from src/AspNetCoreModuleV1/AspNetCore/Inc/environmentvariablehash.h
rename to src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/environmentvariablehash.h
diff --git a/src/AspNetCoreModuleV1/AspNetCore/Inc/filewatcher.h b/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/filewatcher.h
similarity index 100%
rename from src/AspNetCoreModuleV1/AspNetCore/Inc/filewatcher.h
rename to src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/filewatcher.h
diff --git a/src/AspNetCoreModuleV1/AspNetCore/Inc/forwarderconnection.h b/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/forwarderconnection.h
similarity index 100%
rename from src/AspNetCoreModuleV1/AspNetCore/Inc/forwarderconnection.h
rename to src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/forwarderconnection.h
diff --git a/src/AspNetCoreModuleV1/AspNetCore/Inc/forwardinghandler.h b/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/forwardinghandler.h
similarity index 100%
rename from src/AspNetCoreModuleV1/AspNetCore/Inc/forwardinghandler.h
rename to src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/forwardinghandler.h
diff --git a/src/AspNetCoreModuleV1/AspNetCore/Inc/path.h b/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/path.h
similarity index 100%
rename from src/AspNetCoreModuleV1/AspNetCore/Inc/path.h
rename to src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/path.h
diff --git a/src/AspNetCoreModuleV1/AspNetCore/Inc/processmanager.h b/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/processmanager.h
similarity index 100%
rename from src/AspNetCoreModuleV1/AspNetCore/Inc/processmanager.h
rename to src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/processmanager.h
diff --git a/src/AspNetCoreModuleV1/AspNetCore/Inc/protocolconfig.h b/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/protocolconfig.h
similarity index 100%
rename from src/AspNetCoreModuleV1/AspNetCore/Inc/protocolconfig.h
rename to src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/protocolconfig.h
diff --git a/src/AspNetCoreModuleV1/AspNetCore/Inc/proxymodule.h b/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/proxymodule.h
similarity index 100%
rename from src/AspNetCoreModuleV1/AspNetCore/Inc/proxymodule.h
rename to src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/proxymodule.h
diff --git a/src/AspNetCoreModuleV1/AspNetCore/Inc/resource.h b/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/resource.h
similarity index 100%
rename from src/AspNetCoreModuleV1/AspNetCore/Inc/resource.h
rename to src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/resource.h
diff --git a/src/AspNetCoreModuleV1/AspNetCore/Inc/responseheaderhash.h b/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/responseheaderhash.h
similarity index 100%
rename from src/AspNetCoreModuleV1/AspNetCore/Inc/responseheaderhash.h
rename to src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/responseheaderhash.h
diff --git a/src/AspNetCoreModuleV1/AspNetCore/Inc/serverprocess.h b/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/serverprocess.h
similarity index 100%
rename from src/AspNetCoreModuleV1/AspNetCore/Inc/serverprocess.h
rename to src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/serverprocess.h
diff --git a/src/AspNetCoreModuleV1/AspNetCore/Inc/sttimer.h b/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/sttimer.h
similarity index 100%
rename from src/AspNetCoreModuleV1/AspNetCore/Inc/sttimer.h
rename to src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/sttimer.h
diff --git a/src/AspNetCoreModuleV1/AspNetCore/Inc/websockethandler.h b/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/websockethandler.h
similarity index 100%
rename from src/AspNetCoreModuleV1/AspNetCore/Inc/websockethandler.h
rename to src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/websockethandler.h
diff --git a/src/AspNetCoreModuleV1/AspNetCore/Inc/winhttphelper.h b/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/winhttphelper.h
similarity index 100%
rename from src/AspNetCoreModuleV1/AspNetCore/Inc/winhttphelper.h
rename to src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Inc/winhttphelper.h
diff --git a/src/AspNetCoreModuleV1/AspNetCore/Source.def b/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Source.def
similarity index 100%
rename from src/AspNetCoreModuleV1/AspNetCore/Source.def
rename to src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/Source.def
diff --git a/src/AspNetCoreModuleV1/AspNetCore/aspnetcore_msg.mc b/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/aspnetcore_msg.mc
similarity index 100%
rename from src/AspNetCoreModuleV1/AspNetCore/aspnetcore_msg.mc
rename to src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/aspnetcore_msg.mc
diff --git a/src/AspNetCoreModuleV1/AspNetCore/aspnetcore_schema.xml b/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/aspnetcore_schema.xml
similarity index 100%
rename from src/AspNetCoreModuleV1/AspNetCore/aspnetcore_schema.xml
rename to src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/aspnetcore_schema.xml
diff --git a/src/AspNetCoreModuleV1/AspNetCore/aspnetcoremodule.rc b/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/aspnetcoremodule.rc
similarity index 100%
rename from src/AspNetCoreModuleV1/AspNetCore/aspnetcoremodule.rc
rename to src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/aspnetcoremodule.rc
diff --git a/src/AspNetCoreModuleV1/AspNetCore/resource.h b/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/resource.h
similarity index 100%
rename from src/AspNetCoreModuleV1/AspNetCore/resource.h
rename to src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/resource.h
diff --git a/src/AspNetCoreModuleV1/AspNetCore/src/application.cxx b/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/application.cxx
similarity index 100%
rename from src/AspNetCoreModuleV1/AspNetCore/src/application.cxx
rename to src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/application.cxx
diff --git a/src/AspNetCoreModuleV1/AspNetCore/src/applicationmanager.cxx b/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/applicationmanager.cxx
similarity index 100%
rename from src/AspNetCoreModuleV1/AspNetCore/src/applicationmanager.cxx
rename to src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/applicationmanager.cxx
diff --git a/src/AspNetCoreModuleV1/AspNetCore/src/aspnetcoreconfig.cxx b/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/aspnetcoreconfig.cxx
similarity index 100%
rename from src/AspNetCoreModuleV1/AspNetCore/src/aspnetcoreconfig.cxx
rename to src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/aspnetcoreconfig.cxx
diff --git a/src/AspNetCoreModuleV1/AspNetCore/src/filewatcher.cxx b/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/filewatcher.cxx
similarity index 100%
rename from src/AspNetCoreModuleV1/AspNetCore/src/filewatcher.cxx
rename to src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/filewatcher.cxx
diff --git a/src/AspNetCoreModuleV1/AspNetCore/src/forwarderconnection.cxx b/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/forwarderconnection.cxx
similarity index 100%
rename from src/AspNetCoreModuleV1/AspNetCore/src/forwarderconnection.cxx
rename to src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/forwarderconnection.cxx
diff --git a/src/AspNetCoreModuleV1/AspNetCore/src/forwardinghandler.cxx b/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/forwardinghandler.cxx
similarity index 100%
rename from src/AspNetCoreModuleV1/AspNetCore/src/forwardinghandler.cxx
rename to src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/forwardinghandler.cxx
diff --git a/src/AspNetCoreModuleV1/AspNetCore/src/main.cxx b/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/main.cxx
similarity index 100%
rename from src/AspNetCoreModuleV1/AspNetCore/src/main.cxx
rename to src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/main.cxx
diff --git a/src/AspNetCoreModuleV1/AspNetCore/src/path.cxx b/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/path.cxx
similarity index 100%
rename from src/AspNetCoreModuleV1/AspNetCore/src/path.cxx
rename to src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/path.cxx
diff --git a/src/AspNetCoreModuleV1/AspNetCore/src/precomp.hxx b/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/precomp.hxx
similarity index 100%
rename from src/AspNetCoreModuleV1/AspNetCore/src/precomp.hxx
rename to src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/precomp.hxx
diff --git a/src/AspNetCoreModuleV1/AspNetCore/src/processmanager.cxx b/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/processmanager.cxx
similarity index 100%
rename from src/AspNetCoreModuleV1/AspNetCore/src/processmanager.cxx
rename to src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/processmanager.cxx
diff --git a/src/AspNetCoreModuleV1/AspNetCore/src/protocolconfig.cxx b/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/protocolconfig.cxx
similarity index 100%
rename from src/AspNetCoreModuleV1/AspNetCore/src/protocolconfig.cxx
rename to src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/protocolconfig.cxx
diff --git a/src/AspNetCoreModuleV1/AspNetCore/src/proxymodule.cxx b/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/proxymodule.cxx
similarity index 100%
rename from src/AspNetCoreModuleV1/AspNetCore/src/proxymodule.cxx
rename to src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/proxymodule.cxx
diff --git a/src/AspNetCoreModuleV1/AspNetCore/src/responseheaderhash.cxx b/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/responseheaderhash.cxx
similarity index 100%
rename from src/AspNetCoreModuleV1/AspNetCore/src/responseheaderhash.cxx
rename to src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/responseheaderhash.cxx
diff --git a/src/AspNetCoreModuleV1/AspNetCore/src/serverprocess.cxx b/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/serverprocess.cxx
similarity index 100%
rename from src/AspNetCoreModuleV1/AspNetCore/src/serverprocess.cxx
rename to src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/serverprocess.cxx
diff --git a/src/AspNetCoreModuleV1/AspNetCore/src/websockethandler.cxx b/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/websockethandler.cxx
similarity index 100%
rename from src/AspNetCoreModuleV1/AspNetCore/src/websockethandler.cxx
rename to src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/websockethandler.cxx
diff --git a/src/AspNetCoreModuleV1/AspNetCore/src/winhttphelper.cxx b/src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/winhttphelper.cxx
similarity index 100%
rename from src/AspNetCoreModuleV1/AspNetCore/src/winhttphelper.cxx
rename to src/IISIntegration/src/AspNetCoreModuleV1/AspNetCore/src/winhttphelper.cxx
diff --git a/src/AspNetCoreModuleV1/IISLib/IISLib.vcxproj b/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/IISLib.vcxproj
similarity index 100%
rename from src/AspNetCoreModuleV1/IISLib/IISLib.vcxproj
rename to src/IISIntegration/src/AspNetCoreModuleV1/IISLib/IISLib.vcxproj
diff --git a/src/AspNetCoreModuleV1/IISLib/acache.cxx b/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/acache.cxx
similarity index 100%
rename from src/AspNetCoreModuleV1/IISLib/acache.cxx
rename to src/IISIntegration/src/AspNetCoreModuleV1/IISLib/acache.cxx
diff --git a/src/AspNetCoreModuleV1/IISLib/acache.h b/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/acache.h
similarity index 100%
rename from src/AspNetCoreModuleV1/IISLib/acache.h
rename to src/IISIntegration/src/AspNetCoreModuleV1/IISLib/acache.h
diff --git a/src/AspNetCoreModuleV1/IISLib/ahutil.cpp b/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/ahutil.cpp
similarity index 100%
rename from src/AspNetCoreModuleV1/IISLib/ahutil.cpp
rename to src/IISIntegration/src/AspNetCoreModuleV1/IISLib/ahutil.cpp
diff --git a/src/AspNetCoreModuleV1/IISLib/ahutil.h b/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/ahutil.h
similarity index 100%
rename from src/AspNetCoreModuleV1/IISLib/ahutil.h
rename to src/IISIntegration/src/AspNetCoreModuleV1/IISLib/ahutil.h
diff --git a/src/AspNetCoreModuleV1/IISLib/base64.cpp b/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/base64.cpp
similarity index 100%
rename from src/AspNetCoreModuleV1/IISLib/base64.cpp
rename to src/IISIntegration/src/AspNetCoreModuleV1/IISLib/base64.cpp
diff --git a/src/AspNetCoreModuleV1/IISLib/base64.h b/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/base64.h
similarity index 100%
rename from src/AspNetCoreModuleV1/IISLib/base64.h
rename to src/IISIntegration/src/AspNetCoreModuleV1/IISLib/base64.h
diff --git a/src/AspNetCoreModuleV1/IISLib/buffer.h b/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/buffer.h
similarity index 100%
rename from src/AspNetCoreModuleV1/IISLib/buffer.h
rename to src/IISIntegration/src/AspNetCoreModuleV1/IISLib/buffer.h
diff --git a/src/AspNetCoreModuleV1/IISLib/datetime.h b/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/datetime.h
similarity index 100%
rename from src/AspNetCoreModuleV1/IISLib/datetime.h
rename to src/IISIntegration/src/AspNetCoreModuleV1/IISLib/datetime.h
diff --git a/src/AspNetCoreModuleV1/IISLib/dbgutil.h b/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/dbgutil.h
similarity index 100%
rename from src/AspNetCoreModuleV1/IISLib/dbgutil.h
rename to src/IISIntegration/src/AspNetCoreModuleV1/IISLib/dbgutil.h
diff --git a/src/AspNetCoreModuleV1/IISLib/hashfn.h b/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/hashfn.h
similarity index 100%
rename from src/AspNetCoreModuleV1/IISLib/hashfn.h
rename to src/IISIntegration/src/AspNetCoreModuleV1/IISLib/hashfn.h
diff --git a/src/AspNetCoreModuleV1/IISLib/hashtable.h b/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/hashtable.h
similarity index 100%
rename from src/AspNetCoreModuleV1/IISLib/hashtable.h
rename to src/IISIntegration/src/AspNetCoreModuleV1/IISLib/hashtable.h
diff --git a/src/AspNetCoreModuleV1/IISLib/listentry.h b/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/listentry.h
similarity index 100%
rename from src/AspNetCoreModuleV1/IISLib/listentry.h
rename to src/IISIntegration/src/AspNetCoreModuleV1/IISLib/listentry.h
diff --git a/src/AspNetCoreModuleV1/IISLib/macros.h b/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/macros.h
similarity index 100%
rename from src/AspNetCoreModuleV1/IISLib/macros.h
rename to src/IISIntegration/src/AspNetCoreModuleV1/IISLib/macros.h
diff --git a/src/AspNetCoreModuleV1/IISLib/multisz.cpp b/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/multisz.cpp
similarity index 100%
rename from src/AspNetCoreModuleV1/IISLib/multisz.cpp
rename to src/IISIntegration/src/AspNetCoreModuleV1/IISLib/multisz.cpp
diff --git a/src/AspNetCoreModuleV1/IISLib/multisz.h b/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/multisz.h
similarity index 100%
rename from src/AspNetCoreModuleV1/IISLib/multisz.h
rename to src/IISIntegration/src/AspNetCoreModuleV1/IISLib/multisz.h
diff --git a/src/AspNetCoreModuleV1/IISLib/multisza.cpp b/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/multisza.cpp
similarity index 100%
rename from src/AspNetCoreModuleV1/IISLib/multisza.cpp
rename to src/IISIntegration/src/AspNetCoreModuleV1/IISLib/multisza.cpp
diff --git a/src/AspNetCoreModuleV1/IISLib/multisza.h b/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/multisza.h
similarity index 100%
rename from src/AspNetCoreModuleV1/IISLib/multisza.h
rename to src/IISIntegration/src/AspNetCoreModuleV1/IISLib/multisza.h
diff --git a/src/AspNetCoreModuleV1/IISLib/ntassert.h b/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/ntassert.h
similarity index 100%
rename from src/AspNetCoreModuleV1/IISLib/ntassert.h
rename to src/IISIntegration/src/AspNetCoreModuleV1/IISLib/ntassert.h
diff --git a/src/AspNetCoreModuleV1/IISLib/percpu.h b/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/percpu.h
similarity index 100%
rename from src/AspNetCoreModuleV1/IISLib/percpu.h
rename to src/IISIntegration/src/AspNetCoreModuleV1/IISLib/percpu.h
diff --git a/src/AspNetCoreModuleV1/IISLib/precomp.h b/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/precomp.h
similarity index 100%
rename from src/AspNetCoreModuleV1/IISLib/precomp.h
rename to src/IISIntegration/src/AspNetCoreModuleV1/IISLib/precomp.h
diff --git a/src/AspNetCoreModuleV1/IISLib/prime.h b/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/prime.h
similarity index 100%
rename from src/AspNetCoreModuleV1/IISLib/prime.h
rename to src/IISIntegration/src/AspNetCoreModuleV1/IISLib/prime.h
diff --git a/src/AspNetCoreModuleV1/IISLib/pudebug.h b/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/pudebug.h
similarity index 100%
rename from src/AspNetCoreModuleV1/IISLib/pudebug.h
rename to src/IISIntegration/src/AspNetCoreModuleV1/IISLib/pudebug.h
diff --git a/src/AspNetCoreModuleV1/IISLib/reftrace.c b/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/reftrace.c
similarity index 100%
rename from src/AspNetCoreModuleV1/IISLib/reftrace.c
rename to src/IISIntegration/src/AspNetCoreModuleV1/IISLib/reftrace.c
diff --git a/src/AspNetCoreModuleV1/IISLib/reftrace.h b/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/reftrace.h
similarity index 100%
rename from src/AspNetCoreModuleV1/IISLib/reftrace.h
rename to src/IISIntegration/src/AspNetCoreModuleV1/IISLib/reftrace.h
diff --git a/src/AspNetCoreModuleV1/IISLib/rwlock.h b/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/rwlock.h
similarity index 100%
rename from src/AspNetCoreModuleV1/IISLib/rwlock.h
rename to src/IISIntegration/src/AspNetCoreModuleV1/IISLib/rwlock.h
diff --git a/src/AspNetCoreModuleV1/IISLib/stringa.cpp b/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/stringa.cpp
similarity index 100%
rename from src/AspNetCoreModuleV1/IISLib/stringa.cpp
rename to src/IISIntegration/src/AspNetCoreModuleV1/IISLib/stringa.cpp
diff --git a/src/AspNetCoreModuleV1/IISLib/stringa.h b/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/stringa.h
similarity index 100%
rename from src/AspNetCoreModuleV1/IISLib/stringa.h
rename to src/IISIntegration/src/AspNetCoreModuleV1/IISLib/stringa.h
diff --git a/src/AspNetCoreModuleV1/IISLib/stringu.cpp b/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/stringu.cpp
similarity index 100%
rename from src/AspNetCoreModuleV1/IISLib/stringu.cpp
rename to src/IISIntegration/src/AspNetCoreModuleV1/IISLib/stringu.cpp
diff --git a/src/AspNetCoreModuleV1/IISLib/stringu.h b/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/stringu.h
similarity index 100%
rename from src/AspNetCoreModuleV1/IISLib/stringu.h
rename to src/IISIntegration/src/AspNetCoreModuleV1/IISLib/stringu.h
diff --git a/src/AspNetCoreModuleV1/IISLib/tracelog.c b/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/tracelog.c
similarity index 100%
rename from src/AspNetCoreModuleV1/IISLib/tracelog.c
rename to src/IISIntegration/src/AspNetCoreModuleV1/IISLib/tracelog.c
diff --git a/src/AspNetCoreModuleV1/IISLib/tracelog.h b/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/tracelog.h
similarity index 100%
rename from src/AspNetCoreModuleV1/IISLib/tracelog.h
rename to src/IISIntegration/src/AspNetCoreModuleV1/IISLib/tracelog.h
diff --git a/src/AspNetCoreModuleV1/IISLib/treehash.h b/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/treehash.h
similarity index 100%
rename from src/AspNetCoreModuleV1/IISLib/treehash.h
rename to src/IISIntegration/src/AspNetCoreModuleV1/IISLib/treehash.h
diff --git a/src/AspNetCoreModuleV1/IISLib/util.cxx b/src/IISIntegration/src/AspNetCoreModuleV1/IISLib/util.cxx
similarity index 100%
rename from src/AspNetCoreModuleV1/IISLib/util.cxx
rename to src/IISIntegration/src/AspNetCoreModuleV1/IISLib/util.cxx
diff --git a/src/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj b/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj
similarity index 100%
rename from src/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj
rename to src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/AspNetCore.vcxproj
diff --git a/src/AspNetCoreModuleV2/AspNetCore/Inc/applicationinfo.h b/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/Inc/applicationinfo.h
similarity index 100%
rename from src/AspNetCoreModuleV2/AspNetCore/Inc/applicationinfo.h
rename to src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/Inc/applicationinfo.h
diff --git a/src/AspNetCoreModuleV2/AspNetCore/Inc/applicationmanager.h b/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/Inc/applicationmanager.h
similarity index 100%
rename from src/AspNetCoreModuleV2/AspNetCore/Inc/applicationmanager.h
rename to src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/Inc/applicationmanager.h
diff --git a/src/AspNetCoreModuleV2/AspNetCore/Inc/appoffline.h b/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/Inc/appoffline.h
similarity index 100%
rename from src/AspNetCoreModuleV2/AspNetCore/Inc/appoffline.h
rename to src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/Inc/appoffline.h
diff --git a/src/AspNetCoreModuleV2/AspNetCore/Inc/filewatcher.h b/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/Inc/filewatcher.h
similarity index 100%
rename from src/AspNetCoreModuleV2/AspNetCore/Inc/filewatcher.h
rename to src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/Inc/filewatcher.h
diff --git a/src/AspNetCoreModuleV2/AspNetCore/Inc/fx_ver.h b/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/Inc/fx_ver.h
similarity index 100%
rename from src/AspNetCoreModuleV2/AspNetCore/Inc/fx_ver.h
rename to src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/Inc/fx_ver.h
diff --git a/src/AspNetCoreModuleV2/AspNetCore/Inc/globalmodule.h b/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/Inc/globalmodule.h
similarity index 100%
rename from src/AspNetCoreModuleV2/AspNetCore/Inc/globalmodule.h
rename to src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/Inc/globalmodule.h
diff --git a/src/AspNetCoreModuleV2/AspNetCore/Inc/proxymodule.h b/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/Inc/proxymodule.h
similarity index 100%
rename from src/AspNetCoreModuleV2/AspNetCore/Inc/proxymodule.h
rename to src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/Inc/proxymodule.h
diff --git a/src/AspNetCoreModuleV2/AspNetCore/Source.def b/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/Source.def
similarity index 100%
rename from src/AspNetCoreModuleV2/AspNetCore/Source.def
rename to src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/Source.def
diff --git a/src/AspNetCoreModuleV2/AspNetCore/ancm.mof b/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/ancm.mof
similarity index 100%
rename from src/AspNetCoreModuleV2/AspNetCore/ancm.mof
rename to src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/ancm.mof
diff --git a/src/AspNetCoreModuleV2/AspNetCore/aspnetcore_schema.xml b/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/aspnetcore_schema.xml
similarity index 100%
rename from src/AspNetCoreModuleV2/AspNetCore/aspnetcore_schema.xml
rename to src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/aspnetcore_schema.xml
diff --git a/src/AspNetCoreModuleV2/AspNetCore/aspnetcoremodule.rc b/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/aspnetcoremodule.rc
similarity index 100%
rename from src/AspNetCoreModuleV2/AspNetCore/aspnetcoremodule.rc
rename to src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/aspnetcoremodule.rc
diff --git a/src/AspNetCoreModuleV2/AspNetCore/src/applicationinfo.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/src/applicationinfo.cpp
similarity index 100%
rename from src/AspNetCoreModuleV2/AspNetCore/src/applicationinfo.cpp
rename to src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/src/applicationinfo.cpp
diff --git a/src/AspNetCoreModuleV2/AspNetCore/src/applicationmanager.cxx b/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/src/applicationmanager.cxx
similarity index 100%
rename from src/AspNetCoreModuleV2/AspNetCore/src/applicationmanager.cxx
rename to src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/src/applicationmanager.cxx
diff --git a/src/AspNetCoreModuleV2/AspNetCore/src/dllmain.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/src/dllmain.cpp
similarity index 100%
rename from src/AspNetCoreModuleV2/AspNetCore/src/dllmain.cpp
rename to src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/src/dllmain.cpp
diff --git a/src/AspNetCoreModuleV2/AspNetCore/src/filewatcher.cxx b/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/src/filewatcher.cxx
similarity index 100%
rename from src/AspNetCoreModuleV2/AspNetCore/src/filewatcher.cxx
rename to src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/src/filewatcher.cxx
diff --git a/src/AspNetCoreModuleV2/AspNetCore/src/globalmodule.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/src/globalmodule.cpp
similarity index 100%
rename from src/AspNetCoreModuleV2/AspNetCore/src/globalmodule.cpp
rename to src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/src/globalmodule.cpp
diff --git a/src/AspNetCoreModuleV2/AspNetCore/src/precomp.hxx b/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/src/precomp.hxx
similarity index 100%
rename from src/AspNetCoreModuleV2/AspNetCore/src/precomp.hxx
rename to src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/src/precomp.hxx
diff --git a/src/AspNetCoreModuleV2/AspNetCore/src/proxymodule.cxx b/src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/src/proxymodule.cxx
similarity index 100%
rename from src/AspNetCoreModuleV2/AspNetCore/src/proxymodule.cxx
rename to src/IISIntegration/src/AspNetCoreModuleV2/AspNetCore/src/proxymodule.cxx
diff --git a/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj
similarity index 100%
rename from src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj
rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj
diff --git a/src/AspNetCoreModuleV2/CommonLib/SRWLockWrapper.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/SRWLockWrapper.cpp
similarity index 100%
rename from src/AspNetCoreModuleV2/CommonLib/SRWLockWrapper.cpp
rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/SRWLockWrapper.cpp
diff --git a/src/AspNetCoreModuleV2/CommonLib/SRWLockWrapper.h b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/SRWLockWrapper.h
similarity index 100%
rename from src/AspNetCoreModuleV2/CommonLib/SRWLockWrapper.h
rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/SRWLockWrapper.h
diff --git a/src/AspNetCoreModuleV2/CommonLib/application.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/application.cpp
similarity index 100%
rename from src/AspNetCoreModuleV2/CommonLib/application.cpp
rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/application.cpp
diff --git a/src/AspNetCoreModuleV2/CommonLib/application.h b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/application.h
similarity index 100%
rename from src/AspNetCoreModuleV2/CommonLib/application.h
rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/application.h
diff --git a/src/AspNetCoreModuleV2/CommonLib/aspnetcore_msg.mc b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/aspnetcore_msg.mc
similarity index 100%
rename from src/AspNetCoreModuleV2/CommonLib/aspnetcore_msg.mc
rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/aspnetcore_msg.mc
diff --git a/src/AspNetCoreModuleV2/CommonLib/aspnetcore_msg.rc b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/aspnetcore_msg.rc
similarity index 100%
rename from src/AspNetCoreModuleV2/CommonLib/aspnetcore_msg.rc
rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/aspnetcore_msg.rc
diff --git a/src/AspNetCoreModuleV2/CommonLib/aspnetcoreconfig.cxx b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/aspnetcoreconfig.cxx
similarity index 100%
rename from src/AspNetCoreModuleV2/CommonLib/aspnetcoreconfig.cxx
rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/aspnetcoreconfig.cxx
diff --git a/src/AspNetCoreModuleV2/CommonLib/aspnetcoreconfig.h b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/aspnetcoreconfig.h
similarity index 100%
rename from src/AspNetCoreModuleV2/CommonLib/aspnetcoreconfig.h
rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/aspnetcoreconfig.h
diff --git a/src/AspNetCoreModuleV2/CommonLib/debugutil.h b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/debugutil.h
similarity index 100%
rename from src/AspNetCoreModuleV2/CommonLib/debugutil.h
rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/debugutil.h
diff --git a/src/AspNetCoreModuleV2/CommonLib/environmentvariablehash.h b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/environmentvariablehash.h
similarity index 100%
rename from src/AspNetCoreModuleV2/CommonLib/environmentvariablehash.h
rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/environmentvariablehash.h
diff --git a/src/AspNetCoreModuleV2/CommonLib/fx_ver.cxx b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/fx_ver.cxx
similarity index 100%
rename from src/AspNetCoreModuleV2/CommonLib/fx_ver.cxx
rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/fx_ver.cxx
diff --git a/src/AspNetCoreModuleV2/CommonLib/fx_ver.h b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/fx_ver.h
similarity index 100%
rename from src/AspNetCoreModuleV2/CommonLib/fx_ver.h
rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/fx_ver.h
diff --git a/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.cpp
similarity index 100%
rename from src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.cpp
rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.cpp
diff --git a/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.h b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.h
similarity index 100%
rename from src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.h
rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/hostfxr_utility.h
diff --git a/src/AspNetCoreModuleV2/CommonLib/requesthandler.cxx b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/requesthandler.cxx
similarity index 100%
rename from src/AspNetCoreModuleV2/CommonLib/requesthandler.cxx
rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/requesthandler.cxx
diff --git a/src/AspNetCoreModuleV2/CommonLib/requesthandler.h b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/requesthandler.h
similarity index 100%
rename from src/AspNetCoreModuleV2/CommonLib/requesthandler.h
rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/requesthandler.h
diff --git a/src/AspNetCoreModuleV2/CommonLib/resources.h b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/resources.h
similarity index 100%
rename from src/AspNetCoreModuleV2/CommonLib/resources.h
rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/resources.h
diff --git a/src/AspNetCoreModuleV2/CommonLib/stdafx.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/stdafx.cpp
similarity index 100%
rename from src/AspNetCoreModuleV2/CommonLib/stdafx.cpp
rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/stdafx.cpp
diff --git a/src/AspNetCoreModuleV2/CommonLib/stdafx.h b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/stdafx.h
similarity index 100%
rename from src/AspNetCoreModuleV2/CommonLib/stdafx.h
rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/stdafx.h
diff --git a/src/AspNetCoreModuleV2/CommonLib/targetver.h b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/targetver.h
similarity index 100%
rename from src/AspNetCoreModuleV2/CommonLib/targetver.h
rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/targetver.h
diff --git a/src/AspNetCoreModuleV2/CommonLib/utility.cxx b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/utility.cxx
similarity index 100%
rename from src/AspNetCoreModuleV2/CommonLib/utility.cxx
rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/utility.cxx
diff --git a/src/AspNetCoreModuleV2/CommonLib/utility.h b/src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/utility.h
similarity index 100%
rename from src/AspNetCoreModuleV2/CommonLib/utility.h
rename to src/IISIntegration/src/AspNetCoreModuleV2/CommonLib/utility.h
diff --git a/src/AspNetCoreModuleV2/IISLib/IISLib.vcxproj b/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/IISLib.vcxproj
similarity index 100%
rename from src/AspNetCoreModuleV2/IISLib/IISLib.vcxproj
rename to src/IISIntegration/src/AspNetCoreModuleV2/IISLib/IISLib.vcxproj
diff --git a/src/AspNetCoreModuleV2/IISLib/acache.cxx b/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/acache.cxx
similarity index 100%
rename from src/AspNetCoreModuleV2/IISLib/acache.cxx
rename to src/IISIntegration/src/AspNetCoreModuleV2/IISLib/acache.cxx
diff --git a/src/AspNetCoreModuleV2/IISLib/acache.h b/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/acache.h
similarity index 100%
rename from src/AspNetCoreModuleV2/IISLib/acache.h
rename to src/IISIntegration/src/AspNetCoreModuleV2/IISLib/acache.h
diff --git a/src/AspNetCoreModuleV2/IISLib/ahutil.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/ahutil.cpp
similarity index 100%
rename from src/AspNetCoreModuleV2/IISLib/ahutil.cpp
rename to src/IISIntegration/src/AspNetCoreModuleV2/IISLib/ahutil.cpp
diff --git a/src/AspNetCoreModuleV2/IISLib/ahutil.h b/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/ahutil.h
similarity index 100%
rename from src/AspNetCoreModuleV2/IISLib/ahutil.h
rename to src/IISIntegration/src/AspNetCoreModuleV2/IISLib/ahutil.h
diff --git a/src/AspNetCoreModuleV2/IISLib/base64.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/base64.cpp
similarity index 100%
rename from src/AspNetCoreModuleV2/IISLib/base64.cpp
rename to src/IISIntegration/src/AspNetCoreModuleV2/IISLib/base64.cpp
diff --git a/src/AspNetCoreModuleV2/IISLib/base64.h b/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/base64.h
similarity index 100%
rename from src/AspNetCoreModuleV2/IISLib/base64.h
rename to src/IISIntegration/src/AspNetCoreModuleV2/IISLib/base64.h
diff --git a/src/AspNetCoreModuleV2/IISLib/buffer.h b/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/buffer.h
similarity index 100%
rename from src/AspNetCoreModuleV2/IISLib/buffer.h
rename to src/IISIntegration/src/AspNetCoreModuleV2/IISLib/buffer.h
diff --git a/src/AspNetCoreModuleV2/IISLib/datetime.h b/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/datetime.h
similarity index 100%
rename from src/AspNetCoreModuleV2/IISLib/datetime.h
rename to src/IISIntegration/src/AspNetCoreModuleV2/IISLib/datetime.h
diff --git a/src/AspNetCoreModuleV2/IISLib/dbgutil.h b/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/dbgutil.h
similarity index 100%
rename from src/AspNetCoreModuleV2/IISLib/dbgutil.h
rename to src/IISIntegration/src/AspNetCoreModuleV2/IISLib/dbgutil.h
diff --git a/src/AspNetCoreModuleV2/IISLib/hashfn.h b/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/hashfn.h
similarity index 100%
rename from src/AspNetCoreModuleV2/IISLib/hashfn.h
rename to src/IISIntegration/src/AspNetCoreModuleV2/IISLib/hashfn.h
diff --git a/src/AspNetCoreModuleV2/IISLib/hashtable.h b/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/hashtable.h
similarity index 100%
rename from src/AspNetCoreModuleV2/IISLib/hashtable.h
rename to src/IISIntegration/src/AspNetCoreModuleV2/IISLib/hashtable.h
diff --git a/src/AspNetCoreModuleV2/IISLib/listentry.h b/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/listentry.h
similarity index 100%
rename from src/AspNetCoreModuleV2/IISLib/listentry.h
rename to src/IISIntegration/src/AspNetCoreModuleV2/IISLib/listentry.h
diff --git a/src/AspNetCoreModuleV2/IISLib/macros.h b/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/macros.h
similarity index 100%
rename from src/AspNetCoreModuleV2/IISLib/macros.h
rename to src/IISIntegration/src/AspNetCoreModuleV2/IISLib/macros.h
diff --git a/src/AspNetCoreModuleV2/IISLib/multisz.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/multisz.cpp
similarity index 100%
rename from src/AspNetCoreModuleV2/IISLib/multisz.cpp
rename to src/IISIntegration/src/AspNetCoreModuleV2/IISLib/multisz.cpp
diff --git a/src/AspNetCoreModuleV2/IISLib/multisz.h b/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/multisz.h
similarity index 100%
rename from src/AspNetCoreModuleV2/IISLib/multisz.h
rename to src/IISIntegration/src/AspNetCoreModuleV2/IISLib/multisz.h
diff --git a/src/AspNetCoreModuleV2/IISLib/multisza.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/multisza.cpp
similarity index 100%
rename from src/AspNetCoreModuleV2/IISLib/multisza.cpp
rename to src/IISIntegration/src/AspNetCoreModuleV2/IISLib/multisza.cpp
diff --git a/src/AspNetCoreModuleV2/IISLib/multisza.h b/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/multisza.h
similarity index 100%
rename from src/AspNetCoreModuleV2/IISLib/multisza.h
rename to src/IISIntegration/src/AspNetCoreModuleV2/IISLib/multisza.h
diff --git a/src/AspNetCoreModuleV2/IISLib/ntassert.h b/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/ntassert.h
similarity index 100%
rename from src/AspNetCoreModuleV2/IISLib/ntassert.h
rename to src/IISIntegration/src/AspNetCoreModuleV2/IISLib/ntassert.h
diff --git a/src/AspNetCoreModuleV2/IISLib/percpu.h b/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/percpu.h
similarity index 100%
rename from src/AspNetCoreModuleV2/IISLib/percpu.h
rename to src/IISIntegration/src/AspNetCoreModuleV2/IISLib/percpu.h
diff --git a/src/AspNetCoreModuleV2/IISLib/precomp.h b/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/precomp.h
similarity index 100%
rename from src/AspNetCoreModuleV2/IISLib/precomp.h
rename to src/IISIntegration/src/AspNetCoreModuleV2/IISLib/precomp.h
diff --git a/src/AspNetCoreModuleV2/IISLib/prime.h b/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/prime.h
similarity index 100%
rename from src/AspNetCoreModuleV2/IISLib/prime.h
rename to src/IISIntegration/src/AspNetCoreModuleV2/IISLib/prime.h
diff --git a/src/AspNetCoreModuleV2/IISLib/pudebug.h b/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/pudebug.h
similarity index 100%
rename from src/AspNetCoreModuleV2/IISLib/pudebug.h
rename to src/IISIntegration/src/AspNetCoreModuleV2/IISLib/pudebug.h
diff --git a/src/AspNetCoreModuleV2/IISLib/reftrace.c b/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/reftrace.c
similarity index 100%
rename from src/AspNetCoreModuleV2/IISLib/reftrace.c
rename to src/IISIntegration/src/AspNetCoreModuleV2/IISLib/reftrace.c
diff --git a/src/AspNetCoreModuleV2/IISLib/reftrace.h b/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/reftrace.h
similarity index 100%
rename from src/AspNetCoreModuleV2/IISLib/reftrace.h
rename to src/IISIntegration/src/AspNetCoreModuleV2/IISLib/reftrace.h
diff --git a/src/AspNetCoreModuleV2/IISLib/rwlock.h b/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/rwlock.h
similarity index 100%
rename from src/AspNetCoreModuleV2/IISLib/rwlock.h
rename to src/IISIntegration/src/AspNetCoreModuleV2/IISLib/rwlock.h
diff --git a/src/AspNetCoreModuleV2/IISLib/stringa.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/stringa.cpp
similarity index 100%
rename from src/AspNetCoreModuleV2/IISLib/stringa.cpp
rename to src/IISIntegration/src/AspNetCoreModuleV2/IISLib/stringa.cpp
diff --git a/src/AspNetCoreModuleV2/IISLib/stringa.h b/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/stringa.h
similarity index 100%
rename from src/AspNetCoreModuleV2/IISLib/stringa.h
rename to src/IISIntegration/src/AspNetCoreModuleV2/IISLib/stringa.h
diff --git a/src/AspNetCoreModuleV2/IISLib/stringu.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/stringu.cpp
similarity index 100%
rename from src/AspNetCoreModuleV2/IISLib/stringu.cpp
rename to src/IISIntegration/src/AspNetCoreModuleV2/IISLib/stringu.cpp
diff --git a/src/AspNetCoreModuleV2/IISLib/stringu.h b/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/stringu.h
similarity index 100%
rename from src/AspNetCoreModuleV2/IISLib/stringu.h
rename to src/IISIntegration/src/AspNetCoreModuleV2/IISLib/stringu.h
diff --git a/src/AspNetCoreModuleV2/IISLib/tracelog.c b/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/tracelog.c
similarity index 100%
rename from src/AspNetCoreModuleV2/IISLib/tracelog.c
rename to src/IISIntegration/src/AspNetCoreModuleV2/IISLib/tracelog.c
diff --git a/src/AspNetCoreModuleV2/IISLib/tracelog.h b/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/tracelog.h
similarity index 100%
rename from src/AspNetCoreModuleV2/IISLib/tracelog.h
rename to src/IISIntegration/src/AspNetCoreModuleV2/IISLib/tracelog.h
diff --git a/src/AspNetCoreModuleV2/IISLib/treehash.h b/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/treehash.h
similarity index 100%
rename from src/AspNetCoreModuleV2/IISLib/treehash.h
rename to src/IISIntegration/src/AspNetCoreModuleV2/IISLib/treehash.h
diff --git a/src/AspNetCoreModuleV2/IISLib/util.cxx b/src/IISIntegration/src/AspNetCoreModuleV2/IISLib/util.cxx
similarity index 100%
rename from src/AspNetCoreModuleV2/IISLib/util.cxx
rename to src/IISIntegration/src/AspNetCoreModuleV2/IISLib/util.cxx
diff --git a/src/AspNetCoreModuleV2/RequestHandler/RequestHandler.vcxproj b/src/IISIntegration/src/AspNetCoreModuleV2/RequestHandler/RequestHandler.vcxproj
similarity index 100%
rename from src/AspNetCoreModuleV2/RequestHandler/RequestHandler.vcxproj
rename to src/IISIntegration/src/AspNetCoreModuleV2/RequestHandler/RequestHandler.vcxproj
diff --git a/src/AspNetCoreModuleV2/RequestHandler/Source.def b/src/IISIntegration/src/AspNetCoreModuleV2/RequestHandler/Source.def
similarity index 100%
rename from src/AspNetCoreModuleV2/RequestHandler/Source.def
rename to src/IISIntegration/src/AspNetCoreModuleV2/RequestHandler/Source.def
diff --git a/src/AspNetCoreModuleV2/RequestHandler/aspnetcore_event.h b/src/IISIntegration/src/AspNetCoreModuleV2/RequestHandler/aspnetcore_event.h
similarity index 100%
rename from src/AspNetCoreModuleV2/RequestHandler/aspnetcore_event.h
rename to src/IISIntegration/src/AspNetCoreModuleV2/RequestHandler/aspnetcore_event.h
diff --git a/src/AspNetCoreModuleV2/RequestHandler/disconnectcontext.h b/src/IISIntegration/src/AspNetCoreModuleV2/RequestHandler/disconnectcontext.h
similarity index 100%
rename from src/AspNetCoreModuleV2/RequestHandler/disconnectcontext.h
rename to src/IISIntegration/src/AspNetCoreModuleV2/RequestHandler/disconnectcontext.h
diff --git a/src/AspNetCoreModuleV2/RequestHandler/dllmain.cxx b/src/IISIntegration/src/AspNetCoreModuleV2/RequestHandler/dllmain.cxx
similarity index 100%
rename from src/AspNetCoreModuleV2/RequestHandler/dllmain.cxx
rename to src/IISIntegration/src/AspNetCoreModuleV2/RequestHandler/dllmain.cxx
diff --git a/src/AspNetCoreModuleV2/RequestHandler/environmentvariablehelpers.h b/src/IISIntegration/src/AspNetCoreModuleV2/RequestHandler/environmentvariablehelpers.h
similarity index 100%
rename from src/AspNetCoreModuleV2/RequestHandler/environmentvariablehelpers.h
rename to src/IISIntegration/src/AspNetCoreModuleV2/RequestHandler/environmentvariablehelpers.h
diff --git a/src/AspNetCoreModuleV2/RequestHandler/inprocess/inprocessapplication.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/RequestHandler/inprocess/inprocessapplication.cpp
similarity index 100%
rename from src/AspNetCoreModuleV2/RequestHandler/inprocess/inprocessapplication.cpp
rename to src/IISIntegration/src/AspNetCoreModuleV2/RequestHandler/inprocess/inprocessapplication.cpp
diff --git a/src/AspNetCoreModuleV2/RequestHandler/inprocess/inprocessapplication.h b/src/IISIntegration/src/AspNetCoreModuleV2/RequestHandler/inprocess/inprocessapplication.h
similarity index 100%
rename from src/AspNetCoreModuleV2/RequestHandler/inprocess/inprocessapplication.h
rename to src/IISIntegration/src/AspNetCoreModuleV2/RequestHandler/inprocess/inprocessapplication.h
diff --git a/src/AspNetCoreModuleV2/RequestHandler/inprocess/inprocesshandler.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/RequestHandler/inprocess/inprocesshandler.cpp
similarity index 100%
rename from src/AspNetCoreModuleV2/RequestHandler/inprocess/inprocesshandler.cpp
rename to src/IISIntegration/src/AspNetCoreModuleV2/RequestHandler/inprocess/inprocesshandler.cpp
diff --git a/src/AspNetCoreModuleV2/RequestHandler/inprocess/inprocesshandler.h b/src/IISIntegration/src/AspNetCoreModuleV2/RequestHandler/inprocess/inprocesshandler.h
similarity index 100%
rename from src/AspNetCoreModuleV2/RequestHandler/inprocess/inprocesshandler.h
rename to src/IISIntegration/src/AspNetCoreModuleV2/RequestHandler/inprocess/inprocesshandler.h
diff --git a/src/AspNetCoreModuleV2/RequestHandler/managedexports.cxx b/src/IISIntegration/src/AspNetCoreModuleV2/RequestHandler/managedexports.cxx
similarity index 100%
rename from src/AspNetCoreModuleV2/RequestHandler/managedexports.cxx
rename to src/IISIntegration/src/AspNetCoreModuleV2/RequestHandler/managedexports.cxx
diff --git a/src/AspNetCoreModuleV2/RequestHandler/outofprocess/forwarderconnection.cxx b/src/IISIntegration/src/AspNetCoreModuleV2/RequestHandler/outofprocess/forwarderconnection.cxx
similarity index 100%
rename from src/AspNetCoreModuleV2/RequestHandler/outofprocess/forwarderconnection.cxx
rename to src/IISIntegration/src/AspNetCoreModuleV2/RequestHandler/outofprocess/forwarderconnection.cxx
diff --git a/src/AspNetCoreModuleV2/RequestHandler/outofprocess/forwarderconnection.h b/src/IISIntegration/src/AspNetCoreModuleV2/RequestHandler/outofprocess/forwarderconnection.h
similarity index 100%
rename from src/AspNetCoreModuleV2/RequestHandler/outofprocess/forwarderconnection.h
rename to src/IISIntegration/src/AspNetCoreModuleV2/RequestHandler/outofprocess/forwarderconnection.h
diff --git a/src/AspNetCoreModuleV2/RequestHandler/outofprocess/forwardinghandler.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/RequestHandler/outofprocess/forwardinghandler.cpp
similarity index 100%
rename from src/AspNetCoreModuleV2/RequestHandler/outofprocess/forwardinghandler.cpp
rename to src/IISIntegration/src/AspNetCoreModuleV2/RequestHandler/outofprocess/forwardinghandler.cpp
diff --git a/src/AspNetCoreModuleV2/RequestHandler/outofprocess/forwardinghandler.h b/src/IISIntegration/src/AspNetCoreModuleV2/RequestHandler/outofprocess/forwardinghandler.h
similarity index 100%
rename from src/AspNetCoreModuleV2/RequestHandler/outofprocess/forwardinghandler.h
rename to src/IISIntegration/src/AspNetCoreModuleV2/RequestHandler/outofprocess/forwardinghandler.h
diff --git a/src/AspNetCoreModuleV2/RequestHandler/outofprocess/outprocessapplication.cpp b/src/IISIntegration/src/AspNetCoreModuleV2/RequestHandler/outofprocess/outprocessapplication.cpp
similarity index 100%
rename from src/AspNetCoreModuleV2/RequestHandler/outofprocess/outprocessapplication.cpp
rename to src/IISIntegration/src/AspNetCoreModuleV2/RequestHandler/outofprocess/outprocessapplication.cpp
diff --git a/src/AspNetCoreModuleV2/RequestHandler/outofprocess/outprocessapplication.h b/src/IISIntegration/src/AspNetCoreModuleV2/RequestHandler/outofprocess/outprocessapplication.h
similarity index 100%
rename from src/AspNetCoreModuleV2/RequestHandler/outofprocess/outprocessapplication.h
rename to src/IISIntegration/src/AspNetCoreModuleV2/RequestHandler/outofprocess/outprocessapplication.h
diff --git a/src/AspNetCoreModuleV2/RequestHandler/outofprocess/processmanager.cxx b/src/IISIntegration/src/AspNetCoreModuleV2/RequestHandler/outofprocess/processmanager.cxx
similarity index 100%
rename from src/AspNetCoreModuleV2/RequestHandler/outofprocess/processmanager.cxx
rename to src/IISIntegration/src/AspNetCoreModuleV2/RequestHandler/outofprocess/processmanager.cxx
diff --git a/src/AspNetCoreModuleV2/RequestHandler/outofprocess/processmanager.h b/src/IISIntegration/src/AspNetCoreModuleV2/RequestHandler/outofprocess/processmanager.h
similarity index 100%
rename from src/AspNetCoreModuleV2/RequestHandler/outofprocess/processmanager.h
rename to src/IISIntegration/src/AspNetCoreModuleV2/RequestHandler/outofprocess/processmanager.h
diff --git a/src/AspNetCoreModuleV2/RequestHandler/outofprocess/protocolconfig.cxx b/src/IISIntegration/src/AspNetCoreModuleV2/RequestHandler/outofprocess/protocolconfig.cxx
similarity index 100%
rename from src/AspNetCoreModuleV2/RequestHandler/outofprocess/protocolconfig.cxx
rename to src/IISIntegration/src/AspNetCoreModuleV2/RequestHandler/outofprocess/protocolconfig.cxx
diff --git a/src/AspNetCoreModuleV2/RequestHandler/outofprocess/protocolconfig.h b/src/IISIntegration/src/AspNetCoreModuleV2/RequestHandler/outofprocess/protocolconfig.h
similarity index 100%
rename from src/AspNetCoreModuleV2/RequestHandler/outofprocess/protocolconfig.h
rename to src/IISIntegration/src/AspNetCoreModuleV2/RequestHandler/outofprocess/protocolconfig.h
diff --git a/src/AspNetCoreModuleV2/RequestHandler/outofprocess/responseheaderhash.cxx b/src/IISIntegration/src/AspNetCoreModuleV2/RequestHandler/outofprocess/responseheaderhash.cxx
similarity index 100%
rename from src/AspNetCoreModuleV2/RequestHandler/outofprocess/responseheaderhash.cxx
rename to src/IISIntegration/src/AspNetCoreModuleV2/RequestHandler/outofprocess/responseheaderhash.cxx
diff --git a/src/AspNetCoreModuleV2/RequestHandler/outofprocess/responseheaderhash.h b/src/IISIntegration/src/AspNetCoreModuleV2/RequestHandler/outofprocess/responseheaderhash.h
similarity index 100%
rename from src/AspNetCoreModuleV2/RequestHandler/outofprocess/responseheaderhash.h
rename to src/IISIntegration/src/AspNetCoreModuleV2/RequestHandler/outofprocess/responseheaderhash.h
diff --git a/src/AspNetCoreModuleV2/RequestHandler/outofprocess/serverprocess.cxx b/src/IISIntegration/src/AspNetCoreModuleV2/RequestHandler/outofprocess/serverprocess.cxx
similarity index 100%
rename from src/AspNetCoreModuleV2/RequestHandler/outofprocess/serverprocess.cxx
rename to src/IISIntegration/src/AspNetCoreModuleV2/RequestHandler/outofprocess/serverprocess.cxx
diff --git a/src/AspNetCoreModuleV2/RequestHandler/outofprocess/serverprocess.h b/src/IISIntegration/src/AspNetCoreModuleV2/RequestHandler/outofprocess/serverprocess.h
similarity index 100%
rename from src/AspNetCoreModuleV2/RequestHandler/outofprocess/serverprocess.h
rename to src/IISIntegration/src/AspNetCoreModuleV2/RequestHandler/outofprocess/serverprocess.h
diff --git a/src/AspNetCoreModuleV2/RequestHandler/outofprocess/websockethandler.cxx b/src/IISIntegration/src/AspNetCoreModuleV2/RequestHandler/outofprocess/websockethandler.cxx
similarity index 100%
rename from src/AspNetCoreModuleV2/RequestHandler/outofprocess/websockethandler.cxx
rename to src/IISIntegration/src/AspNetCoreModuleV2/RequestHandler/outofprocess/websockethandler.cxx
diff --git a/src/AspNetCoreModuleV2/RequestHandler/outofprocess/websockethandler.h b/src/IISIntegration/src/AspNetCoreModuleV2/RequestHandler/outofprocess/websockethandler.h
similarity index 100%
rename from src/AspNetCoreModuleV2/RequestHandler/outofprocess/websockethandler.h
rename to src/IISIntegration/src/AspNetCoreModuleV2/RequestHandler/outofprocess/websockethandler.h
diff --git a/src/AspNetCoreModuleV2/RequestHandler/outofprocess/winhttphelper.cxx b/src/IISIntegration/src/AspNetCoreModuleV2/RequestHandler/outofprocess/winhttphelper.cxx
similarity index 100%
rename from src/AspNetCoreModuleV2/RequestHandler/outofprocess/winhttphelper.cxx
rename to src/IISIntegration/src/AspNetCoreModuleV2/RequestHandler/outofprocess/winhttphelper.cxx
diff --git a/src/AspNetCoreModuleV2/RequestHandler/outofprocess/winhttphelper.h b/src/IISIntegration/src/AspNetCoreModuleV2/RequestHandler/outofprocess/winhttphelper.h
similarity index 100%
rename from src/AspNetCoreModuleV2/RequestHandler/outofprocess/winhttphelper.h
rename to src/IISIntegration/src/AspNetCoreModuleV2/RequestHandler/outofprocess/winhttphelper.h
diff --git a/src/AspNetCoreModuleV2/RequestHandler/precomp.hxx b/src/IISIntegration/src/AspNetCoreModuleV2/RequestHandler/precomp.hxx
similarity index 100%
rename from src/AspNetCoreModuleV2/RequestHandler/precomp.hxx
rename to src/IISIntegration/src/AspNetCoreModuleV2/RequestHandler/precomp.hxx
diff --git a/src/AspNetCoreModuleV2/RequestHandler/requesthandler.rc b/src/IISIntegration/src/AspNetCoreModuleV2/RequestHandler/requesthandler.rc
similarity index 100%
rename from src/AspNetCoreModuleV2/RequestHandler/requesthandler.rc
rename to src/IISIntegration/src/AspNetCoreModuleV2/RequestHandler/requesthandler.rc
diff --git a/src/AspNetCoreModuleV2/RequestHandler/sttimer.h b/src/IISIntegration/src/AspNetCoreModuleV2/RequestHandler/sttimer.h
similarity index 100%
rename from src/AspNetCoreModuleV2/RequestHandler/sttimer.h
rename to src/IISIntegration/src/AspNetCoreModuleV2/RequestHandler/sttimer.h
diff --git a/src/Directory.Build.props b/src/IISIntegration/src/Directory.Build.props
similarity index 100%
rename from src/Directory.Build.props
rename to src/IISIntegration/src/Directory.Build.props
diff --git a/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.csproj b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.csproj
similarity index 100%
rename from src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.csproj
rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.csproj
diff --git a/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.nuspec b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.nuspec
similarity index 100%
rename from src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.nuspec
rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.nuspec
diff --git a/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.targets b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.targets
similarity index 100%
rename from src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.targets
rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/Microsoft.AspNetCore.Server.IIS.targets
diff --git a/src/Microsoft.AspNetCore.Server.IIS/_._ b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/_._
similarity index 100%
rename from src/Microsoft.AspNetCore.Server.IIS/_._
rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IIS/_._
diff --git a/src/Microsoft.AspNetCore.Server.IISIntegration/AuthenticationHandler.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration/AuthenticationHandler.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Server.IISIntegration/AuthenticationHandler.cs
rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration/AuthenticationHandler.cs
diff --git a/src/Microsoft.AspNetCore.Server.IISIntegration/ForwardedTlsConnectionFeature.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration/ForwardedTlsConnectionFeature.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Server.IISIntegration/ForwardedTlsConnectionFeature.cs
rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration/ForwardedTlsConnectionFeature.cs
diff --git a/src/Microsoft.AspNetCore.Server.IISIntegration/IISDefaults.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration/IISDefaults.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Server.IISIntegration/IISDefaults.cs
rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration/IISDefaults.cs
diff --git a/src/Microsoft.AspNetCore.Server.IISIntegration/IISHostingStartup.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration/IISHostingStartup.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Server.IISIntegration/IISHostingStartup.cs
rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration/IISHostingStartup.cs
diff --git a/src/Microsoft.AspNetCore.Server.IISIntegration/IISMiddleware.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration/IISMiddleware.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Server.IISIntegration/IISMiddleware.cs
rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration/IISMiddleware.cs
diff --git a/src/Microsoft.AspNetCore.Server.IISIntegration/IISOptions.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration/IISOptions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Server.IISIntegration/IISOptions.cs
rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration/IISOptions.cs
diff --git a/src/Microsoft.AspNetCore.Server.IISIntegration/IISSetupFilter.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration/IISSetupFilter.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Server.IISIntegration/IISSetupFilter.cs
rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration/IISSetupFilter.cs
diff --git a/src/Microsoft.AspNetCore.Server.IISIntegration/Microsoft.AspNetCore.Server.IISIntegration.csproj b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration/Microsoft.AspNetCore.Server.IISIntegration.csproj
similarity index 100%
rename from src/Microsoft.AspNetCore.Server.IISIntegration/Microsoft.AspNetCore.Server.IISIntegration.csproj
rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration/Microsoft.AspNetCore.Server.IISIntegration.csproj
diff --git a/src/Microsoft.AspNetCore.Server.IISIntegration/NativeMethods.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration/NativeMethods.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Server.IISIntegration/NativeMethods.cs
rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration/NativeMethods.cs
diff --git a/src/Microsoft.AspNetCore.Server.IISIntegration/Properties/AssemblyInfo.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration/Properties/AssemblyInfo.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Server.IISIntegration/Properties/AssemblyInfo.cs
rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration/Properties/AssemblyInfo.cs
diff --git a/src/Microsoft.AspNetCore.Server.IISIntegration/WebHostBuilderIISExtensions.cs b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration/WebHostBuilderIISExtensions.cs
similarity index 100%
rename from src/Microsoft.AspNetCore.Server.IISIntegration/WebHostBuilderIISExtensions.cs
rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration/WebHostBuilderIISExtensions.cs
diff --git a/src/Microsoft.AspNetCore.Server.IISIntegration/baseline.netcore.json b/src/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration/baseline.netcore.json
similarity index 100%
rename from src/Microsoft.AspNetCore.Server.IISIntegration/baseline.netcore.json
rename to src/IISIntegration/src/Microsoft.AspNetCore.Server.IISIntegration/baseline.netcore.json
diff --git a/test/AspNetCoreModuleTests/AspNetCoreModuleTests.vcxproj b/src/IISIntegration/test/AspNetCoreModuleTests/AspNetCoreModuleTests.vcxproj
similarity index 100%
rename from test/AspNetCoreModuleTests/AspNetCoreModuleTests.vcxproj
rename to src/IISIntegration/test/AspNetCoreModuleTests/AspNetCoreModuleTests.vcxproj
diff --git a/test/AspNetCoreModuleTests/stdafx.h b/src/IISIntegration/test/AspNetCoreModuleTests/stdafx.h
similarity index 100%
rename from test/AspNetCoreModuleTests/stdafx.h
rename to src/IISIntegration/test/AspNetCoreModuleTests/stdafx.h
diff --git a/test/CommonLibTests/CommonLibTests.vcxproj b/src/IISIntegration/test/CommonLibTests/CommonLibTests.vcxproj
similarity index 100%
rename from test/CommonLibTests/CommonLibTests.vcxproj
rename to src/IISIntegration/test/CommonLibTests/CommonLibTests.vcxproj
diff --git a/test/CommonLibTests/NativeTests.targets b/src/IISIntegration/test/CommonLibTests/NativeTests.targets
similarity index 100%
rename from test/CommonLibTests/NativeTests.targets
rename to src/IISIntegration/test/CommonLibTests/NativeTests.targets
diff --git a/test/CommonLibTests/hostfxr_utility_tests.cpp b/src/IISIntegration/test/CommonLibTests/hostfxr_utility_tests.cpp
similarity index 100%
rename from test/CommonLibTests/hostfxr_utility_tests.cpp
rename to src/IISIntegration/test/CommonLibTests/hostfxr_utility_tests.cpp
diff --git a/test/CommonLibTests/main.cpp b/src/IISIntegration/test/CommonLibTests/main.cpp
similarity index 100%
rename from test/CommonLibTests/main.cpp
rename to src/IISIntegration/test/CommonLibTests/main.cpp
diff --git a/test/CommonLibTests/stdafx.cpp b/src/IISIntegration/test/CommonLibTests/stdafx.cpp
similarity index 100%
rename from test/CommonLibTests/stdafx.cpp
rename to src/IISIntegration/test/CommonLibTests/stdafx.cpp
diff --git a/test/CommonLibTests/stdafx.h b/src/IISIntegration/test/CommonLibTests/stdafx.h
similarity index 100%
rename from test/CommonLibTests/stdafx.h
rename to src/IISIntegration/test/CommonLibTests/stdafx.h
diff --git a/test/CommonLibTests/utility_tests.cpp b/src/IISIntegration/test/CommonLibTests/utility_tests.cpp
similarity index 100%
rename from test/CommonLibTests/utility_tests.cpp
rename to src/IISIntegration/test/CommonLibTests/utility_tests.cpp
diff --git a/test/Directory.Build.props b/src/IISIntegration/test/Directory.Build.props
similarity index 100%
rename from test/Directory.Build.props
rename to src/IISIntegration/test/Directory.Build.props
diff --git a/test/IISIntegration.FunctionalTests/AppHostConfig/Http.config b/src/IISIntegration/test/IISIntegration.FunctionalTests/AppHostConfig/Http.config
similarity index 100%
rename from test/IISIntegration.FunctionalTests/AppHostConfig/Http.config
rename to src/IISIntegration/test/IISIntegration.FunctionalTests/AppHostConfig/Http.config
diff --git a/test/IISIntegration.FunctionalTests/AppHostConfig/Https.config b/src/IISIntegration/test/IISIntegration.FunctionalTests/AppHostConfig/Https.config
similarity index 100%
rename from test/IISIntegration.FunctionalTests/AppHostConfig/Https.config
rename to src/IISIntegration/test/IISIntegration.FunctionalTests/AppHostConfig/Https.config
diff --git a/test/IISIntegration.FunctionalTests/AppHostConfig/NtlmAuthentation.config b/src/IISIntegration/test/IISIntegration.FunctionalTests/AppHostConfig/NtlmAuthentation.config
similarity index 100%
rename from test/IISIntegration.FunctionalTests/AppHostConfig/NtlmAuthentation.config
rename to src/IISIntegration/test/IISIntegration.FunctionalTests/AppHostConfig/NtlmAuthentation.config
diff --git a/test/IISIntegration.FunctionalTests/AppHostConfig/WebsocketsNotSupported.config b/src/IISIntegration/test/IISIntegration.FunctionalTests/AppHostConfig/WebsocketsNotSupported.config
similarity index 100%
rename from test/IISIntegration.FunctionalTests/AppHostConfig/WebsocketsNotSupported.config
rename to src/IISIntegration/test/IISIntegration.FunctionalTests/AppHostConfig/WebsocketsNotSupported.config
diff --git a/test/IISIntegration.FunctionalTests/IISIntegration.FunctionalTests.csproj b/src/IISIntegration/test/IISIntegration.FunctionalTests/IISIntegration.FunctionalTests.csproj
similarity index 100%
rename from test/IISIntegration.FunctionalTests/IISIntegration.FunctionalTests.csproj
rename to src/IISIntegration/test/IISIntegration.FunctionalTests/IISIntegration.FunctionalTests.csproj
diff --git a/test/IISIntegration.FunctionalTests/OutOfProcess/HelloWorldTest.cs b/src/IISIntegration/test/IISIntegration.FunctionalTests/OutOfProcess/HelloWorldTest.cs
similarity index 100%
rename from test/IISIntegration.FunctionalTests/OutOfProcess/HelloWorldTest.cs
rename to src/IISIntegration/test/IISIntegration.FunctionalTests/OutOfProcess/HelloWorldTest.cs
diff --git a/test/IISIntegration.FunctionalTests/OutOfProcess/HttpsTest.cs b/src/IISIntegration/test/IISIntegration.FunctionalTests/OutOfProcess/HttpsTest.cs
similarity index 100%
rename from test/IISIntegration.FunctionalTests/OutOfProcess/HttpsTest.cs
rename to src/IISIntegration/test/IISIntegration.FunctionalTests/OutOfProcess/HttpsTest.cs
diff --git a/test/IISIntegration.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs b/src/IISIntegration/test/IISIntegration.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs
similarity index 100%
rename from test/IISIntegration.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs
rename to src/IISIntegration/test/IISIntegration.FunctionalTests/OutOfProcess/NtlmAuthentationTest.cs
diff --git a/test/IISIntegration.FunctionalTests/Properties/AssemblyInfo.cs b/src/IISIntegration/test/IISIntegration.FunctionalTests/Properties/AssemblyInfo.cs
similarity index 100%
rename from test/IISIntegration.FunctionalTests/Properties/AssemblyInfo.cs
rename to src/IISIntegration/test/IISIntegration.FunctionalTests/Properties/AssemblyInfo.cs
diff --git a/test/IISIntegration.FunctionalTests/UpgradeFeatureDetectionTests.cs b/src/IISIntegration/test/IISIntegration.FunctionalTests/UpgradeFeatureDetectionTests.cs
similarity index 100%
rename from test/IISIntegration.FunctionalTests/UpgradeFeatureDetectionTests.cs
rename to src/IISIntegration/test/IISIntegration.FunctionalTests/UpgradeFeatureDetectionTests.cs
diff --git a/test/IISIntegration.FunctionalTests/Utilities/Helpers.cs b/src/IISIntegration/test/IISIntegration.FunctionalTests/Utilities/Helpers.cs
similarity index 100%
rename from test/IISIntegration.FunctionalTests/Utilities/Helpers.cs
rename to src/IISIntegration/test/IISIntegration.FunctionalTests/Utilities/Helpers.cs
diff --git a/test/IISIntegration.FunctionalTests/Utilities/IISExpressSupportsInProcessHostingAttribute.cs b/src/IISIntegration/test/IISIntegration.FunctionalTests/Utilities/IISExpressSupportsInProcessHostingAttribute.cs
similarity index 100%
rename from test/IISIntegration.FunctionalTests/Utilities/IISExpressSupportsInProcessHostingAttribute.cs
rename to src/IISIntegration/test/IISIntegration.FunctionalTests/Utilities/IISExpressSupportsInProcessHostingAttribute.cs
diff --git a/test/IISIntegration.FunctionalTests/Utilities/IISTestSiteCollection.cs b/src/IISIntegration/test/IISIntegration.FunctionalTests/Utilities/IISTestSiteCollection.cs
similarity index 100%
rename from test/IISIntegration.FunctionalTests/Utilities/IISTestSiteCollection.cs
rename to src/IISIntegration/test/IISIntegration.FunctionalTests/Utilities/IISTestSiteCollection.cs
diff --git a/test/IISIntegration.FunctionalTests/Utilities/IISTestSiteFixture.cs b/src/IISIntegration/test/IISIntegration.FunctionalTests/Utilities/IISTestSiteFixture.cs
similarity index 100%
rename from test/IISIntegration.FunctionalTests/Utilities/IISTestSiteFixture.cs
rename to src/IISIntegration/test/IISIntegration.FunctionalTests/Utilities/IISTestSiteFixture.cs
diff --git a/test/Microsoft.AspNetCore.Server.IISIntegration.Tests/IISExtensionTests.cs b/src/IISIntegration/test/Microsoft.AspNetCore.Server.IISIntegration.Tests/IISExtensionTests.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Server.IISIntegration.Tests/IISExtensionTests.cs
rename to src/IISIntegration/test/Microsoft.AspNetCore.Server.IISIntegration.Tests/IISExtensionTests.cs
diff --git a/test/Microsoft.AspNetCore.Server.IISIntegration.Tests/IISMiddlewareTests.cs b/src/IISIntegration/test/Microsoft.AspNetCore.Server.IISIntegration.Tests/IISMiddlewareTests.cs
similarity index 100%
rename from test/Microsoft.AspNetCore.Server.IISIntegration.Tests/IISMiddlewareTests.cs
rename to src/IISIntegration/test/Microsoft.AspNetCore.Server.IISIntegration.Tests/IISMiddlewareTests.cs
diff --git a/test/Microsoft.AspNetCore.Server.IISIntegration.Tests/Microsoft.AspNetCore.Server.IISIntegration.Tests.csproj b/src/IISIntegration/test/Microsoft.AspNetCore.Server.IISIntegration.Tests/Microsoft.AspNetCore.Server.IISIntegration.Tests.csproj
similarity index 100%
rename from test/Microsoft.AspNetCore.Server.IISIntegration.Tests/Microsoft.AspNetCore.Server.IISIntegration.Tests.csproj
rename to src/IISIntegration/test/Microsoft.AspNetCore.Server.IISIntegration.Tests/Microsoft.AspNetCore.Server.IISIntegration.Tests.csproj
diff --git a/test/TestTasks/InjectRequestHandler.cs b/src/IISIntegration/test/TestTasks/InjectRequestHandler.cs
similarity index 100%
rename from test/TestTasks/InjectRequestHandler.cs
rename to src/IISIntegration/test/TestTasks/InjectRequestHandler.cs
diff --git a/test/TestTasks/TestTasks.csproj b/src/IISIntegration/test/TestTasks/TestTasks.csproj
similarity index 100%
rename from test/TestTasks/TestTasks.csproj
rename to src/IISIntegration/test/TestTasks/TestTasks.csproj
diff --git a/test/WebSites/InProcessWebSite/InProcessWebSite.csproj b/src/IISIntegration/test/WebSites/InProcessWebSite/InProcessWebSite.csproj
similarity index 100%
rename from test/WebSites/InProcessWebSite/InProcessWebSite.csproj
rename to src/IISIntegration/test/WebSites/InProcessWebSite/InProcessWebSite.csproj
diff --git a/test/WebSites/InProcessWebSite/Program.cs b/src/IISIntegration/test/WebSites/InProcessWebSite/Program.cs
similarity index 100%
rename from test/WebSites/InProcessWebSite/Program.cs
rename to src/IISIntegration/test/WebSites/InProcessWebSite/Program.cs
diff --git a/test/WebSites/InProcessWebSite/Properties/launchSettings.json b/src/IISIntegration/test/WebSites/InProcessWebSite/Properties/launchSettings.json
similarity index 100%
rename from test/WebSites/InProcessWebSite/Properties/launchSettings.json
rename to src/IISIntegration/test/WebSites/InProcessWebSite/Properties/launchSettings.json
diff --git a/test/WebSites/InProcessWebSite/Startup.cs b/src/IISIntegration/test/WebSites/InProcessWebSite/Startup.cs
similarity index 100%
rename from test/WebSites/InProcessWebSite/Startup.cs
rename to src/IISIntegration/test/WebSites/InProcessWebSite/Startup.cs
diff --git a/test/WebSites/InProcessWebSite/web.config b/src/IISIntegration/test/WebSites/InProcessWebSite/web.config
similarity index 100%
rename from test/WebSites/InProcessWebSite/web.config
rename to src/IISIntegration/test/WebSites/InProcessWebSite/web.config
diff --git a/test/WebSites/OutOfProcessWebSite/OutOfProcessWebSite.csproj b/src/IISIntegration/test/WebSites/OutOfProcessWebSite/OutOfProcessWebSite.csproj
similarity index 100%
rename from test/WebSites/OutOfProcessWebSite/OutOfProcessWebSite.csproj
rename to src/IISIntegration/test/WebSites/OutOfProcessWebSite/OutOfProcessWebSite.csproj
diff --git a/test/WebSites/OutOfProcessWebSite/Program.cs b/src/IISIntegration/test/WebSites/OutOfProcessWebSite/Program.cs
similarity index 100%
rename from test/WebSites/OutOfProcessWebSite/Program.cs
rename to src/IISIntegration/test/WebSites/OutOfProcessWebSite/Program.cs
diff --git a/test/WebSites/OutOfProcessWebSite/Properties/launchSettings.json b/src/IISIntegration/test/WebSites/OutOfProcessWebSite/Properties/launchSettings.json
similarity index 100%
rename from test/WebSites/OutOfProcessWebSite/Properties/launchSettings.json
rename to src/IISIntegration/test/WebSites/OutOfProcessWebSite/Properties/launchSettings.json
diff --git a/test/WebSites/OutOfProcessWebSite/StartupHelloWorld.cs b/src/IISIntegration/test/WebSites/OutOfProcessWebSite/StartupHelloWorld.cs
similarity index 100%
rename from test/WebSites/OutOfProcessWebSite/StartupHelloWorld.cs
rename to src/IISIntegration/test/WebSites/OutOfProcessWebSite/StartupHelloWorld.cs
diff --git a/test/WebSites/OutOfProcessWebSite/StartupHttpsHelloWorld.cs b/src/IISIntegration/test/WebSites/OutOfProcessWebSite/StartupHttpsHelloWorld.cs
similarity index 100%
rename from test/WebSites/OutOfProcessWebSite/StartupHttpsHelloWorld.cs
rename to src/IISIntegration/test/WebSites/OutOfProcessWebSite/StartupHttpsHelloWorld.cs
diff --git a/test/WebSites/OutOfProcessWebSite/StartupNtlmAuthentication.cs b/src/IISIntegration/test/WebSites/OutOfProcessWebSite/StartupNtlmAuthentication.cs
similarity index 100%
rename from test/WebSites/OutOfProcessWebSite/StartupNtlmAuthentication.cs
rename to src/IISIntegration/test/WebSites/OutOfProcessWebSite/StartupNtlmAuthentication.cs
diff --git a/test/WebSites/OutOfProcessWebSite/StartupUpgradeFeatureDetection.cs b/src/IISIntegration/test/WebSites/OutOfProcessWebSite/StartupUpgradeFeatureDetection.cs
similarity index 100%
rename from test/WebSites/OutOfProcessWebSite/StartupUpgradeFeatureDetection.cs
rename to src/IISIntegration/test/WebSites/OutOfProcessWebSite/StartupUpgradeFeatureDetection.cs
diff --git a/test/WebSites/OutOfProcessWebSite/web.config b/src/IISIntegration/test/WebSites/OutOfProcessWebSite/web.config
similarity index 100%
rename from test/WebSites/OutOfProcessWebSite/web.config
rename to src/IISIntegration/test/WebSites/OutOfProcessWebSite/web.config
diff --git a/test/WebSites/OverriddenServerWebSite/OverriddenServerWebSite.csproj b/src/IISIntegration/test/WebSites/OverriddenServerWebSite/OverriddenServerWebSite.csproj
similarity index 100%
rename from test/WebSites/OverriddenServerWebSite/OverriddenServerWebSite.csproj
rename to src/IISIntegration/test/WebSites/OverriddenServerWebSite/OverriddenServerWebSite.csproj
diff --git a/test/WebSites/OverriddenServerWebSite/Program.cs b/src/IISIntegration/test/WebSites/OverriddenServerWebSite/Program.cs
similarity index 100%
rename from test/WebSites/OverriddenServerWebSite/Program.cs
rename to src/IISIntegration/test/WebSites/OverriddenServerWebSite/Program.cs
diff --git a/test/WebSites/OverriddenServerWebSite/Properties/launchSettings.json b/src/IISIntegration/test/WebSites/OverriddenServerWebSite/Properties/launchSettings.json
similarity index 100%
rename from test/WebSites/OverriddenServerWebSite/Properties/launchSettings.json
rename to src/IISIntegration/test/WebSites/OverriddenServerWebSite/Properties/launchSettings.json
diff --git a/test/WebSites/OverriddenServerWebSite/web.config b/src/IISIntegration/test/WebSites/OverriddenServerWebSite/web.config
similarity index 100%
rename from test/WebSites/OverriddenServerWebSite/web.config
rename to src/IISIntegration/test/WebSites/OverriddenServerWebSite/web.config
diff --git a/test/WebSites/StressTestWebSite/Program.cs b/src/IISIntegration/test/WebSites/StressTestWebSite/Program.cs
similarity index 100%
rename from test/WebSites/StressTestWebSite/Program.cs
rename to src/IISIntegration/test/WebSites/StressTestWebSite/Program.cs
diff --git a/test/WebSites/StressTestWebSite/Properties/launchSettings.json b/src/IISIntegration/test/WebSites/StressTestWebSite/Properties/launchSettings.json
similarity index 100%
rename from test/WebSites/StressTestWebSite/Properties/launchSettings.json
rename to src/IISIntegration/test/WebSites/StressTestWebSite/Properties/launchSettings.json
diff --git a/test/WebSites/StressTestWebSite/Startup.cs b/src/IISIntegration/test/WebSites/StressTestWebSite/Startup.cs
similarity index 100%
rename from test/WebSites/StressTestWebSite/Startup.cs
rename to src/IISIntegration/test/WebSites/StressTestWebSite/Startup.cs
diff --git a/test/WebSites/StressTestWebSite/StressTestWebSite.csproj b/src/IISIntegration/test/WebSites/StressTestWebSite/StressTestWebSite.csproj
similarity index 100%
rename from test/WebSites/StressTestWebSite/StressTestWebSite.csproj
rename to src/IISIntegration/test/WebSites/StressTestWebSite/StressTestWebSite.csproj
diff --git a/test/WebSites/StressTestWebSite/WebSockets/Constants.cs b/src/IISIntegration/test/WebSites/StressTestWebSite/WebSockets/Constants.cs
similarity index 100%
rename from test/WebSites/StressTestWebSite/WebSockets/Constants.cs
rename to src/IISIntegration/test/WebSites/StressTestWebSite/WebSockets/Constants.cs
diff --git a/test/WebSites/StressTestWebSite/WebSockets/HandshakeHelpers.cs b/src/IISIntegration/test/WebSites/StressTestWebSite/WebSockets/HandshakeHelpers.cs
similarity index 100%
rename from test/WebSites/StressTestWebSite/WebSockets/HandshakeHelpers.cs
rename to src/IISIntegration/test/WebSites/StressTestWebSite/WebSockets/HandshakeHelpers.cs
diff --git a/test/gtest-1.8.0/CHANGES b/src/IISIntegration/test/gtest-1.8.0/CHANGES
similarity index 100%
rename from test/gtest-1.8.0/CHANGES
rename to src/IISIntegration/test/gtest-1.8.0/CHANGES
diff --git a/test/gtest-1.8.0/CMakeLists.txt b/src/IISIntegration/test/gtest-1.8.0/CMakeLists.txt
similarity index 100%
rename from test/gtest-1.8.0/CMakeLists.txt
rename to src/IISIntegration/test/gtest-1.8.0/CMakeLists.txt
diff --git a/test/gtest-1.8.0/CONTRIBUTORS b/src/IISIntegration/test/gtest-1.8.0/CONTRIBUTORS
similarity index 100%
rename from test/gtest-1.8.0/CONTRIBUTORS
rename to src/IISIntegration/test/gtest-1.8.0/CONTRIBUTORS
diff --git a/test/gtest-1.8.0/LICENSE b/src/IISIntegration/test/gtest-1.8.0/LICENSE
similarity index 100%
rename from test/gtest-1.8.0/LICENSE
rename to src/IISIntegration/test/gtest-1.8.0/LICENSE
diff --git a/test/gtest-1.8.0/Makefile.am b/src/IISIntegration/test/gtest-1.8.0/Makefile.am
similarity index 100%
rename from test/gtest-1.8.0/Makefile.am
rename to src/IISIntegration/test/gtest-1.8.0/Makefile.am
diff --git a/test/gtest-1.8.0/README.md b/src/IISIntegration/test/gtest-1.8.0/README.md
similarity index 100%
rename from test/gtest-1.8.0/README.md
rename to src/IISIntegration/test/gtest-1.8.0/README.md
diff --git a/test/gtest-1.8.0/build-aux/.keep b/src/IISIntegration/test/gtest-1.8.0/build-aux/.keep
similarity index 100%
rename from test/gtest-1.8.0/build-aux/.keep
rename to src/IISIntegration/test/gtest-1.8.0/build-aux/.keep
diff --git a/test/gtest-1.8.0/cmake/internal_utils.cmake b/src/IISIntegration/test/gtest-1.8.0/cmake/internal_utils.cmake
similarity index 100%
rename from test/gtest-1.8.0/cmake/internal_utils.cmake
rename to src/IISIntegration/test/gtest-1.8.0/cmake/internal_utils.cmake
diff --git a/test/gtest-1.8.0/codegear/gtest.cbproj b/src/IISIntegration/test/gtest-1.8.0/codegear/gtest.cbproj
similarity index 100%
rename from test/gtest-1.8.0/codegear/gtest.cbproj
rename to src/IISIntegration/test/gtest-1.8.0/codegear/gtest.cbproj
diff --git a/test/gtest-1.8.0/codegear/gtest.groupproj b/src/IISIntegration/test/gtest-1.8.0/codegear/gtest.groupproj
similarity index 100%
rename from test/gtest-1.8.0/codegear/gtest.groupproj
rename to src/IISIntegration/test/gtest-1.8.0/codegear/gtest.groupproj
diff --git a/test/gtest-1.8.0/codegear/gtest_all.cc b/src/IISIntegration/test/gtest-1.8.0/codegear/gtest_all.cc
similarity index 100%
rename from test/gtest-1.8.0/codegear/gtest_all.cc
rename to src/IISIntegration/test/gtest-1.8.0/codegear/gtest_all.cc
diff --git a/test/gtest-1.8.0/codegear/gtest_link.cc b/src/IISIntegration/test/gtest-1.8.0/codegear/gtest_link.cc
similarity index 100%
rename from test/gtest-1.8.0/codegear/gtest_link.cc
rename to src/IISIntegration/test/gtest-1.8.0/codegear/gtest_link.cc
diff --git a/test/gtest-1.8.0/codegear/gtest_main.cbproj b/src/IISIntegration/test/gtest-1.8.0/codegear/gtest_main.cbproj
similarity index 100%
rename from test/gtest-1.8.0/codegear/gtest_main.cbproj
rename to src/IISIntegration/test/gtest-1.8.0/codegear/gtest_main.cbproj
diff --git a/test/gtest-1.8.0/codegear/gtest_unittest.cbproj b/src/IISIntegration/test/gtest-1.8.0/codegear/gtest_unittest.cbproj
similarity index 100%
rename from test/gtest-1.8.0/codegear/gtest_unittest.cbproj
rename to src/IISIntegration/test/gtest-1.8.0/codegear/gtest_unittest.cbproj
diff --git a/test/gtest-1.8.0/configure.ac b/src/IISIntegration/test/gtest-1.8.0/configure.ac
similarity index 100%
rename from test/gtest-1.8.0/configure.ac
rename to src/IISIntegration/test/gtest-1.8.0/configure.ac
diff --git a/test/gtest-1.8.0/docs/AdvancedGuide.md b/src/IISIntegration/test/gtest-1.8.0/docs/AdvancedGuide.md
similarity index 100%
rename from test/gtest-1.8.0/docs/AdvancedGuide.md
rename to src/IISIntegration/test/gtest-1.8.0/docs/AdvancedGuide.md
diff --git a/test/gtest-1.8.0/docs/DevGuide.md b/src/IISIntegration/test/gtest-1.8.0/docs/DevGuide.md
similarity index 100%
rename from test/gtest-1.8.0/docs/DevGuide.md
rename to src/IISIntegration/test/gtest-1.8.0/docs/DevGuide.md
diff --git a/test/gtest-1.8.0/docs/Documentation.md b/src/IISIntegration/test/gtest-1.8.0/docs/Documentation.md
similarity index 100%
rename from test/gtest-1.8.0/docs/Documentation.md
rename to src/IISIntegration/test/gtest-1.8.0/docs/Documentation.md
diff --git a/test/gtest-1.8.0/docs/FAQ.md b/src/IISIntegration/test/gtest-1.8.0/docs/FAQ.md
similarity index 100%
rename from test/gtest-1.8.0/docs/FAQ.md
rename to src/IISIntegration/test/gtest-1.8.0/docs/FAQ.md
diff --git a/test/gtest-1.8.0/docs/Primer.md b/src/IISIntegration/test/gtest-1.8.0/docs/Primer.md
similarity index 100%
rename from test/gtest-1.8.0/docs/Primer.md
rename to src/IISIntegration/test/gtest-1.8.0/docs/Primer.md
diff --git a/test/gtest-1.8.0/docs/PumpManual.md b/src/IISIntegration/test/gtest-1.8.0/docs/PumpManual.md
similarity index 100%
rename from test/gtest-1.8.0/docs/PumpManual.md
rename to src/IISIntegration/test/gtest-1.8.0/docs/PumpManual.md
diff --git a/test/gtest-1.8.0/docs/Samples.md b/src/IISIntegration/test/gtest-1.8.0/docs/Samples.md
similarity index 100%
rename from test/gtest-1.8.0/docs/Samples.md
rename to src/IISIntegration/test/gtest-1.8.0/docs/Samples.md
diff --git a/test/gtest-1.8.0/docs/V1_5_AdvancedGuide.md b/src/IISIntegration/test/gtest-1.8.0/docs/V1_5_AdvancedGuide.md
similarity index 100%
rename from test/gtest-1.8.0/docs/V1_5_AdvancedGuide.md
rename to src/IISIntegration/test/gtest-1.8.0/docs/V1_5_AdvancedGuide.md
diff --git a/test/gtest-1.8.0/docs/V1_5_Documentation.md b/src/IISIntegration/test/gtest-1.8.0/docs/V1_5_Documentation.md
similarity index 100%
rename from test/gtest-1.8.0/docs/V1_5_Documentation.md
rename to src/IISIntegration/test/gtest-1.8.0/docs/V1_5_Documentation.md
diff --git a/test/gtest-1.8.0/docs/V1_5_FAQ.md b/src/IISIntegration/test/gtest-1.8.0/docs/V1_5_FAQ.md
similarity index 100%
rename from test/gtest-1.8.0/docs/V1_5_FAQ.md
rename to src/IISIntegration/test/gtest-1.8.0/docs/V1_5_FAQ.md
diff --git a/test/gtest-1.8.0/docs/V1_5_Primer.md b/src/IISIntegration/test/gtest-1.8.0/docs/V1_5_Primer.md
similarity index 100%
rename from test/gtest-1.8.0/docs/V1_5_Primer.md
rename to src/IISIntegration/test/gtest-1.8.0/docs/V1_5_Primer.md
diff --git a/test/gtest-1.8.0/docs/V1_5_PumpManual.md b/src/IISIntegration/test/gtest-1.8.0/docs/V1_5_PumpManual.md
similarity index 100%
rename from test/gtest-1.8.0/docs/V1_5_PumpManual.md
rename to src/IISIntegration/test/gtest-1.8.0/docs/V1_5_PumpManual.md
diff --git a/test/gtest-1.8.0/docs/V1_5_XcodeGuide.md b/src/IISIntegration/test/gtest-1.8.0/docs/V1_5_XcodeGuide.md
similarity index 100%
rename from test/gtest-1.8.0/docs/V1_5_XcodeGuide.md
rename to src/IISIntegration/test/gtest-1.8.0/docs/V1_5_XcodeGuide.md
diff --git a/test/gtest-1.8.0/docs/V1_6_AdvancedGuide.md b/src/IISIntegration/test/gtest-1.8.0/docs/V1_6_AdvancedGuide.md
similarity index 100%
rename from test/gtest-1.8.0/docs/V1_6_AdvancedGuide.md
rename to src/IISIntegration/test/gtest-1.8.0/docs/V1_6_AdvancedGuide.md
diff --git a/test/gtest-1.8.0/docs/V1_6_Documentation.md b/src/IISIntegration/test/gtest-1.8.0/docs/V1_6_Documentation.md
similarity index 100%
rename from test/gtest-1.8.0/docs/V1_6_Documentation.md
rename to src/IISIntegration/test/gtest-1.8.0/docs/V1_6_Documentation.md
diff --git a/test/gtest-1.8.0/docs/V1_6_FAQ.md b/src/IISIntegration/test/gtest-1.8.0/docs/V1_6_FAQ.md
similarity index 100%
rename from test/gtest-1.8.0/docs/V1_6_FAQ.md
rename to src/IISIntegration/test/gtest-1.8.0/docs/V1_6_FAQ.md
diff --git a/test/gtest-1.8.0/docs/V1_6_Primer.md b/src/IISIntegration/test/gtest-1.8.0/docs/V1_6_Primer.md
similarity index 100%
rename from test/gtest-1.8.0/docs/V1_6_Primer.md
rename to src/IISIntegration/test/gtest-1.8.0/docs/V1_6_Primer.md
diff --git a/test/gtest-1.8.0/docs/V1_6_PumpManual.md b/src/IISIntegration/test/gtest-1.8.0/docs/V1_6_PumpManual.md
similarity index 100%
rename from test/gtest-1.8.0/docs/V1_6_PumpManual.md
rename to src/IISIntegration/test/gtest-1.8.0/docs/V1_6_PumpManual.md
diff --git a/test/gtest-1.8.0/docs/V1_6_Samples.md b/src/IISIntegration/test/gtest-1.8.0/docs/V1_6_Samples.md
similarity index 100%
rename from test/gtest-1.8.0/docs/V1_6_Samples.md
rename to src/IISIntegration/test/gtest-1.8.0/docs/V1_6_Samples.md
diff --git a/test/gtest-1.8.0/docs/V1_6_XcodeGuide.md b/src/IISIntegration/test/gtest-1.8.0/docs/V1_6_XcodeGuide.md
similarity index 100%
rename from test/gtest-1.8.0/docs/V1_6_XcodeGuide.md
rename to src/IISIntegration/test/gtest-1.8.0/docs/V1_6_XcodeGuide.md
diff --git a/test/gtest-1.8.0/docs/V1_7_AdvancedGuide.md b/src/IISIntegration/test/gtest-1.8.0/docs/V1_7_AdvancedGuide.md
similarity index 100%
rename from test/gtest-1.8.0/docs/V1_7_AdvancedGuide.md
rename to src/IISIntegration/test/gtest-1.8.0/docs/V1_7_AdvancedGuide.md
diff --git a/test/gtest-1.8.0/docs/V1_7_Documentation.md b/src/IISIntegration/test/gtest-1.8.0/docs/V1_7_Documentation.md
similarity index 100%
rename from test/gtest-1.8.0/docs/V1_7_Documentation.md
rename to src/IISIntegration/test/gtest-1.8.0/docs/V1_7_Documentation.md
diff --git a/test/gtest-1.8.0/docs/V1_7_FAQ.md b/src/IISIntegration/test/gtest-1.8.0/docs/V1_7_FAQ.md
similarity index 100%
rename from test/gtest-1.8.0/docs/V1_7_FAQ.md
rename to src/IISIntegration/test/gtest-1.8.0/docs/V1_7_FAQ.md
diff --git a/test/gtest-1.8.0/docs/V1_7_Primer.md b/src/IISIntegration/test/gtest-1.8.0/docs/V1_7_Primer.md
similarity index 100%
rename from test/gtest-1.8.0/docs/V1_7_Primer.md
rename to src/IISIntegration/test/gtest-1.8.0/docs/V1_7_Primer.md
diff --git a/test/gtest-1.8.0/docs/V1_7_PumpManual.md b/src/IISIntegration/test/gtest-1.8.0/docs/V1_7_PumpManual.md
similarity index 100%
rename from test/gtest-1.8.0/docs/V1_7_PumpManual.md
rename to src/IISIntegration/test/gtest-1.8.0/docs/V1_7_PumpManual.md
diff --git a/test/gtest-1.8.0/docs/V1_7_Samples.md b/src/IISIntegration/test/gtest-1.8.0/docs/V1_7_Samples.md
similarity index 100%
rename from test/gtest-1.8.0/docs/V1_7_Samples.md
rename to src/IISIntegration/test/gtest-1.8.0/docs/V1_7_Samples.md
diff --git a/test/gtest-1.8.0/docs/V1_7_XcodeGuide.md b/src/IISIntegration/test/gtest-1.8.0/docs/V1_7_XcodeGuide.md
similarity index 100%
rename from test/gtest-1.8.0/docs/V1_7_XcodeGuide.md
rename to src/IISIntegration/test/gtest-1.8.0/docs/V1_7_XcodeGuide.md
diff --git a/test/gtest-1.8.0/docs/XcodeGuide.md b/src/IISIntegration/test/gtest-1.8.0/docs/XcodeGuide.md
similarity index 100%
rename from test/gtest-1.8.0/docs/XcodeGuide.md
rename to src/IISIntegration/test/gtest-1.8.0/docs/XcodeGuide.md
diff --git a/test/gtest-1.8.0/include/gtest/gtest-death-test.h b/src/IISIntegration/test/gtest-1.8.0/include/gtest/gtest-death-test.h
similarity index 100%
rename from test/gtest-1.8.0/include/gtest/gtest-death-test.h
rename to src/IISIntegration/test/gtest-1.8.0/include/gtest/gtest-death-test.h
diff --git a/test/gtest-1.8.0/include/gtest/gtest-message.h b/src/IISIntegration/test/gtest-1.8.0/include/gtest/gtest-message.h
similarity index 100%
rename from test/gtest-1.8.0/include/gtest/gtest-message.h
rename to src/IISIntegration/test/gtest-1.8.0/include/gtest/gtest-message.h
diff --git a/test/gtest-1.8.0/include/gtest/gtest-param-test.h b/src/IISIntegration/test/gtest-1.8.0/include/gtest/gtest-param-test.h
similarity index 100%
rename from test/gtest-1.8.0/include/gtest/gtest-param-test.h
rename to src/IISIntegration/test/gtest-1.8.0/include/gtest/gtest-param-test.h
diff --git a/test/gtest-1.8.0/include/gtest/gtest-param-test.h.pump b/src/IISIntegration/test/gtest-1.8.0/include/gtest/gtest-param-test.h.pump
similarity index 100%
rename from test/gtest-1.8.0/include/gtest/gtest-param-test.h.pump
rename to src/IISIntegration/test/gtest-1.8.0/include/gtest/gtest-param-test.h.pump
diff --git a/test/gtest-1.8.0/include/gtest/gtest-printers.h b/src/IISIntegration/test/gtest-1.8.0/include/gtest/gtest-printers.h
similarity index 100%
rename from test/gtest-1.8.0/include/gtest/gtest-printers.h
rename to src/IISIntegration/test/gtest-1.8.0/include/gtest/gtest-printers.h
diff --git a/test/gtest-1.8.0/include/gtest/gtest-spi.h b/src/IISIntegration/test/gtest-1.8.0/include/gtest/gtest-spi.h
similarity index 100%
rename from test/gtest-1.8.0/include/gtest/gtest-spi.h
rename to src/IISIntegration/test/gtest-1.8.0/include/gtest/gtest-spi.h
diff --git a/test/gtest-1.8.0/include/gtest/gtest-test-part.h b/src/IISIntegration/test/gtest-1.8.0/include/gtest/gtest-test-part.h
similarity index 100%
rename from test/gtest-1.8.0/include/gtest/gtest-test-part.h
rename to src/IISIntegration/test/gtest-1.8.0/include/gtest/gtest-test-part.h
diff --git a/test/gtest-1.8.0/include/gtest/gtest-typed-test.h b/src/IISIntegration/test/gtest-1.8.0/include/gtest/gtest-typed-test.h
similarity index 100%
rename from test/gtest-1.8.0/include/gtest/gtest-typed-test.h
rename to src/IISIntegration/test/gtest-1.8.0/include/gtest/gtest-typed-test.h
diff --git a/test/gtest-1.8.0/include/gtest/gtest.h b/src/IISIntegration/test/gtest-1.8.0/include/gtest/gtest.h
similarity index 100%
rename from test/gtest-1.8.0/include/gtest/gtest.h
rename to src/IISIntegration/test/gtest-1.8.0/include/gtest/gtest.h
diff --git a/test/gtest-1.8.0/include/gtest/gtest_pred_impl.h b/src/IISIntegration/test/gtest-1.8.0/include/gtest/gtest_pred_impl.h
similarity index 100%
rename from test/gtest-1.8.0/include/gtest/gtest_pred_impl.h
rename to src/IISIntegration/test/gtest-1.8.0/include/gtest/gtest_pred_impl.h
diff --git a/test/gtest-1.8.0/include/gtest/gtest_prod.h b/src/IISIntegration/test/gtest-1.8.0/include/gtest/gtest_prod.h
similarity index 100%
rename from test/gtest-1.8.0/include/gtest/gtest_prod.h
rename to src/IISIntegration/test/gtest-1.8.0/include/gtest/gtest_prod.h
diff --git a/test/gtest-1.8.0/include/gtest/internal/custom/gtest-port.h b/src/IISIntegration/test/gtest-1.8.0/include/gtest/internal/custom/gtest-port.h
similarity index 100%
rename from test/gtest-1.8.0/include/gtest/internal/custom/gtest-port.h
rename to src/IISIntegration/test/gtest-1.8.0/include/gtest/internal/custom/gtest-port.h
diff --git a/test/gtest-1.8.0/include/gtest/internal/custom/gtest-printers.h b/src/IISIntegration/test/gtest-1.8.0/include/gtest/internal/custom/gtest-printers.h
similarity index 100%
rename from test/gtest-1.8.0/include/gtest/internal/custom/gtest-printers.h
rename to src/IISIntegration/test/gtest-1.8.0/include/gtest/internal/custom/gtest-printers.h
diff --git a/test/gtest-1.8.0/include/gtest/internal/custom/gtest.h b/src/IISIntegration/test/gtest-1.8.0/include/gtest/internal/custom/gtest.h
similarity index 100%
rename from test/gtest-1.8.0/include/gtest/internal/custom/gtest.h
rename to src/IISIntegration/test/gtest-1.8.0/include/gtest/internal/custom/gtest.h
diff --git a/test/gtest-1.8.0/include/gtest/internal/gtest-death-test-internal.h b/src/IISIntegration/test/gtest-1.8.0/include/gtest/internal/gtest-death-test-internal.h
similarity index 100%
rename from test/gtest-1.8.0/include/gtest/internal/gtest-death-test-internal.h
rename to src/IISIntegration/test/gtest-1.8.0/include/gtest/internal/gtest-death-test-internal.h
diff --git a/test/gtest-1.8.0/include/gtest/internal/gtest-filepath.h b/src/IISIntegration/test/gtest-1.8.0/include/gtest/internal/gtest-filepath.h
similarity index 100%
rename from test/gtest-1.8.0/include/gtest/internal/gtest-filepath.h
rename to src/IISIntegration/test/gtest-1.8.0/include/gtest/internal/gtest-filepath.h
diff --git a/test/gtest-1.8.0/include/gtest/internal/gtest-internal.h b/src/IISIntegration/test/gtest-1.8.0/include/gtest/internal/gtest-internal.h
similarity index 100%
rename from test/gtest-1.8.0/include/gtest/internal/gtest-internal.h
rename to src/IISIntegration/test/gtest-1.8.0/include/gtest/internal/gtest-internal.h
diff --git a/test/gtest-1.8.0/include/gtest/internal/gtest-linked_ptr.h b/src/IISIntegration/test/gtest-1.8.0/include/gtest/internal/gtest-linked_ptr.h
similarity index 100%
rename from test/gtest-1.8.0/include/gtest/internal/gtest-linked_ptr.h
rename to src/IISIntegration/test/gtest-1.8.0/include/gtest/internal/gtest-linked_ptr.h
diff --git a/test/gtest-1.8.0/include/gtest/internal/gtest-param-util-generated.h b/src/IISIntegration/test/gtest-1.8.0/include/gtest/internal/gtest-param-util-generated.h
similarity index 100%
rename from test/gtest-1.8.0/include/gtest/internal/gtest-param-util-generated.h
rename to src/IISIntegration/test/gtest-1.8.0/include/gtest/internal/gtest-param-util-generated.h
diff --git a/test/gtest-1.8.0/include/gtest/internal/gtest-param-util-generated.h.pump b/src/IISIntegration/test/gtest-1.8.0/include/gtest/internal/gtest-param-util-generated.h.pump
similarity index 100%
rename from test/gtest-1.8.0/include/gtest/internal/gtest-param-util-generated.h.pump
rename to src/IISIntegration/test/gtest-1.8.0/include/gtest/internal/gtest-param-util-generated.h.pump
diff --git a/test/gtest-1.8.0/include/gtest/internal/gtest-param-util.h b/src/IISIntegration/test/gtest-1.8.0/include/gtest/internal/gtest-param-util.h
similarity index 100%
rename from test/gtest-1.8.0/include/gtest/internal/gtest-param-util.h
rename to src/IISIntegration/test/gtest-1.8.0/include/gtest/internal/gtest-param-util.h
diff --git a/test/gtest-1.8.0/include/gtest/internal/gtest-port-arch.h b/src/IISIntegration/test/gtest-1.8.0/include/gtest/internal/gtest-port-arch.h
similarity index 100%
rename from test/gtest-1.8.0/include/gtest/internal/gtest-port-arch.h
rename to src/IISIntegration/test/gtest-1.8.0/include/gtest/internal/gtest-port-arch.h
diff --git a/test/gtest-1.8.0/include/gtest/internal/gtest-port.h b/src/IISIntegration/test/gtest-1.8.0/include/gtest/internal/gtest-port.h
similarity index 100%
rename from test/gtest-1.8.0/include/gtest/internal/gtest-port.h
rename to src/IISIntegration/test/gtest-1.8.0/include/gtest/internal/gtest-port.h
diff --git a/test/gtest-1.8.0/include/gtest/internal/gtest-string.h b/src/IISIntegration/test/gtest-1.8.0/include/gtest/internal/gtest-string.h
similarity index 100%
rename from test/gtest-1.8.0/include/gtest/internal/gtest-string.h
rename to src/IISIntegration/test/gtest-1.8.0/include/gtest/internal/gtest-string.h
diff --git a/test/gtest-1.8.0/include/gtest/internal/gtest-tuple.h b/src/IISIntegration/test/gtest-1.8.0/include/gtest/internal/gtest-tuple.h
similarity index 100%
rename from test/gtest-1.8.0/include/gtest/internal/gtest-tuple.h
rename to src/IISIntegration/test/gtest-1.8.0/include/gtest/internal/gtest-tuple.h
diff --git a/test/gtest-1.8.0/include/gtest/internal/gtest-tuple.h.pump b/src/IISIntegration/test/gtest-1.8.0/include/gtest/internal/gtest-tuple.h.pump
similarity index 100%
rename from test/gtest-1.8.0/include/gtest/internal/gtest-tuple.h.pump
rename to src/IISIntegration/test/gtest-1.8.0/include/gtest/internal/gtest-tuple.h.pump
diff --git a/test/gtest-1.8.0/include/gtest/internal/gtest-type-util.h b/src/IISIntegration/test/gtest-1.8.0/include/gtest/internal/gtest-type-util.h
similarity index 100%
rename from test/gtest-1.8.0/include/gtest/internal/gtest-type-util.h
rename to src/IISIntegration/test/gtest-1.8.0/include/gtest/internal/gtest-type-util.h
diff --git a/test/gtest-1.8.0/include/gtest/internal/gtest-type-util.h.pump b/src/IISIntegration/test/gtest-1.8.0/include/gtest/internal/gtest-type-util.h.pump
similarity index 100%
rename from test/gtest-1.8.0/include/gtest/internal/gtest-type-util.h.pump
rename to src/IISIntegration/test/gtest-1.8.0/include/gtest/internal/gtest-type-util.h.pump
diff --git a/test/gtest-1.8.0/m4/acx_pthread.m4 b/src/IISIntegration/test/gtest-1.8.0/m4/acx_pthread.m4
similarity index 100%
rename from test/gtest-1.8.0/m4/acx_pthread.m4
rename to src/IISIntegration/test/gtest-1.8.0/m4/acx_pthread.m4
diff --git a/test/gtest-1.8.0/m4/gtest.m4 b/src/IISIntegration/test/gtest-1.8.0/m4/gtest.m4
similarity index 100%
rename from test/gtest-1.8.0/m4/gtest.m4
rename to src/IISIntegration/test/gtest-1.8.0/m4/gtest.m4
diff --git a/test/gtest-1.8.0/make/Makefile b/src/IISIntegration/test/gtest-1.8.0/make/Makefile
similarity index 100%
rename from test/gtest-1.8.0/make/Makefile
rename to src/IISIntegration/test/gtest-1.8.0/make/Makefile
diff --git a/test/gtest-1.8.0/msvc/Debug/gtest/gtest.log b/src/IISIntegration/test/gtest-1.8.0/msvc/Debug/gtest/gtest.log
similarity index 100%
rename from test/gtest-1.8.0/msvc/Debug/gtest/gtest.log
rename to src/IISIntegration/test/gtest-1.8.0/msvc/Debug/gtest/gtest.log
diff --git a/test/gtest-1.8.0/msvc/gtest-md.sln b/src/IISIntegration/test/gtest-1.8.0/msvc/gtest-md.sln
similarity index 100%
rename from test/gtest-1.8.0/msvc/gtest-md.sln
rename to src/IISIntegration/test/gtest-1.8.0/msvc/gtest-md.sln
diff --git a/test/gtest-1.8.0/msvc/gtest-md.vcproj b/src/IISIntegration/test/gtest-1.8.0/msvc/gtest-md.vcproj
similarity index 100%
rename from test/gtest-1.8.0/msvc/gtest-md.vcproj
rename to src/IISIntegration/test/gtest-1.8.0/msvc/gtest-md.vcproj
diff --git a/test/gtest-1.8.0/msvc/gtest.sln b/src/IISIntegration/test/gtest-1.8.0/msvc/gtest.sln
similarity index 100%
rename from test/gtest-1.8.0/msvc/gtest.sln
rename to src/IISIntegration/test/gtest-1.8.0/msvc/gtest.sln
diff --git a/test/gtest-1.8.0/msvc/gtest.vcproj b/src/IISIntegration/test/gtest-1.8.0/msvc/gtest.vcproj
similarity index 100%
rename from test/gtest-1.8.0/msvc/gtest.vcproj
rename to src/IISIntegration/test/gtest-1.8.0/msvc/gtest.vcproj
diff --git a/test/gtest-1.8.0/msvc/gtest.vcxproj b/src/IISIntegration/test/gtest-1.8.0/msvc/gtest.vcxproj
similarity index 100%
rename from test/gtest-1.8.0/msvc/gtest.vcxproj
rename to src/IISIntegration/test/gtest-1.8.0/msvc/gtest.vcxproj
diff --git a/test/gtest-1.8.0/msvc/gtest/gtest.log b/src/IISIntegration/test/gtest-1.8.0/msvc/gtest/gtest.log
similarity index 100%
rename from test/gtest-1.8.0/msvc/gtest/gtest.log
rename to src/IISIntegration/test/gtest-1.8.0/msvc/gtest/gtest.log
diff --git a/test/gtest-1.8.0/msvc/gtest_main-md.vcproj b/src/IISIntegration/test/gtest-1.8.0/msvc/gtest_main-md.vcproj
similarity index 100%
rename from test/gtest-1.8.0/msvc/gtest_main-md.vcproj
rename to src/IISIntegration/test/gtest-1.8.0/msvc/gtest_main-md.vcproj
diff --git a/test/gtest-1.8.0/msvc/gtest_main.vcproj b/src/IISIntegration/test/gtest-1.8.0/msvc/gtest_main.vcproj
similarity index 100%
rename from test/gtest-1.8.0/msvc/gtest_main.vcproj
rename to src/IISIntegration/test/gtest-1.8.0/msvc/gtest_main.vcproj
diff --git a/test/gtest-1.8.0/msvc/gtest_prod_test-md.vcproj b/src/IISIntegration/test/gtest-1.8.0/msvc/gtest_prod_test-md.vcproj
similarity index 100%
rename from test/gtest-1.8.0/msvc/gtest_prod_test-md.vcproj
rename to src/IISIntegration/test/gtest-1.8.0/msvc/gtest_prod_test-md.vcproj
diff --git a/test/gtest-1.8.0/msvc/gtest_prod_test.vcproj b/src/IISIntegration/test/gtest-1.8.0/msvc/gtest_prod_test.vcproj
similarity index 100%
rename from test/gtest-1.8.0/msvc/gtest_prod_test.vcproj
rename to src/IISIntegration/test/gtest-1.8.0/msvc/gtest_prod_test.vcproj
diff --git a/test/gtest-1.8.0/msvc/gtest_unittest-md.vcproj b/src/IISIntegration/test/gtest-1.8.0/msvc/gtest_unittest-md.vcproj
similarity index 100%
rename from test/gtest-1.8.0/msvc/gtest_unittest-md.vcproj
rename to src/IISIntegration/test/gtest-1.8.0/msvc/gtest_unittest-md.vcproj
diff --git a/test/gtest-1.8.0/msvc/gtest_unittest.vcproj b/src/IISIntegration/test/gtest-1.8.0/msvc/gtest_unittest.vcproj
similarity index 100%
rename from test/gtest-1.8.0/msvc/gtest_unittest.vcproj
rename to src/IISIntegration/test/gtest-1.8.0/msvc/gtest_unittest.vcproj
diff --git a/test/gtest-1.8.0/samples/prime_tables.h b/src/IISIntegration/test/gtest-1.8.0/samples/prime_tables.h
similarity index 100%
rename from test/gtest-1.8.0/samples/prime_tables.h
rename to src/IISIntegration/test/gtest-1.8.0/samples/prime_tables.h
diff --git a/test/gtest-1.8.0/samples/sample1.cc b/src/IISIntegration/test/gtest-1.8.0/samples/sample1.cc
similarity index 100%
rename from test/gtest-1.8.0/samples/sample1.cc
rename to src/IISIntegration/test/gtest-1.8.0/samples/sample1.cc
diff --git a/test/gtest-1.8.0/samples/sample1.h b/src/IISIntegration/test/gtest-1.8.0/samples/sample1.h
similarity index 100%
rename from test/gtest-1.8.0/samples/sample1.h
rename to src/IISIntegration/test/gtest-1.8.0/samples/sample1.h
diff --git a/test/gtest-1.8.0/samples/sample10_unittest.cc b/src/IISIntegration/test/gtest-1.8.0/samples/sample10_unittest.cc
similarity index 100%
rename from test/gtest-1.8.0/samples/sample10_unittest.cc
rename to src/IISIntegration/test/gtest-1.8.0/samples/sample10_unittest.cc
diff --git a/test/gtest-1.8.0/samples/sample1_unittest.cc b/src/IISIntegration/test/gtest-1.8.0/samples/sample1_unittest.cc
similarity index 100%
rename from test/gtest-1.8.0/samples/sample1_unittest.cc
rename to src/IISIntegration/test/gtest-1.8.0/samples/sample1_unittest.cc
diff --git a/test/gtest-1.8.0/samples/sample2.cc b/src/IISIntegration/test/gtest-1.8.0/samples/sample2.cc
similarity index 100%
rename from test/gtest-1.8.0/samples/sample2.cc
rename to src/IISIntegration/test/gtest-1.8.0/samples/sample2.cc
diff --git a/test/gtest-1.8.0/samples/sample2.h b/src/IISIntegration/test/gtest-1.8.0/samples/sample2.h
similarity index 100%
rename from test/gtest-1.8.0/samples/sample2.h
rename to src/IISIntegration/test/gtest-1.8.0/samples/sample2.h
diff --git a/test/gtest-1.8.0/samples/sample2_unittest.cc b/src/IISIntegration/test/gtest-1.8.0/samples/sample2_unittest.cc
similarity index 100%
rename from test/gtest-1.8.0/samples/sample2_unittest.cc
rename to src/IISIntegration/test/gtest-1.8.0/samples/sample2_unittest.cc
diff --git a/test/gtest-1.8.0/samples/sample3-inl.h b/src/IISIntegration/test/gtest-1.8.0/samples/sample3-inl.h
similarity index 100%
rename from test/gtest-1.8.0/samples/sample3-inl.h
rename to src/IISIntegration/test/gtest-1.8.0/samples/sample3-inl.h
diff --git a/test/gtest-1.8.0/samples/sample3_unittest.cc b/src/IISIntegration/test/gtest-1.8.0/samples/sample3_unittest.cc
similarity index 100%
rename from test/gtest-1.8.0/samples/sample3_unittest.cc
rename to src/IISIntegration/test/gtest-1.8.0/samples/sample3_unittest.cc
diff --git a/test/gtest-1.8.0/samples/sample4.cc b/src/IISIntegration/test/gtest-1.8.0/samples/sample4.cc
similarity index 100%
rename from test/gtest-1.8.0/samples/sample4.cc
rename to src/IISIntegration/test/gtest-1.8.0/samples/sample4.cc
diff --git a/test/gtest-1.8.0/samples/sample4.h b/src/IISIntegration/test/gtest-1.8.0/samples/sample4.h
similarity index 100%
rename from test/gtest-1.8.0/samples/sample4.h
rename to src/IISIntegration/test/gtest-1.8.0/samples/sample4.h
diff --git a/test/gtest-1.8.0/samples/sample4_unittest.cc b/src/IISIntegration/test/gtest-1.8.0/samples/sample4_unittest.cc
similarity index 100%
rename from test/gtest-1.8.0/samples/sample4_unittest.cc
rename to src/IISIntegration/test/gtest-1.8.0/samples/sample4_unittest.cc
diff --git a/test/gtest-1.8.0/samples/sample5_unittest.cc b/src/IISIntegration/test/gtest-1.8.0/samples/sample5_unittest.cc
similarity index 100%
rename from test/gtest-1.8.0/samples/sample5_unittest.cc
rename to src/IISIntegration/test/gtest-1.8.0/samples/sample5_unittest.cc
diff --git a/test/gtest-1.8.0/samples/sample6_unittest.cc b/src/IISIntegration/test/gtest-1.8.0/samples/sample6_unittest.cc
similarity index 100%
rename from test/gtest-1.8.0/samples/sample6_unittest.cc
rename to src/IISIntegration/test/gtest-1.8.0/samples/sample6_unittest.cc
diff --git a/test/gtest-1.8.0/samples/sample7_unittest.cc b/src/IISIntegration/test/gtest-1.8.0/samples/sample7_unittest.cc
similarity index 100%
rename from test/gtest-1.8.0/samples/sample7_unittest.cc
rename to src/IISIntegration/test/gtest-1.8.0/samples/sample7_unittest.cc
diff --git a/test/gtest-1.8.0/samples/sample8_unittest.cc b/src/IISIntegration/test/gtest-1.8.0/samples/sample8_unittest.cc
similarity index 100%
rename from test/gtest-1.8.0/samples/sample8_unittest.cc
rename to src/IISIntegration/test/gtest-1.8.0/samples/sample8_unittest.cc
diff --git a/test/gtest-1.8.0/samples/sample9_unittest.cc b/src/IISIntegration/test/gtest-1.8.0/samples/sample9_unittest.cc
similarity index 100%
rename from test/gtest-1.8.0/samples/sample9_unittest.cc
rename to src/IISIntegration/test/gtest-1.8.0/samples/sample9_unittest.cc
diff --git a/test/gtest-1.8.0/scripts/common.py b/src/IISIntegration/test/gtest-1.8.0/scripts/common.py
similarity index 100%
rename from test/gtest-1.8.0/scripts/common.py
rename to src/IISIntegration/test/gtest-1.8.0/scripts/common.py
diff --git a/test/gtest-1.8.0/scripts/fuse_gtest_files.py b/src/IISIntegration/test/gtest-1.8.0/scripts/fuse_gtest_files.py
similarity index 100%
rename from test/gtest-1.8.0/scripts/fuse_gtest_files.py
rename to src/IISIntegration/test/gtest-1.8.0/scripts/fuse_gtest_files.py
diff --git a/test/gtest-1.8.0/scripts/gen_gtest_pred_impl.py b/src/IISIntegration/test/gtest-1.8.0/scripts/gen_gtest_pred_impl.py
similarity index 100%
rename from test/gtest-1.8.0/scripts/gen_gtest_pred_impl.py
rename to src/IISIntegration/test/gtest-1.8.0/scripts/gen_gtest_pred_impl.py
diff --git a/test/gtest-1.8.0/scripts/gtest-config.in b/src/IISIntegration/test/gtest-1.8.0/scripts/gtest-config.in
similarity index 100%
rename from test/gtest-1.8.0/scripts/gtest-config.in
rename to src/IISIntegration/test/gtest-1.8.0/scripts/gtest-config.in
diff --git a/test/gtest-1.8.0/scripts/pump.py b/src/IISIntegration/test/gtest-1.8.0/scripts/pump.py
similarity index 100%
rename from test/gtest-1.8.0/scripts/pump.py
rename to src/IISIntegration/test/gtest-1.8.0/scripts/pump.py
diff --git a/test/gtest-1.8.0/scripts/release_docs.py b/src/IISIntegration/test/gtest-1.8.0/scripts/release_docs.py
similarity index 100%
rename from test/gtest-1.8.0/scripts/release_docs.py
rename to src/IISIntegration/test/gtest-1.8.0/scripts/release_docs.py
diff --git a/test/gtest-1.8.0/scripts/test/Makefile b/src/IISIntegration/test/gtest-1.8.0/scripts/test/Makefile
similarity index 100%
rename from test/gtest-1.8.0/scripts/test/Makefile
rename to src/IISIntegration/test/gtest-1.8.0/scripts/test/Makefile
diff --git a/test/gtest-1.8.0/scripts/upload.py b/src/IISIntegration/test/gtest-1.8.0/scripts/upload.py
similarity index 100%
rename from test/gtest-1.8.0/scripts/upload.py
rename to src/IISIntegration/test/gtest-1.8.0/scripts/upload.py
diff --git a/test/gtest-1.8.0/scripts/upload_gtest.py b/src/IISIntegration/test/gtest-1.8.0/scripts/upload_gtest.py
similarity index 100%
rename from test/gtest-1.8.0/scripts/upload_gtest.py
rename to src/IISIntegration/test/gtest-1.8.0/scripts/upload_gtest.py
diff --git a/test/gtest-1.8.0/src/gtest-all.cc b/src/IISIntegration/test/gtest-1.8.0/src/gtest-all.cc
similarity index 100%
rename from test/gtest-1.8.0/src/gtest-all.cc
rename to src/IISIntegration/test/gtest-1.8.0/src/gtest-all.cc
diff --git a/test/gtest-1.8.0/src/gtest-death-test.cc b/src/IISIntegration/test/gtest-1.8.0/src/gtest-death-test.cc
similarity index 100%
rename from test/gtest-1.8.0/src/gtest-death-test.cc
rename to src/IISIntegration/test/gtest-1.8.0/src/gtest-death-test.cc
diff --git a/test/gtest-1.8.0/src/gtest-filepath.cc b/src/IISIntegration/test/gtest-1.8.0/src/gtest-filepath.cc
similarity index 100%
rename from test/gtest-1.8.0/src/gtest-filepath.cc
rename to src/IISIntegration/test/gtest-1.8.0/src/gtest-filepath.cc
diff --git a/test/gtest-1.8.0/src/gtest-internal-inl.h b/src/IISIntegration/test/gtest-1.8.0/src/gtest-internal-inl.h
similarity index 100%
rename from test/gtest-1.8.0/src/gtest-internal-inl.h
rename to src/IISIntegration/test/gtest-1.8.0/src/gtest-internal-inl.h
diff --git a/test/gtest-1.8.0/src/gtest-port.cc b/src/IISIntegration/test/gtest-1.8.0/src/gtest-port.cc
similarity index 100%
rename from test/gtest-1.8.0/src/gtest-port.cc
rename to src/IISIntegration/test/gtest-1.8.0/src/gtest-port.cc
diff --git a/test/gtest-1.8.0/src/gtest-printers.cc b/src/IISIntegration/test/gtest-1.8.0/src/gtest-printers.cc
similarity index 100%
rename from test/gtest-1.8.0/src/gtest-printers.cc
rename to src/IISIntegration/test/gtest-1.8.0/src/gtest-printers.cc
diff --git a/test/gtest-1.8.0/src/gtest-test-part.cc b/src/IISIntegration/test/gtest-1.8.0/src/gtest-test-part.cc
similarity index 100%
rename from test/gtest-1.8.0/src/gtest-test-part.cc
rename to src/IISIntegration/test/gtest-1.8.0/src/gtest-test-part.cc
diff --git a/test/gtest-1.8.0/src/gtest-typed-test.cc b/src/IISIntegration/test/gtest-1.8.0/src/gtest-typed-test.cc
similarity index 100%
rename from test/gtest-1.8.0/src/gtest-typed-test.cc
rename to src/IISIntegration/test/gtest-1.8.0/src/gtest-typed-test.cc
diff --git a/test/gtest-1.8.0/src/gtest.cc b/src/IISIntegration/test/gtest-1.8.0/src/gtest.cc
similarity index 100%
rename from test/gtest-1.8.0/src/gtest.cc
rename to src/IISIntegration/test/gtest-1.8.0/src/gtest.cc
diff --git a/test/gtest-1.8.0/src/gtest_main.cc b/src/IISIntegration/test/gtest-1.8.0/src/gtest_main.cc
similarity index 100%
rename from test/gtest-1.8.0/src/gtest_main.cc
rename to src/IISIntegration/test/gtest-1.8.0/src/gtest_main.cc
diff --git a/test/gtest-1.8.0/test/gtest-death-test_ex_test.cc b/src/IISIntegration/test/gtest-1.8.0/test/gtest-death-test_ex_test.cc
similarity index 100%
rename from test/gtest-1.8.0/test/gtest-death-test_ex_test.cc
rename to src/IISIntegration/test/gtest-1.8.0/test/gtest-death-test_ex_test.cc
diff --git a/test/gtest-1.8.0/test/gtest-death-test_test.cc b/src/IISIntegration/test/gtest-1.8.0/test/gtest-death-test_test.cc
similarity index 100%
rename from test/gtest-1.8.0/test/gtest-death-test_test.cc
rename to src/IISIntegration/test/gtest-1.8.0/test/gtest-death-test_test.cc
diff --git a/test/gtest-1.8.0/test/gtest-filepath_test.cc b/src/IISIntegration/test/gtest-1.8.0/test/gtest-filepath_test.cc
similarity index 100%
rename from test/gtest-1.8.0/test/gtest-filepath_test.cc
rename to src/IISIntegration/test/gtest-1.8.0/test/gtest-filepath_test.cc
diff --git a/test/gtest-1.8.0/test/gtest-linked_ptr_test.cc b/src/IISIntegration/test/gtest-1.8.0/test/gtest-linked_ptr_test.cc
similarity index 100%
rename from test/gtest-1.8.0/test/gtest-linked_ptr_test.cc
rename to src/IISIntegration/test/gtest-1.8.0/test/gtest-linked_ptr_test.cc
diff --git a/test/gtest-1.8.0/test/gtest-listener_test.cc b/src/IISIntegration/test/gtest-1.8.0/test/gtest-listener_test.cc
similarity index 100%
rename from test/gtest-1.8.0/test/gtest-listener_test.cc
rename to src/IISIntegration/test/gtest-1.8.0/test/gtest-listener_test.cc
diff --git a/test/gtest-1.8.0/test/gtest-message_test.cc b/src/IISIntegration/test/gtest-1.8.0/test/gtest-message_test.cc
similarity index 100%
rename from test/gtest-1.8.0/test/gtest-message_test.cc
rename to src/IISIntegration/test/gtest-1.8.0/test/gtest-message_test.cc
diff --git a/test/gtest-1.8.0/test/gtest-options_test.cc b/src/IISIntegration/test/gtest-1.8.0/test/gtest-options_test.cc
similarity index 100%
rename from test/gtest-1.8.0/test/gtest-options_test.cc
rename to src/IISIntegration/test/gtest-1.8.0/test/gtest-options_test.cc
diff --git a/test/gtest-1.8.0/test/gtest-param-test2_test.cc b/src/IISIntegration/test/gtest-1.8.0/test/gtest-param-test2_test.cc
similarity index 100%
rename from test/gtest-1.8.0/test/gtest-param-test2_test.cc
rename to src/IISIntegration/test/gtest-1.8.0/test/gtest-param-test2_test.cc
diff --git a/test/gtest-1.8.0/test/gtest-param-test_test.cc b/src/IISIntegration/test/gtest-1.8.0/test/gtest-param-test_test.cc
similarity index 100%
rename from test/gtest-1.8.0/test/gtest-param-test_test.cc
rename to src/IISIntegration/test/gtest-1.8.0/test/gtest-param-test_test.cc
diff --git a/test/gtest-1.8.0/test/gtest-param-test_test.h b/src/IISIntegration/test/gtest-1.8.0/test/gtest-param-test_test.h
similarity index 100%
rename from test/gtest-1.8.0/test/gtest-param-test_test.h
rename to src/IISIntegration/test/gtest-1.8.0/test/gtest-param-test_test.h
diff --git a/test/gtest-1.8.0/test/gtest-port_test.cc b/src/IISIntegration/test/gtest-1.8.0/test/gtest-port_test.cc
similarity index 100%
rename from test/gtest-1.8.0/test/gtest-port_test.cc
rename to src/IISIntegration/test/gtest-1.8.0/test/gtest-port_test.cc
diff --git a/test/gtest-1.8.0/test/gtest-printers_test.cc b/src/IISIntegration/test/gtest-1.8.0/test/gtest-printers_test.cc
similarity index 100%
rename from test/gtest-1.8.0/test/gtest-printers_test.cc
rename to src/IISIntegration/test/gtest-1.8.0/test/gtest-printers_test.cc
diff --git a/test/gtest-1.8.0/test/gtest-test-part_test.cc b/src/IISIntegration/test/gtest-1.8.0/test/gtest-test-part_test.cc
similarity index 100%
rename from test/gtest-1.8.0/test/gtest-test-part_test.cc
rename to src/IISIntegration/test/gtest-1.8.0/test/gtest-test-part_test.cc
diff --git a/test/gtest-1.8.0/test/gtest-tuple_test.cc b/src/IISIntegration/test/gtest-1.8.0/test/gtest-tuple_test.cc
similarity index 100%
rename from test/gtest-1.8.0/test/gtest-tuple_test.cc
rename to src/IISIntegration/test/gtest-1.8.0/test/gtest-tuple_test.cc
diff --git a/test/gtest-1.8.0/test/gtest-typed-test2_test.cc b/src/IISIntegration/test/gtest-1.8.0/test/gtest-typed-test2_test.cc
similarity index 100%
rename from test/gtest-1.8.0/test/gtest-typed-test2_test.cc
rename to src/IISIntegration/test/gtest-1.8.0/test/gtest-typed-test2_test.cc
diff --git a/test/gtest-1.8.0/test/gtest-typed-test_test.cc b/src/IISIntegration/test/gtest-1.8.0/test/gtest-typed-test_test.cc
similarity index 100%
rename from test/gtest-1.8.0/test/gtest-typed-test_test.cc
rename to src/IISIntegration/test/gtest-1.8.0/test/gtest-typed-test_test.cc
diff --git a/test/gtest-1.8.0/test/gtest-typed-test_test.h b/src/IISIntegration/test/gtest-1.8.0/test/gtest-typed-test_test.h
similarity index 100%
rename from test/gtest-1.8.0/test/gtest-typed-test_test.h
rename to src/IISIntegration/test/gtest-1.8.0/test/gtest-typed-test_test.h
diff --git a/test/gtest-1.8.0/test/gtest-unittest-api_test.cc b/src/IISIntegration/test/gtest-1.8.0/test/gtest-unittest-api_test.cc
similarity index 100%
rename from test/gtest-1.8.0/test/gtest-unittest-api_test.cc
rename to src/IISIntegration/test/gtest-1.8.0/test/gtest-unittest-api_test.cc
diff --git a/test/gtest-1.8.0/test/gtest_all_test.cc b/src/IISIntegration/test/gtest-1.8.0/test/gtest_all_test.cc
similarity index 100%
rename from test/gtest-1.8.0/test/gtest_all_test.cc
rename to src/IISIntegration/test/gtest-1.8.0/test/gtest_all_test.cc
diff --git a/test/gtest-1.8.0/test/gtest_break_on_failure_unittest.py b/src/IISIntegration/test/gtest-1.8.0/test/gtest_break_on_failure_unittest.py
similarity index 100%
rename from test/gtest-1.8.0/test/gtest_break_on_failure_unittest.py
rename to src/IISIntegration/test/gtest-1.8.0/test/gtest_break_on_failure_unittest.py
diff --git a/test/gtest-1.8.0/test/gtest_break_on_failure_unittest_.cc b/src/IISIntegration/test/gtest-1.8.0/test/gtest_break_on_failure_unittest_.cc
similarity index 100%
rename from test/gtest-1.8.0/test/gtest_break_on_failure_unittest_.cc
rename to src/IISIntegration/test/gtest-1.8.0/test/gtest_break_on_failure_unittest_.cc
diff --git a/test/gtest-1.8.0/test/gtest_catch_exceptions_test.py b/src/IISIntegration/test/gtest-1.8.0/test/gtest_catch_exceptions_test.py
similarity index 100%
rename from test/gtest-1.8.0/test/gtest_catch_exceptions_test.py
rename to src/IISIntegration/test/gtest-1.8.0/test/gtest_catch_exceptions_test.py
diff --git a/test/gtest-1.8.0/test/gtest_catch_exceptions_test_.cc b/src/IISIntegration/test/gtest-1.8.0/test/gtest_catch_exceptions_test_.cc
similarity index 100%
rename from test/gtest-1.8.0/test/gtest_catch_exceptions_test_.cc
rename to src/IISIntegration/test/gtest-1.8.0/test/gtest_catch_exceptions_test_.cc
diff --git a/test/gtest-1.8.0/test/gtest_color_test.py b/src/IISIntegration/test/gtest-1.8.0/test/gtest_color_test.py
similarity index 100%
rename from test/gtest-1.8.0/test/gtest_color_test.py
rename to src/IISIntegration/test/gtest-1.8.0/test/gtest_color_test.py
diff --git a/test/gtest-1.8.0/test/gtest_color_test_.cc b/src/IISIntegration/test/gtest-1.8.0/test/gtest_color_test_.cc
similarity index 100%
rename from test/gtest-1.8.0/test/gtest_color_test_.cc
rename to src/IISIntegration/test/gtest-1.8.0/test/gtest_color_test_.cc
diff --git a/test/gtest-1.8.0/test/gtest_env_var_test.py b/src/IISIntegration/test/gtest-1.8.0/test/gtest_env_var_test.py
similarity index 100%
rename from test/gtest-1.8.0/test/gtest_env_var_test.py
rename to src/IISIntegration/test/gtest-1.8.0/test/gtest_env_var_test.py
diff --git a/test/gtest-1.8.0/test/gtest_env_var_test_.cc b/src/IISIntegration/test/gtest-1.8.0/test/gtest_env_var_test_.cc
similarity index 100%
rename from test/gtest-1.8.0/test/gtest_env_var_test_.cc
rename to src/IISIntegration/test/gtest-1.8.0/test/gtest_env_var_test_.cc
diff --git a/test/gtest-1.8.0/test/gtest_environment_test.cc b/src/IISIntegration/test/gtest-1.8.0/test/gtest_environment_test.cc
similarity index 100%
rename from test/gtest-1.8.0/test/gtest_environment_test.cc
rename to src/IISIntegration/test/gtest-1.8.0/test/gtest_environment_test.cc
diff --git a/test/gtest-1.8.0/test/gtest_filter_unittest.py b/src/IISIntegration/test/gtest-1.8.0/test/gtest_filter_unittest.py
similarity index 100%
rename from test/gtest-1.8.0/test/gtest_filter_unittest.py
rename to src/IISIntegration/test/gtest-1.8.0/test/gtest_filter_unittest.py
diff --git a/test/gtest-1.8.0/test/gtest_filter_unittest_.cc b/src/IISIntegration/test/gtest-1.8.0/test/gtest_filter_unittest_.cc
similarity index 100%
rename from test/gtest-1.8.0/test/gtest_filter_unittest_.cc
rename to src/IISIntegration/test/gtest-1.8.0/test/gtest_filter_unittest_.cc
diff --git a/test/gtest-1.8.0/test/gtest_help_test.py b/src/IISIntegration/test/gtest-1.8.0/test/gtest_help_test.py
similarity index 100%
rename from test/gtest-1.8.0/test/gtest_help_test.py
rename to src/IISIntegration/test/gtest-1.8.0/test/gtest_help_test.py
diff --git a/test/gtest-1.8.0/test/gtest_help_test_.cc b/src/IISIntegration/test/gtest-1.8.0/test/gtest_help_test_.cc
similarity index 100%
rename from test/gtest-1.8.0/test/gtest_help_test_.cc
rename to src/IISIntegration/test/gtest-1.8.0/test/gtest_help_test_.cc
diff --git a/test/gtest-1.8.0/test/gtest_list_tests_unittest.py b/src/IISIntegration/test/gtest-1.8.0/test/gtest_list_tests_unittest.py
similarity index 100%
rename from test/gtest-1.8.0/test/gtest_list_tests_unittest.py
rename to src/IISIntegration/test/gtest-1.8.0/test/gtest_list_tests_unittest.py
diff --git a/test/gtest-1.8.0/test/gtest_list_tests_unittest_.cc b/src/IISIntegration/test/gtest-1.8.0/test/gtest_list_tests_unittest_.cc
similarity index 100%
rename from test/gtest-1.8.0/test/gtest_list_tests_unittest_.cc
rename to src/IISIntegration/test/gtest-1.8.0/test/gtest_list_tests_unittest_.cc
diff --git a/test/gtest-1.8.0/test/gtest_main_unittest.cc b/src/IISIntegration/test/gtest-1.8.0/test/gtest_main_unittest.cc
similarity index 100%
rename from test/gtest-1.8.0/test/gtest_main_unittest.cc
rename to src/IISIntegration/test/gtest-1.8.0/test/gtest_main_unittest.cc
diff --git a/test/gtest-1.8.0/test/gtest_no_test_unittest.cc b/src/IISIntegration/test/gtest-1.8.0/test/gtest_no_test_unittest.cc
similarity index 100%
rename from test/gtest-1.8.0/test/gtest_no_test_unittest.cc
rename to src/IISIntegration/test/gtest-1.8.0/test/gtest_no_test_unittest.cc
diff --git a/test/gtest-1.8.0/test/gtest_output_test.py b/src/IISIntegration/test/gtest-1.8.0/test/gtest_output_test.py
similarity index 100%
rename from test/gtest-1.8.0/test/gtest_output_test.py
rename to src/IISIntegration/test/gtest-1.8.0/test/gtest_output_test.py
diff --git a/test/gtest-1.8.0/test/gtest_output_test_.cc b/src/IISIntegration/test/gtest-1.8.0/test/gtest_output_test_.cc
similarity index 100%
rename from test/gtest-1.8.0/test/gtest_output_test_.cc
rename to src/IISIntegration/test/gtest-1.8.0/test/gtest_output_test_.cc
diff --git a/test/gtest-1.8.0/test/gtest_output_test_golden_lin.txt b/src/IISIntegration/test/gtest-1.8.0/test/gtest_output_test_golden_lin.txt
similarity index 100%
rename from test/gtest-1.8.0/test/gtest_output_test_golden_lin.txt
rename to src/IISIntegration/test/gtest-1.8.0/test/gtest_output_test_golden_lin.txt
diff --git a/test/gtest-1.8.0/test/gtest_pred_impl_unittest.cc b/src/IISIntegration/test/gtest-1.8.0/test/gtest_pred_impl_unittest.cc
similarity index 100%
rename from test/gtest-1.8.0/test/gtest_pred_impl_unittest.cc
rename to src/IISIntegration/test/gtest-1.8.0/test/gtest_pred_impl_unittest.cc
diff --git a/test/gtest-1.8.0/test/gtest_premature_exit_test.cc b/src/IISIntegration/test/gtest-1.8.0/test/gtest_premature_exit_test.cc
similarity index 100%
rename from test/gtest-1.8.0/test/gtest_premature_exit_test.cc
rename to src/IISIntegration/test/gtest-1.8.0/test/gtest_premature_exit_test.cc
diff --git a/test/gtest-1.8.0/test/gtest_prod_test.cc b/src/IISIntegration/test/gtest-1.8.0/test/gtest_prod_test.cc
similarity index 100%
rename from test/gtest-1.8.0/test/gtest_prod_test.cc
rename to src/IISIntegration/test/gtest-1.8.0/test/gtest_prod_test.cc
diff --git a/test/gtest-1.8.0/test/gtest_repeat_test.cc b/src/IISIntegration/test/gtest-1.8.0/test/gtest_repeat_test.cc
similarity index 100%
rename from test/gtest-1.8.0/test/gtest_repeat_test.cc
rename to src/IISIntegration/test/gtest-1.8.0/test/gtest_repeat_test.cc
diff --git a/test/gtest-1.8.0/test/gtest_shuffle_test.py b/src/IISIntegration/test/gtest-1.8.0/test/gtest_shuffle_test.py
similarity index 100%
rename from test/gtest-1.8.0/test/gtest_shuffle_test.py
rename to src/IISIntegration/test/gtest-1.8.0/test/gtest_shuffle_test.py
diff --git a/test/gtest-1.8.0/test/gtest_shuffle_test_.cc b/src/IISIntegration/test/gtest-1.8.0/test/gtest_shuffle_test_.cc
similarity index 100%
rename from test/gtest-1.8.0/test/gtest_shuffle_test_.cc
rename to src/IISIntegration/test/gtest-1.8.0/test/gtest_shuffle_test_.cc
diff --git a/test/gtest-1.8.0/test/gtest_sole_header_test.cc b/src/IISIntegration/test/gtest-1.8.0/test/gtest_sole_header_test.cc
similarity index 100%
rename from test/gtest-1.8.0/test/gtest_sole_header_test.cc
rename to src/IISIntegration/test/gtest-1.8.0/test/gtest_sole_header_test.cc
diff --git a/test/gtest-1.8.0/test/gtest_stress_test.cc b/src/IISIntegration/test/gtest-1.8.0/test/gtest_stress_test.cc
similarity index 100%
rename from test/gtest-1.8.0/test/gtest_stress_test.cc
rename to src/IISIntegration/test/gtest-1.8.0/test/gtest_stress_test.cc
diff --git a/test/gtest-1.8.0/test/gtest_test_utils.py b/src/IISIntegration/test/gtest-1.8.0/test/gtest_test_utils.py
similarity index 100%
rename from test/gtest-1.8.0/test/gtest_test_utils.py
rename to src/IISIntegration/test/gtest-1.8.0/test/gtest_test_utils.py
diff --git a/test/gtest-1.8.0/test/gtest_throw_on_failure_ex_test.cc b/src/IISIntegration/test/gtest-1.8.0/test/gtest_throw_on_failure_ex_test.cc
similarity index 100%
rename from test/gtest-1.8.0/test/gtest_throw_on_failure_ex_test.cc
rename to src/IISIntegration/test/gtest-1.8.0/test/gtest_throw_on_failure_ex_test.cc
diff --git a/test/gtest-1.8.0/test/gtest_throw_on_failure_test.py b/src/IISIntegration/test/gtest-1.8.0/test/gtest_throw_on_failure_test.py
similarity index 100%
rename from test/gtest-1.8.0/test/gtest_throw_on_failure_test.py
rename to src/IISIntegration/test/gtest-1.8.0/test/gtest_throw_on_failure_test.py
diff --git a/test/gtest-1.8.0/test/gtest_throw_on_failure_test_.cc b/src/IISIntegration/test/gtest-1.8.0/test/gtest_throw_on_failure_test_.cc
similarity index 100%
rename from test/gtest-1.8.0/test/gtest_throw_on_failure_test_.cc
rename to src/IISIntegration/test/gtest-1.8.0/test/gtest_throw_on_failure_test_.cc
diff --git a/test/gtest-1.8.0/test/gtest_uninitialized_test.py b/src/IISIntegration/test/gtest-1.8.0/test/gtest_uninitialized_test.py
similarity index 100%
rename from test/gtest-1.8.0/test/gtest_uninitialized_test.py
rename to src/IISIntegration/test/gtest-1.8.0/test/gtest_uninitialized_test.py
diff --git a/test/gtest-1.8.0/test/gtest_uninitialized_test_.cc b/src/IISIntegration/test/gtest-1.8.0/test/gtest_uninitialized_test_.cc
similarity index 100%
rename from test/gtest-1.8.0/test/gtest_uninitialized_test_.cc
rename to src/IISIntegration/test/gtest-1.8.0/test/gtest_uninitialized_test_.cc
diff --git a/test/gtest-1.8.0/test/gtest_unittest.cc b/src/IISIntegration/test/gtest-1.8.0/test/gtest_unittest.cc
similarity index 100%
rename from test/gtest-1.8.0/test/gtest_unittest.cc
rename to src/IISIntegration/test/gtest-1.8.0/test/gtest_unittest.cc
diff --git a/test/gtest-1.8.0/test/gtest_xml_outfile1_test_.cc b/src/IISIntegration/test/gtest-1.8.0/test/gtest_xml_outfile1_test_.cc
similarity index 100%
rename from test/gtest-1.8.0/test/gtest_xml_outfile1_test_.cc
rename to src/IISIntegration/test/gtest-1.8.0/test/gtest_xml_outfile1_test_.cc
diff --git a/test/gtest-1.8.0/test/gtest_xml_outfile2_test_.cc b/src/IISIntegration/test/gtest-1.8.0/test/gtest_xml_outfile2_test_.cc
similarity index 100%
rename from test/gtest-1.8.0/test/gtest_xml_outfile2_test_.cc
rename to src/IISIntegration/test/gtest-1.8.0/test/gtest_xml_outfile2_test_.cc
diff --git a/test/gtest-1.8.0/test/gtest_xml_outfiles_test.py b/src/IISIntegration/test/gtest-1.8.0/test/gtest_xml_outfiles_test.py
similarity index 100%
rename from test/gtest-1.8.0/test/gtest_xml_outfiles_test.py
rename to src/IISIntegration/test/gtest-1.8.0/test/gtest_xml_outfiles_test.py
diff --git a/test/gtest-1.8.0/test/gtest_xml_output_unittest.py b/src/IISIntegration/test/gtest-1.8.0/test/gtest_xml_output_unittest.py
similarity index 100%
rename from test/gtest-1.8.0/test/gtest_xml_output_unittest.py
rename to src/IISIntegration/test/gtest-1.8.0/test/gtest_xml_output_unittest.py
diff --git a/test/gtest-1.8.0/test/gtest_xml_output_unittest_.cc b/src/IISIntegration/test/gtest-1.8.0/test/gtest_xml_output_unittest_.cc
similarity index 100%
rename from test/gtest-1.8.0/test/gtest_xml_output_unittest_.cc
rename to src/IISIntegration/test/gtest-1.8.0/test/gtest_xml_output_unittest_.cc
diff --git a/test/gtest-1.8.0/test/gtest_xml_test_utils.py b/src/IISIntegration/test/gtest-1.8.0/test/gtest_xml_test_utils.py
similarity index 100%
rename from test/gtest-1.8.0/test/gtest_xml_test_utils.py
rename to src/IISIntegration/test/gtest-1.8.0/test/gtest_xml_test_utils.py
diff --git a/test/gtest-1.8.0/test/production.cc b/src/IISIntegration/test/gtest-1.8.0/test/production.cc
similarity index 100%
rename from test/gtest-1.8.0/test/production.cc
rename to src/IISIntegration/test/gtest-1.8.0/test/production.cc
diff --git a/test/gtest-1.8.0/test/production.h b/src/IISIntegration/test/gtest-1.8.0/test/production.h
similarity index 100%
rename from test/gtest-1.8.0/test/production.h
rename to src/IISIntegration/test/gtest-1.8.0/test/production.h
diff --git a/test/gtest-1.8.0/xcode/Config/DebugProject.xcconfig b/src/IISIntegration/test/gtest-1.8.0/xcode/Config/DebugProject.xcconfig
similarity index 100%
rename from test/gtest-1.8.0/xcode/Config/DebugProject.xcconfig
rename to src/IISIntegration/test/gtest-1.8.0/xcode/Config/DebugProject.xcconfig
diff --git a/test/gtest-1.8.0/xcode/Config/FrameworkTarget.xcconfig b/src/IISIntegration/test/gtest-1.8.0/xcode/Config/FrameworkTarget.xcconfig
similarity index 100%
rename from test/gtest-1.8.0/xcode/Config/FrameworkTarget.xcconfig
rename to src/IISIntegration/test/gtest-1.8.0/xcode/Config/FrameworkTarget.xcconfig
diff --git a/test/gtest-1.8.0/xcode/Config/General.xcconfig b/src/IISIntegration/test/gtest-1.8.0/xcode/Config/General.xcconfig
similarity index 100%
rename from test/gtest-1.8.0/xcode/Config/General.xcconfig
rename to src/IISIntegration/test/gtest-1.8.0/xcode/Config/General.xcconfig
diff --git a/test/gtest-1.8.0/xcode/Config/ReleaseProject.xcconfig b/src/IISIntegration/test/gtest-1.8.0/xcode/Config/ReleaseProject.xcconfig
similarity index 100%
rename from test/gtest-1.8.0/xcode/Config/ReleaseProject.xcconfig
rename to src/IISIntegration/test/gtest-1.8.0/xcode/Config/ReleaseProject.xcconfig
diff --git a/test/gtest-1.8.0/xcode/Config/StaticLibraryTarget.xcconfig b/src/IISIntegration/test/gtest-1.8.0/xcode/Config/StaticLibraryTarget.xcconfig
similarity index 100%
rename from test/gtest-1.8.0/xcode/Config/StaticLibraryTarget.xcconfig
rename to src/IISIntegration/test/gtest-1.8.0/xcode/Config/StaticLibraryTarget.xcconfig
diff --git a/test/gtest-1.8.0/xcode/Config/TestTarget.xcconfig b/src/IISIntegration/test/gtest-1.8.0/xcode/Config/TestTarget.xcconfig
similarity index 100%
rename from test/gtest-1.8.0/xcode/Config/TestTarget.xcconfig
rename to src/IISIntegration/test/gtest-1.8.0/xcode/Config/TestTarget.xcconfig
diff --git a/test/gtest-1.8.0/xcode/Resources/Info.plist b/src/IISIntegration/test/gtest-1.8.0/xcode/Resources/Info.plist
similarity index 100%
rename from test/gtest-1.8.0/xcode/Resources/Info.plist
rename to src/IISIntegration/test/gtest-1.8.0/xcode/Resources/Info.plist
diff --git a/test/gtest-1.8.0/xcode/Samples/FrameworkSample/Info.plist b/src/IISIntegration/test/gtest-1.8.0/xcode/Samples/FrameworkSample/Info.plist
similarity index 100%
rename from test/gtest-1.8.0/xcode/Samples/FrameworkSample/Info.plist
rename to src/IISIntegration/test/gtest-1.8.0/xcode/Samples/FrameworkSample/Info.plist
diff --git a/test/gtest-1.8.0/xcode/Samples/FrameworkSample/WidgetFramework.xcodeproj/project.pbxproj b/src/IISIntegration/test/gtest-1.8.0/xcode/Samples/FrameworkSample/WidgetFramework.xcodeproj/project.pbxproj
similarity index 100%
rename from test/gtest-1.8.0/xcode/Samples/FrameworkSample/WidgetFramework.xcodeproj/project.pbxproj
rename to src/IISIntegration/test/gtest-1.8.0/xcode/Samples/FrameworkSample/WidgetFramework.xcodeproj/project.pbxproj
diff --git a/test/gtest-1.8.0/xcode/Samples/FrameworkSample/runtests.sh b/src/IISIntegration/test/gtest-1.8.0/xcode/Samples/FrameworkSample/runtests.sh
similarity index 100%
rename from test/gtest-1.8.0/xcode/Samples/FrameworkSample/runtests.sh
rename to src/IISIntegration/test/gtest-1.8.0/xcode/Samples/FrameworkSample/runtests.sh
diff --git a/test/gtest-1.8.0/xcode/Samples/FrameworkSample/widget.cc b/src/IISIntegration/test/gtest-1.8.0/xcode/Samples/FrameworkSample/widget.cc
similarity index 100%
rename from test/gtest-1.8.0/xcode/Samples/FrameworkSample/widget.cc
rename to src/IISIntegration/test/gtest-1.8.0/xcode/Samples/FrameworkSample/widget.cc
diff --git a/test/gtest-1.8.0/xcode/Samples/FrameworkSample/widget.h b/src/IISIntegration/test/gtest-1.8.0/xcode/Samples/FrameworkSample/widget.h
similarity index 100%
rename from test/gtest-1.8.0/xcode/Samples/FrameworkSample/widget.h
rename to src/IISIntegration/test/gtest-1.8.0/xcode/Samples/FrameworkSample/widget.h
diff --git a/test/gtest-1.8.0/xcode/Samples/FrameworkSample/widget_test.cc b/src/IISIntegration/test/gtest-1.8.0/xcode/Samples/FrameworkSample/widget_test.cc
similarity index 100%
rename from test/gtest-1.8.0/xcode/Samples/FrameworkSample/widget_test.cc
rename to src/IISIntegration/test/gtest-1.8.0/xcode/Samples/FrameworkSample/widget_test.cc
diff --git a/test/gtest-1.8.0/xcode/Scripts/runtests.sh b/src/IISIntegration/test/gtest-1.8.0/xcode/Scripts/runtests.sh
similarity index 100%
rename from test/gtest-1.8.0/xcode/Scripts/runtests.sh
rename to src/IISIntegration/test/gtest-1.8.0/xcode/Scripts/runtests.sh
diff --git a/test/gtest-1.8.0/xcode/Scripts/versiongenerate.py b/src/IISIntegration/test/gtest-1.8.0/xcode/Scripts/versiongenerate.py
similarity index 100%
rename from test/gtest-1.8.0/xcode/Scripts/versiongenerate.py
rename to src/IISIntegration/test/gtest-1.8.0/xcode/Scripts/versiongenerate.py
diff --git a/test/gtest-1.8.0/xcode/gtest.xcodeproj/project.pbxproj b/src/IISIntegration/test/gtest-1.8.0/xcode/gtest.xcodeproj/project.pbxproj
similarity index 100%
rename from test/gtest-1.8.0/xcode/gtest.xcodeproj/project.pbxproj
rename to src/IISIntegration/test/gtest-1.8.0/xcode/gtest.xcodeproj/project.pbxproj
diff --git a/tools/certificate.ps1 b/src/IISIntegration/tools/certificate.ps1
similarity index 100%
rename from tools/certificate.ps1
rename to src/IISIntegration/tools/certificate.ps1
diff --git a/tools/httpsys.ps1 b/src/IISIntegration/tools/httpsys.ps1
similarity index 100%
rename from tools/httpsys.ps1
rename to src/IISIntegration/tools/httpsys.ps1
diff --git a/tools/installancm.ps1 b/src/IISIntegration/tools/installancm.ps1
similarity index 100%
rename from tools/installancm.ps1
rename to src/IISIntegration/tools/installancm.ps1
diff --git a/tools/stresstest.ps1 b/src/IISIntegration/tools/stresstest.ps1
similarity index 100%
rename from tools/stresstest.ps1
rename to src/IISIntegration/tools/stresstest.ps1
diff --git a/tools/update_schema.ps1 b/src/IISIntegration/tools/update_schema.ps1
similarity index 100%
rename from tools/update_schema.ps1
rename to src/IISIntegration/tools/update_schema.ps1
diff --git a/version.props b/src/IISIntegration/version.props
similarity index 100%
rename from version.props
rename to src/IISIntegration/version.props