Merge branch 'master' of https://github.com/Microsoft/vcpkg into patch-vs2013

# Conflicts: # toolsrc/include/vcpkg/vcpkgpaths.h # toolsrc/src/vcpkg/vcpkgpaths.cpp
author: martin-s <webmaster@macside.net> 2017-10-15 02:00:19 +0200
committer: martin-s <webmaster@macside.net> 2017-10-15 02:00:19 +0200
commit: 9c2fa042ee451f5ec1e5781c8daccd9fd6875de0 (patch)
tree: 250b18fea62d58e2138de12f78e25d0ed8c69678
parent: 630bcd84b8325217c440def11681e375f5ef4652 (diff)
parent: 561cfe89e653aef903488f7af7d4d17cfb11a26c (diff)
download: vcpkg-9c2fa042ee451f5ec1e5781c8daccd9fd6875de0.tar.gz
vcpkg-9c2fa042ee451f5ec1e5781c8daccd9fd6875de0.zip
223 files changed, 4484 insertions, 2121 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 75d89f6ac..5a2b0e336 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,45 @@
+vcpkg (0.0.91)
+--------------
+  * Add ports:
+    - abseil         2017-09-28
+    - enet           1.3.13
+    - exiv2          4f4add2cdcbe73af7098122a509dff0739d15908
+    - freexl         1.0.4
+    - gts            0.7.6
+    - kinectsdk2     2.0
+    - libexif        0.6.21-1
+    - libfreenect2   0.2.0
+    - librtmp        2.3
+    - libspatialite  4.3.0a
+    - libxmp-lite    4.4.1
+    - proj4          4.9.3-1
+    - readosm        1.1.0
+    - spirit-po      1.1.2
+    - telnetpp       1.2.4
+    - wildmidi       0.4.1
+  * Update ports:
+    - anax           2.1.0-2 -> 2.1.0-3
+    - aws-sdk-cpp    1.0.61-1 -> 1.2.4
+    - geos           3.5.0-1 -> 3.6.2-2
+    - kinectsdk1     1.8-1 -> 1.8-2
+    - lua            5.3.4-1 -> 5.3.4-2
+    - openni2        2.2.0.33 -> 2.2.0.33-2
+    - openssl        1.0.2l-2 -> 1.0.2l-3
+    - pangolin       0.5-1 -> 0.5-2
+    - proj           4.9.3-1 -> 0
+    - sdl2           2.0.5-4 -> 2.0.6-1
+    - zlib           1.2.11-2 -> 1.2.11-3
+  * `vcpkg export`: Add new option `--ifw` which creates a standalone GUI installer for the exported packages. More information and screenshots [here](https://github.com/Microsoft/vcpkg/pull/1734)
+  * Complete rework of Visual Studio detection & selection:
+    - Use [`vswhere.exe`](https://github.com/Microsoft/vswhere) to detect Visual Studio installation instances
+    - Add the ability to specify the Visual Studio instance to use in the triplet file with the `VCPKG_VISUAL_STUDIO_PATH` variable
+    - Automatic selection now picks instances in order: stable, prerelease, legacy. Within each group, newer versions are preferred over old versions
+    - Fix issue where v140 toolset would not work if VS2017 (with v140) was installed but VS2015 was not installed
+  * Add message when downloading a `vcpkg` dependency (e.g. `cmake`)
+
+-- vcpkg team <vcpkg@microsoft.com>  THU, 05 Oct 2017 19:00:00 -0800
+
+
 vcpkg (0.0.90)
 --------------
   * Add ports:
diff --git a/docs/maintainers/portfile-functions.md b/docs/maintainers/portfile-functions.md
index 705d65b7e..e16147f7d 100644
--- a/docs/maintainers/portfile-functions.md
+++ b/docs/maintainers/portfile-functions.md
@@ -3,6 +3,7 @@
 # Portfile helper functions
 - [vcpkg\_acquire\_msys](vcpkg_acquire_msys.md)
 - [vcpkg\_apply\_patches](vcpkg_apply_patches.md)
+- [vcpkg\_build\_cmake](vcpkg_build_cmake.md)
 - [vcpkg\_build\_msbuild](vcpkg_build_msbuild.md)
 - [vcpkg\_configure\_cmake](vcpkg_configure_cmake.md)
 - [vcpkg\_copy\_pdbs](vcpkg_copy_pdbs.md)
@@ -11,5 +12,6 @@
 - [vcpkg\_execute\_required\_process](vcpkg_execute_required_process.md)
 - [vcpkg\_extract\_source\_archive](vcpkg_extract_source_archive.md)
 - [vcpkg\_find\_acquire\_program](vcpkg_find_acquire_program.md)
+- [vcpkg\_from\_bitbucket](vcpkg_from_bitbucket.md)
 - [vcpkg\_from\_github](vcpkg_from_github.md)
 - [vcpkg\_install\_cmake](vcpkg_install_cmake.md)
diff --git a/docs/maintainers/vcpkg_acquire_msys.md b/docs/maintainers/vcpkg_acquire_msys.md
index 46cda81fd..53aa6532e 100644
--- a/docs/maintainers/vcpkg_acquire_msys.md
+++ b/docs/maintainers/vcpkg_acquire_msys.md
@@ -32,7 +32,7 @@ message(STATUS "Installing MSYS Packages")
 vcpkg_execute_required_process(
     COMMAND
         ${BASH} --noprofile --norc -c
-            "pacman -Sy --noconfirm --needed make"
+            'PATH=/usr/bin:\$PATH pacman -Sy --noconfirm --needed make'
     WORKING_DIRECTORY ${MSYS_ROOT}
     LOGNAME pacman-${TARGET_TRIPLET})
 ```
diff --git a/docs/maintainers/vcpkg_build_cmake.md b/docs/maintainers/vcpkg_build_cmake.md
new file mode 100644
index 000000000..ddfa46f6b
--- /dev/null
+++ b/docs/maintainers/vcpkg_build_cmake.md
@@ -0,0 +1,31 @@
+# vcpkg_build_cmake
+
+Build a cmake project.
+
+## Usage:
+```cmake
+vcpkg_build_cmake([DISABLE_PARALLEL] [TARGET <target>])
+```
+
+## Parameters:
+### DISABLE_PARALLEL
+The underlying buildsystem will be instructed to not parallelize
+
+### TARGET
+The target passed to the cmake build command (`cmake --build . --target <target>`). If not specified, no target will
+be passed.
+
+## Notes:
+This command should be preceeded by a call to [`vcpkg_configure_cmake()`](vcpkg_configure_cmake.md).
+You can use the alias [`vcpkg_install_cmake()`](vcpkg_configure_cmake.md) function if your CMake script supports the
+"install" target
+
+## Examples:
+
+* [zlib](https://github.com/Microsoft/vcpkg/blob/master/ports/zlib/portfile.cmake)
+* [cpprestsdk](https://github.com/Microsoft/vcpkg/blob/master/ports/cpprestsdk/portfile.cmake)
+* [poco](https://github.com/Microsoft/vcpkg/blob/master/ports/poco/portfile.cmake)
+* [opencv](https://github.com/Microsoft/vcpkg/blob/master/ports/opencv/portfile.cmake)
+
+## Source
+[scripts/cmake/vcpkg_build_cmake.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_build_cmake.cmake)
diff --git a/docs/maintainers/vcpkg_find_acquire_program.md b/docs/maintainers/vcpkg_find_acquire_program.md
index bc50ef4c8..8107c8dd2 100644
--- a/docs/maintainers/vcpkg_find_acquire_program.md
+++ b/docs/maintainers/vcpkg_find_acquire_program.md
@@ -16,6 +16,7 @@ The current list of programs includes:
 - 7Z
 - BISON
 - FLEX
+- GASPREPROCESSOR
 - PERL
 - PYTHON2
 - PYTHON3
@@ -24,7 +25,6 @@ The current list of programs includes:
 - NASM
 - NINJA
 - YASM
-- GASPREPROCESSOR
 
 Note that msys2 has a dedicated helper function: [`vcpkg_acquire_msys`](vcpkg_acquire_msys.md).
 
diff --git a/docs/maintainers/vcpkg_from_bitbucket.md b/docs/maintainers/vcpkg_from_bitbucket.md
new file mode 100644
index 000000000..c8850b725
--- /dev/null
+++ b/docs/maintainers/vcpkg_from_bitbucket.md
@@ -0,0 +1,53 @@
+# vcpkg_from_bitbucket
+
+Download and extract a project from Bitbucket.
+Enables support for installing HEAD `vcpkg.exe install --head <port>`.
+
+## Usage:
+```cmake
+vcpkg_from_bitbucket(
+    OUT_SOURCE_PATH <SOURCE_PATH>
+    REPO <Microsoft/cpprestsdk>
+    [REF <v2.0.0>]
+    [SHA512 <45d0d7f8cc350...>]
+    [HEAD_REF <master>]
+)
+```
+
+## Parameters:
+### OUT_SOURCE_PATH
+Specifies the out-variable that will contain the extracted location.
+
+This should be set to `SOURCE_PATH` by convention.
+
+### REPO
+The organization or user and repository on GitHub.
+
+### REF
+A stable git commit-ish (ideally a tag) that will not change contents. **This should not be a branch.**
+
+For repositories without official releases, this can be set to the full commit id of the current latest master.
+
+If `REF` is specified, `SHA512` must also be specified.
+
+### SHA512
+The SHA512 hash that should match the archive (https://bitbucket.com/${REPO}/get/${REF}.tar.gz).
+
+This is most easily determined by first setting it to `1`, then trying to build the port. The error message will contain the full hash, which can be copied back into the portfile.
+
+### HEAD_REF
+The unstable git commit-ish (ideally a branch) to pull for `--head` builds.
+
+For most projects, this should be `master`. The chosen branch should be one that is expected to be always buildable on all supported platforms.
+
+## Notes:
+At least one of `REF` and `HEAD_REF` must be specified, however it is preferable for both to be present.
+
+This exports the `VCPKG_HEAD_VERSION` variable during head builds.
+
+## Examples:
+
+* [blaze](https://github.com/Microsoft/vcpkg/blob/master/ports/blaze/portfile.cmake)
+
+## Source
+[scripts/cmake/vcpkg_from_bitbucket.cmake](https://github.com/Microsoft/vcpkg/blob/master/scripts/cmake/vcpkg_from_bitbucket.cmake)
diff --git a/docs/maintainers/vcpkg_from_github.md b/docs/maintainers/vcpkg_from_github.md
index cb7849fcc..cf50dc445 100644
--- a/docs/maintainers/vcpkg_from_github.md
+++ b/docs/maintainers/vcpkg_from_github.md
@@ -23,7 +23,9 @@ This should be set to `SOURCE_PATH` by convention.
 The organization or user and repository on GitHub.
 
 ### REF
-A stable git commit-ish (ideally a tag) that will not change contents.
+A stable git commit-ish (ideally a tag) that will not change contents. **This should not be a branch.**
+
+For repositories without official releases, this can be set to the full commit id of the current latest master.
 
 If `REF` is specified, `SHA512` must also be specified.
 
@@ -38,7 +40,7 @@ The unstable git commit-ish (ideally a branch) to pull for `--head` builds.
 For most projects, this should be `master`. The chosen branch should be one that is expected to be always buildable on all supported platforms.
 
 ## Notes:
-At least one of `REF` and `HEAD_REF` must be specified.
+At least one of `REF` and `HEAD_REF` must be specified, however it is preferable for both to be present.
 
 This exports the `VCPKG_HEAD_VERSION` variable during head builds.
 
diff --git a/docs/maintainers/vcpkg_install_cmake.md b/docs/maintainers/vcpkg_install_cmake.md
index e199d1292..1b132b4f1 100644
--- a/docs/maintainers/vcpkg_install_cmake.md
+++ b/docs/maintainers/vcpkg_install_cmake.md
@@ -4,15 +4,15 @@ Build and install a cmake project.
 
 ## Usage:
 ```cmake
-vcpkg_install_cmake([MSVC_64_TOOLSET])
+vcpkg_install_cmake(...)
 ```
 
 ## Parameters:
-### MSVC_64_TOOLSET
-This adds the `/p:PreferredToolArchitecture=x64` switch if the underlying buildsystem is MSBuild. Some large projects can run out of memory when linking if they use the 32-bit hosted tools.
+See [`vcpkg_build_cmake()`](vcpkg_build_cmake.md).
 
 ## Notes:
-This command should be preceeded by a call to [`vcpkg_configure_cmake()`](vcpkg_configure_cmake.md).
+This command transparently forwards to [`vcpkg_build_cmake()`](vcpkg_build_cmake.md), adding a `TARGET install`
+parameter.
 
 ## Examples:
 
diff --git a/ports/abseil/CMakeLists.txt b/ports/abseil/CMakeLists.txt
index 34b69817a..4a96b3fde 100644
--- a/ports/abseil/CMakeLists.txt
+++ b/ports/abseil/CMakeLists.txt
@@ -1,21 +1,29 @@
 cmake_minimum_required(VERSION 3.8)
 project(abseil CXX)
 
-add_definitions(-DNOMINMAX)
+add_definitions(-DNOMINMAX -DWIN32_LEAN_AND_MEAN)
 
 set(CMAKE_DEBUG_POSTFIX d)
 set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
 
-option(INSTALL_HEADERS "Install header files" ON)
+if(CMAKE_BUILD_TYPE STREQUAL "Release")
+    option(INSTALL_HEADERS "Install header files" ON)
+else()
+    option(INSTALL_HEADERS "Install header files" OFF)
+endif()
 
 function(add_sublibrary LIB)
     file(GLOB_RECURSE SOURCES "absl/${LIB}/*.cc")
-    list(FILTER SOURCES EXCLUDE REGEX "_test")
+    list(FILTER SOURCES EXCLUDE REGEX "_test(_.+)?.cc$|_nonprod.cc$")
     file(GLOB HEADERS "absl/${LIB}/*.h")
     file(GLOB INTERNAL_HEADERS "absl/${LIB}/internal/*.h")
 
     if(SOURCES)
-        add_library(${LIB} ${SOURCES})
+        if("STATIC" IN_LIST ARGN)
+            add_library(${LIB} STATIC ${SOURCES})
+        else()
+            add_library(${LIB} ${SOURCES})
+        endif()
         set_target_properties(${LIB} PROPERTIES OUTPUT_NAME "absl_${LIB}")
         target_include_directories(${LIB} PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> $<INSTALL_INTERFACE:include>)
     else()
@@ -49,14 +57,17 @@ function(target_link_public_libraries A)
     endif()
 endfunction()
 
-add_sublibrary(base)
-add_sublibrary(meta)
 add_sublibrary(algorithm)
+add_sublibrary(base)
 add_sublibrary(container)
-add_sublibrary(memory)
-add_sublibrary(strings)
 add_sublibrary(debugging)
+add_sublibrary(memory)
+add_sublibrary(meta)
 add_sublibrary(numeric)
+add_sublibrary(strings)
+add_sublibrary(synchronization STATIC)
+# Time must be static because there are global variables intended for export
+add_sublibrary(time STATIC)
 add_sublibrary(types)
 add_sublibrary(utility)
 
@@ -68,6 +79,11 @@ target_link_public_libraries(numeric base)
 target_link_public_libraries(strings base memory meta numeric)
 target_link_public_libraries(types base utility meta algorithm strings)
 target_link_public_libraries(utility base meta)
+target_link_public_libraries(time base numeric)
+target_link_public_libraries(synchronization base time)
+
+find_package(unofficial-cctz REQUIRED)
+targeT_link_libraries(time PUBLIC unofficial::cctz)
 
 install(
     EXPORT unofficial-abseil-targets
diff --git a/ports/abseil/CONTROL b/ports/abseil/CONTROL
index fb37a8cae..44684b6b8 100644
--- a/ports/abseil/CONTROL
+++ b/ports/abseil/CONTROL
@@ -1,6 +1,7 @@
 Source: abseil
-Version: 2017-09-28
+Version: 2017-10-14
 Description: an open-source collection designed to augment the C++ standard library.
   Abseil is an open-source collection of C++ library code designed to augment the C++ standard library. The Abseil library code is collected from Google's own C++ code base, has been extensively tested and used in production, and is the same code we depend on in our daily coding lives.
   In some cases, Abseil provides pieces missing from the C++ standard; in others, Abseil provides alternatives to the standard for special needs we've found through usage in the Google code base. We denote those cases clearly within the library code we provide you.
   Abseil is not meant to be a competitor to the standard library; we've just found that many of these utilities serve a purpose within our code base, and we now want to provide those resources to the C++ community as a whole.
+Build-Depends: cctz
diff --git a/ports/abseil/portfile.cmake b/ports/abseil/portfile.cmake
index 8c9e81aa3..8273f80e3 100644
--- a/ports/abseil/portfile.cmake
+++ b/ports/abseil/portfile.cmake
@@ -10,8 +10,8 @@ message("To use from cmake:\n  find_package(unofficial-abseil REQUIRED)\n  link_
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO abseil/abseil-cpp
-    REF cdf20caa491f59c0a35a8d8fbec0d948e4bc7e4c
-    SHA512 04889e7804b644821d0bf5d1b13f15a072e748bf0465442c64528e014c71f415544e9146c9518f9fe7bb14a295b18f293c3f7b672f6a51dba9909f3b74667fae
+    REF 1a9ba5e2e5a14413704f0c913fac53359576d3b6
+    SHA512 756e494c30324c937ca655d91afdee9acb923c7ee837a7c685441305bea2d54a75b3b21be7355abe416660984ba51ace9d234d70168fb029c601b7442397e8ff
     HEAD_REF master
 )
 
@@ -25,7 +25,6 @@ file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
-    OPTIONS_DEBUG -DINSTALL_HEADERS=OFF
 )
 
 vcpkg_install_cmake()
diff --git a/ports/antlr4/portfile.cmake b/ports/antlr4/portfile.cmake
index 78266b6eb..868efcdbe 100644
--- a/ports/antlr4/portfile.cmake
+++ b/ports/antlr4/portfile.cmake
@@ -24,7 +24,7 @@ vcpkg_apply_patches(
                 ${CMAKE_CURRENT_LIST_DIR}/Fix-building-in-Visual-Studio-2017.patch
 )
 
-if (${VCPKG_LIBRARY_LINKAGE} STREQUAL static)
+if (VCPKG_LIBRARY_LINKAGE STREQUAL "static")
     set(DEBUG_CONFIG   "Debug Static")
     set(RELEASE_CONFIG "Release Static")
 else()
@@ -53,7 +53,7 @@ file(COPY       ${SOURCE_PATH}/bin/vs-2015/${TRIPLET_SYSTEM_ARCH}/${DEBUG_CONFIG
 file(COPY       ${SOURCE_PATH}/bin/vs-2015/${TRIPLET_SYSTEM_ARCH}/${RELEASE_CONFIG}/antlr4-runtime.lib
     DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
 
-if (${VCPKG_LIBRARY_LINKAGE} STREQUAL static)
+if (VCPKG_LIBRARY_LINKAGE STREQUAL "static")
     vcpkg_apply_patches(
         SOURCE_PATH ${CURRENT_PACKAGES_DIR}/include
         PATCHES     ${CMAKE_CURRENT_LIST_DIR}/static.patch
diff --git a/ports/aws-sdk-cpp/CONTROL b/ports/aws-sdk-cpp/CONTROL
index 251e7bdf9..a36263e7a 100644
--- a/ports/aws-sdk-cpp/CONTROL
+++ b/ports/aws-sdk-cpp/CONTROL
@@ -1,3 +1,3 @@
 Source: aws-sdk-cpp
-Version: 1.0.61-1
+Version: 1.2.4
 Description: AWS SDK for C++
diff --git a/ports/aws-sdk-cpp/portfile.cmake b/ports/aws-sdk-cpp/portfile.cmake
index 3a8f9b464..4e0e8bdfe 100644
--- a/ports/aws-sdk-cpp/portfile.cmake
+++ b/ports/aws-sdk-cpp/portfile.cmake
@@ -1,11 +1,12 @@
 include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/aws-sdk-cpp-1.0.61)
-vcpkg_download_distfile(ARCHIVE
-    URLS "https://github.com/aws/aws-sdk-cpp/archive/1.0.61.tar.gz"
-    FILENAME "aws-sdk-cpp-1.0.61.tar.gz"
-    SHA512 75f3570d8e8c08624b69d8254e156829030a36a7c4aa4b783d895e7c209b2a46b6b9ce822e6d9e9f649b171cf64988f0ad18ce0a55eb39c50d68a7880568078a
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO aws/aws-sdk-cpp
+    REF 1.2.4
+    SHA512 dc96e40fe72e4b115607245f536cd13414e33a8f754153fd137f1391af14b9793fc8a07f9f984490e0783e385c2c7b9a421878b63ea793012f53fefe7ec4d368
+    HEAD_REF master
 )
-vcpkg_extract_source_archive(${ARCHIVE})
 
 vcpkg_apply_patches(
     SOURCE_PATH ${SOURCE_PATH}
@@ -30,6 +31,34 @@ vcpkg_configure_cmake(
 
 vcpkg_install_cmake()
 
+file(GLOB CMAKE_FILES ${CURRENT_PACKAGES_DIR}/lib/cmake/*)
+
+file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share)
+
+file(COPY ${CMAKE_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/share)
+
+vcpkg_copy_pdbs()
+
+file(GLOB AWS_TARGETS "${CURRENT_PACKAGES_DIR}/share/aws-cpp-sdk-*/aws-cpp-sdk-*targets.cmake")
+foreach(AWS_TARGETS ${AWS_TARGETS})
+    file(READ ${AWS_TARGETS} _contents)
+    string(REGEX REPLACE
+        "get_filename_component\\(_IMPORT_PREFIX \"\\\${CMAKE_CURRENT_LIST_FILE}\" PATH\\)(\nget_filename_component\\(_IMPORT_PREFIX \"\\\${_IMPORT_PREFIX}\" PATH\\))*"
+        "get_filename_component(_IMPORT_PREFIX \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)\nget_filename_component(_IMPORT_PREFIX \"\${_IMPORT_PREFIX}\" PATH)\nget_filename_component(_IMPORT_PREFIX \"\${_IMPORT_PREFIX}\" PATH)"
+        _contents "${_contents}")
+    file(WRITE ${AWS_TARGETS} "${_contents}")
+endforeach()
+
+file(GLOB AWS_TARGETS_RELEASE "${CURRENT_PACKAGES_DIR}/share/aws-cpp-sdk-*/aws-cpp-sdk-*targets-release.cmake")
+foreach(AWS_TARGETS_RELEASE ${AWS_TARGETS_RELEASE})
+    file(READ ${AWS_TARGETS_RELEASE} _contents)
+    string(REGEX REPLACE
+        "bin\\/([A-Za-z0-9_.-]+lib)"
+        "lib/\\1"
+        _contents "${_contents}")
+    file(WRITE ${AWS_TARGETS_RELEASE} "${_contents}")
+endforeach()
+
 file(REMOVE_RECURSE 
 	${CURRENT_PACKAGES_DIR}/debug/include
 	${CURRENT_PACKAGES_DIR}/lib/cmake
diff --git a/ports/bond/portfile.cmake b/ports/bond/portfile.cmake
index f3664da8c..147ebeea8 100644
--- a/ports/bond/portfile.cmake
+++ b/ports/bond/portfile.cmake
@@ -1,4 +1,4 @@
-if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
+if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
     message(STATUS "Warning: Dynamic building not supported yet. Building static.")
     set(VCPKG_LIBRARY_LINKAGE static)
 endif()
@@ -23,7 +23,7 @@ vcpkg_extract_source_archive(${ARCHIVE})
 vcpkg_extract_source_archive(${GBC_ARCHIVE} ${CURRENT_BUILDTREES_DIR}/tools/)
 set(FETCHED_GBC_PATH ${CURRENT_BUILDTREES_DIR}/tools/gbc-6.0.0-amd64.exe)
 
-if (NOT EXISTS ${FETCHED_GBC_PATH})
+if (NOT EXISTS "${FETCHED_GBC_PATH}")
     message(FATAL_ERROR "Fetching GBC failed. Expected '${FETCHED_GBC_PATH}' to exists, but it doesn't.")
 endif()
 
diff --git a/ports/cctz/CMakeLists.txt b/ports/cctz/CMakeLists.txt
new file mode 100644
index 000000000..99322d05e
--- /dev/null
+++ b/ports/cctz/CMakeLists.txt
@@ -0,0 +1,36 @@
+cmake_minimum_required(VERSION 3.8)
+project(cctz CXX)
+
+set(CMAKE_DEBUG_POSTFIX d)
+set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
+
+if(CMAKE_BUILD_TYPE STREQUAL "Release")
+    option(INSTALL_HEADERS "Install header files" ON)
+else()
+    option(INSTALL_HEADERS "Install header files" OFF)
+endif()
+
+file(GLOB SOURCES src/*.cc)
+list(FILTER SOURCES EXCLUDE REGEX "_test.cc$|benchmarks|_tool.cc$")
+
+file(GLOB HEADERS include/cctz/*.h)
+
+add_library(cctz ${SOURCES})
+target_include_directories(cctz PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> $<INSTALL_INTERFACE:include>)
+
+if(INSTALL_HEADERS)
+    install(FILES ${HEADERS} DESTINATION "include/cctz")
+endif()
+
+install(TARGETS cctz EXPORT unofficial-cctz-targets
+    RUNTIME DESTINATION bin
+    LIBRARY DESTINATION lib
+    ARCHIVE DESTINATION lib
+)
+
+install(
+    EXPORT unofficial-cctz-targets
+    FILE unofficial-cctz-config.cmake
+    NAMESPACE unofficial::
+    DESTINATION share/unofficial-cctz
+)
diff --git a/ports/cctz/CONTROL b/ports/cctz/CONTROL
new file mode 100644
index 000000000..fb125fa13
--- /dev/null
+++ b/ports/cctz/CONTROL
@@ -0,0 +1,3 @@
+Source: cctz
+Version: v2.1
+Description: two libraries that cooperate with <chrono> to give C++ programmers all the necessary tools for computing with dates, times, and time zones in a simple and correct manner.
diff --git a/ports/cctz/portfile.cmake b/ports/cctz/portfile.cmake
new file mode 100644
index 000000000..11955b365
--- /dev/null
+++ b/ports/cctz/portfile.cmake
@@ -0,0 +1,24 @@
+include(vcpkg_common_functions)
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO google/cctz
+    REF v2.1
+    SHA512 b6531ce64fdd8581944457cdeff7f9ff9c00958af51ddb262c74e08fcc076466c59c7bef1ce7edccc9512a7f4cb204e04581d287c4a9a684057fe39421c3fbc6
+    HEAD_REF master
+)
+
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+)
+
+vcpkg_install_cmake()
+
+vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-cctz)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/cctz ${CURRENT_PACKAGES_DIR}/share/unofficial-cctz)
+
+vcpkg_copy_pdbs()
+
+file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/cctz RENAME copyright)
diff --git a/ports/celero/CONTROL b/ports/celero/CONTROL
new file mode 100644
index 000000000..d40c93783
--- /dev/null
+++ b/ports/celero/CONTROL
@@ -0,0 +1,3 @@
+Source: celero
+Version: 2.1.0-1
+Description: Celero is a modern cross-platform (Windows, Linux, MacOS) Microbenchmarking library for C++.
diff --git a/ports/celero/portfile.cmake b/ports/celero/portfile.cmake
new file mode 100644
index 000000000..c942ca5d8
--- /dev/null
+++ b/ports/celero/portfile.cmake
@@ -0,0 +1,29 @@
+include(vcpkg_common_functions)
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
+    message(STATUS "Celero currently can only be built statically")
+    set(VCPKG_LIBRARY_LINKAGE static)
+endif()
+
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO DigitalInBlue/Celero
+    REF v2.1.0
+    SHA512 30563567255b09a2c810d97896839589ed99d45b6c8d075fd16d1a0068457d70195a199f5c982c84784c2e03284c1eaac565253fa72b81d9e2d4102721b80221
+    HEAD_REF master
+)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA # Disable this option if project cannot be built with Ninja
+    OPTIONS
+        -DCELERO_ENABLE_EXPERIMENTS=OFF
+        -DCELERO_ENABLE_TESTS=OFF
+        -DCELERO_RUN_EXAMPLE_ON_BUILD=OFF
+)
+
+vcpkg_install_cmake()
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(INSTALL ${SOURCE_PATH}/license.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/celero RENAME copyright)
diff --git a/ports/cpprestsdk/0003_openssl_110.patch b/ports/cpprestsdk/0003_openssl_110.patch
new file mode 100644
index 000000000..b2b361187
--- /dev/null
+++ b/ports/cpprestsdk/0003_openssl_110.patch
@@ -0,0 +1,14 @@
+diff --git a/Release/src/websockets/client/ws_client_wspp.cpp b/Release/src/websockets/client/ws_client_wspp.cpp
+index 9f91d68..4b5d506 100644
+--- a/Release/src/websockets/client/ws_client_wspp.cpp
++++ b/Release/src/websockets/client/ws_client_wspp.cpp
+@@ -76,7 +76,9 @@ static struct ASIO_SSL_memory_leak_suppress
+ {
+     ~ASIO_SSL_memory_leak_suppress()
+     {
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+         ::SSL_COMP_free_compression_methods();
++#endif
+     }
+ } ASIO_SSL_memory_leak_suppressor;
+ 
diff --git a/ports/cpprestsdk/CONTROL b/ports/cpprestsdk/CONTROL
index f22ee9854..9831af585 100644
--- a/ports/cpprestsdk/CONTROL
+++ b/ports/cpprestsdk/CONTROL
@@ -1,5 +1,5 @@
 Source: cpprestsdk
-Version: 2.9.0-3
+Version: 2.9.0-4
 Build-Depends: zlib (windows), openssl (windows), boost (windows), websocketpp (windows)
 Description: C++11 JSON, REST, and OAuth library
   The C++ REST SDK is a Microsoft project for cloud-based client-server communication in native code using a modern asynchronous C++ API design. This project aims to help C++ developers connect to and interact with services.
diff --git a/ports/cpprestsdk/portfile.cmake b/ports/cpprestsdk/portfile.cmake
index 7482760d3..83b38a92d 100644
--- a/ports/cpprestsdk/portfile.cmake
+++ b/ports/cpprestsdk/portfile.cmake
@@ -13,6 +13,7 @@ if(NOT VCPKG_USE_HEAD_VERSION)
         PATCHES
             ${CMAKE_CURRENT_LIST_DIR}/0001_cmake.patch
             ${CMAKE_CURRENT_LIST_DIR}/0002_no_websocketpp_in_uwp.patch
+            ${CMAKE_CURRENT_LIST_DIR}/0003_openssl_110.patch
     )
 endif()
 
diff --git a/ports/eastl/CONTROL b/ports/eastl/CONTROL
new file mode 100644
index 000000000..d43d7203e
--- /dev/null
+++ b/ports/eastl/CONTROL
@@ -0,0 +1,4 @@
+Source: eastl
+Version: 3.05.08
+Description: Electronic Arts Standard Template Library.
+    It is a C++ template library of containers, algorithms, and iterators useful for runtime and tool development across multiple platforms. It is a fairly extensive and robust implementation of such a library and has an emphasis on high performance above all other considerations.
diff --git a/ports/eastl/portfile.cmake b/ports/eastl/portfile.cmake
new file mode 100644
index 000000000..19fb6e51c
--- /dev/null
+++ b/ports/eastl/portfile.cmake
@@ -0,0 +1,29 @@
+if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
+    message(STATUS "Warning: Dynamic building not supported by EASTL. Building static.")
+    set(VCPKG_LIBRARY_LINKAGE static)
+endif()
+
+include(vcpkg_common_functions)
+set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/eastl)
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO electronicarts/EASTL
+    REF 3.05.08
+    SHA512 7b9e87d967252026a660a648688a19e7b88d4eca7f373ba7427b315103a6f8cea555a85b2ef74557cf7e8a486b847589cac4b622b4ab88cab7c0f0a22355ab66
+    HEAD_REF master
+)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+)
+
+vcpkg_install_cmake()
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+
+vcpkg_copy_pdbs()
+
+# Handle copyright
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/eastl RENAME copyright)
+file(INSTALL ${SOURCE_PATH}/3RDPARTYLICENSES.TXT DESTINATION ${CURRENT_PACKAGES_DIR}/share/eastl)
diff --git a/ports/folly/portfile.cmake b/ports/folly/portfile.cmake
index 919e799d5..1b30ad86c 100644
--- a/ports/folly/portfile.cmake
+++ b/ports/folly/portfile.cmake
@@ -38,7 +38,7 @@ vcpkg_configure_cmake(
 # Folly runs built executables during the build, so they need access to the installed DLLs.
 set(ENV{PATH} "$ENV{PATH};${CURRENT_INSTALLED_DIR}/bin;${CURRENT_INSTALLED_DIR}/debug/bin")
 
-vcpkg_install_cmake(MSVC_64_TOOLSET)
+vcpkg_install_cmake()
 
 vcpkg_copy_pdbs()
 
diff --git a/ports/freeimage/CMakeLists.txt b/ports/freeimage/CMakeLists.txt
index f385f508c..9f4f1677b 100644
--- a/ports/freeimage/CMakeLists.txt
+++ b/ports/freeimage/CMakeLists.txt
@@ -72,7 +72,7 @@ set(SRCS ${DEPRECATION_SRCS}
 # define (to nothing instead of _declspec(dllimport) ) the DLL_API macro.
 # For this purpouse we include (depending on the BUILD_SHARED_LIBS )
 # the appropriate FreeImageConfig.h .
-if(${BUILD_SHARED_LIBS})
+if(BUILD_SHARED_LIBS)
     configure_file(${CMAKE_CURRENT_SOURCE_DIR}/FreeImageConfig-dynamic.h ${CMAKE_CURRENT_BINARY_DIR}/FreeImageConfig.h)
 else()
     configure_file(${CMAKE_CURRENT_SOURCE_DIR}/FreeImageConfig-static.h ${CMAKE_CURRENT_BINARY_DIR}/FreeImageConfig.h)
@@ -81,7 +81,7 @@ list(APPEND PUBLIC_HEADERS ${CMAKE_CURRENT_BINARY_DIR}/FreeImageConfig.h)
 
 add_library(FreeImage ${SRCS} ${PRIVATE_HEADERS} ${PUBLIC_HEADERS})
 
-if(${BUILD_SHARED_LIBS})
+if(BUILD_SHARED_LIBS)
     target_compile_definitions(FreeImage PRIVATE -DFREEIMAGE_EXPORTS)
 else()
     target_compile_definitions(FreeImage PRIVATE -DFREEIMAGE_LIB)
@@ -119,7 +119,7 @@ add_library(FreeImagePlus
     ${CMAKE_CURRENT_SOURCE_DIR}/Wrapper/FreeImagePlus/FreeImagePlus.h
     ${CMAKE_CURRENT_SOURCE_DIR}/Wrapper/FreeImagePlus/FreeImagePlus.rc)
 
-if(${BUILD_SHARED_LIBS})
+if(BUILD_SHARED_LIBS)
     target_compile_definitions(FreeImagePlus PRIVATE -DFIP_EXPORTS)
 else()
     target_compile_definitions(FreeImagePlus PRIVATE -DFREEIMAGE_LIB)
diff --git a/ports/gdal/0001-Add-support-for-MSVC1900-backported-from-GDAL2.patch b/ports/gdal/0001-Add-support-for-MSVC1900-backported-from-GDAL2.patch
deleted file mode 100644
index e29cc5b8e..000000000
--- a/ports/gdal/0001-Add-support-for-MSVC1900-backported-from-GDAL2.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 823171a129401d226ac4821fb997ce585045170c Mon Sep 17 00:00:00 2001
-From: Manuel Massing <m.massing@warped-space.de>
-Date: Wed, 23 Nov 2016 23:50:12 +0100
-Subject: [PATCH] Add support for MSVC1900 (backported from GDAL2)
-
----
- nmake.opt            | 6 ++++++
- port/cpl_config.h.vc | 8 +++++---
- 2 files changed, 11 insertions(+), 3 deletions(-)
-
-diff --git a/nmake.opt b/nmake.opt
-index 8900135..4d1c4fa 100644
---- a/nmake.opt
-+++ b/nmake.opt
-@@ -31,6 +31,7 @@
- # Check version of Visual C++ compiler:
- # nmake -f makefile.vc MSVC_VER=xxxx
- # where xxxx is one of following:
-+# 1900 = 14.0(2015)
- # 1800 = 12.0(2013)
- # 1700 = 11.0(2012)
- # 1600 = 10.0(2010)
-@@ -627,8 +628,13 @@ GDALLIB	=    $(GDAL_ROOT)/gdal.lib
- !ENDIF
- 
- !IFDEF ODBC_SUPPORTED
-+!IF $(MSVC_VER) >= 1900
-+# legacy_stdio_definitions.lib : https://connect.microsoft.com/VisualStudio/feedback/details/1134693/vs-2015-ctp-5-c-vsnwprintf-s-and-other-functions-are-not-exported-in-appcrt140-dll-breaking-linkage-of-static-libraries
-+ODBCLIB = legacy_stdio_definitions.lib odbc32.lib odbccp32.lib user32.lib
-+!ELSE
- ODBCLIB = odbc32.lib odbccp32.lib user32.lib
- !ENDIF
-+!ENDIF
- 
- !IF DEFINED(MRSID_DIR) || DEFINED(MRSID_RASTER_DIR) || DEFINED(MRSID_LIDAR_DIR)
- !IF "$(MRSID_PLUGIN)" != "YES"
-diff --git a/port/cpl_config.h.vc b/port/cpl_config.h.vc
-index bfff8f6..fe7b82a 100644
---- a/port/cpl_config.h.vc
-+++ b/port/cpl_config.h.vc
-@@ -1,5 +1,5 @@
- 
--/* We define this here in general so that a VC++ build will publically
-+/* We define this here in general so that a VC++ build will publicly
-    declare STDCALL interfaces even if an application is built against it
-    using MinGW */
- 
-@@ -17,7 +17,9 @@
- #if defined(_MSC_VER) && (_MSC_VER < 1500)
- #  define vsnprintf _vsnprintf
- #endif
--#define snprintf _snprintf
-+#if defined(_MSC_VER) && (_MSC_VER < 1900)
-+#  define snprintf _snprintf
-+#endif
- 
- #define HAVE_GETCWD 1
- /* gmt_notunix.h from GMT project also redefines getcwd. See #3138 */
-@@ -86,7 +88,7 @@
- /* Set the native cpu bit order */
- #define HOST_FILLORDER FILLORDER_LSB2MSB
- 
--/* Define as 0 or 1 according to the floating point format suported by the
-+/* Define as 0 or 1 according to the floating point format supported by the
-    machine */
- #define HAVE_IEEEFP 1
- 
--- 
-2.10.1.windows.1
-
diff --git a/ports/gdal/0002-Add-variable-CXX_CRT_FLAGS-to-allow-for-selection-of.patch b/ports/gdal/0001-Add-variable-CXX_CRT_FLAGS-to-allow-for-selection-of.patch
index 0ffcac5fb..7817c4a38 100644
--- a/ports/gdal/0002-Add-variable-CXX_CRT_FLAGS-to-allow-for-selection-of.patch
+++ b/ports/gdal/0001-Add-variable-CXX_CRT_FLAGS-to-allow-for-selection-of.patch
@@ -1,18 +1,8 @@
-From b25c3dc49ca1bcf9a789cf64c9fa8694e35127f0 Mon Sep 17 00:00:00 2001
-From: Manuel Massing <m.massing@warped-space.de>
-Date: Sun, 27 Nov 2016 09:57:04 +0100
-Subject: [PATCH 2/2] Add variable CXX_CRT_FLAGS to allow for selection of C
- runtime linkage in nmake build.
-
----
- nmake.opt | 18 ++++++++++++++----
- 1 file changed, 14 insertions(+), 4 deletions(-)
-
 diff --git a/nmake.opt b/nmake.opt
-index 4d1c4fa..47c2df8 100644
+index bd5719c2d1..f6101ccd59 100644
 --- a/nmake.opt
 +++ b/nmake.opt
-@@ -125,18 +125,28 @@ CXX_PDB_FLAGS=/Zi /Fd$(GDAL_ROOT)\gdal$(VERSION).pdb
+@@ -127,18 +127,28 @@ CXX_PDB_FLAGS=/Zi /Fd$(GDAL_ROOT)\gdal$(VERSION).pdb
  CXX_PDB_FLAGS=
  !ENDIF
  
@@ -29,22 +19,19 @@ index 4d1c4fa..47c2df8 100644
  !IFNDEF OPTFLAGS
  !IF $(MSVC_VER) >= 1400
  !IFNDEF DEBUG
--OPTFLAGS= $(CXX_ANALYZE_FLAGS) $(CXX_PDB_FLAGS) /nologo /MD /EHsc /Ox /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE /DNDEBUG
+-OPTFLAGS= $(CXX_ANALYZE_FLAGS) $(CXX_PDB_FLAGS) /nologo /MP /MD /EHsc /Ox /FC /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE /DNDEBUG
 +OPTFLAGS= $(CXX_ANALYZE_FLAGS) $(CXX_PDB_FLAGS) /nologo $(CXX_CRT_FLAGS) /EHsc /Ox /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE /DNDEBUG
  !ELSE
--OPTFLAGS= $(CXX_ANALYZE_FLAGS) $(CXX_PDB_FLAGS) /nologo /MD /EHsc /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE /DDEBUG
+-OPTFLAGS= $(CXX_ANALYZE_FLAGS) $(CXX_PDB_FLAGS) /nologo /MP /MD /EHsc /FC /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE /DDEBUG
 +OPTFLAGS= $(CXX_ANALYZE_FLAGS) $(CXX_PDB_FLAGS) /nologo $(CXX_CRT_FLAGS) /EHsc /D_CRT_SECURE_NO_DEPRECATE /D_CRT_NONSTDC_NO_DEPRECATE /DDEBUG
  !ENDIF
  !ELSE
  !IFNDEF DEBUG
--OPTFLAGS= $(CXX_PDB_FLAGS) /nologo /MD /EHsc /GR /Ox /DNDEBUG
+-OPTFLAGS= $(CXX_PDB_FLAGS) /nologo /MD /EHsc /GR /Ox /FC /DNDEBUG
 +OPTFLAGS= $(CXX_PDB_FLAGS) /nologo $(CXX_CRT_FLAGS) /EHsc /GR /Ox /DNDEBUG
  !ELSE
--OPTFLAGS= $(CXX_PDB_FLAGS) /nologo /MD /EHsc /GR /DDEBUG
+-OPTFLAGS= $(CXX_PDB_FLAGS) /nologo /MD /EHsc /GR /FC /DDEBUG
 +OPTFLAGS= $(CXX_PDB_FLAGS) /nologo $(CXX_CRT_FLAGS) /EHsc /GR /DDEBUG
  !ENDIF
  !ENDIF  #MSVC_VER
  !ENDIF  # OPTFLAGS
--- 
-2.10.1.windows.1
-
diff --git a/ports/gdal/0002-Ensures-inclusion-of-PDB-in-release-dll-if-so-reques.patch b/ports/gdal/0002-Ensures-inclusion-of-PDB-in-release-dll-if-so-reques.patch
new file mode 100644
index 000000000..57030b99b
--- /dev/null
+++ b/ports/gdal/0002-Ensures-inclusion-of-PDB-in-release-dll-if-so-reques.patch
@@ -0,0 +1,14 @@
+diff --git a/nmake.opt b/nmake.opt
+index bd5719c2d1..c0ca442cbe 100644
+--- a/nmake.opt
++++ b/nmake.opt
+@@ -195,6 +205,9 @@ SOFTWARNFLAGS= /wd4244 /wd4702 /wd4701 /wd4013 /wd4706 /wd4057 /wd4210 /wd4305
+ # Linker debug options
+ !IFDEF DEBUG
+ LDEBUG= /debug
++!ELSEIFDEF WITH_PDB
++# Ensures that PDB is included in release DLL if so requested
++LDEBUG= /debug /opt:ref /opt:icf
+ !ENDIF
+ 
+ # Uncomment the following if you are building for 64-bit windows
diff --git a/ports/gdal/0003-Ensures-inclusion-of-PDB-in-release-dll-if-so-reques.patch b/ports/gdal/0003-Ensures-inclusion-of-PDB-in-release-dll-if-so-reques.patch
deleted file mode 100644
index 1065a2982..000000000
--- a/ports/gdal/0003-Ensures-inclusion-of-PDB-in-release-dll-if-so-reques.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 9da0cb6eed442ebf3eea232cd85e26c155c963ef Mon Sep 17 00:00:00 2001
-From: Manuel Massing <m.massing@warped-space.de>
-Date: Tue, 29 Nov 2016 12:43:58 +0100
-Subject: [PATCH 3/4] - Ensures inclusion of PDB in release dll if so requested
-
----
- gdal/nmake.opt | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/nmake.opt b/nmake.opt
-index 47c2df8..4844d22 100644
---- a/nmake.opt
-+++ b/nmake.opt
-@@ -174,6 +174,9 @@ SOFTWARNFLAGS= /wd4244 /wd4702 /wd4701 /wd4013 /wd4706 /wd4057 /wd4210 /wd4305
- # Linker debug options
- !IFDEF DEBUG
- LDEBUG= /debug
-+!ELSEIFDEF WITH_PDB
-+# Ensures that PDB is included in release DLL if so requested
-+LDEBUG= /debug /opt:ref /opt:icf
- !ENDIF
- 
- # Uncomment the following if you are building for 64-bit windows
--- 
-2.10.1.windows.1
-
diff --git a/ports/gdal/0003-Fix-openjpeg-include.patch b/ports/gdal/0003-Fix-openjpeg-include.patch
new file mode 100644
index 000000000..4ea72690c
--- /dev/null
+++ b/ports/gdal/0003-Fix-openjpeg-include.patch
@@ -0,0 +1,20 @@
+diff --git a/frmts/openjpeg/openjpegdataset.cpp b/frmts/openjpeg/openjpegdataset.cpp
+index 5978882bc9..72cc7b9559 100644
+--- a/frmts/openjpeg/openjpegdataset.cpp
++++ b/frmts/openjpeg/openjpegdataset.cpp
+@@ -34,14 +34,8 @@
+ #pragma clang diagnostic ignored "-Wdocumentation"
+ #endif
+ 
+-#if defined(OPENJPEG_VERSION) && OPENJPEG_VERSION >= 20200
+-#include <openjpeg-2.2/openjpeg.h>
+-#elif defined(OPENJPEG_VERSION) && OPENJPEG_VERSION >= 20100
+-#include <openjpeg-2.1/openjpeg.h>
+-#else
+ #include <stdio.h> /* openjpeg.h needs FILE* */
+-#include <openjpeg-2.0/openjpeg.h>
+-#endif
++#include <openjpeg.h>
+ 
+ #ifdef __clang__
+ #pragma clang diagnostic pop
diff --git a/ports/gdal/0004-Fix-openjpeg-include.patch b/ports/gdal/0004-Fix-openjpeg-include.patch
deleted file mode 100644
index 2865455d8..000000000
--- a/ports/gdal/0004-Fix-openjpeg-include.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/frmts/openjpeg/openjpegdataset.cpp b/frmts/openjpeg/openjpegdataset.cpp
-index 1fd4f4f..417f7a8 100644
---- a/frmts/openjpeg/openjpegdataset.cpp
-+++ b/frmts/openjpeg/openjpegdataset.cpp
-@@ -29,12 +29,8 @@
- 
- /* This file is to be used with openjpeg 2.0 */
- 
--#if defined(OPENJPEG_VERSION) && OPENJPEG_VERSION >= 20100
--#include <openjpeg-2.1/openjpeg.h>
--#else
--#include <stdio.h> /* openjpeg.h needs FILE* */
--#include <openjpeg-2.0/openjpeg.h>
--#endif
-+#include <stdio.h>
-+#include <openjpeg.h>
- #include <vector>
- 
- #include "gdaljp2abstractdataset.h"
diff --git a/ports/gdal/CONTROL b/ports/gdal/CONTROL
index 083a52800..b84dc29e1 100644
--- a/ports/gdal/CONTROL
+++ b/ports/gdal/CONTROL
@@ -1,4 +1,4 @@
 Source: gdal
-Version: 1.11.3-5
+Version: 2.2.2
 Description: The Geographic Data Abstraction Library for reading and writing geospatial raster and vector data.
 Build-Depends: proj4, libpng, geos, sqlite3, curl, expat, libpq, libmysql, openjpeg, libwebp, libxml2, liblzma
diff --git a/ports/gdal/portfile.cmake b/ports/gdal/portfile.cmake
index 214ec2024..9bfb92362 100644
--- a/ports/gdal/portfile.cmake
+++ b/ports/gdal/portfile.cmake
@@ -5,25 +5,24 @@ endif()
 include(vcpkg_common_functions)
 
 vcpkg_download_distfile(ARCHIVE
-    URLS "http://download.osgeo.org/gdal/1.11.3/gdal1113.zip"
-    FILENAME "gdal1113.zip"
-    SHA512 42feb98a54019d3b6ac54f598f299a57e117db500c662d39faa9d5f5090f03c1b8d7680242e1abd8035738edc4fc3197ae118a0ce50733691a76a5cf377bcd46
-)
+    URLS "http://download.osgeo.org/gdal/2.2.2/gdal222.zip"
+    FILENAME "gdal222.zip"
+    SHA512 b886238a7915c97f4acec5920dabe959d1ab15a8be0bc31ba0d05ad69d1d7d96f864faf0aa82921fa1a1b40b733744202b86f2f45ff63d6518cd18a53f3544a8
+    )
 
 # Extract source into archictecture specific directory, because GDALs' nmake based build currently does not
 # support out of source builds.
-set(SOURCE_PATH_DEBUG   ${CURRENT_BUILDTREES_DIR}/src-${TARGET_TRIPLET}-debug/gdal-1.11.3)
-set(SOURCE_PATH_RELEASE ${CURRENT_BUILDTREES_DIR}/src-${TARGET_TRIPLET}-release/gdal-1.11.3)
+set(SOURCE_PATH_DEBUG   ${CURRENT_BUILDTREES_DIR}/src-${TARGET_TRIPLET}-debug/gdal-2.2.2)
+set(SOURCE_PATH_RELEASE ${CURRENT_BUILDTREES_DIR}/src-${TARGET_TRIPLET}-release/gdal-2.2.2)
 
 foreach(BUILD_TYPE debug release)
     vcpkg_extract_source_archive(${ARCHIVE} ${CURRENT_BUILDTREES_DIR}/src-${TARGET_TRIPLET}-${BUILD_TYPE})
     vcpkg_apply_patches(
-        SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src-${TARGET_TRIPLET}-${BUILD_TYPE}/gdal-1.11.3
+        SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src-${TARGET_TRIPLET}-${BUILD_TYPE}/gdal-2.2.2
         PATCHES
-        ${CMAKE_CURRENT_LIST_DIR}/0001-Add-support-for-MSVC1900-backported-from-GDAL2.patch
-        ${CMAKE_CURRENT_LIST_DIR}/0002-Add-variable-CXX_CRT_FLAGS-to-allow-for-selection-of.patch
-        ${CMAKE_CURRENT_LIST_DIR}/0003-Ensures-inclusion-of-PDB-in-release-dll-if-so-reques.patch
-        ${CMAKE_CURRENT_LIST_DIR}/0004-Fix-openjpeg-include.patch
+        ${CMAKE_CURRENT_LIST_DIR}/0001-Add-variable-CXX_CRT_FLAGS-to-allow-for-selection-of.patch
+        ${CMAKE_CURRENT_LIST_DIR}/0002-Ensures-inclusion-of-PDB-in-release-dll-if-so-reques.patch
+        ${CMAKE_CURRENT_LIST_DIR}/0003-Fix-openjpeg-include.patch
     )
 endforeach()
 
@@ -211,7 +210,7 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
 else()
   file(GLOB EXE_FILES ${CURRENT_PACKAGES_DIR}/bin/*.exe)
   file(REMOVE ${EXE_FILES} ${CURRENT_PACKAGES_DIR}/lib/gdal.lib)
-  file(COPY ${SOURCE_PATH_DEBUG}/gdal111.dll DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin)
+  file(COPY ${SOURCE_PATH_DEBUG}/gdal202.dll DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin)
   file(COPY ${SOURCE_PATH_DEBUG}/gdal_i.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
   file(RENAME ${CURRENT_PACKAGES_DIR}/lib/gdal_i.lib ${CURRENT_PACKAGES_DIR}/lib/gdal.lib)
   file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/gdal_i.lib ${CURRENT_PACKAGES_DIR}/debug/lib/gdald.lib)
diff --git a/ports/geos/CONTROL b/ports/geos/CONTROL
index 3d2ed4565..2b192d088 100644
--- a/ports/geos/CONTROL
+++ b/ports/geos/CONTROL
@@ -1,3 +1,3 @@
 Source: geos
-Version: 3.6.2-1
+Version: 3.6.2-2
 Description: Geometry Engine Open Source
diff --git a/ports/geos/portfile.cmake b/ports/geos/portfile.cmake
index ec88a0f57..68b4ab9f7 100644
--- a/ports/geos/portfile.cmake
+++ b/ports/geos/portfile.cmake
@@ -33,8 +33,6 @@ vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     OPTIONS -DGEOS_ENABLE_TESTS=False
 )
-
-vcpkg_build_cmake()
 vcpkg_install_cmake()
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 # Handle copyright
@@ -49,4 +47,4 @@ else()
 
 endif()
 
-vcpkg_copy_pdbs()
-\ No newline at end of file
+vcpkg_copy_pdbs()
diff --git a/ports/gtest/portfile.cmake b/ports/gtest/portfile.cmake
index 0bfe4e60c..333dc8ae3 100644
--- a/ports/gtest/portfile.cmake
+++ b/ports/gtest/portfile.cmake
@@ -28,6 +28,8 @@ vcpkg_configure_cmake(
     OPTIONS -Dgtest_force_shared_crt=${gtest_force_shared_crt}
 )
 
+set(ENV{_CL_} "/D_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING")
+
 vcpkg_install_cmake()
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
diff --git a/ports/kinectsdk1/CONTROL b/ports/kinectsdk1/CONTROL
index 3d4c83fd2..9764fb69a 100644
--- a/ports/kinectsdk1/CONTROL
+++ b/ports/kinectsdk1/CONTROL
@@ -1,3 +1,3 @@
 Source: kinectsdk1
-Version: 1.8-1
+Version: 1.8-2
 Description: Kinect for Windows SDK for Kinect v1 sensor.
diff --git a/ports/kinectsdk1/portfile.cmake b/ports/kinectsdk1/portfile.cmake
index aef4cd1c2..5aec50119 100644
--- a/ports/kinectsdk1/portfile.cmake
+++ b/ports/kinectsdk1/portfile.cmake
@@ -1,10 +1,39 @@
 include(vcpkg_common_functions)
 
-get_filename_component(KINECTSDK10_DIR "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Kinect;SDKInstallPath]" ABSOLUTE CACHE)
-if(NOT EXISTS "${KINECTSDK10_DIR}")
-    message(FATAL_ERROR "Error: Could not find Kinect for Windows SDK v1.x. It can be downloaded from https://www.microsoft.com/en-us/download/details.aspx?id=40278.")
+if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm")
+    message(FATAL_ERROR "This port does not currently support architecture: ${VCPKG_TARGET_ARCHITECTURE}")
 endif()
 
+set(KINECTSDK10_VERSION "v1.8")
+vcpkg_download_distfile(KINECTSDK10_INSTALLER
+    URLS "https://download.microsoft.com/download/E/1/D/E1DEC243-0389-4A23-87BF-F47DE869FC1A/KinectSDK-${KINECTSDK10_VERSION}-Setup.exe"
+    FILENAME "KinectSDK-${KINECTSDK10_VERSION}-Setup.exe"
+    SHA512 ee8a0f70c86aad80fe214108e315e4550a90ed39f278ce00a7137532174ee5bf3bdeb1d0b499fc5ffdb5e176adecfd68963ee3731e1d2f00d69d32d1b8a3c555
+)
+
+vcpkg_find_acquire_program(DARK)
+
+set(KINECTSDK10_WIX_INSTALLER "${KINECTSDK10_INSTALLER}")
+set(KINECTSDK10_WIX_EXTRACT_DIR "${CURRENT_BUILDTREES_DIR}/src/installer/wix")
+vcpkg_execute_required_process(
+    COMMAND ${DARK} -x ${KINECTSDK10_WIX_EXTRACT_DIR} ${KINECTSDK10_WIX_INSTALLER}
+    WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}
+    LOGNAME extract_wix_installer
+)
+
+file(TO_NATIVE_PATH "${KINECTSDK10_WIX_EXTRACT_DIR}/AttachedContainer/KinectSDK-${KINECTSDK10_VERSION}-${VCPKG_TARGET_ARCHITECTURE}.msi" KINECTSDK10_MSI_INSTALLER)
+file(TO_NATIVE_PATH "${CURRENT_BUILDTREES_DIR}/src/installer/msi/${VCPKG_TARGET_ARCHITECTURE}" KINECTSDK10_MSI_EXTRACT_DIR)
+file(TO_NATIVE_PATH "${CURRENT_BUILDTREES_DIR}/msiexec.log" MSIEXEC_LOG_PATH)
+set(BATCH_FILE ${CURRENT_BUILDTREES_DIR}/msiextract-msmpi.bat)
+file(WRITE ${BATCH_FILE} "msiexec.exe /a \"${KINECTSDK10_MSI_INSTALLER}\" /qn /log \"${MSIEXEC_LOG_PATH}\" TARGETDIR=\"${KINECTSDK10_MSI_EXTRACT_DIR}\"")
+vcpkg_execute_required_process(
+    COMMAND ${BATCH_FILE}
+    WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}
+    LOGNAME extract_msi_installer_${VCPKG_TARGET_ARCHITECTURE}
+)
+
+set(KINECTSDK10_DIR "${CURRENT_BUILDTREES_DIR}/src/installer/msi/${VCPKG_TARGET_ARCHITECTURE}/Microsoft SDKs/Kinect/${KINECTSDK10_VERSION}")
+
 file(
     INSTALL
         "${KINECTSDK10_DIR}/inc/NuiApi.h"
diff --git a/ports/kinectsdk2/CONTROL b/ports/kinectsdk2/CONTROL
new file mode 100644
index 000000000..85ccd7f0b
--- /dev/null
+++ b/ports/kinectsdk2/CONTROL
@@ -0,0 +1,3 @@
+Source: kinectsdk2
+Version: 2.0
+Description: Kinect for Windows SDK for Kinect v2 sensor.
diff --git a/ports/kinectsdk2/portfile.cmake b/ports/kinectsdk2/portfile.cmake
new file mode 100644
index 000000000..05aa1fd2e
--- /dev/null
+++ b/ports/kinectsdk2/portfile.cmake
@@ -0,0 +1,72 @@
+# Common Ambient Variables:
+#   CURRENT_BUILDTREES_DIR    = ${VCPKG_ROOT_DIR}\buildtrees\${PORT}
+#   CURRENT_PACKAGES_DIR      = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET}
+#   CURRENT_PORT_DIR          = ${VCPKG_ROOT_DIR}\ports\${PORT}
+#   PORT                      = current port name (zlib, etc)
+#   TARGET_TRIPLET            = current triplet (x86-windows, x64-windows-static, etc)
+#   VCPKG_CRT_LINKAGE         = C runtime linkage type (static, dynamic)
+#   VCPKG_LIBRARY_LINKAGE     = target library linkage type (static, dynamic)
+#   VCPKG_ROOT_DIR            = <C:\path\to\current\vcpkg>
+#   VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm)
+#
+
+include(vcpkg_common_functions)
+
+if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm")
+    message(FATAL_ERROR "This port does not currently support architecture: ${VCPKG_TARGET_ARCHITECTURE}")
+endif()
+
+set(KINECTSDK20_VERSION "v2.0_1409")
+vcpkg_download_distfile(KINECTSDK20_INSTALLER
+    URLS "https://download.microsoft.com/download/F/2/D/F2D1012E-3BC6-49C5-B8B3-5ACFF58AF7B8/KinectSDK-${KINECTSDK20_VERSION}-Setup.exe"
+    FILENAME "KinectSDK-${KINECTSDK20_VERSION}-Setup.exe"
+    SHA512 ae3b00f45282ab2ed6ea36c09e42e1b274074f41546ecfbe00facf1fffa2e5a762ffeffb9ba2194f716e8122e0fbd9a8ef63c62be68d2b50a40e4f8c5a821f5f
+)
+
+vcpkg_find_acquire_program(DARK)
+
+set(KINECTSDK20_WIX_INSTALLER "${KINECTSDK20_INSTALLER}")
+set(KINECTSDK20_WIX_EXTRACT_DIR "${CURRENT_BUILDTREES_DIR}/src/installer/wix")
+vcpkg_execute_required_process(
+    COMMAND ${DARK} -x ${KINECTSDK20_WIX_EXTRACT_DIR} ${KINECTSDK20_WIX_INSTALLER}
+    WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}
+    LOGNAME extract_wix_installer
+)
+
+file(TO_NATIVE_PATH "${KINECTSDK20_WIX_EXTRACT_DIR}/AttachedContainer/KinectSDK-${KINECTSDK20_VERSION}-x64.msi" KINECTSDK20_MSI_INSTALLER)
+file(TO_NATIVE_PATH "${CURRENT_BUILDTREES_DIR}/src/installer/msi" KINECTSDK20_MSI_EXTRACT_DIR)
+file(TO_NATIVE_PATH "${CURRENT_BUILDTREES_DIR}/msiexec.log" MSIEXEC_LOG_PATH)
+set(BATCH_FILE ${CURRENT_BUILDTREES_DIR}/msiextract-msmpi.bat)
+file(WRITE ${BATCH_FILE} "msiexec.exe /a \"${KINECTSDK20_MSI_INSTALLER}\" /qn /log \"${MSIEXEC_LOG_PATH}\" TARGETDIR=\"${KINECTSDK20_MSI_EXTRACT_DIR}\"")
+vcpkg_execute_required_process(
+    COMMAND ${BATCH_FILE}
+    WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}
+    LOGNAME extract_msi_installer
+)
+
+set(KINECTSDK20_DIR "${CURRENT_BUILDTREES_DIR}/src/installer/msi/Microsoft SDKs/Kinect/${KINECTSDK20_VERSION}")
+
+file(
+    INSTALL
+        "${KINECTSDK20_DIR}/inc/Kinect.h"
+    DESTINATION
+        ${CURRENT_PACKAGES_DIR}/include
+)
+
+file(
+    INSTALL
+        "${KINECTSDK20_DIR}/Lib/${VCPKG_TARGET_ARCHITECTURE}/Kinect20.lib"
+    DESTINATION
+        ${CURRENT_PACKAGES_DIR}/lib
+)
+
+file(
+    INSTALL
+        "${KINECTSDK20_DIR}/Lib/${VCPKG_TARGET_ARCHITECTURE}/Kinect20.lib"
+    DESTINATION
+        ${CURRENT_PACKAGES_DIR}/debug/lib
+)
+
+# Handle copyright
+file(COPY "${KINECTSDK20_DIR}/SDKEula.rtf" DESTINATION ${CURRENT_PACKAGES_DIR}/share/kinectsdk2)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/kinectsdk2/SDKEula.rtf ${CURRENT_PACKAGES_DIR}/share/kinectsdk2/copyright)
diff --git a/ports/libnice/CMakeLists.txt b/ports/libnice/CMakeLists.txt
index c631d3317..7454a0046 100644
--- a/ports/libnice/CMakeLists.txt
+++ b/ports/libnice/CMakeLists.txt
@@ -119,7 +119,7 @@ RUNTIME DESTINATION bin
     ARCHIVE DESTINATION lib
     LIBRARY DESTINATION lib)
 
-if (${CMAKE_BUILD_TYPE} STREQUAL "Release")
+if (CMAKE_BUILD_TYPE STREQUAL "Release")
 install(FILES agent/address.h DESTINATION include/nice)
 install(FILES agent/agent.h DESTINATION include/nice)
 install(FILES agent/candidate.h DESTINATION include/nice)
diff --git a/ports/librtmp/CMakeLists.txt b/ports/librtmp/CMakeLists.txt
new file mode 100644
index 000000000..c12ddc0ef
--- /dev/null
+++ b/ports/librtmp/CMakeLists.txt
@@ -0,0 +1,57 @@
+cmake_minimum_required(VERSION 3.8)
+
+project(librtmp C)
+
+find_package(zlib REQUIRED)
+find_package(openssl REQUIRED)
+
+include_directories(${ZLIB_INCLUDE_DIRS})
+include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+
+set(CMAKE_DEBUG_POSTFIX "d")
+
+if(MSVC)
+    add_definitions(-D_CRT_SECURE_NO_DEPRECATE)
+    add_definitions(-D_CRT_NONSTDC_NO_DEPRECATE)
+    add_definitions(-D_WINSOCK_DEPRECATED_NO_WARNINGS)
+endif()
+
+add_definitions(-DLIBRTMP_ONLY)
+
+# List the header files
+set(HEADERS librtmp/amf.h
+            librtmp/bytes.h
+            librtmp/dh.h
+            librtmp/dhgroups.h
+            librtmp/handshake.h
+            librtmp/http.h
+            librtmp/log.h
+            librtmp/rtmp.h
+            librtmp/rtmp_sys.h
+)
+
+# List the source files
+set(SRCS librtmp/amf.c
+         librtmp/hashswf.c
+         librtmp/log.c
+         librtmp/parseurl.c
+         librtmp/rtmp.c
+         librtmp/librtmp.def
+)
+
+if(MSVC)
+    set(SRCS_MSVC "librtmp/librtmp.def")
+endif()
+
+add_library(librtmp ${SRCS} ${HEADERS} ${SRCS_MSVC})
+
+target_include_directories(librtmp PRIVATE ./librtmp)
+target_link_libraries(librtmp PRIVATE ${ZLIB_LIBRARIES} ${OPENSSL_LIBRARIES})
+target_link_libraries(librtmp PRIVATE Ws2_32.lib Winmm.lib)
+
+install(TARGETS librtmp
+        RUNTIME DESTINATION bin
+        LIBRARY DESTINATION lib
+        ARCHIVE DESTINATION lib)
+
+install(FILES librtmp/rtmp.h librtmp/amf.h DESTINATION include/librtmp)
+\ No newline at end of file
diff --git a/ports/librtmp/CONTROL b/ports/librtmp/CONTROL
new file mode 100644
index 000000000..d26541d91
--- /dev/null
+++ b/ports/librtmp/CONTROL
@@ -0,0 +1,4 @@
+Source: librtmp
+Version: 2.3
+Build-Depends: zlib, openssl
+Description: RTMPDump Real-Time Messaging Protocol API
diff --git a/ports/librtmp/fix_strncasecmp.patch b/ports/librtmp/fix_strncasecmp.patch
new file mode 100644
index 000000000..c1cadc4ac
--- /dev/null
+++ b/ports/librtmp/fix_strncasecmp.patch
@@ -0,0 +1,16 @@
+diff --git a/librtmp/rtmp_sys.h b/librtmp/rtmp_sys.h
+index 0874cbe..b43d587 100644
+--- a/librtmp/rtmp_sys.h
++++ b/librtmp/rtmp_sys.h
+@@ -37,6 +37,11 @@
+ #include <ws2tcpip.h>
+ #endif
+ 
++#ifdef _MSC_VER
++#define strncasecmp _strnicmp
++#define strcasecmp _stricmp
++#endif
++
+ #define GetSockError()	WSAGetLastError()
+ #define SetSockError(e)	WSASetLastError(e)
+ #define setsockopt(a,b,c,d,e)	(setsockopt)(a,b,c,(const char *)d,(int)e)
diff --git a/ports/librtmp/hide_netstackdump.patch b/ports/librtmp/hide_netstackdump.patch
new file mode 100644
index 000000000..e2a5e4207
--- /dev/null
+++ b/ports/librtmp/hide_netstackdump.patch
@@ -0,0 +1,22 @@
+diff --git a/librtmp/rtmp.c b/librtmp/rtmp.c
+index f152648..0bf3f7d 100644
+--- a/librtmp/rtmp.c
++++ b/librtmp/rtmp.c
+@@ -1316,7 +1316,7 @@ ReadN(RTMP *r, char *buffer, int n)
+ 	    SendBytesReceived(r);
+ 	}
+       /*RTMP_Log(RTMP_LOGDEBUG, "%s: %d bytes\n", __FUNCTION__, nBytes); */
+-#ifdef _DEBUG
++#if defined(_DEBUG) && !defined(LIBRTMP_ONLY)
+       fwrite(ptr, 1, nBytes, netstackdump_read);
+ #endif
+ 
+@@ -3527,7 +3527,7 @@ RTMPSockBuf_Send(RTMPSockBuf *sb, const char *buf, int len)
+ {
+   int rc;
+ 
+-#ifdef _DEBUG
++#if defined(_DEBUG) && !defined(LIBRTMP_ONLY)
+   fwrite(buf, 1, len, netstackdump);
+ #endif
+ 
diff --git a/ports/librtmp/librtmp.def b/ports/librtmp/librtmp.def
new file mode 100644
index 000000000..d9f8b9136
--- /dev/null
+++ b/ports/librtmp/librtmp.def
@@ -0,0 +1,105 @@
+EXPORTS
+	AMF_AddProp
+	AMF_CountProp
+	AMF_Decode
+	AMF_DecodeArray
+	AMF_DecodeBoolean
+	AMF_DecodeInt16
+	AMF_DecodeInt24
+	AMF_DecodeInt32
+	AMF_DecodeLongString
+	AMF_DecodeNumber
+	AMF_DecodeString
+	AMF_Dump
+	AMF_Encode
+	AMF_EncodeBoolean
+	AMF_EncodeInt16
+	AMF_EncodeInt24
+	AMF_EncodeInt32
+	AMF_EncodeNamedBoolean
+	AMF_EncodeNamedNumber
+	AMF_EncodeNamedString
+	AMF_EncodeNumber
+	AMF_EncodeString
+	AMF_GetProp
+	AMF_Reset
+
+	AMF3_Decode
+	AMF3CD_AddProp
+	AMF3CD_GetProp
+	AMF3Prop_Decode
+	AMF3ReadInteger
+	AMF3ReadString
+
+	AMFProp_Decode
+	AMFProp_Dump
+	AMFProp_Encode
+	AMFProp_GetBoolean
+	AMFProp_GetName
+	AMFProp_GetNumber
+	AMFProp_GetObject
+	AMFProp_GetString
+	AMFProp_GetType
+	AMFProp_IsValid
+	AMFProp_Reset
+	AMFProp_SetName
+
+	RTMP_Alloc
+	RTMP_ClientPacket
+	RTMP_Close
+	RTMP_Connect
+	RTMP_Connect0
+	RTMP_Connect1
+	RTMP_ConnectStream
+	RTMP_ctrlC
+	RTMP_debuglevel
+	RTMP_DefaultFlashVer
+	RTMP_DeleteStream
+	RTMP_DropRequest
+	RTMP_EnableWrite
+	RTMP_FindFirstMatchingProperty
+	RTMP_FindPrefixProperty
+	RTMP_Free
+	RTMP_GetDuration
+	RTMP_GetNextMediaPacket
+	RTMP_GetTime
+	RTMP_HashSWF
+	RTMP_Init
+	RTMP_IsConnected
+	RTMP_IsTimedout
+	RTMP_LibVersion
+	RTMP_Log
+	RTMP_LogGetLevel
+	RTMP_LogHex
+	RTMP_LogHexString
+	RTMP_LogPrintf
+	RTMP_LogSetCallback
+	RTMP_LogSetLevel
+	RTMP_LogSetOutput
+	RTMP_LogStatus
+	RTMP_ParsePlaypath
+	RTMP_ParseURL
+	RTMP_Pause
+	RTMP_Read
+	RTMP_ReadPacket
+	RTMP_ReconnectStream
+	RTMP_SendChunk
+	RTMP_SendClientBW
+	RTMP_SendCreateStream
+	RTMP_SendCtrl
+	RTMP_SendPacket
+	RTMP_SendPause
+	RTMP_SendSeek
+	RTMP_SendServerBW
+	RTMP_Serve
+	RTMP_SetBufferMS
+	RTMP_SetOpt
+	RTMP_SetupStream
+	RTMP_SetupURL
+	RTMP_Socket
+	RTMP_TLS_ctx
+	RTMP_TLS_Init
+	RTMP_ToggleStream
+	RTMP_UpdateBufferMS
+	RTMP_UserInterrupt
+	RTMP_Write
diff --git a/ports/librtmp/portfile.cmake b/ports/librtmp/portfile.cmake
new file mode 100644
index 000000000..18423f152
--- /dev/null
+++ b/ports/librtmp/portfile.cmake
@@ -0,0 +1,36 @@
+include(vcpkg_common_functions)
+
+set(RTMPDUMP_VERSION 2.3)
+set(RTMPDUMP_FILENAME rtmpdump-${RTMPDUMP_VERSION}.tgz)
+set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/rtmpdump-${RTMPDUMP_VERSION})
+
+vcpkg_download_distfile(ARCHIVE
+    URLS "http://rtmpdump.mplayerhq.hu/download/${RTMPDUMP_FILENAME}"
+    FILENAME "${RTMPDUMP_FILENAME}"
+    SHA512 d8240ba372a704231286b81bbf75716d8b76874840538c4e1527f7f8b6ca66eeaba6b03167fe6fab06bf80f20f07d89ecb84cc428b3196234174a43f3328ec2a
+)
+vcpkg_extract_source_archive(${ARCHIVE})
+
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/librtmp.def DESTINATION ${SOURCE_PATH}/librtmp)
+
+vcpkg_apply_patches(
+    SOURCE_PATH ${SOURCE_PATH}
+    PATCHES
+        ${CMAKE_CURRENT_LIST_DIR}/fix_strncasecmp.patch
+        ${CMAKE_CURRENT_LIST_DIR}/hide_netstackdump.patch
+)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+)
+
+vcpkg_install_cmake()
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+
+# License and man
+file(INSTALL ${SOURCE_PATH}/librtmp/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/librtmp RENAME copyright)
+file(INSTALL ${SOURCE_PATH}/librtmp/librtmp.3.html DESTINATION ${CURRENT_PACKAGES_DIR}/share/librtmp)
+
+vcpkg_copy_pdbs()
diff --git a/ports/libtheora/CMakeLists.txt b/ports/libtheora/CMakeLists.txt
index 24ecbccf4..cf8799e5d 100644
--- a/ports/libtheora/CMakeLists.txt
+++ b/ports/libtheora/CMakeLists.txt
@@ -66,7 +66,7 @@ if(USE_X86)
   add_definitions(-DOC_X86_ASM)
 endif()
 
-if (${BUILD_SHARED_LIBS})
+if (BUILD_SHARED_LIBS)
   add_definitions(-DLIBTHEORA_EXPORTS)
 endif()
 
diff --git a/ports/mozjpeg/CONTROL b/ports/mozjpeg/CONTROL
new file mode 100644
index 000000000..9e3f19b4c
--- /dev/null
+++ b/ports/mozjpeg/CONTROL
@@ -0,0 +1,3 @@
+Source: mozjpeg
+Version: 3.2-1
+Description: MozJPEG reduces file sizes of JPEG images while retaining quality and compatibility with the vast majority of the world's deployed decoders. It's compatible with libjpeg API and ABI, and can be used as a drop-in replacement for libjpeg.
diff --git a/ports/mozjpeg/portfile.cmake b/ports/mozjpeg/portfile.cmake
new file mode 100644
index 000000000..52011d394
--- /dev/null
+++ b/ports/mozjpeg/portfile.cmake
@@ -0,0 +1,54 @@
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO mozilla/mozjpeg
+    REF v3.2
+    SHA512 d14789827a9f4f78139a3945d3169d37eb891758b5ab40ef19e99ebebb2fb6d7c3a05495de245bba54cfd913b153af352159aa9fc0218127f97819137e0f1ab8
+    HEAD_REF master
+)
+
+vcpkg_find_acquire_program(NASM)
+get_filename_component(NASM_EXE_PATH ${NASM} DIRECTORY)
+set(ENV{PATH} "$ENV{PATH};${NASM_EXE_PATH}")
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
+    set(OPTIONS "-DENABLE_SHARED=FALSE")
+else()
+    set(OPTIONS "-DENABLE_STATIC=FALSE")
+endif()
+
+string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "dynamic" WITH_CRT_DLL)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    OPTIONS
+        ${OPTIONS}
+        -DWITH_CRT_DLL=${WITH_CRT_DLL}
+)
+
+vcpkg_install_cmake()
+
+#remove extra debug files
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/doc)
+file(GLOB DEBUGEXES ${CURRENT_PACKAGES_DIR}/debug/bin/*.exe)
+file(REMOVE ${DEBUGEXES})
+
+#move exes to tools
+file(GLOB EXES ${CURRENT_PACKAGES_DIR}/bin/*.exe)
+file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/mozjpeg)
+file(COPY ${EXES} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/mozjpeg)
+file(REMOVE ${EXES})
+
+vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/mozjpeg)
+
+#remove empty folders after static build
+if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
+    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin)
+    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin)
+endif()
+
+# Handle copyright
+file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/mozjpeg RENAME copyright)
+vcpkg_copy_pdbs()
+\ No newline at end of file
diff --git a/ports/mpfr/CONTROL b/ports/mpfr/CONTROL
index 2d5d4fedd..bec54417d 100644
--- a/ports/mpfr/CONTROL
+++ b/ports/mpfr/CONTROL
@@ -1,4 +1,4 @@
 Source: mpfr
-Version: 3.1.5-1
+Version: 3.1.6
 Description: The MPFR library is a C library for multiple-precision floating-point computations with correct rounding
 Build-Depends: mpir
diff --git a/ports/mpfr/portfile.cmake b/ports/mpfr/portfile.cmake
index 6a61d4038..b71aa0505 100644
--- a/ports/mpfr/portfile.cmake
+++ b/ports/mpfr/portfile.cmake
@@ -1,9 +1,9 @@
 include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/mpfr-3.1.5)
+set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/mpfr-3.1.6)
 vcpkg_download_distfile(ARCHIVE
-    URLS "http://www.mpfr.org/mpfr-current/mpfr-3.1.5.tar.xz"
-    FILENAME "mpfr-3.1.5.tar.xz"
-    SHA512 3643469b9099b31e41d6ec9158196cd1c30894030c8864ee5b1b1e91b488bccbf7c263c951b03fe9f4ae6f9d29279e157a7dfed0885467d875f107a3d964f032
+    URLS "http://www.mpfr.org/mpfr-current/mpfr-3.1.6.tar.xz"
+    FILENAME "mpfr-3.1.6.tar.xz"
+    SHA512 746ee74d5026f267f74ab352d850ed30ff627d530aa840c71b24793e44875f8503946bd7399905dea2b2dd5744326254d7889337fe94cfe58d03c4066e9d8054
 )
 
 vcpkg_extract_source_archive(${ARCHIVE})
diff --git a/ports/msmpi/portfile.cmake b/ports/msmpi/portfile.cmake
index ca841313e..893e6f124 100644
--- a/ports/msmpi/portfile.cmake
+++ b/ports/msmpi/portfile.cmake
@@ -22,7 +22,7 @@ vcpkg_get_program_files_platform_bitness(PROGRAM_FILES_PLATFORM_BITNESS)
 set(SYSTEM_MPIEXEC_FILEPATH "${PROGRAM_FILES_PLATFORM_BITNESS}/Microsoft MPI/Bin/mpiexec.exe")
 set(MSMPI_EXPECTED_FULL_VERSION "8.1.12438.1084")
 
-if(EXISTS ${SYSTEM_MPIEXEC_FILEPATH})
+if(EXISTS "${SYSTEM_MPIEXEC_FILEPATH}")
     set(MPIEXEC_VERSION_LOGNAME "mpiexec-version")
     vcpkg_execute_required_process(
         COMMAND ${SYSTEM_MPIEXEC_FILEPATH}
@@ -31,8 +31,8 @@ if(EXISTS ${SYSTEM_MPIEXEC_FILEPATH})
     )
     file(READ ${CURRENT_BUILDTREES_DIR}/${MPIEXEC_VERSION_LOGNAME}-out.log MPIEXEC_OUTPUT)
 
-    if(${MPIEXEC_OUTPUT} MATCHES "\\[Version ([0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+)\\]")
-        if(NOT ${CMAKE_MATCH_1} STREQUAL ${MSMPI_EXPECTED_FULL_VERSION})
+    if(MPIEXEC_OUTPUT MATCHES "\\[Version ([0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+)\\]")
+        if(NOT CMAKE_MATCH_1 STREQUAL MSMPI_EXPECTED_FULL_VERSION)
             download_msmpi_redistributable_package()
 
             message(FATAL_ERROR
@@ -102,7 +102,7 @@ file(INSTALL
     DESTINATION
         ${CURRENT_PACKAGES_DIR}/lib
 )
-if(${TRIPLET_SYSTEM_ARCH} STREQUAL "x86")
+if(TRIPLET_SYSTEM_ARCH STREQUAL "x86")
     file(INSTALL
             "${SOURCE_LIB_PATH}/${TRIPLET_SYSTEM_ARCH}/msmpifes.lib"
             "${SOURCE_LIB_PATH}/${TRIPLET_SYSTEM_ARCH}/msmpifms.lib"
@@ -121,7 +121,7 @@ file(INSTALL
     DESTINATION
         ${CURRENT_PACKAGES_DIR}/debug/lib
 )
-if(${TRIPLET_SYSTEM_ARCH} STREQUAL "x86")
+if(TRIPLET_SYSTEM_ARCH STREQUAL "x86")
     file(INSTALL
             "${SOURCE_LIB_PATH}/${TRIPLET_SYSTEM_ARCH}/msmpifes.lib"
             "${SOURCE_LIB_PATH}/${TRIPLET_SYSTEM_ARCH}/msmpifms.lib"
diff --git a/ports/openni2/CONTROL b/ports/openni2/CONTROL
index 2f0e010e0..b1d60d860 100644
--- a/ports/openni2/CONTROL
+++ b/ports/openni2/CONTROL
@@ -1,3 +1,4 @@
 Source: openni2
-Version: 2.2.0.33-1
+Version: 2.2.0.33-4
+Build-Depends: kinectsdk1
 Description: OpenNI is open source library for access to Natural Interaction (NI) devices such as RGB-D camera.
diff --git a/ports/openni2/portfile.cmake b/ports/openni2/portfile.cmake
index 7c15b40ec..cc428ddb7 100644
--- a/ports/openni2/portfile.cmake
+++ b/ports/openni2/portfile.cmake
@@ -1,15 +1,3 @@
-# Common Ambient Variables:
-#   CURRENT_BUILDTREES_DIR    = ${VCPKG_ROOT_DIR}\buildtrees\${PORT}
-#   CURRENT_PACKAGES_DIR      = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET}
-#   CURRENT_PORT_DIR          = ${VCPKG_ROOT_DIR}\ports\${PORT}
-#   PORT                      = current port name (zlib, etc)
-#   TARGET_TRIPLET            = current triplet (x86-windows, x64-windows-static, etc)
-#   VCPKG_CRT_LINKAGE         = C runtime linkage type (static, dynamic)
-#   VCPKG_LIBRARY_LINKAGE     = target library linkage type (static, dynamic)
-#   VCPKG_ROOT_DIR            = <C:\path\to\current\vcpkg>
-#   VCPKG_TARGET_ARCHITECTURE = target architecture (x64, x86, arm)
-#
-
 # UWP Not Support
 if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
     message(FATAL_ERROR "Error: UWP builds are currently not supported.")
@@ -28,22 +16,13 @@ endif()
 
 # Download Source Code
 include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/OpenNI2-2.2-beta2)
-vcpkg_download_distfile(ARCHIVE
-    URLS "https://github.com/OpenNI/OpenNI2/archive/2.2-beta2.zip"
-    FILENAME "OpenNI2-2.2-beta.zip"
-    SHA512 9779161493114265745c9eb8b15db95a3ed2322cd75504931d0fb7b6214d7abc8a9eb2ea5f35e309bc4d2748f015eee27ada4974a2e9568b5ecb9d98099c84e9
-)
-vcpkg_extract_source_archive(${ARCHIVE})
-
-get_filename_component(KINECTSDK10_DIR "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Kinect;SDKInstallPath]" ABSOLUTE CACHE)
-set(KINECTSDK10_INSTALLED FALSE)
-if(EXISTS "${KINECTSDK10_DIR}")
-    set(KINECTSDK10_INSTALLED TRUE)
-endif()
-
-file(TO_NATIVE_PATH ${KINECTSDK10_DIR} KINECTSDK10_DIR)
-configure_file("${CMAKE_CURRENT_LIST_DIR}/replace_environment_variable.patch.in" "${CMAKE_CURRENT_LIST_DIR}/replace_environment_variable.patch" @ONLY)
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO OpenNI/OpenNI2
+    REF 2.2-beta2
+    SHA512 60a3a3043679f3069aea869e92dc5881328ce4393d4140ea8d089027321ac501ae27d283657214e2834d216d0d49bf4f29a4b3d3e43df27a6ed21f889cd0083f
+    HEAD_REF master
+)
 
 vcpkg_apply_patches(
     SOURCE_PATH ${SOURCE_PATH}
@@ -52,12 +31,16 @@ vcpkg_apply_patches(
             "${CMAKE_CURRENT_LIST_DIR}/replace_environment_variable.patch"
 )
 
-if(NOT ${KINECTSDK10_INSTALLED})
-    vcpkg_apply_patches(
-        SOURCE_PATH ${SOURCE_PATH}
-        PATCHES "${CMAKE_CURRENT_LIST_DIR}/disable_kinect.patch"
-    )
-endif()
+file(REMOVE_RECURSE ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET})
+file(MAKE_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET})
+file(COPY ${SOURCE_PATH} DESTINATION ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET})
+get_filename_component(SOURCE_DIR_NAME "${SOURCE_PATH}" NAME)
+
+# Use fresh copy of sources for building and modification
+set(SOURCE_PATH "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}/${SOURCE_DIR_NAME}")
+
+file(TO_NATIVE_PATH ${CURRENT_INSTALLED_DIR} NATIVE_INSTALLED_DIR)
+configure_file("${SOURCE_PATH}/Source/Drivers/Kinect/Kinect.vcxproj" "${SOURCE_PATH}/Source/Drivers/Kinect/Kinect.vcxproj" @ONLY)
 
 # Build OpenNI2
 vcpkg_build_msbuild(
@@ -154,6 +137,7 @@ file(
 
 file(
     INSTALL
+        "${SOURCE_BIN_PATH_RELEASE}/OpenNI2/Drivers/Kinect.dll"
         "${SOURCE_BIN_PATH_RELEASE}/OpenNI2/Drivers/OniFile.dll"
         "${SOURCE_BIN_PATH_RELEASE}/OpenNI2/Drivers/PS1080.dll"
         "${SOURCE_CONFIG_PATH}/OpenNI2/Drivers/PS1080.ini"
@@ -163,15 +147,6 @@ file(
         ${CURRENT_PACKAGES_DIR}/bin/OpenNI2/Drivers
 )
 
-if(${KINECTSDK10_INSTALLED})
-    file(
-        INSTALL
-            "${SOURCE_BIN_PATH_RELEASE}/OpenNI2/Drivers/Kinect.dll"
-        DESTINATION
-            ${CURRENT_PACKAGES_DIR}/bin/OpenNI2/Drivers
-    )
-endif()
-
 file(
     INSTALL
         "${SOURCE_CONFIG_PATH}/OpenNI.ini"
@@ -182,6 +157,7 @@ file(
 
 file(
     INSTALL
+        "${SOURCE_BIN_PATH_DEBUG}/OpenNI2/Drivers/Kinect.dll"
         "${SOURCE_BIN_PATH_DEBUG}/OpenNI2/Drivers/OniFile.dll"
         "${SOURCE_BIN_PATH_DEBUG}/OpenNI2/Drivers/PS1080.dll"
         "${SOURCE_CONFIG_PATH}/OpenNI2/Drivers/PS1080.ini"
@@ -191,15 +167,6 @@ file(
         ${CURRENT_PACKAGES_DIR}/debug/bin/OpenNI2/Drivers
 )
 
-if(${KINECTSDK10_INSTALLED})
-    file(
-        INSTALL
-            "${SOURCE_BIN_PATH_DEBUG}/OpenNI2/Drivers/Kinect.dll"
-        DESTINATION
-            ${CURRENT_PACKAGES_DIR}/debug/bin/OpenNI2/Drivers
-    )
-endif()
-
 file(
     INSTALL
         "${SOURCE_CONFIG_PATH}/OpenNI.ini"
@@ -210,6 +177,7 @@ file(
 
 file(
     INSTALL
+        "${SOURCE_BIN_PATH_RELEASE}/OpenNI2/Drivers/Kinect.dll"
         "${SOURCE_BIN_PATH_RELEASE}/OpenNI2/Drivers/OniFile.dll"
         "${SOURCE_BIN_PATH_RELEASE}/OpenNI2/Drivers/PS1080.dll"
         "${SOURCE_CONFIG_PATH}/OpenNI2/Drivers/PS1080.ini"
@@ -219,15 +187,6 @@ file(
         ${CURRENT_PACKAGES_DIR}/tools/openni2/OpenNI2/Drivers
 )
 
-if(${KINECTSDK10_INSTALLED})
-    file(
-        INSTALL
-            "${SOURCE_BIN_PATH_RELEASE}/OpenNI2/Drivers/Kinect.dll"
-        DESTINATION
-            ${CURRENT_PACKAGES_DIR}/tools/openni2/OpenNI2/Drivers
-    )
-endif()
-
 if(VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
     set(NUMBEROFBIT 32)
 elseif(VCPKG_TARGET_ARCHITECTURE STREQUAL "x64")
@@ -248,4 +207,4 @@ file(
 
 # Handle copyright
 file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/openni2)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/openni2/LICENSE ${CURRENT_PACKAGES_DIR}/share/openni2/copyright)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/openni2/LICENSE ${CURRENT_PACKAGES_DIR}/share/openni2/copyright)
+\ No newline at end of file
diff --git a/ports/openni2/replace_environment_variable.patch.in b/ports/openni2/replace_environment_variable.patch
index 25abe7edf..48978e869 100644
--- a/ports/openni2/replace_environment_variable.patch.in
+++ b/ports/openni2/replace_environment_variable.patch
@@ -7,7 +7,7 @@ index 08a49fe..7fd8620 100644
        <WarningLevel>Level3</WarningLevel>
        <Optimization>Disabled</Optimization>
 -      <AdditionalIncludeDirectories>..\..\..\Include;..\..\..\ThirdParty\PSCommon\XnLib\Include;$(KINECTSDK10_DIR)\inc;</AdditionalIncludeDirectories>
-+      <AdditionalIncludeDirectories>..\..\..\Include;..\..\..\ThirdParty\PSCommon\XnLib\Include;@KINECTSDK10_DIR@\inc;</AdditionalIncludeDirectories>
++      <AdditionalIncludeDirectories>..\..\..\Include;..\..\..\ThirdParty\PSCommon\XnLib\Include;@NATIVE_INSTALLED_DIR@\include</AdditionalIncludeDirectories>
        <PreprocessorDefinitions>_WINDLL;%(PreprocessorDefinitions);_WINDOWS</PreprocessorDefinitions>
        <DisableLanguageExtensions>false</DisableLanguageExtensions>
        <TreatWarningAsError>false</TreatWarningAsError>
@@ -16,7 +16,7 @@ index 08a49fe..7fd8620 100644
        <GenerateDebugInformation>true</GenerateDebugInformation>
        <AdditionalDependencies>Kinect10.lib;XnLib.lib;%(AdditionalDependencies)</AdditionalDependencies>
 -      <AdditionalLibraryDirectories>$(SolutionDir)Bin\$(Platform)-$(Configuration)\;$(KINECTSDK10_DIR)\lib\x86;</AdditionalLibraryDirectories>
-+      <AdditionalLibraryDirectories>$(SolutionDir)Bin\$(Platform)-$(Configuration)\;@KINECTSDK10_DIR@\lib\x86;</AdditionalLibraryDirectories>
++      <AdditionalLibraryDirectories>$(SolutionDir)Bin\$(Platform)-$(Configuration)\;@NATIVE_INSTALLED_DIR@\debug\lib</AdditionalLibraryDirectories>
        <TreatLinkerWarningAsErrors>true</TreatLinkerWarningAsErrors>
      </Link>
    </ItemDefinitionGroup>
@@ -25,7 +25,7 @@ index 08a49fe..7fd8620 100644
        <WarningLevel>Level3</WarningLevel>
        <Optimization>Disabled</Optimization>
 -      <AdditionalIncludeDirectories>..\..\..\Include;..\..\..\ThirdParty\PSCommon\XnLib\Include;$(KINECTSDK10_DIR)\inc;</AdditionalIncludeDirectories>
-+      <AdditionalIncludeDirectories>..\..\..\Include;..\..\..\ThirdParty\PSCommon\XnLib\Include;@KINECTSDK10_DIR@\inc;</AdditionalIncludeDirectories>
++      <AdditionalIncludeDirectories>..\..\..\Include;..\..\..\ThirdParty\PSCommon\XnLib\Include;@NATIVE_INSTALLED_DIR@\include</AdditionalIncludeDirectories>
        <PreprocessorDefinitions>_WINDLL;%(PreprocessorDefinitions);_WINDOWS</PreprocessorDefinitions>
        <DisableLanguageExtensions>false</DisableLanguageExtensions>
        <TreatWarningAsError>false</TreatWarningAsError>
@@ -34,7 +34,7 @@ index 08a49fe..7fd8620 100644
        <GenerateDebugInformation>true</GenerateDebugInformation>
        <AdditionalDependencies>Kinect10.lib;XnLib.lib;%(AdditionalDependencies)</AdditionalDependencies>
 -      <AdditionalLibraryDirectories>$(SolutionDir)Bin\$(Platform)-$(Configuration)\;$(KINECTSDK10_DIR)\lib\amd64;</AdditionalLibraryDirectories>
-+      <AdditionalLibraryDirectories>$(SolutionDir)Bin\$(Platform)-$(Configuration)\;@KINECTSDK10_DIR@\lib\amd64;</AdditionalLibraryDirectories>
++      <AdditionalLibraryDirectories>$(SolutionDir)Bin\$(Platform)-$(Configuration)\;@NATIVE_INSTALLED_DIR@\debug\lib</AdditionalLibraryDirectories>
        <IgnoreSpecificDefaultLibraries>
        </IgnoreSpecificDefaultLibraries>
        <IgnoreAllDefaultLibraries>
@@ -43,7 +43,7 @@ index 08a49fe..7fd8620 100644
        <FunctionLevelLinking>true</FunctionLevelLinking>
        <IntrinsicFunctions>true</IntrinsicFunctions>
 -      <AdditionalIncludeDirectories>..\..\..\Include;..\..\..\ThirdParty\PSCommon\XnLib\Include;$(KINECTSDK10_DIR)\inc;</AdditionalIncludeDirectories>
-+      <AdditionalIncludeDirectories>..\..\..\Include;..\..\..\ThirdParty\PSCommon\XnLib\Include;@KINECTSDK10_DIR@\inc;</AdditionalIncludeDirectories>
++      <AdditionalIncludeDirectories>..\..\..\Include;..\..\..\ThirdParty\PSCommon\XnLib\Include;@NATIVE_INSTALLED_DIR@\include</AdditionalIncludeDirectories>
        <TreatWarningAsError>false</TreatWarningAsError>
      </ClCompile>
      <Link>
@@ -52,7 +52,7 @@ index 08a49fe..7fd8620 100644
        <OptimizeReferences>true</OptimizeReferences>
        <AdditionalDependencies>Kinect10.lib;XnLib.lib;%(AdditionalDependencies)</AdditionalDependencies>
 -      <AdditionalLibraryDirectories>$(SolutionDir)Bin\$(Platform)-$(Configuration)\;$(KINECTSDK10_DIR)\lib\x86;</AdditionalLibraryDirectories>
-+      <AdditionalLibraryDirectories>$(SolutionDir)Bin\$(Platform)-$(Configuration)\;@KINECTSDK10_DIR@\lib\x86;</AdditionalLibraryDirectories>
++      <AdditionalLibraryDirectories>$(SolutionDir)Bin\$(Platform)-$(Configuration)\;@NATIVE_INSTALLED_DIR@\lib</AdditionalLibraryDirectories>
        <TreatLinkerWarningAsErrors>true</TreatLinkerWarningAsErrors>
      </Link>
    </ItemDefinitionGroup>
@@ -61,7 +61,7 @@ index 08a49fe..7fd8620 100644
        <FunctionLevelLinking>true</FunctionLevelLinking>
        <IntrinsicFunctions>true</IntrinsicFunctions>
 -      <AdditionalIncludeDirectories>..\..\..\Include;..\..\..\ThirdParty\PSCommon\XnLib\Include;$(KINECTSDK10_DIR)\inc;</AdditionalIncludeDirectories>
-+      <AdditionalIncludeDirectories>..\..\..\Include;..\..\..\ThirdParty\PSCommon\XnLib\Include;@KINECTSDK10_DIR@\inc;</AdditionalIncludeDirectories>
++      <AdditionalIncludeDirectories>..\..\..\Include;..\..\..\ThirdParty\PSCommon\XnLib\Include;@NATIVE_INSTALLED_DIR@\include</AdditionalIncludeDirectories>
        <TreatWarningAsError>false</TreatWarningAsError>
      </ClCompile>
      <Link>
@@ -70,7 +70,7 @@ index 08a49fe..7fd8620 100644
        <OptimizeReferences>true</OptimizeReferences>
        <AdditionalDependencies>Kinect10.lib;XnLib.lib;%(AdditionalDependencies)</AdditionalDependencies>
 -      <AdditionalLibraryDirectories>$(SolutionDir)Bin\$(Platform)-$(Configuration)\;$(KINECTSDK10_DIR)\lib\amd64;</AdditionalLibraryDirectories>
-+      <AdditionalLibraryDirectories>$(SolutionDir)Bin\$(Platform)-$(Configuration)\;@KINECTSDK10_DIR@\lib\amd64;</AdditionalLibraryDirectories>
++      <AdditionalLibraryDirectories>$(SolutionDir)Bin\$(Platform)-$(Configuration)\;@NATIVE_INSTALLED_DIR@\lib</AdditionalLibraryDirectories>
        <TreatLinkerWarningAsErrors>true</TreatLinkerWarningAsErrors>
      </Link>
    </ItemDefinitionGroup>
diff --git a/ports/openni2/upgrade_projects.patch b/ports/openni2/upgrade_projects.patch
index 1a44381b0..86dee5794 100644
--- a/ports/openni2/upgrade_projects.patch
+++ b/ports/openni2/upgrade_projects.patch
@@ -837,7 +837,7 @@ index 56c5944..0401f3d 100644
        <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
        <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
 diff --git a/Source/Drivers/Kinect/Kinect.vcxproj b/Source/Drivers/Kinect/Kinect.vcxproj
-index f54e8b2..7f54d04 100644
+index f54e8b2..6ea2656 100644
 --- a/Source/Drivers/Kinect/Kinect.vcxproj
 +++ b/Source/Drivers/Kinect/Kinect.vcxproj
 @@ -2,4 +2,4 @@
@@ -895,6 +895,15 @@ index f54e8b2..7f54d04 100644
      </ClCompile>
      <Link>
        <GenerateDebugInformation>true</GenerateDebugInformation>
+@@ -125,7 +129,7 @@
+       </IgnoreSpecificDefaultLibraries>
+       <IgnoreAllDefaultLibraries>
+       </IgnoreAllDefaultLibraries>
+-      <TreatLinkerWarningAsErrors>true</TreatLinkerWarningAsErrors>
++      <TreatLinkerWarningAsErrors>false</TreatLinkerWarningAsErrors>
+     </Link>
+   </ItemDefinitionGroup>
+   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
 @@ -135,7 +139,7 @@
        <FunctionLevelLinking>true</FunctionLevelLinking>
        <IntrinsicFunctions>true</IntrinsicFunctions>
diff --git a/ports/pcl/CONTROL b/ports/pcl/CONTROL
index e9547c8cb..d8c38a363 100644
--- a/ports/pcl/CONTROL
+++ b/ports/pcl/CONTROL
@@ -1,4 +1,4 @@
 Source: pcl
-Version: 1.8.1-1
-Build-Depends: boost, eigen3, flann, qhull, vtk, openni2, qt5
+Version: 1.8.1-2
+Build-Depends: boost, eigen3, flann, qhull, vtk, openni2, qt5, winpcap
 Description: Point Cloud Library (PCL) is open source library for 2D/3D image and point cloud processing.
diff --git a/ports/pcl/portfile.cmake b/ports/pcl/portfile.cmake
index 8010d9c70..cd5c5bedc 100644
--- a/ports/pcl/portfile.cmake
+++ b/ports/pcl/portfile.cmake
@@ -50,7 +50,7 @@ vcpkg_configure_cmake(
         -DWITH_CUDA=OFF
         -DWITH_LIBUSB=OFF
         -DWITH_OPENNI2=ON
-        -DWITH_PCAP=OFF
+        -DWITH_PCAP=ON
         -DWITH_PNG=OFF
         -DWITH_QHULL=ON
         -DWITH_QT=ON
diff --git a/ports/protobuf/portfile.cmake b/ports/protobuf/portfile.cmake
index e3cae639c..e7f45c36c 100644
--- a/ports/protobuf/portfile.cmake
+++ b/ports/protobuf/portfile.cmake
@@ -58,8 +58,7 @@ vcpkg_configure_cmake(
         -DCMAKE_INSTALL_CMAKEDIR=share/protobuf
 )
 
-# Using 64-bit toolset to avoid occassional Linker Out-of-Memory issues.
-vcpkg_install_cmake(MSVC_64_TOOLSET)
+vcpkg_install_cmake()
 
 # It appears that at this point the build hasn't actually finished. There is probably
 # a process spawned by the build, therefore we need to wait a bit.
diff --git a/ports/sciter/CONTROL b/ports/sciter/CONTROL
index 54d72ec3c..5583c626d 100644
--- a/ports/sciter/CONTROL
+++ b/ports/sciter/CONTROL
@@ -1,4 +1,4 @@
 Source: sciter
-Version: 4.0.3
+Version: 4.0.4
 Description: Sciter is an embeddable HTML/CSS/scripting engine.
 Maintainer: andrew.fedoniouk@gmail.com, ehysta@gmail.com
diff --git a/ports/sciter/portfile.cmake b/ports/sciter/portfile.cmake
index 063b318e3..ac3020144 100644
--- a/ports/sciter/portfile.cmake
+++ b/ports/sciter/portfile.cmake
@@ -12,9 +12,9 @@ include(vcpkg_common_functions)
 # header-only library
 set(VCPKG_POLICY_DLLS_WITHOUT_LIBS enabled)
 
-set(SCITER_VERSION 4.0.3)
-set(SCITER_REVISION 1209528289b8c8369352d648f4ba0c67826cbd8b)
-set(SCITER_SHA 9fc72dd44b22c69715b4b08c5af7a65e0bb48d849191002b2ae45ca6f5ea058fb8c64cc7f6c176215afce682af6166a1579efd8cc2ca0fb9e844ceba1160f10f)
+set(SCITER_VERSION 4.0.4)
+set(SCITER_REVISION 9b5954df34ac0094e6037ac8aa6e00fb883185f9)
+set(SCITER_SHA a87b05aec6c99f56926b005eb1303b2b68f901fe2658433ca11d704b50308e6d291026404b86320fae0f1b12ca257a35338464f21d94ebeaa6e40cfec64a9201)
 
 if(VCPKG_TARGET_ARCHITECTURE STREQUAL x64)
     set(SCITER_ARCH 64)
diff --git a/ports/shaderc/CMakeLists.txt b/ports/shaderc/CMakeLists.txt
index f4e0830c6..580ffa1d1 100644
--- a/ports/shaderc/CMakeLists.txt
+++ b/ports/shaderc/CMakeLists.txt
@@ -1,5 +1,5 @@
 option(SUFFIX_D "Add d Suffix to lib" ${SUFFIX_D})
-if(NOT ${SUFFIX_D})
+if(NOT SUFFIX_D)
     find_library(GLSLANG glslang)
     find_library(OSDEPENDENT OSDependent)
     find_library(OGLCOMPILER OGLCompiler)
diff --git a/ports/shaderc/CMakeLists_spirv.txt b/ports/shaderc/CMakeLists_spirv.txt
index 6aa738b1f..618177fa6 100644
--- a/ports/shaderc/CMakeLists_spirv.txt
+++ b/ports/shaderc/CMakeLists_spirv.txt
@@ -1,5 +1,5 @@
 option(SUFFIX_D "Add d Suffix to lib" ${SUFFIX_D})
-if(NOT ${SUFFIX_D})
+if(NOT SUFFIX_D)
     find_library(SPIRVTOOLSOPT spirv-tools-opt)
     find_library(SPIRVTOOLS spirv-tools)
 ELSE()
diff --git a/ports/spatialite-tools/CONTROL b/ports/spatialite-tools/CONTROL
new file mode 100644
index 000000000..ecbf681c6
--- /dev/null
+++ b/ports/spatialite-tools/CONTROL
@@ -0,0 +1,4 @@
+Source: spatialite-tools
+Version: 4.3.0
+Description: Contains spatialite.exe and other command line tools to work with SpatiaLite databases (import, export, SQL queries)
+Build-Depends: sqlite3, libspatialite, geos, readosm, proj4, zlib, libiconv, expat
diff --git a/ports/spatialite-tools/fix-makefiles.patch b/ports/spatialite-tools/fix-makefiles.patch
new file mode 100644
index 000000000..ff6e0ad0d
--- /dev/null
+++ b/ports/spatialite-tools/fix-makefiles.patch
@@ -0,0 +1,128 @@
+diff --git a/makefile.vc b/makefile.vc
+index 33c85d2..c811e7d 100644
+--- a/makefile.vc
++++ b/makefile.vc
+@@ -15,7 +15,7 @@ SPATIALITE_OSM_RAW_EXE    = spatialite_osm_raw.exe
+ SPATIALITE_OSM_FILTER_EXE = spatialite_osm_filter.exe
+ SPATIALITE_GML_EXE        = spatialite_gml.exe
+ 
+-CFLAGS	=	/nologo -IC:\OSGeo4W\include $(OPTFLAGS)
++CFLAGS	=	/nologo -I$(INSTALLED_ROOT)\include $(OPTFLAGS)
+ 
+ default:	all
+ 
+@@ -26,89 +26,58 @@ all: $(SPATIALITE_EXE) $(SHP_DOCTOR_EXE) $(SPATIALITE_TOOL_EXE) \
+ 	$(SPATIALITE_OSM_FILTER_EXE)
+ 
+ $(SPATIALITE_EXE): shell.obj
+-	cl shell.obj C:\OSGeo4W\lib\proj_i.lib \
+-		C:\OSGeo4W\lib\iconv.lib C:\OSGeo4W\lib\geos_c.lib \
+-		C:\OSGeo4W\lib\spatialite_i.lib C:\OSGeo4W\lib\sqlite3_i.lib \
+-		/Fe$(SPATIALITE_EXE)
++	cl shell.obj $(LIBS_ALL) /Fe$(SPATIALITE_EXE)
+ 	if exist $(SPATIALITE_EXE).manifest mt -manifest \
+ 		$(SPATIALITE_EXE).manifest -outputresource:$(SPATIALITE_EXE);1
+ 
+ $(EXIF_LOADER_EXE):	exif_loader.obj
+-	cl exif_loader.obj C:\OSGeo4W\lib\proj_i.lib \
+-		C:\OSGeo4W\lib\iconv.lib C:\OSGeo4W\lib\geos_c.lib \
+-		C:\OSGeo4W\lib\spatialite_i.lib C:\OSGeo4W\lib\sqlite3_i.lib 
++	cl exif_loader.obj $(LIBS_ALL) 
+ 	if exist $(EXIF_LOADER_EXE).manifest mt -manifest \
+ 		$(EXIF_LOADER_EXE).manifest -outputresource:$(EXIF_LOADER_EXE);1
+ 
+ $(SHP_DOCTOR_EXE):	shp_doctor.obj
+-	cl shp_doctor.obj  C:\OSGeo4W\lib\proj_i.lib \
+-		C:\OSGeo4W\lib\iconv.lib C:\OSGeo4W\lib\geos_c.lib \
+-		C:\OSGeo4W\lib\spatialite_i.lib C:\OSGeo4W\lib\sqlite3_i.lib 
++	cl shp_doctor.obj $(LIBS_ALL) 
+ 	if exist $(SHP_DOCTOR_EXE).manifest mt -manifest \
+ 		$(SHP_DOCTOR_EXE).manifest -outputresource:$(SHP_DOCTOR_EXE);1
+ 
+ $(SPATIALITE_NETWORK_EXE):	spatialite_network.obj
+-	cl spatialite_network.obj C:\OSGeo4W\lib\proj_i.lib \
+-		C:\OSGeo4W\lib\iconv.lib \
+-		C:\OSGeo4W\lib\spatialite_i.lib C:\OSGeo4W\lib\sqlite3_i.lib 
++	cl spatialite_network.obj $(LIBS_ALL) 
+ 	if exist $(SPATIALITE_NETWORK_EXE).manifest mt -manifest \
+ 		$(SPATIALITE_TOOL_EXE).manifest \
+ 		-outputresource:$(SPATIALITE_TOOL_EXE);1
+ 
+ $(SPATIALITE_TOOL_EXE):	spatialite_tool.obj
+-	cl spatialite_tool.obj C:\OSGeo4W\lib\proj_i.lib \
+-		C:\OSGeo4W\lib\iconv.lib C:\OSGeo4W\lib\geos_c.lib \
+-		C:\OSGeo4W\lib\spatialite_i.lib C:\OSGeo4W\lib\sqlite3_i.lib 
++	cl spatialite_tool.obj $(LIBS_ALL) 
+ 	if exist $(SPATIALITE_TOOL_EXE).manifest mt -manifest \
+ 		$(SPATIALITE_TOOL_EXE).manifest \
+ 		-outputresource:$(SPATIALITE_TOOL_EXE);1
+ 
+ $(SPATIALITE_OSM_NET_EXE):	spatialite_osm_net.obj
+-	cl spatialite_osm_net.obj C:\OSGeo4W\lib\proj_i.lib \
+-		C:\OSGeo4W\lib\iconv.lib \
+-		C:\OSGeo4W\lib\readosm_i.lib \
+-		C:\OSGeo4W\lib\libexpat.lib \
+-		C:\OSGeo4W\lib\zlib.lib \
+-		C:\OSGeo4W\lib\spatialite_i.lib C:\OSGeo4W\lib\sqlite3_i.lib 
++	cl spatialite_osm_net.obj $(LIBS_ALL) 
+ 	if exist $(SPATIALITE_OSM_EXE).manifest mt -manifest \
+ 		$(SPATIALITE_OSM_EXE).manifest \
+ 		-outputresource:$(SPATIALITE_OSM_NET_EXE);1
+ 
+ $(SPATIALITE_OSM_MAP_EXE):	spatialite_osm_map.obj
+-	cl spatialite_osm_map.obj C:\OSGeo4W\lib\proj_i.lib \
+-		C:\OSGeo4W\lib\iconv.lib \
+-		C:\OSGeo4W\lib\readosm_i.lib \
+-		C:\OSGeo4W\lib\libexpat.lib \
+-		C:\OSGeo4W\lib\zlib.lib \
+-		C:\OSGeo4W\lib\spatialite_i.lib C:\OSGeo4W\lib\sqlite3_i.lib 
++	cl spatialite_osm_map.obj $(LIBS_ALL) 
+ 	if exist $(SPATIALITE_OSM_MAP_EXE).manifest mt -manifest \
+ 		$(SPATIALITE_OSM_MAP_EXE).manifest \
+ 		-outputresource:$(SPATIALITE_OSM_MAP_EXE);1
+ 
+ $(SPATIALITE_GML_EXE):	spatialite_gml.obj
+-	cl spatialite_gml.obj C:\OSGeo4W\lib\proj_i.lib \
+-		C:\OSGeo4W\lib\iconv.lib \
+-		C:\OSGeo4W\lib\libexpat.lib \
+-		C:\OSGeo4W\lib\spatialite_i.lib C:\OSGeo4W\lib\sqlite3_i.lib 
++	cl spatialite_gml.obj $(LIBS_ALL) 
+ 	if exist $(SPATIALITE_GML_EXE).manifest mt -manifest \
+ 		$(SPATIALITE_GML_EXE).manifest \
+ 		-outputresource:$(SPATIALITE_GML_EXE);1
+ 
+ $(SPATIALITE_OSM_RAW_EXE):	spatialite_osm_raw.obj
+-	cl spatialite_osm_raw.obj C:\OSGeo4W\lib\proj_i.lib \
+-		C:\OSGeo4W\lib\iconv.lib \
+-		C:\OSGeo4W\lib\readosm_i.lib \
+-		C:\OSGeo4W\lib\libexpat.lib \
+-		C:\OSGeo4W\lib\zlib.lib \
+-		C:\OSGeo4W\lib\spatialite_i.lib C:\OSGeo4W\lib\sqlite3_i.lib 
++	cl spatialite_osm_raw.obj $(LIBS_ALL) 
+ 	if exist $(SPATIALITE_OSM_RAW_EXE).manifest mt -manifest \
+ 		$(SPATIALITE_OSM_RAW_EXE).manifest \
+ 		-outputresource:$(SPATIALITE_OSM_RAW_EXE);1
+ 
+ $(SPATIALITE_OSM_FILTER_EXE):	spatialite_osm_filter.obj
+-	cl spatialite_osm_filter.obj C:\OSGeo4W\lib\proj_i.lib \
+-		C:\OSGeo4W\lib\iconv.lib \
+-		C:\OSGeo4W\lib\spatialite_i.lib C:\OSGeo4W\lib\sqlite3_i.lib 
++	cl spatialite_osm_filter.obj $(LIBS_ALL) 
+ 	if exist $(SPATIALITE_OSM_FILTER_EXE).manifest mt -manifest \
+ 		$(SPATIALITE_OSM_FILTER_EXE).manifest \
+ 		-outputresource:$(SPATIALITE_OSM_FILTER_EXE);1
+diff --git a/nmake.opt b/nmake.opt
+index 4f4a953..d9efecf 100644
+--- a/nmake.opt
++++ b/nmake.opt
+@@ -1,8 +1,8 @@
+ # Directory tree where SpatiaLite will be installed.
+-INSTDIR=C:\OSGeo4W
++INSTDIR=$(INST_DIR)
+ 
+ # Uncomment the first for an optimized build, or the second for debug.
+-OPTFLAGS=	/nologo /Ox /fp:precise /W3 /MD /D_CRT_SECURE_NO_WARNINGS \
++OPTFLAGS=	/nologo /fp:precise /W3 $(CL_FLAGS) /D_CRT_SECURE_NO_WARNINGS \
+ 	/D_LARGE_FILE=1 /D_FILE_OFFSET_BITS=64 /D_LARGEFILE_SOURCE=1
+ #OPTFLAGS=	/nologo /Zi /MD /Fdspatialite.pdb
+ 
diff --git a/ports/spatialite-tools/portfile.cmake b/ports/spatialite-tools/portfile.cmake
new file mode 100644
index 000000000..f42227a12
--- /dev/null
+++ b/ports/spatialite-tools/portfile.cmake
@@ -0,0 +1,118 @@
+include(vcpkg_common_functions)
+
+option(BUILD_DEBUG_TOOLS "Build debug version of tools" OFF)
+
+set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/spatialite-tools-4.3.0)
+vcpkg_download_distfile(ARCHIVE
+    URLS "http://www.gaia-gis.it/gaia-sins/spatialite-tools-4.3.0.tar.gz"
+    FILENAME "spatialite-tools-4.3.0.tar.gz"
+    SHA512 e1de27c1c65ff2ff0b08583113517bea74edf33fff59ad6e9c77492ea3ae87d9c0f17d7670ee6602b32eea73ad3678bb5410ef2c6fac6e213bf2e341a907db88
+)
+vcpkg_extract_source_archive(${ARCHIVE})
+
+find_program(NMAKE nmake)
+
+vcpkg_apply_patches(
+    SOURCE_PATH ${SOURCE_PATH}
+    PATCHES ${CMAKE_CURRENT_LIST_DIR}/fix-makefiles.patch
+)
+
+set(LDIR "\"${CURRENT_INSTALLED_DIR}\"")
+
+if(VCPKG_CRT_LINKAGE STREQUAL dynamic)
+    set(CL_FLAGS_DBG "/MDd /Zi")
+    set(CL_FLAGS_REL "/MD /Ox")
+    set(GEOS_LIBS_REL "${LDIR}/lib/geos_c.lib")
+    set(GEOS_LIBS_DBG "${LDIR}/debug/lib/geos_c.lib")
+    set(LIBXML2_LIBS_REL "${LDIR}/lib/libxml2.lib")
+    set(LIBXML2_LIBS_DBG "${LDIR}/debug/lib/libxml2.lib")
+    set(SPATIALITE_LIBS_REL "${LDIR}/lib/spatialite.lib")
+    set(SPATIALITE_LIBS_DBG "${LDIR}/debug/lib/spatialite.lib")
+    set(ICONV_LIBS_REL "${LDIR}/lib/libiconv.lib")
+    set(ICONV_LIBS_DBG "${LDIR}/debug/lib/libiconv.lib")
+else()
+    set(CL_FLAGS_DBG "/MTd /Zi")
+    set(CL_FLAGS_REL "/MT /Ox")
+    set(GEOS_LIBS_REL "${LDIR}/lib/libgeos_c.lib ${LDIR}/lib/libgeos.lib")
+    set(GEOS_LIBS_DBG "${LDIR}/debug/lib/libgeos_c.lib ${LDIR}/debug/lib/libgeos.lib")
+    set(LIBXML2_LIBS_REL "${LDIR}/lib/libxml2.lib ${LDIR}/lib/lzma.lib ws2_32.lib")
+    set(LIBXML2_LIBS_DBG "${LDIR}/debug/lib/libxml2.lib ${LDIR}/debug/lib/lzma.lib ws2_32.lib")
+    set(SPATIALITE_LIBS_REL "${LDIR}/lib/spatialite.lib ${LDIR}/lib/freexl.lib")
+    set(SPATIALITE_LIBS_DBG "${LDIR}/debug/lib/spatialite.lib ${LDIR}/debug/lib/freexl.lib")
+    set(ICONV_LIBS_REL "${LDIR}/lib/libiconv.lib ${LDIR}/lib/libcharset.lib")
+    set(ICONV_LIBS_DBG "${LDIR}/debug/lib/libiconv.lib ${LDIR}/debug/lib/libcharset.lib ")
+endif()
+
+set(LIBS_ALL_DBG
+    "${ICONV_LIBS_DBG} \
+    ${LDIR}/debug/lib/sqlite3.lib \
+    ${SPATIALITE_LIBS_DBG} \
+    ${LIBXML2_LIBS_DBG} \
+    ${GEOS_LIBS_DBG} \
+    ${LDIR}/debug/lib/readosm.lib \
+    ${LDIR}/debug/lib/expat.lib \
+    ${LDIR}/debug/lib/zlibd.lib \
+    ${LDIR}/debug/lib/projd.lib"
+   )
+set(LIBS_ALL_REL
+    "${ICONV_LIBS_REL} \
+    ${LDIR}/lib/sqlite3.lib \
+    ${SPATIALITE_LIBS_REL} \
+    ${LIBXML2_LIBS_REL} \
+    ${GEOS_LIBS_REL} \
+    ${LDIR}/lib/readosm.lib \
+    ${LDIR}/lib/expat.lib \
+    ${LDIR}/lib/zlib.lib \
+    ${LDIR}/lib/proj.lib"
+   )
+
+if(BUILD_DEBUG_TOOLS)
+	################
+	# Debug build
+	################
+	message(STATUS "Building ${TARGET_TRIPLET}-dgb")
+
+	file(TO_NATIVE_PATH "${CURRENT_PACKAGES_DIR}" INST_DIR_REL)
+	vcpkg_execute_required_process(
+		COMMAND ${NMAKE} -f makefile.vc clean install
+		"INST_DIR=\"${INST_DIR_REL}\"" "INSTALLED_ROOT=${LDIR}" "CL_FLAGS=${CL_FLAGS_DBG}" "LIBS_ALL=${LIBS_ALL_DBG}"
+		WORKING_DIRECTORY ${SOURCE_PATH}
+		LOGNAME nmake-build-${TARGET_TRIPLET}-debug
+	)
+	message(STATUS "Building ${TARGET_TRIPLET}-dbg done")
+	set(EXE_FOLDER ${CURRENT_PACKAGES_DIR}/bin/)
+else()
+	################
+	# Release build
+	################
+	message(STATUS "Building ${TARGET_TRIPLET}-rel")
+
+	file(TO_NATIVE_PATH "${CURRENT_PACKAGES_DIR}" INST_DIR_REL)
+	vcpkg_execute_required_process(
+		COMMAND ${NMAKE} -f makefile.vc clean install
+		"INST_DIR=\"${INST_DIR_REL}\"" "INSTALLED_ROOT=${LDIR}" "CL_FLAGS=${CL_FLAGS_REL}" "LIBS_ALL=${LIBS_ALL_REL}"
+		WORKING_DIRECTORY ${SOURCE_PATH}
+		LOGNAME nmake-build-${TARGET_TRIPLET}-release
+	)
+	message(STATUS "Building ${TARGET_TRIPLET}-rel done")
+	set(EXE_FOLDER ${CURRENT_PACKAGES_DIR}/bin/)
+endif()
+
+file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+
+file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/${PORT}/)
+file(GLOB EXES "${EXE_FOLDER}/*.exe")
+file(COPY ${EXES} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/${PORT})
+file(REMOVE ${EXES})
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include)
+
+if(NOT BUILD_DEBUG_TOOLS AND VCPKG_CRT_LINKAGE STREQUAL dynamic)
+    vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT})
+endif()
+
+message(STATUS "Packaging ${TARGET_TRIPLET} done")
+
+# Allow empty include directory
+set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled)
diff --git a/ports/string-theory/CONTROL b/ports/string-theory/CONTROL
new file mode 100644
index 000000000..63bc5b656
--- /dev/null
+++ b/ports/string-theory/CONTROL
@@ -0,0 +1,3 @@
+Source: string-theory
+Version: 1.6
+Description: Flexible C++11 string library with type-safe formatting.
diff --git a/ports/string-theory/portfile.cmake b/ports/string-theory/portfile.cmake
new file mode 100644
index 000000000..8a6cb1fd1
--- /dev/null
+++ b/ports/string-theory/portfile.cmake
@@ -0,0 +1,42 @@
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO zrax/string_theory
+    REF 1.6
+    SHA512 5bc99b6dfc2ab43d2812ee47dfbbeeb68106da39b2349799ab924f009270166ebb5508f87a37e634fbfa5495dd263697a582404650eedc5393722761c5ce2028
+    HEAD_REF master
+)
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
+    set(ST_BUILD_STATIC ON)
+else()
+    set(ST_BUILD_STATIC OFF)
+endif()
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+    OPTIONS
+        -DST_BUILD_STATIC=${ST_BUILD_STATIC}
+)
+
+vcpkg_install_cmake()
+
+vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/string_theory")
+
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/string-theory ${CURRENT_PACKAGES_DIR}/share/string_theory)
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
+    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin)
+    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin)
+endif()
+
+vcpkg_copy_pdbs()
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+
+# Handle copyright
+file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/string-theory)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/string-theory/LICENSE ${CURRENT_PACKAGES_DIR}/share/string-theory/copyright)
+file(COPY ${CURRENT_PACKAGES_DIR}/share/string-theory/copyright DESTINATION ${CURRENT_PACKAGES_DIR}/share/string_theory/copyright)
diff --git a/ports/tiny-dnn/CONTROL b/ports/tiny-dnn/CONTROL
new file mode 100644
index 000000000..f12cc076f
--- /dev/null
+++ b/ports/tiny-dnn/CONTROL
@@ -0,0 +1,3 @@
+Source: tiny-dnn
+Version: 2017-10-09-dd906fed8c8aff8dc837657c42f9d55f8b793b0e
+Description: A C++14 implementation of deep learning. It is suitable for deep learning on limited computational resource.
diff --git a/ports/tiny-dnn/portfile.cmake b/ports/tiny-dnn/portfile.cmake
new file mode 100644
index 000000000..7e3baa92a
--- /dev/null
+++ b/ports/tiny-dnn/portfile.cmake
@@ -0,0 +1,15 @@
+#header-only library
+include(vcpkg_common_functions)
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO tiny-dnn/tiny-dnn
+    REF dd906fed8c8aff8dc837657c42f9d55f8b793b0e
+    SHA512 d853db7f49af1bece55337b93631c41191f3abd8287969f230330662fecc612e4e53ab789535fc6f9770ae0c8623d8e020e6036c2c804783d08f176a08c05d1b
+    HEAD_REF master
+)
+
+file(INSTALL ${SOURCE_PATH}/tiny_dnn DESTINATION ${CURRENT_PACKAGES_DIR}/include)
+
+
+file(COPY ${CURRENT_BUILDTREES_DIR}/src/tiny-dnn-dd906fed8c8aff8dc837657c42f9d55f8b793b0e/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/tiny-dnn)
+    file(RENAME ${CURRENT_PACKAGES_DIR}/share/tiny-dnn/LICENSE ${CURRENT_PACKAGES_DIR}/share/tiny-dnn/copyright)
+\ No newline at end of file
diff --git a/ports/vtk/CONTROL b/ports/vtk/CONTROL
index 284ccecd3..22d1b1376 100644
--- a/ports/vtk/CONTROL
+++ b/ports/vtk/CONTROL
@@ -1,4 +1,4 @@
 Source: vtk
-Version: 8.0.0-2
+Version: 8.0.0-3
 Description: Software system for 3D computer graphics, image processing, and visualization
-Build-Depends: zlib, libpng, tiff, libxml2, jsoncpp, glew, freetype, expat, hdf5, qt5, msmpi, libjpeg-turbo, proj4, lz4, libtheora
+Build-Depends: zlib, libpng, tiff, libxml2, jsoncpp, glew, freetype, expat, hdf5, qt5, msmpi, libjpeg-turbo, proj4, lz4, libtheora, libharu
diff --git a/ports/vtk/FindGDAL.cmake b/ports/vtk/FindGDAL.cmake
new file mode 100644
index 000000000..e4f2f303b
--- /dev/null
+++ b/ports/vtk/FindGDAL.cmake
@@ -0,0 +1,127 @@
+# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
+# file Copyright.txt or https://cmake.org/licensing for details.
+
+#.rst:
+# FindGDAL
+# --------
+#
+#
+#
+# Locate gdal
+#
+# This module accepts the following environment variables:
+#
+# ::
+#
+#     GDAL_DIR or GDAL_ROOT - Specify the location of GDAL
+#
+#
+#
+# This module defines the following CMake variables:
+#
+# ::
+#
+#     GDAL_FOUND - True if libgdal is found
+#     GDAL_LIBRARY - A variable pointing to the GDAL library
+#     GDAL_INCLUDE_DIR - Where to find the headers
+
+#
+# $GDALDIR is an environment variable that would
+# correspond to the ./configure --prefix=$GDAL_DIR
+# used in building gdal.
+#
+# Created by Eric Wing. I'm not a gdal user, but OpenSceneGraph uses it
+# for osgTerrain so I whipped this module together for completeness.
+# I actually don't know the conventions or where files are typically
+# placed in distros.
+# Any real gdal users are encouraged to correct this (but please don't
+# break the OS X framework stuff when doing so which is what usually seems
+# to happen).
+
+# This makes the presumption that you are include gdal.h like
+#
+#include "gdal.h"
+
+find_path(GDAL_INCLUDE_DIR gdal.h
+  HINTS
+    ENV GDAL_DIR
+    ENV GDAL_ROOT
+  PATH_SUFFIXES
+     include/gdal
+     include/GDAL
+     include
+  PATHS
+      ~/Library/Frameworks/gdal.framework/Headers
+      /Library/Frameworks/gdal.framework/Headers
+      /sw # Fink
+      /opt/local # DarwinPorts
+      /opt/csw # Blastwave
+      /opt
+)
+
+if(UNIX)
+    # Use gdal-config to obtain the library version (this should hopefully
+    # allow us to -lgdal1.x.y where x.y are correct version)
+    # For some reason, libgdal development packages do not contain
+    # libgdal.so...
+    find_program(GDAL_CONFIG gdal-config
+        HINTS
+          ENV GDAL_DIR
+          ENV GDAL_ROOT
+        PATH_SUFFIXES bin
+        PATHS
+            /sw # Fink
+            /opt/local # DarwinPorts
+            /opt/csw # Blastwave
+            /opt
+    )
+
+    if(GDAL_CONFIG)
+        exec_program(${GDAL_CONFIG} ARGS --libs OUTPUT_VARIABLE GDAL_CONFIG_LIBS)
+        if(GDAL_CONFIG_LIBS)
+            string(REGEX MATCHALL "-l[^ ]+" _gdal_dashl ${GDAL_CONFIG_LIBS})
+            string(REPLACE "-l" "" _gdal_lib "${_gdal_dashl}")
+            string(REGEX MATCHALL "-L[^ ]+" _gdal_dashL ${GDAL_CONFIG_LIBS})
+            string(REPLACE "-L" "" _gdal_libpath "${_gdal_dashL}")
+        endif()
+    endif()
+endif()
+
+find_library(GDAL_LIBRARY_RELEASE
+  NAMES ${_gdal_lib} gdal gdal_i gdal1.5.0 gdal1.4.0 gdal1.3.2 GDAL
+  HINTS
+     ENV GDAL_DIR
+     ENV GDAL_ROOT
+     ${_gdal_libpath}
+  PATH_SUFFIXES lib
+  PATHS
+    /sw
+    /opt/local
+    /opt/csw
+    /opt
+    /usr/freeware
+)
+
+find_library(GDAL_LIBRARY_DEBUG
+  NAMES ${_gdal_lib} gdald gdald_i gdald1.5.0 gdald1.4.0 gdald1.3.2 GDALD
+  HINTS
+     ENV GDAL_DIR
+     ENV GDAL_ROOT
+     ${_gdal_libpath}
+  PATH_SUFFIXES lib
+  PATHS
+    /sw
+    /opt/local
+    /opt/csw
+    /opt
+    /usr/freeware
+)
+
+include(SelectLibraryConfigurations)
+select_library_configurations(GDAL)
+
+include(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(GDAL DEFAULT_MSG GDAL_LIBRARY GDAL_INCLUDE_DIR)
+
+set(GDAL_LIBRARIES ${GDAL_LIBRARY})
+set(GDAL_INCLUDE_DIRS ${GDAL_INCLUDE_DIR})
diff --git a/ports/vtk/fix-find-libharu.patch b/ports/vtk/fix-find-libharu.patch
new file mode 100644
index 000000000..683f7bae6
--- /dev/null
+++ b/ports/vtk/fix-find-libharu.patch
@@ -0,0 +1,18 @@
+--- a/CMake/FindLibHaru.cmake	Mon Jun 26 15:29:04 2017
++++ b/CMake/FindLibHaru.cmake	Wed Aug 16 09:30:12 2017
+@@ -19,9 +19,13 @@
+ 
+ find_path(LIBHARU_INCLUDE_DIR hpdf.h)
+ 
+-find_library(LIBHARU_LIBRARY NAMES hpdf)
++find_library(LIBHARU_LIBRARY_RELEASE NAMES hpdf libhpdf)
++find_library(LIBHARU_LIBRARY_DEBUG NAMES hpdfd libhpdfd)
+ 
+-# handle the QUIETLY and REQUIRED arguments and set FONTCONFIG_FOUND to TRUE if
++include(SelectLibraryConfigurations)
++select_library_configurations(LIBHARU)
++
++# handle the QUIETLY and REQUIRED arguments and set LIBHARU_FOUND to TRUE if
+ # all listed variables are TRUE
+ include(FindPackageHandleStandardArgs)
+ find_package_handle_standard_args(LibHaru DEFAULT_MSG
diff --git a/ports/vtk/fix-find-mysql.patch b/ports/vtk/fix-find-mysql.patch
new file mode 100644
index 000000000..d2f984cd5
--- /dev/null
+++ b/ports/vtk/fix-find-mysql.patch
@@ -0,0 +1,10 @@
+--- a/CMake/FindMySQL.cmake	Mon Jun 26 15:29:04 2017
++++ b/CMake/FindMySQL.cmake	Wed Aug 16 11:21:58 2017
+@@ -28,6 +28,7 @@
+   "C:/MySQL/include"
+   "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.0;Location]/include"
+   "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.0;Location]/include"
++  PATH_SUFFIXES mysql
+   DOC "Specify the directory containing mysql.h."
+ )
+ 
diff --git a/ports/vtk/fix-find-odbc.patch b/ports/vtk/fix-find-odbc.patch
new file mode 100644
index 000000000..0690ed0a9
--- /dev/null
+++ b/ports/vtk/fix-find-odbc.patch
@@ -0,0 +1,11 @@
+--- a/CMake/FindODBC.cmake	Mon Jun 26 15:29:04 2017
++++ b/CMake/FindODBC.cmake	Wed Aug 16 12:58:11 2017
+@@ -30,7 +30,7 @@
+ )
+ 
+ FIND_LIBRARY( ODBC_LIBRARY
+-  NAMES odbc iodbc unixodbc
++  NAMES odbc iodbc unixodbc odbc32
+   PATHS
+   /usr/lib
+   /usr/lib/odbc
diff --git a/ports/vtk/portfile.cmake b/ports/vtk/portfile.cmake
index ff9d457f1..c5ea4c387 100644
--- a/ports/vtk/portfile.cmake
+++ b/ports/vtk/portfile.cmake
@@ -1,13 +1,26 @@
 include(vcpkg_common_functions)
 
+set(VTK_SHORT_VERSION "8.0")
+set(VTK_LONG_VERSION "${VTK_SHORT_VERSION}.0")
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO "Kitware/VTK"
-    REF "v8.0.0"
+    REF "v${VTK_LONG_VERSION}"
     SHA512 1a328f24df0b1c40c623ae80c9d49f8b27570144b10af02aeed41b90b50b8d4e0dd83d1341961f6818cde36e2cd793c578ebc95a46950cebfc518f486f249791
     HEAD_REF "master"
 )
 
+# =============================================================================
+# Options: These should be set by feature-packages when they become available
+set(VTK_WITH_QT                          ON ) # IMPORTANT: if ON make sure `qt5` is listed as dependency in the CONTROL file
+set(VTK_WITH_MPI                         ON ) # IMPORTANT: if ON make sure `mpi` is listed as dependency in the CONTROL file
+set(VTK_WITH_PYTHON                      OFF) # IMPORTANT: if ON make sure `python3` is listed as dependency in the CONTROL file
+set(VTK_WITH_ALL_MODULES                 OFF) # IMPORTANT: if ON make sure `qt5`, `mpi`, `python3`, `ffmpeg`, `gdal`, `fontconfig`,
+                                              #            `libmysql` and `atlmfc` are  listed as dependency in the CONTROL file
+
+# =============================================================================
+# Apply patches to the source code
 vcpkg_apply_patches(
     SOURCE_PATH ${SOURCE_PATH}
     PATCHES
@@ -28,33 +41,78 @@ vcpkg_apply_patches(
         ${CMAKE_CURRENT_LIST_DIR}/disable-workaround-findhdf5.patch
 
         ${CMAKE_CURRENT_LIST_DIR}/fix-find-libproj4.patch
+        ${CMAKE_CURRENT_LIST_DIR}/fix-find-libharu.patch
+        ${CMAKE_CURRENT_LIST_DIR}/fix-find-mysql.patch
+        ${CMAKE_CURRENT_LIST_DIR}/fix-find-odbc.patch
 )
 
-# Remove the FindGLEW.cmake that is distributed with VTK, since it does not
-# detect the debug libraries correctly.
-# The default file distributed with CMake should be superior by all means.
+# Remove the FindGLEW.cmake and FindPythonLibs.cmake that are distributed with VTK,
+# since they do not detect the debug libraries correctly.
+# The default files distributed with CMake (>= 3.9) should be superior by all means.
+# For GDAL, the one distributed with CMake does not detect the debug libraries correctly,
+# so we provide an own one.
 file(REMOVE ${SOURCE_PATH}/CMake/FindGLEW.cmake)
+file(REMOVE ${SOURCE_PATH}/CMake/FindPythonLibs.cmake)
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/FindGDAL.cmake DESTINATION ${SOURCE_PATH}/CMake)
+
+# =============================================================================
+# Collect CMake options for optional components
+if(VTK_WITH_QT)
+    list(APPEND ADDITIONAL_OPTIONS
+        -DVTK_Group_Qt=ON
+        -DVTK_QT_VERSION=5
+        -DVTK_BUILD_QT_DESIGNER_PLUGIN=OFF
+    )
+endif()
+
+if(VTK_WITH_MPI)
+    list(APPEND ADDITIONAL_OPTIONS
+        -DVTK_Group_MPI=ON
+    )
+endif()
+
+if(VTK_WITH_PYTHON)
+    list(APPEND ADDITIONAL_OPTIONS
+        -DVTK_WRAP_PYTHON=ON
+        -DVTK_PYTHON_VERSION=3
+    )
+endif()
+
+if(VTK_WITH_ALL_MODULES)
+    list(APPEND ADDITIONAL_OPTIONS
+        -DVTK_BUILD_ALL_MODULES=ON
+        -DVTK_USE_TK=OFF # TCL/TK currently not included in vcpkg
+        # -DVTK_USE_SYSTEM_AUTOBAHN=ON
+        # -DVTK_USE_SYSTEM_SIX=ON
+        # -DVTK_USE_SYSTEM_MPI4PY=ON
+        # -DVTK_USE_SYSTEM_CONSTANTLY=ON
+        # -DVTK_USE_SYSTEM_INCREMENTAL=ON
+        # -DVTK_USE_SYSTEM_TWISTED=ON
+        # -DVTK_USE_SYSTEM_XDMF2=ON
+        # -DVTK_USE_SYSTEM_XDMF3=ON
+        # -DVTK_USE_SYSTEM_ZFP=ON
+        # -DVTK_USE_SYSTEM_ZOPE=ON
+    )
+endif()
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
     list(APPEND ADDITIONAL_OPTIONS "-DVTK_EXTERNAL_HDF5_IS_SHARED=ON")
 endif()
 
+# =============================================================================
+# Configure & Install
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
     OPTIONS
+        -DVTK_Group_Imaging=ON
+        -DVTK_Group_Views=ON
         -DBUILD_TESTING=OFF
         -DBUILD_EXAMPLES=OFF
-        -DVTK_Group_MPI=ON
-        -DVTK_Group_Qt=ON
-        -DVTK_QT_VERSION=5
-        -DVTK_BUILD_QT_DESIGNER_PLUGIN=OFF
-        # -DVTK_WRAP_PYTHON=ON
-        # -DVTK_PYTHON_VERSION=3
         -DVTK_USE_SYSTEM_EXPAT=ON
         -DVTK_USE_SYSTEM_FREETYPE=ON
         # -DVTK_USE_SYSTEM_GL2PS=ON
-        # -DVTK_USE_SYSTEM_LIBHARU=ON
+        -DVTK_USE_SYSTEM_LIBHARU=ON
         -DVTK_USE_SYSTEM_JPEG=ON
         -DVTK_USE_SYSTEM_GLEW=ON
         -DVTK_USE_SYSTEM_HDF5=ON
@@ -85,9 +143,29 @@ vcpkg_configure_cmake(
 vcpkg_install_cmake()
 vcpkg_copy_pdbs()
 
+# =============================================================================
+# Fixup target files
 vcpkg_fixup_cmake_targets()
 
-# For VTK vcpkg_fixup_cmake_targets is not enough:
+# For some reason the references to the XDMF libraries in the target files do not end up
+# correctly, so we fix them here.
+if(VTK_WITH_ALL_MODULES)
+    file(READ ${CURRENT_PACKAGES_DIR}/share/vtk/VTKTargets-release.cmake VTK_TARGETS_RELEASE_CONTENT)
+    string(REPLACE "lib/../XdmfCore.lib" "lib/XdmfCore.lib" VTK_TARGETS_RELEASE_CONTENT "${VTK_TARGETS_RELEASE_CONTENT}")
+    string(REPLACE "bin/../XdmfCore.dll" "bin/XdmfCore.dll" VTK_TARGETS_RELEASE_CONTENT "${VTK_TARGETS_RELEASE_CONTENT}")
+    string(REPLACE "lib/../vtkxdmf3.lib" "lib/vtkxdmf3.lib" VTK_TARGETS_RELEASE_CONTENT "${VTK_TARGETS_RELEASE_CONTENT}")
+    string(REPLACE "bin/../vtkxdmf3.dll" "bin/vtkxdmf3.dll" VTK_TARGETS_RELEASE_CONTENT "${VTK_TARGETS_RELEASE_CONTENT}")
+    file(WRITE ${CURRENT_PACKAGES_DIR}/share/vtk/VTKTargets-release.cmake "${VTK_TARGETS_RELEASE_CONTENT}")
+
+    file(READ ${CURRENT_PACKAGES_DIR}/share/vtk/VTKTargets-debug.cmake VTK_TARGETS_DEBUG_CONTENT)
+    string(REPLACE "lib/../XdmfCore.lib" "lib/XdmfCore.lib" VTK_TARGETS_DEBUG_CONTENT "${VTK_TARGETS_DEBUG_CONTENT}")
+    string(REPLACE "bin/../XdmfCore.dll" "bin/XdmfCore.dll" VTK_TARGETS_DEBUG_CONTENT "${VTK_TARGETS_DEBUG_CONTENT}")
+    string(REPLACE "lib/../vtkxdmf3.lib" "lib/vtkxdmf3.lib" VTK_TARGETS_DEBUG_CONTENT "${VTK_TARGETS_DEBUG_CONTENT}")
+    string(REPLACE "bin/../vtkxdmf3.dll" "bin/vtkxdmf3.dll" VTK_TARGETS_DEBUG_CONTENT "${VTK_TARGETS_DEBUG_CONTENT}")
+    file(WRITE ${CURRENT_PACKAGES_DIR}/share/vtk/VTKTargets-debug.cmake "${VTK_TARGETS_DEBUG_CONTENT}")
+endif()
+
+# For VTK `vcpkg_fixup_cmake_targets` is not enough:
 # Files for system third party dependencies are written to modules that
 # are located in the paths `share/vtk/Modules` and `debug/share/vtk/Modules`.
 # In the release folder, only the release libraries are referenced (e.g. "C:/vcpkg/installed/x64-windows/lib/zlib.lib").
@@ -158,8 +236,22 @@ set(SYSTEM_THIRD_PARTY_MODULES
     vtkpng
     vtktiff
     vtkzlib
+    # vtkgl2ps
+    vtklibharu
 )
 
+if(VTK_WITH_PYTHON OR VTK_WITH_ALL_MODULES)
+    list(APPEND SYSTEM_THIRD_PARTY_MODULES
+        vtkPython
+    )
+endif()
+
+if(VTK_WITH_ALL_MODULES)
+    list(APPEND SYSTEM_THIRD_PARTY_MODULES
+        AutobahnPython
+    )
+endif()
+
 foreach(MODULE IN LISTS SYSTEM_THIRD_PARTY_MODULES)
     _vtk_combine_third_party_libraries("${MODULE}")
 endforeach()
@@ -172,16 +264,45 @@ file(READ "${CURRENT_PACKAGES_DIR}/share/vtk/VTKTargets.cmake" VTK_TARGETS_CONTE
 string(REGEX REPLACE "${CURRENT_INSTALLED_DIR}/lib/[^\\.]*\\.lib" "" VTK_TARGETS_CONTENT "${VTK_TARGETS_CONTENT}")
 file(WRITE "${CURRENT_PACKAGES_DIR}/share/vtk/VTKTargets.cmake" "${VTK_TARGETS_CONTENT}")
 
-# Move executable to tools directory
+# =============================================================================
+# Move executable to tools directory and clean-up other directories
 file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/vtk)
-file(RENAME ${CURRENT_PACKAGES_DIR}/bin/vtkEncodeString-8.0.exe ${CURRENT_PACKAGES_DIR}/tools/vtk/vtkEncodeString-8.0.exe)
-file(RENAME ${CURRENT_PACKAGES_DIR}/bin/vtkHashSource-8.0.exe ${CURRENT_PACKAGES_DIR}/tools/vtk/vtkHashSource-8.0.exe)
 
-if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-    file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/vtkEncodeString-8.0.exe)
-    file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/vtkHashSource-8.0.exe)
-else()
-    # On static builds there should be no bin directory at all
+function(_vtk_move_tool TOOL_NAME)
+    if(EXISTS ${CURRENT_PACKAGES_DIR}/bin/${TOOL_NAME}.exe)
+        file(RENAME ${CURRENT_PACKAGES_DIR}/bin/${TOOL_NAME}.exe ${CURRENT_PACKAGES_DIR}/tools/vtk/${TOOL_NAME}.exe)
+    endif()
+
+    file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/${TOOL_NAME}.exe)
+endfunction()
+
+set(VTK_TOOLS
+    vtkEncodeString-${VTK_SHORT_VERSION}
+    vtkHashSource-${VTK_SHORT_VERSION}
+    vtkWrapTclInit-${VTK_SHORT_VERSION}
+    vtkWrapTcl-${VTK_SHORT_VERSION}
+    vtkWrapPythonInit-${VTK_SHORT_VERSION}
+    vtkWrapPython-${VTK_SHORT_VERSION}
+    vtkWrapJava-${VTK_SHORT_VERSION}
+    vtkWrapHierarchy-${VTK_SHORT_VERSION}
+    vtkParseJava-${VTK_SHORT_VERSION}
+    vtkParseOGLExt-${VTK_SHORT_VERSION}
+    vtkpython
+    pvtkpython
+)
+
+foreach(TOOL_NAME IN LISTS VTK_TOOLS)
+    _vtk_move_tool("${TOOL_NAME}")
+endforeach()
+
+# =============================================================================
+# Remove other files and directories that are not valid for vcpkg
+if(VTK_WITH_ALL_MODULES)
+    file(REMOVE ${CURRENT_PACKAGES_DIR}/XdmfConfig.cmake)
+    file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/XdmfConfig.cmake)
+endif()
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
     file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin)
     file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin)
 endif()
@@ -189,6 +310,7 @@ endif()
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
 
+# =============================================================================
 # Handle copyright
 file(COPY ${SOURCE_PATH}/Copyright.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/vtk)
 file(RENAME ${CURRENT_PACKAGES_DIR}/share/vtk/Copyright.txt ${CURRENT_PACKAGES_DIR}/share/vtk/copyright)
diff --git a/ports/websocketpp/CONTROL b/ports/websocketpp/CONTROL
index f812dc565..f15164de2 100644
--- a/ports/websocketpp/CONTROL
+++ b/ports/websocketpp/CONTROL
@@ -1,4 +1,4 @@
 Source: websocketpp
-Version: 0.7.0
+Version: 0.7.0-1
 Build-Depends: zlib, openssl, boost
 Description: Library that implements RFC6455 The WebSocket Protocol
 \ No newline at end of file
diff --git a/ports/websocketpp/openssl_110.patch b/ports/websocketpp/openssl_110.patch
new file mode 100644
index 000000000..93f4302e0
--- /dev/null
+++ b/ports/websocketpp/openssl_110.patch
@@ -0,0 +1,19 @@
+diff --git a/websocketpp/transport/asio/security/tls.hpp b/websocketpp/transport/asio/security/tls.hpp
+index 7b32db8..37173b7 100644
+--- a/websocketpp/transport/asio/security/tls.hpp
++++ b/websocketpp/transport/asio/security/tls.hpp
+@@ -355,7 +355,13 @@ protected:
+     template <typename ErrorCodeType>
+     lib::error_code translate_ec(ErrorCodeType ec) {
+         if (ec.category() == lib::asio::error::get_ssl_category()) {
+-            if (ERR_GET_REASON(ec.value()) == SSL_R_SHORT_READ) {
++            if (
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
++                ERR_GET_REASON(ec.value()) == SSL_R_SHORT_READ
++#else
++                false
++#endif
++            ) {
+                 return make_error_code(transport::error::tls_short_read);
+             } else {
+                 // We know it is a TLS related error, but otherwise don't know
diff --git a/ports/websocketpp/portfile.cmake b/ports/websocketpp/portfile.cmake
index 98a4d52e6..8531edd7d 100644
--- a/ports/websocketpp/portfile.cmake
+++ b/ports/websocketpp/portfile.cmake
@@ -9,6 +9,12 @@ vcpkg_download_distfile(ARCHIVE
 )
 vcpkg_extract_source_archive(${ARCHIVE})
 
+vcpkg_apply_patches(
+    SOURCE_PATH ${SOURCE_PATH}
+    PATCHES
+    ${CMAKE_CURRENT_LIST_DIR}/openssl_110.patch
+)
+
 file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share)
 
 # Put the license file where vcpkg expects it
diff --git a/ports/wincrypt/CONTROL b/ports/wincrypt/CONTROL
new file mode 100644
index 000000000..78803229c
--- /dev/null
+++ b/ports/wincrypt/CONTROL
@@ -0,0 +1,3 @@
+Source: wincrypt
+Version: 0.0
+Description: Windows Cryptography.
+\ No newline at end of file
diff --git a/ports/wincrypt/portfile.cmake b/ports/wincrypt/portfile.cmake
new file mode 100644
index 000000000..8ded1cdc4
--- /dev/null
+++ b/ports/wincrypt/portfile.cmake
@@ -0,0 +1,40 @@
+include(vcpkg_common_functions)
+
+vcpkg_get_program_files_32_bit(PROGRAM_FILES_32_BIT)
+vcpkg_get_windows_sdk(WINDOWS_SDK)
+
+if (WINDOWS_SDK MATCHES "10.")
+    set(LIBFILEPATH "${PROGRAM_FILES_32_BIT}\\Windows Kits\\10\\Lib\\${WINDOWS_SDK}\\um\\${TRIPLET_SYSTEM_ARCH}\\Crypt32.Lib")
+    set(LICENSEPATH "${PROGRAM_FILES_32_BIT}\\Windows Kits\\10\\Licenses\\${WINDOWS_SDK}\\sdk_license.rtf")
+    set(HEADERSPATH "${PROGRAM_FILES_32_BIT}\\Windows Kits\\10\\Include\\${WINDOWS_SDK}\\um")
+elseif(WINDOWS_SDK MATCHES "8.")
+    set(LIBFILEPATH "${PROGRAM_FILES_32_BIT}\\Windows Kits\\8.1\\Lib\\winv6.3\\um\\${TRIPLET_SYSTEM_ARCH}\\Crypt32.Lib")
+    set(HEADERSPATH "${PROGRAM_FILES_32_BIT}\\Windows Kits\\8.1\\Include\\um")
+else()
+    message(FATAL_ERROR "Portfile not yet configured for Windows SDK with version: ${WINDOWS_SDK}")
+endif()
+
+if (NOT EXISTS "${LIBFILEPATH}")
+    message(FATAL_ERROR "Cannot find Windows ${WINDOWS_SDK} SDK. File does not exist: ${LIBFILEPATH}")
+endif()
+
+file(MAKE_DIRECTORY
+    ${CURRENT_PACKAGES_DIR}/include
+    ${CURRENT_PACKAGES_DIR}/lib
+    ${CURRENT_PACKAGES_DIR}/debug/lib
+    ${CURRENT_PACKAGES_DIR}/share/wincrypt
+)
+
+file(COPY
+    "${HEADERSPATH}\\Wincrypt.h"
+    DESTINATION ${CURRENT_PACKAGES_DIR}/include
+    )
+file(COPY ${LIBFILEPATH} DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
+file(COPY ${LIBFILEPATH} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
+
+if (DEFINED LICENSEPATH)
+    file(COPY ${LICENSEPATH} DESTINATION ${CURRENT_PACKAGES_DIR}/share/wincrypt)
+    file(WRITE ${CURRENT_PACKAGES_DIR}/share/wincrypt/copyright "See the accompanying sdk_license.rtf")
+else()
+    file(WRITE ${CURRENT_PACKAGES_DIR}/share/wincrypt/copyright "See https://developer.microsoft.com/en-us/windows/downloads/windows-8-1-sdk for the Windows 8.1 SDK license")
+endif()
+\ No newline at end of file
diff --git a/ports/winsock2/CONTROL b/ports/winsock2/CONTROL
new file mode 100644
index 000000000..4b56e50bf
--- /dev/null
+++ b/ports/winsock2/CONTROL
@@ -0,0 +1,3 @@
+Source: winsock2
+Version: 0.0
+Description: Windows Sockets.
+\ No newline at end of file
diff --git a/ports/winsock2/portfile.cmake b/ports/winsock2/portfile.cmake
new file mode 100644
index 000000000..81fd38992
--- /dev/null
+++ b/ports/winsock2/portfile.cmake
@@ -0,0 +1,40 @@
+include(vcpkg_common_functions)
+
+vcpkg_get_program_files_32_bit(PROGRAM_FILES_32_BIT)
+vcpkg_get_windows_sdk(WINDOWS_SDK)
+
+if (WINDOWS_SDK MATCHES "10.")
+    set(LIBFILEPATH "${PROGRAM_FILES_32_BIT}\\Windows Kits\\10\\Lib\\${WINDOWS_SDK}\\um\\${TRIPLET_SYSTEM_ARCH}\\Ws2_32.Lib")
+    set(LICENSEPATH "${PROGRAM_FILES_32_BIT}\\Windows Kits\\10\\Licenses\\${WINDOWS_SDK}\\sdk_license.rtf")
+    set(HEADERSPATH "${PROGRAM_FILES_32_BIT}\\Windows Kits\\10\\Include\\${WINDOWS_SDK}\\um")
+elseif(WINDOWS_SDK MATCHES "8.")
+    set(LIBFILEPATH "${PROGRAM_FILES_32_BIT}\\Windows Kits\\8.1\\Lib\\winv6.3\\um\\${TRIPLET_SYSTEM_ARCH}\\Ws2_32.Lib")
+    set(HEADERSPATH "${PROGRAM_FILES_32_BIT}\\Windows Kits\\8.1\\Include\\um")
+else()
+    message(FATAL_ERROR "Portfile not yet configured for Windows SDK with version: ${WINDOWS_SDK}")
+endif()
+
+if (NOT EXISTS "${LIBFILEPATH}")
+    message(FATAL_ERROR "Cannot find Windows ${WINDOWS_SDK} SDK. File does not exist: ${LIBFILEPATH}")
+endif()
+
+file(MAKE_DIRECTORY
+    ${CURRENT_PACKAGES_DIR}/include
+    ${CURRENT_PACKAGES_DIR}/lib
+    ${CURRENT_PACKAGES_DIR}/debug/lib
+    ${CURRENT_PACKAGES_DIR}/share/winsock2
+)
+
+file(COPY
+    "${HEADERSPATH}\\Winsock2.h"
+    DESTINATION ${CURRENT_PACKAGES_DIR}/include
+    )
+file(COPY ${LIBFILEPATH} DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
+file(COPY ${LIBFILEPATH} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
+
+if (DEFINED LICENSEPATH)
+    file(COPY ${LICENSEPATH} DESTINATION ${CURRENT_PACKAGES_DIR}/share/winsock2)
+    file(WRITE ${CURRENT_PACKAGES_DIR}/share/winsock2/copyright "See the accompanying sdk_license.rtf")
+else()
+    file(WRITE ${CURRENT_PACKAGES_DIR}/share/winsock2/copyright "See https://developer.microsoft.com/en-us/windows/downloads/windows-8-1-sdk for the Windows 8.1 SDK license")
+endif()
+\ No newline at end of file
diff --git a/ports/zziplib/CMakeLists.txt b/ports/zziplib/CMakeLists.txt
index 7f46079e9..c99bc0ddd 100644
--- a/ports/zziplib/CMakeLists.txt
+++ b/ports/zziplib/CMakeLists.txt
@@ -55,7 +55,7 @@ set(SRCS zzip/dir.c
 
 add_library(zziplib ${SRCS} ${HEADERS})
 
-if(${BUILD_SHARED_LIBS})
+if(BUILD_SHARED_LIBS)
     target_compile_definitions(zziplib PRIVATE -DZZIPLIB_EXPORTS)
 endif()
 
diff --git a/scripts/cmake/vcpkg_acquire_depot_tools.cmake b/scripts/cmake/vcpkg_acquire_depot_tools.cmake
index 1cc375725..009ba40f1 100644
--- a/scripts/cmake/vcpkg_acquire_depot_tools.cmake
+++ b/scripts/cmake/vcpkg_acquire_depot_tools.cmake
@@ -26,7 +26,7 @@ function(vcpkg_acquire_depot_tools PATH_TO_ROOT_OUT)
         set(download_success 1)
       endif()
 
-      if (NOT ${download_success})
+      if (NOT download_success)
         message(FATAL_ERROR
           "\n"
           "    Failed to download file.\n"
diff --git a/scripts/cmake/vcpkg_build_cmake.cmake b/scripts/cmake/vcpkg_build_cmake.cmake
index 18e2a8b00..5dc81ec09 100644
--- a/scripts/cmake/vcpkg_build_cmake.cmake
+++ b/scripts/cmake/vcpkg_build_cmake.cmake
@@ -1,41 +1,76 @@
+## # vcpkg_build_cmake
+##
+## Build a cmake project.
+##
+## ## Usage:
+## ```cmake
+## vcpkg_build_cmake([DISABLE_PARALLEL] [TARGET <target>])
+## ```
+##
+## ## Parameters:
+## ### DISABLE_PARALLEL
+## The underlying buildsystem will be instructed to not parallelize
+##
+## ### TARGET
+## The target passed to the cmake build command (`cmake --build . --target <target>`). If not specified, no target will
+## be passed.
+##
+## ## Notes:
+## This command should be preceeded by a call to [`vcpkg_configure_cmake()`](vcpkg_configure_cmake.md).
+## You can use the alias [`vcpkg_install_cmake()`](vcpkg_configure_cmake.md) function if your CMake script supports the
+## "install" target
+##
+## ## Examples:
+##
+## * [zlib](https://github.com/Microsoft/vcpkg/blob/master/ports/zlib/portfile.cmake)
+## * [cpprestsdk](https://github.com/Microsoft/vcpkg/blob/master/ports/cpprestsdk/portfile.cmake)
+## * [poco](https://github.com/Microsoft/vcpkg/blob/master/ports/poco/portfile.cmake)
+## * [opencv](https://github.com/Microsoft/vcpkg/blob/master/ports/opencv/portfile.cmake)
 function(vcpkg_build_cmake)
-    cmake_parse_arguments(_bc "MSVC_64_TOOLSET;DISABLE_PARALLEL" "" "" ${ARGN})
+    cmake_parse_arguments(_bc "DISABLE_PARALLEL" "TARGET;LOGFILE_ROOT" "" ${ARGN})
 
-    set(MSVC_EXTRA_ARGS
-        "/p:VCPkgLocalAppDataDisabled=true"
-        "/p:UseIntelMKL=No"
-    )
-
-    # Specifies the architecture of the toolset, NOT the architecture of the produced binary
-    # This can help libraries that cause the linker to run out of memory.
-    # https://support.microsoft.com/en-us/help/2891057/linker-fatal-error-lnk1102-out-of-memory
-    if (_bc_MSVC_64_TOOLSET)
-        list(APPEND MSVC_EXTRA_ARGS "/p:PreferredToolArchitecture=x64")
+    if(NOT _bc_LOGFILE_ROOT)
+        set(_bc_LOGFILE_ROOT "build")
     endif()
 
-    if (NOT _bc_DISABLE_PARALLEL)
-        list(APPEND MSVC_EXTRA_ARGS "/m")
+    if(_VCPKG_CMAKE_GENERATOR MATCHES "Ninja")
+        set(BUILD_ARGS "-v") # verbose output
+        if (_bc_DISABLE_PARALLEL)
+            list(APPEND BUILD_ARGS "-j1")
+        endif()
+    elseif(_VCPKG_CMAKE_GENERATOR MATCHES "Visual Studio")
+        set(BUILD_ARGS
+            "/p:VCPkgLocalAppDataDisabled=true"
+            "/p:UseIntelMKL=No"
+        )
+        if (NOT _bc_DISABLE_PARALLEL)
+            list(APPEND BUILD_ARGS "/m")
+        endif()
+    elseif(_VCPKG_CMAKE_GENERATOR MATCHES "NMake")
+        # No options are currently added for nmake builds
+    else()
+        message(FATAL_ERROR "Unrecognized GENERATOR setting from vcpkg_configure_cmake(). Valid generators are: Ninja, Visual Studio, and NMake Makefiles")
     endif()
 
-    if(EXISTS ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/build.ninja)
-        set(BUILD_ARGS -v) # verbose output
+    if(_bc_TARGET)
+        set(TARGET_PARAM "--target" ${_bc_TARGET})
     else()
-        set(BUILD_ARGS ${MSVC_EXTRA_ARGS})
+        set(TARGET_PARAM)
     endif()
 
     message(STATUS "Build ${TARGET_TRIPLET}-rel")
     vcpkg_execute_required_process(
-        COMMAND ${CMAKE_COMMAND} --build . --config Release -- ${BUILD_ARGS}
+        COMMAND ${CMAKE_COMMAND} --build . --config Release ${TARGET_PARAM} -- ${BUILD_ARGS}
         WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel
-        LOGNAME build-${TARGET_TRIPLET}-rel
+        LOGNAME ${_bc_LOGFILE_ROOT}-${TARGET_TRIPLET}-rel
     )
     message(STATUS "Build ${TARGET_TRIPLET}-rel done")
 
     message(STATUS "Build ${TARGET_TRIPLET}-dbg")
     vcpkg_execute_required_process(
-        COMMAND ${CMAKE_COMMAND} --build . --config Debug -- ${BUILD_ARGS}
+        COMMAND ${CMAKE_COMMAND} --build . --config Debug ${TARGET_PARAM} -- ${BUILD_ARGS}
         WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg
-        LOGNAME build-${TARGET_TRIPLET}-dbg
+        LOGNAME ${_bc_LOGFILE_ROOT}-${TARGET_TRIPLET}-dbg
     )
     message(STATUS "Build ${TARGET_TRIPLET}-dbg done")
 endfunction()
diff --git a/scripts/cmake/vcpkg_configure_cmake.cmake b/scripts/cmake/vcpkg_configure_cmake.cmake
index 738f98731..3e92db762 100644
--- a/scripts/cmake/vcpkg_configure_cmake.cmake
+++ b/scripts/cmake/vcpkg_configure_cmake.cmake
@@ -86,14 +86,20 @@ function(vcpkg_configure_cmake)
         set(GENERATOR "Visual Studio 15 2017")
     elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" AND TRIPLET_SYSTEM_ARCH MATCHES "x64" AND VCPKG_PLATFORM_TOOLSET MATCHES "v141")
         set(GENERATOR "Visual Studio 15 2017 Win64")
-    elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" AND TRIPLET_SYSTEM_ARCH MATCHES "arm" AND VCPKG_PLATFORM_TOOLSET MATCHES "v141")
+    elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" AND TRIPLET_SYSTEM_ARCH STREQUAL "arm" AND VCPKG_PLATFORM_TOOLSET MATCHES "v141")
         set(GENERATOR "Visual Studio 15 2017 ARM")
+    elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore" AND TRIPLET_SYSTEM_ARCH STREQUAL "arm64" AND VCPKG_PLATFORM_TOOLSET MATCHES "v141")
+        set(GENERATOR "Visual Studio 15 2017")    
+        set(ARCH "ARM64")
     elseif(TRIPLET_SYSTEM_ARCH MATCHES "x86" AND VCPKG_PLATFORM_TOOLSET MATCHES "v141")
         set(GENERATOR "Visual Studio 15 2017")
     elseif(TRIPLET_SYSTEM_ARCH MATCHES "x64" AND VCPKG_PLATFORM_TOOLSET MATCHES "v141")
         set(GENERATOR "Visual Studio 15 2017 Win64")
-    elseif(TRIPLET_SYSTEM_ARCH MATCHES "arm" AND VCPKG_PLATFORM_TOOLSET MATCHES "v141")
+    elseif(TRIPLET_SYSTEM_ARCH STREQUAL "arm" AND VCPKG_PLATFORM_TOOLSET MATCHES "v141")
         set(GENERATOR "Visual Studio 15 2017 ARM")
+    elseif(TRIPLET_SYSTEM_ARCH STREQUAL "arm64" AND VCPKG_PLATFORM_TOOLSET MATCHES "v141")
+        set(GENERATOR "Visual Studio 15 2017")
+        set(ARCH "ARM64")
     endif()
     
     # If we use Ninja, make sure it's on PATH
@@ -147,6 +153,12 @@ function(vcpkg_configure_cmake)
         "-DCMAKE_ERROR_ON_ABSOLUTE_INSTALL_DESTINATION=ON"
     )
 
+    if(DEFINED ARCH)
+        list(APPEND _csc_OPTIONS
+            "-A${ARCH}"
+        )
+    endif()
+
     if(DEFINED VCPKG_CRT_LINKAGE AND VCPKG_CRT_LINKAGE STREQUAL dynamic)
         list(APPEND _csc_OPTIONS_DEBUG
             "-DCMAKE_CXX_FLAGS_DEBUG=/D_DEBUG /MDd /Z7 /Ob0 /Od /RTC1 ${VCPKG_CXX_FLAGS_DEBUG}"
@@ -196,4 +208,6 @@ function(vcpkg_configure_cmake)
         LOGNAME config-${TARGET_TRIPLET}-dbg
     )
     message(STATUS "Configuring ${TARGET_TRIPLET}-dbg done")
+
+    set(_VCPKG_CMAKE_GENERATOR "${GENERATOR}" PARENT_SCOPE)
 endfunction()
 \ No newline at end of file
diff --git a/scripts/cmake/vcpkg_download_distfile.cmake b/scripts/cmake/vcpkg_download_distfile.cmake
index 006570195..b8acfc823 100644
--- a/scripts/cmake/vcpkg_download_distfile.cmake
+++ b/scripts/cmake/vcpkg_download_distfile.cmake
@@ -78,7 +78,7 @@ function(vcpkg_download_distfile VAR)
             endif()
         endforeach(url)
 
-        if (NOT ${download_success})
+        if (NOT download_success)
             message(FATAL_ERROR
             "\n"
             "    Failed to download file.\n"
diff --git a/scripts/cmake/vcpkg_find_acquire_program.cmake b/scripts/cmake/vcpkg_find_acquire_program.cmake
index 3c6dfae08..51e394bf1 100644
--- a/scripts/cmake/vcpkg_find_acquire_program.cmake
+++ b/scripts/cmake/vcpkg_find_acquire_program.cmake
@@ -34,7 +34,8 @@
 ## * [openssl](https://github.com/Microsoft/vcpkg/blob/master/ports/openssl/portfile.cmake)
 ## * [qt5](https://github.com/Microsoft/vcpkg/blob/master/ports/qt5/portfile.cmake)
 function(vcpkg_find_acquire_program VAR)
-  if(${VAR} AND NOT ${VAR} MATCHES "-NOTFOUND")
+  set(EXPANDED_VAR ${${VAR}})
+  if(EXPANDED_VAR)
     return()
   endif()
 
@@ -162,7 +163,7 @@ function(vcpkg_find_acquire_program VAR)
   endmacro()
 
   do_find()
-  if(${VAR} MATCHES "-NOTFOUND")
+  if("${${VAR}}" MATCHES "-NOTFOUND")
     file(DOWNLOAD ${URL} ${DOWNLOADS}/${ARCHIVE}
       EXPECTED_HASH SHA512=${HASH}
       SHOW_PROGRESS
@@ -173,7 +174,7 @@ function(vcpkg_find_acquire_program VAR)
     else()
       get_filename_component(ARCHIVE_EXTENSION ${ARCHIVE} EXT)
       string(TOLOWER "${ARCHIVE_EXTENSION}" ARCHIVE_EXTENSION)
-      if(${ARCHIVE_EXTENSION} STREQUAL ".msi")
+      if(ARCHIVE_EXTENSION STREQUAL ".msi")
         file(TO_NATIVE_PATH "${DOWNLOADS}/${ARCHIVE}" ARCHIVE_NATIVE_PATH)
         file(TO_NATIVE_PATH "${DOWNLOADS}/tools/${PROGNAME}/${SUBDIR}" DESTINATION_NATIVE_PATH)
         execute_process(
@@ -191,5 +192,5 @@ function(vcpkg_find_acquire_program VAR)
     do_find()
   endif()
 
-  set(${VAR} ${${VAR}} PARENT_SCOPE)
+  set(${VAR} "${${VAR}}" PARENT_SCOPE)
 endfunction()
diff --git a/scripts/cmake/vcpkg_install_cmake.cmake b/scripts/cmake/vcpkg_install_cmake.cmake
index f778007ef..ab72d054e 100644
--- a/scripts/cmake/vcpkg_install_cmake.cmake
+++ b/scripts/cmake/vcpkg_install_cmake.cmake
@@ -4,15 +4,15 @@
 ##
 ## ## Usage:
 ## ```cmake
-## vcpkg_install_cmake([MSVC_64_TOOLSET])
+## vcpkg_install_cmake(...)
 ## ```
 ##
 ## ## Parameters:
-## ### MSVC_64_TOOLSET
-## This adds the `/p:PreferredToolArchitecture=x64` switch if the underlying buildsystem is MSBuild. Some large projects can run out of memory when linking if they use the 32-bit hosted tools.
+## See [`vcpkg_build_cmake()`](vcpkg_build_cmake.md).
 ##
 ## ## Notes:
-## This command should be preceeded by a call to [`vcpkg_configure_cmake()`](vcpkg_configure_cmake.md).
+## This command transparently forwards to [`vcpkg_build_cmake()`](vcpkg_build_cmake.md), adding a `TARGET install`
+## parameter.
 ##
 ## ## Examples:
 ##
@@ -21,43 +21,5 @@
 ## * [poco](https://github.com/Microsoft/vcpkg/blob/master/ports/poco/portfile.cmake)
 ## * [opencv](https://github.com/Microsoft/vcpkg/blob/master/ports/opencv/portfile.cmake)
 function(vcpkg_install_cmake)
-    cmake_parse_arguments(_bc "MSVC_64_TOOLSET;DISABLE_PARALLEL" "" "" ${ARGN})
-
-    set(MSVC_EXTRA_ARGS
-        "/p:VCPkgLocalAppDataDisabled=true"
-        "/p:UseIntelMKL=No"
-    )
-
-    # Specifies the architecture of the toolset, NOT the architecture of the produced binary
-    # This can help libraries that cause the linker to run out of memory.
-    # https://support.microsoft.com/en-us/help/2891057/linker-fatal-error-lnk1102-out-of-memory
-    if (_bc_MSVC_64_TOOLSET)
-        list(APPEND MSVC_EXTRA_ARGS "/p:PreferredToolArchitecture=x64")
-    endif()
-
-    if (NOT _bc_DISABLE_PARALLEL)
-        list(APPEND MSVC_EXTRA_ARGS "/m")
-    endif()
-    
-    if(EXISTS ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/build.ninja)
-        set(BUILD_ARGS -v) # verbose output
-    else()
-        set(BUILD_ARGS ${MSVC_EXTRA_ARGS})
-    endif()
-
-    message(STATUS "Package ${TARGET_TRIPLET}-rel")
-    vcpkg_execute_required_process(
-        COMMAND ${CMAKE_COMMAND} --build . --config Release --target install -- ${BUILD_ARGS}
-        WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel
-        LOGNAME package-${TARGET_TRIPLET}-rel
-    )
-    message(STATUS "Package ${TARGET_TRIPLET}-rel done")
-
-    message(STATUS "Package ${TARGET_TRIPLET}-dbg")
-    vcpkg_execute_required_process(
-        COMMAND ${CMAKE_COMMAND} --build . --config Debug --target install -- ${BUILD_ARGS}
-        WORKING_DIRECTORY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg
-        LOGNAME package-${TARGET_TRIPLET}-dbg
-    )
-    message(STATUS "Package ${TARGET_TRIPLET}-dbg done")
+    vcpkg_build_cmake(LOGFILE_ROOT install TARGET install ${ARGN})
 endfunction()
diff --git a/scripts/fetchDependency.ps1 b/scripts/fetchDependency.ps1
index 2a23002a4..773ebeac4 100644
--- a/scripts/fetchDependency.ps1
+++ b/scripts/fetchDependency.ps1
@@ -36,17 +36,19 @@ function SelectProgram([Parameter(Mandatory=$true)][string]$Dependency)
             New-Item -ItemType directory -Path $downloadDir | Out-Null
         }
 
+        $WC = New-Object System.Net.WebClient
+        $ProxyAuth = !$WC.Proxy.IsBypassed($url)
+        if ($ProxyAuth)
+        {
+            $ProxyCred = Get-Credential -Message "Enter credentials for Proxy Authentication"
+            $PSDefaultParameterValues.Add("Start-BitsTransfer:ProxyAuthentication","Basic")
+            $PSDefaultParameterValues.Add("Start-BitsTransfer:ProxyCredential",$ProxyCred)
+            $WC.Proxy.Credentials=$ProxyCred
+        }
+
         if (($PSVersionTable.PSEdition -ne "Core") -and ($Dependency -ne "git")) # git fails with BITS
         {
             try {
-                $WC = New-Object System.Net.WebClient
-                $ProxyAuth = !$WC.Proxy.IsBypassed($url)
-                If($ProxyAuth){
-                    $ProxyCred = Get-Credential -Message "Enter credentials for Proxy Authentication"
-                    $PSDefaultParameterValues.Add("Start-BitsTransfer:ProxyAuthentication","Basic")
-                    $PSDefaultParameterValues.Add("Start-BitsTransfer:ProxyCredential",$ProxyCred)
-                }
-
                 Start-BitsTransfer -Source $url -Destination $downloadPath -ErrorAction Stop
             }
             catch [System.Exception] {
@@ -60,7 +62,7 @@ function SelectProgram([Parameter(Mandatory=$true)][string]$Dependency)
         if (!(Test-Path $downloadPath))
         {
             Write-Verbose("Downloading $Dependency...")
-            (New-Object System.Net.WebClient).DownloadFile($url, $downloadPath)
+            $WC.DownloadFile($url, $downloadPath)
         }
     }
 
@@ -116,11 +118,21 @@ function SelectProgram([Parameter(Mandatory=$true)][string]$Dependency)
     }
     elseif($Dependency -eq "nuget")
     {
-        $requiredVersion = "4.1.0"
-        $downloadVersion = "4.1.0"
-        $url = "https://dist.nuget.org/win-x86-commandline/v4.1.0/nuget.exe"
-        $downloadPath = "$downloadsDir\nuget-4.1.0\nuget.exe"
-        $expectedDownloadedFileHash = "4c1de9b026e0c4ab087302ff75240885742c0faa62bd2554f913bbe1f6cb63a0"
+        $requiredVersion = "4.3.0"
+        $downloadVersion = "4.3.0"
+        $url = "https://dist.nuget.org/win-x86-commandline/v4.3.0/nuget.exe"
+        $downloadPath = "$downloadsDir\nuget-$downloadVersion\nuget.exe"
+        $expectedDownloadedFileHash = "386da77a8cf2b63d1260b7020feeedabfe3b65ab31d20e6a313a530865972f3a"
+        $executableFromDownload = $downloadPath
+        $extractionType = $ExtractionType_NO_EXTRACTION_REQUIRED
+    }
+    elseif($Dependency -eq "vswhere")
+    {
+        $requiredVersion = "2.2.3"
+        $downloadVersion = "2.2.3"
+        $url = "https://github.com/Microsoft/vswhere/releases/download/2.2.3/vswhere.exe"
+        $downloadPath = "$downloadsDir\vswhere-$downloadVersion\vswhere.exe"
+        $expectedDownloadedFileHash = "5f19066ac91635ad17d33fe0f79fc63c672a46f98c0358589a90163bcb2733e8"
         $executableFromDownload = $downloadPath
         $extractionType = $ExtractionType_NO_EXTRACTION_REQUIRED
     }
@@ -137,6 +149,17 @@ function SelectProgram([Parameter(Mandatory=$true)][string]$Dependency)
         $extractionType = $ExtractionType_ZIP
         $extractionFolder = "$downloadsDir\MinGit-2.14.1-32-bit"
     }
+    elseif($Dependency -eq "installerbase")
+    {
+        $requiredVersion = "3.1.81"
+        $downloadVersion = "3.1.81"
+        $url = "https://github.com/podsvirov/installer-framework/releases/download/cr203958-9/QtInstallerFramework-win-x86.zip"
+        $downloadPath = "$downloadsDir\QtInstallerFramework-win-x86.zip"
+        $expectedDownloadedFileHash = "f2ce23cf5cf9fc7ce409bdca49328e09a070c0026d3c8a04e4dfde7b05b83fe8"
+        $executableFromDownload = "$downloadsDir\QtInstallerFramework-win-x86\bin\installerbase.exe"
+        $extractionType = $ExtractionType_ZIP
+        $extractionFolder = $downloadsDir
+    }
     else
     {
         throw "Unknown program requested"
diff --git a/scripts/findAnyMSBuildWithCppPlatformToolset.ps1 b/scripts/findAnyMSBuildWithCppPlatformToolset.ps1
index f72491e5d..e9fb60cb2 100644
--- a/scripts/findAnyMSBuildWithCppPlatformToolset.ps1
+++ b/scripts/findAnyMSBuildWithCppPlatformToolset.ps1
@@ -1,164 +1,50 @@
 [CmdletBinding()]
 param(
     [Parameter(Mandatory=$False)]
-    [switch]$DisableVS2017 = $False,
-
-    [Parameter(Mandatory=$False)]
-    [switch]$DisableVS2015 = $False
+    [string]$explicitlyRequestedVSPath = ""
 )
 
-if ($DisableVS2017 -and $DisableVS2015)
-{
-    throw "Both VS2015 and VS2017 were disabled."
-}
-
-function New-MSBuildInstance()
-{
-    param ($msbuildExePath, $toolsetVersion)
-
-    $instance = new-object PSObject
-    $instance | add-member -type NoteProperty -Name msbuildExePath -Value $msbuildExePath
-    $instance | add-member -type NoteProperty -Name toolsetVersion -Value $toolsetVersion
+$explicitlyRequestedVSPath = $explicitlyRequestedVSPath -replace "\\$" # Remove potential trailing backslash
 
-    return $instance
-}
-
-Write-Verbose "Executing $($MyInvocation.MyCommand.Name) with DisableVS2017=$DisableVS2017, DisableVS2015=$DisableVS2015"
 $scriptsDir = split-path -parent $MyInvocation.MyCommand.Definition
-
-$validInstances = New-Object System.Collections.ArrayList
-
-# VS2017
-Write-Verbose "`n`n"
-Write-Verbose "Checking for MSBuild from VS2017 instances..."
-$VisualStudio2017InstallationInstances = & $scriptsDir\findVisualStudioInstallationInstances.ps1
-Write-Verbose "VS2017 Candidates: $([system.String]::Join(',', $VisualStudio2017InstallationInstances))"
-foreach ($instanceCandidate in $VisualStudio2017InstallationInstances)
-{
-    $VCFolder= "$instanceCandidate\VC\Tools\MSVC\"
-
-    if (Test-Path $VCFolder)
-    {
-        $instance = New-MSBuildInstance "$instanceCandidate\MSBuild\15.0\Bin\MSBuild.exe" "v141"
-        Write-Verbose "Found $instance"
-        $validInstances.Add($instance) > $null
-    }
-}
-
-# VS2015 - in Program Files
-Write-Verbose "`n`n"
-Write-Verbose "Checking for MSBuild from VS2015 in Program Files..."
-$CandidateProgramFiles = $(& $scriptsDir\getProgramFiles32bit.ps1), $(& $scriptsDir\getProgramFilesPlatformBitness.ps1)
-Write-Verbose "Program Files Candidate locations: $([system.String]::Join(',', $CandidateProgramFiles))"
-foreach ($ProgramFiles in $CandidateProgramFiles)
-{
-    $clExe= "$ProgramFiles\Microsoft Visual Studio 14.0\VC\bin\cl.exe"
-
-    if (!(Test-Path $clExe))
-    {
-        Write-Verbose "$clExe - Not Found"
-        continue
-    }
-
-    Write-Verbose "$clExe - Found"
-    $instance = New-MSBuildInstance "$ProgramFiles\MSBuild\14.0\Bin\MSBuild.exe" "v140"
-    Write-Verbose "Found $instance"
-    $validInstances.Add($instance) > $null
-}
-
-# VS2015 - through the registry
-function NewCppRegistryPair()
-{
-    param ($visualStudioEntry, $msBuildEntry)
-
-    $instance = new-object PSObject
-    $instance | add-member -type NoteProperty -Name visualStudioEntry -Value $visualStudioEntry
-    $instance | add-member -type NoteProperty -Name msBuildEntry -Value $msBuildEntry
-
-    return $instance
-}
-
-Write-Verbose "`n`n"
-Write-Verbose "Checking for MSBuild from VS2015 through the registry..."
-
-$registryPairs =
-$(NewCppRegistryPair "Registry::HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\visualstudio\14.0" "Registry::HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\msbuild\toolsversions\14.0"),
-$(NewCppRegistryPair "Registry::HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\visualstudio\14.0" "Registry::HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\msbuild\toolsversions\14.0")
-
-foreach ($pair in $registryPairs)
+$VisualStudioInstallationInstances = & $scriptsDir\findVisualStudioInstallationInstances.ps1
+Write-Verbose "VS Candidates:`n`r$([system.String]::Join([Environment]::NewLine, $VisualStudioInstallationInstances))"
+foreach ($instanceCandidate in $VisualStudioInstallationInstances)
 {
-    $vsEntry = $pair.visualStudioEntry
-    try
-    {
-        $VS14InstallDir = $(gp $vsEntry InstallDir -erroraction Stop | % { $_.InstallDir })
-        Write-Verbose "$vsEntry\InstallDir - Found"
-    }
-    catch
-    {
-        Write-Verbose "$vsEntry\InstallDir - Not Found"
-        continue
-    }
-
-    Write-Verbose "$VS14InstallDir - Obtained from registry"
-    # We want "${VS14InstallDir}..\..\VC\bin\cl.exe"
-    # Doing Split-path to avoid the ..\.. from appearing in the output
-    $clExePath = Split-path $VS14InstallDir -Parent
-    $clExePath = Split-path $clExePath -Parent
-    $clExePath = "$clExePath\VC\bin\cl.exe"
-
-    if (!(Test-Path $clExePath))
-    {
-        Write-Verbose "$clExePath - Not Found"
-        continue
-    }
+    Write-Verbose "Inspecting: $instanceCandidate"
+    $split = $instanceCandidate -split "::"
+    # $preferenceWeight = $split[0]
+    # $releaseType = $split[1]
+    $version = $split[2]
+    $path = $split[3]
 
-    Write-Verbose "$clExePath - Found"
-
-    $msbuildEntry = $pair.msBuildEntry
-    try
-    {
-        $MSBuild14 = $(gp $msbuildEntry MSBuildToolsPath -erroraction Stop | % { $_.MSBuildToolsPath })
-        Write-Verbose "$msbuildEntry\MSBuildToolsPath - Found"
-    }
-    catch
-    {
-        Write-Verbose "$msbuildEntry\MSBuildToolsPath - Not Found"
-        continue
-    }
-
-    Write-Verbose "${MSBuild14} - Obtained from registry"
-    $msbuildPath = "${MSBuild14}MSBuild.exe"
-    if (!(Test-Path $msbuildPath))
+    if ($explicitlyRequestedVSPath -ne "" -and $explicitlyRequestedVSPath -ne $path)
     {
-        Write-Verbose "$msbuildPath - Not Found"
+        Write-Verbose "Skipping: $instanceCandidate"
         continue
     }
 
-    $instance = New-MSBuildInstance $msbuildPath "v140"
-    Write-Verbose "Found $instance"
-    $validInstances.Add($instance) > $null
-}
-
-Write-Verbose "`n`n`n"
-Write-Verbose "The following MSBuild instances were found:"
-foreach ($instance in $validInstances)
-{
-    Write-Verbose $instance
-}
-
-# Selecting
-foreach ($instance in $validInstances)
-{
-    if (!$DisableVS2017 -and $instance.toolsetVersion -eq "v141")
+    $majorVersion = $version.Substring(0,2);
+    if ($majorVersion -eq "15")
     {
-        return $instance.msbuildExePath, $instance.toolsetVersion
+        $VCFolder= "$path\VC\Tools\MSVC\"
+        if (Test-Path $VCFolder)
+        {
+            Write-Verbose "Picking: $instanceCandidate"
+            return "$path\MSBuild\15.0\Bin\MSBuild.exe", "v141"
+        }
     }
 
-    if (!$DisableVS2015 -and $instance.toolsetVersion -eq "v140")
+    if ($majorVersion -eq "14")
     {
-        return $instance.msbuildExePath, $instance.toolsetVersion
+        $clExe= "$path\VC\bin\cl.exe"
+        if (Test-Path $clExe)
+        {
+            Write-Verbose "Picking: $instanceCandidate"
+            $programFilesPath = & $scriptsDir\getProgramFiles32bit.ps1
+            return "$programFilesPath\MSBuild\14.0\Bin\MSBuild.exe", "v140"
+        }
     }
 }
 
-
 throw "Could not find MSBuild version with C++ support. VS2015 or VS2017 (with C++) needs to be installed."
 \ No newline at end of file
diff --git a/scripts/findVisualStudioInstallationInstances.ps1 b/scripts/findVisualStudioInstallationInstances.ps1
index ca807980c..b2f186478 100644
--- a/scripts/findVisualStudioInstallationInstances.ps1
+++ b/scripts/findVisualStudioInstallationInstances.ps1
@@ -4,32 +4,35 @@ param(
 )
 
 $scriptsDir = split-path -parent $MyInvocation.MyCommand.Definition
-$vcpkgRootDir = & $scriptsDir\findFileRecursivelyUp.ps1 $scriptsDir .vcpkg-root
+$vswhereExe = & $scriptsDir\fetchDependency.ps1 "vswhere"
 
-$downloadsDir = "$vcpkgRootDir\downloads"
+$output = & $vswhereExe -prerelease -legacy -products * -format xml
+[xml]$asXml = $output
 
-$nugetexe = & $scriptsDir\fetchDependency.ps1 "nuget"
-$nugetPackageDir = "$downloadsDir\nuget-packages"
-
-$SetupAPIVersion = "1.8.24"
-Write-Verbose "Fetching Microsoft.VisualStudio.Setup.Configuration.Native@$SetupAPIVersion from NuGet."
-$nugetOutput = & $nugetexe install Microsoft.VisualStudio.Setup.Configuration.Native -Version $SetupAPIVersion -OutputDirectory $nugetPackageDir -Source "https://api.nuget.org/v3/index.json" -nocache 2>&1
-Write-Verbose "Fetching Microsoft.VisualStudio.Setup.Configuration.Native@$SetupAPIVersion from NuGet. Done."
-
-$SetupConsoleExe = "$nugetPackageDir\Microsoft.VisualStudio.Setup.Configuration.Native.$SetupAPIVersion\tools\x86\Microsoft.VisualStudio.Setup.Configuration.Console.exe"
-
-if (!(Test-Path $SetupConsoleExe))
+$results = New-Object System.Collections.ArrayList
+foreach ($instance in $asXml.instances.instance)
 {
-    throw $nugetOutput
+    $installationPath = $instance.InstallationPath -replace "\\$" # Remove potential trailing backslash
+    $installationVersion = $instance.InstallationVersion
+    $isPrerelease = $instance.IsPrerelease
+    if ($isPrerelease -eq 0)
+    {
+        $releaseType = "PreferenceWeight3::StableRelease"
+    }
+    elseif ($isPrerelease -eq 1)
+    {
+        $releaseType = "PreferenceWeight2::PreRelease"
+    }
+    else
+    {
+        $releaseType = "PreferenceWeight1::Legacy"
+    }
+
+    # Placed like that for easy sorting according to preference
+    $results.Add("${releaseType}::${installationVersion}::${installationPath}") > $null
 }
 
-$instances = & $SetupConsoleExe -nologo -value InstallationPath 2>&1
-$instanceCount = $instances.Length
-
-# The last item can be empty
-if ($instanceCount -gt 0 -and $instances[$instanceCount - 1] -eq "")
-{
-    $instances = $instances[0..($instanceCount - 2)]
-}
+$results.Sort()
+$results.Reverse()
 
-return $instances
+return $results
+\ No newline at end of file
diff --git a/scripts/getWindowsSDK.ps1 b/scripts/getWindowsSDK.ps1
index 9aebae8e3..8ef26a436 100644
--- a/scripts/getWindowsSDK.ps1
+++ b/scripts/getWindowsSDK.ps1
@@ -13,14 +13,13 @@ if ($DisableWin10SDK -and $DisableWin81SDK)
 }
 
 Write-Verbose "Executing $($MyInvocation.MyCommand.Name)"
-$scriptsDir = split-path -parent $MyInvocation.MyCommand.Definition
 
 $validInstances = New-Object System.Collections.ArrayList
 
 # Windows 10 SDK
 function CheckWindows10SDK($path)
 {
-    $folder = "$path\Include"
+    $folder = (Join-Path $path "Include")
     if (!(Test-Path $folder))
     {
         Write-Verbose "$folder - Not Found"
@@ -37,7 +36,7 @@ function CheckWindows10SDK($path)
         if (!(Test-Path $windowsheader))
         {
             Write-Verbose "$windowsheader - Not Found"
-            return
+            continue
         }
         Write-Verbose "$windowsheader - Found"
 
@@ -45,7 +44,7 @@ function CheckWindows10SDK($path)
         if (!(Test-Path $ddkheader))
         {
             Write-Verbose "$ddkheader - Not Found"
-            return
+            continue
         }
 
         Write-Verbose "$ddkheader - Found"
@@ -106,4 +105,4 @@ foreach ($instance in $validInstances)
     }
 }
 
-throw "Could not detect a Windows SDK / TargetPlatformVersion"
-\ No newline at end of file
+throw "Could not detect a Windows SDK / TargetPlatformVersion"
diff --git a/scripts/get_triplet_environment.cmake b/scripts/get_triplet_environment.cmake
index 69e06bf97..b32f840d2 100644
--- a/scripts/get_triplet_environment.cmake
+++ b/scripts/get_triplet_environment.cmake
@@ -5,4 +5,5 @@ message("c35112b6-d1ba-415b-aa5d-81de856ef8eb")
 message("VCPKG_TARGET_ARCHITECTURE=${VCPKG_TARGET_ARCHITECTURE}")
 message("VCPKG_CMAKE_SYSTEM_NAME=${VCPKG_CMAKE_SYSTEM_NAME}")
 message("VCPKG_CMAKE_SYSTEM_VERSION=${VCPKG_CMAKE_SYSTEM_VERSION}")
-message("VCPKG_PLATFORM_TOOLSET=${VCPKG_PLATFORM_TOOLSET}")
-\ No newline at end of file
+message("VCPKG_PLATFORM_TOOLSET=${VCPKG_PLATFORM_TOOLSET}")
+message("VCPKG_VISUAL_STUDIO_PATH=${VCPKG_VISUAL_STUDIO_PATH}")
+\ No newline at end of file
diff --git a/scripts/ifw/maintenance.qs b/scripts/ifw/maintenance.qs
new file mode 100644
index 000000000..5cdad7225
--- /dev/null
+++ b/scripts/ifw/maintenance.qs
@@ -0,0 +1,46 @@
+// constructor
+function Component()
+{
+    installer.installationStarted.connect(this, Component.prototype.onInstallationStarted);
+}
+
+Component.prototype.onInstallationStarted = function()
+{
+    if (component.updateRequested() || component.installationRequested()) {
+        if (installer.value("os") == "win")
+            component.installerbaseBinaryPath = "@TargetDir@/tempmaintenancetool.exe";
+        installer.setInstallerBaseBinary(component.installerbaseBinaryPath);
+    }
+}
+
+Component.prototype.createOperations = function()
+{
+    // call the base createOperations
+    component.createOperations();
+
+    // only for windows online installer
+    if ( installer.value("os") == "win" && !installer.isOfflineOnly() )
+    {
+        // shortcut to add or remove packages
+        component.addOperation( "CreateShortcut",
+                                "@TargetDir@/maintenancetool.exe",
+                                "@StartMenuDir@/Manage vcpkg.lnk",
+                                " --manage-packages");
+        // shortcut to update packages
+        component.addOperation( "CreateShortcut",
+                                "@TargetDir@/maintenancetool.exe",
+                                "@StartMenuDir@/Update vcpkg.lnk",
+                                " --updater");
+    }
+
+    // create uninstall link only for windows
+    if (installer.value("os") == "win")
+    {
+        // shortcut to uninstaller
+        component.addOperation( "CreateShortcut",
+                                "@TargetDir@/maintenancetool.exe",
+                                "@StartMenuDir@/Uninstall vcpkg.lnk",
+                                " --uninstall");
+    }
+}
+
diff --git a/scripts/internalCI.ps1 b/scripts/internalCI.ps1
index 67871acc1..887eb7bea 100644
--- a/scripts/internalCI.ps1
+++ b/scripts/internalCI.ps1
@@ -14,7 +14,7 @@ if (-not $?) { throw $? }
 ./vcpkg.exe install azure-storage-cpp cpprestsdk:x64-windows-static cpprestsdk:x86-uwp
 if (-not $?) { throw $? }
 
-./vcpkg.exe install bond chakracore cryptopp zlib expat sdl2 curl sqlite3 libuv protobuf:x64-windows sfml opencv:x64-windows uwebsockets uwebsockets:x64-windows-static
+./vcpkg.exe install bond cryptopp zlib expat sdl2 curl sqlite3 libuv protobuf:x64-windows sfml opencv:x64-windows uwebsockets uwebsockets:x64-windows-static
 if (-not $?) { throw $? }
 
 ./vcpkg.exe install opencv:x86-uwp boost:x86-uwp
diff --git a/scripts/posh-vcpkg/0.0.1/posh-vcpkg.psd1 b/scripts/posh-vcpkg/0.0.1/posh-vcpkg.psd1
new file mode 100644
index 000000000..3fb94fe7d
--- /dev/null
+++ b/scripts/posh-vcpkg/0.0.1/posh-vcpkg.psd1
@@ -0,0 +1,31 @@
+@{
+
+# Script module or binary module file associated with this manifest.
+ModuleToProcess = 'posh-vcpkg.psm1'
+
+# Version number of this module.
+ModuleVersion = '0.0.1'
+
+# ID used to uniquely identify this module
+GUID = '948f02ab-fc99-4a53-8335-b6556eef129b'
+
+# Minimum version of the Windows PowerShell engine required by this module
+PowerShellVersion = '5.0'
+
+FunctionsToExport = @('TabExpansion')
+CmdletsToExport = @()
+VariablesToExport = @()
+AliasesToExport = @()
+
+# Private data to pass to the module specified in RootModule/ModuleToProcess.
+# This may also contain a PSData hashtable with additional module metadata used by PowerShell.
+PrivateData = 
+@{
+    PSData =
+    @{
+        # Tags applied to this module. These help with module discovery in online galleries.
+        Tags = @('vcpkg', 'tab', 'tab-completion', 'tab-expansion', 'tabexpansion')
+    }
+}
+
+}
diff --git a/scripts/posh-vcpkg/0.0.1/posh-vcpkg.psm1 b/scripts/posh-vcpkg/0.0.1/posh-vcpkg.psm1
new file mode 100644
index 000000000..25ef99609
--- /dev/null
+++ b/scripts/posh-vcpkg/0.0.1/posh-vcpkg.psm1
@@ -0,0 +1,39 @@
+param()
+
+if (Get-Module posh-vcpkg) { return }
+
+if ($PSVersionTable.PSVersion.Major -lt 5) {
+    Write-Warning ("posh-vcpkg does not support PowerShell versions before 5.0.")
+    return
+}
+
+if (Test-Path Function:\TabExpansion) {
+    Rename-Item Function:\TabExpansion VcpkgTabExpansionBackup
+}
+
+function TabExpansion($line, $lastWord) {
+    $lastBlock = [regex]::Split($line, '[|;]')[-1].TrimStart()
+
+    switch -regex ($lastBlock) {
+        "^(?<vcpkgexe>(\./|\.\\|)vcpkg(\.exe|)) (?<remaining>.*)$"
+        {
+            & $matches['vcpkgexe'] autocomplete $matches['remaining']
+            return
+        }
+
+        # Fall back on existing tab expansion
+        default {
+            if (Test-Path Function:\VcpkgTabExpansionBackup) {
+                VcpkgTabExpansionBackup $line $lastWord
+            }
+        }
+    }
+}
+
+$exportModuleMemberParams = @{
+    Function = @(
+        'TabExpansion'
+    )
+}
+
+Export-ModuleMember @exportModuleMemberParams
diff --git a/toolsrc/VERSION.txt b/toolsrc/VERSION.txt
index c47961221..04ab0d2c9 100644
--- a/toolsrc/VERSION.txt
+++ b/toolsrc/VERSION.txt
@@ -1 +1 @@
-"0.0.90"
-\ No newline at end of file
+"0.0.91"
+\ No newline at end of file
diff --git a/toolsrc/include/Span.h b/toolsrc/include/Span.h
deleted file mode 100644
index b2c9acdbc..000000000
--- a/toolsrc/include/Span.h
+++ /dev/null
@@ -1,50 +0,0 @@
-#pragma once
-
-#include <array>
-#include <cstddef>
-#include <vector>
-
-template<class T>
-struct Span
-{
-public:
-    using element_type = T;
-    using pointer = T*;
-    using reference = T&;
-    using iterator = T*;
-
-    constexpr Span() noexcept : m_ptr(nullptr), m_count(0) {}
-    constexpr Span(std::nullptr_t) noexcept : Span() {}
-    constexpr Span(T* ptr, size_t count) noexcept : m_ptr(ptr), m_count(count) {}
-    constexpr Span(T* ptr_begin, T* ptr_end) noexcept : m_ptr(ptr_begin), m_count(ptr_end - ptr_begin) {}
-
-    template<size_t N>
-    constexpr Span(T (&arr)[N]) noexcept : Span(arr, N)
-    {
-    }
-
-    Span(std::vector<T>& v) noexcept : Span(v.data(), v.size()) {}
-    Span(const std::vector<std::remove_const_t<T>>& v) noexcept : Span(v.data(), v.size()) {}
-
-    constexpr iterator begin() const { return m_ptr; }
-    constexpr iterator end() const { return m_ptr + m_count; }
-
-    constexpr reference operator[](size_t i) const { return m_ptr[i]; }
-    constexpr size_t size() const { return m_count; }
-
-private:
-    pointer m_ptr;
-    size_t m_count;
-};
-
-template<class T>
-Span<T> make_span(std::vector<T>& v)
-{
-    return {v.data(), v.size()};
-}
-
-template<class T>
-Span<const T> make_span(const std::vector<T>& v)
-{
-    return {v.data(), v.size()};
-}
diff --git a/toolsrc/include/filesystem_fs.h b/toolsrc/include/filesystem_fs.h
deleted file mode 100644
index 0651ebf25..000000000
--- a/toolsrc/include/filesystem_fs.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#pragma once
-
-#include <filesystem>
-
-namespace fs
-{
-    namespace stdfs = std::experimental::filesystem;
-
-    using stdfs::path;
-    using stdfs::copy_options;
-    using stdfs::file_status;
-
-    inline bool is_regular_file(file_status s) { return stdfs::is_regular_file(s); }
-    inline bool is_directory(file_status s) { return stdfs::is_directory(s); }
-    inline bool status_known(file_status s) { return stdfs::status_known(s); }
-}
-\ No newline at end of file
diff --git a/toolsrc/include/pch.h b/toolsrc/include/pch.h
index 0f34063f8..8333eb927 100644
--- a/toolsrc/include/pch.h
+++ b/toolsrc/include/pch.h
@@ -2,9 +2,13 @@
 
 #define NOMINMAX
 #define WIN32_LEAN_AND_MEAN
+
 #pragma warning(suppress : 4768)
 #include <windows.h>
 
+#pragma warning(suppress : 4768)
+#include <Shlobj.h>
+
 #include <algorithm>
 #include <array>
 #include <atomic>
@@ -28,10 +32,6 @@
 #include <regex>
 #include <set>
 #include <shellapi.h>
-#pragma warning(push)
-#pragma warning(disable : 4768)
-#include <Shlobj.h>
-#pragma warning(pop)
 #include <stdexcept>
 #include <string>
 #include <sys/timeb.h>
diff --git a/toolsrc/include/vcpkg_Checks.h b/toolsrc/include/vcpkg/base/checks.h
index ce486ac19..fb162c897 100644
--- a/toolsrc/include/vcpkg_Checks.h
+++ b/toolsrc/include/vcpkg/base/checks.h
@@ -1,7 +1,8 @@
 #pragma once
 
-#include "LineInfo.h"
-#include "vcpkg_Strings.h"
+#include <vcpkg/base/cstringview.h>
+#include <vcpkg/base/lineinfo.h>
+#include <vcpkg/base/strings.h>
 
 namespace vcpkg::Checks
 {
diff --git a/toolsrc/include/vcpkg_Chrono.h b/toolsrc/include/vcpkg/base/chrono.h
index c14019ff9..b525852f2 100644
--- a/toolsrc/include/vcpkg_Chrono.h
+++ b/toolsrc/include/vcpkg/base/chrono.h
@@ -3,7 +3,7 @@
 #include <chrono>
 #include <string>
 
-namespace vcpkg
+namespace vcpkg::Chrono
 {
     class ElapsedTime
     {
diff --git a/toolsrc/include/coff_file_reader.h b/toolsrc/include/vcpkg/base/cofffilereader.h
index 7287211a1..ad2cc7b12 100644
--- a/toolsrc/include/coff_file_reader.h
+++ b/toolsrc/include/vcpkg/base/cofffilereader.h
@@ -1,6 +1,8 @@
 #pragma once
-#include "MachineType.h"
-#include "filesystem_fs.h"
+
+#include <vcpkg/base/files.h>
+#include <vcpkg/base/machinetype.h>
+
 #include <vector>
 
 namespace vcpkg::CoffFileReader
diff --git a/toolsrc/include/CStringView.h b/toolsrc/include/vcpkg/base/cstringview.h
index c1810b4f1..341830f05 100644
--- a/toolsrc/include/CStringView.h
+++ b/toolsrc/include/vcpkg/base/cstringview.h
@@ -1,4 +1,5 @@
 #pragma once
+
 #include <string>
 
 namespace vcpkg
diff --git a/toolsrc/include/vcpkg_Enums.h b/toolsrc/include/vcpkg/base/enums.h
index c75feaa1f..6eca2cfe1 100644
--- a/toolsrc/include/vcpkg_Enums.h
+++ b/toolsrc/include/vcpkg/base/enums.h
@@ -1,5 +1,7 @@
 #pragma once
-#include "LineInfo.h"
+
+#include <vcpkg/base/lineinfo.h>
+
 #include <string>
 
 namespace vcpkg::Enums
diff --git a/toolsrc/include/vcpkg_expected.h b/toolsrc/include/vcpkg/base/expected.h
index 9637ec087..a946c442e 100644
--- a/toolsrc/include/vcpkg_expected.h
+++ b/toolsrc/include/vcpkg/base/expected.h
@@ -1,6 +1,7 @@
 #pragma once
 
-#include "vcpkg_Checks.h"
+#include <vcpkg/base/checks.h>
+
 #include <system_error>
 
 namespace vcpkg
@@ -71,13 +72,13 @@ namespace vcpkg
             return std::move(this->m_t);
         }
 
-        const T& value_or_exit(const LineInfo& line_info) const &
+        const T& value_or_exit(const LineInfo& line_info) const&
         {
             exit_if_error(line_info);
             return this->m_t;
         }
 
-        const S& error() const & { return this->m_s.error(); }
+        const S& error() const& { return this->m_s.error(); }
 
         S&& error() && { return std::move(this->m_s.error()); }
 
diff --git a/toolsrc/include/vcpkg_Files.h b/toolsrc/include/vcpkg/base/files.h
index 855e8ea45..f4bcf742c 100644
--- a/toolsrc/include/vcpkg_Files.h
+++ b/toolsrc/include/vcpkg/base/files.h
@@ -1,7 +1,21 @@
 #pragma once
 
-#include "filesystem_fs.h"
-#include "vcpkg_expected.h"
+#include <vcpkg/base/expected.h>
+
+#include <filesystem>
+
+namespace fs
+{
+    namespace stdfs = std::experimental::filesystem;
+
+    using stdfs::copy_options;
+    using stdfs::file_status;
+    using stdfs::path;
+
+    inline bool is_regular_file(file_status s) { return stdfs::is_regular_file(s); }
+    inline bool is_directory(file_status s) { return stdfs::is_directory(s); }
+    inline bool status_known(file_status s) { return stdfs::status_known(s); }
+}
 
 namespace vcpkg::Files
 {
diff --git a/toolsrc/include/vcpkg_Graphs.h b/toolsrc/include/vcpkg/base/graphs.h
index 13c0a7136..ff56cb298 100644
--- a/toolsrc/include/vcpkg_Graphs.h
+++ b/toolsrc/include/vcpkg/base/graphs.h
@@ -3,6 +3,8 @@
 #include <unordered_map>
 #include <unordered_set>
 
+#include <vcpkg/base/checks.h>
+
 namespace vcpkg::Graphs
 {
     enum class ExplorationStatus
diff --git a/toolsrc/include/lazy.h b/toolsrc/include/vcpkg/base/lazy.h
index 58c11c002..58c11c002 100644
--- a/toolsrc/include/lazy.h
+++ b/toolsrc/include/vcpkg/base/lazy.h
diff --git a/toolsrc/include/LineInfo.h b/toolsrc/include/vcpkg/base/lineinfo.h
index 62973462a..62973462a 100644
--- a/toolsrc/include/LineInfo.h
+++ b/toolsrc/include/vcpkg/base/lineinfo.h
diff --git a/toolsrc/include/MachineType.h b/toolsrc/include/vcpkg/base/machinetype.h
index 6f61bbd53..b85cdbb0b 100644
--- a/toolsrc/include/MachineType.h
+++ b/toolsrc/include/vcpkg/base/machinetype.h
@@ -1,4 +1,5 @@
 #pragma once
+
 #include <cstdint>
 
 namespace vcpkg
diff --git a/toolsrc/include/vcpkg_optional.h b/toolsrc/include/vcpkg/base/optional.h
index 31a2d3e88..ff7a210c7 100644
--- a/toolsrc/include/vcpkg_optional.h
+++ b/toolsrc/include/vcpkg/base/optional.h
@@ -1,5 +1,6 @@
 #pragma once
-#include "vcpkg_Checks.h"
+
+#include <vcpkg/base/checks.h>
 
 namespace vcpkg
 {
@@ -29,7 +30,7 @@ namespace vcpkg
             return std::move(this->m_t);
         }
 
-        const T& value_or_exit(const LineInfo& line_info) const &
+        const T& value_or_exit(const LineInfo& line_info) const&
         {
             this->exit_if_null(line_info);
             return this->m_t;
@@ -40,7 +41,7 @@ namespace vcpkg
         constexpr bool has_value() const { return m_is_present; }
 
         template<class U>
-        T value_or(U&& default_value) const &
+        T value_or(U&& default_value) const&
         {
             return bool(*this) ? this->m_t : static_cast<T>(std::forward<U>(default_value));
         }
diff --git a/toolsrc/include/SortedVector.h b/toolsrc/include/vcpkg/base/sortedvector.h
index 62808cc2f..62808cc2f 100644
--- a/toolsrc/include/SortedVector.h
+++ b/toolsrc/include/vcpkg/base/sortedvector.h
diff --git a/toolsrc/include/vcpkg/base/span.h b/toolsrc/include/vcpkg/base/span.h
new file mode 100644
index 000000000..6be546351
--- /dev/null
+++ b/toolsrc/include/vcpkg/base/span.h
@@ -0,0 +1,60 @@
+#pragma once
+
+#include <array>
+#include <cstddef>
+#include <initializer_list>
+#include <vector>
+
+namespace vcpkg
+{
+    template<class T>
+    struct Span
+    {
+    public:
+        using element_type = T;
+        using pointer = T*;
+        using reference = T&;
+        using iterator = T*;
+
+        constexpr Span() noexcept : m_ptr(nullptr), m_count(0) {}
+        constexpr Span(std::nullptr_t) noexcept : Span() {}
+        constexpr Span(T* ptr, size_t count) noexcept : m_ptr(ptr), m_count(count) {}
+        constexpr Span(T* ptr_begin, T* ptr_end) noexcept : m_ptr(ptr_begin), m_count(ptr_end - ptr_begin) {}
+        constexpr Span(std::initializer_list<T> l) noexcept : m_ptr(l.begin()), m_count(l.size()) {}
+
+        template<size_t N>
+        constexpr Span(T (&arr)[N]) noexcept : Span(arr, N)
+        {
+        }
+
+        template<size_t N>
+        constexpr Span(const std::array<std::remove_const_t<T>, N>& arr) noexcept : Span(arr.data(), arr.size())
+        {
+        }
+
+        Span(std::vector<T>& v) noexcept : Span(v.data(), v.size()) {}
+        Span(const std::vector<std::remove_const_t<T>>& v) noexcept : Span(v.data(), v.size()) {}
+
+        constexpr iterator begin() const { return m_ptr; }
+        constexpr iterator end() const { return m_ptr + m_count; }
+
+        constexpr reference operator[](size_t i) const { return m_ptr[i]; }
+        constexpr size_t size() const { return m_count; }
+
+    private:
+        pointer m_ptr;
+        size_t m_count;
+    };
+
+    template<class T>
+    Span<T> make_span(std::vector<T>& v)
+    {
+        return {v.data(), v.size()};
+    }
+
+    template<class T>
+    Span<const T> make_span(const std::vector<T>& v)
+    {
+        return {v.data(), v.size()};
+    }
+}
+\ No newline at end of file
diff --git a/toolsrc/include/vcpkg_Strings.h b/toolsrc/include/vcpkg/base/strings.h
index c44ce2b99..59823deb8 100644
--- a/toolsrc/include/vcpkg_Strings.h
+++ b/toolsrc/include/vcpkg/base/strings.h
@@ -1,6 +1,7 @@
 #pragma once
 
-#include "CStringView.h"
+#include <vcpkg/base/cstringview.h>
+
 #include <vector>
 
 namespace vcpkg::Strings::details
@@ -61,7 +62,7 @@ namespace vcpkg::Strings
 
     bool case_insensitive_ascii_contains(const std::string& s, const std::string& pattern);
 
-    int case_insensitive_ascii_compare(const CStringView left, const CStringView right);
+    bool case_insensitive_ascii_compare(const CStringView left, const CStringView right);
 
     std::string ascii_to_lowercase(const std::string& input);
 
diff --git a/toolsrc/include/vcpkg_System.h b/toolsrc/include/vcpkg/base/system.h
index 65f80ae6d..a2e8f3f45 100644
--- a/toolsrc/include/vcpkg_System.h
+++ b/toolsrc/include/vcpkg/base/system.h
@@ -1,8 +1,9 @@
 #pragma once
 
-#include "filesystem_fs.h"
-#include "vcpkg_Strings.h"
-#include "vcpkg_optional.h"
+#include <vcpkg/base/files.h>
+#include <vcpkg/base/optional.h>
+#include <vcpkg/base/strings.h>
+
 #include <Windows.h>
 
 namespace vcpkg::System
diff --git a/toolsrc/include/vcpkg_Util.h b/toolsrc/include/vcpkg/base/util.h
index c76ca01ac..3834580b6 100644
--- a/toolsrc/include/vcpkg_Util.h
+++ b/toolsrc/include/vcpkg/base/util.h
@@ -38,6 +38,12 @@ namespace vcpkg::Util
     }
 
     template<class Container, class Pred>
+    void stable_keep_if(Container& cont, Pred pred)
+    {
+        cont.erase(std::stable_partition(cont.begin(), cont.end(), pred), cont.end());
+    }
+
+    template<class Container, class Pred>
     void unstable_keep_if(Container& cont, Pred pred)
     {
         cont.erase(std::partition(cont.begin(), cont.end(), pred), cont.end());
@@ -50,25 +56,40 @@ namespace vcpkg::Util
     }
 
     template<class Container, class V>
-    auto find(const Container& cont, V&& v)
+    auto find(Container&& cont, V&& v)
     {
-        return std::find(cont.cbegin(), cont.cend(), v);
+        using std::begin;
+        using std::end;
+        return std::find(begin(cont), end(cont), v);
     }
 
     template<class Container, class Pred>
-    auto find_if(const Container& cont, Pred pred)
+    auto find_if(Container&& cont, Pred pred)
     {
-        return std::find_if(cont.cbegin(), cont.cend(), pred);
+        using std::begin;
+        using std::end;
+        return std::find_if(begin(cont), end(cont), pred);
+    }
+
+    template<class Container>
+    using ElementT = std::remove_reference_t<decltype(*begin(std::declval<Container>()))>;
+
+    template<class Container, class T = ElementT<Container>>
+    std::vector<T*> element_pointers(Container&& cont)
+    {
+        return fmap(cont, [](auto&& x) { return &x; });
     }
 
     template<class Container, class Pred>
-    auto find_if_not(const Container& cont, Pred pred)
+    auto find_if_not(Container&& cont, Pred pred)
     {
-        return std::find_if_not(cont.cbegin(), cont.cend(), pred);
+        using std::begin;
+        using std::end;
+        return std::find_if_not(begin(cont), end(cont), pred);
     }
 
     template<class K, class V, class Container, class Func>
-    void group_by(const Container& cont, std::map<K, std::vector<const V*>>* output, Func f)
+    void group_by(const Container& cont, _Inout_ std::map<K, std::vector<const V*>>* output, Func&& f)
     {
         for (const V& element : cont)
         {
@@ -77,6 +98,12 @@ namespace vcpkg::Util
         }
     }
 
+    template<class AssocContainer, class K = std::decay_t<decltype(begin(std::declval<AssocContainer>())->first)>>
+    std::vector<K> extract_keys(AssocContainer&& input_map)
+    {
+        return fmap(input_map, [](auto&& p) { return p.first; });
+    }
+
     struct MoveOnlyBase
     {
         MoveOnlyBase() = default;
diff --git a/toolsrc/include/BinaryParagraph.h b/toolsrc/include/vcpkg/binaryparagraph.h
index 61e03343a..7eb50a6d7 100644
--- a/toolsrc/include/BinaryParagraph.h
+++ b/toolsrc/include/vcpkg/binaryparagraph.h
@@ -1,7 +1,8 @@
 #pragma once
 
-#include "PackageSpec.h"
-#include "SourceParagraph.h"
+#include <vcpkg/packagespec.h>
+#include <vcpkg/sourceparagraph.h>
+
 #include <unordered_map>
 
 namespace vcpkg
diff --git a/toolsrc/include/vcpkg_Build.h b/toolsrc/include/vcpkg/build.h
index 78e89d4de..f146e9951 100644
--- a/toolsrc/include/vcpkg_Build.h
+++ b/toolsrc/include/vcpkg/build.h
@@ -1,11 +1,14 @@
 #pragma once
 
-#include "CStringView.h"
-#include "PackageSpec.h"
-#include "StatusParagraphs.h"
-#include "VcpkgPaths.h"
-#include "vcpkg_Files.h"
-#include "vcpkg_optional.h"
+#include <vcpkg/packagespec.h>
+#include <vcpkg/statusparagraphs.h>
+#include <vcpkg/triplet.h>
+#include <vcpkg/vcpkgcmdarguments.h>
+#include <vcpkg/vcpkgpaths.h>
+
+#include <vcpkg/base/cstringview.h>
+#include <vcpkg/base/files.h>
+#include <vcpkg/base/optional.h>
 
 #include <array>
 #include <map>
@@ -13,6 +16,16 @@
 
 namespace vcpkg::Build
 {
+    namespace Command
+    {
+        void perform_and_exit(const FullPackageSpec& full_spec,
+                              const fs::path& port_dir,
+                              const std::unordered_set<std::string>& options,
+                              const VcpkgPaths& paths);
+
+        void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths, const Triplet& default_triplet);
+    }
+
     enum class UseHeadVersion
     {
         NO = 0,
@@ -79,7 +92,8 @@ namespace vcpkg::Build
         std::string target_architecture;
         std::string cmake_system_name;
         std::string cmake_system_version;
-        std::string platform_toolset;
+        Optional<std::string> platform_toolset;
+        Optional<fs::path> visual_studio_path;
     };
 
     std::wstring make_build_env_cmd(const PreBuildInfo& pre_build_info, const Toolset& toolset);
diff --git a/toolsrc/include/vcpkg/commands.h b/toolsrc/include/vcpkg/commands.h
new file mode 100644
index 000000000..e00812c98
--- /dev/null
+++ b/toolsrc/include/vcpkg/commands.h
@@ -0,0 +1,135 @@
+#pragma once
+
+#include <vcpkg/build.h>
+#include <vcpkg/dependencies.h>
+#include <vcpkg/statusparagraphs.h>
+#include <vcpkg/vcpkgcmdarguments.h>
+#include <vcpkg/vcpkgpaths.h>
+
+#include <array>
+
+namespace vcpkg::Commands
+{
+    using CommandTypeA = void (*)(const VcpkgCmdArguments& args,
+                                  const VcpkgPaths& paths,
+                                  const Triplet& default_triplet);
+    using CommandTypeB = void (*)(const VcpkgCmdArguments& args, const VcpkgPaths& paths);
+    using CommandTypeC = void (*)(const VcpkgCmdArguments& args);
+
+    namespace BuildExternal
+    {
+        void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths, const Triplet& default_triplet);
+    }
+
+    namespace CI
+    {
+        void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths, const Triplet& default_triplet);
+    }
+
+    namespace Env
+    {
+        void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths, const Triplet& default_triplet);
+    }
+
+    namespace Create
+    {
+        void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths);
+    }
+
+    namespace Edit
+    {
+        extern const CommandStructure COMMAND_STRUCTURE;
+        void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths);
+    }
+
+    namespace DependInfo
+    {
+        void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths);
+    }
+
+    namespace Search
+    {
+        void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths);
+    }
+
+    namespace List
+    {
+        void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths);
+    }
+
+    namespace Owns
+    {
+        void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths);
+    }
+
+    namespace Cache
+    {
+        void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths);
+    }
+
+    namespace Import
+    {
+        void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths);
+    }
+
+    namespace Integrate
+    {
+        extern const char* const INTEGRATE_COMMAND_HELPSTRING;
+
+        void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths);
+    }
+
+    namespace PortsDiff
+    {
+        void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths);
+    }
+
+    namespace Autocomplete
+    {
+        void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths);
+    }
+
+    namespace Version
+    {
+        const std::string& version();
+        void warn_if_vcpkg_version_mismatch(const VcpkgPaths& paths);
+        void perform_and_exit(const VcpkgCmdArguments& args);
+    }
+
+    namespace Contact
+    {
+        const std::string& email();
+        void perform_and_exit(const VcpkgCmdArguments& args);
+    }
+
+    namespace Hash
+    {
+        void perform_and_exit(const VcpkgCmdArguments& args);
+    }
+
+    template<class T>
+    struct PackageNameAndFunction
+    {
+        std::string name;
+        T function;
+    };
+
+    Span<const PackageNameAndFunction<CommandTypeA>> get_available_commands_type_a();
+    Span<const PackageNameAndFunction<CommandTypeB>> get_available_commands_type_b();
+    Span<const PackageNameAndFunction<CommandTypeC>> get_available_commands_type_c();
+
+    template<typename T>
+    T find(const std::string& command_name, const std::vector<PackageNameAndFunction<T>> available_commands)
+    {
+        for (const PackageNameAndFunction<T>& cmd : available_commands)
+        {
+            if (cmd.name == command_name)
+            {
+                return cmd.function;
+            }
+        }
+
+        // not found
+        return nullptr;
+    }
+}
diff --git a/toolsrc/include/vcpkg_Dependencies.h b/toolsrc/include/vcpkg/dependencies.h
index d67122e48..2301dbc36 100644
--- a/toolsrc/include/vcpkg_Dependencies.h
+++ b/toolsrc/include/vcpkg/dependencies.h
@@ -1,10 +1,12 @@
 #pragma once
-#include "PackageSpec.h"
-#include "StatusParagraphs.h"
-#include "VcpkgPaths.h"
-#include "vcpkg_Graphs.h"
-#include "vcpkg_Util.h"
-#include "vcpkg_optional.h"
+
+#include <vcpkg/base/graphs.h>
+#include <vcpkg/base/optional.h>
+#include <vcpkg/base/util.h>
+#include <vcpkg/packagespec.h>
+#include <vcpkg/statusparagraphs.h>
+#include <vcpkg/vcpkgpaths.h>
+
 #include <vector>
 
 namespace vcpkg::Dependencies
diff --git a/toolsrc/include/vcpkg/export.h b/toolsrc/include/vcpkg/export.h
new file mode 100644
index 000000000..f3285e187
--- /dev/null
+++ b/toolsrc/include/vcpkg/export.h
@@ -0,0 +1,10 @@
+#pragma once
+
+#include <vcpkg/vcpkgpaths.h>
+
+namespace vcpkg::Export
+{
+    void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths, const Triplet& default_triplet);
+
+    void export_integration_files(const fs::path& raw_exported_dir_path, const VcpkgPaths& paths);
+}
diff --git a/toolsrc/include/vcpkg/export.ifw.h b/toolsrc/include/vcpkg/export.ifw.h
new file mode 100644
index 000000000..d28a4436d
--- /dev/null
+++ b/toolsrc/include/vcpkg/export.ifw.h
@@ -0,0 +1,26 @@
+#pragma once
+
+#include <vcpkg/dependencies.h>
+#include <vcpkg/vcpkgpaths.h>
+
+#include <vcpkg/base/files.h>
+
+#include <string>
+#include <vector>
+
+namespace vcpkg::Export::IFW
+{
+    struct Options
+    {
+        Optional<std::string> maybe_repository_url;
+        Optional<std::string> maybe_packages_dir_path;
+        Optional<std::string> maybe_repository_dir_path;
+        Optional<std::string> maybe_config_file_path;
+        Optional<std::string> maybe_installer_file_path;
+    };
+
+    void do_export(const std::vector<Dependencies::ExportPlanAction>& export_plan,
+                   const std::string& export_id,
+                   const Options& ifw_options,
+                   const VcpkgPaths& paths);
+}
diff --git a/toolsrc/include/vcpkg_GlobalState.h b/toolsrc/include/vcpkg/globalstate.h
index 6522a25bf..7cea361cf 100644
--- a/toolsrc/include/vcpkg_GlobalState.h
+++ b/toolsrc/include/vcpkg/globalstate.h
@@ -1,15 +1,15 @@
 #pragma once
 
-#include <atomic>
+#include <vcpkg/base/chrono.h>
+#include <vcpkg/base/util.h>
 
-#include "vcpkg_Chrono.h"
-#include "vcpkg_Util.h"
+#include <atomic>
 
 namespace vcpkg
 {
     struct GlobalState
     {
-        static Util::LockGuarded<ElapsedTime> timer;
+        static Util::LockGuarded<Chrono::ElapsedTime> timer;
         static std::atomic<bool> debugging;
         static std::atomic<bool> feature_packages;
 
diff --git a/toolsrc/include/vcpkg/help.h b/toolsrc/include/vcpkg/help.h
new file mode 100644
index 000000000..39ad6912d
--- /dev/null
+++ b/toolsrc/include/vcpkg/help.h
@@ -0,0 +1,19 @@
+#pragma once
+
+#include <vcpkg/vcpkgcmdarguments.h>
+#include <vcpkg/vcpkgpaths.h>
+
+#include <string>
+
+namespace vcpkg::Help
+{
+    void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths);
+
+    void help_topic_valid_triplet(const VcpkgPaths& paths);
+
+    void print_usage();
+
+    void print_example(const std::string& command_and_arguments);
+
+    std::string create_example_string(const std::string& command_and_arguments);
+}
diff --git a/toolsrc/include/vcpkg_Input.h b/toolsrc/include/vcpkg/input.h
index fa568207a..621139427 100644
--- a/toolsrc/include/vcpkg_Input.h
+++ b/toolsrc/include/vcpkg/input.h
@@ -1,5 +1,6 @@
 #pragma once
-#include "PackageSpec.h"
+
+#include <vcpkg/packagespec.h>
 
 namespace vcpkg::Input
 {
diff --git a/toolsrc/include/vcpkg/install.h b/toolsrc/include/vcpkg/install.h
new file mode 100644
index 000000000..db6055f4f
--- /dev/null
+++ b/toolsrc/include/vcpkg/install.h
@@ -0,0 +1,71 @@
+#pragma once
+
+#include <vcpkg/build.h>
+#include <vcpkg/dependencies.h>
+#include <vcpkg/vcpkgcmdarguments.h>
+#include <vcpkg/vcpkgpaths.h>
+
+#include <vector>
+
+namespace vcpkg::Install
+{
+    enum class KeepGoing
+    {
+        NO = 0,
+        YES
+    };
+
+    inline KeepGoing to_keep_going(const bool value) { return value ? KeepGoing::YES : KeepGoing::NO; }
+
+    enum class PrintSummary
+    {
+        NO = 0,
+        YES
+    };
+
+    inline PrintSummary to_print_summary(const bool value) { return value ? PrintSummary::YES : PrintSummary::NO; }
+
+    struct InstallDir
+    {
+        static InstallDir from_destination_root(const fs::path& destination_root,
+                                                const std::string& destination_subdirectory,
+                                                const fs::path& listfile);
+
+    private:
+        fs::path m_destination;
+        std::string m_destination_subdirectory;
+        fs::path m_listfile;
+
+    public:
+        const fs::path& destination() const;
+        const std::string& destination_subdirectory() const;
+        const fs::path& listfile() const;
+    };
+
+    Build::BuildResult perform_install_plan_action(const VcpkgPaths& paths,
+                                                   const Dependencies::InstallPlanAction& action,
+                                                   const Build::BuildPackageOptions& install_plan_options,
+                                                   StatusParagraphs& status_db);
+
+    enum class InstallResult
+    {
+        FILE_CONFLICTS,
+        SUCCESS,
+    };
+
+    void install_files_and_write_listfile(Files::Filesystem& fs, const fs::path& source_dir, const InstallDir& dirs);
+    InstallResult install_package(const VcpkgPaths& paths,
+                                  const BinaryControlFile& binary_paragraph,
+                                  StatusParagraphs* status_db);
+
+    void perform_and_exit_ex(const std::vector<Dependencies::AnyAction>& action_plan,
+                             const Build::BuildPackageOptions& install_plan_options,
+                             const KeepGoing keep_going,
+                             const PrintSummary print_summary,
+                             const VcpkgPaths& paths,
+                             StatusParagraphs& status_db);
+
+    extern const CommandStructure COMMAND_STRUCTURE;
+
+    void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths, const Triplet& default_triplet);
+}
diff --git a/toolsrc/include/metrics.h b/toolsrc/include/vcpkg/metrics.h
index 8eae426de..41be5002d 100644
--- a/toolsrc/include/metrics.h
+++ b/toolsrc/include/vcpkg/metrics.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include <string>
+#include <vcpkg/base/util.h>
 
-#include "vcpkg_Util.h"
+#include <string>
 
 namespace vcpkg::Metrics
 {
diff --git a/toolsrc/include/PackageSpec.h b/toolsrc/include/vcpkg/packagespec.h
index c5ce767f9..ee34f14a3 100644
--- a/toolsrc/include/PackageSpec.h
+++ b/toolsrc/include/vcpkg/packagespec.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "PackageSpecParseResult.h"
-#include "Triplet.h"
-#include "vcpkg_expected.h"
+#include <vcpkg/base/expected.h>
+#include <vcpkg/packagespecparseresult.h>
+#include <vcpkg/triplet.h>
 
 namespace vcpkg
 {
diff --git a/toolsrc/include/PackageSpecParseResult.h b/toolsrc/include/vcpkg/packagespecparseresult.h
index 1462b8073..8a56574fd 100644
--- a/toolsrc/include/PackageSpecParseResult.h
+++ b/toolsrc/include/vcpkg/packagespecparseresult.h
@@ -1,6 +1,7 @@
 #pragma once
 
-#include "vcpkg_expected.h"
+#include <vcpkg/base/cstringview.h>
+#include <vcpkg/base/expected.h>
 
 namespace vcpkg
 {
diff --git a/toolsrc/include/ParagraphParseResult.h b/toolsrc/include/vcpkg/paragraphparseresult.h
index eaa7e6327..abdd9eecd 100644
--- a/toolsrc/include/ParagraphParseResult.h
+++ b/toolsrc/include/vcpkg/paragraphparseresult.h
@@ -1,4 +1,5 @@
 #pragma once
+
 #include <system_error>
 
 namespace vcpkg
diff --git a/toolsrc/include/Paragraphs.h b/toolsrc/include/vcpkg/paragraphs.h
index aae46f7da..c8dbea646 100644
--- a/toolsrc/include/Paragraphs.h
+++ b/toolsrc/include/vcpkg/paragraphs.h
@@ -1,13 +1,13 @@
 #pragma once
 
-#include <map>
+#include <vcpkg/binaryparagraph.h>
+#include <vcpkg/parse.h>
+#include <vcpkg/vcpkgpaths.h>
+#include <vcpkg/versiont.h>
+
+#include <vcpkg/base/expected.h>
 
-#include "BinaryParagraph.h"
-#include "VcpkgPaths.h"
-#include "VersionT.h"
-#include "filesystem_fs.h"
-#include "vcpkg_Parse.h"
-#include "vcpkg_expected.h"
+#include <map>
 
 namespace vcpkg::Paragraphs
 {
diff --git a/toolsrc/include/vcpkg_Parse.h b/toolsrc/include/vcpkg/parse.h
index 2dda033b3..4b33e302e 100644
--- a/toolsrc/include/vcpkg_Parse.h
+++ b/toolsrc/include/vcpkg/parse.h
@@ -1,11 +1,11 @@
 #pragma once
 
+#include <vcpkg/base/expected.h>
+#include <vcpkg/base/optional.h>
+
 #include <memory>
 #include <unordered_map>
 
-#include "vcpkg_expected.h"
-#include "vcpkg_optional.h"
-
 namespace vcpkg::Parse
 {
     struct ParseControlErrorInfo
diff --git a/toolsrc/include/PostBuildLint_BuildType.h b/toolsrc/include/vcpkg/postbuildlint.buildtype.h
index 38ad3084e..ff651fd7a 100644
--- a/toolsrc/include/PostBuildLint_BuildType.h
+++ b/toolsrc/include/vcpkg/postbuildlint.buildtype.h
@@ -1,6 +1,8 @@
 #pragma once
-#include "CStringView.h"
-#include "vcpkg_Build.h"
+
+#include <vcpkg/base/cstringview.h>
+#include <vcpkg/build.h>
+
 #include <array>
 #include <regex>
 
diff --git a/toolsrc/include/PostBuildLint.h b/toolsrc/include/vcpkg/postbuildlint.h
index 69fafc9f7..5dcfeb8df 100644
--- a/toolsrc/include/PostBuildLint.h
+++ b/toolsrc/include/vcpkg/postbuildlint.h
@@ -1,7 +1,8 @@
 #pragma once
-#include "PackageSpec.h"
-#include "VcpkgPaths.h"
-#include "vcpkg_Build.h"
+
+#include <vcpkg/build.h>
+#include <vcpkg/packagespec.h>
+#include <vcpkg/vcpkgpaths.h>
 
 namespace vcpkg::PostBuildLint
 {
diff --git a/toolsrc/include/vcpkg/remove.h b/toolsrc/include/vcpkg/remove.h
new file mode 100644
index 000000000..6d8a3ebe9
--- /dev/null
+++ b/toolsrc/include/vcpkg/remove.h
@@ -0,0 +1,26 @@
+#pragma once
+
+#include <vcpkg/dependencies.h>
+#include <vcpkg/vcpkgcmdarguments.h>
+#include <vcpkg/vcpkgpaths.h>
+
+namespace vcpkg::Remove
+{
+    enum class Purge
+    {
+        NO = 0,
+        YES
+    };
+
+    inline Purge to_purge(const bool value) { return value ? Purge::YES : Purge::NO; }
+
+    void perform_remove_plan_action(const VcpkgPaths& paths,
+                                    const Dependencies::RemovePlanAction& action,
+                                    const Purge purge,
+                                    StatusParagraphs& status_db);
+
+    extern const CommandStructure COMMAND_STRUCTURE;
+
+    void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths, const Triplet& default_triplet);
+    void remove_package(const VcpkgPaths& paths, const PackageSpec& spec, StatusParagraphs* status_db);
+}
diff --git a/toolsrc/include/SourceParagraph.h b/toolsrc/include/vcpkg/sourceparagraph.h
index ccf9faf4f..0a02e4cda 100644
--- a/toolsrc/include/SourceParagraph.h
+++ b/toolsrc/include/vcpkg/sourceparagraph.h
@@ -1,10 +1,11 @@
 #pragma once
 
-#include "PackageSpec.h"
-#include "Span.h"
-#include "vcpkg_Parse.h"
-#include "vcpkg_System.h"
-#include "vcpkg_expected.h"
+#include <vcpkg/packagespec.h>
+#include <vcpkg/parse.h>
+
+#include <vcpkg/base/Span.h>
+#include <vcpkg/base/expected.h>
+#include <vcpkg/base/system.h>
 
 #include <string>
 #include <vector>
diff --git a/toolsrc/include/StatusParagraph.h b/toolsrc/include/vcpkg/statusparagraph.h
index b56533d65..ca84b1bb7 100644
--- a/toolsrc/include/StatusParagraph.h
+++ b/toolsrc/include/vcpkg/statusparagraph.h
@@ -1,6 +1,7 @@
 #pragma once
 
-#include "BinaryParagraph.h"
+#include <vcpkg/binaryparagraph.h>
+
 #include <unordered_map>
 
 namespace vcpkg
diff --git a/toolsrc/include/StatusParagraphs.h b/toolsrc/include/vcpkg/statusparagraphs.h
index 1a9ee6a03..c2f3b7b8e 100644
--- a/toolsrc/include/StatusParagraphs.h
+++ b/toolsrc/include/vcpkg/statusparagraphs.h
@@ -1,5 +1,6 @@
 #pragma once
-#include "StatusParagraph.h"
+#include <vcpkg/statusparagraph.h>
+
 #include <iterator>
 #include <memory>
 
diff --git a/toolsrc/include/triplet.h b/toolsrc/include/vcpkg/triplet.h
index 46a52f8e6..46a52f8e6 100644
--- a/toolsrc/include/triplet.h
+++ b/toolsrc/include/vcpkg/triplet.h
diff --git a/toolsrc/include/vcpkg/update.h b/toolsrc/include/vcpkg/update.h
new file mode 100644
index 000000000..e7303d1b0
--- /dev/null
+++ b/toolsrc/include/vcpkg/update.h
@@ -0,0 +1,21 @@
+#pragma once
+
+#include <vcpkg/packagespec.h>
+#include <vcpkg/statusparagraphs.h>
+#include <vcpkg/vcpkgcmdarguments.h>
+#include <vcpkg/vcpkgpaths.h>
+#include <vcpkg/versiont.h>
+
+namespace vcpkg::Update
+{
+    struct OutdatedPackage
+    {
+        static bool compare_by_name(const OutdatedPackage& left, const OutdatedPackage& right);
+
+        PackageSpec spec;
+        VersionDiff version_diff;
+    };
+
+    std::vector<OutdatedPackage> find_outdated_packages(const VcpkgPaths& paths, const StatusParagraphs& status_db);
+    void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths);
+}
+\ No newline at end of file
diff --git a/toolsrc/include/VcpkgCmdArguments.h b/toolsrc/include/vcpkg/vcpkgcmdarguments.h
index 0de5747b1..8b1d766b6 100644
--- a/toolsrc/include/VcpkgCmdArguments.h
+++ b/toolsrc/include/vcpkg/vcpkgcmdarguments.h
@@ -1,6 +1,9 @@
 #pragma once
 
-#include "vcpkg_optional.h"
+#include <vcpkg/base/cstringview.h>
+#include <vcpkg/base/optional.h>
+#include <vcpkg/base/span.h>
+
 #include <memory>
 #include <unordered_map>
 #include <unordered_set>
@@ -46,4 +49,19 @@ namespace vcpkg
     private:
         std::unordered_map<std::string, Optional<std::string>> optional_command_arguments;
     };
+
+    struct VcpkgPaths;
+
+    struct CommandStructure
+    {
+        CStringView example_text;
+
+        size_t minimum_arity;
+        size_t maximum_arity;
+
+        Span<const std::string> switches;
+        Span<const std::string> settings;
+
+        std::vector<std::string> (*valid_arguments)(const VcpkgPaths& paths);
+    };
 }
diff --git a/toolsrc/include/vcpkglib.h b/toolsrc/include/vcpkg/vcpkglib.h
index 0bb75f9b5..b2aad8d7b 100644
--- a/toolsrc/include/vcpkglib.h
+++ b/toolsrc/include/vcpkg/vcpkglib.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "SortedVector.h"
-#include "StatusParagraphs.h"
-#include "VcpkgPaths.h"
+#include <vcpkg/base/sortedvector.h>
+#include <vcpkg/statusparagraphs.h>
+#include <vcpkg/vcpkgpaths.h>
 
 namespace vcpkg
 {
diff --git a/toolsrc/include/VcpkgPaths.h b/toolsrc/include/vcpkg/vcpkgpaths.h
index 9f55dc5ac..01c6e30cd 100644
--- a/toolsrc/include/VcpkgPaths.h
+++ b/toolsrc/include/vcpkg/vcpkgpaths.h
@@ -1,10 +1,11 @@
 #pragma once
-#include "BinaryParagraph.h"
-#include "Lazy.h"
-#include "PackageSpec.h"
-#include "filesystem_fs.h"
-#include "vcpkg_Files.h"
-#include "vcpkg_expected.h"
+
+#include <vcpkg/binaryparagraph.h>
+#include <vcpkg/packagespec.h>
+
+#include <vcpkg/base/Lazy.h>
+#include <vcpkg/base/expected.h>
+#include <vcpkg/base/files.h>
 
 namespace vcpkg
 {
@@ -17,6 +18,7 @@ namespace vcpkg
 
     struct Toolset
     {
+        fs::path visual_studio_root_path;
         fs::path dumpbin;
         fs::path vcvarsall;
         std::vector<std::wstring> vcvarsall_options;
@@ -58,12 +60,16 @@ namespace vcpkg
         const fs::path& get_cmake_exe() const;
         const fs::path& get_git_exe() const;
         const fs::path& get_nuget_exe() const;
+        const fs::path& get_ifw_installerbase_exe() const;
+        const fs::path& get_ifw_binarycreator_exe() const;
+        const fs::path& get_ifw_repogen_exe() const;
 
         /// <summary>Retrieve a toolset matching a VS version</summary>
         /// <remarks>
         ///   Valid version strings are "v120", "v140", "v141", and "". Empty string gets the latest.
         /// </remarks>
-        const Toolset& get_toolset(const std::string& toolset_version) const;
+        const Toolset& get_toolset(const Optional<std::string>& toolset_version,
+                                   const Optional<fs::path>& visual_studio_path) const;
 
         Files::Filesystem& get_filesystem() const;
 
@@ -71,8 +77,10 @@ namespace vcpkg
         Lazy<fs::path> cmake_exe;
         Lazy<fs::path> git_exe;
         Lazy<fs::path> nuget_exe;
+        Lazy<fs::path> ifw_installerbase_exe;
+        Lazy<fs::path> ifw_binarycreator_exe;
+        Lazy<fs::path> ifw_repogen_exe;
         Lazy<std::vector<Toolset>> toolsets;
-        Lazy<std::vector<Toolset>> toolsets_vs2017_v140;
         Lazy<std::vector<Toolset>> toolsets_vs2013;
     };
 }
diff --git a/toolsrc/include/VersionT.h b/toolsrc/include/vcpkg/versiont.h
index 67efd8da3..67efd8da3 100644
--- a/toolsrc/include/VersionT.h
+++ b/toolsrc/include/vcpkg/versiont.h
diff --git a/toolsrc/include/vcpkg_Commands.h b/toolsrc/include/vcpkg_Commands.h
deleted file mode 100644
index 590f0208c..000000000
--- a/toolsrc/include/vcpkg_Commands.h
+++ /dev/null
@@ -1,253 +0,0 @@
-#pragma once
-
-#include "StatusParagraphs.h"
-#include "VcpkgCmdArguments.h"
-#include "VcpkgPaths.h"
-#include "VersionT.h"
-#include "vcpkg_Build.h"
-#include "vcpkg_Dependencies.h"
-#include <array>
-
-namespace vcpkg::Commands
-{
-    using CommandTypeA = void (*)(const VcpkgCmdArguments& args,
-                                  const VcpkgPaths& paths,
-                                  const Triplet& default_triplet);
-    using CommandTypeB = void (*)(const VcpkgCmdArguments& args, const VcpkgPaths& paths);
-    using CommandTypeC = void (*)(const VcpkgCmdArguments& args);
-
-    namespace BuildCommand
-    {
-        void perform_and_exit(const FullPackageSpec& full_spec,
-                              const fs::path& port_dir,
-                              const std::unordered_set<std::string>& options,
-                              const VcpkgPaths& paths);
-
-        void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths, const Triplet& default_triplet);
-    }
-
-    namespace BuildExternal
-    {
-        void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths, const Triplet& default_triplet);
-    }
-
-    namespace Install
-    {
-        enum class KeepGoing
-        {
-            NO = 0,
-            YES
-        };
-
-        inline KeepGoing to_keep_going(const bool value) { return value ? KeepGoing::YES : KeepGoing::NO; }
-
-        enum class PrintSummary
-        {
-            NO = 0,
-            YES
-        };
-
-        inline PrintSummary to_print_summary(const bool value) { return value ? PrintSummary::YES : PrintSummary::NO; }
-
-        struct InstallDir
-        {
-            static InstallDir from_destination_root(const fs::path& destination_root,
-                                                    const std::string& destination_subdirectory,
-                                                    const fs::path& listfile);
-
-        private:
-            fs::path m_destination;
-            std::string m_destination_subdirectory;
-            fs::path m_listfile;
-
-        public:
-            const fs::path& destination() const;
-            const std::string& destination_subdirectory() const;
-            const fs::path& listfile() const;
-        };
-
-        Build::BuildResult perform_install_plan_action(const VcpkgPaths& paths,
-                                                       const Dependencies::InstallPlanAction& action,
-                                                       const Build::BuildPackageOptions& install_plan_options,
-                                                       StatusParagraphs& status_db);
-
-        enum class InstallResult
-        {
-            FILE_CONFLICTS,
-            SUCCESS,
-        };
-
-        void install_files_and_write_listfile(Files::Filesystem& fs,
-                                              const fs::path& source_dir,
-                                              const InstallDir& dirs);
-        InstallResult install_package(const VcpkgPaths& paths,
-                                      const BinaryControlFile& binary_paragraph,
-                                      StatusParagraphs* status_db);
-
-        void perform_and_exit(const std::vector<Dependencies::AnyAction>& action_plan,
-                              const Build::BuildPackageOptions& install_plan_options,
-                              const KeepGoing keep_going,
-                              const PrintSummary print_summary,
-                              const VcpkgPaths& paths,
-                              StatusParagraphs& status_db);
-
-        void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths, const Triplet& default_triplet);
-    }
-
-    namespace Export
-    {
-        void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths, const Triplet& default_triplet);
-    }
-
-    namespace CI
-    {
-        void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths, const Triplet& default_triplet);
-    }
-
-    namespace Remove
-    {
-        enum class Purge
-        {
-            NO = 0,
-            YES
-        };
-
-        inline Purge to_purge(const bool value) { return value ? Purge::YES : Purge::NO; }
-
-        void perform_remove_plan_action(const VcpkgPaths& paths,
-                                        const Dependencies::RemovePlanAction& action,
-                                        const Purge purge,
-                                        StatusParagraphs& status_db);
-
-        void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths, const Triplet& default_triplet);
-        void remove_package(const VcpkgPaths& paths, const PackageSpec& spec, StatusParagraphs* status_db);
-    }
-
-    namespace Update
-    {
-        struct OutdatedPackage
-        {
-            static bool compare_by_name(const OutdatedPackage& left, const OutdatedPackage& right);
-
-            PackageSpec spec;
-            VersionDiff version_diff;
-        };
-
-        std::vector<OutdatedPackage> find_outdated_packages(const VcpkgPaths& paths, const StatusParagraphs& status_db);
-        void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths);
-    }
-
-    namespace Env
-    {
-        void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths, const Triplet& default_triplet);
-    }
-
-    namespace Create
-    {
-        void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths);
-    }
-
-    namespace Edit
-    {
-        void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths);
-    }
-
-    namespace DependInfo
-    {
-        void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths);
-    }
-
-    namespace Search
-    {
-        void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths);
-    }
-
-    namespace List
-    {
-        void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths);
-    }
-
-    namespace Owns
-    {
-        void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths);
-    }
-
-    namespace Cache
-    {
-        void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths);
-    }
-
-    namespace Import
-    {
-        void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths);
-    }
-
-    namespace Integrate
-    {
-        extern const char* const INTEGRATE_COMMAND_HELPSTRING;
-
-        void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths);
-    }
-
-    namespace PortsDiff
-    {
-        void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths);
-    }
-
-    namespace Help
-    {
-        void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths);
-
-        void help_topic_valid_triplet(const VcpkgPaths& paths);
-
-        void print_usage();
-
-        void print_example(const std::string& command_and_arguments);
-
-        std::string create_example_string(const std::string& command_and_arguments);
-    }
-
-    namespace Version
-    {
-        const std::string& version();
-        void warn_if_vcpkg_version_mismatch(const VcpkgPaths& paths);
-        void perform_and_exit(const VcpkgCmdArguments& args);
-    }
-
-    namespace Contact
-    {
-        const std::string& email();
-        void perform_and_exit(const VcpkgCmdArguments& args);
-    }
-
-    namespace Hash
-    {
-        void perform_and_exit(const VcpkgCmdArguments& args);
-    }
-
-    template<class T>
-    struct PackageNameAndFunction
-    {
-        std::string name;
-        T function;
-    };
-
-    const std::vector<PackageNameAndFunction<CommandTypeA>>& get_available_commands_type_a();
-    const std::vector<PackageNameAndFunction<CommandTypeB>>& get_available_commands_type_b();
-    const std::vector<PackageNameAndFunction<CommandTypeC>>& get_available_commands_type_c();
-
-    template<typename T>
-    T find(const std::string& command_name, const std::vector<PackageNameAndFunction<T>> available_commands)
-    {
-        for (const PackageNameAndFunction<T>& cmd : available_commands)
-        {
-            if (cmd.name == command_name)
-            {
-                return cmd.function;
-            }
-        }
-
-        // not found
-        return nullptr;
-    }
-}
diff --git a/toolsrc/include/vcpkg_Maps.h b/toolsrc/include/vcpkg_Maps.h
deleted file mode 100644
index aadd81c2b..000000000
--- a/toolsrc/include/vcpkg_Maps.h
+++ /dev/null
@@ -1,30 +0,0 @@
-#pragma once
-
-#include <map>
-#include <unordered_map>
-#include <unordered_set>
-
-namespace vcpkg::Maps
-{
-    template<typename K, typename V>
-    std::vector<K> extract_keys(const std::unordered_map<K, V>& input_map)
-    {
-        std::vector<K> key_set;
-        for (auto const& element : input_map)
-        {
-            key_set.push_back(element.first);
-        }
-        return key_set;
-    }
-
-    template<typename K, typename V>
-    std::vector<K> extract_keys(const std::map<K, V>& input_map)
-    {
-        std::vector<K> key_set;
-        for (auto const& element : input_map)
-        {
-            key_set.push_back(element.first);
-        }
-        return key_set;
-    }
-}
diff --git a/toolsrc/src/commands_build.cpp b/toolsrc/src/commands_build.cpp
deleted file mode 100644
index a69958058..000000000
--- a/toolsrc/src/commands_build.cpp
+++ /dev/null
@@ -1,102 +0,0 @@
-#include "pch.h"
-
-#include "Paragraphs.h"
-#include "PostBuildLint.h"
-#include "StatusParagraphs.h"
-#include "vcpkg_Commands.h"
-#include "vcpkg_Dependencies.h"
-#include "vcpkg_Enums.h"
-#include "vcpkg_Input.h"
-#include "vcpkg_System.h"
-#include "vcpkglib.h"
-
-using vcpkg::Build::BuildResult;
-using vcpkg::Parse::ParseControlErrorInfo;
-using vcpkg::Parse::ParseExpected;
-
-namespace vcpkg::Commands::BuildCommand
-{
-    using Dependencies::InstallPlanAction;
-    using Dependencies::InstallPlanType;
-
-    static const std::string OPTION_CHECKS_ONLY = "--checks-only";
-
-    void perform_and_exit(const FullPackageSpec& full_spec,
-                          const fs::path& port_dir,
-                          const std::unordered_set<std::string>& options,
-                          const VcpkgPaths& paths)
-    {
-        const PackageSpec& spec = full_spec.package_spec;
-        if (options.find(OPTION_CHECKS_ONLY) != options.end())
-        {
-            const auto pre_build_info = Build::PreBuildInfo::from_triplet_file(paths, spec.triplet());
-            const auto build_info = Build::read_build_info(paths.get_filesystem(), paths.build_info_file_path(spec));
-            const size_t error_count = PostBuildLint::perform_all_checks(spec, paths, pre_build_info, build_info);
-            Checks::check_exit(VCPKG_LINE_INFO, error_count == 0);
-            Checks::exit_success(VCPKG_LINE_INFO);
-        }
-
-        const ParseExpected<SourceControlFile> source_control_file =
-            Paragraphs::try_load_port(paths.get_filesystem(), port_dir);
-
-        if (!source_control_file.has_value())
-        {
-            print_error_message(source_control_file.error());
-            Checks::exit_fail(VCPKG_LINE_INFO);
-        }
-
-        for (const std::string& str : full_spec.features)
-        {
-            System::println("%s \n", str);
-        }
-        const auto& scf = source_control_file.value_or_exit(VCPKG_LINE_INFO);
-        Checks::check_exit(VCPKG_LINE_INFO,
-                           spec.name() == scf->core_paragraph->name,
-                           "The Name: field inside the CONTROL does not match the port directory: '%s' != '%s'",
-                           scf->core_paragraph->name,
-                           spec.name());
-
-        const StatusParagraphs status_db = database_load_check(paths);
-        const Build::BuildPackageOptions build_package_options{Build::UseHeadVersion::NO, Build::AllowDownloads::YES};
-
-        const Build::BuildPackageConfig build_config{
-            *scf->core_paragraph, spec.triplet(), paths.port_dir(spec), build_package_options};
-
-        const auto result = Build::build_package(paths, build_config, status_db);
-        if (result.code == BuildResult::CASCADED_DUE_TO_MISSING_DEPENDENCIES)
-        {
-            System::println(System::Color::error,
-                            "The build command requires all dependencies to be already installed.");
-            System::println("The following dependencies are missing:");
-            System::println();
-            for (const auto& p : result.unmet_dependencies)
-            {
-                System::println("    %s", p);
-            }
-            System::println();
-            Checks::exit_fail(VCPKG_LINE_INFO);
-        }
-
-        if (result.code != BuildResult::SUCCEEDED)
-        {
-            System::println(System::Color::error, Build::create_error_message(result.code, spec));
-            System::println(Build::create_user_troubleshooting_message(spec));
-            Checks::exit_fail(VCPKG_LINE_INFO);
-        }
-
-        Checks::exit_success(VCPKG_LINE_INFO);
-    }
-
-    void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths, const Triplet& default_triplet)
-    {
-        static const std::string EXAMPLE = Commands::Help::create_example_string("build zlib:x64-windows");
-        // Build only takes a single package and all dependencies must already be installed
-        args.check_exact_arg_count(1, EXAMPLE);
-        const std::string command_argument = args.command_arguments.at(0);
-        const FullPackageSpec spec = Input::check_and_get_full_package_spec(command_argument, default_triplet, EXAMPLE);
-        Input::check_triplet(spec.package_spec.triplet(), paths);
-        const std::unordered_set<std::string> options =
-            args.check_and_get_optional_command_arguments({OPTION_CHECKS_ONLY});
-        perform_and_exit(spec, paths.port_dir(spec.package_spec), options, paths);
-    }
-}
diff --git a/toolsrc/src/tests_arguments.cpp b/toolsrc/src/tests.arguments.cpp
index 14b3c3d4f..25bf0f085 100644
--- a/toolsrc/src/tests_arguments.cpp
+++ b/toolsrc/src/tests.arguments.cpp
@@ -1,5 +1,5 @@
-#include "CppUnitTest.h"
-#include "VcpkgCmdArguments.h"
+#include <CppUnitTest.h>
+#include <vcpkg/vcpkgcmdarguments.h>
 
 #pragma comment(lib, "version")
 #pragma comment(lib, "winhttp")
diff --git a/toolsrc/src/tests_dependencies.cpp b/toolsrc/src/tests.dependencies.cpp
index 6a6981d73..3f6e0dd10 100644
--- a/toolsrc/src/tests_dependencies.cpp
+++ b/toolsrc/src/tests.dependencies.cpp
@@ -1,6 +1,6 @@
-#include "CppUnitTest.h"
-#include "SourceParagraph.h"
-#include "Triplet.h"
+#include <CppUnitTest.h>
+#include <vcpkg/sourceparagraph.h>
+#include <vcpkg/triplet.h>
 
 #pragma comment(lib, "version")
 #pragma comment(lib, "winhttp")
diff --git a/toolsrc/src/test_install_plan.cpp b/toolsrc/src/tests.installplan.cpp
index 6c9311264..120009db5 100644
--- a/toolsrc/src/test_install_plan.cpp
+++ b/toolsrc/src/tests.installplan.cpp
@@ -1,6 +1,7 @@
-#include "CppUnitTest.h"
-#include "vcpkg_Dependencies.h"
-#include "vcpkg_Util.h"
+#include <CppUnitTest.h>
+#include <vcpkg/dependencies.h>
+
+#include <vcpkg/base/util.h>
 
 using namespace Microsoft::VisualStudio::CppUnitTestFramework;
 
diff --git a/toolsrc/src/tests_package_spec.cpp b/toolsrc/src/tests.packagespec.cpp
index a6b9d5b13..cb5c41af0 100644
--- a/toolsrc/src/tests_package_spec.cpp
+++ b/toolsrc/src/tests.packagespec.cpp
@@ -1,7 +1,8 @@
-#include "BinaryParagraph.h"
-#include "CppUnitTest.h"
-#include "Paragraphs.h"
-#include "vcpkg_Strings.h"
+#include <CppUnitTest.h>
+#include <vcpkg/binaryparagraph.h>
+#include <vcpkg/paragraphs.h>
+
+#include <vcpkg/base/strings.h>
 
 #pragma comment(lib, "version")
 #pragma comment(lib, "winhttp")
diff --git a/toolsrc/src/tests_paragraph.cpp b/toolsrc/src/tests.paragraph.cpp
index 47a07e12d..d9301abd0 100644
--- a/toolsrc/src/tests_paragraph.cpp
+++ b/toolsrc/src/tests.paragraph.cpp
@@ -1,7 +1,8 @@
-#include "BinaryParagraph.h"
-#include "CppUnitTest.h"
-#include "Paragraphs.h"
-#include "vcpkg_Strings.h"
+#include <CppUnitTest.h>
+#include <vcpkg/binaryparagraph.h>
+#include <vcpkg/paragraphs.h>
+
+#include <vcpkg/base/strings.h>
 
 #pragma comment(lib, "version")
 #pragma comment(lib, "winhttp")
diff --git a/toolsrc/src/vcpkg.cpp b/toolsrc/src/vcpkg.cpp
index 706c641fb..f1a86ae22 100644
--- a/toolsrc/src/vcpkg.cpp
+++ b/toolsrc/src/vcpkg.cpp
@@ -1,16 +1,18 @@
 #define WIN32_LEAN_AND_MEAN
 #include <Windows.h>
 
-#include "Paragraphs.h"
-#include "metrics.h"
-#include "vcpkg_Chrono.h"
-#include "vcpkg_Commands.h"
-#include "vcpkg_Files.h"
-#include "vcpkg_GlobalState.h"
-#include "vcpkg_Input.h"
-#include "vcpkg_Strings.h"
-#include "vcpkg_System.h"
-#include "vcpkglib.h"
+#include <vcpkg/base/chrono.h>
+#include <vcpkg/base/files.h>
+#include <vcpkg/base/strings.h>
+#include <vcpkg/base/system.h>
+#include <vcpkg/commands.h>
+#include <vcpkg/globalstate.h>
+#include <vcpkg/help.h>
+#include <vcpkg/input.h>
+#include <vcpkg/metrics.h>
+#include <vcpkg/paragraphs.h>
+#include <vcpkg/vcpkglib.h>
+
 #pragma warning(push)
 #pragma warning(disable : 4768)
 #include <Shlobj.h>
@@ -19,12 +21,15 @@
 #include <fstream>
 #include <memory>
 
+#pragma comment(lib, "ole32")
+#pragma comment(lib, "shell32")
+
 using namespace vcpkg;
 
 void invalid_command(const std::string& cmd)
 {
     System::println(System::Color::error, "invalid command: %s", cmd);
-    Commands::Help::print_usage();
+    Help::print_usage();
     Checks::exit_fail(VCPKG_LINE_INFO);
 }
 
@@ -33,13 +38,26 @@ static void inner(const VcpkgCmdArguments& args)
     Metrics::g_metrics.lock()->track_property("command", args.command);
     if (args.command.empty())
     {
-        Commands::Help::print_usage();
+        Help::print_usage();
         Checks::exit_fail(VCPKG_LINE_INFO);
     }
 
-    if (const auto command_function = Commands::find(args.command, Commands::get_available_commands_type_c()))
+    static const auto find_command = [&](auto&& commands) {
+        auto it = Util::find_if(commands, [&](auto&& commandc) {
+            return Strings::case_insensitive_ascii_compare(commandc.name, args.command);
+        });
+        using std::end;
+        if (it != end(commands))
+        {
+            return &*it;
+        }
+        else
+            return static_cast<decltype(&*it)>(nullptr);
+    };
+
+    if (const auto command_function = find_command(Commands::get_available_commands_type_c()))
     {
-        return command_function(args);
+        return command_function->function(args);
     }
 
     fs::path vcpkg_root_dir;
@@ -56,8 +74,14 @@ static void inner(const VcpkgCmdArguments& args)
         }
         else
         {
-            vcpkg_root_dir = Files::get_real_filesystem().find_file_recursively_up(
-                fs::stdfs::absolute(System::get_exe_path_of_current_process()), ".vcpkg-root");
+            const fs::path current_path = fs::stdfs::current_path();
+            vcpkg_root_dir = Files::get_real_filesystem().find_file_recursively_up(current_path, ".vcpkg-root");
+
+            if (vcpkg_root_dir.empty())
+            {
+                vcpkg_root_dir = Files::get_real_filesystem().find_file_recursively_up(
+                    fs::stdfs::absolute(System::get_exe_path_of_current_process()), ".vcpkg-root");
+            }
         }
     }
 
@@ -70,13 +94,14 @@ static void inner(const VcpkgCmdArguments& args)
                        vcpkg_root_dir.string(),
                        expected_paths.error().message());
     const VcpkgPaths paths = expected_paths.value_or_exit(VCPKG_LINE_INFO);
+
     const int exit_code = _wchdir(paths.root.c_str());
     Checks::check_exit(VCPKG_LINE_INFO, exit_code == 0, "Changing the working dir failed");
     Commands::Version::warn_if_vcpkg_version_mismatch(paths);
 
-    if (const auto command_function = Commands::find(args.command, Commands::get_available_commands_type_b()))
+    if (const auto command_function = find_command(Commands::get_available_commands_type_b()))
     {
-        return command_function(args, paths);
+        return command_function->function(args, paths);
     }
 
     Triplet default_triplet;
@@ -100,9 +125,9 @@ static void inner(const VcpkgCmdArguments& args)
 
     Input::check_triplet(default_triplet, paths);
 
-    if (const auto command_function = Commands::find(args.command, Commands::get_available_commands_type_a()))
+    if (const auto command_function = find_command(Commands::get_available_commands_type_a()))
     {
-        return command_function(args, paths, default_triplet);
+        return command_function->function(args, paths, default_triplet);
     }
 
     return invalid_command(args.command);
@@ -202,7 +227,7 @@ int wmain(const int argc, const wchar_t* const* const argv)
     SetConsoleCP(65001);
     SetConsoleOutputCP(65001);
 
-    *GlobalState::timer.lock() = ElapsedTime::create_started();
+    *GlobalState::timer.lock() = Chrono::ElapsedTime::create_started();
 
     const std::string trimmed_command_line = trim_path_from_command_line(Strings::to_utf8(GetCommandLineW()));
 
diff --git a/toolsrc/src/vcpkg_Checks.cpp b/toolsrc/src/vcpkg/base/checks.cpp
index e7c9046a4..73c7b9b1a 100644
--- a/toolsrc/src/vcpkg_Checks.cpp
+++ b/toolsrc/src/vcpkg/base/checks.cpp
@@ -1,10 +1,10 @@
 #include "pch.h"
 
-#include "metrics.h"
-#include "vcpkg_Checks.h"
-#include "vcpkg_GlobalState.h"
-#include "vcpkg_System.h"
-#include "vcpkglib.h"
+#include <vcpkg/globalstate.h>
+#include <vcpkg/metrics.h>
+
+#include <vcpkg/base/checks.h>
+#include <vcpkg/base/system.h>
 
 namespace vcpkg::Checks
 {
diff --git a/toolsrc/src/vcpkg_Chrono.cpp b/toolsrc/src/vcpkg/base/chrono.cpp
index d96f30987..5d28909fc 100644
--- a/toolsrc/src/vcpkg_Chrono.cpp
+++ b/toolsrc/src/vcpkg/base/chrono.cpp
@@ -1,9 +1,9 @@
 #include "pch.h"
 
-#include "vcpkg_Checks.h"
-#include "vcpkg_Chrono.h"
+#include <vcpkg/base/checks.h>
+#include <vcpkg/base/chrono.h>
 
-namespace vcpkg
+namespace vcpkg::Chrono
 {
     static std::string format_time_userfriendly(const std::chrono::nanoseconds& nanos)
     {
diff --git a/toolsrc/src/coff_file_reader.cpp b/toolsrc/src/vcpkg/base/cofffilereader.cpp
index bb3a6cefd..5e9c86998 100644
--- a/toolsrc/src/coff_file_reader.cpp
+++ b/toolsrc/src/vcpkg/base/cofffilereader.cpp
@@ -1,7 +1,7 @@
 #include "pch.h"
 
-#include "coff_file_reader.h"
-#include "vcpkg_Checks.h"
+#include <vcpkg/base/checks.h>
+#include <vcpkg/base/cofffilereader.h>
 
 using namespace std;
 
diff --git a/toolsrc/src/vcpkg_Enums.cpp b/toolsrc/src/vcpkg/base/enums.cpp
index 51ba9d5dc..aa124f3aa 100644
--- a/toolsrc/src/vcpkg_Enums.cpp
+++ b/toolsrc/src/vcpkg/base/enums.cpp
@@ -1,7 +1,7 @@
 #include "pch.h"
 
-#include "vcpkg_Checks.h"
-#include "vcpkg_Enums.h"
+#include <vcpkg/base/checks.h>
+#include <vcpkg/base/enums.h>
 
 namespace vcpkg::Enums
 {
diff --git a/toolsrc/src/vcpkg_Files.cpp b/toolsrc/src/vcpkg/base/files.cpp
index ad1fcebc6..f8b239eaa 100644
--- a/toolsrc/src/vcpkg_Files.cpp
+++ b/toolsrc/src/vcpkg/base/files.cpp
@@ -1,9 +1,8 @@
 #include "pch.h"
 
-#include "vcpkg_Files.h"
-#include "vcpkg_System.h"
-#include "vcpkg_Util.h"
-#include <thread>
+#include <vcpkg/base/files.h>
+#include <vcpkg/base/system.h>
+#include <vcpkg/base/util.h>
 
 namespace vcpkg::Files
 {
diff --git a/toolsrc/src/LineInfo.cpp b/toolsrc/src/vcpkg/base/lineinfo.cpp
index d1bf9a4b1..7435ed666 100644
--- a/toolsrc/src/LineInfo.cpp
+++ b/toolsrc/src/vcpkg/base/lineinfo.cpp
@@ -1,7 +1,7 @@
 #include "pch.h"
 
-#include "LineInfo.h"
-#include "vcpkg_Strings.h"
+#include <vcpkg/base/lineinfo.h>
+#include <vcpkg/base/strings.h>
 
 namespace vcpkg
 {
diff --git a/toolsrc/src/MachineType.cpp b/toolsrc/src/vcpkg/base/machinetype.cpp
index af6378c88..2b7bd5e3a 100644
--- a/toolsrc/src/MachineType.cpp
+++ b/toolsrc/src/vcpkg/base/machinetype.cpp
@@ -1,7 +1,7 @@
 #include "pch.h"
 
-#include "MachineType.h"
-#include "vcpkg_Checks.h"
+#include <vcpkg/base/checks.h>
+#include <vcpkg/base/machinetype.h>
 
 namespace vcpkg
 {
diff --git a/toolsrc/src/vcpkg_Strings.cpp b/toolsrc/src/vcpkg/base/strings.cpp
index 21df2c309..2a6d3dff2 100644
--- a/toolsrc/src/vcpkg_Strings.cpp
+++ b/toolsrc/src/vcpkg/base/strings.cpp
@@ -1,8 +1,8 @@
 #include "pch.h"
 
-#include "vcpkg_Checks.h"
-#include "vcpkg_Strings.h"
-#include "vcpkg_Util.h"
+#include <vcpkg/base/checks.h>
+#include <vcpkg/base/strings.h>
+#include <vcpkg/base/util.h>
 
 namespace vcpkg::Strings::details
 {
@@ -104,9 +104,9 @@ namespace vcpkg::Strings
         return case_insensitive_ascii_find(s, pattern) != s.end();
     }
 
-    int case_insensitive_ascii_compare(const CStringView left, const CStringView right)
+    bool case_insensitive_ascii_compare(const CStringView left, const CStringView right)
     {
-        return _stricmp(left.c_str(), right.c_str());
+        return _stricmp(left.c_str(), right.c_str()) == 0;
     }
 
     std::string ascii_to_lowercase(const std::string& input)
@@ -154,11 +154,13 @@ namespace vcpkg::Strings
             return output;
         }
 
+        const size_t delimiter_length = delimiter.length();
         size_t i = 0;
         for (size_t pos = s.find(delimiter); pos != std::string::npos; pos = s.find(delimiter, pos))
         {
             output.push_back(s.substr(i, pos - i));
-            i = ++pos;
+            pos += delimiter_length;
+            i = pos;
         }
 
         // Add the rest of the string after the last delimiter, unless there is nothing after it
diff --git a/toolsrc/src/vcpkg_System.cpp b/toolsrc/src/vcpkg/base/system.cpp
index 4d2e88b73..d5d39461c 100644
--- a/toolsrc/src/vcpkg_System.cpp
+++ b/toolsrc/src/vcpkg/base/system.cpp
@@ -1,9 +1,10 @@
 #include "pch.h"
 
-#include "vcpkg_Checks.h"
-#include "vcpkg_GlobalState.h"
-#include "vcpkg_System.h"
-#include "vcpkglib.h"
+#include <vcpkg/base/checks.h>
+#include <vcpkg/base/system.h>
+#include <vcpkg/globalstate.h>
+
+#pragma comment(lib, "Advapi32")
 
 namespace vcpkg::System
 {
@@ -26,11 +27,11 @@ namespace vcpkg::System
 
     Optional<CPUArchitecture> to_cpu_architecture(CStringView arch)
     {
-        if (Strings::case_insensitive_ascii_compare(arch, "x86") == 0) return CPUArchitecture::X86;
-        if (Strings::case_insensitive_ascii_compare(arch, "x64") == 0) return CPUArchitecture::X64;
-        if (Strings::case_insensitive_ascii_compare(arch, "amd64") == 0) return CPUArchitecture::X64;
-        if (Strings::case_insensitive_ascii_compare(arch, "arm") == 0) return CPUArchitecture::ARM;
-        if (Strings::case_insensitive_ascii_compare(arch, "arm64") == 0) return CPUArchitecture::ARM64;
+        if (Strings::case_insensitive_ascii_compare(arch, "x86")) return CPUArchitecture::X86;
+        if (Strings::case_insensitive_ascii_compare(arch, "x64")) return CPUArchitecture::X64;
+        if (Strings::case_insensitive_ascii_compare(arch, "amd64")) return CPUArchitecture::X64;
+        if (Strings::case_insensitive_ascii_compare(arch, "arm")) return CPUArchitecture::ARM;
+        if (Strings::case_insensitive_ascii_compare(arch, "arm64")) return CPUArchitecture::ARM64;
         return nullopt;
     }
 
@@ -106,6 +107,8 @@ namespace vcpkg::System
             L"HTTPS_PROXY",
             // Enables find_package(CUDA) in CMake
             L"CUDA_PATH",
+            // Environmental variable generated automatically by CUDA after installation
+            L"NVCUDASAMPLES_ROOT",
         };
 
         // Flush stdout before launching external process
@@ -177,11 +180,11 @@ namespace vcpkg::System
     }
 
     // On Win7, output from powershell calls contain a byte order mark, so we strip it out if it is present
-    static void remove_byte_order_mark(std::wstring* s)
+    static void remove_byte_order_marks(std::wstring* s)
     {
         const wchar_t* a = s->c_str();
         // This is the UTF-8 byte-order mark
-        if (a[0] == 0xEF && a[1] == 0xBB && a[2] == 0xBF)
+        while (s->size() >= 3 && a[0] == 0xEF && a[1] == 0xBB && a[2] == 0xBF)
         {
             s->erase(0, 3);
         }
@@ -213,7 +216,7 @@ namespace vcpkg::System
 
         const auto ec = _pclose(pipe);
         Debug::println("_pclose() returned %d", ec);
-        remove_byte_order_mark(&output);
+        remove_byte_order_marks(&output);
         return {ec, Strings::to_utf8(output)};
     }
 
diff --git a/toolsrc/src/BinaryParagraph.cpp b/toolsrc/src/vcpkg/binaryparagraph.cpp
index 1504912ab..ef943011f 100644
--- a/toolsrc/src/BinaryParagraph.cpp
+++ b/toolsrc/src/vcpkg/binaryparagraph.cpp
@@ -1,8 +1,8 @@
 #include "pch.h"
 
-#include "BinaryParagraph.h"
-#include "vcpkg_Checks.h"
-#include "vcpkg_Parse.h"
+#include <vcpkg/base/checks.h>
+#include <vcpkg/binaryparagraph.h>
+#include <vcpkg/parse.h>
 
 namespace vcpkg
 {
diff --git a/toolsrc/src/vcpkg_Build.cpp b/toolsrc/src/vcpkg/build.cpp
index 853f84998..99ec541c1 100644
--- a/toolsrc/src/vcpkg_Build.cpp
+++ b/toolsrc/src/vcpkg/build.cpp
@@ -1,20 +1,147 @@
 #include "pch.h"
 
-#include "Paragraphs.h"
-#include "PostBuildLint.h"
-#include "metrics.h"
-#include "vcpkg_Build.h"
-#include "vcpkg_Checks.h"
-#include "vcpkg_Chrono.h"
-#include "vcpkg_Commands.h"
-#include "vcpkg_Enums.h"
-#include "vcpkg_GlobalState.h"
-#include "vcpkg_System.h"
-#include "vcpkg_optional.h"
-#include "vcpkglib.h"
+#include <vcpkg/base/checks.h>
+#include <vcpkg/base/chrono.h>
+#include <vcpkg/base/enums.h>
+#include <vcpkg/base/optional.h>
+#include <vcpkg/base/system.h>
+#include <vcpkg/build.h>
+#include <vcpkg/commands.h>
+#include <vcpkg/dependencies.h>
+#include <vcpkg/globalstate.h>
+#include <vcpkg/help.h>
+#include <vcpkg/input.h>
+#include <vcpkg/metrics.h>
+#include <vcpkg/paragraphs.h>
+#include <vcpkg/postbuildlint.h>
+#include <vcpkg/statusparagraphs.h>
+#include <vcpkg/vcpkglib.h>
+
+using vcpkg::Build::BuildResult;
+using vcpkg::Parse::ParseControlErrorInfo;
+using vcpkg::Parse::ParseExpected;
+
+namespace vcpkg::Build::Command
+{
+    using Dependencies::InstallPlanAction;
+    using Dependencies::InstallPlanType;
+
+    static const std::string OPTION_CHECKS_ONLY = "--checks-only";
+
+    void perform_and_exit(const FullPackageSpec& full_spec,
+                          const fs::path& port_dir,
+                          const std::unordered_set<std::string>& options,
+                          const VcpkgPaths& paths)
+    {
+        const PackageSpec& spec = full_spec.package_spec;
+        if (options.find(OPTION_CHECKS_ONLY) != options.end())
+        {
+            const auto pre_build_info = Build::PreBuildInfo::from_triplet_file(paths, spec.triplet());
+            const auto build_info = Build::read_build_info(paths.get_filesystem(), paths.build_info_file_path(spec));
+            const size_t error_count = PostBuildLint::perform_all_checks(spec, paths, pre_build_info, build_info);
+            Checks::check_exit(VCPKG_LINE_INFO, error_count == 0);
+            Checks::exit_success(VCPKG_LINE_INFO);
+        }
+
+        const ParseExpected<SourceControlFile> source_control_file =
+            Paragraphs::try_load_port(paths.get_filesystem(), port_dir);
+
+        if (!source_control_file.has_value())
+        {
+            print_error_message(source_control_file.error());
+            Checks::exit_fail(VCPKG_LINE_INFO);
+        }
+
+        for (const std::string& str : full_spec.features)
+        {
+            System::println("%s \n", str);
+        }
+        const auto& scf = source_control_file.value_or_exit(VCPKG_LINE_INFO);
+        Checks::check_exit(VCPKG_LINE_INFO,
+                           spec.name() == scf->core_paragraph->name,
+                           "The Name: field inside the CONTROL does not match the port directory: '%s' != '%s'",
+                           scf->core_paragraph->name,
+                           spec.name());
+
+        const StatusParagraphs status_db = database_load_check(paths);
+        const Build::BuildPackageOptions build_package_options{Build::UseHeadVersion::NO, Build::AllowDownloads::YES};
+
+        const Build::BuildPackageConfig build_config{
+            *scf->core_paragraph, spec.triplet(), paths.port_dir(spec), build_package_options};
+
+        const auto result = Build::build_package(paths, build_config, status_db);
+        if (result.code == BuildResult::CASCADED_DUE_TO_MISSING_DEPENDENCIES)
+        {
+            System::println(System::Color::error,
+                            "The build command requires all dependencies to be already installed.");
+            System::println("The following dependencies are missing:");
+            System::println();
+            for (const auto& p : result.unmet_dependencies)
+            {
+                System::println("    %s", p);
+            }
+            System::println();
+            Checks::exit_fail(VCPKG_LINE_INFO);
+        }
+
+        if (result.code != BuildResult::SUCCEEDED)
+        {
+            System::println(System::Color::error, Build::create_error_message(result.code, spec));
+            System::println(Build::create_user_troubleshooting_message(spec));
+            Checks::exit_fail(VCPKG_LINE_INFO);
+        }
+
+        Checks::exit_success(VCPKG_LINE_INFO);
+    }
+
+    void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths, const Triplet& default_triplet)
+    {
+        static const std::string EXAMPLE = Help::create_example_string("build zlib:x64-windows");
+        // Build only takes a single package and all dependencies must already be installed
+        args.check_exact_arg_count(1, EXAMPLE);
+        const std::string command_argument = args.command_arguments.at(0);
+        const FullPackageSpec spec = Input::check_and_get_full_package_spec(command_argument, default_triplet, EXAMPLE);
+        Input::check_triplet(spec.package_spec.triplet(), paths);
+        const std::unordered_set<std::string> options =
+            args.check_and_get_optional_command_arguments({OPTION_CHECKS_ONLY});
+        perform_and_exit(spec, paths.port_dir(spec.package_spec), options, paths);
+    }
+}
 
 namespace vcpkg::Build
 {
+    static const std::string NAME_EMPTY_PACKAGE = "PolicyEmptyPackage";
+    static const std::string NAME_DLLS_WITHOUT_LIBS = "PolicyDLLsWithoutLIBs";
+    static const std::string NAME_ONLY_RELEASE_CRT = "PolicyOnlyReleaseCRT";
+    static const std::string NAME_EMPTY_INCLUDE_FOLDER = "PolicyEmptyIncludeFolder";
+    static const std::string NAME_ALLOW_OBSOLETE_MSVCRT = "PolicyAllowObsoleteMsvcrt";
+
+    const std::string& to_string(BuildPolicy policy)
+    {
+        switch (policy)
+        {
+            case BuildPolicy::EMPTY_PACKAGE: return NAME_EMPTY_PACKAGE;
+            case BuildPolicy::DLLS_WITHOUT_LIBS: return NAME_DLLS_WITHOUT_LIBS;
+            case BuildPolicy::ONLY_RELEASE_CRT: return NAME_ONLY_RELEASE_CRT;
+            case BuildPolicy::EMPTY_INCLUDE_FOLDER: return NAME_EMPTY_INCLUDE_FOLDER;
+            case BuildPolicy::ALLOW_OBSOLETE_MSVCRT: return NAME_ALLOW_OBSOLETE_MSVCRT;
+            default: Checks::unreachable(VCPKG_LINE_INFO);
+        }
+    }
+
+    CStringView to_cmake_variable(BuildPolicy policy)
+    {
+        switch (policy)
+        {
+            case BuildPolicy::EMPTY_PACKAGE: return "VCPKG_POLICY_EMPTY_PACKAGE";
+            case BuildPolicy::DLLS_WITHOUT_LIBS: return "VCPKG_POLICY_DLLS_WITHOUT_LIBS";
+            case BuildPolicy::ONLY_RELEASE_CRT: return "VCPKG_POLICY_ONLY_RELEASE_CRT";
+            case BuildPolicy::EMPTY_INCLUDE_FOLDER: return "VCPKG_POLICY_EMPTY_INCLUDE_FOLDER";
+            case BuildPolicy::ALLOW_OBSOLETE_MSVCRT: return "VCPKG_POLICY_ALLOW_OBSOLETE_MSVCRT";
+            default: Checks::unreachable(VCPKG_LINE_INFO);
+        }
+    }
+
     Optional<LinkageType> to_linkage_type(const std::string& str)
     {
         if (str == "dynamic") return LinkageType::DYNAMIC;
@@ -138,7 +265,7 @@ namespace vcpkg::Build
 
         const fs::path ports_cmake_script_path = paths.ports_cmake;
         const auto pre_build_info = PreBuildInfo::from_triplet_file(paths, triplet);
-        const Toolset& toolset = paths.get_toolset(pre_build_info.platform_toolset);
+        const Toolset& toolset = paths.get_toolset(pre_build_info.platform_toolset, pre_build_info.visual_studio_path);
         const auto cmd_set_environment = make_build_env_cmd(pre_build_info, toolset);
 
         std::string features;
@@ -174,7 +301,7 @@ namespace vcpkg::Build
 
         const std::wstring command = Strings::wformat(LR"(%s && %s)", cmd_set_environment, cmd_launch_cmake);
 
-        const ElapsedTime timer = ElapsedTime::create_started();
+        const auto timer = Chrono::ElapsedTime::create_started();
 
         const int return_code = System::cmd_execute_clean(command);
         const auto buildtimeus = timer.microseconds();
@@ -386,7 +513,15 @@ namespace vcpkg::Build
 
             if (variable_name == "VCPKG_PLATFORM_TOOLSET")
             {
-                pre_build_info.platform_toolset = variable_value;
+                pre_build_info.platform_toolset =
+                    variable_value.empty() ? nullopt : Optional<std::string>{variable_value};
+                continue;
+            }
+
+            if (variable_name == "VCPKG_VISUAL_STUDIO_PATH")
+            {
+                pre_build_info.visual_studio_path =
+                    variable_value.empty() ? nullopt : Optional<fs::path>{variable_value};
                 continue;
             }
 
diff --git a/toolsrc/src/vcpkg/commands.autocomplete.cpp b/toolsrc/src/vcpkg/commands.autocomplete.cpp
new file mode 100644
index 000000000..23c2c2f7e
--- /dev/null
+++ b/toolsrc/src/vcpkg/commands.autocomplete.cpp
@@ -0,0 +1,129 @@
+#include "pch.h"
+
+#include <vcpkg/base/system.h>
+#include <vcpkg/commands.h>
+#include <vcpkg/install.h>
+#include <vcpkg/metrics.h>
+#include <vcpkg/paragraphs.h>
+#include <vcpkg/remove.h>
+#include <vcpkg/vcpkglib.h>
+
+namespace vcpkg::Commands::Autocomplete
+{
+    std::vector<std::string> autocomplete_install(
+        const std::vector<std::unique_ptr<SourceControlFile>>& source_paragraphs, const std::string& start_with)
+    {
+        std::vector<std::string> results;
+
+        for (const auto& source_control_file : source_paragraphs)
+        {
+            auto&& sp = *source_control_file->core_paragraph;
+
+            if (Strings::case_insensitive_ascii_starts_with(sp.name, start_with))
+            {
+                results.push_back(sp.name);
+            }
+        }
+        return results;
+    }
+
+    std::vector<std::string> autocomplete_remove(std::vector<StatusParagraph*> installed_packages,
+                                                 const std::string& start_with)
+    {
+        std::vector<std::string> results;
+
+        for (const auto& installed_package : installed_packages)
+        {
+            const auto sp = installed_package->package.displayname();
+
+            if (Strings::case_insensitive_ascii_starts_with(sp, start_with))
+            {
+                results.push_back(sp);
+            }
+        }
+        return results;
+    }
+
+    [[noreturn]] static void output_sorted_results_and_exit(const LineInfo& line_info,
+                                                            std::vector<std::string>&& results)
+    {
+        const SortedVector<std::string> sorted_results(results);
+        System::println(Strings::join("\n", sorted_results));
+
+        Checks::exit_success(line_info);
+    }
+
+    void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths)
+    {
+        Metrics::g_metrics.lock()->set_send_metrics(false);
+        const std::string to_autocomplete = Strings::join(" ", args.command_arguments);
+        const std::vector<std::string> tokens = Strings::split(to_autocomplete, " ");
+
+        std::smatch match;
+
+        // Handles vcpkg <command>
+        if (std::regex_match(to_autocomplete, match, std::regex{R"###(^(\S*)$)###"}))
+        {
+            const std::string requested_command = match[1].str();
+
+            std::vector<std::string> valid_commands = {
+                "install",
+                "search",
+                "remove",
+                "list",
+                "update",
+                "hash",
+                "help",
+                "integrate",
+                "export",
+                "edit",
+                "create",
+                "owns",
+                "cache",
+                "version",
+                "contact",
+            };
+
+            Util::unstable_keep_if(valid_commands, [&](const std::string& s) {
+                return Strings::case_insensitive_ascii_starts_with(s, requested_command);
+            });
+
+            output_sorted_results_and_exit(VCPKG_LINE_INFO, std::move(valid_commands));
+        }
+
+        struct CommandEntry
+        {
+            CStringView regex;
+            const CommandStructure& structure;
+        };
+        static constexpr CommandEntry commands[] = {
+            {R"###(^install\s(.*\s|)(\S*)$)###", Install::COMMAND_STRUCTURE},
+            {R"###(^edit\s(.*\s|)(\S*)$)###", Edit::COMMAND_STRUCTURE},
+            {R"###(^remove\s(.*\s|)(\S*)$)###", Remove::COMMAND_STRUCTURE},
+        };
+
+        for (auto&& command : commands)
+        {
+            if (std::regex_match(to_autocomplete, match, std::regex{command.regex.c_str()}))
+            {
+                auto prefix = match[2].str();
+                std::vector<std::string> v;
+                if (Strings::case_insensitive_ascii_starts_with(prefix, "-"))
+                {
+                    v = Util::fmap(command.structure.switches, [](auto&& s) -> std::string { return s; });
+                }
+                else
+                {
+                    v = command.structure.valid_arguments(paths);
+                }
+
+                Util::unstable_keep_if(
+                    v, [&](const std::string& s) { return Strings::case_insensitive_ascii_starts_with(s, prefix); });
+
+                output_sorted_results_and_exit(VCPKG_LINE_INFO, std::move(v));
+            }
+        }
+
+        Checks::exit_success(VCPKG_LINE_INFO);
+    }
+}
diff --git a/toolsrc/src/commands_build_external.cpp b/toolsrc/src/vcpkg/commands.buildexternal.cpp
index 7e85f2250..3991beb62 100644
--- a/toolsrc/src/commands_build_external.cpp
+++ b/toolsrc/src/vcpkg/commands.buildexternal.cpp
@@ -1,14 +1,16 @@
 #include "pch.h"
 
-#include "vcpkg_Commands.h"
-#include "vcpkg_Input.h"
+#include <vcpkg/build.h>
+#include <vcpkg/commands.h>
+#include <vcpkg/help.h>
+#include <vcpkg/input.h>
 
 namespace vcpkg::Commands::BuildExternal
 {
     void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths, const Triplet& default_triplet)
     {
         static const std::string EXAMPLE =
-            Commands::Help::create_example_string(R"(build_external zlib2 C:\path\to\dir\with\controlfile\)");
+            Help::create_example_string(R"(build_external zlib2 C:\path\to\dir\with\controlfile\)");
         args.check_exact_arg_count(2, EXAMPLE);
         const FullPackageSpec spec =
             Input::check_and_get_full_package_spec(args.command_arguments.at(0), default_triplet, EXAMPLE);
@@ -16,6 +18,6 @@ namespace vcpkg::Commands::BuildExternal
         const std::unordered_set<std::string> options = args.check_and_get_optional_command_arguments({});
 
         const fs::path port_dir = args.command_arguments.at(1);
-        BuildCommand::perform_and_exit(spec, port_dir, options, paths);
+        Build::Command::perform_and_exit(spec, port_dir, options, paths);
     }
 }
diff --git a/toolsrc/src/commands_cache.cpp b/toolsrc/src/vcpkg/commands.cache.cpp
index 5b65b197f..77f0a20f6 100644
--- a/toolsrc/src/commands_cache.cpp
+++ b/toolsrc/src/vcpkg/commands.cache.cpp
@@ -1,10 +1,11 @@
 #include "pch.h"
 
-#include "BinaryParagraph.h"
-#include "Paragraphs.h"
-#include "vcpkg_Commands.h"
-#include "vcpkg_Files.h"
-#include "vcpkg_System.h"
+#include <vcpkg/base/files.h>
+#include <vcpkg/base/system.h>
+#include <vcpkg/binaryparagraph.h>
+#include <vcpkg/commands.h>
+#include <vcpkg/help.h>
+#include <vcpkg/paragraphs.h>
 
 namespace vcpkg::Commands::Cache
 {
@@ -29,7 +30,7 @@ namespace vcpkg::Commands::Cache
     {
         static const std::string EXAMPLE = Strings::format(
             "The argument should be a substring to search for, or no argument to display all cached libraries.\n%s",
-            Commands::Help::create_example_string("cache png"));
+            Help::create_example_string("cache png"));
         args.check_max_arg_count(1, EXAMPLE);
         args.check_and_get_optional_command_arguments({});
 
diff --git a/toolsrc/src/commands_ci.cpp b/toolsrc/src/vcpkg/commands.ci.cpp
index 75ff65556..1c98d1d83 100644
--- a/toolsrc/src/commands_ci.cpp
+++ b/toolsrc/src/vcpkg/commands.ci.cpp
@@ -1,15 +1,17 @@
 #include "pch.h"
 
-#include "Paragraphs.h"
-#include "vcpkg_Build.h"
-#include "vcpkg_Chrono.h"
-#include "vcpkg_Commands.h"
-#include "vcpkg_Dependencies.h"
-#include "vcpkg_Files.h"
-#include "vcpkg_Input.h"
-#include "vcpkg_System.h"
-#include "vcpkg_Util.h"
-#include "vcpkglib.h"
+#include <vcpkg/base/chrono.h>
+#include <vcpkg/base/files.h>
+#include <vcpkg/base/system.h>
+#include <vcpkg/base/util.h>
+#include <vcpkg/build.h>
+#include <vcpkg/commands.h>
+#include <vcpkg/dependencies.h>
+#include <vcpkg/help.h>
+#include <vcpkg/input.h>
+#include <vcpkg/install.h>
+#include <vcpkg/paragraphs.h>
+#include <vcpkg/vcpkglib.h>
 
 namespace vcpkg::Commands::CI
 {
@@ -30,7 +32,7 @@ namespace vcpkg::Commands::CI
 
     void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths, const Triplet& default_triplet)
     {
-        static const std::string EXAMPLE = Commands::Help::create_example_string("ci x64-windows");
+        static const std::string EXAMPLE = Help::create_example_string("ci x64-windows");
         args.check_max_arg_count(1, EXAMPLE);
         const Triplet triplet = args.command_arguments.size() == 1
                                     ? Triplet::from_canonical_name(args.command_arguments.at(0))
@@ -52,7 +54,7 @@ namespace vcpkg::Commands::CI
                 return Dependencies::AnyAction(std::move(install_action));
             });
 
-        Install::perform_and_exit(
+        Install::perform_and_exit_ex(
             action_plan, install_plan_options, Install::KeepGoing::YES, Install::PrintSummary::YES, paths, status_db);
 
         Checks::exit_success(VCPKG_LINE_INFO);
diff --git a/toolsrc/src/commands_contact.cpp b/toolsrc/src/vcpkg/commands.contact.cpp
index 8374350ee..421b8a230 100644
--- a/toolsrc/src/commands_contact.cpp
+++ b/toolsrc/src/vcpkg/commands.contact.cpp
@@ -1,7 +1,7 @@
 #include "pch.h"
 
-#include "vcpkg_Commands.h"
-#include "vcpkg_System.h"
+#include <vcpkg/base/system.h>
+#include <vcpkg/commands.h>
 
 namespace vcpkg::Commands::Contact
 {
diff --git a/toolsrc/src/commands_available_commands.cpp b/toolsrc/src/vcpkg/commands.cpp
index 87cc43dca..9d969ea28 100644
--- a/toolsrc/src/commands_available_commands.cpp
+++ b/toolsrc/src/vcpkg/commands.cpp
@@ -1,16 +1,22 @@
 #include "pch.h"
 
-#include "vcpkg_Commands.h"
+#include <vcpkg/build.h>
+#include <vcpkg/commands.h>
+#include <vcpkg/export.h>
+#include <vcpkg/help.h>
+#include <vcpkg/install.h>
+#include <vcpkg/remove.h>
+#include <vcpkg/update.h>
 
 namespace vcpkg::Commands
 {
-    const std::vector<PackageNameAndFunction<CommandTypeA>>& get_available_commands_type_a()
+    Span<const PackageNameAndFunction<CommandTypeA>> get_available_commands_type_a()
     {
         static std::vector<PackageNameAndFunction<CommandTypeA>> t = {
             {"install", &Install::perform_and_exit},
             {"ci", &CI::perform_and_exit},
             {"remove", &Remove::perform_and_exit},
-            {"build", &BuildCommand::perform_and_exit},
+            {"build", &Build::Command::perform_and_exit},
             {"env", &Env::perform_and_exit},
             {"build-external", &BuildExternal::perform_and_exit},
             {"export", &Export::perform_and_exit},
@@ -18,7 +24,7 @@ namespace vcpkg::Commands
         return t;
     }
 
-    const std::vector<PackageNameAndFunction<CommandTypeB>>& get_available_commands_type_b()
+    Span<const PackageNameAndFunction<CommandTypeB>> get_available_commands_type_b()
     {
         static std::vector<PackageNameAndFunction<CommandTypeB>> t = {
             {"/?", &Help::perform_and_exit},
@@ -34,11 +40,11 @@ namespace vcpkg::Commands
             {"import", &Import::perform_and_exit},
             {"cache", &Cache::perform_and_exit},
             {"portsdiff", &PortsDiff::perform_and_exit},
-        };
+            {"autocomplete", &Autocomplete::perform_and_exit}};
         return t;
     }
 
-    const std::vector<PackageNameAndFunction<CommandTypeC>>& get_available_commands_type_c()
+    Span<const PackageNameAndFunction<CommandTypeC>> get_available_commands_type_c()
     {
         static std::vector<PackageNameAndFunction<CommandTypeC>> t = {
             {"version", &Version::perform_and_exit},
diff --git a/toolsrc/src/commands_create.cpp b/toolsrc/src/vcpkg/commands.create.cpp
index 6898f7399..d923cf555 100644
--- a/toolsrc/src/commands_create.cpp
+++ b/toolsrc/src/vcpkg/commands.create.cpp
@@ -1,15 +1,16 @@
 #include "pch.h"
 
-#include "vcpkg_Commands.h"
-#include "vcpkg_Files.h"
-#include "vcpkg_System.h"
-#include "vcpkglib.h"
+#include <vcpkg/base/files.h>
+#include <vcpkg/base/system.h>
+#include <vcpkg/commands.h>
+#include <vcpkg/help.h>
+#include <vcpkg/vcpkglib.h>
 
 namespace vcpkg::Commands::Create
 {
     void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths)
     {
-        static const std::string EXAMPLE = Commands::Help::create_example_string(
+        static const std::string EXAMPLE = Help::create_example_string(
             R"###(create zlib2 http://zlib.net/zlib1211.zip "zlib1211-2.zip")###");
         args.check_max_arg_count(3, EXAMPLE);
         args.check_min_arg_count(2, EXAMPLE);
diff --git a/toolsrc/src/commands_depends.cpp b/toolsrc/src/vcpkg/commands.dependinfo.cpp
index 17cd9c881..89c7e0c7f 100644
--- a/toolsrc/src/commands_depends.cpp
+++ b/toolsrc/src/vcpkg/commands.dependinfo.cpp
@@ -1,16 +1,17 @@
 #include "pch.h"
 
-#include "Paragraphs.h"
-#include "vcpkg_Commands.h"
-#include "vcpkg_Strings.h"
-#include "vcpkg_System.h"
-#include "vcpkg_Util.h"
+#include <vcpkg/base/strings.h>
+#include <vcpkg/base/system.h>
+#include <vcpkg/base/util.h>
+#include <vcpkg/commands.h>
+#include <vcpkg/help.h>
+#include <vcpkg/paragraphs.h>
 
 namespace vcpkg::Commands::DependInfo
 {
     void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths)
     {
-        static const std::string EXAMPLE = Commands::Help::create_example_string(R"###(depend-info [pat])###");
+        static const std::string EXAMPLE = Help::create_example_string(R"###(depend-info [pat])###");
         args.check_max_arg_count(1, EXAMPLE);
         args.check_and_get_optional_command_arguments({});
 
diff --git a/toolsrc/src/commands_edit.cpp b/toolsrc/src/vcpkg/commands.edit.cpp
index 823c87534..a90ae1bc3 100644
--- a/toolsrc/src/commands_edit.cpp
+++ b/toolsrc/src/vcpkg/commands.edit.cpp
@@ -1,8 +1,10 @@
 #include "pch.h"
 
-#include "vcpkg_Commands.h"
-#include "vcpkg_Input.h"
-#include "vcpkg_System.h"
+#include <vcpkg/base/system.h>
+#include <vcpkg/commands.h>
+#include <vcpkg/help.h>
+#include <vcpkg/input.h>
+#include <vcpkg/paragraphs.h>
 
 namespace vcpkg::Commands::Edit
 {
@@ -29,16 +31,38 @@ namespace vcpkg::Commands::Edit
         return output;
     }
 
-    void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths)
+    static const std::string OPTION_BUILDTREES = "--buildtrees";
+
+    static const std::array<std::string, 1> SWITCHES = {
+        OPTION_BUILDTREES,
+    };
+    static const std::array<std::string, 0> SETTINGS;
+
+    static std::vector<std::string> valid_arguments(const VcpkgPaths& paths)
     {
-        static const std::string OPTION_BUILDTREES = "--buildtrees";
+        auto sources_and_errors = Paragraphs::try_load_all_ports(paths.get_filesystem(), paths.ports);
+
+        return Util::fmap(sources_and_errors.paragraphs,
+                          [](auto&& pgh) -> std::string { return pgh->core_paragraph->name; });
+    }
+
+    const CommandStructure COMMAND_STRUCTURE = {
+        "edit zlib",
+        1,
+        1,
+        SWITCHES,
+        SETTINGS,
+        &valid_arguments,
+    };
 
+    void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths)
+    {
         static const fs::path VS_CODE_INSIDERS = fs::path{"Microsoft VS Code Insiders"} / "Code - Insiders.exe";
         static const fs::path VS_CODE = fs::path{"Microsoft VS Code"} / "Code.exe";
 
         auto& fs = paths.get_filesystem();
 
-        static const std::string EXAMPLE = Commands::Help::create_example_string("edit zlib");
+        static const std::string EXAMPLE = Help::create_example_string("edit zlib");
         args.check_exact_arg_count(1, EXAMPLE);
         const std::unordered_set<std::string> options =
             args.check_and_get_optional_command_arguments({OPTION_BUILDTREES});
diff --git a/toolsrc/src/commands_env.cpp b/toolsrc/src/vcpkg/commands.env.cpp
index 073c501f5..089881588 100644
--- a/toolsrc/src/commands_env.cpp
+++ b/toolsrc/src/vcpkg/commands.env.cpp
@@ -1,20 +1,21 @@
 #include "pch.h"
 
-#include "vcpkg_Build.h"
-#include "vcpkg_Commands.h"
-#include "vcpkg_System.h"
+#include <vcpkg/base/system.h>
+#include <vcpkg/build.h>
+#include <vcpkg/commands.h>
+#include <vcpkg/help.h>
 
 namespace vcpkg::Commands::Env
 {
     void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths, const Triplet& default_triplet)
     {
-        static const std::string EXAMPLE = Commands::Help::create_example_string(R"(env --Triplet x64-windows)");
+        static const std::string EXAMPLE = Help::create_example_string(R"(env --triplet x64-windows)");
         args.check_exact_arg_count(0, EXAMPLE);
         args.check_and_get_optional_command_arguments({});
 
         const auto pre_build_info = Build::PreBuildInfo::from_triplet_file(paths, default_triplet);
-        System::cmd_execute_clean(
-            Build::make_build_env_cmd(pre_build_info, paths.get_toolset(pre_build_info.platform_toolset)) + L" && cmd");
+        const Toolset& toolset = paths.get_toolset(pre_build_info.platform_toolset, pre_build_info.visual_studio_path);
+        System::cmd_execute_clean(Build::make_build_env_cmd(pre_build_info, toolset) + L" && cmd");
 
         Checks::exit_success(VCPKG_LINE_INFO);
     }
diff --git a/toolsrc/src/vcpkg/commands.exportifw.cpp b/toolsrc/src/vcpkg/commands.exportifw.cpp
new file mode 100644
index 000000000..fbf3beb8c
--- /dev/null
+++ b/toolsrc/src/vcpkg/commands.exportifw.cpp
@@ -0,0 +1,490 @@
+#include "pch.h"
+
+#include <vcpkg/commands.h>
+#include <vcpkg/export.h>
+#include <vcpkg/export.ifw.h>
+#include <vcpkg/install.h>
+
+namespace vcpkg::Export::IFW
+{
+    using Dependencies::ExportPlanAction;
+    using Dependencies::ExportPlanType;
+    using Install::InstallDir;
+
+    static std::string create_release_date()
+    {
+        const tm date_time = System::get_current_date_time();
+
+        // Format is: YYYY-mm-dd
+        // 10 characters + 1 null terminating character will be written for a total of 11 chars
+        char mbstr[11];
+        const size_t bytes_written = std::strftime(mbstr, sizeof(mbstr), "%Y-%m-%d", &date_time);
+        Checks::check_exit(VCPKG_LINE_INFO,
+                           bytes_written == 10,
+                           "Expected 10 bytes to be written, but %u were written",
+                           bytes_written);
+        const std::string date_time_as_string(mbstr);
+        return date_time_as_string;
+    }
+
+    std::string safe_rich_from_plain_text(const std::string& text)
+    {
+        // match standalone ampersand, no HTML number or name
+        std::regex standalone_ampersand(R"###(&(?!(#[0-9]+|\w+);))###");
+
+        return std::regex_replace(text, standalone_ampersand, "&amp;");
+    }
+
+    fs::path get_packages_dir_path(const std::string& export_id, const Options& ifw_options, const VcpkgPaths& paths)
+    {
+        return ifw_options.maybe_packages_dir_path.has_value()
+                   ? fs::path(ifw_options.maybe_packages_dir_path.value_or_exit(VCPKG_LINE_INFO))
+                   : paths.root / (export_id + "-ifw-packages");
+    }
+
+    fs::path get_repository_dir_path(const std::string& export_id, const Options& ifw_options, const VcpkgPaths& paths)
+    {
+        return ifw_options.maybe_repository_dir_path.has_value()
+                   ? fs::path(ifw_options.maybe_repository_dir_path.value_or_exit(VCPKG_LINE_INFO))
+                   : paths.root / (export_id + "-ifw-repository");
+    }
+
+    fs::path get_config_file_path(const std::string& export_id, const Options& ifw_options, const VcpkgPaths& paths)
+    {
+        return ifw_options.maybe_config_file_path.has_value()
+                   ? fs::path(ifw_options.maybe_config_file_path.value_or_exit(VCPKG_LINE_INFO))
+                   : paths.root / (export_id + "-ifw-configuration.xml");
+    }
+
+    fs::path get_installer_file_path(const std::string& export_id, const Options& ifw_options, const VcpkgPaths& paths)
+    {
+        return ifw_options.maybe_installer_file_path.has_value()
+                   ? fs::path(ifw_options.maybe_installer_file_path.value_or_exit(VCPKG_LINE_INFO))
+                   : paths.root / (export_id + "-ifw-installer.exe");
+    }
+
+    fs::path export_real_package(const fs::path& ifw_packages_dir_path,
+                                 const ExportPlanAction& action,
+                                 Files::Filesystem& fs)
+    {
+        std::error_code ec;
+
+        const BinaryParagraph& binary_paragraph =
+            action.any_paragraph.binary_control_file.value_or_exit(VCPKG_LINE_INFO).core_paragraph;
+
+        // Prepare meta dir
+        const fs::path package_xml_file_path =
+            ifw_packages_dir_path /
+            Strings::format("packages.%s.%s", action.spec.name(), action.spec.triplet().canonical_name()) / "meta" /
+            "package.xml";
+        const fs::path package_xml_dir_path = package_xml_file_path.parent_path();
+        fs.create_directories(package_xml_dir_path, ec);
+        Checks::check_exit(VCPKG_LINE_INFO,
+                           !ec,
+                           "Could not create directory for package file %s",
+                           package_xml_file_path.generic_string());
+
+        auto deps = Strings::join(
+            ",", binary_paragraph.depends, [](const std::string& dep) { return "packages." + dep + ":"; });
+
+        if (!deps.empty()) deps = "\n    <Dependencies>" + deps + "</Dependencies>";
+
+        fs.write_contents(package_xml_file_path,
+                          Strings::format(
+                              R"###(<?xml version="1.0"?>
+<Package>
+    <DisplayName>%s</DisplayName>
+    <Version>%s</Version>
+    <ReleaseDate>%s</ReleaseDate>
+    <AutoDependOn>packages.%s:,triplets.%s:</AutoDependOn>%s
+    <Virtual>true</Virtual>
+</Package>
+)###",
+                              action.spec.to_string(),
+                              binary_paragraph.version,
+                              create_release_date(),
+                              action.spec.name(),
+                              action.spec.triplet().canonical_name(),
+                              deps));
+
+        // Return dir path for export package data
+        return ifw_packages_dir_path /
+               Strings::format("packages.%s.%s", action.spec.name(), action.spec.triplet().canonical_name()) / "data" /
+               "installed";
+    }
+
+    void export_unique_packages(const fs::path& raw_exported_dir_path,
+                                std::map<std::string, const ExportPlanAction*> unique_packages,
+                                Files::Filesystem& fs)
+    {
+        std::error_code ec;
+
+        // packages
+
+        fs::path package_xml_file_path = raw_exported_dir_path / "packages" / "meta" / "package.xml";
+        fs::path package_xml_dir_path = package_xml_file_path.parent_path();
+        fs.create_directories(package_xml_dir_path, ec);
+        Checks::check_exit(VCPKG_LINE_INFO,
+                           !ec,
+                           "Could not create directory for package file %s",
+                           package_xml_file_path.generic_string());
+        fs.write_contents(package_xml_file_path,
+                          Strings::format(
+                              R"###(<?xml version="1.0"?>
+<Package>
+    <DisplayName>Packages</DisplayName>
+    <Version>1.0.0</Version>
+    <ReleaseDate>%s</ReleaseDate>
+</Package>
+)###",
+                              create_release_date()));
+
+        for (auto package = unique_packages.begin(); package != unique_packages.end(); ++package)
+        {
+            const ExportPlanAction& action = *(package->second);
+            const BinaryParagraph& binary_paragraph =
+                action.any_paragraph.binary_control_file.value_or_exit(VCPKG_LINE_INFO).core_paragraph;
+
+            package_xml_file_path =
+                raw_exported_dir_path / Strings::format("packages.%s", package->first) / "meta" / "package.xml";
+            package_xml_dir_path = package_xml_file_path.parent_path();
+            fs.create_directories(package_xml_dir_path, ec);
+            Checks::check_exit(VCPKG_LINE_INFO,
+                               !ec,
+                               "Could not create directory for package file %s",
+                               package_xml_file_path.generic_string());
+
+            fs.write_contents(package_xml_file_path,
+                              Strings::format(
+                                  R"###(<?xml version="1.0"?>
+<Package>
+    <DisplayName>%s</DisplayName>
+    <Description>%s</Description>
+    <Version>%s</Version>
+    <ReleaseDate>%s</ReleaseDate>
+</Package>
+)###",
+                                  action.spec.name(),
+                                  safe_rich_from_plain_text(binary_paragraph.description),
+                                  binary_paragraph.version,
+                                  create_release_date()));
+        }
+    }
+
+    void export_unique_triplets(const fs::path& raw_exported_dir_path,
+                                std::set<std::string> unique_triplets,
+                                Files::Filesystem& fs)
+    {
+        std::error_code ec;
+
+        // triplets
+
+        fs::path package_xml_file_path = raw_exported_dir_path / "triplets" / "meta" / "package.xml";
+        fs::path package_xml_dir_path = package_xml_file_path.parent_path();
+        fs.create_directories(package_xml_dir_path, ec);
+        Checks::check_exit(VCPKG_LINE_INFO,
+                           !ec,
+                           "Could not create directory for package file %s",
+                           package_xml_file_path.generic_string());
+        fs.write_contents(package_xml_file_path,
+                          Strings::format(
+                              R"###(<?xml version="1.0"?>
+<Package>
+    <DisplayName>Triplets</DisplayName>
+    <Version>1.0.0</Version>
+    <ReleaseDate>%s</ReleaseDate>
+</Package>
+)###",
+                              create_release_date()));
+
+        for (const std::string& triplet : unique_triplets)
+        {
+            package_xml_file_path =
+                raw_exported_dir_path / Strings::format("triplets.%s", triplet) / "meta" / "package.xml";
+            package_xml_dir_path = package_xml_file_path.parent_path();
+            fs.create_directories(package_xml_dir_path, ec);
+            Checks::check_exit(VCPKG_LINE_INFO,
+                               !ec,
+                               "Could not create directory for package file %s",
+                               package_xml_file_path.generic_string());
+            fs.write_contents(package_xml_file_path,
+                              Strings::format(
+                                  R"###(<?xml version="1.0"?>
+<Package>
+    <DisplayName>%s</DisplayName>
+    <Version>1.0.0</Version>
+    <ReleaseDate>%s</ReleaseDate>
+</Package>
+)###",
+                                  triplet,
+                                  create_release_date()));
+        }
+    }
+
+    void export_integration(const fs::path& raw_exported_dir_path, Files::Filesystem& fs)
+    {
+        std::error_code ec;
+
+        // integration
+        fs::path package_xml_file_path = raw_exported_dir_path / "integration" / "meta" / "package.xml";
+        fs::path package_xml_dir_path = package_xml_file_path.parent_path();
+        fs.create_directories(package_xml_dir_path, ec);
+        Checks::check_exit(VCPKG_LINE_INFO,
+                           !ec,
+                           "Could not create directory for package file %s",
+                           package_xml_file_path.generic_string());
+
+        fs.write_contents(package_xml_file_path,
+                          Strings::format(
+                              R"###(<?xml version="1.0"?>
+<Package>
+    <DisplayName>Integration</DisplayName>
+    <Version>1.0.0</Version>
+    <ReleaseDate>%s</ReleaseDate>
+</Package>
+)###",
+                              create_release_date()));
+    }
+
+    void export_config(const std::string& export_id, const Options& ifw_options, const VcpkgPaths& paths)
+    {
+        std::error_code ec;
+        Files::Filesystem& fs = paths.get_filesystem();
+
+        const fs::path config_xml_file_path = get_config_file_path(export_id, ifw_options, paths);
+
+        fs::path config_xml_dir_path = config_xml_file_path.parent_path();
+        fs.create_directories(config_xml_dir_path, ec);
+        Checks::check_exit(VCPKG_LINE_INFO,
+                           !ec,
+                           "Could not create directory for configuration file %s",
+                           config_xml_file_path.generic_string());
+
+        std::string formatted_repo_url;
+        std::string ifw_repo_url = ifw_options.maybe_repository_url.value_or("");
+        if (!ifw_repo_url.empty())
+        {
+            formatted_repo_url = Strings::format(R"###(
+    <RemoteRepositories>
+        <Repository>
+            <Url>%s</Url>
+        </Repository>
+    </RemoteRepositories>)###",
+                                                 ifw_repo_url);
+        }
+
+        fs.write_contents(config_xml_file_path,
+                          Strings::format(
+                              R"###(<?xml version="1.0"?>
+<Installer>
+    <Name>vcpkg</Name>
+    <Version>1.0.0</Version>
+    <StartMenuDir>vcpkg</StartMenuDir>
+    <TargetDir>@RootDir@/src/vcpkg</TargetDir>%s
+</Installer>
+)###",
+                              formatted_repo_url));
+    }
+
+    void export_maintenance_tool(const fs::path& ifw_packages_dir_path, const VcpkgPaths& paths)
+    {
+        System::println("Exporting maintenance tool... ");
+
+        std::error_code ec;
+        Files::Filesystem& fs = paths.get_filesystem();
+
+        const fs::path& installerbase_exe = paths.get_ifw_installerbase_exe();
+        fs::path tempmaintenancetool = ifw_packages_dir_path / "maintenance" / "data" / "tempmaintenancetool.exe";
+        fs.create_directories(tempmaintenancetool.parent_path(), ec);
+        Checks::check_exit(VCPKG_LINE_INFO,
+                           !ec,
+                           "Could not create directory for package file %s",
+                           tempmaintenancetool.generic_string());
+        fs.copy_file(installerbase_exe, tempmaintenancetool, fs::copy_options::overwrite_existing, ec);
+        Checks::check_exit(
+            VCPKG_LINE_INFO, !ec, "Could not write package file %s", tempmaintenancetool.generic_string());
+
+        fs::path package_xml_file_path = ifw_packages_dir_path / "maintenance" / "meta" / "package.xml";
+        fs::path package_xml_dir_path = package_xml_file_path.parent_path();
+        fs.create_directories(package_xml_dir_path, ec);
+        Checks::check_exit(VCPKG_LINE_INFO,
+                           !ec,
+                           "Could not create directory for package file %s",
+                           package_xml_file_path.generic_string());
+        fs.write_contents(package_xml_file_path,
+                          Strings::format(
+                              R"###(<?xml version="1.0"?>
+<Package>
+    <DisplayName>Maintenance Tool</DisplayName>
+    <Description>Maintenance Tool</Description>
+    <Version>1.0.0</Version>
+    <ReleaseDate>%s</ReleaseDate>
+    <Script>maintenance.qs</Script>
+    <Essential>true</Essential>
+    <Virtual>true</Virtual>
+    <ForcedInstallation>true</ForcedInstallation>
+</Package>
+)###",
+                              create_release_date()));
+        const fs::path script_source = paths.root / "scripts" / "ifw" / "maintenance.qs";
+        const fs::path script_destination = ifw_packages_dir_path / "maintenance" / "meta" / "maintenance.qs";
+        fs.copy_file(script_source, script_destination, fs::copy_options::overwrite_existing, ec);
+        Checks::check_exit(
+            VCPKG_LINE_INFO, !ec, "Could not write package file %s", script_destination.generic_string());
+
+        System::println("Exporting maintenance tool... done");
+    }
+
+    void do_repository(const std::string& export_id, const Options& ifw_options, const VcpkgPaths& paths)
+    {
+        const fs::path& repogen_exe = paths.get_ifw_repogen_exe();
+        const fs::path packages_dir = get_packages_dir_path(export_id, ifw_options, paths);
+        const fs::path repository_dir = get_repository_dir_path(export_id, ifw_options, paths);
+
+        System::println("Generating repository %s...", repository_dir.generic_string());
+
+        std::error_code ec;
+        Files::Filesystem& fs = paths.get_filesystem();
+
+        fs.remove_all(repository_dir, ec);
+        Checks::check_exit(
+            VCPKG_LINE_INFO, !ec, "Could not remove outdated repository directory %s", repository_dir.generic_string());
+
+        const std::wstring cmd_line = Strings::wformat(LR"("%s" --packages "%s" "%s" > nul)",
+                                                       repogen_exe.native(),
+                                                       packages_dir.native(),
+                                                       repository_dir.native());
+
+        const int exit_code = System::cmd_execute_clean(cmd_line);
+        Checks::check_exit(VCPKG_LINE_INFO, exit_code == 0, "Error: IFW repository generating failed");
+
+        System::println(System::Color::success, "Generating repository %s... done.", repository_dir.generic_string());
+    }
+
+    void do_installer(const std::string& export_id, const Options& ifw_options, const VcpkgPaths& paths)
+    {
+        const fs::path& binarycreator_exe = paths.get_ifw_binarycreator_exe();
+        const fs::path config_file = get_config_file_path(export_id, ifw_options, paths);
+        const fs::path packages_dir = get_packages_dir_path(export_id, ifw_options, paths);
+        const fs::path repository_dir = get_repository_dir_path(export_id, ifw_options, paths);
+        const fs::path installer_file = get_installer_file_path(export_id, ifw_options, paths);
+
+        System::println("Generating installer %s...", installer_file.generic_string());
+
+        std::wstring cmd_line;
+
+        std::string ifw_repo_url = ifw_options.maybe_repository_url.value_or("");
+        if (!ifw_repo_url.empty())
+        {
+            cmd_line = Strings::wformat(LR"("%s" --online-only --config "%s" --repository "%s" "%s" > nul)",
+                                        binarycreator_exe.native(),
+                                        config_file.native(),
+                                        repository_dir.native(),
+                                        installer_file.native());
+        }
+        else
+        {
+            cmd_line = Strings::wformat(LR"("%s" --config "%s" --packages "%s" "%s" > nul)",
+                                        binarycreator_exe.native(),
+                                        config_file.native(),
+                                        packages_dir.native(),
+                                        installer_file.native());
+        }
+
+        const int exit_code = System::cmd_execute_clean(cmd_line);
+        Checks::check_exit(VCPKG_LINE_INFO, exit_code == 0, "Error: IFW installer generating failed");
+
+        System::println(System::Color::success, "Generating installer %s... done.", installer_file.generic_string());
+    }
+
+    void do_export(const std::vector<ExportPlanAction>& export_plan,
+                   const std::string& export_id,
+                   const Options& ifw_options,
+                   const VcpkgPaths& paths)
+    {
+        std::error_code ec;
+        Files::Filesystem& fs = paths.get_filesystem();
+
+        // Prepare packages directory
+        const fs::path ifw_packages_dir_path = get_packages_dir_path(export_id, ifw_options, paths);
+
+        fs.remove_all(ifw_packages_dir_path, ec);
+        Checks::check_exit(VCPKG_LINE_INFO,
+                           !ec,
+                           "Could not remove outdated packages directory %s",
+                           ifw_packages_dir_path.generic_string());
+
+        fs.create_directory(ifw_packages_dir_path, ec);
+        Checks::check_exit(
+            VCPKG_LINE_INFO, !ec, "Could not create packages directory %s", ifw_packages_dir_path.generic_string());
+
+        // Export maintenance tool
+        export_maintenance_tool(ifw_packages_dir_path, paths);
+
+        System::println("Exporting packages %s... ", ifw_packages_dir_path.generic_string());
+
+        // execute the plan
+        std::map<std::string, const ExportPlanAction*> unique_packages;
+        std::set<std::string> unique_triplets;
+        for (const ExportPlanAction& action : export_plan)
+        {
+            if (action.plan_type != ExportPlanType::ALREADY_BUILT)
+            {
+                Checks::unreachable(VCPKG_LINE_INFO);
+            }
+
+            const std::string display_name = action.spec.to_string();
+            System::println("Exporting package %s... ", display_name);
+
+            const BinaryParagraph& binary_paragraph =
+                action.any_paragraph.binary_control_file.value_or_exit(VCPKG_LINE_INFO).core_paragraph;
+
+            unique_packages[action.spec.name()] = &action;
+            unique_triplets.insert(action.spec.triplet().canonical_name());
+
+            // Export real package and return data dir for installation
+            fs::path ifw_package_dir_path = export_real_package(ifw_packages_dir_path, action, fs);
+
+            // Copy package data
+            const InstallDir dirs = InstallDir::from_destination_root(ifw_package_dir_path,
+                                                                      action.spec.triplet().to_string(),
+                                                                      ifw_package_dir_path / "vcpkg" / "info" /
+                                                                          (binary_paragraph.fullstem() + ".list"));
+
+            Install::install_files_and_write_listfile(paths.get_filesystem(), paths.package_dir(action.spec), dirs);
+            System::println("Exporting package %s... done", display_name);
+        }
+
+        System::println("Exporting packages %s... done", ifw_packages_dir_path.generic_string());
+
+        const fs::path config_file = get_config_file_path(export_id, ifw_options, paths);
+
+        System::println("Generating configuration %s...", config_file.generic_string());
+
+        // Unique packages
+        export_unique_packages(ifw_packages_dir_path, unique_packages, fs);
+
+        // Unique triplets
+        export_unique_triplets(ifw_packages_dir_path, unique_triplets, fs);
+
+        // Copy files needed for integration
+        export_integration_files(ifw_packages_dir_path / "integration" / "data", paths);
+        // Integration
+        export_integration(ifw_packages_dir_path, fs);
+
+        // Configuration
+        export_config(export_id, ifw_options, paths);
+
+        System::println("Generating configuration %s... done.", config_file.generic_string());
+
+        // Do repository (optional)
+        std::string ifw_repo_url = ifw_options.maybe_repository_url.value_or("");
+        if (!ifw_repo_url.empty())
+        {
+            do_repository(export_id, ifw_options, paths);
+        }
+
+        // Do installer
+        do_installer(export_id, ifw_options, paths);
+    }
+}
diff --git a/toolsrc/src/commands_hash.cpp b/toolsrc/src/vcpkg/commands.hash.cpp
index b3211b9f8..394a02e23 100644
--- a/toolsrc/src/commands_hash.cpp
+++ b/toolsrc/src/vcpkg/commands.hash.cpp
@@ -1,8 +1,9 @@
 #include "pch.h"
 
-#include "vcpkg_Commands.h"
-#include "vcpkg_System.h"
-#include "vcpkg_Util.h"
+#include <vcpkg/base/system.h>
+#include <vcpkg/base/util.h>
+#include <vcpkg/commands.h>
+#include <vcpkg/help.h>
 
 namespace vcpkg::Commands::Hash
 {
@@ -34,9 +35,8 @@ namespace vcpkg::Commands::Hash
 
     void perform_and_exit(const VcpkgCmdArguments& args)
     {
-        static const std::string EXAMPLE =
-            Strings::format("The argument should be a file path\n%s",
-                            Commands::Help::create_example_string("hash boost_1_62_0.tar.bz2"));
+        static const std::string EXAMPLE = Strings::format("The argument should be a file path\n%s",
+                                                           Help::create_example_string("hash boost_1_62_0.tar.bz2"));
         args.check_min_arg_count(1, EXAMPLE);
         args.check_max_arg_count(2, EXAMPLE);
         args.check_and_get_optional_command_arguments({});
diff --git a/toolsrc/src/commands_import.cpp b/toolsrc/src/vcpkg/commands.import.cpp
index 412a03d7f..119aee022 100644
--- a/toolsrc/src/commands_import.cpp
+++ b/toolsrc/src/vcpkg/commands.import.cpp
@@ -1,9 +1,10 @@
 #include "pch.h"
 
-#include "Paragraphs.h"
-#include "StatusParagraph.h"
-#include "vcpkg_Commands.h"
-#include "vcpkg_Files.h"
+#include <vcpkg/base/files.h>
+#include <vcpkg/commands.h>
+#include <vcpkg/help.h>
+#include <vcpkg/paragraphs.h>
+#include <vcpkg/statusparagraph.h>
 
 namespace vcpkg::Commands::Import
 {
@@ -93,7 +94,7 @@ namespace vcpkg::Commands::Import
 
     void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths)
     {
-        static const std::string EXAMPLE = Commands::Help::create_example_string(
+        static const std::string EXAMPLE = Help::create_example_string(
             R"(import C:\path\to\CONTROLfile C:\path\to\includedir C:\path\to\projectdir)");
         args.check_exact_arg_count(3, EXAMPLE);
         args.check_and_get_optional_command_arguments({});
diff --git a/toolsrc/src/commands_integrate.cpp b/toolsrc/src/vcpkg/commands.integrate.cpp
index fd2f11294..85b567adb 100644
--- a/toolsrc/src/commands_integrate.cpp
+++ b/toolsrc/src/vcpkg/commands.integrate.cpp
@@ -1,10 +1,10 @@
 #include "pch.h"
 
-#include "vcpkg_Checks.h"
-#include "vcpkg_Commands.h"
-#include "vcpkg_Files.h"
-#include "vcpkg_System.h"
-#include "vcpkg_Util.h"
+#include <vcpkg/base/checks.h>
+#include <vcpkg/base/files.h>
+#include <vcpkg/base/system.h>
+#include <vcpkg/base/util.h>
+#include <vcpkg/commands.h>
 
 namespace vcpkg::Commands::Integrate
 {
@@ -230,13 +230,14 @@ namespace vcpkg::Commands::Integrate
         }
         System::println(System::Color::success, "Applied user-wide integration for this vcpkg root.");
         const fs::path cmake_toolchain = paths.buildsystems / "vcpkg.cmake";
-        System::println("\n"
-                        "All MSBuild C++ projects can now #include any installed libraries.\n"
-                        "Linking will be handled automatically.\n"
-                        "Installing new libraries will make them instantly available.\n"
-                        "\n"
-                        "CMake projects should use -DCMAKE_TOOLCHAIN_FILE=%s",
-                        cmake_toolchain.generic_string());
+        System::println(
+            R"(
+All MSBuild C++ projects can now #include any installed libraries.
+Linking will be handled automatically.
+Installing new libraries will make them instantly available.
+
+CMake projects should use: "-DCMAKE_TOOLCHAIN_FILE=%s")",
+            cmake_toolchain.generic_string());
 
         Checks::exit_success(VCPKG_LINE_INFO);
     }
diff --git a/toolsrc/src/commands_list.cpp b/toolsrc/src/vcpkg/commands.list.cpp
index 640885860..d0e8e00b4 100644
--- a/toolsrc/src/commands_list.cpp
+++ b/toolsrc/src/vcpkg/commands.list.cpp
@@ -1,8 +1,9 @@
 #include "pch.h"
 
-#include "vcpkg_Commands.h"
-#include "vcpkg_System.h"
-#include "vcpkglib.h"
+#include <vcpkg/base/system.h>
+#include <vcpkg/commands.h>
+#include <vcpkg/help.h>
+#include <vcpkg/vcpkglib.h>
 
 namespace vcpkg::Commands::List
 {
@@ -27,7 +28,7 @@ namespace vcpkg::Commands::List
     {
         static const std::string EXAMPLE = Strings::format(
             "The argument should be a substring to search for, or no argument to display all installed libraries.\n%s",
-            Commands::Help::create_example_string("list png"));
+            Help::create_example_string("list png"));
         args.check_max_arg_count(1, EXAMPLE);
         const std::unordered_set<std::string> options =
             args.check_and_get_optional_command_arguments({OPTION_FULLDESC});
diff --git a/toolsrc/src/commands_owns.cpp b/toolsrc/src/vcpkg/commands.owns.cpp
index 718a0277f..69079e829 100644
--- a/toolsrc/src/commands_owns.cpp
+++ b/toolsrc/src/vcpkg/commands.owns.cpp
@@ -1,8 +1,9 @@
 #include "pch.h"
 
-#include "vcpkg_Commands.h"
-#include "vcpkg_System.h"
-#include "vcpkglib.h"
+#include <vcpkg/base/system.h>
+#include <vcpkg/commands.h>
+#include <vcpkg/help.h>
+#include <vcpkg/vcpkglib.h>
 
 namespace vcpkg::Commands::Owns
 {
@@ -26,7 +27,7 @@ namespace vcpkg::Commands::Owns
     void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths)
     {
         static const std::string EXAMPLE = Strings::format("The argument should be a pattern to search for. %s",
-                                                           Commands::Help::create_example_string("owns zlib.dll"));
+                                                           Help::create_example_string("owns zlib.dll"));
         args.check_exact_arg_count(1, EXAMPLE);
         args.check_and_get_optional_command_arguments({});
 
diff --git a/toolsrc/src/commands_portsdiff.cpp b/toolsrc/src/vcpkg/commands.portsdiff.cpp
index 2334b2270..b70ad2b80 100644
--- a/toolsrc/src/commands_portsdiff.cpp
+++ b/toolsrc/src/vcpkg/commands.portsdiff.cpp
@@ -1,10 +1,12 @@
 #include "pch.h"
 
-#include "Paragraphs.h"
-#include "SortedVector.h"
-#include "vcpkg_Commands.h"
-#include "vcpkg_Maps.h"
-#include "vcpkg_System.h"
+#include <vcpkg/commands.h>
+#include <vcpkg/help.h>
+#include <vcpkg/paragraphs.h>
+
+#include <vcpkg/base/sortedvector.h>
+#include <vcpkg/base/system.h>
+#include <vcpkg/base/util.h>
 
 namespace vcpkg::Commands::PortsDiff
 {
@@ -116,9 +118,8 @@ namespace vcpkg::Commands::PortsDiff
 
     void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths)
     {
-        static const std::string EXAMPLE =
-            Strings::format("The argument should be a branch/tag/hash to checkout.\n%s",
-                            Commands::Help::create_example_string("portsdiff mybranchname"));
+        static const std::string EXAMPLE = Strings::format("The argument should be a branch/tag/hash to checkout.\n%s",
+                                                           Help::create_example_string("portsdiff mybranchname"));
         args.check_min_arg_count(1, EXAMPLE);
         args.check_max_arg_count(2, EXAMPLE);
         args.check_and_get_optional_command_arguments({});
@@ -138,8 +139,8 @@ namespace vcpkg::Commands::PortsDiff
             read_ports_from_commit(paths, git_commit_id_for_previous_snapshot);
 
         // Already sorted, so set_difference can work on std::vector too
-        const std::vector<std::string> current_ports = Maps::extract_keys(current_names_and_versions);
-        const std::vector<std::string> previous_ports = Maps::extract_keys(previous_names_and_versions);
+        const std::vector<std::string> current_ports = Util::extract_keys(current_names_and_versions);
+        const std::vector<std::string> previous_ports = Util::extract_keys(previous_names_and_versions);
 
         const SetElementPresence<std::string> setp =
             SetElementPresence<std::string>::create(current_ports, previous_ports);
diff --git a/toolsrc/src/commands_search.cpp b/toolsrc/src/vcpkg/commands.search.cpp
index d35a546c4..3ba8707de 100644
--- a/toolsrc/src/commands_search.cpp
+++ b/toolsrc/src/vcpkg/commands.search.cpp
@@ -1,11 +1,12 @@
 #include "pch.h"
 
-#include "Paragraphs.h"
-#include "SourceParagraph.h"
-#include "vcpkg_Commands.h"
-#include "vcpkg_GlobalState.h"
-#include "vcpkg_System.h"
-#include "vcpkglib.h"
+#include <vcpkg/base/system.h>
+#include <vcpkg/commands.h>
+#include <vcpkg/globalstate.h>
+#include <vcpkg/help.h>
+#include <vcpkg/paragraphs.h>
+#include <vcpkg/sourceparagraph.h>
+#include <vcpkg/vcpkglib.h>
 
 namespace vcpkg::Commands::Search
 {
@@ -82,7 +83,7 @@ namespace vcpkg::Commands::Search
     {
         static const std::string EXAMPLE = Strings::format(
             "The argument should be a substring to search for, or no argument to display all libraries.\n%s",
-            Commands::Help::create_example_string("search png"));
+            Help::create_example_string("search png"));
         args.check_max_arg_count(1, EXAMPLE);
         const std::unordered_set<std::string> options =
             args.check_and_get_optional_command_arguments({OPTION_GRAPH, OPTION_FULLDESC});
diff --git a/toolsrc/src/commands_version.cpp b/toolsrc/src/vcpkg/commands.version.cpp
index 5744ea9ef..c6cc82d1f 100644
--- a/toolsrc/src/commands_version.cpp
+++ b/toolsrc/src/vcpkg/commands.version.cpp
@@ -1,8 +1,8 @@
 #include "pch.h"
 
-#include "metrics.h"
-#include "vcpkg_Commands.h"
-#include "vcpkg_System.h"
+#include <vcpkg/base/system.h>
+#include <vcpkg/commands.h>
+#include <vcpkg/metrics.h>
 
 #define STRINGIFY(...) #__VA_ARGS__
 #define MACRO_TO_STRING(X) STRINGIFY(X)
diff --git a/toolsrc/src/vcpkg_Dependencies.cpp b/toolsrc/src/vcpkg/dependencies.cpp
index 8dd60a2eb..da8f1e178 100644
--- a/toolsrc/src/vcpkg_Dependencies.cpp
+++ b/toolsrc/src/vcpkg/dependencies.cpp
@@ -1,15 +1,15 @@
 #include "pch.h"
 
-#include "PackageSpec.h"
-#include "Paragraphs.h"
-#include "StatusParagraphs.h"
-#include "VcpkgPaths.h"
-#include "vcpkg_Dependencies.h"
-#include "vcpkg_Files.h"
-#include "vcpkg_Graphs.h"
-#include "vcpkg_Strings.h"
-#include "vcpkg_Util.h"
-#include "vcpkglib.h"
+#include <vcpkg/base/files.h>
+#include <vcpkg/base/graphs.h>
+#include <vcpkg/base/strings.h>
+#include <vcpkg/base/util.h>
+#include <vcpkg/dependencies.h>
+#include <vcpkg/packagespec.h>
+#include <vcpkg/paragraphs.h>
+#include <vcpkg/statusparagraphs.h>
+#include <vcpkg/vcpkglib.h>
+#include <vcpkg/vcpkgpaths.h>
 
 namespace vcpkg::Dependencies
 {
diff --git a/toolsrc/src/commands_export.cpp b/toolsrc/src/vcpkg/export.cpp
index b416a6f3c..de6464c87 100644
--- a/toolsrc/src/commands_export.cpp
+++ b/toolsrc/src/vcpkg/export.cpp
@@ -1,15 +1,19 @@
 #include "pch.h"
 
-#include "Paragraphs.h"
-#include "vcpkg_Commands.h"
-#include "vcpkg_Dependencies.h"
-#include "vcpkg_Input.h"
-#include "vcpkg_System.h"
-#include "vcpkg_Util.h"
-#include "vcpkglib.h"
+#include <vcpkg/base/system.h>
+#include <vcpkg/base/util.h>
+#include <vcpkg/commands.h>
+#include <vcpkg/dependencies.h>
+#include <vcpkg/export.ifw.h>
+#include <vcpkg/help.h>
+#include <vcpkg/input.h>
+#include <vcpkg/install.h>
+#include <vcpkg/paragraphs.h>
+#include <vcpkg/vcpkglib.h>
+
 #include <regex>
 
-namespace vcpkg::Commands::Export
+namespace vcpkg::Export
 {
     using Dependencies::ExportPlanAction;
     using Dependencies::ExportPlanType;
@@ -210,103 +214,167 @@ namespace vcpkg::Commands::Export
         return nullopt;
     }
 
-    void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths, const Triplet& default_triplet)
+    void export_integration_files(const fs::path& raw_exported_dir_path, const VcpkgPaths& paths)
+    {
+        const std::vector<fs::path> integration_files_relative_to_root = {
+            {".vcpkg-root"},
+            {fs::path{"scripts"} / "buildsystems" / "msbuild" / "applocal.ps1"},
+            {fs::path{"scripts"} / "buildsystems" / "msbuild" / "vcpkg.targets"},
+            {fs::path{"scripts"} / "buildsystems" / "vcpkg.cmake"},
+            {fs::path{"scripts"} / "cmake" / "vcpkg_get_windows_sdk.cmake"},
+            {fs::path{"scripts"} / "getWindowsSDK.ps1"},
+            {fs::path{"scripts"} / "getProgramFilesPlatformBitness.ps1"},
+            {fs::path{"scripts"} / "getProgramFiles32bit.ps1"},
+        };
+
+        for (const fs::path& file : integration_files_relative_to_root)
+        {
+            const fs::path source = paths.root / file;
+            fs::path destination = raw_exported_dir_path / file;
+            Files::Filesystem& fs = paths.get_filesystem();
+            std::error_code ec;
+            fs.create_directories(destination.parent_path(), ec);
+            Checks::check_exit(VCPKG_LINE_INFO, !ec);
+            fs.copy_file(source, destination, fs::copy_options::overwrite_existing, ec);
+            Checks::check_exit(VCPKG_LINE_INFO, !ec);
+        }
+    }
+
+    struct ExportArguments
     {
+        bool dry_run;
+        bool raw;
+        bool nuget;
+        bool ifw;
+        bool zip;
+        bool seven_zip;
+
+        Optional<std::string> maybe_nuget_id;
+        Optional<std::string> maybe_nuget_version;
+
+        IFW::Options ifw_options;
+        std::vector<PackageSpec> specs;
+    };
+
+    static ExportArguments handle_export_command_arguments(const VcpkgCmdArguments& args,
+                                                           const Triplet& default_triplet)
+    {
+        ExportArguments ret;
+
         static const std::string OPTION_DRY_RUN = "--dry-run";
         static const std::string OPTION_RAW = "--raw";
         static const std::string OPTION_NUGET = "--nuget";
+        static const std::string OPTION_IFW = "--ifw";
         static const std::string OPTION_ZIP = "--zip";
         static const std::string OPTION_SEVEN_ZIP = "--7zip";
         static const std::string OPTION_NUGET_ID = "--nuget-id";
         static const std::string OPTION_NUGET_VERSION = "--nuget-version";
+        static const std::string OPTION_IFW_REPOSITORY_URL = "--ifw-repository-url";
+        static const std::string OPTION_IFW_PACKAGES_DIR_PATH = "--ifw-packages-directory-path";
+        static const std::string OPTION_IFW_REPOSITORY_DIR_PATH = "--ifw-repository-directory-path";
+        static const std::string OPTION_IFW_CONFIG_FILE_PATH = "--ifw-configuration-file-path";
+        static const std::string OPTION_IFW_INSTALLER_FILE_PATH = "--ifw-installer-file-path";
 
         // input sanitization
-        static const std::string EXAMPLE =
-            Commands::Help::create_example_string("export zlib zlib:x64-windows boost --nuget");
+        static const std::string EXAMPLE = Help::create_example_string("export zlib zlib:x64-windows boost --nuget");
         args.check_min_arg_count(1, EXAMPLE);
 
-        const std::vector<PackageSpec> specs = Util::fmap(args.command_arguments, [&](auto&& arg) {
+        ret.specs = Util::fmap(args.command_arguments, [&](auto&& arg) {
             return Input::check_and_get_package_spec(arg, default_triplet, EXAMPLE);
         });
-        for (auto&& spec : specs)
-            Input::check_triplet(spec.triplet(), paths);
 
         const auto options = args.check_and_get_optional_command_arguments(
             {
                 OPTION_DRY_RUN,
                 OPTION_RAW,
                 OPTION_NUGET,
+                OPTION_IFW,
                 OPTION_ZIP,
                 OPTION_SEVEN_ZIP,
             },
             {
                 OPTION_NUGET_ID,
                 OPTION_NUGET_VERSION,
+                OPTION_IFW_REPOSITORY_URL,
+                OPTION_IFW_PACKAGES_DIR_PATH,
+                OPTION_IFW_REPOSITORY_DIR_PATH,
+                OPTION_IFW_CONFIG_FILE_PATH,
+                OPTION_IFW_INSTALLER_FILE_PATH,
             });
-        const bool dry_run = options.switches.find(OPTION_DRY_RUN) != options.switches.cend();
-        const bool raw = options.switches.find(OPTION_RAW) != options.switches.cend();
-        const bool nuget = options.switches.find(OPTION_NUGET) != options.switches.cend();
-        const bool zip = options.switches.find(OPTION_ZIP) != options.switches.cend();
-        const bool seven_zip = options.switches.find(OPTION_SEVEN_ZIP) != options.switches.cend();
-
-        if (!raw && !nuget && !zip && !seven_zip && !dry_run)
+        ret.dry_run = options.switches.find(OPTION_DRY_RUN) != options.switches.cend();
+        ret.raw = options.switches.find(OPTION_RAW) != options.switches.cend();
+        ret.nuget = options.switches.find(OPTION_NUGET) != options.switches.cend();
+        ret.ifw = options.switches.find(OPTION_IFW) != options.switches.cend();
+        ret.zip = options.switches.find(OPTION_ZIP) != options.switches.cend();
+        ret.seven_zip = options.switches.find(OPTION_SEVEN_ZIP) != options.switches.cend();
+
+        if (!ret.raw && !ret.nuget && !ret.ifw && !ret.zip && !ret.seven_zip && !ret.dry_run)
         {
-            System::println(System::Color::error, "Must provide at least one export type: --raw --nuget --zip --7zip");
+            System::println(System::Color::error,
+                            "Must provide at least one export type: --raw --nuget --ifw --zip --7zip");
             System::print(EXAMPLE);
             Checks::exit_fail(VCPKG_LINE_INFO);
         }
 
-        auto maybe_nuget_id = maybe_lookup(options.settings, OPTION_NUGET_ID);
-        auto maybe_nuget_version = maybe_lookup(options.settings, OPTION_NUGET_VERSION);
-
-        Checks::check_exit(VCPKG_LINE_INFO, !maybe_nuget_id || nuget, "--nuget-id is only valid with --nuget");
-        Checks::check_exit(
-            VCPKG_LINE_INFO, !maybe_nuget_version || nuget, "--nuget-version is only valid with --nuget");
-
-        // create the plan
-        const StatusParagraphs status_db = database_load_check(paths);
-        std::vector<ExportPlanAction> export_plan = Dependencies::create_export_plan(paths, specs, status_db);
-        Checks::check_exit(VCPKG_LINE_INFO, !export_plan.empty(), "Export plan cannot be empty");
-
-        std::map<ExportPlanType, std::vector<const ExportPlanAction*>> group_by_plan_type;
-        Util::group_by(export_plan, &group_by_plan_type, [](const ExportPlanAction& p) { return p.plan_type; });
-        print_plan(group_by_plan_type);
-
-        const bool has_non_user_requested_packages =
-            Util::find_if(export_plan, [](const ExportPlanAction& package) -> bool {
-                return package.request_type != RequestType::USER_REQUESTED;
-            }) != export_plan.cend();
-
-        if (has_non_user_requested_packages)
-        {
-            System::println(System::Color::warning,
-                            "Additional packages (*) need to be exported to complete this operation.");
-        }
-
-        const auto it = group_by_plan_type.find(ExportPlanType::PORT_AVAILABLE_BUT_NOT_BUILT);
-        if (it != group_by_plan_type.cend() && !it->second.empty())
-        {
-            System::println(System::Color::error, "There are packages that have not been built.");
-
-            // No need to show all of them, just the user-requested ones. Dependency resolution will handle the rest.
-            std::vector<const ExportPlanAction*> unbuilt = it->second;
-            Util::erase_remove_if(
-                unbuilt, [](const ExportPlanAction* a) { return a->request_type != RequestType::USER_REQUESTED; });
-
-            const auto s = Strings::join(" ", unbuilt, [](const ExportPlanAction* a) { return a->spec.to_string(); });
-            System::println("To build them, run:\n"
-                            "    vcpkg install %s",
-                            s);
-            Checks::exit_fail(VCPKG_LINE_INFO);
-        }
-
-        if (dry_run)
+        struct OptionPair
         {
-            Checks::exit_success(VCPKG_LINE_INFO);
-        }
+            const std::string& name;
+            Optional<std::string>& out_opt;
+        };
+        const auto options_implies =
+            [&](const std::string& main_opt_name, bool main_opt, Span<const OptionPair> implying_opts) {
+                if (main_opt)
+                {
+                    for (auto&& opt : implying_opts)
+                        opt.out_opt = maybe_lookup(options.settings, opt.name);
+                }
+                else
+                {
+                    for (auto&& opt : implying_opts)
+                        Checks::check_exit(VCPKG_LINE_INFO,
+                                           !maybe_lookup(options.settings, opt.name),
+                                           "%s is only valid with %s",
+                                           opt.name,
+                                           main_opt_name);
+                }
+            };
+
+        options_implies(OPTION_NUGET,
+                        ret.nuget,
+                        {
+                            {OPTION_NUGET_ID, ret.maybe_nuget_id},
+                            {OPTION_NUGET_VERSION, ret.maybe_nuget_version},
+                        });
+
+        options_implies(OPTION_IFW,
+                        ret.ifw,
+                        {
+                            {OPTION_IFW_REPOSITORY_URL, ret.ifw_options.maybe_repository_url},
+                            {OPTION_IFW_PACKAGES_DIR_PATH, ret.ifw_options.maybe_packages_dir_path},
+                            {OPTION_IFW_REPOSITORY_DIR_PATH, ret.ifw_options.maybe_repository_dir_path},
+                            {OPTION_IFW_CONFIG_FILE_PATH, ret.ifw_options.maybe_config_file_path},
+                            {OPTION_IFW_INSTALLER_FILE_PATH, ret.ifw_options.maybe_installer_file_path},
+                        });
+        return ret;
+    }
 
-        const std::string export_id = create_export_id();
+    static void print_next_step_info(const fs::path& prefix)
+    {
+        const fs::path cmake_toolchain = prefix / "scripts" / "buildsystems" / "vcpkg.cmake";
+        const CMakeVariable cmake_variable = CMakeVariable(L"CMAKE_TOOLCHAIN_FILE", cmake_toolchain.generic_string());
+        System::println("\n"
+                        "To use the exported libraries in CMake projects use:"
+                        "\n"
+                        "    %s"
+                        "\n",
+                        Strings::to_utf8(cmake_variable.s));
+    };
 
+    static void handle_raw_based_export(Span<const ExportPlanAction> export_plan,
+                                        const ExportArguments& opts,
+                                        const std::string& export_id,
+                                        const VcpkgPaths& paths)
+    {
         Files::Filesystem& fs = paths.get_filesystem();
         const fs::path export_to_path = paths.root;
         const fs::path raw_exported_dir_path = export_to_path / export_id;
@@ -327,6 +395,7 @@ namespace vcpkg::Commands::Export
 
             const BinaryParagraph& binary_paragraph =
                 action.any_paragraph.binary_control_file.value_or_exit(VCPKG_LINE_INFO).core_paragraph;
+
             const InstallDir dirs = InstallDir::from_destination_root(
                 raw_exported_dir_path / "installed",
                 action.spec.triplet().to_string(),
@@ -337,52 +406,21 @@ namespace vcpkg::Commands::Export
         }
 
         // Copy files needed for integration
-        const std::vector<fs::path> integration_files_relative_to_root = {
-            {".vcpkg-root"},
-            {fs::path{"scripts"} / "buildsystems" / "msbuild" / "applocal.ps1"},
-            {fs::path{"scripts"} / "buildsystems" / "msbuild" / "vcpkg.targets"},
-            {fs::path{"scripts"} / "buildsystems" / "vcpkg.cmake"},
-            {fs::path{"scripts"} / "cmake" / "vcpkg_get_windows_sdk.cmake"},
-            {fs::path{"scripts"} / "getWindowsSDK.ps1"},
-            {fs::path{"scripts"} / "getProgramFilesPlatformBitness.ps1"},
-            {fs::path{"scripts"} / "getProgramFiles32bit.ps1"},
-        };
-
-        for (const fs::path& file : integration_files_relative_to_root)
-        {
-            const fs::path source = paths.root / file;
-            const fs::path destination = raw_exported_dir_path / file;
-            fs.create_directories(destination.parent_path(), ec);
-            Checks::check_exit(VCPKG_LINE_INFO, !ec);
-            fs.copy_file(source, destination, fs::copy_options::overwrite_existing, ec);
-            Checks::check_exit(VCPKG_LINE_INFO, !ec);
-        }
+        export_integration_files(raw_exported_dir_path, paths);
 
-        const auto print_next_step_info = [](const fs::path& prefix) {
-            const fs::path cmake_toolchain = prefix / "scripts" / "buildsystems" / "vcpkg.cmake";
-            const CMakeVariable cmake_variable =
-                CMakeVariable(L"CMAKE_TOOLCHAIN_FILE", cmake_toolchain.generic_string());
-            System::println("\n"
-                            "To use the exported libraries in CMake projects use:"
-                            "\n"
-                            "    %s"
-                            "\n",
-                            Strings::to_utf8(cmake_variable.s));
-        };
-
-        if (raw)
+        if (opts.raw)
         {
             System::println(
                 System::Color::success, R"(Files exported at: "%s")", raw_exported_dir_path.generic_string());
             print_next_step_info(export_to_path);
         }
 
-        if (nuget)
+        if (opts.nuget)
         {
             System::println("Creating nuget package... ");
 
-            const std::string nuget_id = maybe_nuget_id.value_or(raw_exported_dir_path.filename().string());
-            const std::string nuget_version = maybe_nuget_version.value_or("1.0.0");
+            const std::string nuget_id = opts.maybe_nuget_id.value_or(raw_exported_dir_path.filename().string());
+            const std::string nuget_version = opts.maybe_nuget_version.value_or("1.0.0");
             const fs::path output_path =
                 do_nuget_export(paths, nuget_id, nuget_version, raw_exported_dir_path, export_to_path);
             System::println(System::Color::success, "Creating nuget package... done");
@@ -397,7 +435,7 @@ With a project open, go to Tools->NuGet Package Manager->Package Manager Console
                             output_path.parent_path().u8string());
         }
 
-        if (zip)
+        if (opts.zip)
         {
             System::println("Creating zip archive... ");
             const fs::path output_path =
@@ -407,7 +445,7 @@ With a project open, go to Tools->NuGet Package Manager->Package Manager Console
             print_next_step_info("[...]");
         }
 
-        if (seven_zip)
+        if (opts.seven_zip)
         {
             System::println("Creating 7zip archive... ");
             const fs::path output_path =
@@ -417,10 +455,73 @@ With a project open, go to Tools->NuGet Package Manager->Package Manager Console
             print_next_step_info("[...]");
         }
 
-        if (!raw)
+        if (!opts.raw)
         {
             fs.remove_all(raw_exported_dir_path, ec);
         }
+    }
+
+    void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths, const Triplet& default_triplet)
+    {
+        const auto opts = handle_export_command_arguments(args, default_triplet);
+        for (auto&& spec : opts.specs)
+            Input::check_triplet(spec.triplet(), paths);
+
+        // create the plan
+        const StatusParagraphs status_db = database_load_check(paths);
+        std::vector<ExportPlanAction> export_plan = Dependencies::create_export_plan(paths, opts.specs, status_db);
+        Checks::check_exit(VCPKG_LINE_INFO, !export_plan.empty(), "Export plan cannot be empty");
+
+        std::map<ExportPlanType, std::vector<const ExportPlanAction*>> group_by_plan_type;
+        Util::group_by(export_plan, &group_by_plan_type, [](const ExportPlanAction& p) { return p.plan_type; });
+        print_plan(group_by_plan_type);
+
+        const bool has_non_user_requested_packages =
+            Util::find_if(export_plan, [](const ExportPlanAction& package) -> bool {
+                return package.request_type != RequestType::USER_REQUESTED;
+            }) != export_plan.cend();
+
+        if (has_non_user_requested_packages)
+        {
+            System::println(System::Color::warning,
+                            "Additional packages (*) need to be exported to complete this operation.");
+        }
+
+        const auto it = group_by_plan_type.find(ExportPlanType::PORT_AVAILABLE_BUT_NOT_BUILT);
+        if (it != group_by_plan_type.cend() && !it->second.empty())
+        {
+            System::println(System::Color::error, "There are packages that have not been built.");
+
+            // No need to show all of them, just the user-requested ones. Dependency resolution will handle the rest.
+            std::vector<const ExportPlanAction*> unbuilt = it->second;
+            Util::erase_remove_if(
+                unbuilt, [](const ExportPlanAction* a) { return a->request_type != RequestType::USER_REQUESTED; });
+
+            const auto s = Strings::join(" ", unbuilt, [](const ExportPlanAction* a) { return a->spec.to_string(); });
+            System::println("To build them, run:\n"
+                            "    vcpkg install %s",
+                            s);
+            Checks::exit_fail(VCPKG_LINE_INFO);
+        }
+
+        if (opts.dry_run)
+        {
+            Checks::exit_success(VCPKG_LINE_INFO);
+        }
+
+        std::string export_id = create_export_id();
+
+        if (opts.raw || opts.nuget || opts.zip || opts.seven_zip)
+        {
+            handle_raw_based_export(export_plan, opts, export_id, paths);
+        }
+
+        if (opts.ifw)
+        {
+            IFW::do_export(export_plan, export_id, opts.ifw_options, paths);
+
+            print_next_step_info("@RootDir@/src/vcpkg");
+        }
 
         Checks::exit_success(VCPKG_LINE_INFO);
     }
diff --git a/toolsrc/src/vcpkg_GlobalState.cpp b/toolsrc/src/vcpkg/globalstate.cpp
index 2221222c0..de564d357 100644
--- a/toolsrc/src/vcpkg_GlobalState.cpp
+++ b/toolsrc/src/vcpkg/globalstate.cpp
@@ -1,10 +1,10 @@
 #include "pch.h"
 
-#include "vcpkg_GlobalState.h"
+#include <vcpkg/globalstate.h>
 
 namespace vcpkg
 {
-    Util::LockGuarded<ElapsedTime> GlobalState::timer;
+    Util::LockGuarded<Chrono::ElapsedTime> GlobalState::timer;
     std::atomic<bool> GlobalState::debugging = false;
     std::atomic<bool> GlobalState::feature_packages = false;
 
diff --git a/toolsrc/src/commands_help.cpp b/toolsrc/src/vcpkg/help.cpp
index a12f9003d..7867f71d2 100644
--- a/toolsrc/src/commands_help.cpp
+++ b/toolsrc/src/vcpkg/help.cpp
@@ -1,9 +1,9 @@
 #include "pch.h"
 
-#include "vcpkg_Commands.h"
-#include "vcpkg_System.h"
+#include <vcpkg/base/system.h>
+#include <vcpkg/commands.h>
 
-namespace vcpkg::Commands::Help
+namespace vcpkg::Help
 {
     void help_topics()
     {
@@ -75,7 +75,7 @@ namespace vcpkg::Commands::Help
             "                                  (default: %%VCPKG_ROOT%%)\n"
             "\n"
             "For more help (including examples) see the accompanying README.md.",
-            Integrate::INTEGRATE_COMMAND_HELPSTRING);
+            Commands::Integrate::INTEGRATE_COMMAND_HELPSTRING);
     }
 
     std::string create_example_string(const std::string& command_and_arguments)
@@ -114,7 +114,7 @@ namespace vcpkg::Commands::Help
         {
             System::print("Commands:\n"
                           "%s",
-                          Integrate::INTEGRATE_COMMAND_HELPSTRING);
+                          Commands::Integrate::INTEGRATE_COMMAND_HELPSTRING);
         }
         else if (topic == "topics")
         {
diff --git a/toolsrc/src/vcpkg_Input.cpp b/toolsrc/src/vcpkg/input.cpp
index f1cac9632..aee0fac7f 100644
--- a/toolsrc/src/vcpkg_Input.cpp
+++ b/toolsrc/src/vcpkg/input.cpp
@@ -1,9 +1,10 @@
 #include "pch.h"
 
-#include "metrics.h"
-#include "vcpkg_Commands.h"
-#include "vcpkg_Input.h"
-#include "vcpkg_System.h"
+#include <vcpkg/base/system.h>
+#include <vcpkg/commands.h>
+#include <vcpkg/help.h>
+#include <vcpkg/input.h>
+#include <vcpkg/metrics.h>
 
 namespace vcpkg::Input
 {
@@ -30,7 +31,7 @@ namespace vcpkg::Input
         {
             System::println(System::Color::error, "Error: invalid triplet: %s", t);
             Metrics::g_metrics.lock()->track_property("error", "invalid triplet: " + t.to_string());
-            Commands::Help::help_topic_valid_triplet(paths);
+            Help::help_topic_valid_triplet(paths);
             Checks::exit_fail(VCPKG_LINE_INFO);
         }
     }
diff --git a/toolsrc/src/commands_install.cpp b/toolsrc/src/vcpkg/install.cpp
index d815332fe..26f729a57 100644
--- a/toolsrc/src/commands_install.cpp
+++ b/toolsrc/src/vcpkg/install.cpp
@@ -1,18 +1,21 @@
 #include "pch.h"
 
-#include "Paragraphs.h"
-#include "metrics.h"
-#include "vcpkg_Build.h"
-#include "vcpkg_Commands.h"
-#include "vcpkg_Dependencies.h"
-#include "vcpkg_Files.h"
-#include "vcpkg_GlobalState.h"
-#include "vcpkg_Input.h"
-#include "vcpkg_System.h"
-#include "vcpkg_Util.h"
-#include "vcpkglib.h"
-
-namespace vcpkg::Commands::Install
+#include <vcpkg/base/files.h>
+#include <vcpkg/base/system.h>
+#include <vcpkg/base/util.h>
+#include <vcpkg/build.h>
+#include <vcpkg/commands.h>
+#include <vcpkg/dependencies.h>
+#include <vcpkg/globalstate.h>
+#include <vcpkg/help.h>
+#include <vcpkg/input.h>
+#include <vcpkg/install.h>
+#include <vcpkg/metrics.h>
+#include <vcpkg/paragraphs.h>
+#include <vcpkg/remove.h>
+#include <vcpkg/vcpkglib.h>
+
+namespace vcpkg::Install
 {
     using namespace Dependencies;
 
@@ -68,8 +71,8 @@ namespace vcpkg::Commands::Install
 
             const std::string filename = file.filename().generic_string();
             if (fs::is_regular_file(status) &&
-                (Strings::case_insensitive_ascii_compare(filename.c_str(), "CONTROL") == 0 ||
-                 Strings::case_insensitive_ascii_compare(filename.c_str(), "BUILD_INFO") == 0))
+                (Strings::case_insensitive_ascii_compare(filename.c_str(), "CONTROL") ||
+                 Strings::case_insensitive_ascii_compare(filename.c_str(), "BUILD_INFO")))
             {
                 // Do not copy the control file
                 continue;
@@ -442,22 +445,22 @@ namespace vcpkg::Commands::Install
         }
     }
 
-    void perform_and_exit(const std::vector<AnyAction>& action_plan,
-                          const Build::BuildPackageOptions& install_plan_options,
-                          const KeepGoing keep_going,
-                          const PrintSummary print_summary,
-                          const VcpkgPaths& paths,
-                          StatusParagraphs& status_db)
+    void perform_and_exit_ex(const std::vector<AnyAction>& action_plan,
+                             const Build::BuildPackageOptions& install_plan_options,
+                             const KeepGoing keep_going,
+                             const PrintSummary print_summary,
+                             const VcpkgPaths& paths,
+                             StatusParagraphs& status_db)
     {
         std::vector<BuildResult> results;
         std::vector<std::string> timing;
-        const ElapsedTime timer = ElapsedTime::create_started();
+        const auto timer = Chrono::ElapsedTime::create_started();
         size_t counter = 0;
         const size_t package_count = action_plan.size();
 
         for (const auto& action : action_plan)
         {
-            const ElapsedTime build_timer = ElapsedTime::create_started();
+            const auto build_timer = Chrono::ElapsedTime::create_started();
             counter++;
 
             const std::string display_name = action.spec().to_string();
@@ -522,17 +525,42 @@ namespace vcpkg::Commands::Install
         Checks::exit_success(VCPKG_LINE_INFO);
     }
 
-    void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths, const Triplet& default_triplet)
+    static const std::string OPTION_DRY_RUN = "--dry-run";
+    static const std::string OPTION_USE_HEAD_VERSION = "--head";
+    static const std::string OPTION_NO_DOWNLOADS = "--no-downloads";
+    static const std::string OPTION_RECURSE = "--recurse";
+    static const std::string OPTION_KEEP_GOING = "--keep-going";
+
+    static const std::array<std::string, 5> INSTALL_SWITCHES = {
+        OPTION_DRY_RUN,
+        OPTION_USE_HEAD_VERSION,
+        OPTION_NO_DOWNLOADS,
+        OPTION_RECURSE,
+        OPTION_KEEP_GOING,
+    };
+    static const std::array<std::string, 0> INSTALL_SETTINGS;
+
+    static std::vector<std::string> valid_arguments(const VcpkgPaths& paths)
     {
-        static const std::string OPTION_DRY_RUN = "--dry-run";
-        static const std::string OPTION_USE_HEAD_VERSION = "--head";
-        static const std::string OPTION_NO_DOWNLOADS = "--no-downloads";
-        static const std::string OPTION_RECURSE = "--recurse";
-        static const std::string OPTION_KEEP_GOING = "--keep-going";
+        auto sources_and_errors = Paragraphs::try_load_all_ports(paths.get_filesystem(), paths.ports);
+
+        return Util::fmap(sources_and_errors.paragraphs,
+                          [](auto&& pgh) -> std::string { return pgh->core_paragraph->name; });
+    }
 
+    const CommandStructure COMMAND_STRUCTURE = {
+        "install zlib zlib:x64-windows curl boost",
+        1,
+        SIZE_MAX,
+        INSTALL_SWITCHES,
+        INSTALL_SETTINGS,
+        &valid_arguments,
+    };
+
+    void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths, const Triplet& default_triplet)
+    {
         // input sanitization
-        static const std::string EXAMPLE =
-            Commands::Help::create_example_string("install zlib zlib:x64-windows curl boost");
+        static const std::string EXAMPLE = Help::create_example_string("install zlib zlib:x64-windows curl boost");
         args.check_min_arg_count(1, EXAMPLE);
 
         const std::vector<FullPackageSpec> specs = Util::fmap(args.command_arguments, [&](auto&& arg) {
@@ -556,6 +584,7 @@ namespace vcpkg::Commands::Install
         const bool no_downloads = options.find(OPTION_NO_DOWNLOADS) != options.cend();
         const bool is_recursive = options.find(OPTION_RECURSE) != options.cend();
         const KeepGoing keep_going = to_keep_going(options.find(OPTION_KEEP_GOING) != options.cend());
+        const PrintSummary print_summary = to_print_summary(keep_going == KeepGoing::YES);
 
         // create the plan
         StatusParagraphs status_db = database_load_check(paths);
@@ -606,7 +635,7 @@ namespace vcpkg::Commands::Install
             Checks::exit_success(VCPKG_LINE_INFO);
         }
 
-        perform_and_exit(action_plan, install_plan_options, keep_going, PrintSummary::NO, paths, status_db);
+        perform_and_exit_ex(action_plan, install_plan_options, keep_going, print_summary, paths, status_db);
 
         Checks::exit_success(VCPKG_LINE_INFO);
     }
diff --git a/toolsrc/src/metrics.cpp b/toolsrc/src/vcpkg/metrics.cpp
index 8a0050bfc..84c1ee208 100644
--- a/toolsrc/src/metrics.cpp
+++ b/toolsrc/src/vcpkg/metrics.cpp
@@ -1,10 +1,13 @@
 #include "pch.h"
 
-#include "filesystem_fs.h"
-#include "metrics.h"
-#include "vcpkg_Files.h"
-#include "vcpkg_Strings.h"
-#include "vcpkg_System.h"
+#include <vcpkg/metrics.h>
+
+#include <vcpkg/base/files.h>
+#include <vcpkg/base/strings.h>
+#include <vcpkg/base/system.h>
+
+#pragma comment(lib, "version")
+#pragma comment(lib, "winhttp")
 
 namespace vcpkg::Metrics
 {
diff --git a/toolsrc/src/PackageSpec.cpp b/toolsrc/src/vcpkg/packagespec.cpp
index 890de8899..01a09618d 100644
--- a/toolsrc/src/PackageSpec.cpp
+++ b/toolsrc/src/vcpkg/packagespec.cpp
@@ -1,8 +1,8 @@
 #include "pch.h"
 
-#include "PackageSpec.h"
-#include "vcpkg_Parse.h"
-#include "vcpkg_Util.h"
+#include <vcpkg/base/util.h>
+#include <vcpkg/packagespec.h>
+#include <vcpkg/parse.h>
 
 using vcpkg::Parse::parse_comma_list;
 
diff --git a/toolsrc/src/PackageSpecParseResult.cpp b/toolsrc/src/vcpkg/packagespecparseresult.cpp
index 838c788ba..b12bd12d0 100644
--- a/toolsrc/src/PackageSpecParseResult.cpp
+++ b/toolsrc/src/vcpkg/packagespecparseresult.cpp
@@ -1,7 +1,8 @@
 #include "pch.h"
 
-#include "PackageSpecParseResult.h"
-#include "vcpkg_Checks.h"
+#include <vcpkg/packagespecparseresult.h>
+
+#include <vcpkg/base/checks.h>
 
 namespace vcpkg
 {
diff --git a/toolsrc/src/ParagraphParseResult.cpp b/toolsrc/src/vcpkg/paragraphparseresult.cpp
index 5c8c1d59d..920a4b16b 100644
--- a/toolsrc/src/ParagraphParseResult.cpp
+++ b/toolsrc/src/vcpkg/paragraphparseresult.cpp
@@ -1,7 +1,7 @@
 #include "pch.h"
 
-#include "ParagraphParseResult.h"
-#include "vcpkg_Checks.h"
+#include <vcpkg/base/checks.h>
+#include <vcpkg/paragraphparseresult.h>
 
 namespace vcpkg
 {
diff --git a/toolsrc/src/Paragraphs.cpp b/toolsrc/src/vcpkg/paragraphs.cpp
index 6a6f191df..b93de190c 100644
--- a/toolsrc/src/Paragraphs.cpp
+++ b/toolsrc/src/vcpkg/paragraphs.cpp
@@ -1,10 +1,10 @@
 #include "pch.h"
 
-#include "ParagraphParseResult.h"
-#include "Paragraphs.h"
-#include "vcpkg_Files.h"
-#include "vcpkg_GlobalState.h"
-#include "vcpkg_Util.h"
+#include <vcpkg/base/files.h>
+#include <vcpkg/base/util.h>
+#include <vcpkg/globalstate.h>
+#include <vcpkg/paragraphparseresult.h>
+#include <vcpkg/paragraphs.h>
 
 using namespace vcpkg::Parse;
 
diff --git a/toolsrc/src/vcpkg_Parse.cpp b/toolsrc/src/vcpkg/parse.cpp
index e671a1a05..116a7f5c8 100644
--- a/toolsrc/src/vcpkg_Parse.cpp
+++ b/toolsrc/src/vcpkg/parse.cpp
@@ -1,8 +1,9 @@
 #include "pch.h"
 
-#include "vcpkg_Checks.h"
-#include "vcpkg_Maps.h"
-#include "vcpkg_Parse.h"
+#include <vcpkg/parse.h>
+
+#include <vcpkg/base/checks.h>
+#include <vcpkg/base/util.h>
 
 namespace vcpkg::Parse
 {
@@ -38,7 +39,7 @@ namespace vcpkg::Parse
         {
             auto err = std::make_unique<ParseControlErrorInfo>();
             err->name = name;
-            err->extra_fields = Maps::extract_keys(fields);
+            err->extra_fields = Util::extract_keys(fields);
             err->missing_fields = std::move(missing_fields);
             return err;
         }
diff --git a/toolsrc/src/PostBuildLint_BuildType.cpp b/toolsrc/src/vcpkg/postbuildlint.buildtype.cpp
index 649f0ccca..2baaddb5e 100644
--- a/toolsrc/src/PostBuildLint_BuildType.cpp
+++ b/toolsrc/src/vcpkg/postbuildlint.buildtype.cpp
@@ -1,7 +1,7 @@
 #include "pch.h"
 
-#include "PostBuildLint_BuildType.h"
-#include "vcpkg_Checks.h"
+#include <vcpkg/base/checks.h>
+#include <vcpkg/postbuildlint.buildtype.h>
 
 namespace vcpkg::PostBuildLint
 {
diff --git a/toolsrc/src/PostBuildLint.cpp b/toolsrc/src/vcpkg/postbuildlint.cpp
index 5de1078cd..b2422b4b2 100644
--- a/toolsrc/src/PostBuildLint.cpp
+++ b/toolsrc/src/vcpkg/postbuildlint.cpp
@@ -1,14 +1,14 @@
 #include "pch.h"
 
-#include "PackageSpec.h"
-#include "PostBuildLint.h"
-#include "PostBuildLint_BuildType.h"
-#include "VcpkgPaths.h"
-#include "coff_file_reader.h"
-#include "vcpkg_Build.h"
-#include "vcpkg_Files.h"
-#include "vcpkg_System.h"
-#include "vcpkg_Util.h"
+#include <vcpkg/base/cofffilereader.h>
+#include <vcpkg/base/files.h>
+#include <vcpkg/base/system.h>
+#include <vcpkg/base/util.h>
+#include <vcpkg/build.h>
+#include <vcpkg/packagespec.h>
+#include <vcpkg/postbuildlint.buildtype.h>
+#include <vcpkg/postbuildlint.h>
+#include <vcpkg/vcpkgpaths.h>
 
 using vcpkg::Build::BuildInfo;
 using vcpkg::Build::BuildPolicy;
@@ -38,7 +38,7 @@ namespace vcpkg::PostBuildLint
         }
     };
 
-    Span<const OutdatedDynamicCrt> get_outdated_dynamic_crts(CStringView toolset)
+    Span<const OutdatedDynamicCrt> get_outdated_dynamic_crts(const Optional<std::string>& toolset_version)
     {
         static const std::vector<OutdatedDynamicCrt> V_NO_120 = {
             {"msvcp100.dll", R"(msvcp100\.dll)"},
@@ -66,10 +66,14 @@ namespace vcpkg::PostBuildLint
             return ret;
         }();
 
-        if (toolset == "v120")
-            return V_NO_120;
-        else
-            return V_NO_MSVCRT;
+		const auto tsv = toolset_version.get();
+		if (tsv && (*tsv) == "v120")
+		{
+			return V_NO_120;
+		}
+
+		// Default case for all version >= VS 2015.
+		return V_NO_MSVCRT;
     }
 
     static LintStatus check_for_files_in_include_directory(const Files::Filesystem& fs,
@@ -371,6 +375,7 @@ namespace vcpkg::PostBuildLint
             case MachineType::I386: return "x86";
             case MachineType::ARM:
             case MachineType::ARMNT: return "arm";
+            case MachineType::ARM64: return "arm64";
             default: return "Machine Type Code = " + std::to_string(static_cast<uint16_t>(machine_type));
         }
     }
@@ -706,8 +711,8 @@ namespace vcpkg::PostBuildLint
         std::vector<fs::path> misplaced_files = fs.get_files_non_recursive(dir);
         Util::unstable_keep_if(misplaced_files, [&fs](const fs::path& path) {
             const std::string filename = path.filename().generic_string();
-            if (Strings::case_insensitive_ascii_compare(filename.c_str(), "CONTROL") == 0 ||
-                Strings::case_insensitive_ascii_compare(filename.c_str(), "BUILD_INFO") == 0)
+            if (Strings::case_insensitive_ascii_compare(filename.c_str(), "CONTROL") ||
+                Strings::case_insensitive_ascii_compare(filename.c_str(), "BUILD_INFO"))
                 return false;
             return !fs.is_directory(path);
         });
@@ -733,7 +738,7 @@ namespace vcpkg::PostBuildLint
         const auto& fs = paths.get_filesystem();
 
         // for dumpbin
-        const Toolset& toolset = paths.get_toolset(pre_build_info.platform_toolset);
+        const Toolset& toolset = paths.get_toolset(pre_build_info.platform_toolset, pre_build_info.visual_studio_path);
         const fs::path package_dir = paths.package_dir(spec);
 
         size_t error_count = 0;
diff --git a/toolsrc/src/commands_remove.cpp b/toolsrc/src/vcpkg/remove.cpp
index a9f1b2564..04ddba1e4 100644
--- a/toolsrc/src/commands_remove.cpp
+++ b/toolsrc/src/vcpkg/remove.cpp
@@ -1,13 +1,16 @@
 #include "pch.h"
 
-#include "vcpkg_Commands.h"
-#include "vcpkg_Dependencies.h"
-#include "vcpkg_Input.h"
-#include "vcpkg_System.h"
-#include "vcpkg_Util.h"
-#include "vcpkglib.h"
-
-namespace vcpkg::Commands::Remove
+#include <vcpkg/base/system.h>
+#include <vcpkg/base/util.h>
+#include <vcpkg/commands.h>
+#include <vcpkg/dependencies.h>
+#include <vcpkg/help.h>
+#include <vcpkg/input.h>
+#include <vcpkg/remove.h>
+#include <vcpkg/update.h>
+#include <vcpkg/vcpkglib.h>
+
+namespace vcpkg::Remove
 {
     using Dependencies::RemovePlanAction;
     using Dependencies::RemovePlanType;
@@ -160,15 +163,41 @@ namespace vcpkg::Commands::Remove
         }
     }
 
+    static const std::string OPTION_PURGE = "--purge";
+    static const std::string OPTION_NO_PURGE = "--no-purge";
+    static const std::string OPTION_RECURSE = "--recurse";
+    static const std::string OPTION_DRY_RUN = "--dry-run";
+    static const std::string OPTION_OUTDATED = "--outdated";
+
+    static const std::array<std::string, 5> REMOVE_SWITCHES = {
+        OPTION_PURGE,
+        OPTION_NO_PURGE,
+        OPTION_RECURSE,
+        OPTION_DRY_RUN,
+        OPTION_OUTDATED,
+    };
+    static const std::array<std::string, 0> REMOVE_SETTINGS;
+
+    static std::vector<std::string> valid_arguments(const VcpkgPaths& paths)
+    {
+        const StatusParagraphs status_db = database_load_check(paths);
+        const std::vector<StatusParagraph*> installed_packages = get_installed_ports(status_db);
+
+        return Util::fmap(installed_packages, [](auto&& pgh) -> std::string { return pgh->package.spec.to_string(); });
+    }
+
+    const CommandStructure COMMAND_STRUCTURE = {
+        "remove zlib zlib:x64-windows curl boost",
+        1,
+        SIZE_MAX,
+        REMOVE_SWITCHES,
+        REMOVE_SETTINGS,
+        &valid_arguments,
+    };
+
     void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths, const Triplet& default_triplet)
     {
-        static const std::string OPTION_PURGE = "--purge";
-        static const std::string OPTION_NO_PURGE = "--no-purge";
-        static const std::string OPTION_RECURSE = "--recurse";
-        static const std::string OPTION_DRY_RUN = "--dry-run";
-        static const std::string OPTION_OUTDATED = "--outdated";
-        static const std::string EXAMPLE =
-            Commands::Help::create_example_string("remove zlib zlib:x64-windows curl boost");
+        static const std::string EXAMPLE = Help::create_example_string("remove zlib zlib:x64-windows curl boost");
         const std::unordered_set<std::string> options = args.check_and_get_optional_command_arguments(
             {OPTION_PURGE, OPTION_NO_PURGE, OPTION_RECURSE, OPTION_DRY_RUN, OPTION_OUTDATED});
 
diff --git a/toolsrc/src/SourceParagraph.cpp b/toolsrc/src/vcpkg/sourceparagraph.cpp
index 0f1a38d19..d766dcb72 100644
--- a/toolsrc/src/SourceParagraph.cpp
+++ b/toolsrc/src/vcpkg/sourceparagraph.cpp
@@ -1,19 +1,19 @@
 #include "pch.h"
 
-#include "PackageSpec.h"
-#include "SourceParagraph.h"
-#include "Triplet.h"
-#include "vcpkg_Checks.h"
-#include "vcpkg_Maps.h"
-#include "vcpkg_System.h"
-#include "vcpkg_Util.h"
-#include "vcpkg_expected.h"
+#include <vcpkg/packagespec.h>
+#include <vcpkg/sourceparagraph.h>
+#include <vcpkg/triplet.h>
+
+#include <vcpkg/base/checks.h>
+#include <vcpkg/base/expected.h>
+#include <vcpkg/base/system.h>
+#include <vcpkg/base/util.h>
 
 namespace vcpkg
 {
     using namespace vcpkg::Parse;
 
-    namespace Fields
+    namespace SourceParagraphFields
     {
         static const std::string BUILD_DEPENDS = "Build-Depends";
         static const std::string DEFAULTFEATURES = "Default-Features";
@@ -28,11 +28,11 @@ namespace vcpkg
     static Span<const std::string> get_list_of_valid_fields()
     {
         static const std::string valid_fields[] = {
-            Fields::SOURCE,
-            Fields::VERSION,
-            Fields::DESCRIPTION,
-            Fields::MAINTAINER,
-            Fields::BUILD_DEPENDS,
+            SourceParagraphFields::SOURCE,
+            SourceParagraphFields::VERSION,
+            SourceParagraphFields::DESCRIPTION,
+            SourceParagraphFields::MAINTAINER,
+            SourceParagraphFields::BUILD_DEPENDS,
         };
 
         return valid_fields;
@@ -92,14 +92,15 @@ namespace vcpkg
 
         auto spgh = std::make_unique<SourceParagraph>();
 
-        parser.required_field(Fields::SOURCE, spgh->name);
-        parser.required_field(Fields::VERSION, spgh->version);
+        parser.required_field(SourceParagraphFields::SOURCE, spgh->name);
+        parser.required_field(SourceParagraphFields::VERSION, spgh->version);
 
-        spgh->description = parser.optional_field(Fields::DESCRIPTION);
-        spgh->maintainer = parser.optional_field(Fields::MAINTAINER);
-        spgh->depends = expand_qualified_dependencies(parse_comma_list(parser.optional_field(Fields::BUILD_DEPENDS)));
-        spgh->supports = parse_comma_list(parser.optional_field(Fields::SUPPORTS));
-        spgh->default_features = parse_comma_list(parser.optional_field(Fields::DEFAULTFEATURES));
+        spgh->description = parser.optional_field(SourceParagraphFields::DESCRIPTION);
+        spgh->maintainer = parser.optional_field(SourceParagraphFields::MAINTAINER);
+        spgh->depends = expand_qualified_dependencies(
+            parse_comma_list(parser.optional_field(SourceParagraphFields::BUILD_DEPENDS)));
+        spgh->supports = parse_comma_list(parser.optional_field(SourceParagraphFields::SUPPORTS));
+        spgh->default_features = parse_comma_list(parser.optional_field(SourceParagraphFields::DEFAULTFEATURES));
 
         auto err = parser.error_info(spgh->name);
         if (err)
@@ -114,10 +115,11 @@ namespace vcpkg
 
         auto fpgh = std::make_unique<FeatureParagraph>();
 
-        parser.required_field(Fields::FEATURE, fpgh->name);
-        parser.required_field(Fields::DESCRIPTION, fpgh->description);
+        parser.required_field(SourceParagraphFields::FEATURE, fpgh->name);
+        parser.required_field(SourceParagraphFields::DESCRIPTION, fpgh->description);
 
-        fpgh->depends = expand_qualified_dependencies(parse_comma_list(parser.optional_field(Fields::BUILD_DEPENDS)));
+        fpgh->depends = expand_qualified_dependencies(
+            parse_comma_list(parser.optional_field(SourceParagraphFields::BUILD_DEPENDS)));
 
         auto err = parser.error_info(fpgh->name);
         if (err)
diff --git a/toolsrc/src/StatusParagraph.cpp b/toolsrc/src/vcpkg/statusparagraph.cpp
index f8ae293c2..5f00825e1 100644
--- a/toolsrc/src/StatusParagraph.cpp
+++ b/toolsrc/src/vcpkg/statusparagraph.cpp
@@ -1,6 +1,6 @@
 #include "pch.h"
 
-#include "StatusParagraph.h"
+#include <vcpkg/statusparagraph.h>
 
 using namespace vcpkg::Parse;
 
diff --git a/toolsrc/src/StatusParagraphs.cpp b/toolsrc/src/vcpkg/statusparagraphs.cpp
index aaba95eb9..647ed6d3f 100644
--- a/toolsrc/src/StatusParagraphs.cpp
+++ b/toolsrc/src/vcpkg/statusparagraphs.cpp
@@ -1,8 +1,7 @@
 #include "pch.h"
 
-#include "StatusParagraphs.h"
-#include "vcpkg_Checks.h"
-#include <algorithm>
+#include <vcpkg/base/checks.h>
+#include <vcpkg/statusparagraphs.h>
 
 namespace vcpkg
 {
diff --git a/toolsrc/src/triplet.cpp b/toolsrc/src/vcpkg/triplet.cpp
index 3b56da02a..8a84ee2b2 100644
--- a/toolsrc/src/triplet.cpp
+++ b/toolsrc/src/vcpkg/triplet.cpp
@@ -1,8 +1,8 @@
 #include "pch.h"
 
-#include "Triplet.h"
-#include "vcpkg_Checks.h"
-#include "vcpkg_Strings.h"
+#include <vcpkg/base/checks.h>
+#include <vcpkg/base/strings.h>
+#include <vcpkg/triplet.h>
 
 namespace vcpkg
 {
diff --git a/toolsrc/src/commands_update.cpp b/toolsrc/src/vcpkg/update.cpp
index 71ea4b063..168949bc1 100644
--- a/toolsrc/src/commands_update.cpp
+++ b/toolsrc/src/vcpkg/update.cpp
@@ -1,11 +1,13 @@
 #include "pch.h"
 
-#include "Paragraphs.h"
-#include "vcpkg_Commands.h"
-#include "vcpkg_System.h"
-#include "vcpkglib.h"
+#include <vcpkg/base/system.h>
+#include <vcpkg/commands.h>
+#include <vcpkg/help.h>
+#include <vcpkg/paragraphs.h>
+#include <vcpkg/update.h>
+#include <vcpkg/vcpkglib.h>
 
-namespace vcpkg::Commands::Update
+namespace vcpkg::Update
 {
     bool OutdatedPackage::compare_by_name(const OutdatedPackage& left, const OutdatedPackage& right)
     {
diff --git a/toolsrc/src/VcpkgCmdArguments.cpp b/toolsrc/src/vcpkg/vcpkgcmdarguments.cpp
index cb261930e..522961693 100644
--- a/toolsrc/src/VcpkgCmdArguments.cpp
+++ b/toolsrc/src/vcpkg/vcpkgcmdarguments.cpp
@@ -1,10 +1,11 @@
 #include "pch.h"
 
-#include "VcpkgCmdArguments.h"
-#include "metrics.h"
-#include "vcpkg_Commands.h"
-#include "vcpkg_GlobalState.h"
-#include "vcpkg_System.h"
+#include <vcpkg/base/system.h>
+#include <vcpkg/commands.h>
+#include <vcpkg/globalstate.h>
+#include <vcpkg/help.h>
+#include <vcpkg/metrics.h>
+#include <vcpkg/vcpkgcmdarguments.h>
 
 namespace vcpkg
 {
@@ -17,7 +18,7 @@ namespace vcpkg
         {
             System::println(System::Color::error, "Error: expected value after %s", option_name);
             Metrics::g_metrics.lock()->track_property("error", "error option name");
-            Commands::Help::print_usage();
+            Help::print_usage();
             Checks::exit_fail(VCPKG_LINE_INFO);
         }
 
@@ -25,7 +26,7 @@ namespace vcpkg
         {
             System::println(System::Color::error, "Error: %s specified multiple times", option_name);
             Metrics::g_metrics.lock()->track_property("error", "error option specified multiple times");
-            Commands::Help::print_usage();
+            Help::print_usage();
             Checks::exit_fail(VCPKG_LINE_INFO);
         }
 
@@ -38,7 +39,7 @@ namespace vcpkg
         {
             System::println(System::Color::error, "Error: conflicting values specified for --%s", option_name);
             Metrics::g_metrics.lock()->track_property("error", "error conflicting switches");
-            Commands::Help::print_usage();
+            Help::print_usage();
             Checks::exit_fail(VCPKG_LINE_INFO);
         }
         option_field = new_setting;
diff --git a/toolsrc/src/vcpkglib.cpp b/toolsrc/src/vcpkg/vcpkglib.cpp
index 5cdafdbc8..23c774210 100644
--- a/toolsrc/src/vcpkglib.cpp
+++ b/toolsrc/src/vcpkg/vcpkglib.cpp
@@ -1,11 +1,11 @@
 #include "pch.h"
 
-#include "Paragraphs.h"
-#include "metrics.h"
-#include "vcpkg_Files.h"
-#include "vcpkg_Strings.h"
-#include "vcpkg_Util.h"
-#include "vcpkglib.h"
+#include <vcpkg/base/files.h>
+#include <vcpkg/base/strings.h>
+#include <vcpkg/base/util.h>
+#include <vcpkg/metrics.h>
+#include <vcpkg/paragraphs.h>
+#include <vcpkg/vcpkglib.h>
 
 namespace vcpkg
 {
diff --git a/toolsrc/src/VcpkgPaths.cpp b/toolsrc/src/vcpkg/vcpkgpaths.cpp
index e8eb4f01c..f0e02db8a 100644
--- a/toolsrc/src/VcpkgPaths.cpp
+++ b/toolsrc/src/vcpkg/vcpkgpaths.cpp
@@ -1,12 +1,12 @@
 #include "pch.h"
 
-#include "PackageSpec.h"
-#include "VcpkgPaths.h"
-#include "metrics.h"
-#include "vcpkg_Files.h"
-#include "vcpkg_System.h"
-#include "vcpkg_Util.h"
-#include "vcpkg_expected.h"
+#include <vcpkg/base/expected.h>
+#include <vcpkg/base/files.h>
+#include <vcpkg/base/system.h>
+#include <vcpkg/base/util.h>
+#include <vcpkg/metrics.h>
+#include <vcpkg/packagespec.h>
+#include <vcpkg/vcpkgpaths.h>
 
 namespace vcpkg
 {
@@ -130,10 +130,10 @@ namespace vcpkg
 
     fs::path get_nuget_path(const fs::path& downloads_folder, const fs::path& scripts_folder)
     {
-        static constexpr std::array<int, 3> EXPECTED_VERSION = {4, 1, 0};
+        static constexpr std::array<int, 3> EXPECTED_VERSION = {4, 3, 0};
         static const std::wstring VERSION_CHECK_ARGUMENTS = Strings::WEMPTY;
 
-        const fs::path downloaded_copy = downloads_folder / "nuget-4.1.0" / "nuget.exe";
+        const fs::path downloaded_copy = downloads_folder / "nuget-4.3.0" / "nuget.exe";
         const std::vector<fs::path> from_path = Files::find_from_PATH(L"nuget");
 
         std::vector<fs::path> candidate_paths;
@@ -173,6 +173,34 @@ namespace vcpkg
         return fetch_dependency(scripts_folder, L"git", downloaded_copy, EXPECTED_VERSION);
     }
 
+    static fs::path get_ifw_installerbase_path(const fs::path& downloads_folder, const fs::path& scripts_folder)
+    {
+        static constexpr std::array<int, 3> EXPECTED_VERSION = {3, 1, 81};
+        static const std::wstring VERSION_CHECK_ARGUMENTS = L"--framework-version";
+
+        const fs::path downloaded_copy =
+            downloads_folder / "QtInstallerFramework-win-x86" / "bin" / "installerbase.exe";
+
+        std::vector<fs::path> candidate_paths;
+        candidate_paths.push_back(downloaded_copy);
+        // TODO: Uncomment later
+        // const std::vector<fs::path> from_path = Files::find_from_PATH(L"installerbase");
+        // candidate_paths.insert(candidate_paths.end(), from_path.cbegin(), from_path.cend());
+        // candidate_paths.push_back(fs::path(System::get_environment_variable(L"HOMEDRIVE").value_or("C:")) / "Qt" /
+        // "Tools" / "QtInstallerFramework" / "3.1" / "bin" / "installerbase.exe");
+        // candidate_paths.push_back(fs::path(System::get_environment_variable(L"HOMEDRIVE").value_or("C:")) / "Qt" /
+        // "QtIFW-3.1.0" / "bin" / "installerbase.exe");
+
+        const Optional<fs::path> path =
+            find_if_has_equal_or_greater_version(candidate_paths, VERSION_CHECK_ARGUMENTS, EXPECTED_VERSION);
+        if (const auto p = path.get())
+        {
+            return *p;
+        }
+
+        return fetch_dependency(scripts_folder, L"installerbase", downloaded_copy, EXPECTED_VERSION);
+    }
+
     Expected<VcpkgPaths> VcpkgPaths::create(const fs::path& vcpkg_root_dir)
     {
         std::error_code ec;
@@ -256,89 +284,51 @@ namespace vcpkg
         return this->nuget_exe.get_lazy([this]() { return get_nuget_path(this->downloads, this->scripts); });
     }
 
-    static std::vector<std::string> get_vs2017_installation_instances(const VcpkgPaths& paths)
+    const fs::path& VcpkgPaths::get_ifw_installerbase_exe() const
     {
-        const fs::path script = paths.scripts / "findVisualStudioInstallationInstances.ps1";
-        const std::wstring cmd = System::create_powershell_script_cmd(script);
-        const System::ExitCodeAndOutput ec_data = System::cmd_execute_and_capture_output(cmd);
-        Checks::check_exit(VCPKG_LINE_INFO, ec_data.exit_code == 0, "Could not run script to detect VS 2017 instances");
-        return Strings::split(ec_data.output, "\n");
+        return this->ifw_installerbase_exe.get_lazy(
+            [this]() { return get_ifw_installerbase_path(this->downloads, this->scripts); });
     }
 
-    static Optional<fs::path> get_vs2015_installation_instance()
+    const fs::path& VcpkgPaths::get_ifw_binarycreator_exe() const
     {
-        const Optional<std::wstring> vs2015_cmntools_optional = System::get_environment_variable(L"VS140COMNTOOLS");
-        if (const auto v = vs2015_cmntools_optional.get())
-        {
-            const fs::path vs2015_cmntools = fs::path(*v).parent_path(); // The call to parent_path() is needed because
-                                                                         // the env variable has a trailing backslash
-            return vs2015_cmntools.parent_path().parent_path();
-        }
-
-        return nullopt;
+        return this->ifw_binarycreator_exe.get_lazy(
+            [this]() { return get_ifw_installerbase_exe().parent_path() / "binarycreator.exe"; });
     }
 
-    static std::vector<Toolset> find_v120_toolset_instances(const Files::Filesystem& fs)
+    const fs::path& VcpkgPaths::get_ifw_repogen_exe() const
     {
-        using CPU = System::CPUArchitecture;
-
-        // Note: this will contain a mix of vcvarsall.bat locations and dumpbin.exe locations.
-        std::vector<fs::path> paths_examined;
-
-        std::vector<Toolset> found_toolsets;
-
-        // VS2013
-        const Optional<std::wstring> vs2013_cmntools_optional = System::get_environment_variable(L"VS120COMNTOOLS");
-        if (const auto vs120comntools = vs2013_cmntools_optional.get())
-        {
-            const fs::path vs2013_cmntools =
-                fs::path(*vs120comntools).parent_path(); // The call to parent_path() is needed because
-                                                         // the env variable has a trailing backslash
-            auto v = vs2013_cmntools.parent_path().parent_path();
+        return this->ifw_repogen_exe.get_lazy(
+            [this]() { return get_ifw_installerbase_exe().parent_path() / "repogen.exe"; });
+    }
 
-            const fs::path vs2013_vcvarsall_bat = v / "VC" / "vcvarsall.bat";
+    struct VisualStudioInstance
+    {
+        fs::path root_path;
+        std::string version;
+        std::string release_type;
+        std::string preference_weight; // Mostly unused, just for verification that order is as intended
 
-            paths_examined.push_back(vs2013_vcvarsall_bat);
-            if (fs.exists(vs2013_vcvarsall_bat))
-            {
-                const fs::path vs2013_dumpbin_exe = v / "VC" / "bin" / "dumpbin.exe";
-                paths_examined.push_back(vs2013_dumpbin_exe);
+        std::string major_version() const { return version.substr(0, 2); }
+    };
 
-                const fs::path vs2013_bin_dir = vs2013_vcvarsall_bat.parent_path() / "bin";
-                std::vector<ToolsetArchOption> supported_architectures;
-                if (fs.exists(vs2013_bin_dir / "vcvars32.bat"))
-                    supported_architectures.push_back({L"x86", CPU::X86, CPU::X86});
-                if (fs.exists(vs2013_bin_dir / "amd64\\vcvars64.bat"))
-                    supported_architectures.push_back({L"x64", CPU::X64, CPU::X64});
-                if (fs.exists(vs2013_bin_dir / "x86_amd64\\vcvarsx86_amd64.bat"))
-                    supported_architectures.push_back({L"x86_amd64", CPU::X86, CPU::X64});
-                if (fs.exists(vs2013_bin_dir / "x86_arm\\vcvarsx86_arm.bat"))
-                    supported_architectures.push_back({L"x86_arm", CPU::X86, CPU::ARM});
-                if (fs.exists(vs2013_bin_dir / "amd64_x86\\vcvarsamd64_x86.bat"))
-                    supported_architectures.push_back({L"amd64_x86", CPU::X64, CPU::X86});
-                if (fs.exists(vs2013_bin_dir / "amd64_arm\\vcvarsamd64_arm.bat"))
-                    supported_architectures.push_back({L"amd64_arm", CPU::X64, CPU::ARM});
-
-                if (fs.exists(vs2013_dumpbin_exe))
-                {
-                    found_toolsets.push_back(
-                        {vs2013_dumpbin_exe, vs2013_vcvarsall_bat, {}, V_120, supported_architectures});
-                }
-            }
-        }
+    static std::vector<VisualStudioInstance> get_visual_studio_instances(const VcpkgPaths& paths)
+    {
+        const fs::path script = paths.scripts / "findVisualStudioInstallationInstances.ps1";
+        const std::wstring cmd = System::create_powershell_script_cmd(script);
+        const System::ExitCodeAndOutput ec_data = System::cmd_execute_and_capture_output(cmd);
+        Checks::check_exit(
+            VCPKG_LINE_INFO, ec_data.exit_code == 0, "Could not run script to detect Visual Studio instances");
 
-        if (found_toolsets.empty())
+        const std::vector<std::string> instances_as_strings = Strings::split(ec_data.output, "\n");
+        std::vector<VisualStudioInstance> output;
+        for (const std::string& instance_as_string : instances_as_strings)
         {
-            System::println(System::Color::error, "Could not locate a complete toolset.");
-            System::println("The following paths were examined:");
-            for (const fs::path& path : paths_examined)
-            {
-                System::println("    %s", path.u8string());
-            }
-            Checks::exit_fail(VCPKG_LINE_INFO);
+            const std::vector<std::string> split = Strings::split(instance_as_string, "::");
+            output.push_back({split.at(3), split.at(2), split.at(1), split.at(0)});
         }
 
-        return found_toolsets;
+        return output;
     }
 
     static std::vector<Toolset> find_toolset_instances(const VcpkgPaths& paths)
@@ -352,93 +342,117 @@ namespace vcpkg
 
         std::vector<Toolset> found_toolsets;
 
-        // VS2015
-        const Optional<fs::path> vs_2015_installation_instance = get_vs2015_installation_instance();
-        if (const auto v = vs_2015_installation_instance.get())
-        {
-            const fs::path vs2015_vcvarsall_bat = *v / "VC" / "vcvarsall.bat";
+        const std::vector<VisualStudioInstance> vs_instances = get_visual_studio_instances(paths);
+        const bool v140_is_available = Util::find_if(vs_instances, [&](const VisualStudioInstance& vs_instance) {
+                                           return vs_instance.major_version() == "14";
+                                       }) != vs_instances.cend();
 
-            paths_examined.push_back(vs2015_vcvarsall_bat);
-            if (fs.exists(vs2015_vcvarsall_bat))
+        for (const VisualStudioInstance& vs_instance : vs_instances)
+        {
+            const std::string major_version = vs_instance.major_version();
+            if (major_version == "15")
             {
-                const fs::path vs2015_dumpbin_exe = *v / "VC" / "bin" / "dumpbin.exe";
-                paths_examined.push_back(vs2015_dumpbin_exe);
+                const fs::path vc_dir = vs_instance.root_path / "VC";
+
+                // Skip any instances that do not have vcvarsall.
+                const fs::path vcvarsall_dir = vc_dir / "Auxiliary" / "Build";
+                const fs::path vcvarsall_bat = vcvarsall_dir / "vcvarsall.bat";
+                paths_examined.push_back(vcvarsall_bat);
+                if (!fs.exists(vcvarsall_bat)) continue;
 
-                const fs::path vs2015_bin_dir = vs2015_vcvarsall_bat.parent_path() / "bin";
+                // Get all supported architectures
                 std::vector<ToolsetArchOption> supported_architectures;
-                if (fs.exists(vs2015_bin_dir / "vcvars32.bat"))
+                if (fs.exists(vcvarsall_dir / "vcvars32.bat"))
                     supported_architectures.push_back({L"x86", CPU::X86, CPU::X86});
-                if (fs.exists(vs2015_bin_dir / "amd64\\vcvars64.bat"))
-                    supported_architectures.push_back({L"x64", CPU::X64, CPU::X64});
-                if (fs.exists(vs2015_bin_dir / "x86_amd64\\vcvarsx86_amd64.bat"))
+                if (fs.exists(vcvarsall_dir / "vcvars64.bat"))
+                    supported_architectures.push_back({L"amd64", CPU::X64, CPU::X64});
+                if (fs.exists(vcvarsall_dir / "vcvarsx86_amd64.bat"))
                     supported_architectures.push_back({L"x86_amd64", CPU::X86, CPU::X64});
-                if (fs.exists(vs2015_bin_dir / "x86_arm\\vcvarsx86_arm.bat"))
+                if (fs.exists(vcvarsall_dir / "vcvarsx86_arm.bat"))
                     supported_architectures.push_back({L"x86_arm", CPU::X86, CPU::ARM});
-                if (fs.exists(vs2015_bin_dir / "amd64_x86\\vcvarsamd64_x86.bat"))
+                if (fs.exists(vcvarsall_dir / "vcvarsx86_arm64.bat"))
+                    supported_architectures.push_back({L"x86_arm64", CPU::X86, CPU::ARM64});
+                if (fs.exists(vcvarsall_dir / "vcvarsamd64_x86.bat"))
                     supported_architectures.push_back({L"amd64_x86", CPU::X64, CPU::X86});
-                if (fs.exists(vs2015_bin_dir / "amd64_arm\\vcvarsamd64_arm.bat"))
+                if (fs.exists(vcvarsall_dir / "vcvarsamd64_arm.bat"))
                     supported_architectures.push_back({L"amd64_arm", CPU::X64, CPU::ARM});
-
-                if (fs.exists(vs2015_dumpbin_exe))
+                if (fs.exists(vcvarsall_dir / "vcvarsamd64_arm64.bat"))
+                    supported_architectures.push_back({L"amd64_arm64", CPU::X64, CPU::ARM64});
+
+                // Locate the "best" MSVC toolchain version
+                const fs::path msvc_path = vc_dir / "Tools" / "MSVC";
+                std::vector<fs::path> msvc_subdirectories = fs.get_files_non_recursive(msvc_path);
+                Util::unstable_keep_if(msvc_subdirectories,
+                                       [&fs](const fs::path& path) { return fs.is_directory(path); });
+
+                // Sort them so that latest comes first
+                std::sort(
+                    msvc_subdirectories.begin(),
+                    msvc_subdirectories.end(),
+                    [](const fs::path& left, const fs::path& right) { return left.filename() > right.filename(); });
+
+                for (const fs::path& subdir : msvc_subdirectories)
                 {
-                    found_toolsets.push_back(
-                        {vs2015_dumpbin_exe, vs2015_vcvarsall_bat, {}, V_140, supported_architectures});
+                    const fs::path dumpbin_path = subdir / "bin" / "HostX86" / "x86" / "dumpbin.exe";
+                    paths_examined.push_back(dumpbin_path);
+                    if (fs.exists(dumpbin_path))
+                    {
+                        found_toolsets.push_back(Toolset{
+                            vs_instance.root_path, dumpbin_path, vcvarsall_bat, {}, V_141, supported_architectures});
+
+                        if (v140_is_available)
+                        {
+                            found_toolsets.push_back(Toolset{vs_instance.root_path,
+                                                             dumpbin_path,
+                                                             vcvarsall_bat,
+                                                             {L"-vcvars_ver=14.0"},
+                                                             V_140,
+                                                             supported_architectures});
+                        }
+
+                        break;
+                    }
                 }
+
+                continue;
             }
-        }
 
-        // VS2017
-        Optional<Toolset> vs2017_toolset;
-        const std::vector<std::string> vs2017_installation_instances = get_vs2017_installation_instances(paths);
-        for (const std::string& instance : vs2017_installation_instances)
-        {
-            const fs::path vc_dir = fs::path{instance} / "VC";
-
-            // Skip any instances that do not have vcvarsall.
-            const fs::path vcvarsall_dir = vc_dir / "Auxiliary" / "Build";
-            const fs::path vcvarsall_bat = vcvarsall_dir / "vcvarsall.bat";
-            paths_examined.push_back(vcvarsall_bat);
-            if (!fs.exists(vcvarsall_bat)) continue;
-
-            // Get all supported architectures
-            std::vector<ToolsetArchOption> supported_architectures;
-            if (fs.exists(vcvarsall_dir / "vcvars32.bat"))
-                supported_architectures.push_back({L"x86", CPU::X86, CPU::X86});
-            if (fs.exists(vcvarsall_dir / "vcvars64.bat"))
-                supported_architectures.push_back({L"amd64", CPU::X64, CPU::X64});
-            if (fs.exists(vcvarsall_dir / "vcvarsx86_amd64.bat"))
-                supported_architectures.push_back({L"x86_amd64", CPU::X86, CPU::X64});
-            if (fs.exists(vcvarsall_dir / "vcvarsx86_arm.bat"))
-                supported_architectures.push_back({L"x86_arm", CPU::X86, CPU::ARM});
-            if (fs.exists(vcvarsall_dir / "vcvarsamd64_x86.bat"))
-                supported_architectures.push_back({L"amd64_x86", CPU::X64, CPU::X86});
-            if (fs.exists(vcvarsall_dir / "vcvarsamd64_arm.bat"))
-                supported_architectures.push_back({L"amd64_arm", CPU::X64, CPU::ARM});
-
-            // Locate the "best" MSVC toolchain version
-            const fs::path msvc_path = vc_dir / "Tools" / "MSVC";
-            std::vector<fs::path> msvc_subdirectories = fs.get_files_non_recursive(msvc_path);
-            Util::unstable_keep_if(msvc_subdirectories, [&fs](const fs::path& path) { return fs.is_directory(path); });
-
-            // Sort them so that latest comes first
-            std::sort(msvc_subdirectories.begin(),
-                      msvc_subdirectories.end(),
-                      [](const fs::path& left, const fs::path& right) { return left.filename() > right.filename(); });
-
-            for (const fs::path& subdir : msvc_subdirectories)
+            if (major_version == "14" || major_version == "12")
             {
-                const fs::path dumpbin_path = subdir / "bin" / "HostX86" / "x86" / "dumpbin.exe";
-                paths_examined.push_back(dumpbin_path);
-                if (fs.exists(dumpbin_path))
+                const fs::path vcvarsall_bat = vs_instance.root_path / "VC" / "vcvarsall.bat";
+
+                paths_examined.push_back(vcvarsall_bat);
+                if (fs.exists(vcvarsall_bat))
                 {
-                    vs2017_toolset = Toolset{dumpbin_path, vcvarsall_bat, {}, V_141, supported_architectures};
-                    break;
+                    const fs::path vs_dumpbin_exe = vs_instance.root_path / "VC" / "bin" / "dumpbin.exe";
+                    paths_examined.push_back(vs_dumpbin_exe);
+
+                    const fs::path vs_bin_dir = vcvarsall_bat.parent_path() / "bin";
+                    std::vector<ToolsetArchOption> supported_architectures;
+                    if (fs.exists(vs_bin_dir / "vcvars32.bat"))
+                        supported_architectures.push_back({L"x86", CPU::X86, CPU::X86});
+                    if (fs.exists(vs_bin_dir / "amd64\\vcvars64.bat"))
+                        supported_architectures.push_back({L"x64", CPU::X64, CPU::X64});
+                    if (fs.exists(vs_bin_dir / "x86_amd64\\vcvarsx86_amd64.bat"))
+                        supported_architectures.push_back({L"x86_amd64", CPU::X86, CPU::X64});
+                    if (fs.exists(vs_bin_dir / "x86_arm\\vcvarsx86_arm.bat"))
+                        supported_architectures.push_back({L"x86_arm", CPU::X86, CPU::ARM});
+                    if (fs.exists(vs_bin_dir / "amd64_x86\\vcvarsamd64_x86.bat"))
+                        supported_architectures.push_back({L"amd64_x86", CPU::X64, CPU::X86});
+                    if (fs.exists(vs_bin_dir / "amd64_arm\\vcvarsamd64_arm.bat"))
+                        supported_architectures.push_back({L"amd64_arm", CPU::X64, CPU::ARM});
+
+                    if (fs.exists(vs_dumpbin_exe))
+                    {
+                        found_toolsets.push_back({vs_instance.root_path,
+                                                  vs_dumpbin_exe,
+                                                  vcvarsall_bat,
+                                                  {},
+							                      major_version == "14" ? V_140 : V_120,
+                                                  supported_architectures});
+                    }
                 }
             }
-            if (const auto value = vs2017_toolset.get())
-            {
-                found_toolsets.push_back(*value);
-            }
         }
 
         if (found_toolsets.empty())
@@ -455,72 +469,54 @@ namespace vcpkg
         return found_toolsets;
     }
 
-    static std::vector<Toolset> create_vs2017_v140_toolset_instances(const std::vector<Toolset>& vs_toolsets)
+    const Toolset& VcpkgPaths::get_toolset(const Optional<std::string>& toolset_version,
+                                           const Optional<fs::path>& visual_studio_path) const
     {
-        std::vector<Toolset> vs2017_v140_toolsets;
-
-        // In constrast to v141 and above, there can only be a single instance of v140 (VS2017 vs VS2015).
-        const auto it = Util::find_if(vs_toolsets, [&](const Toolset& t) { return t.version == V_140; });
-
-        // If v140 is not available, then VS2017 cant use them. Return empty.
-        if (it == vs_toolsets.cend())
-        {
-            return vs2017_v140_toolsets;
-        }
-
-        // If it does exist, then create a matching v140 toolset for each v141 toolset
-        const Toolset v140_toolset = *it;
-        for (const Toolset& toolset : vs_toolsets)
-        {
-            if (toolset.version != V_141)
-            {
-                continue;
-            }
-
-            Toolset t = Toolset{
-                toolset.dumpbin, toolset.vcvarsall, {L"-vcvars_ver=14.0"}, V_140, toolset.supported_architectures};
-            vs2017_v140_toolsets.push_back(std::move(t));
-        }
-
-        return vs2017_v140_toolsets;
-    }
-
-    const Toolset& VcpkgPaths::get_toolset(const std::string& toolset_version) const
-    {
-        const std::wstring& w_toolset_version = Strings::to_utf16(toolset_version);
-
-        if (w_toolset_version == V_120)
-        {
-            const auto& v120_toolsets = this->toolsets_vs2013.get_lazy(
-                [this]() { return find_v120_toolset_instances(this->get_filesystem()); });
-            Checks::check_exit(VCPKG_LINE_INFO, v120_toolsets.size() > 0);
-            return v120_toolsets.back();
-        }
-
         // Invariant: toolsets are non-empty and sorted with newest at back()
         const std::vector<Toolset>& vs_toolsets =
             this->toolsets.get_lazy([this]() { return find_toolset_instances(*this); });
 
-        if (w_toolset_version.empty())
+        std::vector<const Toolset*> candidates = Util::element_pointers(vs_toolsets);
+        const auto tsv = toolset_version.get();
+        const auto vsp = visual_studio_path.get();
+
+        if (tsv && vsp)
         {
-            return vs_toolsets.back();
+            const std::wstring w_toolset_version = Strings::to_utf16(*tsv);
+            const fs::path vs_root_path = *vsp;
+            Util::stable_keep_if(candidates, [&](const Toolset* t) {
+                return w_toolset_version == t->version && vs_root_path == t->visual_studio_root_path;
+            });
+            Checks::check_exit(VCPKG_LINE_INFO,
+                               !candidates.empty(),
+                               "Could not find Visual Studio instace at %s with %s toolset.",
+                               vs_root_path.generic_string(),
+                               *tsv);
+
+            Checks::check_exit(VCPKG_LINE_INFO, candidates.size() == 1);
+            return *candidates.back();
         }
 
-        const auto toolset =
-            Util::find_if(vs_toolsets, [&](const Toolset& t) { return w_toolset_version == t.version; });
-        Checks::check_exit(
-            VCPKG_LINE_INFO, toolset != vs_toolsets.end(), "Could not find toolset '%s'", toolset_version);
+        if (tsv)
+        {
+            const std::wstring w_toolset_version = Strings::to_utf16(*tsv);
+            Util::stable_keep_if(candidates, [&](const Toolset* t) { return w_toolset_version == t->version; });
+            Checks::check_exit(
+                VCPKG_LINE_INFO, !candidates.empty(), "Could not find Visual Studio instace with %s toolset.", *tsv);
+        }
 
-        // If v140 is the selected toolset and VS2017 is available, then use VS2017's vcvarsall with the
-        // -vcvars_ver=14.0 option
-        const std::vector<Toolset>& vs2017_v140_toolsets = this->toolsets_vs2017_v140.get_lazy(
-            [&vs_toolsets]() { return create_vs2017_v140_toolset_instances(vs_toolsets); });
-        if (w_toolset_version == V_140 && !vs2017_v140_toolsets.empty())
+        if (vsp)
         {
-            return vs2017_v140_toolsets.back();
+            const fs::path vs_root_path = *vsp;
+            Util::stable_keep_if(candidates,
+                                 [&](const Toolset* t) { return vs_root_path == t->visual_studio_root_path; });
+            Checks::check_exit(VCPKG_LINE_INFO,
+                               !candidates.empty(),
+                               "Could not find Visual Studio instace at %s.",
+                               vs_root_path.generic_string());
         }
 
-        return *toolset;
+        return *candidates.front();
     }
 
     Files::Filesystem& VcpkgPaths::get_filesystem() const { return Files::get_real_filesystem(); }
diff --git a/toolsrc/src/VersionT.cpp b/toolsrc/src/vcpkg/versiont.cpp
index 738d2ce88..1c52d674a 100644
--- a/toolsrc/src/VersionT.cpp
+++ b/toolsrc/src/vcpkg/versiont.cpp
@@ -1,7 +1,7 @@
 #include "pch.h"
 
-#include "VersionT.h"
-#include "vcpkg_Strings.h"
+#include <vcpkg/base/strings.h>
+#include <vcpkg/versiont.h>
 
 namespace vcpkg
 {
diff --git a/toolsrc/src/vcpkg_Build_BuildPolicy.cpp b/toolsrc/src/vcpkg_Build_BuildPolicy.cpp
deleted file mode 100644
index b3bb778dc..000000000
--- a/toolsrc/src/vcpkg_Build_BuildPolicy.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-#include "pch.h"
-
-#include "vcpkg_Build.h"
-#include "vcpkg_Checks.h"
-#include "vcpkg_Enums.h"
-
-namespace vcpkg::Build
-{
-    static const std::string NAME_EMPTY_PACKAGE = "PolicyEmptyPackage";
-    static const std::string NAME_DLLS_WITHOUT_LIBS = "PolicyDLLsWithoutLIBs";
-    static const std::string NAME_ONLY_RELEASE_CRT = "PolicyOnlyReleaseCRT";
-    static const std::string NAME_EMPTY_INCLUDE_FOLDER = "PolicyEmptyIncludeFolder";
-    static const std::string NAME_ALLOW_OBSOLETE_MSVCRT = "PolicyAllowObsoleteMsvcrt";
-
-    const std::string& to_string(BuildPolicy policy)
-    {
-        switch (policy)
-        {
-            case BuildPolicy::EMPTY_PACKAGE: return NAME_EMPTY_PACKAGE;
-            case BuildPolicy::DLLS_WITHOUT_LIBS: return NAME_DLLS_WITHOUT_LIBS;
-            case BuildPolicy::ONLY_RELEASE_CRT: return NAME_ONLY_RELEASE_CRT;
-            case BuildPolicy::EMPTY_INCLUDE_FOLDER: return NAME_EMPTY_INCLUDE_FOLDER;
-            case BuildPolicy::ALLOW_OBSOLETE_MSVCRT: return NAME_ALLOW_OBSOLETE_MSVCRT;
-            default: Checks::unreachable(VCPKG_LINE_INFO);
-        }
-    }
-
-    CStringView to_cmake_variable(BuildPolicy policy)
-    {
-        switch (policy)
-        {
-            case BuildPolicy::EMPTY_PACKAGE: return "VCPKG_POLICY_EMPTY_PACKAGE";
-            case BuildPolicy::DLLS_WITHOUT_LIBS: return "VCPKG_POLICY_DLLS_WITHOUT_LIBS";
-            case BuildPolicy::ONLY_RELEASE_CRT: return "VCPKG_POLICY_ONLY_RELEASE_CRT";
-            case BuildPolicy::EMPTY_INCLUDE_FOLDER: return "VCPKG_POLICY_EMPTY_INCLUDE_FOLDER";
-            case BuildPolicy::ALLOW_OBSOLETE_MSVCRT: return "VCPKG_POLICY_ALLOW_OBSOLETE_MSVCRT";
-            default: Checks::unreachable(VCPKG_LINE_INFO);
-        }
-    }
-}
diff --git a/toolsrc/src/vcpkg_metrics_uploader.cpp b/toolsrc/src/vcpkgmetricsuploader.cpp
index cef4f4756..2239fe750 100644
--- a/toolsrc/src/vcpkg_metrics_uploader.cpp
+++ b/toolsrc/src/vcpkgmetricsuploader.cpp
@@ -1,6 +1,8 @@
-#include "metrics.h"
-#include "vcpkg_Checks.h"
-#include "vcpkg_Files.h"
+#include <vcpkg/metrics.h>
+
+#include <vcpkg/base/checks.h>
+#include <vcpkg/base/files.h>
+
 #include <Windows.h>
 
 using namespace vcpkg;
diff --git a/toolsrc/vcpkglib/vcpkglib.vcxproj b/toolsrc/vcpkglib/vcpkglib.vcxproj
index edecd7720..ae332e015 100644
--- a/toolsrc/vcpkglib/vcpkglib.vcxproj
+++ b/toolsrc/vcpkglib/vcpkglib.vcxproj
@@ -136,110 +136,114 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="..\include\BinaryParagraph.h" />
-    <ClInclude Include="..\include\CStringView.h" />
-    <ClInclude Include="..\include\lazy.h" />
-    <ClInclude Include="..\include\LineInfo.h" />
-    <ClInclude Include="..\include\ParagraphParseResult.h" />
-    <ClInclude Include="..\include\PostBuildLint_BuildType.h" />
-    <ClInclude Include="..\include\Span.h" />
-    <ClInclude Include="..\include\vcpkg_Build.h" />
-    <ClInclude Include="..\include\coff_file_reader.h" />
-    <ClInclude Include="..\include\vcpkg_expected.h" />
-    <ClInclude Include="..\include\filesystem_fs.h" />
-    <ClInclude Include="..\include\SortedVector.h" />
-    <ClInclude Include="..\include\MachineType.h" />
-    <ClInclude Include="..\include\metrics.h" />
-    <ClInclude Include="..\include\PackageSpec.h" />
-    <ClInclude Include="..\include\PackageSpecParseResult.h" />
-    <ClInclude Include="..\include\Paragraphs.h" />
     <ClInclude Include="..\include\pch.h" />
-    <ClInclude Include="..\include\PostBuildLint.h" />
-    <ClInclude Include="..\include\SourceParagraph.h" />
-    <ClInclude Include="..\include\StatusParagraph.h" />
-    <ClInclude Include="..\include\StatusParagraphs.h" />
-    <ClInclude Include="..\include\vcpkg_Chrono.h" />
-    <ClInclude Include="..\include\triplet.h" />
-    <ClInclude Include="..\include\vcpkglib.h" />
-    <ClInclude Include="..\include\vcpkg_GlobalState.h" />
-    <ClInclude Include="..\include\vcpkg_Parse.h" />
-    <ClInclude Include="..\include\vcpkg_Checks.h" />
-    <ClInclude Include="..\include\VcpkgCmdArguments.h" />
-    <ClInclude Include="..\include\vcpkg_Commands.h" />
-    <ClInclude Include="..\include\vcpkg_Dependencies.h" />
-    <ClInclude Include="..\include\vcpkg_Enums.h" />
-    <ClInclude Include="..\include\vcpkg_Files.h" />
-    <ClInclude Include="..\include\vcpkg_Graphs.h" />
-    <ClInclude Include="..\include\vcpkg_Input.h" />
-    <ClInclude Include="..\include\vcpkg_Maps.h" />
-    <ClInclude Include="..\include\vcpkg_optional.h" />
-    <ClInclude Include="..\include\VcpkgPaths.h" />
-    <ClInclude Include="..\include\vcpkg_Strings.h" />
-    <ClInclude Include="..\include\vcpkg_System.h" />
-    <ClInclude Include="..\include\vcpkg_Util.h" />
-    <ClInclude Include="..\include\VersionT.h" />
+    <ClInclude Include="..\include\vcpkg\base\checks.h" />
+    <ClInclude Include="..\include\vcpkg\base\chrono.h" />
+    <ClInclude Include="..\include\vcpkg\base\cofffilereader.h" />
+    <ClInclude Include="..\include\vcpkg\base\cstringview.h" />
+    <ClInclude Include="..\include\vcpkg\base\enums.h" />
+    <ClInclude Include="..\include\vcpkg\base\expected.h" />
+    <ClInclude Include="..\include\vcpkg\base\files.h" />
+    <ClInclude Include="..\include\vcpkg\base\graphs.h" />
+    <ClInclude Include="..\include\vcpkg\base\lazy.h" />
+    <ClInclude Include="..\include\vcpkg\base\lineinfo.h" />
+    <ClInclude Include="..\include\vcpkg\base\machinetype.h" />
+    <ClInclude Include="..\include\vcpkg\base\optional.h" />
+    <ClInclude Include="..\include\vcpkg\base\sortedvector.h" />
+    <ClInclude Include="..\include\vcpkg\base\span.h" />
+    <ClInclude Include="..\include\vcpkg\base\strings.h" />
+    <ClInclude Include="..\include\vcpkg\base\system.h" />
+    <ClInclude Include="..\include\vcpkg\base\util.h" />
+    <ClInclude Include="..\include\vcpkg\binaryparagraph.h" />
+    <ClInclude Include="..\include\vcpkg\build.h" />
+    <ClInclude Include="..\include\vcpkg\commands.h" />
+    <ClInclude Include="..\include\vcpkg\dependencies.h" />
+    <ClInclude Include="..\include\vcpkg\export.h" />
+    <ClInclude Include="..\include\vcpkg\export.ifw.h" />
+    <ClInclude Include="..\include\vcpkg\globalstate.h" />
+    <ClInclude Include="..\include\vcpkg\help.h" />
+    <ClInclude Include="..\include\vcpkg\input.h" />
+    <ClInclude Include="..\include\vcpkg\install.h" />
+    <ClInclude Include="..\include\vcpkg\metrics.h" />
+    <ClInclude Include="..\include\vcpkg\packagespec.h" />
+    <ClInclude Include="..\include\vcpkg\packagespecparseresult.h" />
+    <ClInclude Include="..\include\vcpkg\paragraphparseresult.h" />
+    <ClInclude Include="..\include\vcpkg\paragraphs.h" />
+    <ClInclude Include="..\include\vcpkg\parse.h" />
+    <ClInclude Include="..\include\vcpkg\postbuildlint.h" />
+    <ClInclude Include="..\include\vcpkg\postbuildlint.buildtype.h" />
+    <ClInclude Include="..\include\vcpkg\remove.h" />
+    <ClInclude Include="..\include\vcpkg\sourceparagraph.h" />
+    <ClInclude Include="..\include\vcpkg\statusparagraph.h" />
+    <ClInclude Include="..\include\vcpkg\statusparagraphs.h" />
+    <ClInclude Include="..\include\vcpkg\triplet.h" />
+    <ClInclude Include="..\include\vcpkg\update.h" />
+    <ClInclude Include="..\include\vcpkg\vcpkgcmdarguments.h" />
+    <ClInclude Include="..\include\vcpkg\vcpkglib.h" />
+    <ClInclude Include="..\include\vcpkg\vcpkgpaths.h" />
+    <ClInclude Include="..\include\vcpkg\versiont.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\src\BinaryParagraph.cpp" />
-    <ClCompile Include="..\src\commands_ci.cpp" />
-    <ClCompile Include="..\src\commands_depends.cpp" />
-    <ClCompile Include="..\src\commands_env.cpp" />
-    <ClCompile Include="..\src\commands_export.cpp" />
-    <ClCompile Include="..\src\LineInfo.cpp" />
-    <ClCompile Include="..\src\ParagraphParseResult.cpp" />
-    <ClCompile Include="..\src\vcpkg_Build.cpp" />
-    <ClCompile Include="..\src\vcpkg_Build_BuildPolicy.cpp" />
-    <ClCompile Include="..\src\coff_file_reader.cpp" />
-    <ClCompile Include="..\src\commands_available_commands.cpp" />
-    <ClCompile Include="..\src\commands_build.cpp" />
-    <ClCompile Include="..\src\commands_build_external.cpp" />
-    <ClCompile Include="..\src\commands_cache.cpp" />
-    <ClCompile Include="..\src\commands_contact.cpp" />
-    <ClCompile Include="..\src\commands_create.cpp" />
-    <ClCompile Include="..\src\commands_edit.cpp" />
-    <ClCompile Include="..\src\commands_hash.cpp" />
-    <ClCompile Include="..\src\commands_help.cpp" />
-    <ClCompile Include="..\src\commands_import.cpp" />
-    <ClCompile Include="..\src\commands_install.cpp" />
-    <ClCompile Include="..\src\commands_integrate.cpp" />
-    <ClCompile Include="..\src\commands_list.cpp" />
-    <ClCompile Include="..\src\commands_owns.cpp" />
-    <ClCompile Include="..\src\commands_portsdiff.cpp" />
-    <ClCompile Include="..\src\commands_remove.cpp" />
-    <ClCompile Include="..\src\commands_search.cpp" />
-    <ClCompile Include="..\src\commands_update.cpp" />
-    <ClCompile Include="..\src\commands_version.cpp" />
-    <ClCompile Include="..\src\MachineType.cpp" />
-    <ClCompile Include="..\src\metrics.cpp" />
     <ClCompile Include="..\src\pch.cpp">
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
       <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
     </ClCompile>
-    <ClCompile Include="..\src\PostBuildLint.cpp" />
-    <ClCompile Include="..\src\PostBuildLint_BuildType.cpp" />
-    <ClCompile Include="..\src\vcpkg_Chrono.cpp" />
-    <ClCompile Include="..\src\vcpkglib.cpp" />
-    <ClCompile Include="..\src\PackageSpec.cpp" />
-    <ClCompile Include="..\src\PackageSpecParseResult.cpp" />
-    <ClCompile Include="..\src\Paragraphs.cpp" />
-    <ClCompile Include="..\src\SourceParagraph.cpp" />
-    <ClCompile Include="..\src\StatusParagraph.cpp" />
-    <ClCompile Include="..\src\StatusParagraphs.cpp" />
-    <ClCompile Include="..\src\triplet.cpp" />
-    <ClCompile Include="..\src\vcpkg_GlobalState.cpp" />
-    <ClCompile Include="..\src\vcpkg_Parse.cpp" />
-    <ClCompile Include="..\src\vcpkg_Checks.cpp" />
-    <ClCompile Include="..\src\VcpkgCmdArguments.cpp" />
-    <ClCompile Include="..\src\vcpkg_Dependencies.cpp" />
-    <ClCompile Include="..\src\vcpkg_Enums.cpp" />
-    <ClCompile Include="..\src\vcpkg_Files.cpp" />
-    <ClCompile Include="..\src\vcpkg_Input.cpp" />
-    <ClCompile Include="..\src\VcpkgPaths.cpp" />
-    <ClCompile Include="..\src\vcpkg_Strings.cpp" />
-    <ClCompile Include="..\src\vcpkg_System.cpp" />
-    <ClCompile Include="..\src\VersionT.cpp" />
+    <ClCompile Include="..\src\vcpkg\base\checks.cpp" />
+    <ClCompile Include="..\src\vcpkg\base\chrono.cpp" />
+    <ClCompile Include="..\src\vcpkg\base\cofffilereader.cpp" />
+    <ClCompile Include="..\src\vcpkg\base\enums.cpp" />
+    <ClCompile Include="..\src\vcpkg\base\files.cpp" />
+    <ClCompile Include="..\src\vcpkg\base\lineinfo.cpp" />
+    <ClCompile Include="..\src\vcpkg\base\machinetype.cpp" />
+    <ClCompile Include="..\src\vcpkg\base\strings.cpp" />
+    <ClCompile Include="..\src\vcpkg\base\system.cpp" />
+    <ClCompile Include="..\src\vcpkg\binaryparagraph.cpp" />
+    <ClCompile Include="..\src\vcpkg\build.cpp" />
+    <ClCompile Include="..\src\vcpkg\commands.autocomplete.cpp" />
+    <ClCompile Include="..\src\vcpkg\commands.buildexternal.cpp" />
+    <ClCompile Include="..\src\vcpkg\commands.cache.cpp" />
+    <ClCompile Include="..\src\vcpkg\commands.ci.cpp" />
+    <ClCompile Include="..\src\vcpkg\commands.contact.cpp" />
+    <ClCompile Include="..\src\vcpkg\commands.cpp" />
+    <ClCompile Include="..\src\vcpkg\commands.create.cpp" />
+    <ClCompile Include="..\src\vcpkg\commands.dependinfo.cpp" />
+    <ClCompile Include="..\src\vcpkg\commands.edit.cpp" />
+    <ClCompile Include="..\src\vcpkg\commands.env.cpp" />
+    <ClCompile Include="..\src\vcpkg\commands.exportifw.cpp" />
+    <ClCompile Include="..\src\vcpkg\commands.hash.cpp" />
+    <ClCompile Include="..\src\vcpkg\commands.import.cpp" />
+    <ClCompile Include="..\src\vcpkg\commands.integrate.cpp" />
+    <ClCompile Include="..\src\vcpkg\commands.list.cpp" />
+    <ClCompile Include="..\src\vcpkg\commands.owns.cpp" />
+    <ClCompile Include="..\src\vcpkg\commands.portsdiff.cpp" />
+    <ClCompile Include="..\src\vcpkg\commands.search.cpp" />
+    <ClCompile Include="..\src\vcpkg\commands.version.cpp" />
+    <ClCompile Include="..\src\vcpkg\dependencies.cpp" />
+    <ClCompile Include="..\src\vcpkg\export.cpp" />
+    <ClCompile Include="..\src\vcpkg\globalstate.cpp" />
+    <ClCompile Include="..\src\vcpkg\help.cpp" />
+    <ClCompile Include="..\src\vcpkg\input.cpp" />
+    <ClCompile Include="..\src\vcpkg\install.cpp" />
+    <ClCompile Include="..\src\vcpkg\metrics.cpp" />
+    <ClCompile Include="..\src\vcpkg\packagespec.cpp" />
+    <ClCompile Include="..\src\vcpkg\packagespecparseresult.cpp" />
+    <ClCompile Include="..\src\vcpkg\paragraphparseresult.cpp" />
+    <ClCompile Include="..\src\vcpkg\paragraphs.cpp" />
+    <ClCompile Include="..\src\vcpkg\parse.cpp" />
+    <ClCompile Include="..\src\vcpkg\postbuildlint.buildtype.cpp" />
+    <ClCompile Include="..\src\vcpkg\postbuildlint.cpp" />
+    <ClCompile Include="..\src\vcpkg\remove.cpp" />
+    <ClCompile Include="..\src\vcpkg\sourceparagraph.cpp" />
+    <ClCompile Include="..\src\vcpkg\statusparagraph.cpp" />
+    <ClCompile Include="..\src\vcpkg\statusparagraphs.cpp" />
+    <ClCompile Include="..\src\vcpkg\triplet.cpp" />
+    <ClCompile Include="..\src\vcpkg\update.cpp" />
+    <ClCompile Include="..\src\vcpkg\vcpkgcmdarguments.cpp" />
+    <ClCompile Include="..\src\vcpkg\vcpkglib.cpp" />
+    <ClCompile Include="..\src\vcpkg\vcpkgpaths.cpp" />
+    <ClCompile Include="..\src\vcpkg\versiont.cpp" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/toolsrc/vcpkglib/vcpkglib.vcxproj.filters b/toolsrc/vcpkglib/vcpkglib.vcxproj.filters
index 2fbf3d929..e902bffbb 100644
--- a/toolsrc/vcpkglib/vcpkglib.vcxproj.filters
+++ b/toolsrc/vcpkglib/vcpkglib.vcxproj.filters
@@ -13,300 +13,324 @@
       <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
       <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
     </Filter>
+    <Filter Include="Header Files\vcpkg">
+      <UniqueIdentifier>{69f6b6e6-5ac4-4419-a256-b8a6b0392720}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Header Files\vcpkg\base">
+      <UniqueIdentifier>{4a229410-0d09-4dab-953b-f434d6483f96}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\vcpkg">
+      <UniqueIdentifier>{75592043-ab63-4905-beee-568a6ab8bf93}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files\vcpkg\base">
+      <UniqueIdentifier>{fa1f10e7-58d2-4f7c-ac26-a979baa70061}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\src\SourceParagraph.cpp">
+    <ClCompile Include="..\src\pch.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\BinaryParagraph.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\src\vcpkg\binaryparagraph.cpp">
+      <Filter>Source Files\vcpkg</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\StatusParagraph.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\src\vcpkg\build.cpp">
+      <Filter>Source Files\vcpkg</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\StatusParagraphs.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\src\vcpkg\commands.autocomplete.cpp">
+      <Filter>Source Files\vcpkg</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\triplet.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\src\vcpkg\commands.buildexternal.cpp">
+      <Filter>Source Files\vcpkg</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\Paragraphs.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\src\vcpkg\commands.cache.cpp">
+      <Filter>Source Files\vcpkg</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\metrics.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\src\vcpkg\commands.ci.cpp">
+      <Filter>Source Files\vcpkg</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\vcpkg_Input.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\src\vcpkg\commands.contact.cpp">
+      <Filter>Source Files\vcpkg</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\coff_file_reader.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\src\vcpkg\commands.cpp">
+      <Filter>Source Files\vcpkg</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\commands_available_commands.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\src\vcpkg\commands.create.cpp">
+      <Filter>Source Files\vcpkg</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\commands_build.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\src\vcpkg\commands.dependinfo.cpp">
+      <Filter>Source Files\vcpkg</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\commands_build_external.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\src\vcpkg\commands.edit.cpp">
+      <Filter>Source Files\vcpkg</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\commands_cache.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\src\vcpkg\commands.env.cpp">
+      <Filter>Source Files\vcpkg</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\commands_contact.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\src\vcpkg\commands.exportifw.cpp">
+      <Filter>Source Files\vcpkg</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\commands_create.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\src\vcpkg\commands.hash.cpp">
+      <Filter>Source Files\vcpkg</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\commands_edit.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\src\vcpkg\commands.import.cpp">
+      <Filter>Source Files\vcpkg</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\commands_hash.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\src\vcpkg\commands.integrate.cpp">
+      <Filter>Source Files\vcpkg</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\commands_help.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\src\vcpkg\commands.list.cpp">
+      <Filter>Source Files\vcpkg</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\commands_import.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\src\vcpkg\commands.owns.cpp">
+      <Filter>Source Files\vcpkg</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\commands_install.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\src\vcpkg\commands.portsdiff.cpp">
+      <Filter>Source Files\vcpkg</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\commands_integrate.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\src\vcpkg\commands.search.cpp">
+      <Filter>Source Files\vcpkg</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\commands_list.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\src\vcpkg\commands.version.cpp">
+      <Filter>Source Files\vcpkg</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\commands_owns.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\src\vcpkg\dependencies.cpp">
+      <Filter>Source Files\vcpkg</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\commands_portsdiff.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\src\vcpkg\export.cpp">
+      <Filter>Source Files\vcpkg</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\commands_remove.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\src\vcpkg\globalstate.cpp">
+      <Filter>Source Files\vcpkg</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\commands_search.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\src\vcpkg\help.cpp">
+      <Filter>Source Files\vcpkg</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\commands_update.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\src\vcpkg\input.cpp">
+      <Filter>Source Files\vcpkg</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\commands_version.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\src\vcpkg\install.cpp">
+      <Filter>Source Files\vcpkg</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\MachineType.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\src\vcpkg\metrics.cpp">
+      <Filter>Source Files\vcpkg</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\vcpkg_Dependencies.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\src\vcpkg\packagespec.cpp">
+      <Filter>Source Files\vcpkg</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\vcpkglib.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\src\vcpkg\packagespecparseresult.cpp">
+      <Filter>Source Files\vcpkg</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\vcpkg_System.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\src\vcpkg\paragraphparseresult.cpp">
+      <Filter>Source Files\vcpkg</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\vcpkg_Checks.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\src\vcpkg\paragraphs.cpp">
+      <Filter>Source Files\vcpkg</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\vcpkg_Files.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\src\vcpkg\parse.cpp">
+      <Filter>Source Files\vcpkg</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\vcpkg_Strings.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\src\vcpkg\postbuildlint.buildtype.cpp">
+      <Filter>Source Files\vcpkg</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\pch.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\src\vcpkg\postbuildlint.cpp">
+      <Filter>Source Files\vcpkg</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\PostBuildLint.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\src\vcpkg\remove.cpp">
+      <Filter>Source Files\vcpkg</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\PostBuildLint_BuildType.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\src\vcpkg\sourceparagraph.cpp">
+      <Filter>Source Files\vcpkg</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\vcpkg_Enums.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\src\vcpkg\statusparagraph.cpp">
+      <Filter>Source Files\vcpkg</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\commands_ci.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\src\vcpkg\statusparagraphs.cpp">
+      <Filter>Source Files\vcpkg</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\vcpkg_Chrono.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\src\vcpkg\triplet.cpp">
+      <Filter>Source Files\vcpkg</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\LineInfo.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\src\vcpkg\update.cpp">
+      <Filter>Source Files\vcpkg</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\commands_env.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\src\vcpkg\vcpkgcmdarguments.cpp">
+      <Filter>Source Files\vcpkg</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\PackageSpec.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\src\vcpkg\vcpkglib.cpp">
+      <Filter>Source Files\vcpkg</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\PackageSpecParseResult.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\src\vcpkg\vcpkgpaths.cpp">
+      <Filter>Source Files\vcpkg</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\ParagraphParseResult.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\src\vcpkg\versiont.cpp">
+      <Filter>Source Files\vcpkg</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\VcpkgCmdArguments.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\src\vcpkg\base\checks.cpp">
+      <Filter>Source Files\vcpkg\base</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\VcpkgPaths.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\src\vcpkg\base\chrono.cpp">
+      <Filter>Source Files\vcpkg\base</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\commands_depends.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\src\vcpkg\base\cofffilereader.cpp">
+      <Filter>Source Files\vcpkg\base</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\commands_export.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\src\vcpkg\base\enums.cpp">
+      <Filter>Source Files\vcpkg\base</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\VersionT.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\src\vcpkg\base\files.cpp">
+      <Filter>Source Files\vcpkg\base</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\vcpkg_Build.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\src\vcpkg\base\lineinfo.cpp">
+      <Filter>Source Files\vcpkg\base</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\vcpkg_Build_BuildPolicy.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\src\vcpkg\base\machinetype.cpp">
+      <Filter>Source Files\vcpkg\base</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\vcpkg_Parse.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\src\vcpkg\base\strings.cpp">
+      <Filter>Source Files\vcpkg\base</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\vcpkg_GlobalState.cpp">
-      <Filter>Source Files</Filter>
+    <ClCompile Include="..\src\vcpkg\base\system.cpp">
+      <Filter>Source Files\vcpkg\base</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\include\SourceParagraph.h">
+    <ClInclude Include="..\include\pch.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\BinaryParagraph.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="..\include\vcpkg\base\files.h">
+      <Filter>Header Files\vcpkg\base</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\StatusParagraph.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="..\include\vcpkg\base\checks.h">
+      <Filter>Header Files\vcpkg\base</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\StatusParagraphs.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="..\include\vcpkg\base\chrono.h">
+      <Filter>Header Files\vcpkg\base</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\triplet.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="..\include\vcpkg\base\cofffilereader.h">
+      <Filter>Header Files\vcpkg\base</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\Paragraphs.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="..\include\vcpkg\base\cstringview.h">
+      <Filter>Header Files\vcpkg\base</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\metrics.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="..\include\vcpkg\base\enums.h">
+      <Filter>Header Files\vcpkg\base</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\vcpkg_Input.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="..\include\vcpkg\base\expected.h">
+      <Filter>Header Files\vcpkg\base</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\coff_file_reader.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="..\include\vcpkg\base\graphs.h">
+      <Filter>Header Files\vcpkg\base</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\filesystem_fs.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="..\include\vcpkg\base\lazy.h">
+      <Filter>Header Files\vcpkg\base</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\MachineType.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="..\include\vcpkg\base\lineinfo.h">
+      <Filter>Header Files\vcpkg\base</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\vcpkg_Commands.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="..\include\vcpkg\base\machinetype.h">
+      <Filter>Header Files\vcpkg\base</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\vcpkg_Dependencies.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="..\include\vcpkg\base\optional.h">
+      <Filter>Header Files\vcpkg\base</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\vcpkglib.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="..\include\vcpkg\base\sortedvector.h">
+      <Filter>Header Files\vcpkg\base</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\vcpkg_Checks.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="..\include\vcpkg\base\span.h">
+      <Filter>Header Files\vcpkg\base</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\vcpkg_Files.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="..\include\vcpkg\base\strings.h">
+      <Filter>Header Files\vcpkg\base</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\vcpkg_Graphs.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="..\include\vcpkg\base\system.h">
+      <Filter>Header Files\vcpkg\base</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\vcpkg_Maps.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="..\include\vcpkg\base\util.h">
+      <Filter>Header Files\vcpkg\base</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\vcpkg_Strings.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="..\include\vcpkg\binaryparagraph.h">
+      <Filter>Header Files\vcpkg</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\vcpkg_System.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="..\include\vcpkg\build.h">
+      <Filter>Header Files\vcpkg</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\pch.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="..\include\vcpkg\commands.h">
+      <Filter>Header Files\vcpkg</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\vcpkg_optional.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="..\include\vcpkg\dependencies.h">
+      <Filter>Header Files\vcpkg</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\PostBuildLint.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="..\include\vcpkg\export.h">
+      <Filter>Header Files\vcpkg</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\vcpkg_Enums.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="..\include\vcpkg\globalstate.h">
+      <Filter>Header Files\vcpkg</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\vcpkg_Chrono.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="..\include\vcpkg\help.h">
+      <Filter>Header Files\vcpkg</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\lazy.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="..\include\vcpkg\input.h">
+      <Filter>Header Files\vcpkg</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\LineInfo.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="..\include\vcpkg\install.h">
+      <Filter>Header Files\vcpkg</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\vcpkg_expected.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="..\include\vcpkg\metrics.h">
+      <Filter>Header Files\vcpkg</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\vcpkg_Util.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="..\include\vcpkg\packagespec.h">
+      <Filter>Header Files\vcpkg</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\SortedVector.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="..\include\vcpkg\packagespecparseresult.h">
+      <Filter>Header Files\vcpkg</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\CStringView.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="..\include\vcpkg\paragraphparseresult.h">
+      <Filter>Header Files\vcpkg</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\PackageSpec.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="..\include\vcpkg\paragraphs.h">
+      <Filter>Header Files\vcpkg</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\PackageSpecParseResult.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="..\include\vcpkg\parse.h">
+      <Filter>Header Files\vcpkg</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\ParagraphParseResult.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="..\include\vcpkg\postbuildlint.h">
+      <Filter>Header Files\vcpkg</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\VcpkgCmdArguments.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="..\include\vcpkg\remove.h">
+      <Filter>Header Files\vcpkg</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\VersionT.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="..\include\vcpkg\sourceparagraph.h">
+      <Filter>Header Files\vcpkg</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\VcpkgPaths.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="..\include\vcpkg\statusparagraph.h">
+      <Filter>Header Files\vcpkg</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\vcpkg_Build.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="..\include\vcpkg\statusparagraphs.h">
+      <Filter>Header Files\vcpkg</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\PostBuildLint_BuildType.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="..\include\vcpkg\triplet.h">
+      <Filter>Header Files\vcpkg</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\Span.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="..\include\vcpkg\update.h">
+      <Filter>Header Files\vcpkg</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\vcpkg_Parse.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="..\include\vcpkg\vcpkgcmdarguments.h">
+      <Filter>Header Files\vcpkg</Filter>
     </ClInclude>
-    <ClInclude Include="..\include\vcpkg_GlobalState.h">
-      <Filter>Header Files</Filter>
+    <ClInclude Include="..\include\vcpkg\vcpkglib.h">
+      <Filter>Header Files\vcpkg</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\vcpkg\vcpkgpaths.h">
+      <Filter>Header Files\vcpkg</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\vcpkg\versiont.h">
+      <Filter>Header Files\vcpkg</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\vcpkg\postbuildlint.buildtype.h">
+      <Filter>Header Files\vcpkg</Filter>
+    </ClInclude>
+    <ClInclude Include="..\include\vcpkg\export.ifw.h">
+      <Filter>Header Files\vcpkg</Filter>
     </ClInclude>
   </ItemGroup>
 </Project>
 \ No newline at end of file
diff --git a/toolsrc/vcpkgmetricsuploader/vcpkgmetricsuploader.vcxproj b/toolsrc/vcpkgmetricsuploader/vcpkgmetricsuploader.vcxproj
index 472d74e30..4b59c5ace 100644
--- a/toolsrc/vcpkgmetricsuploader/vcpkgmetricsuploader.vcxproj
+++ b/toolsrc/vcpkgmetricsuploader/vcpkgmetricsuploader.vcxproj
@@ -131,7 +131,7 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\src\vcpkg_metrics_uploader.cpp" />
+    <ClCompile Include="..\src\vcpkgmetricsuploader.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\vcpkglib\vcpkglib.vcxproj">
diff --git a/toolsrc/vcpkgmetricsuploader/vcpkgmetricsuploader.vcxproj.filters b/toolsrc/vcpkgmetricsuploader/vcpkgmetricsuploader.vcxproj.filters
index a50df7250..847921000 100644
--- a/toolsrc/vcpkgmetricsuploader/vcpkgmetricsuploader.vcxproj.filters
+++ b/toolsrc/vcpkgmetricsuploader/vcpkgmetricsuploader.vcxproj.filters
@@ -15,7 +15,7 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\src\vcpkg_metrics_uploader.cpp">
+    <ClCompile Include="..\src\vcpkgmetricsuploader.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
diff --git a/toolsrc/vcpkgtest/vcpkgtest.vcxproj b/toolsrc/vcpkgtest/vcpkgtest.vcxproj
index 041e74d31..d25748124 100644
--- a/toolsrc/vcpkgtest/vcpkgtest.vcxproj
+++ b/toolsrc/vcpkgtest/vcpkgtest.vcxproj
@@ -19,11 +19,11 @@
     </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\src\tests_arguments.cpp" />
-    <ClCompile Include="..\src\tests_dependencies.cpp" />
-    <ClCompile Include="..\src\tests_package_spec.cpp" />
-    <ClCompile Include="..\src\tests_paragraph.cpp" />
-    <ClCompile Include="..\src\test_install_plan.cpp" />
+    <ClCompile Include="..\src\tests.arguments.cpp" />
+    <ClCompile Include="..\src\tests.dependencies.cpp" />
+    <ClCompile Include="..\src\tests.packagespec.cpp" />
+    <ClCompile Include="..\src\tests.paragraph.cpp" />
+    <ClCompile Include="..\src\tests.installplan.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\vcpkglib\vcpkglib.vcxproj">
diff --git a/toolsrc/vcpkgtest/vcpkgtest.vcxproj.filters b/toolsrc/vcpkgtest/vcpkgtest.vcxproj.filters
index b31dbd951..42691c614 100644
--- a/toolsrc/vcpkgtest/vcpkgtest.vcxproj.filters
+++ b/toolsrc/vcpkgtest/vcpkgtest.vcxproj.filters
@@ -15,19 +15,19 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\src\tests_paragraph.cpp">
+    <ClCompile Include="..\src\tests.installplan.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\tests_dependencies.cpp">
+    <ClCompile Include="..\src\tests.arguments.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\tests_arguments.cpp">
+    <ClCompile Include="..\src\tests.dependencies.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\test_install_plan.cpp">
+    <ClCompile Include="..\src\tests.packagespec.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\tests_package_spec.cpp">
+    <ClCompile Include="..\src\tests.paragraph.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
diff --git a/triplets/arm64-uwp.cmake b/triplets/arm64-uwp.cmake
new file mode 100644
index 000000000..b37c34e87
--- /dev/null
+++ b/triplets/arm64-uwp.cmake
@@ -0,0 +1,6 @@
+set(VCPKG_TARGET_ARCHITECTURE arm64)
+set(VCPKG_CRT_LINKAGE dynamic)
+set(VCPKG_LIBRARY_LINKAGE dynamic)
+
+set(VCPKG_CMAKE_SYSTEM_NAME WindowsStore)
+set(VCPKG_CMAKE_SYSTEM_VERSION 10.0)
author	martin-s <webmaster@macside.net>	2017-10-15 02:00:19 +0200
committer	martin-s <webmaster@macside.net>	2017-10-15 02:00:19 +0200
commit	9c2fa042ee451f5ec1e5781c8daccd9fd6875de0 (patch)
tree	250b18fea62d58e2138de12f78e25d0ed8c69678
parent	630bcd84b8325217c440def11681e375f5ef4652 (diff)
parent	561cfe89e653aef903488f7af7d4d17cfb11a26c (diff)
download	vcpkg-9c2fa042ee451f5ec1e5781c8daccd9fd6875de0.tar.gz vcpkg-9c2fa042ee451f5ec1e5781c8daccd9fd6875de0.zip