diff --git a/Directory.Build.props b/Directory.Build.props
index 3e632a4e4c9301..a381f0464874e5 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -55,6 +55,7 @@
     <CoreClrProjectRoot>$([MSBuild]::NormalizeDirectory('$(MSBuildThisFileDirectory)', 'src', 'coreclr'))</CoreClrProjectRoot>
     <MonoProjectRoot>$([MSBuild]::NormalizeDirectory('$(MSBuildThisFileDirectory)', 'src', 'mono'))</MonoProjectRoot>
     <InstallerProjectRoot>$([MSBuild]::NormalizeDirectory('$(MSBuildThisFileDirectory)', 'src', 'installer'))</InstallerProjectRoot>
+    <SharedNativeRoot>$([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'src', 'native'))</SharedNativeRoot>
     <RepoToolsLocalDir>$([MSBuild]::NormalizeDirectory('$(MSBuildThisFileDirectory)', 'tools-local'))</RepoToolsLocalDir>
     <RepoTasksDir>$([MSBuild]::NormalizeDirectory('$(MSBuildThisFileDirectory)', 'src', 'tasks'))</RepoTasksDir>
     <IbcOptimizationDataDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', 'ibc'))</IbcOptimizationDataDir>
diff --git a/docs/design/features/framework-version-resolution.md b/docs/design/features/framework-version-resolution.md
index 349d0f25019155..a1107bc18e3e16 100644
--- a/docs/design/features/framework-version-resolution.md
+++ b/docs/design/features/framework-version-resolution.md
@@ -11,7 +11,7 @@ Each framework reference consists of these values
 * Version - for example `3.0.1`
 * Roll-forward setting - for example `Minor`
 
-*In the code the framework reference is represented by an instance of [`fx_reference_t`](https://github.com/dotnet/runtime/blob/master/src/installer/corehost/cli/fx_reference.h).*
+*In the code the framework reference is represented by an instance of [`fx_reference_t`](https://github.com/dotnet/runtime/blob/master/src/native/corehost/fx_reference.h).*
 
 In the `.runtimeconfig.json` these values are defined like this:
 ``` json
diff --git a/docs/design/features/native-hosting.md b/docs/design/features/native-hosting.md
index 38c61d8eecb7f4..6b498464bf89d0 100644
--- a/docs/design/features/native-hosting.md
+++ b/docs/design/features/native-hosting.md
@@ -488,8 +488,8 @@ One such scenario is a COM host on multiple threads. The app is not running any
 At the same time it gives the native app (`comhost` in this case) the ability to query and modify runtime properties in between the `hostfxr_initialize...` and `hostfxr_get_runtime_delegate` calls on the `first host context`.
 
 ### API usage
-The `hostfxr` exports are defined in the [hostfxr.h](https://github.com/dotnet/runtime/blob/master/src/installer/corehost/cli/hostfxr.h) header file.
-The runtime helper and method signatures for loading managed components are defined in [coreclr_delegates.h](https://github.com/dotnet/runtime/blob/master/src/installer/corehost/cli/coreclr_delegates.h) header file.
+The `hostfxr` exports are defined in the [hostfxr.h](https://github.com/dotnet/runtime/blob/master/src/native/corehost/hostfxr.h) header file.
+The runtime helper and method signatures for loading managed components are defined in [coreclr_delegates.h](https://github.com/dotnet/runtime/blob/master/src/native/corehost/coreclr_delegates.h) header file.
 
 Currently we don't plan to ship these files, but it's possible to take them from the repo and use it.
 
diff --git a/eng/Subsets.props b/eng/Subsets.props
index e90b49ac9f11fb..4eada72295b5db 100644
--- a/eng/Subsets.props
+++ b/eng/Subsets.props
@@ -256,7 +256,7 @@
 
   <!-- Host sets -->
   <ItemGroup Condition="$(_subset.Contains('+host.native+'))">
-    <CorehostProjectToBuild Include="$(InstallerProjectRoot)corehost\corehost.proj" SignPhase="Binaries" BuildInParallel="false" />
+    <CorehostProjectToBuild Include="$(InstallerProjectRoot)corehost.proj" SignPhase="Binaries" BuildInParallel="false" />
     <ProjectToBuild Include="@(CorehostProjectToBuild)" Pack="true" Category="host" />
   </ItemGroup>
 
diff --git a/src/installer/corehost/corehost.proj b/src/installer/corehost.proj
similarity index 93%
rename from src/installer/corehost/corehost.proj
rename to src/installer/corehost.proj
index 43346190a84357..de5ffe461f5a52 100644
--- a/src/installer/corehost/corehost.proj
+++ b/src/installer/corehost.proj
@@ -45,8 +45,8 @@
       Use IgnoreStandardErrorWarningFormat because Arcade sets WarnAsError and there's an existing
       warning in the macOS build when dsymutil tries to strip symbols.
     -->
-    <Message Text="$(MSBuildProjectDirectory)\build.sh $(BuildArgs)" Importance="High"/>
-    <Exec Command="$(MSBuildProjectDirectory)\build.sh $(BuildArgs)" IgnoreStandardErrorWarningFormat="true"/>
+    <Message Text="$(SharedNativeRoot)\corehost\build.sh $(BuildArgs)" Importance="High"/>
+    <Exec Command="$(SharedNativeRoot)\corehost\build.sh $(BuildArgs)" IgnoreStandardErrorWarningFormat="true"/>
   </Target>
 
   <Target Name="BuildCoreHostWindows"
@@ -103,8 +103,8 @@
       IgnoreStandardErrorWarningFormat because Arcade sets WarnAsError and there's an existing
       warning in the native build.
     -->
-    <Message Text="$(MSBuildProjectDirectory)\build.cmd $(BuildArgs)" Importance="High"/>
-    <Exec Command="$(MSBuildProjectDirectory)\build.cmd $(BuildArgs)" IgnoreStandardErrorWarningFormat="true"/>
+    <Message Text="$(SharedNativeRoot)\corehost\build.cmd $(BuildArgs)" Importance="High"/>
+    <Exec Command="$(SharedNativeRoot)\corehost\build.cmd $(BuildArgs)" IgnoreStandardErrorWarningFormat="true"/>
   </Target>
 
   <Target Name="PrependWindowsHeaderIncludeToVersionHeaderFile"
diff --git a/src/installer/corehost/cli/CMakeLists.txt b/src/installer/corehost/cli/CMakeLists.txt
deleted file mode 100644
index 96d47f3641d184..00000000000000
--- a/src/installer/corehost/cli/CMakeLists.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-if(RUNTIME_FLAVOR STREQUAL "Mono")
-    add_subdirectory(hostcommon)
-    add_subdirectory(fxr)
-    add_subdirectory(hostpolicy)
-else()
-    add_subdirectory(hostcommon)
-    add_subdirectory(apphost)
-    add_subdirectory(dotnet)
-    add_subdirectory(nethost)
-    add_subdirectory(test_fx_ver)
-    add_subdirectory(fxr)
-    add_subdirectory(hostpolicy)
-
-    add_subdirectory(test)
-
-    if(CLR_CMAKE_TARGET_WIN32)
-        add_subdirectory(comhost)
-        add_subdirectory(ijwhost)
-    endif()
-endif()
\ No newline at end of file
diff --git a/src/installer/corehost/CMakeLists.txt b/src/native/corehost/CMakeLists.txt
similarity index 68%
rename from src/installer/corehost/CMakeLists.txt
rename to src/native/corehost/CMakeLists.txt
index e8ba7ae21c961a..548936120d14f9 100644
--- a/src/installer/corehost/CMakeLists.txt
+++ b/src/native/corehost/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.6.2)
 
 if (CMAKE_VERSION VERSION_GREATER 3.15 OR CMAKE_VERSION VERSION_EQUAL 3.15)
-  cmake_policy(SET CMP0091 NEW)
+    cmake_policy(SET CMP0091 NEW)
 endif()
 
 project(corehost)
@@ -9,7 +9,7 @@ project(corehost)
 include(../../../eng/native/configurepaths.cmake)
 include(${CLR_ENG_NATIVE_DIR}/configurecompiler.cmake)
 
-if(MSVC)
+if (MSVC)
     add_compile_options($<$<COMPILE_LANGUAGE:C,CXX>:/wd4996>)
     add_compile_options($<$<COMPILE_LANGUAGE:C,CXX>:/wd4267>)
     add_compile_options($<$<COMPILE_LANGUAGE:C,CXX>:/wd4018>)
@@ -23,4 +23,19 @@ elseif (CMAKE_CXX_COMPILER_ID MATCHES GNU)
     add_compile_options($<$<COMPILE_LANGUAGE:CXX>:-fno-use-cxa-atexit>)
 endif()
 
-add_subdirectory(cli)
+add_subdirectory(hostcommon)
+add_subdirectory(fxr)
+add_subdirectory(hostpolicy)
+
+if (NOT RUNTIME_FLAVOR STREQUAL Mono)
+    add_subdirectory(apphost)
+    add_subdirectory(dotnet)
+    add_subdirectory(nethost)
+    add_subdirectory(test_fx_ver)
+    add_subdirectory(test)
+
+    if(CLR_CMAKE_TARGET_WIN32)
+        add_subdirectory(comhost)
+        add_subdirectory(ijwhost)
+    endif()
+endif()
diff --git a/src/installer/corehost/cli/apphost/CMakeLists.txt b/src/native/corehost/apphost/CMakeLists.txt
similarity index 100%
rename from src/installer/corehost/cli/apphost/CMakeLists.txt
rename to src/native/corehost/apphost/CMakeLists.txt
diff --git a/src/installer/corehost/cli/apphost/apphost.windows.cpp b/src/native/corehost/apphost/apphost.windows.cpp
similarity index 100%
rename from src/installer/corehost/cli/apphost/apphost.windows.cpp
rename to src/native/corehost/apphost/apphost.windows.cpp
diff --git a/src/installer/corehost/cli/apphost/apphost.windows.h b/src/native/corehost/apphost/apphost.windows.h
similarity index 100%
rename from src/installer/corehost/cli/apphost/apphost.windows.h
rename to src/native/corehost/apphost/apphost.windows.h
diff --git a/src/installer/corehost/cli/apphost/bundle_marker.cpp b/src/native/corehost/apphost/bundle_marker.cpp
similarity index 100%
rename from src/installer/corehost/cli/apphost/bundle_marker.cpp
rename to src/native/corehost/apphost/bundle_marker.cpp
diff --git a/src/installer/corehost/cli/apphost/bundle_marker.h b/src/native/corehost/apphost/bundle_marker.h
similarity index 100%
rename from src/installer/corehost/cli/apphost/bundle_marker.h
rename to src/native/corehost/apphost/bundle_marker.h
diff --git a/src/installer/corehost/cli/apphost/standalone/CMakeLists.txt b/src/native/corehost/apphost/standalone/CMakeLists.txt
similarity index 97%
rename from src/installer/corehost/cli/apphost/standalone/CMakeLists.txt
rename to src/native/corehost/apphost/standalone/CMakeLists.txt
index 72ced75f6f9142..b17e63beaf4f1b 100644
--- a/src/installer/corehost/cli/apphost/standalone/CMakeLists.txt
+++ b/src/native/corehost/apphost/standalone/CMakeLists.txt
@@ -25,7 +25,7 @@ set(SOURCES
 
 set(HEADERS
     ../bundle_marker.h
-    ../../../hostfxr_resolver.h
+    ../../hostfxr_resolver.h
 )
 
 if(CLR_CMAKE_TARGET_WIN32)
diff --git a/src/installer/corehost/cli/apphost/standalone/hostfxr_resolver.cpp b/src/native/corehost/apphost/standalone/hostfxr_resolver.cpp
similarity index 100%
rename from src/installer/corehost/cli/apphost/standalone/hostfxr_resolver.cpp
rename to src/native/corehost/apphost/standalone/hostfxr_resolver.cpp
diff --git a/src/installer/corehost/cli/apphost/static/CMakeLists.txt b/src/native/corehost/apphost/static/CMakeLists.txt
similarity index 99%
rename from src/installer/corehost/cli/apphost/static/CMakeLists.txt
rename to src/native/corehost/apphost/static/CMakeLists.txt
index 78607e2eb7daea..ce415c182019aa 100644
--- a/src/installer/corehost/cli/apphost/static/CMakeLists.txt
+++ b/src/native/corehost/apphost/static/CMakeLists.txt
@@ -28,7 +28,7 @@ set(SOURCES
 
 set(HEADERS
     ../bundle_marker.h
-    ../../../hostfxr_resolver.h
+    ../../hostfxr_resolver.h
 )
 
 add_definitions(-D_NO_ASYNCRTIMP)
diff --git a/src/installer/corehost/cli/apphost/static/configure.cmake b/src/native/corehost/apphost/static/configure.cmake
similarity index 100%
rename from src/installer/corehost/cli/apphost/static/configure.cmake
rename to src/native/corehost/apphost/static/configure.cmake
diff --git a/src/installer/corehost/cli/apphost/static/hostfxr_resolver.cpp b/src/native/corehost/apphost/static/hostfxr_resolver.cpp
similarity index 100%
rename from src/installer/corehost/cli/apphost/static/hostfxr_resolver.cpp
rename to src/native/corehost/apphost/static/hostfxr_resolver.cpp
diff --git a/src/installer/corehost/cli/apphost/static/hostpolicy_resolver.cpp b/src/native/corehost/apphost/static/hostpolicy_resolver.cpp
similarity index 100%
rename from src/installer/corehost/cli/apphost/static/hostpolicy_resolver.cpp
rename to src/native/corehost/apphost/static/hostpolicy_resolver.cpp
diff --git a/src/installer/corehost/cli/apphost/static/singlefilehost.def b/src/native/corehost/apphost/static/singlefilehost.def
similarity index 100%
rename from src/installer/corehost/cli/apphost/static/singlefilehost.def
rename to src/native/corehost/apphost/static/singlefilehost.def
diff --git a/src/installer/corehost/cli/apphost/static/singlefilehost_OSXexports.src b/src/native/corehost/apphost/static/singlefilehost_OSXexports.src
similarity index 100%
rename from src/installer/corehost/cli/apphost/static/singlefilehost_OSXexports.src
rename to src/native/corehost/apphost/static/singlefilehost_OSXexports.src
diff --git a/src/installer/corehost/cli/apphost/static/singlefilehost_unixexports.src b/src/native/corehost/apphost/static/singlefilehost_unixexports.src
similarity index 100%
rename from src/installer/corehost/cli/apphost/static/singlefilehost_unixexports.src
rename to src/native/corehost/apphost/static/singlefilehost_unixexports.src
diff --git a/src/installer/corehost/build.cmd b/src/native/corehost/build.cmd
similarity index 100%
rename from src/installer/corehost/build.cmd
rename to src/native/corehost/build.cmd
diff --git a/src/installer/corehost/build.sh b/src/native/corehost/build.sh
similarity index 100%
rename from src/installer/corehost/build.sh
rename to src/native/corehost/build.sh
diff --git a/src/installer/corehost/cli/bundle/dir_utils.cpp b/src/native/corehost/bundle/dir_utils.cpp
similarity index 100%
rename from src/installer/corehost/cli/bundle/dir_utils.cpp
rename to src/native/corehost/bundle/dir_utils.cpp
diff --git a/src/installer/corehost/cli/bundle/dir_utils.h b/src/native/corehost/bundle/dir_utils.h
similarity index 100%
rename from src/installer/corehost/cli/bundle/dir_utils.h
rename to src/native/corehost/bundle/dir_utils.h
diff --git a/src/installer/corehost/cli/bundle/extractor.cpp b/src/native/corehost/bundle/extractor.cpp
similarity index 100%
rename from src/installer/corehost/cli/bundle/extractor.cpp
rename to src/native/corehost/bundle/extractor.cpp
diff --git a/src/installer/corehost/cli/bundle/extractor.h b/src/native/corehost/bundle/extractor.h
similarity index 100%
rename from src/installer/corehost/cli/bundle/extractor.h
rename to src/native/corehost/bundle/extractor.h
diff --git a/src/installer/corehost/cli/bundle/file_entry.cpp b/src/native/corehost/bundle/file_entry.cpp
similarity index 100%
rename from src/installer/corehost/cli/bundle/file_entry.cpp
rename to src/native/corehost/bundle/file_entry.cpp
diff --git a/src/installer/corehost/cli/bundle/file_entry.h b/src/native/corehost/bundle/file_entry.h
similarity index 100%
rename from src/installer/corehost/cli/bundle/file_entry.h
rename to src/native/corehost/bundle/file_entry.h
diff --git a/src/installer/corehost/cli/bundle/file_type.h b/src/native/corehost/bundle/file_type.h
similarity index 100%
rename from src/installer/corehost/cli/bundle/file_type.h
rename to src/native/corehost/bundle/file_type.h
diff --git a/src/installer/corehost/cli/bundle/header.cpp b/src/native/corehost/bundle/header.cpp
similarity index 100%
rename from src/installer/corehost/cli/bundle/header.cpp
rename to src/native/corehost/bundle/header.cpp
diff --git a/src/installer/corehost/cli/bundle/header.h b/src/native/corehost/bundle/header.h
similarity index 100%
rename from src/installer/corehost/cli/bundle/header.h
rename to src/native/corehost/bundle/header.h
diff --git a/src/installer/corehost/cli/bundle/info.cpp b/src/native/corehost/bundle/info.cpp
similarity index 100%
rename from src/installer/corehost/cli/bundle/info.cpp
rename to src/native/corehost/bundle/info.cpp
diff --git a/src/installer/corehost/cli/bundle/info.h b/src/native/corehost/bundle/info.h
similarity index 100%
rename from src/installer/corehost/cli/bundle/info.h
rename to src/native/corehost/bundle/info.h
diff --git a/src/installer/corehost/cli/bundle/manifest.cpp b/src/native/corehost/bundle/manifest.cpp
similarity index 100%
rename from src/installer/corehost/cli/bundle/manifest.cpp
rename to src/native/corehost/bundle/manifest.cpp
diff --git a/src/installer/corehost/cli/bundle/manifest.h b/src/native/corehost/bundle/manifest.h
similarity index 100%
rename from src/installer/corehost/cli/bundle/manifest.h
rename to src/native/corehost/bundle/manifest.h
diff --git a/src/installer/corehost/cli/bundle/reader.cpp b/src/native/corehost/bundle/reader.cpp
similarity index 100%
rename from src/installer/corehost/cli/bundle/reader.cpp
rename to src/native/corehost/bundle/reader.cpp
diff --git a/src/installer/corehost/cli/bundle/reader.h b/src/native/corehost/bundle/reader.h
similarity index 100%
rename from src/installer/corehost/cli/bundle/reader.h
rename to src/native/corehost/bundle/reader.h
diff --git a/src/installer/corehost/cli/bundle/runner.cpp b/src/native/corehost/bundle/runner.cpp
similarity index 100%
rename from src/installer/corehost/cli/bundle/runner.cpp
rename to src/native/corehost/bundle/runner.cpp
diff --git a/src/installer/corehost/cli/bundle/runner.h b/src/native/corehost/bundle/runner.h
similarity index 100%
rename from src/installer/corehost/cli/bundle/runner.h
rename to src/native/corehost/bundle/runner.h
diff --git a/src/installer/corehost/cli/comhost/CMakeLists.txt b/src/native/corehost/comhost/CMakeLists.txt
similarity index 100%
rename from src/installer/corehost/cli/comhost/CMakeLists.txt
rename to src/native/corehost/comhost/CMakeLists.txt
diff --git a/src/installer/corehost/cli/comhost/Exports.def b/src/native/corehost/comhost/Exports.def
similarity index 100%
rename from src/installer/corehost/cli/comhost/Exports.def
rename to src/native/corehost/comhost/Exports.def
diff --git a/src/installer/corehost/cli/comhost/clsidmap.cpp b/src/native/corehost/comhost/clsidmap.cpp
similarity index 100%
rename from src/installer/corehost/cli/comhost/clsidmap.cpp
rename to src/native/corehost/comhost/clsidmap.cpp
diff --git a/src/installer/corehost/cli/comhost/comhost.cpp b/src/native/corehost/comhost/comhost.cpp
similarity index 100%
rename from src/installer/corehost/cli/comhost/comhost.cpp
rename to src/native/corehost/comhost/comhost.cpp
diff --git a/src/installer/corehost/cli/comhost/comhost.h b/src/native/corehost/comhost/comhost.h
similarity index 100%
rename from src/installer/corehost/cli/comhost/comhost.h
rename to src/native/corehost/comhost/comhost.h
diff --git a/src/installer/corehost/cli/common.cmake b/src/native/corehost/common.cmake
similarity index 100%
rename from src/installer/corehost/cli/common.cmake
rename to src/native/corehost/common.cmake
diff --git a/src/installer/corehost/cli/coreclr_delegates.h b/src/native/corehost/coreclr_delegates.h
similarity index 100%
rename from src/installer/corehost/cli/coreclr_delegates.h
rename to src/native/corehost/coreclr_delegates.h
diff --git a/src/installer/corehost/coreclr_resolver.h b/src/native/corehost/coreclr_resolver.h
similarity index 100%
rename from src/installer/corehost/coreclr_resolver.h
rename to src/native/corehost/coreclr_resolver.h
diff --git a/src/installer/corehost/corehost.cpp b/src/native/corehost/corehost.cpp
similarity index 99%
rename from src/installer/corehost/corehost.cpp
rename to src/native/corehost/corehost.cpp
index 0064f8b6a2a9f1..f3a59cee43f6e5 100644
--- a/src/installer/corehost/corehost.cpp
+++ b/src/native/corehost/corehost.cpp
@@ -14,7 +14,7 @@
 #include "bundle_marker.h"
 
 #if defined(_WIN32)
-#include "cli/apphost/apphost.windows.h"
+#include "apphost/apphost.windows.h"
 #endif
 
 #define CURHOST_TYPE    _X("apphost")
diff --git a/src/installer/corehost/cli/corehost_context_contract.h b/src/native/corehost/corehost_context_contract.h
similarity index 100%
rename from src/installer/corehost/cli/corehost_context_contract.h
rename to src/native/corehost/corehost_context_contract.h
diff --git a/src/installer/corehost/cli/deps_entry.cpp b/src/native/corehost/deps_entry.cpp
similarity index 100%
rename from src/installer/corehost/cli/deps_entry.cpp
rename to src/native/corehost/deps_entry.cpp
diff --git a/src/installer/corehost/cli/deps_entry.h b/src/native/corehost/deps_entry.h
similarity index 100%
rename from src/installer/corehost/cli/deps_entry.h
rename to src/native/corehost/deps_entry.h
diff --git a/src/installer/corehost/cli/deps_format.cpp b/src/native/corehost/deps_format.cpp
similarity index 100%
rename from src/installer/corehost/cli/deps_format.cpp
rename to src/native/corehost/deps_format.cpp
diff --git a/src/installer/corehost/cli/deps_format.h b/src/native/corehost/deps_format.h
similarity index 100%
rename from src/installer/corehost/cli/deps_format.h
rename to src/native/corehost/deps_format.h
diff --git a/src/installer/corehost/cli/dotnet/CMakeLists.txt b/src/native/corehost/dotnet/CMakeLists.txt
similarity index 100%
rename from src/installer/corehost/cli/dotnet/CMakeLists.txt
rename to src/native/corehost/dotnet/CMakeLists.txt
diff --git a/src/installer/corehost/cli/dotnet/dotnet.manifest b/src/native/corehost/dotnet/dotnet.manifest
similarity index 100%
rename from src/installer/corehost/cli/dotnet/dotnet.manifest
rename to src/native/corehost/dotnet/dotnet.manifest
diff --git a/src/installer/corehost/error_codes.h b/src/native/corehost/error_codes.h
similarity index 100%
rename from src/installer/corehost/error_codes.h
rename to src/native/corehost/error_codes.h
diff --git a/src/installer/corehost/cli/exe.cmake b/src/native/corehost/exe.cmake
similarity index 89%
rename from src/installer/corehost/cli/exe.cmake
rename to src/native/corehost/exe.cmake
index 6431edfbc4f9bd..c60742144e65be 100644
--- a/src/installer/corehost/cli/exe.cmake
+++ b/src/native/corehost/exe.cmake
@@ -14,10 +14,10 @@ include_directories(${CMAKE_CURRENT_LIST_DIR}/fxr)
 # CMake does not recommend using globbing since it messes with the freshness checks
 list(APPEND SOURCES
     ${CMAKE_CURRENT_LIST_DIR}/fxr_resolver.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/../corehost.cpp
+    ${CMAKE_CURRENT_LIST_DIR}/corehost.cpp
 )
 list(APPEND HEADERS
-    ${CMAKE_CURRENT_LIST_DIR}/../hostfxr_resolver.h
+    ${CMAKE_CURRENT_LIST_DIR}/hostfxr_resolver.h
 )
 
 add_executable(${DOTNET_PROJECT_NAME} ${SOURCES} ${RESOURCES})
diff --git a/src/installer/corehost/cli/fx_definition.cpp b/src/native/corehost/fx_definition.cpp
similarity index 100%
rename from src/installer/corehost/cli/fx_definition.cpp
rename to src/native/corehost/fx_definition.cpp
diff --git a/src/installer/corehost/cli/fx_definition.h b/src/native/corehost/fx_definition.h
similarity index 100%
rename from src/installer/corehost/cli/fx_definition.h
rename to src/native/corehost/fx_definition.h
diff --git a/src/installer/corehost/cli/fx_reference.cpp b/src/native/corehost/fx_reference.cpp
similarity index 100%
rename from src/installer/corehost/cli/fx_reference.cpp
rename to src/native/corehost/fx_reference.cpp
diff --git a/src/installer/corehost/cli/fx_reference.h b/src/native/corehost/fx_reference.h
similarity index 100%
rename from src/installer/corehost/cli/fx_reference.h
rename to src/native/corehost/fx_reference.h
diff --git a/src/installer/corehost/cli/fxr/CMakeLists.txt b/src/native/corehost/fxr/CMakeLists.txt
similarity index 100%
rename from src/installer/corehost/cli/fxr/CMakeLists.txt
rename to src/native/corehost/fxr/CMakeLists.txt
diff --git a/src/installer/corehost/cli/fxr/command_line.cpp b/src/native/corehost/fxr/command_line.cpp
similarity index 100%
rename from src/installer/corehost/cli/fxr/command_line.cpp
rename to src/native/corehost/fxr/command_line.cpp
diff --git a/src/installer/corehost/cli/fxr/command_line.h b/src/native/corehost/fxr/command_line.h
similarity index 100%
rename from src/installer/corehost/cli/fxr/command_line.h
rename to src/native/corehost/fxr/command_line.h
diff --git a/src/installer/corehost/cli/fxr/corehost_init.cpp b/src/native/corehost/fxr/corehost_init.cpp
similarity index 100%
rename from src/installer/corehost/cli/fxr/corehost_init.cpp
rename to src/native/corehost/fxr/corehost_init.cpp
diff --git a/src/installer/corehost/cli/fxr/corehost_init.h b/src/native/corehost/fxr/corehost_init.h
similarity index 100%
rename from src/installer/corehost/cli/fxr/corehost_init.h
rename to src/native/corehost/fxr/corehost_init.h
diff --git a/src/installer/corehost/cli/fxr/files.cmake b/src/native/corehost/fxr/files.cmake
similarity index 100%
rename from src/installer/corehost/cli/fxr/files.cmake
rename to src/native/corehost/fxr/files.cmake
diff --git a/src/installer/corehost/cli/fxr/framework_info.cpp b/src/native/corehost/fxr/framework_info.cpp
similarity index 100%
rename from src/installer/corehost/cli/fxr/framework_info.cpp
rename to src/native/corehost/fxr/framework_info.cpp
diff --git a/src/installer/corehost/cli/fxr/framework_info.h b/src/native/corehost/fxr/framework_info.h
similarity index 100%
rename from src/installer/corehost/cli/fxr/framework_info.h
rename to src/native/corehost/fxr/framework_info.h
diff --git a/src/installer/corehost/cli/fxr/fx_muxer.cpp b/src/native/corehost/fxr/fx_muxer.cpp
similarity index 100%
rename from src/installer/corehost/cli/fxr/fx_muxer.cpp
rename to src/native/corehost/fxr/fx_muxer.cpp
diff --git a/src/installer/corehost/cli/fxr/fx_muxer.h b/src/native/corehost/fxr/fx_muxer.h
similarity index 100%
rename from src/installer/corehost/cli/fxr/fx_muxer.h
rename to src/native/corehost/fxr/fx_muxer.h
diff --git a/src/installer/corehost/cli/fxr/fx_resolver.cpp b/src/native/corehost/fxr/fx_resolver.cpp
similarity index 100%
rename from src/installer/corehost/cli/fxr/fx_resolver.cpp
rename to src/native/corehost/fxr/fx_resolver.cpp
diff --git a/src/installer/corehost/cli/fxr/fx_resolver.h b/src/native/corehost/fxr/fx_resolver.h
similarity index 100%
rename from src/installer/corehost/cli/fxr/fx_resolver.h
rename to src/native/corehost/fxr/fx_resolver.h
diff --git a/src/installer/corehost/cli/fxr/fx_resolver.messages.cpp b/src/native/corehost/fxr/fx_resolver.messages.cpp
similarity index 100%
rename from src/installer/corehost/cli/fxr/fx_resolver.messages.cpp
rename to src/native/corehost/fxr/fx_resolver.messages.cpp
diff --git a/src/installer/corehost/cli/fxr/fx_ver.cpp b/src/native/corehost/fxr/fx_ver.cpp
similarity index 100%
rename from src/installer/corehost/cli/fxr/fx_ver.cpp
rename to src/native/corehost/fxr/fx_ver.cpp
diff --git a/src/installer/corehost/cli/fxr/fx_ver.h b/src/native/corehost/fxr/fx_ver.h
similarity index 100%
rename from src/installer/corehost/cli/fxr/fx_ver.h
rename to src/native/corehost/fxr/fx_ver.h
diff --git a/src/installer/corehost/cli/fxr/host_context.cpp b/src/native/corehost/fxr/host_context.cpp
similarity index 100%
rename from src/installer/corehost/cli/fxr/host_context.cpp
rename to src/native/corehost/fxr/host_context.cpp
diff --git a/src/installer/corehost/cli/fxr/host_context.h b/src/native/corehost/fxr/host_context.h
similarity index 100%
rename from src/installer/corehost/cli/fxr/host_context.h
rename to src/native/corehost/fxr/host_context.h
diff --git a/src/installer/corehost/cli/fxr/hostfxr.cpp b/src/native/corehost/fxr/hostfxr.cpp
similarity index 100%
rename from src/installer/corehost/cli/fxr/hostfxr.cpp
rename to src/native/corehost/fxr/hostfxr.cpp
diff --git a/src/installer/corehost/cli/fxr/hostpolicy_resolver.h b/src/native/corehost/fxr/hostpolicy_resolver.h
similarity index 100%
rename from src/installer/corehost/cli/fxr/hostpolicy_resolver.h
rename to src/native/corehost/fxr/hostpolicy_resolver.h
diff --git a/src/installer/corehost/cli/fxr/sdk_info.cpp b/src/native/corehost/fxr/sdk_info.cpp
similarity index 100%
rename from src/installer/corehost/cli/fxr/sdk_info.cpp
rename to src/native/corehost/fxr/sdk_info.cpp
diff --git a/src/installer/corehost/cli/fxr/sdk_info.h b/src/native/corehost/fxr/sdk_info.h
similarity index 100%
rename from src/installer/corehost/cli/fxr/sdk_info.h
rename to src/native/corehost/fxr/sdk_info.h
diff --git a/src/installer/corehost/cli/fxr/sdk_resolver.cpp b/src/native/corehost/fxr/sdk_resolver.cpp
similarity index 100%
rename from src/installer/corehost/cli/fxr/sdk_resolver.cpp
rename to src/native/corehost/fxr/sdk_resolver.cpp
diff --git a/src/installer/corehost/cli/fxr/sdk_resolver.h b/src/native/corehost/fxr/sdk_resolver.h
similarity index 100%
rename from src/installer/corehost/cli/fxr/sdk_resolver.h
rename to src/native/corehost/fxr/sdk_resolver.h
diff --git a/src/installer/corehost/cli/fxr/standalone/CMakeLists.txt b/src/native/corehost/fxr/standalone/CMakeLists.txt
similarity index 100%
rename from src/installer/corehost/cli/fxr/standalone/CMakeLists.txt
rename to src/native/corehost/fxr/standalone/CMakeLists.txt
diff --git a/src/installer/corehost/cli/fxr/standalone/hostfxr.def b/src/native/corehost/fxr/standalone/hostfxr.def
similarity index 100%
rename from src/installer/corehost/cli/fxr/standalone/hostfxr.def
rename to src/native/corehost/fxr/standalone/hostfxr.def
diff --git a/src/installer/corehost/cli/fxr/standalone/hostfxr_unixexports.src b/src/native/corehost/fxr/standalone/hostfxr_unixexports.src
similarity index 100%
rename from src/installer/corehost/cli/fxr/standalone/hostfxr_unixexports.src
rename to src/native/corehost/fxr/standalone/hostfxr_unixexports.src
diff --git a/src/installer/corehost/cli/fxr/standalone/hostpolicy_resolver.cpp b/src/native/corehost/fxr/standalone/hostpolicy_resolver.cpp
similarity index 100%
rename from src/installer/corehost/cli/fxr/standalone/hostpolicy_resolver.cpp
rename to src/native/corehost/fxr/standalone/hostpolicy_resolver.cpp
diff --git a/src/installer/corehost/cli/fxr_resolver.cpp b/src/native/corehost/fxr_resolver.cpp
similarity index 100%
rename from src/installer/corehost/cli/fxr_resolver.cpp
rename to src/native/corehost/fxr_resolver.cpp
diff --git a/src/installer/corehost/cli/fxr_resolver.h b/src/native/corehost/fxr_resolver.h
similarity index 100%
rename from src/installer/corehost/cli/fxr_resolver.h
rename to src/native/corehost/fxr_resolver.h
diff --git a/src/installer/corehost/cli/host_interface.h b/src/native/corehost/host_interface.h
similarity index 100%
rename from src/installer/corehost/cli/host_interface.h
rename to src/native/corehost/host_interface.h
diff --git a/src/installer/corehost/cli/host_startup_info.cpp b/src/native/corehost/host_startup_info.cpp
similarity index 100%
rename from src/installer/corehost/cli/host_startup_info.cpp
rename to src/native/corehost/host_startup_info.cpp
diff --git a/src/installer/corehost/cli/host_startup_info.h b/src/native/corehost/host_startup_info.h
similarity index 100%
rename from src/installer/corehost/cli/host_startup_info.h
rename to src/native/corehost/host_startup_info.h
diff --git a/src/installer/corehost/cli/hostcommon/CMakeLists.txt b/src/native/corehost/hostcommon/CMakeLists.txt
similarity index 100%
rename from src/installer/corehost/cli/hostcommon/CMakeLists.txt
rename to src/native/corehost/hostcommon/CMakeLists.txt
diff --git a/src/installer/corehost/cli/hostcommon/files.cmake b/src/native/corehost/hostcommon/files.cmake
similarity index 100%
rename from src/installer/corehost/cli/hostcommon/files.cmake
rename to src/native/corehost/hostcommon/files.cmake
diff --git a/src/installer/corehost/cli/hostfxr.h b/src/native/corehost/hostfxr.h
similarity index 100%
rename from src/installer/corehost/cli/hostfxr.h
rename to src/native/corehost/hostfxr.h
diff --git a/src/installer/corehost/hostfxr_resolver.h b/src/native/corehost/hostfxr_resolver.h
similarity index 100%
rename from src/installer/corehost/hostfxr_resolver.h
rename to src/native/corehost/hostfxr_resolver.h
diff --git a/src/installer/corehost/cli/hostmisc/config.h.in b/src/native/corehost/hostmisc/config.h.in
similarity index 100%
rename from src/installer/corehost/cli/hostmisc/config.h.in
rename to src/native/corehost/hostmisc/config.h.in
diff --git a/src/installer/corehost/cli/hostmisc/configure.cmake b/src/native/corehost/hostmisc/configure.cmake
similarity index 100%
rename from src/installer/corehost/cli/hostmisc/configure.cmake
rename to src/native/corehost/hostmisc/configure.cmake
diff --git a/src/installer/corehost/cli/hostmisc/hostmisc.cmake b/src/native/corehost/hostmisc/hostmisc.cmake
similarity index 95%
rename from src/installer/corehost/cli/hostmisc/hostmisc.cmake
rename to src/native/corehost/hostmisc/hostmisc.cmake
index 2eb250bded93a8..2560446a92f7ed 100644
--- a/src/installer/corehost/cli/hostmisc/hostmisc.cmake
+++ b/src/native/corehost/hostmisc/hostmisc.cmake
@@ -20,7 +20,7 @@ list(APPEND HEADERS
     ${CMAKE_CURRENT_LIST_DIR}/trace.h
     ${CMAKE_CURRENT_LIST_DIR}/utils.h
     ${CMAKE_CURRENT_LIST_DIR}/pal.h
-    ${CMAKE_CURRENT_LIST_DIR}/../../error_codes.h
+    ${CMAKE_CURRENT_LIST_DIR}/../error_codes.h
     ${CMAKE_CURRENT_LIST_DIR}/../fxr/fx_ver.h
 )
 
diff --git a/src/installer/corehost/cli/hostmisc/longfile.h b/src/native/corehost/hostmisc/longfile.h
similarity index 100%
rename from src/installer/corehost/cli/hostmisc/longfile.h
rename to src/native/corehost/hostmisc/longfile.h
diff --git a/src/installer/corehost/cli/hostmisc/longfile.windows.cpp b/src/native/corehost/hostmisc/longfile.windows.cpp
similarity index 100%
rename from src/installer/corehost/cli/hostmisc/longfile.windows.cpp
rename to src/native/corehost/hostmisc/longfile.windows.cpp
diff --git a/src/installer/corehost/cli/hostmisc/pal.h b/src/native/corehost/hostmisc/pal.h
similarity index 100%
rename from src/installer/corehost/cli/hostmisc/pal.h
rename to src/native/corehost/hostmisc/pal.h
diff --git a/src/installer/corehost/cli/hostmisc/pal.unix.cpp b/src/native/corehost/hostmisc/pal.unix.cpp
similarity index 100%
rename from src/installer/corehost/cli/hostmisc/pal.unix.cpp
rename to src/native/corehost/hostmisc/pal.unix.cpp
diff --git a/src/installer/corehost/cli/hostmisc/pal.windows.cpp b/src/native/corehost/hostmisc/pal.windows.cpp
similarity index 100%
rename from src/installer/corehost/cli/hostmisc/pal.windows.cpp
rename to src/native/corehost/hostmisc/pal.windows.cpp
diff --git a/src/installer/corehost/cli/hostmisc/trace.cpp b/src/native/corehost/hostmisc/trace.cpp
similarity index 100%
rename from src/installer/corehost/cli/hostmisc/trace.cpp
rename to src/native/corehost/hostmisc/trace.cpp
diff --git a/src/installer/corehost/cli/hostmisc/trace.h b/src/native/corehost/hostmisc/trace.h
similarity index 100%
rename from src/installer/corehost/cli/hostmisc/trace.h
rename to src/native/corehost/hostmisc/trace.h
diff --git a/src/installer/corehost/cli/hostmisc/utils.cpp b/src/native/corehost/hostmisc/utils.cpp
similarity index 100%
rename from src/installer/corehost/cli/hostmisc/utils.cpp
rename to src/native/corehost/hostmisc/utils.cpp
diff --git a/src/installer/corehost/cli/hostmisc/utils.h b/src/native/corehost/hostmisc/utils.h
similarity index 100%
rename from src/installer/corehost/cli/hostmisc/utils.h
rename to src/native/corehost/hostmisc/utils.h
diff --git a/src/installer/corehost/cli/hostpolicy.h b/src/native/corehost/hostpolicy.h
similarity index 100%
rename from src/installer/corehost/cli/hostpolicy.h
rename to src/native/corehost/hostpolicy.h
diff --git a/src/installer/corehost/cli/hostpolicy/CMakeLists.txt b/src/native/corehost/hostpolicy/CMakeLists.txt
similarity index 100%
rename from src/installer/corehost/cli/hostpolicy/CMakeLists.txt
rename to src/native/corehost/hostpolicy/CMakeLists.txt
diff --git a/src/installer/corehost/cli/hostpolicy/args.cpp b/src/native/corehost/hostpolicy/args.cpp
similarity index 100%
rename from src/installer/corehost/cli/hostpolicy/args.cpp
rename to src/native/corehost/hostpolicy/args.cpp
diff --git a/src/installer/corehost/cli/hostpolicy/args.h b/src/native/corehost/hostpolicy/args.h
similarity index 100%
rename from src/installer/corehost/cli/hostpolicy/args.h
rename to src/native/corehost/hostpolicy/args.h
diff --git a/src/installer/corehost/cli/hostpolicy/breadcrumbs.cpp b/src/native/corehost/hostpolicy/breadcrumbs.cpp
similarity index 100%
rename from src/installer/corehost/cli/hostpolicy/breadcrumbs.cpp
rename to src/native/corehost/hostpolicy/breadcrumbs.cpp
diff --git a/src/installer/corehost/cli/hostpolicy/breadcrumbs.h b/src/native/corehost/hostpolicy/breadcrumbs.h
similarity index 100%
rename from src/installer/corehost/cli/hostpolicy/breadcrumbs.h
rename to src/native/corehost/hostpolicy/breadcrumbs.h
diff --git a/src/installer/corehost/cli/hostpolicy/coreclr.cpp b/src/native/corehost/hostpolicy/coreclr.cpp
similarity index 100%
rename from src/installer/corehost/cli/hostpolicy/coreclr.cpp
rename to src/native/corehost/hostpolicy/coreclr.cpp
diff --git a/src/installer/corehost/cli/hostpolicy/coreclr.h b/src/native/corehost/hostpolicy/coreclr.h
similarity index 100%
rename from src/installer/corehost/cli/hostpolicy/coreclr.h
rename to src/native/corehost/hostpolicy/coreclr.h
diff --git a/src/installer/corehost/cli/hostpolicy/deps_resolver.cpp b/src/native/corehost/hostpolicy/deps_resolver.cpp
similarity index 100%
rename from src/installer/corehost/cli/hostpolicy/deps_resolver.cpp
rename to src/native/corehost/hostpolicy/deps_resolver.cpp
diff --git a/src/installer/corehost/cli/hostpolicy/deps_resolver.h b/src/native/corehost/hostpolicy/deps_resolver.h
similarity index 100%
rename from src/installer/corehost/cli/hostpolicy/deps_resolver.h
rename to src/native/corehost/hostpolicy/deps_resolver.h
diff --git a/src/installer/corehost/cli/hostpolicy/files.cmake b/src/native/corehost/hostpolicy/files.cmake
similarity index 96%
rename from src/installer/corehost/cli/hostpolicy/files.cmake
rename to src/native/corehost/hostpolicy/files.cmake
index 0dfabb55135b83..3c2532bd0b2df5 100644
--- a/src/installer/corehost/cli/hostpolicy/files.cmake
+++ b/src/native/corehost/hostpolicy/files.cmake
@@ -35,6 +35,5 @@ list(APPEND HEADERS
     ${CMAKE_CURRENT_LIST_DIR}/../bundle/file_entry.h
     ${CMAKE_CURRENT_LIST_DIR}/../bundle/manifest.h
     ${CMAKE_CURRENT_LIST_DIR}/../bundle/runner.h
-    ${CMAKE_CURRENT_LIST_DIR}/../../coreclr_resolver.h
+    ${CMAKE_CURRENT_LIST_DIR}/../coreclr_resolver.h
 )
-
diff --git a/src/installer/corehost/cli/hostpolicy/hostpolicy.cpp b/src/native/corehost/hostpolicy/hostpolicy.cpp
similarity index 100%
rename from src/installer/corehost/cli/hostpolicy/hostpolicy.cpp
rename to src/native/corehost/hostpolicy/hostpolicy.cpp
diff --git a/src/installer/corehost/cli/hostpolicy/hostpolicy_context.cpp b/src/native/corehost/hostpolicy/hostpolicy_context.cpp
similarity index 100%
rename from src/installer/corehost/cli/hostpolicy/hostpolicy_context.cpp
rename to src/native/corehost/hostpolicy/hostpolicy_context.cpp
diff --git a/src/installer/corehost/cli/hostpolicy/hostpolicy_context.h b/src/native/corehost/hostpolicy/hostpolicy_context.h
similarity index 100%
rename from src/installer/corehost/cli/hostpolicy/hostpolicy_context.h
rename to src/native/corehost/hostpolicy/hostpolicy_context.h
diff --git a/src/installer/corehost/cli/hostpolicy/hostpolicy_init.cpp b/src/native/corehost/hostpolicy/hostpolicy_init.cpp
similarity index 100%
rename from src/installer/corehost/cli/hostpolicy/hostpolicy_init.cpp
rename to src/native/corehost/hostpolicy/hostpolicy_init.cpp
diff --git a/src/installer/corehost/cli/hostpolicy/hostpolicy_init.h b/src/native/corehost/hostpolicy/hostpolicy_init.h
similarity index 100%
rename from src/installer/corehost/cli/hostpolicy/hostpolicy_init.h
rename to src/native/corehost/hostpolicy/hostpolicy_init.h
diff --git a/src/installer/corehost/cli/hostpolicy/standalone/CMakeLists.txt b/src/native/corehost/hostpolicy/standalone/CMakeLists.txt
similarity index 100%
rename from src/installer/corehost/cli/hostpolicy/standalone/CMakeLists.txt
rename to src/native/corehost/hostpolicy/standalone/CMakeLists.txt
diff --git a/src/installer/corehost/cli/hostpolicy/standalone/coreclr_resolver.cpp b/src/native/corehost/hostpolicy/standalone/coreclr_resolver.cpp
similarity index 100%
rename from src/installer/corehost/cli/hostpolicy/standalone/coreclr_resolver.cpp
rename to src/native/corehost/hostpolicy/standalone/coreclr_resolver.cpp
diff --git a/src/installer/corehost/cli/hostpolicy/standalone/hostpolicy.def b/src/native/corehost/hostpolicy/standalone/hostpolicy.def
similarity index 100%
rename from src/installer/corehost/cli/hostpolicy/standalone/hostpolicy.def
rename to src/native/corehost/hostpolicy/standalone/hostpolicy.def
diff --git a/src/installer/corehost/cli/hostpolicy/standalone/hostpolicy_unixexports.src b/src/native/corehost/hostpolicy/standalone/hostpolicy_unixexports.src
similarity index 100%
rename from src/installer/corehost/cli/hostpolicy/standalone/hostpolicy_unixexports.src
rename to src/native/corehost/hostpolicy/standalone/hostpolicy_unixexports.src
diff --git a/src/installer/corehost/cli/hostpolicy/static/coreclr_resolver.cpp b/src/native/corehost/hostpolicy/static/coreclr_resolver.cpp
similarity index 100%
rename from src/installer/corehost/cli/hostpolicy/static/coreclr_resolver.cpp
rename to src/native/corehost/hostpolicy/static/coreclr_resolver.cpp
diff --git a/src/installer/corehost/cli/ijwhost/CMakeLists.txt b/src/native/corehost/ijwhost/CMakeLists.txt
similarity index 100%
rename from src/installer/corehost/cli/ijwhost/CMakeLists.txt
rename to src/native/corehost/ijwhost/CMakeLists.txt
diff --git a/src/installer/corehost/cli/ijwhost/Exports.def b/src/native/corehost/ijwhost/Exports.def
similarity index 100%
rename from src/installer/corehost/cli/ijwhost/Exports.def
rename to src/native/corehost/ijwhost/Exports.def
diff --git a/src/installer/corehost/cli/ijwhost/amd64/asmhelpers.asm b/src/native/corehost/ijwhost/amd64/asmhelpers.asm
similarity index 100%
rename from src/installer/corehost/cli/ijwhost/amd64/asmhelpers.asm
rename to src/native/corehost/ijwhost/amd64/asmhelpers.asm
diff --git a/src/installer/corehost/cli/ijwhost/amd64/asmmacros.inc b/src/native/corehost/ijwhost/amd64/asmmacros.inc
similarity index 100%
rename from src/installer/corehost/cli/ijwhost/amd64/asmmacros.inc
rename to src/native/corehost/ijwhost/amd64/asmmacros.inc
diff --git a/src/installer/corehost/cli/ijwhost/amd64/bootstrap_thunk.cpp b/src/native/corehost/ijwhost/amd64/bootstrap_thunk.cpp
similarity index 100%
rename from src/installer/corehost/cli/ijwhost/amd64/bootstrap_thunk.cpp
rename to src/native/corehost/ijwhost/amd64/bootstrap_thunk.cpp
diff --git a/src/installer/corehost/cli/ijwhost/amd64/bootstrap_thunk.h b/src/native/corehost/ijwhost/amd64/bootstrap_thunk.h
similarity index 100%
rename from src/installer/corehost/cli/ijwhost/amd64/bootstrap_thunk.h
rename to src/native/corehost/ijwhost/amd64/bootstrap_thunk.h
diff --git a/src/installer/corehost/cli/ijwhost/arm/asmhelpers.asm b/src/native/corehost/ijwhost/arm/asmhelpers.asm
similarity index 100%
rename from src/installer/corehost/cli/ijwhost/arm/asmhelpers.asm
rename to src/native/corehost/ijwhost/arm/asmhelpers.asm
diff --git a/src/installer/corehost/cli/ijwhost/arm/bootstrap_thunk.cpp b/src/native/corehost/ijwhost/arm/bootstrap_thunk.cpp
similarity index 100%
rename from src/installer/corehost/cli/ijwhost/arm/bootstrap_thunk.cpp
rename to src/native/corehost/ijwhost/arm/bootstrap_thunk.cpp
diff --git a/src/installer/corehost/cli/ijwhost/arm/bootstrap_thunk.h b/src/native/corehost/ijwhost/arm/bootstrap_thunk.h
similarity index 100%
rename from src/installer/corehost/cli/ijwhost/arm/bootstrap_thunk.h
rename to src/native/corehost/ijwhost/arm/bootstrap_thunk.h
diff --git a/src/installer/corehost/cli/ijwhost/arm64/asmhelpers.asm b/src/native/corehost/ijwhost/arm64/asmhelpers.asm
similarity index 100%
rename from src/installer/corehost/cli/ijwhost/arm64/asmhelpers.asm
rename to src/native/corehost/ijwhost/arm64/asmhelpers.asm
diff --git a/src/installer/corehost/cli/ijwhost/arm64/bootstrap_thunk.cpp b/src/native/corehost/ijwhost/arm64/bootstrap_thunk.cpp
similarity index 100%
rename from src/installer/corehost/cli/ijwhost/arm64/bootstrap_thunk.cpp
rename to src/native/corehost/ijwhost/arm64/bootstrap_thunk.cpp
diff --git a/src/installer/corehost/cli/ijwhost/arm64/bootstrap_thunk.h b/src/native/corehost/ijwhost/arm64/bootstrap_thunk.h
similarity index 100%
rename from src/installer/corehost/cli/ijwhost/arm64/bootstrap_thunk.h
rename to src/native/corehost/ijwhost/arm64/bootstrap_thunk.h
diff --git a/src/installer/corehost/cli/ijwhost/bootstrap_thunk_chunk.cpp b/src/native/corehost/ijwhost/bootstrap_thunk_chunk.cpp
similarity index 100%
rename from src/installer/corehost/cli/ijwhost/bootstrap_thunk_chunk.cpp
rename to src/native/corehost/ijwhost/bootstrap_thunk_chunk.cpp
diff --git a/src/installer/corehost/cli/ijwhost/bootstrap_thunk_chunk.h b/src/native/corehost/ijwhost/bootstrap_thunk_chunk.h
similarity index 100%
rename from src/installer/corehost/cli/ijwhost/bootstrap_thunk_chunk.h
rename to src/native/corehost/ijwhost/bootstrap_thunk_chunk.h
diff --git a/src/installer/corehost/cli/ijwhost/corhdr.h b/src/native/corehost/ijwhost/corhdr.h
similarity index 100%
rename from src/installer/corehost/cli/ijwhost/corhdr.h
rename to src/native/corehost/ijwhost/corhdr.h
diff --git a/src/installer/corehost/cli/ijwhost/i386/asmhelpers.asm b/src/native/corehost/ijwhost/i386/asmhelpers.asm
similarity index 100%
rename from src/installer/corehost/cli/ijwhost/i386/asmhelpers.asm
rename to src/native/corehost/ijwhost/i386/asmhelpers.asm
diff --git a/src/installer/corehost/cli/ijwhost/i386/bootstrap_thunk.cpp b/src/native/corehost/ijwhost/i386/bootstrap_thunk.cpp
similarity index 100%
rename from src/installer/corehost/cli/ijwhost/i386/bootstrap_thunk.cpp
rename to src/native/corehost/ijwhost/i386/bootstrap_thunk.cpp
diff --git a/src/installer/corehost/cli/ijwhost/i386/bootstrap_thunk.h b/src/native/corehost/ijwhost/i386/bootstrap_thunk.h
similarity index 100%
rename from src/installer/corehost/cli/ijwhost/i386/bootstrap_thunk.h
rename to src/native/corehost/ijwhost/i386/bootstrap_thunk.h
diff --git a/src/installer/corehost/cli/ijwhost/ijwhost.cpp b/src/native/corehost/ijwhost/ijwhost.cpp
similarity index 100%
rename from src/installer/corehost/cli/ijwhost/ijwhost.cpp
rename to src/native/corehost/ijwhost/ijwhost.cpp
diff --git a/src/installer/corehost/cli/ijwhost/ijwhost.h b/src/native/corehost/ijwhost/ijwhost.h
similarity index 100%
rename from src/installer/corehost/cli/ijwhost/ijwhost.h
rename to src/native/corehost/ijwhost/ijwhost.h
diff --git a/src/installer/corehost/cli/ijwhost/ijwthunk.cpp b/src/native/corehost/ijwhost/ijwthunk.cpp
similarity index 100%
rename from src/installer/corehost/cli/ijwhost/ijwthunk.cpp
rename to src/native/corehost/ijwhost/ijwthunk.cpp
diff --git a/src/installer/corehost/cli/ijwhost/pedecoder.cpp b/src/native/corehost/ijwhost/pedecoder.cpp
similarity index 100%
rename from src/installer/corehost/cli/ijwhost/pedecoder.cpp
rename to src/native/corehost/ijwhost/pedecoder.cpp
diff --git a/src/installer/corehost/cli/ijwhost/pedecoder.h b/src/native/corehost/ijwhost/pedecoder.h
similarity index 100%
rename from src/installer/corehost/cli/ijwhost/pedecoder.h
rename to src/native/corehost/ijwhost/pedecoder.h
diff --git a/src/installer/corehost/cli/json/rapidjson/README.TXT b/src/native/corehost/json/rapidjson/README.TXT
similarity index 100%
rename from src/installer/corehost/cli/json/rapidjson/README.TXT
rename to src/native/corehost/json/rapidjson/README.TXT
diff --git a/src/installer/corehost/cli/json/rapidjson/allocators.h b/src/native/corehost/json/rapidjson/allocators.h
similarity index 100%
rename from src/installer/corehost/cli/json/rapidjson/allocators.h
rename to src/native/corehost/json/rapidjson/allocators.h
diff --git a/src/installer/corehost/cli/json/rapidjson/cursorstreamwrapper.h b/src/native/corehost/json/rapidjson/cursorstreamwrapper.h
similarity index 100%
rename from src/installer/corehost/cli/json/rapidjson/cursorstreamwrapper.h
rename to src/native/corehost/json/rapidjson/cursorstreamwrapper.h
diff --git a/src/installer/corehost/cli/json/rapidjson/document.h b/src/native/corehost/json/rapidjson/document.h
similarity index 100%
rename from src/installer/corehost/cli/json/rapidjson/document.h
rename to src/native/corehost/json/rapidjson/document.h
diff --git a/src/installer/corehost/cli/json/rapidjson/encodedstream.h b/src/native/corehost/json/rapidjson/encodedstream.h
similarity index 100%
rename from src/installer/corehost/cli/json/rapidjson/encodedstream.h
rename to src/native/corehost/json/rapidjson/encodedstream.h
diff --git a/src/installer/corehost/cli/json/rapidjson/encodings.h b/src/native/corehost/json/rapidjson/encodings.h
similarity index 100%
rename from src/installer/corehost/cli/json/rapidjson/encodings.h
rename to src/native/corehost/json/rapidjson/encodings.h
diff --git a/src/installer/corehost/cli/json/rapidjson/error/en.h b/src/native/corehost/json/rapidjson/error/en.h
similarity index 100%
rename from src/installer/corehost/cli/json/rapidjson/error/en.h
rename to src/native/corehost/json/rapidjson/error/en.h
diff --git a/src/installer/corehost/cli/json/rapidjson/error/error.h b/src/native/corehost/json/rapidjson/error/error.h
similarity index 100%
rename from src/installer/corehost/cli/json/rapidjson/error/error.h
rename to src/native/corehost/json/rapidjson/error/error.h
diff --git a/src/installer/corehost/cli/json/rapidjson/filereadstream.h b/src/native/corehost/json/rapidjson/filereadstream.h
similarity index 100%
rename from src/installer/corehost/cli/json/rapidjson/filereadstream.h
rename to src/native/corehost/json/rapidjson/filereadstream.h
diff --git a/src/installer/corehost/cli/json/rapidjson/filewritestream.h b/src/native/corehost/json/rapidjson/filewritestream.h
similarity index 100%
rename from src/installer/corehost/cli/json/rapidjson/filewritestream.h
rename to src/native/corehost/json/rapidjson/filewritestream.h
diff --git a/src/installer/corehost/cli/json/rapidjson/fwd.h b/src/native/corehost/json/rapidjson/fwd.h
similarity index 100%
rename from src/installer/corehost/cli/json/rapidjson/fwd.h
rename to src/native/corehost/json/rapidjson/fwd.h
diff --git a/src/installer/corehost/cli/json/rapidjson/internal/biginteger.h b/src/native/corehost/json/rapidjson/internal/biginteger.h
similarity index 100%
rename from src/installer/corehost/cli/json/rapidjson/internal/biginteger.h
rename to src/native/corehost/json/rapidjson/internal/biginteger.h
diff --git a/src/installer/corehost/cli/json/rapidjson/internal/diyfp.h b/src/native/corehost/json/rapidjson/internal/diyfp.h
similarity index 100%
rename from src/installer/corehost/cli/json/rapidjson/internal/diyfp.h
rename to src/native/corehost/json/rapidjson/internal/diyfp.h
diff --git a/src/installer/corehost/cli/json/rapidjson/internal/dtoa.h b/src/native/corehost/json/rapidjson/internal/dtoa.h
similarity index 100%
rename from src/installer/corehost/cli/json/rapidjson/internal/dtoa.h
rename to src/native/corehost/json/rapidjson/internal/dtoa.h
diff --git a/src/installer/corehost/cli/json/rapidjson/internal/ieee754.h b/src/native/corehost/json/rapidjson/internal/ieee754.h
similarity index 100%
rename from src/installer/corehost/cli/json/rapidjson/internal/ieee754.h
rename to src/native/corehost/json/rapidjson/internal/ieee754.h
diff --git a/src/installer/corehost/cli/json/rapidjson/internal/itoa.h b/src/native/corehost/json/rapidjson/internal/itoa.h
similarity index 100%
rename from src/installer/corehost/cli/json/rapidjson/internal/itoa.h
rename to src/native/corehost/json/rapidjson/internal/itoa.h
diff --git a/src/installer/corehost/cli/json/rapidjson/internal/meta.h b/src/native/corehost/json/rapidjson/internal/meta.h
similarity index 100%
rename from src/installer/corehost/cli/json/rapidjson/internal/meta.h
rename to src/native/corehost/json/rapidjson/internal/meta.h
diff --git a/src/installer/corehost/cli/json/rapidjson/internal/pow10.h b/src/native/corehost/json/rapidjson/internal/pow10.h
similarity index 100%
rename from src/installer/corehost/cli/json/rapidjson/internal/pow10.h
rename to src/native/corehost/json/rapidjson/internal/pow10.h
diff --git a/src/installer/corehost/cli/json/rapidjson/internal/regex.h b/src/native/corehost/json/rapidjson/internal/regex.h
similarity index 100%
rename from src/installer/corehost/cli/json/rapidjson/internal/regex.h
rename to src/native/corehost/json/rapidjson/internal/regex.h
diff --git a/src/installer/corehost/cli/json/rapidjson/internal/stack.h b/src/native/corehost/json/rapidjson/internal/stack.h
similarity index 100%
rename from src/installer/corehost/cli/json/rapidjson/internal/stack.h
rename to src/native/corehost/json/rapidjson/internal/stack.h
diff --git a/src/installer/corehost/cli/json/rapidjson/internal/strfunc.h b/src/native/corehost/json/rapidjson/internal/strfunc.h
similarity index 100%
rename from src/installer/corehost/cli/json/rapidjson/internal/strfunc.h
rename to src/native/corehost/json/rapidjson/internal/strfunc.h
diff --git a/src/installer/corehost/cli/json/rapidjson/internal/strtod.h b/src/native/corehost/json/rapidjson/internal/strtod.h
similarity index 100%
rename from src/installer/corehost/cli/json/rapidjson/internal/strtod.h
rename to src/native/corehost/json/rapidjson/internal/strtod.h
diff --git a/src/installer/corehost/cli/json/rapidjson/internal/swap.h b/src/native/corehost/json/rapidjson/internal/swap.h
similarity index 100%
rename from src/installer/corehost/cli/json/rapidjson/internal/swap.h
rename to src/native/corehost/json/rapidjson/internal/swap.h
diff --git a/src/installer/corehost/cli/json/rapidjson/istreamwrapper.h b/src/native/corehost/json/rapidjson/istreamwrapper.h
similarity index 100%
rename from src/installer/corehost/cli/json/rapidjson/istreamwrapper.h
rename to src/native/corehost/json/rapidjson/istreamwrapper.h
diff --git a/src/installer/corehost/cli/json/rapidjson/memorybuffer.h b/src/native/corehost/json/rapidjson/memorybuffer.h
similarity index 100%
rename from src/installer/corehost/cli/json/rapidjson/memorybuffer.h
rename to src/native/corehost/json/rapidjson/memorybuffer.h
diff --git a/src/installer/corehost/cli/json/rapidjson/memorystream.h b/src/native/corehost/json/rapidjson/memorystream.h
similarity index 100%
rename from src/installer/corehost/cli/json/rapidjson/memorystream.h
rename to src/native/corehost/json/rapidjson/memorystream.h
diff --git a/src/installer/corehost/cli/json/rapidjson/msinttypes/inttypes.h b/src/native/corehost/json/rapidjson/msinttypes/inttypes.h
similarity index 100%
rename from src/installer/corehost/cli/json/rapidjson/msinttypes/inttypes.h
rename to src/native/corehost/json/rapidjson/msinttypes/inttypes.h
diff --git a/src/installer/corehost/cli/json/rapidjson/msinttypes/stdint.h b/src/native/corehost/json/rapidjson/msinttypes/stdint.h
similarity index 100%
rename from src/installer/corehost/cli/json/rapidjson/msinttypes/stdint.h
rename to src/native/corehost/json/rapidjson/msinttypes/stdint.h
diff --git a/src/installer/corehost/cli/json/rapidjson/ostreamwrapper.h b/src/native/corehost/json/rapidjson/ostreamwrapper.h
similarity index 100%
rename from src/installer/corehost/cli/json/rapidjson/ostreamwrapper.h
rename to src/native/corehost/json/rapidjson/ostreamwrapper.h
diff --git a/src/installer/corehost/cli/json/rapidjson/pointer.h b/src/native/corehost/json/rapidjson/pointer.h
similarity index 100%
rename from src/installer/corehost/cli/json/rapidjson/pointer.h
rename to src/native/corehost/json/rapidjson/pointer.h
diff --git a/src/installer/corehost/cli/json/rapidjson/prettywriter.h b/src/native/corehost/json/rapidjson/prettywriter.h
similarity index 100%
rename from src/installer/corehost/cli/json/rapidjson/prettywriter.h
rename to src/native/corehost/json/rapidjson/prettywriter.h
diff --git a/src/installer/corehost/cli/json/rapidjson/rapidjson.h b/src/native/corehost/json/rapidjson/rapidjson.h
similarity index 100%
rename from src/installer/corehost/cli/json/rapidjson/rapidjson.h
rename to src/native/corehost/json/rapidjson/rapidjson.h
diff --git a/src/installer/corehost/cli/json/rapidjson/reader.h b/src/native/corehost/json/rapidjson/reader.h
similarity index 100%
rename from src/installer/corehost/cli/json/rapidjson/reader.h
rename to src/native/corehost/json/rapidjson/reader.h
diff --git a/src/installer/corehost/cli/json/rapidjson/schema.h b/src/native/corehost/json/rapidjson/schema.h
similarity index 100%
rename from src/installer/corehost/cli/json/rapidjson/schema.h
rename to src/native/corehost/json/rapidjson/schema.h
diff --git a/src/installer/corehost/cli/json/rapidjson/stream.h b/src/native/corehost/json/rapidjson/stream.h
similarity index 100%
rename from src/installer/corehost/cli/json/rapidjson/stream.h
rename to src/native/corehost/json/rapidjson/stream.h
diff --git a/src/installer/corehost/cli/json/rapidjson/stringbuffer.h b/src/native/corehost/json/rapidjson/stringbuffer.h
similarity index 100%
rename from src/installer/corehost/cli/json/rapidjson/stringbuffer.h
rename to src/native/corehost/json/rapidjson/stringbuffer.h
diff --git a/src/installer/corehost/cli/json/rapidjson/writer.h b/src/native/corehost/json/rapidjson/writer.h
similarity index 100%
rename from src/installer/corehost/cli/json/rapidjson/writer.h
rename to src/native/corehost/json/rapidjson/writer.h
diff --git a/src/installer/corehost/cli/json_parser.cpp b/src/native/corehost/json_parser.cpp
similarity index 100%
rename from src/installer/corehost/cli/json_parser.cpp
rename to src/native/corehost/json_parser.cpp
diff --git a/src/installer/corehost/cli/json_parser.h b/src/native/corehost/json_parser.h
similarity index 100%
rename from src/installer/corehost/cli/json_parser.h
rename to src/native/corehost/json_parser.h
diff --git a/src/installer/corehost/cli/lib.cmake b/src/native/corehost/lib.cmake
similarity index 100%
rename from src/installer/corehost/cli/lib.cmake
rename to src/native/corehost/lib.cmake
diff --git a/src/installer/corehost/cli/lib_static.cmake b/src/native/corehost/lib_static.cmake
similarity index 100%
rename from src/installer/corehost/cli/lib_static.cmake
rename to src/native/corehost/lib_static.cmake
diff --git a/src/installer/corehost/cli/native.rc b/src/native/corehost/native.rc
similarity index 100%
rename from src/installer/corehost/cli/native.rc
rename to src/native/corehost/native.rc
diff --git a/src/installer/corehost/cli/nethost/CMakeLists.txt b/src/native/corehost/nethost/CMakeLists.txt
similarity index 100%
rename from src/installer/corehost/cli/nethost/CMakeLists.txt
rename to src/native/corehost/nethost/CMakeLists.txt
diff --git a/src/installer/corehost/cli/nethost/Exports.def b/src/native/corehost/nethost/Exports.def
similarity index 100%
rename from src/installer/corehost/cli/nethost/Exports.def
rename to src/native/corehost/nethost/Exports.def
diff --git a/src/installer/corehost/cli/nethost/nethost.cpp b/src/native/corehost/nethost/nethost.cpp
similarity index 100%
rename from src/installer/corehost/cli/nethost/nethost.cpp
rename to src/native/corehost/nethost/nethost.cpp
diff --git a/src/installer/corehost/cli/nethost/nethost.h b/src/native/corehost/nethost/nethost.h
similarity index 100%
rename from src/installer/corehost/cli/nethost/nethost.h
rename to src/native/corehost/nethost/nethost.h
diff --git a/src/installer/corehost/cli/redirected_error_writer.cpp b/src/native/corehost/redirected_error_writer.cpp
similarity index 100%
rename from src/installer/corehost/cli/redirected_error_writer.cpp
rename to src/native/corehost/redirected_error_writer.cpp
diff --git a/src/installer/corehost/cli/redirected_error_writer.h b/src/native/corehost/redirected_error_writer.h
similarity index 100%
rename from src/installer/corehost/cli/redirected_error_writer.h
rename to src/native/corehost/redirected_error_writer.h
diff --git a/src/installer/corehost/cli/roll_forward_option.cpp b/src/native/corehost/roll_forward_option.cpp
similarity index 100%
rename from src/installer/corehost/cli/roll_forward_option.cpp
rename to src/native/corehost/roll_forward_option.cpp
diff --git a/src/installer/corehost/cli/roll_forward_option.h b/src/native/corehost/roll_forward_option.h
similarity index 100%
rename from src/installer/corehost/cli/roll_forward_option.h
rename to src/native/corehost/roll_forward_option.h
diff --git a/src/installer/corehost/cli/roll_fwd_on_no_candidate_fx_option.h b/src/native/corehost/roll_fwd_on_no_candidate_fx_option.h
similarity index 100%
rename from src/installer/corehost/cli/roll_fwd_on_no_candidate_fx_option.h
rename to src/native/corehost/roll_fwd_on_no_candidate_fx_option.h
diff --git a/src/installer/corehost/cli/runtime_config.cpp b/src/native/corehost/runtime_config.cpp
similarity index 100%
rename from src/installer/corehost/cli/runtime_config.cpp
rename to src/native/corehost/runtime_config.cpp
diff --git a/src/installer/corehost/cli/runtime_config.h b/src/native/corehost/runtime_config.h
similarity index 100%
rename from src/installer/corehost/cli/runtime_config.h
rename to src/native/corehost/runtime_config.h
diff --git a/src/installer/corehost/cli/setup.cmake b/src/native/corehost/setup.cmake
similarity index 100%
rename from src/installer/corehost/cli/setup.cmake
rename to src/native/corehost/setup.cmake
diff --git a/src/installer/corehost/cli/test/CMakeLists.txt b/src/native/corehost/test/CMakeLists.txt
similarity index 100%
rename from src/installer/corehost/cli/test/CMakeLists.txt
rename to src/native/corehost/test/CMakeLists.txt
diff --git a/src/installer/corehost/cli/test/mockcoreclr/CMakeLists.txt b/src/native/corehost/test/mockcoreclr/CMakeLists.txt
similarity index 100%
rename from src/installer/corehost/cli/test/mockcoreclr/CMakeLists.txt
rename to src/native/corehost/test/mockcoreclr/CMakeLists.txt
diff --git a/src/installer/corehost/cli/test/mockcoreclr/mockcoreclr.cpp b/src/native/corehost/test/mockcoreclr/mockcoreclr.cpp
similarity index 100%
rename from src/installer/corehost/cli/test/mockcoreclr/mockcoreclr.cpp
rename to src/native/corehost/test/mockcoreclr/mockcoreclr.cpp
diff --git a/src/installer/corehost/cli/test/mockcoreclr/mockcoreclr.def b/src/native/corehost/test/mockcoreclr/mockcoreclr.def
similarity index 100%
rename from src/installer/corehost/cli/test/mockcoreclr/mockcoreclr.def
rename to src/native/corehost/test/mockcoreclr/mockcoreclr.def
diff --git a/src/installer/corehost/cli/test/mockcoreclr/mockcoreclr.h b/src/native/corehost/test/mockcoreclr/mockcoreclr.h
similarity index 100%
rename from src/installer/corehost/cli/test/mockcoreclr/mockcoreclr.h
rename to src/native/corehost/test/mockcoreclr/mockcoreclr.h
diff --git a/src/installer/corehost/cli/test/mockhostfxr/CMakeLists.txt b/src/native/corehost/test/mockhostfxr/CMakeLists.txt
similarity index 100%
rename from src/installer/corehost/cli/test/mockhostfxr/CMakeLists.txt
rename to src/native/corehost/test/mockhostfxr/CMakeLists.txt
diff --git a/src/installer/corehost/cli/test/mockhostfxr/mockhostfxr.cpp b/src/native/corehost/test/mockhostfxr/mockhostfxr.cpp
similarity index 100%
rename from src/installer/corehost/cli/test/mockhostfxr/mockhostfxr.cpp
rename to src/native/corehost/test/mockhostfxr/mockhostfxr.cpp
diff --git a/src/installer/corehost/cli/test/mockhostpolicy/CMakeLists.txt b/src/native/corehost/test/mockhostpolicy/CMakeLists.txt
similarity index 100%
rename from src/installer/corehost/cli/test/mockhostpolicy/CMakeLists.txt
rename to src/native/corehost/test/mockhostpolicy/CMakeLists.txt
diff --git a/src/installer/corehost/cli/test/mockhostpolicy/mockhostpolicy.cpp b/src/native/corehost/test/mockhostpolicy/mockhostpolicy.cpp
similarity index 100%
rename from src/installer/corehost/cli/test/mockhostpolicy/mockhostpolicy.cpp
rename to src/native/corehost/test/mockhostpolicy/mockhostpolicy.cpp
diff --git a/src/installer/corehost/cli/test/nativehost/CMakeLists.txt b/src/native/corehost/test/nativehost/CMakeLists.txt
similarity index 100%
rename from src/installer/corehost/cli/test/nativehost/CMakeLists.txt
rename to src/native/corehost/test/nativehost/CMakeLists.txt
diff --git a/src/installer/corehost/cli/test/nativehost/comhost_test.cpp b/src/native/corehost/test/nativehost/comhost_test.cpp
similarity index 100%
rename from src/installer/corehost/cli/test/nativehost/comhost_test.cpp
rename to src/native/corehost/test/nativehost/comhost_test.cpp
diff --git a/src/installer/corehost/cli/test/nativehost/comhost_test.h b/src/native/corehost/test/nativehost/comhost_test.h
similarity index 100%
rename from src/installer/corehost/cli/test/nativehost/comhost_test.h
rename to src/native/corehost/test/nativehost/comhost_test.h
diff --git a/src/installer/corehost/cli/test/nativehost/error_writer_redirector.cpp b/src/native/corehost/test/nativehost/error_writer_redirector.cpp
similarity index 100%
rename from src/installer/corehost/cli/test/nativehost/error_writer_redirector.cpp
rename to src/native/corehost/test/nativehost/error_writer_redirector.cpp
diff --git a/src/installer/corehost/cli/test/nativehost/error_writer_redirector.h b/src/native/corehost/test/nativehost/error_writer_redirector.h
similarity index 100%
rename from src/installer/corehost/cli/test/nativehost/error_writer_redirector.h
rename to src/native/corehost/test/nativehost/error_writer_redirector.h
diff --git a/src/installer/corehost/cli/test/nativehost/get_native_search_directories_test.cpp b/src/native/corehost/test/nativehost/get_native_search_directories_test.cpp
similarity index 100%
rename from src/installer/corehost/cli/test/nativehost/get_native_search_directories_test.cpp
rename to src/native/corehost/test/nativehost/get_native_search_directories_test.cpp
diff --git a/src/installer/corehost/cli/test/nativehost/get_native_search_directories_test.h b/src/native/corehost/test/nativehost/get_native_search_directories_test.h
similarity index 100%
rename from src/installer/corehost/cli/test/nativehost/get_native_search_directories_test.h
rename to src/native/corehost/test/nativehost/get_native_search_directories_test.h
diff --git a/src/installer/corehost/cli/test/nativehost/host_context_test.cpp b/src/native/corehost/test/nativehost/host_context_test.cpp
similarity index 100%
rename from src/installer/corehost/cli/test/nativehost/host_context_test.cpp
rename to src/native/corehost/test/nativehost/host_context_test.cpp
diff --git a/src/installer/corehost/cli/test/nativehost/host_context_test.h b/src/native/corehost/test/nativehost/host_context_test.h
similarity index 100%
rename from src/installer/corehost/cli/test/nativehost/host_context_test.h
rename to src/native/corehost/test/nativehost/host_context_test.h
diff --git a/src/installer/corehost/cli/test/nativehost/hostfxr_exports.cpp b/src/native/corehost/test/nativehost/hostfxr_exports.cpp
similarity index 100%
rename from src/installer/corehost/cli/test/nativehost/hostfxr_exports.cpp
rename to src/native/corehost/test/nativehost/hostfxr_exports.cpp
diff --git a/src/installer/corehost/cli/test/nativehost/hostfxr_exports.h b/src/native/corehost/test/nativehost/hostfxr_exports.h
similarity index 100%
rename from src/installer/corehost/cli/test/nativehost/hostfxr_exports.h
rename to src/native/corehost/test/nativehost/hostfxr_exports.h
diff --git a/src/installer/corehost/cli/test/nativehost/hostpolicy_exports.cpp b/src/native/corehost/test/nativehost/hostpolicy_exports.cpp
similarity index 100%
rename from src/installer/corehost/cli/test/nativehost/hostpolicy_exports.cpp
rename to src/native/corehost/test/nativehost/hostpolicy_exports.cpp
diff --git a/src/installer/corehost/cli/test/nativehost/hostpolicy_exports.h b/src/native/corehost/test/nativehost/hostpolicy_exports.h
similarity index 100%
rename from src/installer/corehost/cli/test/nativehost/hostpolicy_exports.h
rename to src/native/corehost/test/nativehost/hostpolicy_exports.h
diff --git a/src/installer/corehost/cli/test/nativehost/nativehost.cpp b/src/native/corehost/test/nativehost/nativehost.cpp
similarity index 100%
rename from src/installer/corehost/cli/test/nativehost/nativehost.cpp
rename to src/native/corehost/test/nativehost/nativehost.cpp
diff --git a/src/installer/corehost/cli/test/nativehost/resolve_component_dependencies_test.cpp b/src/native/corehost/test/nativehost/resolve_component_dependencies_test.cpp
similarity index 100%
rename from src/installer/corehost/cli/test/nativehost/resolve_component_dependencies_test.cpp
rename to src/native/corehost/test/nativehost/resolve_component_dependencies_test.cpp
diff --git a/src/installer/corehost/cli/test/nativehost/resolve_component_dependencies_test.h b/src/native/corehost/test/nativehost/resolve_component_dependencies_test.h
similarity index 100%
rename from src/installer/corehost/cli/test/nativehost/resolve_component_dependencies_test.h
rename to src/native/corehost/test/nativehost/resolve_component_dependencies_test.h
diff --git a/src/installer/corehost/cli/test/testexe.cmake b/src/native/corehost/test/testexe.cmake
similarity index 100%
rename from src/installer/corehost/cli/test/testexe.cmake
rename to src/native/corehost/test/testexe.cmake
diff --git a/src/installer/corehost/cli/test/testlib.cmake b/src/native/corehost/test/testlib.cmake
similarity index 100%
rename from src/installer/corehost/cli/test/testlib.cmake
rename to src/native/corehost/test/testlib.cmake
diff --git a/src/installer/corehost/cli/test_fx_ver/CMakeLists.txt b/src/native/corehost/test_fx_ver/CMakeLists.txt
similarity index 100%
rename from src/installer/corehost/cli/test_fx_ver/CMakeLists.txt
rename to src/native/corehost/test_fx_ver/CMakeLists.txt
diff --git a/src/installer/corehost/cli/test_fx_ver/test_fx_ver.cpp b/src/native/corehost/test_fx_ver/test_fx_ver.cpp
similarity index 100%
rename from src/installer/corehost/cli/test_fx_ver/test_fx_ver.cpp
rename to src/native/corehost/test_fx_ver/test_fx_ver.cpp
diff --git a/src/installer/corehost/cli/version.cpp b/src/native/corehost/version.cpp
similarity index 100%
rename from src/installer/corehost/cli/version.cpp
rename to src/native/corehost/version.cpp
diff --git a/src/installer/corehost/cli/version.h b/src/native/corehost/version.h
similarity index 100%
rename from src/installer/corehost/cli/version.h
rename to src/native/corehost/version.h
diff --git a/src/installer/corehost/cli/version_compatibility_range.cpp b/src/native/corehost/version_compatibility_range.cpp
similarity index 100%
rename from src/installer/corehost/cli/version_compatibility_range.cpp
rename to src/native/corehost/version_compatibility_range.cpp
diff --git a/src/installer/corehost/cli/version_compatibility_range.h b/src/native/corehost/version_compatibility_range.h
similarity index 100%
rename from src/installer/corehost/cli/version_compatibility_range.h
rename to src/native/corehost/version_compatibility_range.h