diff --git a/FreeRTOS-Plus/Demo/corePKCS11_MQTT_Mutual_Auth_Windows_Simulator/WIN32.vcxproj b/FreeRTOS-Plus/Demo/corePKCS11_MQTT_Mutual_Auth_Windows_Simulator/WIN32.vcxproj
index e2720f0f35..99210c2928 100644
--- a/FreeRTOS-Plus/Demo/corePKCS11_MQTT_Mutual_Auth_Windows_Simulator/WIN32.vcxproj
+++ b/FreeRTOS-Plus/Demo/corePKCS11_MQTT_Mutual_Auth_Windows_Simulator/WIN32.vcxproj
@@ -58,7 +58,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\Source\FreeRTOS-Plus-Trace\Include;..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\include;..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\BufferManagement;..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\Compiler\MSVC;..\..\..\FreeRTOS-Plus\Source\Utilities\logging;..\coreMQTT_Windows_Simulator\Common;..\coreMQTT_Windows_Simulator\common\WinPCap;..\..\..\FreeRTOS\Source\include;..\..\..\FreeRTOS\Source\portable\MSVC-MingW;..\..\Source\corePKCS11\source\include;..\..\Source\corePKCS11\3rdparty\pkcs11;..\..\Source\Application-Protocols\coreMQTT\source\include;..\..\Source\Application-Protocols\coreMQTT\source\interface;..\..\Source\Utilities\backoff_algorithm\source\include;..\..\Source\Application-Protocols\network_transport\freertos_plus_tcp;..\..\Source\Application-Protocols\network_transport\freertos_plus_tcp\using_mbedtls_pkcs11;..\..\Source\Utilities\mbedtls_freertos;..\..\Source\mbedtls_utils;..\..\ThirdParty\mbedtls\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\Source\FreeRTOS-Plus-Trace\Include;..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\include;..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\BufferManagement;..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\portable\Compiler\MSVC;..\..\..\FreeRTOS-Plus\Source\Utilities\logging;..\coreMQTT_Windows_Simulator\Common;..\coreMQTT_Windows_Simulator\common\WinPCap;..\..\..\FreeRTOS\Source\include;..\..\..\FreeRTOS\Source\portable\MSVC-MingW;..\..\Source\corePKCS11\source\include;..\..\Source\corePKCS11\source\dependency\3rdparty\pkcs11;..\..\Source\Application-Protocols\coreMQTT\source\include;..\..\Source\Application-Protocols\coreMQTT\source\interface;..\..\Source\Utilities\backoff_algorithm\source\include;..\..\Source\Application-Protocols\network_transport\freertos_plus_tcp;..\..\Source\Application-Protocols\network_transport\freertos_plus_tcp\using_mbedtls_pkcs11;..\..\Source\Utilities\mbedtls_freertos;..\..\Source\mbedtls_utils;..\..\ThirdParty\mbedtls\include;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>MBEDTLS_CONFIG_FILE="mbedtls_config.h";WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;WINVER=0x400;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -403,4 +403,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/FreeRTOS-Plus/Demo/corePKCS11_MQTT_Mutual_Auth_Windows_Simulator/WIN32.vcxproj.filters b/FreeRTOS-Plus/Demo/corePKCS11_MQTT_Mutual_Auth_Windows_Simulator/WIN32.vcxproj.filters
index 6100efc9e5..369174fca3 100644
--- a/FreeRTOS-Plus/Demo/corePKCS11_MQTT_Mutual_Auth_Windows_Simulator/WIN32.vcxproj.filters
+++ b/FreeRTOS-Plus/Demo/corePKCS11_MQTT_Mutual_Auth_Windows_Simulator/WIN32.vcxproj.filters
@@ -452,9 +452,7 @@
     <ClCompile Include="..\..\ThirdParty\mbedtls\library\xtea.c">
       <Filter>ThirdParty\mbedtls</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\Source\Application-Protocols\platform\transport\tls\using_mbedtls_pkcs11.c">
-      <Filter>Transport</Filter>
-    </ClCompile>
+    <ClCompile Include="..\..\Source\Application-Protocols\network_transport\freertos_plus_tcp\using_mbedtls_pkcs11\using_mbedtls_pkcs11.c" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\..\FreeRTOS-Plus\Source\FreeRTOS-Plus-TCP\include\NetworkInterface.h">
@@ -554,9 +552,6 @@
     <ClInclude Include="..\..\..\Source\Application-Protocols\network_transport\freertos_plus_tcp\sockets_wrapper.h">
       <Filter>FreeRTOS+\FreeRTOS IoT Libraries\platform\transport\include</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\Source\Application-Protocols\network_transport\freertos_plus_tcp\using_mbedtls\using_mbedtls.h">
-      <Filter>FreeRTOS+\FreeRTOS IoT Libraries\platform\transport\include</Filter>
-    </ClInclude>
     <ClInclude Include="core_mqtt_config.h">
       <Filter>coreMQTT</Filter>
     </ClInclude>
@@ -839,6 +834,16 @@
     <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\xtea.h">
       <Filter>ThirdParty\mbedtls\include</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\Source\Application-Protocols\network_transport\freertos_plus_tcp\using_mbedtls_pkcs11\using_mbedtls_pkcs11.h" />
+    <ClInclude Include="..\..\..\FreeRTOS-Plus\Source\Utilities\logging\logging.h">
+      <Filter>Common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\FreeRTOS-Plus\Source\Utilities\logging\logging_levels.h">
+      <Filter>Common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\FreeRTOS-Plus\Source\Utilities\logging\logging_stack.h">
+      <Filter>Common</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Text Include="..\..\ThirdParty\mbedtls\library\CMakeLists.txt">
diff --git a/FreeRTOS-Plus/Demo/corePKCS11_Windows_Simulator/WIN32.vcxproj b/FreeRTOS-Plus/Demo/corePKCS11_Windows_Simulator/WIN32.vcxproj
index 1dbcd5bfad..5dc9ce7069 100644
--- a/FreeRTOS-Plus/Demo/corePKCS11_Windows_Simulator/WIN32.vcxproj
+++ b/FreeRTOS-Plus/Demo/corePKCS11_Windows_Simulator/WIN32.vcxproj
@@ -58,7 +58,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\..\..\FreeRTOS-Plus\Source\Utilities\logging;..\..\..\FreeRTOS-Plus\Source\corePKCS11\source\include;..\..\..\FreeRTOS-Plus\Source\corePKCS11\source\portable\mbedtls\include;..\..\..\FreeRTOS-Plus\Source\corePKCS11\3rdparty\pkcs11;..\..\ThirdParty\mbedtls\include;..\..\..\FreeRTOS-Plus\Source\corePKCS11\3rdparty\mbedtls_utils;..\..\..\FreeRTOS\Source\include;..\..\..\FreeRTOS\Source\portable\MSVC-MingW;examples;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..\FreeRTOS-Plus\Source\Utilities\logging;..\..\..\FreeRTOS-Plus\Source\corePKCS11\source\include;..\..\..\FreeRTOS-Plus\Source\corePKCS11\source\portable\mbedtls\include;..\..\..\FreeRTOS-Plus\Source\corePKCS11\source\dependency\3rdparty\pkcs11;..\..\ThirdParty\mbedtls\include;..\..\..\FreeRTOS-Plus\Source\corePKCS11\source\dependency\3rdparty\mbedtls_utils;..\..\..\FreeRTOS\Source\include;..\..\..\FreeRTOS\Source\portable\MSVC-MingW;examples;.;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;WINVER=0x400;_CRT_SECURE_NO_WARNINGS;MBEDTLS_CONFIG_FILE="aws_mbedtls_config.h";CONFIG_MEDTLS_USE_AFR_MEMORY;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>false</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -235,11 +235,11 @@
     <ClCompile Include="..\..\ThirdParty\mbedtls\library\x509write_csr.c" />
     <ClCompile Include="..\..\ThirdParty\mbedtls\library\x509_create.c" />
     <ClCompile Include="..\..\ThirdParty\mbedtls\library\x509_crl.c" />
-    <ClCompile Include="..\..\ThirdParty\mbedtls\library\x509_crt.c" />
+    <ClCompile Include="..\..\thirdparty\mbedtls\library\x509_crt.c" />
     <ClCompile Include="..\..\ThirdParty\mbedtls\library\x509_csr.c" />
     <ClCompile Include="..\..\ThirdParty\mbedtls\library\xtea.c" />
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls_utils\mbedtls_error.c" />
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls_utils\mbedtls_utils.c" />
+    <ClCompile Include="..\..\Source\corePKCS11\source\dependency\3rdparty\mbedtls_utils\mbedtls_error.c" />
+    <ClCompile Include="..\..\Source\corePKCS11\source\dependency\3rdparty\mbedtls_utils\mbedtls_utils.c" />
     <ClCompile Include="..\..\Source\corePKCS11\source\core_pkcs11.c" />
     <ClCompile Include="..\..\Source\corePKCS11\source\core_pki_utils.c" />
     <ClCompile Include="..\..\Source\corePKCS11\source\portable\mbedtls\core_pkcs11_mbedtls.c" />
@@ -351,10 +351,10 @@
     <ClInclude Include="..\..\ThirdParty\mbedtls\library\psa_crypto_storage.h" />
     <ClInclude Include="..\..\ThirdParty\mbedtls\library\ssl_invasive.h" />
     <ClInclude Include="..\..\ThirdParty\mbedtls\library\ssl_tls13_keys.h" />
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls_utils\mbedtls_error.h" />
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\pkcs11\pkcs11.h" />
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\pkcs11\pkcs11f.h" />
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\pkcs11\pkcs11t.h" />
+    <ClInclude Include="..\..\Source\corePKCS11\source\dependency\3rdparty\mbedtls_utils\mbedtls_error.h" />
+    <ClInclude Include="..\..\Source\corePKCS11\source\dependency\3rdparty\pkcs11\pkcs11.h" />
+    <ClInclude Include="..\..\Source\corePKCS11\source\dependency\3rdparty\pkcs11\pkcs11f.h" />
+    <ClInclude Include="..\..\Source\corePKCS11\source\dependency\3rdparty\pkcs11\pkcs11t.h" />
     <ClInclude Include="..\..\Source\corePKCS11\source\include\core_pkcs11.h" />
     <ClInclude Include="..\..\Source\corePKCS11\source\include\core_pkcs11_pal.h" />
     <ClInclude Include="..\..\Source\corePKCS11\source\include\core_pki_utils.h" />
diff --git a/FreeRTOS-Plus/Demo/corePKCS11_Windows_Simulator/WIN32.vcxproj.filters b/FreeRTOS-Plus/Demo/corePKCS11_Windows_Simulator/WIN32.vcxproj.filters
index cde58d7cbc..fa2c37177c 100644
--- a/FreeRTOS-Plus/Demo/corePKCS11_Windows_Simulator/WIN32.vcxproj.filters
+++ b/FreeRTOS-Plus/Demo/corePKCS11_Windows_Simulator/WIN32.vcxproj.filters
@@ -101,247 +101,268 @@
     <ClCompile Include="..\..\Source\corePKCS11\source\portable\windows\core_pkcs11_pal.c">
       <Filter>corePKCS11\source</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls_utils\mbedtls_error.c">
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\aes.c">
+      <Filter>3rdparty\mbedtls</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\aesni.c">
+      <Filter>3rdparty\mbedtls</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\arc4.c">
+      <Filter>3rdparty\mbedtls</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\aria.c">
+      <Filter>3rdparty\mbedtls</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\asn1parse.c">
+      <Filter>3rdparty\mbedtls</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\asn1write.c">
+      <Filter>3rdparty\mbedtls</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\base64.c">
+      <Filter>3rdparty\mbedtls</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\bignum.c">
+      <Filter>3rdparty\mbedtls</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\blowfish.c">
+      <Filter>3rdparty\mbedtls</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\camellia.c">
+      <Filter>3rdparty\mbedtls</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\ccm.c">
+      <Filter>3rdparty\mbedtls</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\certs.c">
+      <Filter>3rdparty\mbedtls</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\chacha20.c">
+      <Filter>3rdparty\mbedtls</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\chachapoly.c">
+      <Filter>3rdparty\mbedtls</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\cipher.c">
+      <Filter>3rdparty\mbedtls</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\cipher_wrap.c">
+      <Filter>3rdparty\mbedtls</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\cmac.c">
+      <Filter>3rdparty\mbedtls</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\ctr_drbg.c">
+      <Filter>3rdparty\mbedtls</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\debug.c">
+      <Filter>3rdparty\mbedtls</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\des.c">
+      <Filter>3rdparty\mbedtls</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\dhm.c">
+      <Filter>3rdparty\mbedtls</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\ecdh.c">
+      <Filter>3rdparty\mbedtls</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\ecdsa.c">
+      <Filter>3rdparty\mbedtls</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\ecjpake.c">
+      <Filter>3rdparty\mbedtls</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\ecp.c">
+      <Filter>3rdparty\mbedtls</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\ecp_curves.c">
+      <Filter>3rdparty\mbedtls</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\entropy.c">
+      <Filter>3rdparty\mbedtls</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\entropy_poll.c">
+      <Filter>3rdparty\mbedtls</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\error.c">
+      <Filter>3rdparty\mbedtls</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\gcm.c">
+      <Filter>3rdparty\mbedtls</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\havege.c">
+      <Filter>3rdparty\mbedtls</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\hkdf.c">
+      <Filter>3rdparty\mbedtls</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\hmac_drbg.c">
+      <Filter>3rdparty\mbedtls</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\md.c">
+      <Filter>3rdparty\mbedtls</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\md2.c">
+      <Filter>3rdparty\mbedtls</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\md4.c">
+      <Filter>3rdparty\mbedtls</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\md5.c">
+      <Filter>3rdparty\mbedtls</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\memory_buffer_alloc.c">
+      <Filter>3rdparty\mbedtls</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\net_sockets.c">
+      <Filter>3rdparty\mbedtls</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\nist_kw.c">
+      <Filter>3rdparty\mbedtls</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\oid.c">
+      <Filter>3rdparty\mbedtls</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\padlock.c">
+      <Filter>3rdparty\mbedtls</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\pem.c">
+      <Filter>3rdparty\mbedtls</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\pk.c">
+      <Filter>3rdparty\mbedtls</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\pk_wrap.c">
+      <Filter>3rdparty\mbedtls</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\pkcs5.c">
+      <Filter>3rdparty\mbedtls</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\pkcs11.c">
+      <Filter>3rdparty\mbedtls</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\pkcs12.c">
+      <Filter>3rdparty\mbedtls</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\pkparse.c">
+      <Filter>3rdparty\mbedtls</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\pkwrite.c">
+      <Filter>3rdparty\mbedtls</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\platform.c">
+      <Filter>3rdparty\mbedtls</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\platform_util.c">
+      <Filter>3rdparty\mbedtls</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\poly1305.c">
+      <Filter>3rdparty\mbedtls</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\ripemd160.c">
+      <Filter>3rdparty\mbedtls</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\rsa.c">
+      <Filter>3rdparty\mbedtls</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\rsa_internal.c">
+      <Filter>3rdparty\mbedtls</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\sha1.c">
+      <Filter>3rdparty\mbedtls</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\sha256.c">
+      <Filter>3rdparty\mbedtls</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\sha512.c">
+      <Filter>3rdparty\mbedtls</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\ssl_cache.c">
+      <Filter>3rdparty\mbedtls</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\ssl_ciphersuites.c">
+      <Filter>3rdparty\mbedtls</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\ssl_cli.c">
+      <Filter>3rdparty\mbedtls</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\ssl_cookie.c">
+      <Filter>3rdparty\mbedtls</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\ssl_srv.c">
+      <Filter>3rdparty\mbedtls</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\ssl_ticket.c">
+      <Filter>3rdparty\mbedtls</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\ssl_tls.c">
+      <Filter>3rdparty\mbedtls</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\threading.c">
+      <Filter>3rdparty\mbedtls</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\timing.c">
+      <Filter>3rdparty\mbedtls</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\version.c">
+      <Filter>3rdparty\mbedtls</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\version_features.c">
+      <Filter>3rdparty\mbedtls</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\x509.c">
+      <Filter>3rdparty\mbedtls</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\x509_create.c">
+      <Filter>3rdparty\mbedtls</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\x509_crl.c">
+      <Filter>3rdparty\mbedtls</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\x509_crt.c">
+      <Filter>3rdparty\mbedtls</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\x509_csr.c">
+      <Filter>3rdparty\mbedtls</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\x509write_crt.c">
+      <Filter>3rdparty\mbedtls</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\x509write_csr.c">
+      <Filter>3rdparty\mbedtls</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\xtea.c">
+      <Filter>3rdparty\mbedtls</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\corePKCS11\source\dependency\3rdparty\mbedtls_utils\mbedtls_error.c">
       <Filter>3rdparty\mbedtls_utils</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls_utils\mbedtls_utils.c">
+    <ClCompile Include="..\..\Source\corePKCS11\source\dependency\3rdparty\mbedtls_utils\mbedtls_utils.c">
       <Filter>3rdparty\mbedtls_utils</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\aes.c">
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\psa_crypto.c">
       <Filter>3rdparty\mbedtls</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\aesni.c">
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\psa_crypto_driver_wrappers.c">
       <Filter>3rdparty\mbedtls</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\arc4.c">
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\psa_crypto_se.c">
       <Filter>3rdparty\mbedtls</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\aria.c">
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\psa_crypto_slot_management.c">
       <Filter>3rdparty\mbedtls</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\asn1parse.c">
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\psa_crypto_storage.c">
       <Filter>3rdparty\mbedtls</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\asn1write.c">
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\psa_its_file.c">
       <Filter>3rdparty\mbedtls</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\base64.c">
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\ssl_msg.c">
       <Filter>3rdparty\mbedtls</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\bignum.c">
-      <Filter>3rdparty\mbedtls</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\blowfish.c">
-      <Filter>3rdparty\mbedtls</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\camellia.c">
-      <Filter>3rdparty\mbedtls</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\ccm.c">
-      <Filter>3rdparty\mbedtls</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\certs.c">
-      <Filter>3rdparty\mbedtls</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\chacha20.c">
-      <Filter>3rdparty\mbedtls</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\chachapoly.c">
-      <Filter>3rdparty\mbedtls</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\cipher.c">
-      <Filter>3rdparty\mbedtls</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\cipher_wrap.c">
-      <Filter>3rdparty\mbedtls</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\cmac.c">
-      <Filter>3rdparty\mbedtls</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\ctr_drbg.c">
-      <Filter>3rdparty\mbedtls</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\debug.c">
-      <Filter>3rdparty\mbedtls</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\des.c">
-      <Filter>3rdparty\mbedtls</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\dhm.c">
-      <Filter>3rdparty\mbedtls</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\ecdh.c">
-      <Filter>3rdparty\mbedtls</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\ecdsa.c">
-      <Filter>3rdparty\mbedtls</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\ecjpake.c">
-      <Filter>3rdparty\mbedtls</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\ecp.c">
-      <Filter>3rdparty\mbedtls</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\ecp_curves.c">
-      <Filter>3rdparty\mbedtls</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\entropy.c">
-      <Filter>3rdparty\mbedtls</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\entropy_poll.c">
-      <Filter>3rdparty\mbedtls</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\error.c">
-      <Filter>3rdparty\mbedtls</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\gcm.c">
-      <Filter>3rdparty\mbedtls</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\havege.c">
-      <Filter>3rdparty\mbedtls</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\hkdf.c">
-      <Filter>3rdparty\mbedtls</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\hmac_drbg.c">
-      <Filter>3rdparty\mbedtls</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\md.c">
-      <Filter>3rdparty\mbedtls</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\md_wrap.c">
-      <Filter>3rdparty\mbedtls</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\md2.c">
-      <Filter>3rdparty\mbedtls</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\md4.c">
-      <Filter>3rdparty\mbedtls</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\md5.c">
-      <Filter>3rdparty\mbedtls</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\memory_buffer_alloc.c">
-      <Filter>3rdparty\mbedtls</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\net_sockets.c">
-      <Filter>3rdparty\mbedtls</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\nist_kw.c">
-      <Filter>3rdparty\mbedtls</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\oid.c">
-      <Filter>3rdparty\mbedtls</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\padlock.c">
-      <Filter>3rdparty\mbedtls</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\pem.c">
-      <Filter>3rdparty\mbedtls</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\pk.c">
-      <Filter>3rdparty\mbedtls</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\pk_wrap.c">
-      <Filter>3rdparty\mbedtls</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\pkcs5.c">
-      <Filter>3rdparty\mbedtls</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\pkcs11.c">
-      <Filter>3rdparty\mbedtls</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\pkcs12.c">
-      <Filter>3rdparty\mbedtls</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\pkparse.c">
-      <Filter>3rdparty\mbedtls</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\pkwrite.c">
-      <Filter>3rdparty\mbedtls</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\platform.c">
-      <Filter>3rdparty\mbedtls</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\platform_util.c">
-      <Filter>3rdparty\mbedtls</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\poly1305.c">
-      <Filter>3rdparty\mbedtls</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\ripemd160.c">
-      <Filter>3rdparty\mbedtls</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\rsa.c">
-      <Filter>3rdparty\mbedtls</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\rsa_internal.c">
-      <Filter>3rdparty\mbedtls</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\sha1.c">
-      <Filter>3rdparty\mbedtls</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\sha256.c">
-      <Filter>3rdparty\mbedtls</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\sha512.c">
-      <Filter>3rdparty\mbedtls</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\ssl_cache.c">
-      <Filter>3rdparty\mbedtls</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\ssl_ciphersuites.c">
-      <Filter>3rdparty\mbedtls</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\ssl_cli.c">
-      <Filter>3rdparty\mbedtls</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\ssl_cookie.c">
-      <Filter>3rdparty\mbedtls</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\ssl_srv.c">
-      <Filter>3rdparty\mbedtls</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\ssl_ticket.c">
-      <Filter>3rdparty\mbedtls</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\ssl_tls.c">
-      <Filter>3rdparty\mbedtls</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\threading.c">
-      <Filter>3rdparty\mbedtls</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\timing.c">
-      <Filter>3rdparty\mbedtls</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\version.c">
-      <Filter>3rdparty\mbedtls</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\version_features.c">
-      <Filter>3rdparty\mbedtls</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\x509.c">
-      <Filter>3rdparty\mbedtls</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\x509_create.c">
-      <Filter>3rdparty\mbedtls</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\x509_crl.c">
-      <Filter>3rdparty\mbedtls</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\x509_crt.c">
-      <Filter>3rdparty\mbedtls</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\x509_csr.c">
-      <Filter>3rdparty\mbedtls</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\x509write_crt.c">
-      <Filter>3rdparty\mbedtls</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\x509write_csr.c">
-      <Filter>3rdparty\mbedtls</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\xtea.c">
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\ssl_tls13_keys.c">
       <Filter>3rdparty\mbedtls</Filter>
     </ClCompile>
   </ItemGroup>
@@ -394,267 +415,296 @@
     <ClInclude Include="..\..\Source\corePKCS11\source\portable\mbedtls\threading_alt.h">
       <Filter>corePKCS11\include</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\pkcs11\pkcs11.h">
-      <Filter>3rdparty\pkcs11</Filter>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\aes.h">
+      <Filter>3rdparty\mbedtls\include</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\pkcs11\pkcs11f.h">
-      <Filter>3rdparty\pkcs11</Filter>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\aesni.h">
+      <Filter>3rdparty\mbedtls\include</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\pkcs11\pkcs11t.h">
-      <Filter>3rdparty\pkcs11</Filter>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\arc4.h">
+      <Filter>3rdparty\mbedtls\include</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls_utils\mbedtls_error.h">
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\aria.h">
+      <Filter>3rdparty\mbedtls\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\asn1.h">
+      <Filter>3rdparty\mbedtls\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\asn1write.h">
+      <Filter>3rdparty\mbedtls\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\base64.h">
+      <Filter>3rdparty\mbedtls\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\bignum.h">
+      <Filter>3rdparty\mbedtls\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\blowfish.h">
+      <Filter>3rdparty\mbedtls\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\bn_mul.h">
+      <Filter>3rdparty\mbedtls\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\camellia.h">
+      <Filter>3rdparty\mbedtls\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\ccm.h">
+      <Filter>3rdparty\mbedtls\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\certs.h">
+      <Filter>3rdparty\mbedtls\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\chacha20.h">
+      <Filter>3rdparty\mbedtls\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\chachapoly.h">
+      <Filter>3rdparty\mbedtls\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\check_config.h">
+      <Filter>3rdparty\mbedtls\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\cipher.h">
+      <Filter>3rdparty\mbedtls\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\cipher_internal.h">
+      <Filter>3rdparty\mbedtls\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\cmac.h">
+      <Filter>3rdparty\mbedtls\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\compat-1.3.h">
+      <Filter>3rdparty\mbedtls\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\config.h">
+      <Filter>3rdparty\mbedtls\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\ctr_drbg.h">
+      <Filter>3rdparty\mbedtls\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\debug.h">
+      <Filter>3rdparty\mbedtls\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\des.h">
+      <Filter>3rdparty\mbedtls\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\dhm.h">
+      <Filter>3rdparty\mbedtls\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\ecdh.h">
+      <Filter>3rdparty\mbedtls\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\ecdsa.h">
+      <Filter>3rdparty\mbedtls\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\ecjpake.h">
+      <Filter>3rdparty\mbedtls\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\ecp.h">
+      <Filter>3rdparty\mbedtls\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\ecp_internal.h">
+      <Filter>3rdparty\mbedtls\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\entropy.h">
+      <Filter>3rdparty\mbedtls\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\entropy_poll.h">
+      <Filter>3rdparty\mbedtls\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\error.h">
+      <Filter>3rdparty\mbedtls\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\gcm.h">
+      <Filter>3rdparty\mbedtls\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\havege.h">
+      <Filter>3rdparty\mbedtls\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\hkdf.h">
+      <Filter>3rdparty\mbedtls\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\hmac_drbg.h">
+      <Filter>3rdparty\mbedtls\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\md.h">
+      <Filter>3rdparty\mbedtls\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\md_internal.h">
+      <Filter>3rdparty\mbedtls\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\md2.h">
+      <Filter>3rdparty\mbedtls\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\md4.h">
+      <Filter>3rdparty\mbedtls\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\md5.h">
+      <Filter>3rdparty\mbedtls\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\memory_buffer_alloc.h">
+      <Filter>3rdparty\mbedtls\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\net.h">
+      <Filter>3rdparty\mbedtls\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\net_sockets.h">
+      <Filter>3rdparty\mbedtls\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\nist_kw.h">
+      <Filter>3rdparty\mbedtls\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\oid.h">
+      <Filter>3rdparty\mbedtls\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\padlock.h">
+      <Filter>3rdparty\mbedtls\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\pem.h">
+      <Filter>3rdparty\mbedtls\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\pk.h">
+      <Filter>3rdparty\mbedtls\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\pk_internal.h">
+      <Filter>3rdparty\mbedtls\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\pkcs5.h">
+      <Filter>3rdparty\mbedtls\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\pkcs11.h">
+      <Filter>3rdparty\mbedtls\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\pkcs12.h">
+      <Filter>3rdparty\mbedtls\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\platform.h">
+      <Filter>3rdparty\mbedtls\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\platform_time.h">
+      <Filter>3rdparty\mbedtls\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\platform_util.h">
+      <Filter>3rdparty\mbedtls\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\poly1305.h">
+      <Filter>3rdparty\mbedtls\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\ripemd160.h">
+      <Filter>3rdparty\mbedtls\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\rsa.h">
+      <Filter>3rdparty\mbedtls\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\rsa_internal.h">
+      <Filter>3rdparty\mbedtls\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\sha1.h">
+      <Filter>3rdparty\mbedtls\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\sha256.h">
+      <Filter>3rdparty\mbedtls\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\sha512.h">
+      <Filter>3rdparty\mbedtls\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\ssl.h">
+      <Filter>3rdparty\mbedtls\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\ssl_cache.h">
+      <Filter>3rdparty\mbedtls\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\ssl_ciphersuites.h">
+      <Filter>3rdparty\mbedtls\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\ssl_cookie.h">
+      <Filter>3rdparty\mbedtls\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\ssl_internal.h">
+      <Filter>3rdparty\mbedtls\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\ssl_ticket.h">
+      <Filter>3rdparty\mbedtls\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\threading.h">
+      <Filter>3rdparty\mbedtls\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\timing.h">
+      <Filter>3rdparty\mbedtls\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\version.h">
+      <Filter>3rdparty\mbedtls\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\x509.h">
+      <Filter>3rdparty\mbedtls\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\x509_crl.h">
+      <Filter>3rdparty\mbedtls\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\x509_crt.h">
+      <Filter>3rdparty\mbedtls\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\x509_csr.h">
+      <Filter>3rdparty\mbedtls\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\xtea.h">
+      <Filter>3rdparty\mbedtls\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\FreeRTOS-Plus\Source\Utilities\logging\logging_stack.h">
+      <Filter>Common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\FreeRTOS-Plus\Source\Utilities\logging\logging.h">
+      <Filter>Common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\FreeRTOS-Plus\Source\Utilities\logging\logging_levels.h">
+      <Filter>Common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\library\common.h">
+      <Filter>Common</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Source\corePKCS11\source\dependency\3rdparty\mbedtls_utils\mbedtls_error.h">
       <Filter>3rdparty\mbedtls_utils</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\aes.h">
-      <Filter>3rdparty\mbedtls\include</Filter>
+    <ClInclude Include="..\..\Source\corePKCS11\source\dependency\3rdparty\pkcs11\pkcs11.h">
+      <Filter>3rdparty\pkcs11</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\aesni.h">
-      <Filter>3rdparty\mbedtls\include</Filter>
+    <ClInclude Include="..\..\Source\corePKCS11\source\dependency\3rdparty\pkcs11\pkcs11f.h">
+      <Filter>3rdparty\pkcs11</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\arc4.h">
-      <Filter>3rdparty\mbedtls\include</Filter>
+    <ClInclude Include="..\..\Source\corePKCS11\source\dependency\3rdparty\pkcs11\pkcs11t.h">
+      <Filter>3rdparty\pkcs11</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\aria.h">
-      <Filter>3rdparty\mbedtls\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\asn1.h">
-      <Filter>3rdparty\mbedtls\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\asn1write.h">
-      <Filter>3rdparty\mbedtls\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\base64.h">
-      <Filter>3rdparty\mbedtls\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\bignum.h">
-      <Filter>3rdparty\mbedtls\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\blowfish.h">
-      <Filter>3rdparty\mbedtls\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\bn_mul.h">
-      <Filter>3rdparty\mbedtls\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\camellia.h">
-      <Filter>3rdparty\mbedtls\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\ccm.h">
-      <Filter>3rdparty\mbedtls\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\certs.h">
-      <Filter>3rdparty\mbedtls\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\chacha20.h">
-      <Filter>3rdparty\mbedtls\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\chachapoly.h">
-      <Filter>3rdparty\mbedtls\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\check_config.h">
-      <Filter>3rdparty\mbedtls\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\cipher.h">
-      <Filter>3rdparty\mbedtls\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\cipher_internal.h">
-      <Filter>3rdparty\mbedtls\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\cmac.h">
-      <Filter>3rdparty\mbedtls\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\compat-1.3.h">
-      <Filter>3rdparty\mbedtls\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\config.h">
-      <Filter>3rdparty\mbedtls\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\ctr_drbg.h">
-      <Filter>3rdparty\mbedtls\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\debug.h">
-      <Filter>3rdparty\mbedtls\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\des.h">
-      <Filter>3rdparty\mbedtls\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\dhm.h">
-      <Filter>3rdparty\mbedtls\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\ecdh.h">
-      <Filter>3rdparty\mbedtls\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\ecdsa.h">
-      <Filter>3rdparty\mbedtls\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\ecjpake.h">
-      <Filter>3rdparty\mbedtls\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\ecp.h">
-      <Filter>3rdparty\mbedtls\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\ecp_internal.h">
-      <Filter>3rdparty\mbedtls\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\entropy.h">
-      <Filter>3rdparty\mbedtls\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\entropy_poll.h">
-      <Filter>3rdparty\mbedtls\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\error.h">
-      <Filter>3rdparty\mbedtls\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\gcm.h">
-      <Filter>3rdparty\mbedtls\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\havege.h">
-      <Filter>3rdparty\mbedtls\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\hkdf.h">
-      <Filter>3rdparty\mbedtls\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\hmac_drbg.h">
-      <Filter>3rdparty\mbedtls\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\md.h">
-      <Filter>3rdparty\mbedtls\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\md_internal.h">
-      <Filter>3rdparty\mbedtls\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\md2.h">
-      <Filter>3rdparty\mbedtls\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\md4.h">
-      <Filter>3rdparty\mbedtls\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\md5.h">
-      <Filter>3rdparty\mbedtls\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\memory_buffer_alloc.h">
-      <Filter>3rdparty\mbedtls\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\net.h">
-      <Filter>3rdparty\mbedtls\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\net_sockets.h">
-      <Filter>3rdparty\mbedtls\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\nist_kw.h">
-      <Filter>3rdparty\mbedtls\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\oid.h">
-      <Filter>3rdparty\mbedtls\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\padlock.h">
-      <Filter>3rdparty\mbedtls\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\pem.h">
-      <Filter>3rdparty\mbedtls\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\pk.h">
-      <Filter>3rdparty\mbedtls\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\pk_internal.h">
-      <Filter>3rdparty\mbedtls\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\pkcs5.h">
-      <Filter>3rdparty\mbedtls\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\pkcs11.h">
-      <Filter>3rdparty\mbedtls\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\pkcs12.h">
-      <Filter>3rdparty\mbedtls\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\platform.h">
-      <Filter>3rdparty\mbedtls\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\platform_time.h">
-      <Filter>3rdparty\mbedtls\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\platform_util.h">
-      <Filter>3rdparty\mbedtls\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\poly1305.h">
-      <Filter>3rdparty\mbedtls\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\ripemd160.h">
-      <Filter>3rdparty\mbedtls\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\rsa.h">
-      <Filter>3rdparty\mbedtls\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\rsa_internal.h">
-      <Filter>3rdparty\mbedtls\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\sha1.h">
-      <Filter>3rdparty\mbedtls\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\sha256.h">
-      <Filter>3rdparty\mbedtls\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\sha512.h">
-      <Filter>3rdparty\mbedtls\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\ssl.h">
-      <Filter>3rdparty\mbedtls\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\ssl_cache.h">
-      <Filter>3rdparty\mbedtls\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\ssl_ciphersuites.h">
-      <Filter>3rdparty\mbedtls\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\ssl_cookie.h">
-      <Filter>3rdparty\mbedtls\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\ssl_internal.h">
-      <Filter>3rdparty\mbedtls\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\ssl_ticket.h">
-      <Filter>3rdparty\mbedtls\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\threading.h">
-      <Filter>3rdparty\mbedtls\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\timing.h">
-      <Filter>3rdparty\mbedtls\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\version.h">
-      <Filter>3rdparty\mbedtls\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\x509.h">
-      <Filter>3rdparty\mbedtls\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\x509_crl.h">
-      <Filter>3rdparty\mbedtls\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\x509_crt.h">
-      <Filter>3rdparty\mbedtls\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\x509_csr.h">
-      <Filter>3rdparty\mbedtls\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\Source\corePKCS11\3rdparty\mbedtls\include\mbedtls\xtea.h">
-      <Filter>3rdparty\mbedtls\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Common\Logging\logging_levels.h">
-      <Filter>Common</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Common\Logging\logging_stack.h">
-      <Filter>Common</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <Text Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\CMakeLists.txt">
+    <ClInclude Include="..\..\ThirdParty\mbedtls\library\psa_crypto_core.h">
       <Filter>3rdparty\mbedtls</Filter>
-    </Text>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\..\Source\corePKCS11\3rdparty\mbedtls\library\Makefile">
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\library\psa_crypto_driver_wrappers.h">
       <Filter>3rdparty\mbedtls</Filter>
-    </None>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\library\psa_crypto_invasive.h">
+      <Filter>3rdparty\mbedtls</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\library\psa_crypto_its.h">
+      <Filter>3rdparty\mbedtls</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\library\psa_crypto_se.h">
+      <Filter>3rdparty\mbedtls</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\library\psa_crypto_service_integration.h">
+      <Filter>3rdparty\mbedtls</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\library\psa_crypto_slot_management.h">
+      <Filter>3rdparty\mbedtls</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\library\psa_crypto_storage.h">
+      <Filter>3rdparty\mbedtls</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\psa_util.h">
+      <Filter>3rdparty\mbedtls</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\library\ssl_invasive.h">
+      <Filter>3rdparty\mbedtls</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\library\ssl_tls13_keys.h">
+      <Filter>3rdparty\mbedtls</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/FreeRTOS-Plus/Source/corePKCS11 b/FreeRTOS-Plus/Source/corePKCS11
index efc4b34b03..3a65d76a06 160000
--- a/FreeRTOS-Plus/Source/corePKCS11
+++ b/FreeRTOS-Plus/Source/corePKCS11
@@ -1 +1 @@
-Subproject commit efc4b34b03f1aef39af7fb771c46a541f0eeb2e3
+Subproject commit 3a65d76a065c8e3d5c2de87f7a3adf9f174f6d1d