diff --git a/android/vcpkg_config_apps/vcpkg.json b/3rdParty/vcpkg_ports/configs/apps/android/vcpkg.json
similarity index 100%
rename from android/vcpkg_config_apps/vcpkg.json
rename to 3rdParty/vcpkg_ports/configs/apps/android/vcpkg.json
diff --git a/linux/vcpkg_config_apps/vcpkg.json b/3rdParty/vcpkg_ports/configs/apps/linux/vcpkg.json
similarity index 100%
rename from linux/vcpkg_config_apps/vcpkg.json
rename to 3rdParty/vcpkg_ports/configs/apps/linux/vcpkg.json
diff --git a/mingw/vcpkg_config_apps/vcpkg.json b/3rdParty/vcpkg_ports/configs/apps/mingw/vcpkg.json
similarity index 100%
rename from mingw/vcpkg_config_apps/vcpkg.json
rename to 3rdParty/vcpkg_ports/configs/apps/mingw/vcpkg.json
diff --git a/linux/vcpkg_config_client/vcpkg.json b/3rdParty/vcpkg_ports/configs/client/vcpkg.json
similarity index 100%
rename from linux/vcpkg_config_client/vcpkg.json
rename to 3rdParty/vcpkg_ports/configs/client/vcpkg.json
diff --git a/linux/vcpkg_config_libs/vcpkg.json b/3rdParty/vcpkg_ports/configs/libs/vcpkg.json
similarity index 100%
rename from linux/vcpkg_config_libs/vcpkg.json
rename to 3rdParty/vcpkg_ports/configs/libs/vcpkg.json
diff --git a/android/vcpkg_config_libs/vcpkg.json b/3rdParty/vcpkg_ports/configs/libs/windows/vcpkg.json
similarity index 68%
rename from android/vcpkg_config_libs/vcpkg.json
rename to 3rdParty/vcpkg_ports/configs/libs/windows/vcpkg.json
index 184a0d589e..b51f54ab61 100644
--- a/android/vcpkg_config_libs/vcpkg.json
+++ b/3rdParty/vcpkg_ports/configs/libs/windows/vcpkg.json
@@ -5,8 +5,9 @@
     [
         {
           "name": "curl",
-          "features": ["openssl"],
+          "features": ["schannel"],
           "default-features": false
-        }
-    ]
+        },
+        "openssl"
+    ]   
 }
diff --git a/win_build/vcpkg_config_msbuild_ARM64/vcpkg.json b/3rdParty/vcpkg_ports/configs/msbuild/ARM64/vcpkg.json
similarity index 100%
rename from win_build/vcpkg_config_msbuild_ARM64/vcpkg.json
rename to 3rdParty/vcpkg_ports/configs/msbuild/ARM64/vcpkg.json
diff --git a/win_build/vcpkg_config_msbuild_x64/vcpkg.json b/3rdParty/vcpkg_ports/configs/msbuild/x64/vcpkg.json
similarity index 100%
rename from win_build/vcpkg_config_msbuild_x64/vcpkg.json
rename to 3rdParty/vcpkg_ports/configs/msbuild/x64/vcpkg.json
diff --git a/android/buildAndroidBOINC-CI.sh b/android/buildAndroidBOINC-CI.sh
index 77ea558b21..9ac5ab4c14 100755
--- a/android/buildAndroidBOINC-CI.sh
+++ b/android/buildAndroidBOINC-CI.sh
@@ -119,6 +119,7 @@ if [ "x$build_dir" != "x" ]; then
 else
     cd ../
     BUILD_DIR="$(pwd)/3rdParty/android"
+    THIRD_PARTY="$(pwd)/3rdParty"
     cd android/
 fi
 
@@ -244,7 +245,11 @@ if [ $build_with_vcpkg = "yes" ]; then
     else
         triplets_setup="default"
     fi
-    manifests="--x-manifest-root=vcpkg_config_$component/ --x-install-root=$VCPKG_ROOT/installed/"
+    manifest_dir=$THIRD_PARTY/vcpkg_ports/configs/$component
+    if [ $component = "apps" ]; then
+        manifest_dir=$manifest_dir/android
+    fi
+    manifests="--x-manifest-root=$manifest_dir --x-install-root=$VCPKG_ROOT/installed/"
     vcpkg_overlay="--overlay-ports=$vcpkg_ports_dir/ports --overlay-triplets=$vcpkg_ports_dir/triplets/$triplets_setup"
     vcpkg_flags="$vcpkg_overlay  --feature-flags=versions --clean-after-build"
     if [ ! -d "$VCPKG_ROOT" ]; then
diff --git a/android/ci_build_libs_cmake.sh b/android/ci_build_libs_cmake.sh
index 26afe5adfa..e62f7c4909 100755
--- a/android/ci_build_libs_cmake.sh
+++ b/android/ci_build_libs_cmake.sh
@@ -35,7 +35,7 @@ for TRIPLET in $TRIPLETS_LIST ; do
         export ANDROID_NDK_HOME=$NDK_ROOT
     fi
     BUILD_TRIPLET=build-$TRIPLET
-    cmake lib -B $BUILD_TRIPLET -DCMAKE_TOOLCHAIN_FILE=$VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake -DVCPKG_OVERLAY_PORTS=$VCPKG_PORTS/ports -DVCPKG_OVERLAY_TRIPLETS=$VCPKG_PORTS/triplets/ci -DVCPKG_TARGET_TRIPLET=$TRIPLET -DVCPKG_INSTALL_OPTIONS=--clean-after-build
+    cmake lib -B $BUILD_TRIPLET -DCMAKE_TOOLCHAIN_FILE=$VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake -DVCPKG_MANIFEST_DIR=3rdParty/vcpkg_ports/configs/libs/ -DVCPKG_MANIFEST_INSTALL=$VCPKG_ROOT/installed/ -DVCPKG_OVERLAY_PORTS=$VCPKG_PORTS/ports -DVCPKG_OVERLAY_TRIPLETS=$VCPKG_PORTS/triplets/ci -DVCPKG_TARGET_TRIPLET=$TRIPLET -DVCPKG_INSTALL_OPTIONS=--clean-after-build
     cmake --build $BUILD_TRIPLET
 
     echo "\e[1;32m $TRIPLET done \e[0m"
diff --git a/android/vcpkg_config_client/vcpkg.json b/android/vcpkg_config_client/vcpkg.json
deleted file mode 100644
index a11a482227..0000000000
--- a/android/vcpkg_config_client/vcpkg.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "name": "boinc-client",
-    "version-string": "7.19.0",
-    "dependencies":
-    [
-        {
-          "name": "curl",
-          "features": ["openssl"],
-          "default-features": false
-        }
-    ]
-}
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index edb53731d0..49ef5275ac 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.16)
-project(libboinc)
+project(boinc-libs)
 
 message(WARNING "This build is under development and may not work as expected")
 
diff --git a/lib/vcpkg.json b/lib/vcpkg.json
deleted file mode 100644
index cddf6f03ae..0000000000
--- a/lib/vcpkg.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "name": "libboinc",
-    "version-string": "7.19.0",
-    "dependencies":
-    [
-        "openssl"
-    ]
-}
diff --git a/linux/ci_configure_libs_cmake.sh b/linux/ci_configure_libs_cmake.sh
index 2074d0df6e..379fbe982a 100755
--- a/linux/ci_configure_libs_cmake.sh
+++ b/linux/ci_configure_libs_cmake.sh
@@ -14,4 +14,4 @@ export VCPKG_DIR="$VCPKG_ROOT/installed/x64-linux"
 
 linux/bootstrap_vcpkg_cmake.sh
 
-cmake lib -B build -DCMAKE_TOOLCHAIN_FILE=$VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake -DVCPKG_OVERLAY_PORTS=$VCPKG_PORTS/ports -DVCPKG_OVERLAY_TRIPLETS=$VCPKG_PORTS/triplets/ci -DVCPKG_TARGET_TRIPLET=x64-linux -DVCPKG_INSTALL_OPTIONS=--clean-after-build
+cmake lib -B build -DCMAKE_TOOLCHAIN_FILE=$VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake -DVCPKG_MANIFEST_DIR=3rdParty/vcpkg_ports/configs/libs/ -DVCPKG_MANIFEST_INSTALL=$VCPKG_ROOT/installed/ -DVCPKG_OVERLAY_PORTS=$VCPKG_PORTS/ports -DVCPKG_OVERLAY_TRIPLETS=$VCPKG_PORTS/triplets/ci -DVCPKG_TARGET_TRIPLET=x64-linux -DVCPKG_INSTALL_OPTIONS=--clean-after-build
diff --git a/linux/update_vcpkg_apps.sh b/linux/update_vcpkg_apps.sh
index 6ae0f0cbfa..89b94fe1dd 100755
--- a/linux/update_vcpkg_apps.sh
+++ b/linux/update_vcpkg_apps.sh
@@ -18,4 +18,4 @@ fi
 
 git -C $VCPKG_ROOT pull
 $VCPKG_ROOT/bootstrap-vcpkg.sh
-$VCPKG_ROOT/vcpkg install --x-manifest-root=linux/vcpkg_config_apps/ --x-install-root=$VCPKG_ROOT/installed/ --overlay-ports=$VCPKG_PORTS/ports --overlay-triplets=$VCPKG_PORTS/triplets/ci --triplet=x64-linux --feature-flags=versions --clean-after-build
+$VCPKG_ROOT/vcpkg install --x-manifest-root=3rdParty/vcpkg_ports/configs/apps/linux/ --x-install-root=$VCPKG_ROOT/installed/ --overlay-ports=$VCPKG_PORTS/ports --overlay-triplets=$VCPKG_PORTS/triplets/ci --triplet=x64-linux --clean-after-build
diff --git a/linux/update_vcpkg_client.sh b/linux/update_vcpkg_client.sh
index 8c519a03f2..4bab6b4277 100755
--- a/linux/update_vcpkg_client.sh
+++ b/linux/update_vcpkg_client.sh
@@ -18,4 +18,4 @@ fi
 
 git -C $VCPKG_ROOT pull
 $VCPKG_ROOT/bootstrap-vcpkg.sh
-$VCPKG_ROOT/vcpkg install --x-manifest-root=linux/vcpkg_config_client/ --x-install-root=$VCPKG_ROOT/installed/ --overlay-ports=$VCPKG_PORTS/ports --overlay-triplets=$VCPKG_PORTS/triplets/ci --triplet=x64-linux --feature-flags=versions --clean-after-build
+$VCPKG_ROOT/vcpkg install --x-manifest-root=3rdParty/vcpkg_ports/configs/client/ --x-install-root=$VCPKG_ROOT/installed/ --overlay-ports=$VCPKG_PORTS/ports --overlay-triplets=$VCPKG_PORTS/triplets/ci --triplet=x64-linux --clean-after-build
diff --git a/linux/update_vcpkg_libs.sh b/linux/update_vcpkg_libs.sh
index 98d70b1114..f4e46a42fa 100755
--- a/linux/update_vcpkg_libs.sh
+++ b/linux/update_vcpkg_libs.sh
@@ -18,4 +18,4 @@ fi
 
 git -C $VCPKG_ROOT pull
 $VCPKG_ROOT/bootstrap-vcpkg.sh
-$VCPKG_ROOT/vcpkg install --x-manifest-root=linux/vcpkg_config_libs/ --x-install-root=$VCPKG_ROOT/installed/ --overlay-ports=$VCPKG_PORTS/ports --overlay-triplets=$VCPKG_PORTS/triplets/ci --triplet=x64-linux --feature-flags=versions --clean-after-build
+$VCPKG_ROOT/vcpkg install --x-manifest-root=3rdParty/vcpkg_ports/configs/libs/ --x-install-root=$VCPKG_ROOT/installed/ --overlay-ports=$VCPKG_PORTS/ports --overlay-triplets=$VCPKG_PORTS/triplets/ci --triplet=x64-linux --clean-after-build
diff --git a/mingw/ci_configure_libs_cmake.sh b/mingw/ci_configure_libs_cmake.sh
index f203c8bfd0..3756cdca26 100755
--- a/mingw/ci_configure_libs_cmake.sh
+++ b/mingw/ci_configure_libs_cmake.sh
@@ -17,4 +17,4 @@ export VCPKG_DIR="$VCPKG_ROOT/installed/$TRIPLET"
 
 $PLATFORM_NAME/bootstrap_vcpkg_cmake.sh
 
-cmake lib -B build -DCMAKE_TOOLCHAIN_FILE=$VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake -DVCPKG_OVERLAY_PORTS=$VCPKG_PORTS/ports -DVCPKG_OVERLAY_TRIPLETS=$VCPKG_PORTS/triplets/ci -DVCPKG_TARGET_TRIPLET=$TRIPLET -DVCPKG_INSTALL_OPTIONS=--clean-after-build
+cmake lib -B build -DCMAKE_TOOLCHAIN_FILE=$VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake -DVCPKG_MANIFEST_DIR=3rdParty/vcpkg_ports/configs/libs/ -DVCPKG_MANIFEST_INSTALL=$VCPKG_ROOT/installed/ -DVCPKG_OVERLAY_PORTS=$VCPKG_PORTS/ports -DVCPKG_OVERLAY_TRIPLETS=$VCPKG_PORTS/triplets/ci -DVCPKG_TARGET_TRIPLET=$TRIPLET -DVCPKG_INSTALL_OPTIONS=--clean-after-build
diff --git a/mingw/update_vcpkg.sh b/mingw/update_vcpkg.sh
index 7f0993803e..d0f480ac36 100755
--- a/mingw/update_vcpkg.sh
+++ b/mingw/update_vcpkg.sh
@@ -19,4 +19,4 @@ fi
 
 git -C $VCPKG_ROOT pull
 $VCPKG_ROOT/bootstrap-vcpkg.sh
-$VCPKG_ROOT/vcpkg install --x-manifest-root=mingw/vcpkg_config_apps/ --x-install-root=$VCPKG_ROOT/installed/ --overlay-ports=$VCPKG_PORTS/ports --overlay-triplets=$VCPKG_PORTS/triplets/ci --triplet=x64-mingw-static --feature-flags=versions --clean-after-build
+$VCPKG_ROOT/vcpkg install --x-manifest-root=3rdParty/vcpkg_ports/configs/apps/mingw --x-install-root=$VCPKG_ROOT/installed/ --overlay-ports=$VCPKG_PORTS/ports --overlay-triplets=$VCPKG_PORTS/triplets/ci --triplet=x64-mingw-static --clean-after-build
diff --git a/osx/ci_build_libs_cmake.sh b/osx/ci_build_libs_cmake.sh
index 292ba62698..0ba8b64a8e 100755
--- a/osx/ci_build_libs_cmake.sh
+++ b/osx/ci_build_libs_cmake.sh
@@ -20,7 +20,7 @@ for TRIPLET in $TRIPLETS_LIST ; do
     echo "\033[0;35m building $TRIPLET ... \033[0m"
     
     BUILD_TRIPLET=build-$TRIPLET
-    cmake lib -B $BUILD_TRIPLET -DCMAKE_TOOLCHAIN_FILE=$VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake -DVCPKG_OVERLAY_PORTS=$VCPKG_PORTS/ports -DVCPKG_OVERLAY_TRIPLETS=$VCPKG_PORTS/triplets/ci -DVCPKG_TARGET_TRIPLET=$TRIPLET -DVCPKG_INSTALL_OPTIONS=--clean-after-build
+    cmake lib -B $BUILD_TRIPLET -DCMAKE_TOOLCHAIN_FILE=$VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake -DVCPKG_MANIFEST_DIR=3rdParty/vcpkg_ports/configs/libs/ -DVCPKG_MANIFEST_INSTALL=$VCPKG_ROOT/installed/ -DVCPKG_OVERLAY_PORTS=$VCPKG_PORTS/ports -DVCPKG_OVERLAY_TRIPLETS=$VCPKG_PORTS/triplets/ci -DVCPKG_TARGET_TRIPLET=$TRIPLET -DVCPKG_INSTALL_OPTIONS=--clean-after-build
     cmake --build $BUILD_TRIPLET
 
     echo "\033[1;32m $TRIPLET done \033[0m"
diff --git a/set-version.py b/set-version.py
index 09d3bc6d3d..14cc75290c 100644
--- a/set-version.py
+++ b/set-version.py
@@ -80,16 +80,15 @@ def set_build_gradle(version):
             f.write(line)
 
 def set_vcpkg_json(version):
-    for json in ['android/vcpkg_config_apps/vcpkg.json',
-                 'android/vcpkg_config_client/vcpkg.json',
-                 'android/vcpkg_config_libs/vcpkg.json',
-                 'lib/vcpkg.json',
-                 'linux/vcpkg_config_apps/vcpkg.json',
-                 'linux/vcpkg_config_client/vcpkg.json',
-                 'linux/vcpkg_config_libs/vcpkg.json',
-                 'mingw/vcpkg_config_apps/vcpkg.json',
-                 'win_build/vcpkg_config_msbuild_ARM64/vcpkg.json',
-                 'win_build/vcpkg_config_msbuild_x64/vcpkg.json']:
+    for json in ['3rdParty/vcpkg_ports/configs/libs/vcpkg.json',
+                 '3rdParty/vcpkg_ports/configs/libs/windows/vcpkg.json',
+                 '3rdParty/vcpkg_ports/configs/client/vcpkg.json',
+                 '3rdParty/vcpkg_ports/configs/apps/android/vcpkg.json',
+                 '3rdParty/vcpkg_ports/configs/apps/linux/vcpkg.json',
+                 '3rdParty/vcpkg_ports/configs/apps/mingw/vcpkg.json',
+                 '3rdParty/vcpkg_ports/configs/msbuild/x64/vcpkg.json',
+                 '3rdParty/vcpkg_ports/configs/msbuild/ARM64/vcpkg.json',
+                ]:
         with open(json, 'r') as f:
             lines = f.readlines()
         with open(json, 'w') as f:
diff --git a/win_build/boinc.props b/win_build/boinc.props
index 29bc99ecfa..728ba1786b 100644
--- a/win_build/boinc.props
+++ b/win_build/boinc.props
@@ -1,6 +1,7 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <PropertyGroup>
         <Windows3rdPartyBuildDir Condition="'$(Windows3rdPartyBuildDir)' == ''">$(MSBuildThisFileDirectory)..\3rdParty\Windows</Windows3rdPartyBuildDir>
+        <VcpkgConfigsDir Condition="'$(VcpkgConfigsDir)' == ''">$(MSBuildThisFileDirectory)..\3rdParty\vcpkg_ports\configs\msbuild</VcpkgConfigsDir>
         <VcpkgRootDir Condition="'$(VcpkgRootDir)' == ''">$(Windows3rdPartyBuildDir)\vcpkg</VcpkgRootDir>
         <VcpkgExe>$(VcpkgRootDir)\vcpkg.exe</VcpkgExe>
         <VcpkgTripletConfig Condition="'$(VcpkgTripletConfig)' == ''">default</VcpkgTripletConfig>
diff --git a/win_build/vcpkg_3rdparty_dependencies_vs2019.vcxproj b/win_build/vcpkg_3rdparty_dependencies_vs2019.vcxproj
index eb8ec3f633..67f635e44c 100644
--- a/win_build/vcpkg_3rdparty_dependencies_vs2019.vcxproj
+++ b/win_build/vcpkg_3rdparty_dependencies_vs2019.vcxproj
@@ -172,6 +172,6 @@
     <Exec Command="bootstrap-vcpkg.bat" WorkingDirectory="$(VcpkgRootDir)" ConsoleToMSBuild="true" />
   </Target>
   <Target Name="Build3rdPartyLibraries"  BeforeTargets="ClCompile" DependsOnTargets="InstallVcpkg" AfterTargets="InstallVcpkg">
-    <Exec Command="vcpkg.exe install --x-manifest-root=$(ProjectDir)/vcpkg_config_msbuild_$(Platform) --x-install-root=installed/  --overlay-ports=../../vcpkg_ports/ports --overlay-triplets=../../vcpkg_ports/triplets/$(VcpkgTripletConfig) --triplet $(VcpkgTripletName) --clean-after-build" WorkingDirectory="$(VcpkgRootDir)" ConsoleToMSBuild="true" ContinueOnError="WarnAndContinue" />
+    <Exec Command="vcpkg.exe install --x-manifest-root=$(VcpkgConfigsDir)/$(Platform) --x-install-root=$(VcpkgRootDir)/installed/ --overlay-ports=../../vcpkg_ports/ports --overlay-triplets=../../vcpkg_ports/triplets/$(VcpkgTripletConfig) --triplet $(VcpkgTripletName) --clean-after-build" WorkingDirectory="$(VcpkgRootDir)" ConsoleToMSBuild="true" ContinueOnError="WarnAndContinue" />
   </Target>
 </Project>
diff --git a/windows/ci_build_libs_cmake.bat b/windows/ci_build_libs_cmake.bat
index 4477430133..f3f0047cd0 100644
--- a/windows/ci_build_libs_cmake.bat
+++ b/windows/ci_build_libs_cmake.bat
@@ -27,5 +27,5 @@ set "VCPKG_ROOT=%BUILD_DIR%\vcpkg"
 
 call windows\bootstrap_vcpkg_cmake.bat
 
-cmake lib -B build -DCMAKE_TOOLCHAIN_FILE=%VCPKG_ROOT%\scripts\buildsystems\vcpkg.cmake -DVCPKG_OVERLAY_PORTS=%VCPKG_PORTS%\ports -DVCPKG_OVERLAY_TRIPLETS=%VCPKG_PORTS%\triplets\ci -DVCPKG_TARGET_TRIPLET=%PLATFORM%-windows-static -DVCPKG_INSTALL_OPTIONS=--clean-after-build
+cmake lib -B build -DCMAKE_TOOLCHAIN_FILE=%VCPKG_ROOT%\scripts\buildsystems\vcpkg.cmake -DVCPKG_MANIFEST_DIR=3rdParty/vcpkg_ports/configs/libs/windows -DVCPKG_MANIFEST_INSTALL=$VCPKG_ROOT/installed/ -DVCPKG_OVERLAY_PORTS=%VCPKG_PORTS%\ports -DVCPKG_OVERLAY_TRIPLETS=%VCPKG_PORTS%\triplets\ci -DVCPKG_TARGET_TRIPLET=%PLATFORM%-windows-static -DVCPKG_INSTALL_OPTIONS=--clean-after-build
 cmake --build build --config %CONFIGURATION%