diff --git a/FreeRTOS-Plus/WindowsSimulator/FreeRTOS+TCP.vcxproj b/FreeRTOS-Plus/WindowsSimulator/FreeRTOS+TCP.vcxproj
deleted file mode 100644
index 62e58a213a..0000000000
--- a/FreeRTOS-Plus/WindowsSimulator/FreeRTOS+TCP.vcxproj
+++ /dev/null
@@ -1,247 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <VCProjectVersion>17.0</VCProjectVersion>
-    <ProjectGuid>{C90E6CC5-818B-4C97-8876-0986D989387C}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Platform)'=='Win32'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Platform)'=='x64'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <PublicIncludeDirectories>..\Source\FreeRTOS-Plus-TCP\source\include;..\Source\FreeRTOS-Plus-TCP\tools\tcp_utilities\include;..\Source\FreeRTOS-Plus-TCP\source\portable\Compiler\MSVC;.\;$(PublicIncludeDirectories)</PublicIncludeDirectories>
-    <AllProjectIncludesArePublic>true</AllProjectIncludesArePublic>
-    <OutDir>build\$(ProjectName)\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>build\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-    <LibraryPath>$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);..\ThirdParty\winpcap\lib\x64</LibraryPath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <PublicIncludeDirectories>..\Source\FreeRTOS-Plus-TCP\source\include;..\Source\FreeRTOS-Plus-TCP\tools\tcp_utilities\include;..\Source\FreeRTOS-Plus-TCP\source\portable\Compiler\MSVC;.\;$(PublicIncludeDirectories)</PublicIncludeDirectories>
-    <AllProjectIncludesArePublic>true</AllProjectIncludesArePublic>
-    <OutDir>build\$(ProjectName)\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>build\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-    <LibraryPath>$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);..\ThirdParty\winpcap\lib\x64</LibraryPath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <PublicIncludeDirectories>..\Source\FreeRTOS-Plus-TCP\source\include;..\Source\FreeRTOS-Plus-TCP\tools\tcp_utilities\include;..\Source\FreeRTOS-Plus-TCP\source\portable\Compiler\MSVC;.\;$(PublicIncludeDirectories)</PublicIncludeDirectories>
-    <AllProjectIncludesArePublic>true</AllProjectIncludesArePublic>
-    <OutDir>build\$(ProjectName)\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>build\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-    <LibraryPath>$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);..\ThirdParty\winpcap\lib\x86</LibraryPath>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <PublicIncludeDirectories>..\Source\FreeRTOS-Plus-TCP\source\include;..\Source\FreeRTOS-Plus-TCP\tools\tcp_utilities\include;..\Source\FreeRTOS-Plus-TCP\source\portable\Compiler\MSVC;.\;$(PublicIncludeDirectories)</PublicIncludeDirectories>
-    <AllProjectIncludesArePublic>true</AllProjectIncludesArePublic>
-    <OutDir>build\$(ProjectName)\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>build\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-    <LibraryPath>$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);..\ThirdParty\winpcap\lib\x86</LibraryPath>
-  </PropertyGroup>
-  <PropertyGroup Label="Vcpkg">
-    <VcpkgEnabled>false</VcpkgEnabled>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\Source\FreeRTOS-Plus-TCP\source\include;..\Source\FreeRTOS-Plus-TCP\source\portable\Compiler\MSVC;..\Source\FreeRTOS-Plus-TCP\tools\tcp_utilities\include;..\ThirdParty\winpcap\include;..\ThirdParty\winpcap\include\pcap;.\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <TargetMachine>MachineX86</TargetMachine>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-    </Link>
-    <Lib>
-      <AdditionalDependencies>wpcap.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <AdditionalIncludeDirectories>..\Source\FreeRTOS-Plus-TCP\source\include;..\Source\FreeRTOS-Plus-TCP\source\portable\Compiler\MSVC;..\Source\FreeRTOS-Plus-TCP\tools\tcp_utilities\include;..\ThirdParty\winpcap\include;..\ThirdParty\winpcap\include\pcap;.\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <TargetMachine>MachineX86</TargetMachine>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Windows</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-    <Lib>
-      <AdditionalDependencies>wpcap.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile />
-    <ClCompile>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\Source\FreeRTOS-Plus-TCP\source\include;..\Source\FreeRTOS-Plus-TCP\source\portable\Compiler\MSVC;..\Source\FreeRTOS-Plus-TCP\tools\tcp_utilities\include;..\ThirdParty\winpcap\include;..\ThirdParty\winpcap\include\pcap;.\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Lib>
-      <AdditionalDependencies>wpcap.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\Source\FreeRTOS-Plus-TCP\source\include;..\Source\FreeRTOS-Plus-TCP\source\portable\Compiler\MSVC;..\Source\FreeRTOS-Plus-TCP\tools\tcp_utilities\include;..\ThirdParty\winpcap\include;..\ThirdParty\winpcap\include\pcap;.\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Lib>
-      <AdditionalDependencies>wpcap.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\Source\FreeRTOS-Plus-TCP\source\FreeRTOS_ARP.c" />
-    <ClCompile Include="..\Source\FreeRTOS-Plus-TCP\source\FreeRTOS_DHCP.c" />
-    <ClCompile Include="..\Source\FreeRTOS-Plus-TCP\source\FreeRTOS_DNS.c" />
-    <ClCompile Include="..\Source\FreeRTOS-Plus-TCP\source\FreeRTOS_DNS_Cache.c" />
-    <ClCompile Include="..\Source\FreeRTOS-Plus-TCP\source\FreeRTOS_DNS_Callback.c" />
-    <ClCompile Include="..\Source\FreeRTOS-Plus-TCP\source\FreeRTOS_DNS_Networking.c" />
-    <ClCompile Include="..\Source\FreeRTOS-Plus-TCP\source\FreeRTOS_DNS_Parser.c" />
-    <ClCompile Include="..\Source\FreeRTOS-Plus-TCP\source\FreeRTOS_ICMP.c" />
-    <ClCompile Include="..\Source\FreeRTOS-Plus-TCP\source\FreeRTOS_IP.c" />
-    <ClCompile Include="..\Source\FreeRTOS-Plus-TCP\source\FreeRTOS_IP_Timers.c" />
-    <ClCompile Include="..\Source\FreeRTOS-Plus-TCP\source\FreeRTOS_IP_Utils.c" />
-    <ClCompile Include="..\Source\FreeRTOS-Plus-TCP\source\FreeRTOS_Sockets.c" />
-    <ClCompile Include="..\Source\FreeRTOS-Plus-TCP\source\FreeRTOS_Stream_Buffer.c" />
-    <ClCompile Include="..\Source\FreeRTOS-Plus-TCP\source\FreeRTOS_TCP_IP.c" />
-    <ClCompile Include="..\Source\FreeRTOS-Plus-TCP\source\FreeRTOS_TCP_Reception.c" />
-    <ClCompile Include="..\Source\FreeRTOS-Plus-TCP\source\FreeRTOS_TCP_State_Handling.c" />
-    <ClCompile Include="..\Source\FreeRTOS-Plus-TCP\source\FreeRTOS_TCP_Transmission.c" />
-    <ClCompile Include="..\Source\FreeRTOS-Plus-TCP\source\FreeRTOS_TCP_Utils.c" />
-    <ClCompile Include="..\Source\FreeRTOS-Plus-TCP\source\FreeRTOS_TCP_WIN.c" />
-    <ClCompile Include="..\Source\FreeRTOS-Plus-TCP\source\FreeRTOS_Tiny_TCP.c" />
-    <ClCompile Include="..\Source\FreeRTOS-Plus-TCP\source\FreeRTOS_UDP_IP.c" />
-    <ClCompile Include="..\Source\FreeRTOS-Plus-TCP\source\portable\BufferManagement\BufferAllocation_2.c" />
-    <ClCompile Include="..\Source\FreeRTOS-Plus-TCP\source\portable\NetworkInterface\WinPCap\NetworkInterface.c" />
-    <ClCompile Include="..\Source\FreeRTOS-Plus-TCP\tools\tcp_utilities\tcp_dump_packets.c" />
-    <ClCompile Include="..\Source\FreeRTOS-Plus-TCP\tools\tcp_utilities\tcp_mem_stats.c" />
-    <ClCompile Include="..\Source\FreeRTOS-Plus-TCP\tools\tcp_utilities\tcp_netstat.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\Source\FreeRTOS-Plus-TCP\source\include\FreeRTOSIPConfigDefaults.h" />
-    <ClInclude Include="..\Source\FreeRTOS-Plus-TCP\source\include\FreeRTOS_ARP.h" />
-    <ClInclude Include="..\Source\FreeRTOS-Plus-TCP\source\include\FreeRTOS_DHCP.h" />
-    <ClInclude Include="..\Source\FreeRTOS-Plus-TCP\source\include\FreeRTOS_DNS.h" />
-    <ClInclude Include="..\Source\FreeRTOS-Plus-TCP\source\include\FreeRTOS_DNS_Cache.h" />
-    <ClInclude Include="..\Source\FreeRTOS-Plus-TCP\source\include\FreeRTOS_DNS_Callback.h" />
-    <ClInclude Include="..\Source\FreeRTOS-Plus-TCP\source\include\FreeRTOS_DNS_Globals.h" />
-    <ClInclude Include="..\Source\FreeRTOS-Plus-TCP\source\include\FreeRTOS_DNS_Networking.h" />
-    <ClInclude Include="..\Source\FreeRTOS-Plus-TCP\source\include\FreeRTOS_DNS_Parser.h" />
-    <ClInclude Include="..\Source\FreeRTOS-Plus-TCP\source\include\FreeRTOS_errno_TCP.h" />
-    <ClInclude Include="..\Source\FreeRTOS-Plus-TCP\source\include\FreeRTOS_ICMP.h" />
-    <ClInclude Include="..\Source\FreeRTOS-Plus-TCP\source\include\FreeRTOS_IP.h" />
-    <ClInclude Include="..\Source\FreeRTOS-Plus-TCP\source\include\FreeRTOS_IP_Private.h" />
-    <ClInclude Include="..\Source\FreeRTOS-Plus-TCP\source\include\FreeRTOS_IP_Timers.h" />
-    <ClInclude Include="..\Source\FreeRTOS-Plus-TCP\source\include\FreeRTOS_IP_Utils.h" />
-    <ClInclude Include="..\Source\FreeRTOS-Plus-TCP\source\include\FreeRTOS_Sockets.h" />
-    <ClInclude Include="..\Source\FreeRTOS-Plus-TCP\source\include\FreeRTOS_Stream_Buffer.h" />
-    <ClInclude Include="..\Source\FreeRTOS-Plus-TCP\source\include\FreeRTOS_TCP_IP.h" />
-    <ClInclude Include="..\Source\FreeRTOS-Plus-TCP\source\include\FreeRTOS_TCP_Reception.h" />
-    <ClInclude Include="..\Source\FreeRTOS-Plus-TCP\source\include\FreeRTOS_TCP_State_Handling.h" />
-    <ClInclude Include="..\Source\FreeRTOS-Plus-TCP\source\include\FreeRTOS_TCP_Transmission.h" />
-    <ClInclude Include="..\Source\FreeRTOS-Plus-TCP\source\include\FreeRTOS_TCP_Utils.h" />
-    <ClInclude Include="..\Source\FreeRTOS-Plus-TCP\source\include\FreeRTOS_TCP_WIN.h" />
-    <ClInclude Include="..\Source\FreeRTOS-Plus-TCP\source\include\FreeRTOS_UDP_IP.h" />
-    <ClInclude Include="..\Source\FreeRTOS-Plus-TCP\source\include\IPTraceMacroDefaults.h" />
-    <ClInclude Include="..\Source\FreeRTOS-Plus-TCP\source\include\NetworkBufferManagement.h" />
-    <ClInclude Include="..\Source\FreeRTOS-Plus-TCP\source\include\NetworkInterface.h" />
-    <ClInclude Include="..\Source\FreeRTOS-Plus-TCP\source\portable\Compiler\MSVC\pack_struct_end.h" />
-    <ClInclude Include="..\Source\FreeRTOS-Plus-TCP\source\portable\Compiler\MSVC\pack_struct_start.h" />
-    <ClInclude Include="..\Source\FreeRTOS-Plus-TCP\tools\tcp_utilities\include\tcp_dump_packets.h" />
-    <ClInclude Include="..\Source\FreeRTOS-Plus-TCP\tools\tcp_utilities\include\tcp_mem_stats.h" />
-    <ClInclude Include="..\Source\FreeRTOS-Plus-TCP\tools\tcp_utilities\include\tcp_netstat.h" />
-    <ClInclude Include="..\ThirdParty\winpcap\include\bittypes.h" />
-    <ClInclude Include="..\ThirdParty\winpcap\include\ip6_misc.h" />
-    <ClInclude Include="..\ThirdParty\winpcap\include\Packet32.h" />
-    <ClInclude Include="..\ThirdParty\winpcap\include\pcap-bpf.h" />
-    <ClInclude Include="..\ThirdParty\winpcap\include\pcap-namedb.h" />
-    <ClInclude Include="..\ThirdParty\winpcap\include\pcap-stdinc.h" />
-    <ClInclude Include="..\ThirdParty\winpcap\include\pcap.h" />
-    <ClInclude Include="..\ThirdParty\winpcap\include\pcap\bluetooth.h" />
-    <ClInclude Include="..\ThirdParty\winpcap\include\pcap\bpf.h" />
-    <ClInclude Include="..\ThirdParty\winpcap\include\pcap\namedb.h" />
-    <ClInclude Include="..\ThirdParty\winpcap\include\pcap\pcap.h" />
-    <ClInclude Include="..\ThirdParty\winpcap\include\pcap\sll.h" />
-    <ClInclude Include="..\ThirdParty\winpcap\include\pcap\usb.h" />
-    <ClInclude Include="..\ThirdParty\winpcap\include\pcap\vlan.h" />
-    <ClInclude Include="..\ThirdParty\winpcap\include\remote-ext.h" />
-    <ClInclude Include="..\ThirdParty\winpcap\include\Win32-Extensions.h" />
-    <ClInclude Include="FreeRTOSIPConfig.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="FreeRTOS-Kernel.vcxproj">
-      <Project>{72c209c4-49a4-4942-a201-44706c9d77ec}</Project>
-      <LinkLibraryDependencies>true</LinkLibraryDependencies>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/FreeRTOS-Plus/WindowsSimulator/FreeRTOS+TCP.vcxproj.filters b/FreeRTOS-Plus/WindowsSimulator/FreeRTOS+TCP.vcxproj.filters
deleted file mode 100644
index fc9436fc8c..0000000000
--- a/FreeRTOS-Plus/WindowsSimulator/FreeRTOS+TCP.vcxproj.filters
+++ /dev/null
@@ -1,260 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="source">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="include">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="compiler_msvc">
-      <UniqueIdentifier>{a3216426-70cf-4b4f-8b8f-423c8d0416cb}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="tcp_utilities">
-      <UniqueIdentifier>{b2e06bcd-b665-4ef4-8eff-5203748463d1}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="tcp_utilities\include">
-      <UniqueIdentifier>{af7dc417-59c0-4c2b-bb4b-cc9b84817e89}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="config">
-      <UniqueIdentifier>{7f8e5e6c-a484-404a-a27f-4a214aa6c6ef}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="winpcap">
-      <UniqueIdentifier>{97a99563-c215-4975-9cb8-c6a29a30f03f}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="winpcap\include">
-      <UniqueIdentifier>{7a52d3bf-8fc9-4242-8636-e173ade0aa68}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\Source\FreeRTOS-Plus-TCP\source\FreeRTOS_ICMP.c">
-      <Filter>source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Source\FreeRTOS-Plus-TCP\source\FreeRTOS_Stream_Buffer.c">
-      <Filter>source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Source\FreeRTOS-Plus-TCP\source\FreeRTOS_Tiny_TCP.c">
-      <Filter>source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Source\FreeRTOS-Plus-TCP\source\FreeRTOS_TCP_State_Handling.c">
-      <Filter>source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Source\FreeRTOS-Plus-TCP\source\FreeRTOS_DNS_Callback.c">
-      <Filter>source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Source\FreeRTOS-Plus-TCP\source\FreeRTOS_TCP_Reception.c">
-      <Filter>source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Source\FreeRTOS-Plus-TCP\source\FreeRTOS_TCP_Utils.c">
-      <Filter>source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Source\FreeRTOS-Plus-TCP\source\FreeRTOS_UDP_IP.c">
-      <Filter>source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Source\FreeRTOS-Plus-TCP\source\FreeRTOS_DNS_Parser.c">
-      <Filter>source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Source\FreeRTOS-Plus-TCP\source\FreeRTOS_DNS_Networking.c">
-      <Filter>source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Source\FreeRTOS-Plus-TCP\source\FreeRTOS_Sockets.c">
-      <Filter>source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Source\FreeRTOS-Plus-TCP\source\FreeRTOS_IP_Utils.c">
-      <Filter>source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Source\FreeRTOS-Plus-TCP\source\FreeRTOS_DHCP.c">
-      <Filter>source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Source\FreeRTOS-Plus-TCP\source\FreeRTOS_TCP_IP.c">
-      <Filter>source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Source\FreeRTOS-Plus-TCP\source\FreeRTOS_DNS.c">
-      <Filter>source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Source\FreeRTOS-Plus-TCP\source\FreeRTOS_TCP_WIN.c">
-      <Filter>source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Source\FreeRTOS-Plus-TCP\source\FreeRTOS_IP_Timers.c">
-      <Filter>source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Source\FreeRTOS-Plus-TCP\source\FreeRTOS_ARP.c">
-      <Filter>source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Source\FreeRTOS-Plus-TCP\source\FreeRTOS_TCP_Transmission.c">
-      <Filter>source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Source\FreeRTOS-Plus-TCP\source\FreeRTOS_DNS_Cache.c">
-      <Filter>source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Source\FreeRTOS-Plus-TCP\source\FreeRTOS_IP.c">
-      <Filter>source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Source\FreeRTOS-Plus-TCP\tools\tcp_utilities\tcp_dump_packets.c">
-      <Filter>tcp_utilities</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Source\FreeRTOS-Plus-TCP\tools\tcp_utilities\tcp_mem_stats.c">
-      <Filter>tcp_utilities</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Source\FreeRTOS-Plus-TCP\tools\tcp_utilities\tcp_netstat.c">
-      <Filter>tcp_utilities</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Source\FreeRTOS-Plus-TCP\source\portable\NetworkInterface\WinPCap\NetworkInterface.c">
-      <Filter>source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\Source\FreeRTOS-Plus-TCP\source\portable\BufferManagement\BufferAllocation_2.c">
-      <Filter>source</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\Source\FreeRTOS-Plus-TCP\source\include\FreeRTOS_Sockets.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Source\FreeRTOS-Plus-TCP\source\include\FreeRTOS_errno_TCP.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Source\FreeRTOS-Plus-TCP\source\include\FreeRTOS_IP_Utils.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Source\FreeRTOS-Plus-TCP\source\include\FreeRTOS_DNS_Globals.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Source\FreeRTOS-Plus-TCP\source\include\FreeRTOS_DNS_Networking.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Source\FreeRTOS-Plus-TCP\source\include\FreeRTOS_TCP_WIN.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Source\FreeRTOS-Plus-TCP\source\include\FreeRTOS_DNS.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Source\FreeRTOS-Plus-TCP\source\include\FreeRTOS_TCP_IP.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Source\FreeRTOS-Plus-TCP\source\include\FreeRTOS_DHCP.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Source\FreeRTOS-Plus-TCP\source\include\FreeRTOS_DNS_Cache.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Source\FreeRTOS-Plus-TCP\source\include\NetworkBufferManagement.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Source\FreeRTOS-Plus-TCP\source\include\FreeRTOS_ARP.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Source\FreeRTOS-Plus-TCP\source\include\NetworkInterface.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Source\FreeRTOS-Plus-TCP\source\include\FreeRTOS_TCP_Transmission.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Source\FreeRTOS-Plus-TCP\source\include\FreeRTOS_IP_Timers.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Source\FreeRTOS-Plus-TCP\source\include\FreeRTOSIPConfigDefaults.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Source\FreeRTOS-Plus-TCP\source\include\FreeRTOS_IP_Private.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Source\FreeRTOS-Plus-TCP\source\include\FreeRTOS_IP.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Source\FreeRTOS-Plus-TCP\source\include\FreeRTOS_Stream_Buffer.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Source\FreeRTOS-Plus-TCP\source\include\FreeRTOS_ICMP.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Source\FreeRTOS-Plus-TCP\source\include\FreeRTOS_DNS_Callback.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Source\FreeRTOS-Plus-TCP\source\include\FreeRTOS_TCP_State_Handling.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Source\FreeRTOS-Plus-TCP\source\include\FreeRTOS_TCP_Reception.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Source\FreeRTOS-Plus-TCP\source\include\FreeRTOS_UDP_IP.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Source\FreeRTOS-Plus-TCP\source\include\FreeRTOS_TCP_Utils.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Source\FreeRTOS-Plus-TCP\source\include\IPTraceMacroDefaults.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Source\FreeRTOS-Plus-TCP\source\include\FreeRTOS_DNS_Parser.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Source\FreeRTOS-Plus-TCP\tools\tcp_utilities\include\tcp_dump_packets.h">
-      <Filter>tcp_utilities\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Source\FreeRTOS-Plus-TCP\tools\tcp_utilities\include\tcp_netstat.h">
-      <Filter>tcp_utilities\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Source\FreeRTOS-Plus-TCP\tools\tcp_utilities\include\tcp_mem_stats.h">
-      <Filter>tcp_utilities\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Source\FreeRTOS-Plus-TCP\source\portable\Compiler\MSVC\pack_struct_end.h">
-      <Filter>compiler_msvc</Filter>
-    </ClInclude>
-    <ClInclude Include="..\Source\FreeRTOS-Plus-TCP\source\portable\Compiler\MSVC\pack_struct_start.h">
-      <Filter>compiler_msvc</Filter>
-    </ClInclude>
-    <ClInclude Include="FreeRTOSIPConfig.h">
-      <Filter>config</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\winpcap\include\pcap\bpf.h">
-      <Filter>winpcap\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\winpcap\include\pcap\sll.h">
-      <Filter>winpcap\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\winpcap\include\pcap\bluetooth.h">
-      <Filter>winpcap\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\winpcap\include\pcap\pcap.h">
-      <Filter>winpcap\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\winpcap\include\pcap\usb.h">
-      <Filter>winpcap\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\winpcap\include\pcap\vlan.h">
-      <Filter>winpcap\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\winpcap\include\pcap\namedb.h">
-      <Filter>winpcap\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\winpcap\include\pcap-bpf.h">
-      <Filter>winpcap\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\winpcap\include\pcap-namedb.h">
-      <Filter>winpcap\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\winpcap\include\remote-ext.h">
-      <Filter>winpcap\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\winpcap\include\bittypes.h">
-      <Filter>winpcap\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\winpcap\include\ip6_misc.h">
-      <Filter>winpcap\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\winpcap\include\pcap.h">
-      <Filter>winpcap\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\winpcap\include\Win32-Extensions.h">
-      <Filter>winpcap\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\winpcap\include\Packet32.h">
-      <Filter>winpcap\include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\winpcap\include\pcap-stdinc.h">
-      <Filter>winpcap\include</Filter>
-    </ClInclude>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/FreeRTOS-Plus/WindowsSimulator/FreeRTOS+TCP/FreeRTOS+TCP.vcxproj b/FreeRTOS-Plus/WindowsSimulator/FreeRTOS+TCP/FreeRTOS+TCP.vcxproj
new file mode 100644
index 0000000000..5db7818aba
--- /dev/null
+++ b/FreeRTOS-Plus/WindowsSimulator/FreeRTOS+TCP/FreeRTOS+TCP.vcxproj
@@ -0,0 +1,249 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <VCProjectVersion>17.0</VCProjectVersion>
+    <ProjectGuid>{C90E6CC5-818B-4C97-8876-0986D989387C}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Platform)'=='Win32'">
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Platform)'=='x64'">
+    <LinkIncremental>true</LinkIncremental>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <PublicIncludeDirectories>..\..\Source\FreeRTOS-Plus-TCP\source\include;..\..\Source\FreeRTOS-Plus-TCP\tools\tcp_utilities\include;..\..\Source\FreeRTOS-Plus-TCP\source\portable\Compiler\MSVC;.\;$(PublicIncludeDirectories)</PublicIncludeDirectories>
+    <AllProjectIncludesArePublic>true</AllProjectIncludesArePublic>
+    <OutDir>build\$(ProjectName)\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>build\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
+    <LibraryPath>$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);..\..\ThirdParty\winpcap\lib\x64</LibraryPath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <PublicIncludeDirectories>..\..\Source\FreeRTOS-Plus-TCP\source\include;..\..\Source\FreeRTOS-Plus-TCP\tools\tcp_utilities\include;..\..\Source\FreeRTOS-Plus-TCP\source\portable\Compiler\MSVC;.\;$(PublicIncludeDirectories)</PublicIncludeDirectories>
+    <AllProjectIncludesArePublic>true</AllProjectIncludesArePublic>
+    <OutDir>build\$(ProjectName)\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>build\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
+    <LibraryPath>$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);..\..\ThirdParty\winpcap\lib\x64</LibraryPath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <PublicIncludeDirectories>..\..\Source\FreeRTOS-Plus-TCP\source\include;..\..\Source\FreeRTOS-Plus-TCP\tools\tcp_utilities\include;..\..\Source\FreeRTOS-Plus-TCP\source\portable\Compiler\MSVC;.\;$(PublicIncludeDirectories)</PublicIncludeDirectories>
+    <AllProjectIncludesArePublic>true</AllProjectIncludesArePublic>
+    <OutDir>build\$(ProjectName)\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>build\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
+    <LibraryPath>$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);..\..\ThirdParty\winpcap\lib\x86</LibraryPath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <PublicIncludeDirectories>..\..\Source\FreeRTOS-Plus-TCP\source\include;..\..\Source\FreeRTOS-Plus-TCP\tools\tcp_utilities\include;..\..\Source\FreeRTOS-Plus-TCP\source\portable\Compiler\MSVC;.\;$(PublicIncludeDirectories)</PublicIncludeDirectories>
+    <AllProjectIncludesArePublic>true</AllProjectIncludesArePublic>
+    <OutDir>build\$(ProjectName)\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>build\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
+    <LibraryPath>$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);..\..\ThirdParty\winpcap\lib\x86</LibraryPath>
+  </PropertyGroup>
+  <PropertyGroup Label="Vcpkg">
+    <VcpkgEnabled>false</VcpkgEnabled>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\..\Source\FreeRTOS-Plus-TCP\source\include;..\..\Source\FreeRTOS-Plus-TCP\source\portable\Compiler\MSVC;..\..\Source\FreeRTOS-Plus-TCP\tools\tcp_utilities\include;..\..\ThirdParty\winpcap\include;..\..\ThirdParty\winpcap\include\pcap;.\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <TargetMachine>MachineX86</TargetMachine>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+    </Link>
+    <Lib>
+      <AdditionalDependencies>wpcap.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
+      <AdditionalIncludeDirectories>..\..\Source\FreeRTOS-Plus-TCP\source\include;..\..\Source\FreeRTOS-Plus-TCP\source\portable\Compiler\MSVC;..\..\Source\FreeRTOS-Plus-TCP\tools\tcp_utilities\include;..\..\ThirdParty\winpcap\include;..\..\ThirdParty\winpcap\include\pcap;.\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <TargetMachine>MachineX86</TargetMachine>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <SubSystem>Windows</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+    <Lib>
+      <AdditionalDependencies>wpcap.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile />
+    <ClCompile>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\Source\FreeRTOS-Plus-TCP\source\include;..\..\Source\FreeRTOS-Plus-TCP\source\portable\Compiler\MSVC;..\..\Source\FreeRTOS-Plus-TCP\tools\tcp_utilities\include;..\..\ThirdParty\winpcap\include;..\..\ThirdParty\winpcap\include\pcap;.\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Lib>
+      <AdditionalDependencies>wpcap.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\..\Source\FreeRTOS-Plus-TCP\source\include;..\..\Source\FreeRTOS-Plus-TCP\source\portable\Compiler\MSVC;..\..\Source\FreeRTOS-Plus-TCP\tools\tcp_utilities\include;..\..\ThirdParty\winpcap\include;..\..\ThirdParty\winpcap\include\pcap;.\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Lib>
+      <AdditionalDependencies>wpcap.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\Source\FreeRTOS-Plus-TCP\source\FreeRTOS_ARP.c" />
+    <ClCompile Include="..\..\Source\FreeRTOS-Plus-TCP\source\FreeRTOS_DHCP.c" />
+    <ClCompile Include="..\..\Source\FreeRTOS-Plus-TCP\source\FreeRTOS_DNS.c" />
+    <ClCompile Include="..\..\Source\FreeRTOS-Plus-TCP\source\FreeRTOS_DNS_Cache.c" />
+    <ClCompile Include="..\..\Source\FreeRTOS-Plus-TCP\source\FreeRTOS_DNS_Callback.c" />
+    <ClCompile Include="..\..\Source\FreeRTOS-Plus-TCP\source\FreeRTOS_DNS_Networking.c" />
+    <ClCompile Include="..\..\Source\FreeRTOS-Plus-TCP\source\FreeRTOS_DNS_Parser.c" />
+    <ClCompile Include="..\..\Source\FreeRTOS-Plus-TCP\source\FreeRTOS_ICMP.c" />
+    <ClCompile Include="..\..\Source\FreeRTOS-Plus-TCP\source\FreeRTOS_IP.c" />
+    <ClCompile Include="..\..\Source\FreeRTOS-Plus-TCP\source\FreeRTOS_IP_Timers.c" />
+    <ClCompile Include="..\..\Source\FreeRTOS-Plus-TCP\source\FreeRTOS_IP_Utils.c" />
+    <ClCompile Include="..\..\Source\FreeRTOS-Plus-TCP\source\FreeRTOS_Sockets.c" />
+    <ClCompile Include="..\..\Source\FreeRTOS-Plus-TCP\source\FreeRTOS_Stream_Buffer.c" />
+    <ClCompile Include="..\..\Source\FreeRTOS-Plus-TCP\source\FreeRTOS_TCP_IP.c" />
+    <ClCompile Include="..\..\Source\FreeRTOS-Plus-TCP\source\FreeRTOS_TCP_Reception.c" />
+    <ClCompile Include="..\..\Source\FreeRTOS-Plus-TCP\source\FreeRTOS_TCP_State_Handling.c" />
+    <ClCompile Include="..\..\Source\FreeRTOS-Plus-TCP\source\FreeRTOS_TCP_Transmission.c" />
+    <ClCompile Include="..\..\Source\FreeRTOS-Plus-TCP\source\FreeRTOS_TCP_Utils.c" />
+    <ClCompile Include="..\..\Source\FreeRTOS-Plus-TCP\source\FreeRTOS_TCP_WIN.c" />
+    <ClCompile Include="..\..\Source\FreeRTOS-Plus-TCP\source\FreeRTOS_Tiny_TCP.c" />
+    <ClCompile Include="..\..\Source\FreeRTOS-Plus-TCP\source\FreeRTOS_UDP_IP.c" />
+    <ClCompile Include="..\..\Source\FreeRTOS-Plus-TCP\source\portable\BufferManagement\BufferAllocation_2.c" />
+    <ClCompile Include="..\..\Source\FreeRTOS-Plus-TCP\source\portable\NetworkInterface\WinPCap\NetworkInterface.c" />
+    <ClCompile Include="..\..\Source\FreeRTOS-Plus-TCP\tools\tcp_utilities\tcp_dump_packets.c" />
+    <ClCompile Include="..\..\Source\FreeRTOS-Plus-TCP\tools\tcp_utilities\tcp_mem_stats.c" />
+    <ClCompile Include="..\..\Source\FreeRTOS-Plus-TCP\tools\tcp_utilities\tcp_netstat.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\Source\FreeRTOS-Plus-TCP\source\include\FreeRTOSIPConfigDefaults.h" />
+    <ClInclude Include="..\..\Source\FreeRTOS-Plus-TCP\source\include\FreeRTOS_ARP.h" />
+    <ClInclude Include="..\..\Source\FreeRTOS-Plus-TCP\source\include\FreeRTOS_DHCP.h" />
+    <ClInclude Include="..\..\Source\FreeRTOS-Plus-TCP\source\include\FreeRTOS_DNS.h" />
+    <ClInclude Include="..\..\Source\FreeRTOS-Plus-TCP\source\include\FreeRTOS_DNS_Cache.h" />
+    <ClInclude Include="..\..\Source\FreeRTOS-Plus-TCP\source\include\FreeRTOS_DNS_Callback.h" />
+    <ClInclude Include="..\..\Source\FreeRTOS-Plus-TCP\source\include\FreeRTOS_DNS_Globals.h" />
+    <ClInclude Include="..\..\Source\FreeRTOS-Plus-TCP\source\include\FreeRTOS_DNS_Networking.h" />
+    <ClInclude Include="..\..\Source\FreeRTOS-Plus-TCP\source\include\FreeRTOS_DNS_Parser.h" />
+    <ClInclude Include="..\..\Source\FreeRTOS-Plus-TCP\source\include\FreeRTOS_errno_TCP.h" />
+    <ClInclude Include="..\..\Source\FreeRTOS-Plus-TCP\source\include\FreeRTOS_ICMP.h" />
+    <ClInclude Include="..\..\Source\FreeRTOS-Plus-TCP\source\include\FreeRTOS_IP.h" />
+    <ClInclude Include="..\..\Source\FreeRTOS-Plus-TCP\source\include\FreeRTOS_IP_Private.h" />
+    <ClInclude Include="..\..\Source\FreeRTOS-Plus-TCP\source\include\FreeRTOS_IP_Timers.h" />
+    <ClInclude Include="..\..\Source\FreeRTOS-Plus-TCP\source\include\FreeRTOS_IP_Utils.h" />
+    <ClInclude Include="..\..\Source\FreeRTOS-Plus-TCP\source\include\FreeRTOS_Sockets.h" />
+    <ClInclude Include="..\..\Source\FreeRTOS-Plus-TCP\source\include\FreeRTOS_Stream_Buffer.h" />
+    <ClInclude Include="..\..\Source\FreeRTOS-Plus-TCP\source\include\FreeRTOS_TCP_IP.h" />
+    <ClInclude Include="..\..\Source\FreeRTOS-Plus-TCP\source\include\FreeRTOS_TCP_Reception.h" />
+    <ClInclude Include="..\..\Source\FreeRTOS-Plus-TCP\source\include\FreeRTOS_TCP_State_Handling.h" />
+    <ClInclude Include="..\..\Source\FreeRTOS-Plus-TCP\source\include\FreeRTOS_TCP_Transmission.h" />
+    <ClInclude Include="..\..\Source\FreeRTOS-Plus-TCP\source\include\FreeRTOS_TCP_Utils.h" />
+    <ClInclude Include="..\..\Source\FreeRTOS-Plus-TCP\source\include\FreeRTOS_TCP_WIN.h" />
+    <ClInclude Include="..\..\Source\FreeRTOS-Plus-TCP\source\include\FreeRTOS_UDP_IP.h" />
+    <ClInclude Include="..\..\Source\FreeRTOS-Plus-TCP\source\include\IPTraceMacroDefaults.h" />
+    <ClInclude Include="..\..\Source\FreeRTOS-Plus-TCP\source\include\NetworkBufferManagement.h" />
+    <ClInclude Include="..\..\Source\FreeRTOS-Plus-TCP\source\include\NetworkInterface.h" />
+    <ClInclude Include="..\..\Source\FreeRTOS-Plus-TCP\source\portable\Compiler\MSVC\pack_struct_end.h" />
+    <ClInclude Include="..\..\Source\FreeRTOS-Plus-TCP\source\portable\Compiler\MSVC\pack_struct_start.h" />
+    <ClInclude Include="..\..\Source\FreeRTOS-Plus-TCP\tools\tcp_utilities\include\tcp_dump_packets.h" />
+    <ClInclude Include="..\..\Source\FreeRTOS-Plus-TCP\tools\tcp_utilities\include\tcp_mem_stats.h" />
+    <ClInclude Include="..\..\Source\FreeRTOS-Plus-TCP\tools\tcp_utilities\include\tcp_netstat.h" />
+    <ClInclude Include="..\..\ThirdParty\winpcap\include\bittypes.h" />
+    <ClInclude Include="..\..\ThirdParty\winpcap\include\ip6_misc.h" />
+    <ClInclude Include="..\..\ThirdParty\winpcap\include\Packet32.h" />
+    <ClInclude Include="..\..\ThirdParty\winpcap\include\pcap-bpf.h" />
+    <ClInclude Include="..\..\ThirdParty\winpcap\include\pcap-namedb.h" />
+    <ClInclude Include="..\..\ThirdParty\winpcap\include\pcap-stdinc.h" />
+    <ClInclude Include="..\..\ThirdParty\winpcap\include\pcap.h" />
+    <ClInclude Include="..\..\ThirdParty\winpcap\include\pcap\bluetooth.h" />
+    <ClInclude Include="..\..\ThirdParty\winpcap\include\pcap\bpf.h" />
+    <ClInclude Include="..\..\ThirdParty\winpcap\include\pcap\namedb.h" />
+    <ClInclude Include="..\..\ThirdParty\winpcap\include\pcap\pcap.h" />
+    <ClInclude Include="..\..\ThirdParty\winpcap\include\pcap\sll.h" />
+    <ClInclude Include="..\..\ThirdParty\winpcap\include\pcap\usb.h" />
+    <ClInclude Include="..\..\ThirdParty\winpcap\include\pcap\vlan.h" />
+    <ClInclude Include="..\..\ThirdParty\winpcap\include\remote-ext.h" />
+    <ClInclude Include="..\..\ThirdParty\winpcap\include\Win32-Extensions.h" />
+    <ClInclude Include="FreeRTOSIPConfig.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\FreeRTOS-Kernel\FreeRTOS-Kernel.vcxproj">
+      <Project>{72c209c4-49a4-4942-a201-44706c9d77ec}</Project>
+      <Private>false</Private>
+      <LinkLibraryDependencies>true</LinkLibraryDependencies>
+      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/FreeRTOS-Plus/WindowsSimulator/FreeRTOS+TCP/FreeRTOS+TCP.vcxproj.filters b/FreeRTOS-Plus/WindowsSimulator/FreeRTOS+TCP/FreeRTOS+TCP.vcxproj.filters
new file mode 100644
index 0000000000..826a4a0bdb
--- /dev/null
+++ b/FreeRTOS-Plus/WindowsSimulator/FreeRTOS+TCP/FreeRTOS+TCP.vcxproj.filters
@@ -0,0 +1,255 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="source">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="include">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="compiler_msvc">
+      <UniqueIdentifier>{a3216426-70cf-4b4f-8b8f-423c8d0416cb}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="tcp_utilities">
+      <UniqueIdentifier>{b2e06bcd-b665-4ef4-8eff-5203748463d1}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="tcp_utilities\include">
+      <UniqueIdentifier>{af7dc417-59c0-4c2b-bb4b-cc9b84817e89}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="winpcap">
+      <UniqueIdentifier>{97a99563-c215-4975-9cb8-c6a29a30f03f}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="winpcap\include">
+      <UniqueIdentifier>{7a52d3bf-8fc9-4242-8636-e173ade0aa68}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\Source\FreeRTOS-Plus-TCP\source\FreeRTOS_ICMP.c">
+      <Filter>source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\FreeRTOS-Plus-TCP\source\FreeRTOS_Stream_Buffer.c">
+      <Filter>source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\FreeRTOS-Plus-TCP\source\FreeRTOS_Tiny_TCP.c">
+      <Filter>source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\FreeRTOS-Plus-TCP\source\FreeRTOS_TCP_State_Handling.c">
+      <Filter>source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\FreeRTOS-Plus-TCP\source\FreeRTOS_DNS_Callback.c">
+      <Filter>source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\FreeRTOS-Plus-TCP\source\FreeRTOS_TCP_Reception.c">
+      <Filter>source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\FreeRTOS-Plus-TCP\source\FreeRTOS_TCP_Utils.c">
+      <Filter>source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\FreeRTOS-Plus-TCP\source\FreeRTOS_UDP_IP.c">
+      <Filter>source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\FreeRTOS-Plus-TCP\source\FreeRTOS_DNS_Parser.c">
+      <Filter>source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\FreeRTOS-Plus-TCP\source\FreeRTOS_DNS_Networking.c">
+      <Filter>source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\FreeRTOS-Plus-TCP\source\FreeRTOS_Sockets.c">
+      <Filter>source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\FreeRTOS-Plus-TCP\source\FreeRTOS_IP_Utils.c">
+      <Filter>source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\FreeRTOS-Plus-TCP\source\FreeRTOS_DHCP.c">
+      <Filter>source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\FreeRTOS-Plus-TCP\source\FreeRTOS_TCP_IP.c">
+      <Filter>source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\FreeRTOS-Plus-TCP\source\FreeRTOS_DNS.c">
+      <Filter>source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\FreeRTOS-Plus-TCP\source\FreeRTOS_TCP_WIN.c">
+      <Filter>source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\FreeRTOS-Plus-TCP\source\FreeRTOS_IP_Timers.c">
+      <Filter>source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\FreeRTOS-Plus-TCP\source\FreeRTOS_ARP.c">
+      <Filter>source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\FreeRTOS-Plus-TCP\source\FreeRTOS_TCP_Transmission.c">
+      <Filter>source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\FreeRTOS-Plus-TCP\source\FreeRTOS_DNS_Cache.c">
+      <Filter>source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\FreeRTOS-Plus-TCP\source\FreeRTOS_IP.c">
+      <Filter>source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\FreeRTOS-Plus-TCP\tools\tcp_utilities\tcp_dump_packets.c">
+      <Filter>tcp_utilities</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\FreeRTOS-Plus-TCP\tools\tcp_utilities\tcp_mem_stats.c">
+      <Filter>tcp_utilities</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\FreeRTOS-Plus-TCP\tools\tcp_utilities\tcp_netstat.c">
+      <Filter>tcp_utilities</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\FreeRTOS-Plus-TCP\source\portable\NetworkInterface\WinPCap\NetworkInterface.c">
+      <Filter>source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Source\FreeRTOS-Plus-TCP\source\portable\BufferManagement\BufferAllocation_2.c">
+      <Filter>source</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\Source\FreeRTOS-Plus-TCP\source\include\FreeRTOS_Sockets.h">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Source\FreeRTOS-Plus-TCP\source\include\FreeRTOS_errno_TCP.h">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Source\FreeRTOS-Plus-TCP\source\include\FreeRTOS_IP_Utils.h">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Source\FreeRTOS-Plus-TCP\source\include\FreeRTOS_DNS_Globals.h">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Source\FreeRTOS-Plus-TCP\source\include\FreeRTOS_DNS_Networking.h">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Source\FreeRTOS-Plus-TCP\source\include\FreeRTOS_TCP_WIN.h">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Source\FreeRTOS-Plus-TCP\source\include\FreeRTOS_DNS.h">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Source\FreeRTOS-Plus-TCP\source\include\FreeRTOS_TCP_IP.h">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Source\FreeRTOS-Plus-TCP\source\include\FreeRTOS_DHCP.h">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Source\FreeRTOS-Plus-TCP\source\include\FreeRTOS_DNS_Cache.h">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Source\FreeRTOS-Plus-TCP\source\include\NetworkBufferManagement.h">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Source\FreeRTOS-Plus-TCP\source\include\FreeRTOS_ARP.h">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Source\FreeRTOS-Plus-TCP\source\include\NetworkInterface.h">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Source\FreeRTOS-Plus-TCP\source\include\FreeRTOS_TCP_Transmission.h">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Source\FreeRTOS-Plus-TCP\source\include\FreeRTOS_IP_Timers.h">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Source\FreeRTOS-Plus-TCP\source\include\FreeRTOSIPConfigDefaults.h">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Source\FreeRTOS-Plus-TCP\source\include\FreeRTOS_IP_Private.h">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Source\FreeRTOS-Plus-TCP\source\include\FreeRTOS_IP.h">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Source\FreeRTOS-Plus-TCP\source\include\FreeRTOS_Stream_Buffer.h">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Source\FreeRTOS-Plus-TCP\source\include\FreeRTOS_ICMP.h">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Source\FreeRTOS-Plus-TCP\source\include\FreeRTOS_DNS_Callback.h">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Source\FreeRTOS-Plus-TCP\source\include\FreeRTOS_TCP_State_Handling.h">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Source\FreeRTOS-Plus-TCP\source\include\FreeRTOS_TCP_Reception.h">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Source\FreeRTOS-Plus-TCP\source\include\FreeRTOS_UDP_IP.h">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Source\FreeRTOS-Plus-TCP\source\include\FreeRTOS_TCP_Utils.h">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Source\FreeRTOS-Plus-TCP\source\include\IPTraceMacroDefaults.h">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Source\FreeRTOS-Plus-TCP\source\include\FreeRTOS_DNS_Parser.h">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Source\FreeRTOS-Plus-TCP\tools\tcp_utilities\include\tcp_dump_packets.h">
+      <Filter>tcp_utilities\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Source\FreeRTOS-Plus-TCP\tools\tcp_utilities\include\tcp_netstat.h">
+      <Filter>tcp_utilities\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Source\FreeRTOS-Plus-TCP\tools\tcp_utilities\include\tcp_mem_stats.h">
+      <Filter>tcp_utilities\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Source\FreeRTOS-Plus-TCP\source\portable\Compiler\MSVC\pack_struct_end.h">
+      <Filter>compiler_msvc</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Source\FreeRTOS-Plus-TCP\source\portable\Compiler\MSVC\pack_struct_start.h">
+      <Filter>compiler_msvc</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\winpcap\include\pcap\bpf.h">
+      <Filter>winpcap\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\winpcap\include\pcap\sll.h">
+      <Filter>winpcap\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\winpcap\include\pcap\bluetooth.h">
+      <Filter>winpcap\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\winpcap\include\pcap\pcap.h">
+      <Filter>winpcap\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\winpcap\include\pcap\usb.h">
+      <Filter>winpcap\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\winpcap\include\pcap\vlan.h">
+      <Filter>winpcap\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\winpcap\include\pcap\namedb.h">
+      <Filter>winpcap\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\winpcap\include\pcap-bpf.h">
+      <Filter>winpcap\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\winpcap\include\pcap-namedb.h">
+      <Filter>winpcap\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\winpcap\include\remote-ext.h">
+      <Filter>winpcap\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\winpcap\include\bittypes.h">
+      <Filter>winpcap\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\winpcap\include\ip6_misc.h">
+      <Filter>winpcap\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\winpcap\include\pcap.h">
+      <Filter>winpcap\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\winpcap\include\Win32-Extensions.h">
+      <Filter>winpcap\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\winpcap\include\Packet32.h">
+      <Filter>winpcap\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\winpcap\include\pcap-stdinc.h">
+      <Filter>winpcap\include</Filter>
+    </ClInclude>
+    <ClInclude Include="FreeRTOSIPConfig.h" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/FreeRTOS-Plus/WindowsSimulator/FreeRTOSIPConfig.h b/FreeRTOS-Plus/WindowsSimulator/FreeRTOS+TCP/FreeRTOSIPConfig.h
similarity index 99%
rename from FreeRTOS-Plus/WindowsSimulator/FreeRTOSIPConfig.h
rename to FreeRTOS-Plus/WindowsSimulator/FreeRTOS+TCP/FreeRTOSIPConfig.h
index 5d1e6462ba..f84fd3f2d4 100644
--- a/FreeRTOS-Plus/WindowsSimulator/FreeRTOSIPConfig.h
+++ b/FreeRTOS-Plus/WindowsSimulator/FreeRTOS+TCP/FreeRTOSIPConfig.h
@@ -318,4 +318,7 @@ extern UBaseType_t uxRand();
 #endif /* INTPTR_MAX == INT64_MAX */
 
 
+#define configMAC
+
+
 #endif /* FREERTOS_IP_CONFIG_H */
diff --git a/FreeRTOS-Plus/WindowsSimulator/FreeRTOS-Kernel.vcxproj.filters b/FreeRTOS-Plus/WindowsSimulator/FreeRTOS-Kernel.vcxproj.filters
deleted file mode 100644
index 512a2441f4..0000000000
--- a/FreeRTOS-Plus/WindowsSimulator/FreeRTOS-Kernel.vcxproj.filters
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="include">
-      <UniqueIdentifier>{03334b83-3266-4cf4-9640-4962e653bdba}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="source">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>c</Extensions>
-    </Filter>
-    <Filter Include="port">
-      <UniqueIdentifier>{3bd8627d-a57b-4847-9d16-23c7676efd72}</UniqueIdentifier>
-      <Extensions>c;h</Extensions>
-    </Filter>
-    <Filter Include="config">
-      <UniqueIdentifier>{4af851cd-ea79-4b69-b39c-6c5d831475a4}</UniqueIdentifier>
-      <Extensions>h</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\FreeRTOS\Source\include\atomic.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\FreeRTOS\Source\include\croutine.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\FreeRTOS\Source\include\deprecated_definitions.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\FreeRTOS\Source\include\event_groups.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\FreeRTOS\Source\include\FreeRTOS.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\FreeRTOS\Source\include\list.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\FreeRTOS\Source\include\message_buffer.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\FreeRTOS\Source\include\mpu_prototypes.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\FreeRTOS\Source\include\mpu_wrappers.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\FreeRTOS\Source\include\portable.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\FreeRTOS\Source\include\projdefs.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\FreeRTOS\Source\include\queue.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\FreeRTOS\Source\include\semphr.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\FreeRTOS\Source\include\stack_macros.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\FreeRTOS\Source\include\StackMacros.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\FreeRTOS\Source\include\stream_buffer.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\FreeRTOS\Source\include\task.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\FreeRTOS\Source\include\timers.h">
-      <Filter>include</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\FreeRTOS\Source\portable\MSVC-MingW\portmacro.h">
-      <Filter>port</Filter>
-    </ClInclude>
-    <ClInclude Include="FreeRTOSConfig.h">
-      <Filter>config</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\FreeRTOS\Source\croutine.c">
-      <Filter>source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\FreeRTOS\Source\event_groups.c">
-      <Filter>source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\FreeRTOS\Source\list.c">
-      <Filter>source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\FreeRTOS\Source\queue.c">
-      <Filter>source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\FreeRTOS\Source\stream_buffer.c">
-      <Filter>source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\FreeRTOS\Source\tasks.c">
-      <Filter>source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\FreeRTOS\Source\timers.c">
-      <Filter>source</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\FreeRTOS\Source\portable\MSVC-MingW\port.c">
-      <Filter>port</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\FreeRTOS\Source\portable\MemMang\heap_4.c">
-      <Filter>port</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/FreeRTOS-Plus/WindowsSimulator/FreeRTOS-Kernel.vcxproj b/FreeRTOS-Plus/WindowsSimulator/FreeRTOS-Kernel/FreeRTOS-Kernel.vcxproj
similarity index 74%
rename from FreeRTOS-Plus/WindowsSimulator/FreeRTOS-Kernel.vcxproj
rename to FreeRTOS-Plus/WindowsSimulator/FreeRTOS-Kernel/FreeRTOS-Kernel.vcxproj
index bca5ad9982..06d5e42b8f 100644
--- a/FreeRTOS-Plus/WindowsSimulator/FreeRTOS-Kernel.vcxproj
+++ b/FreeRTOS-Plus/WindowsSimulator/FreeRTOS-Kernel/FreeRTOS-Kernel.vcxproj
@@ -73,7 +73,7 @@
   </PropertyGroup>
   <PropertyGroup>
     <OutDir>build\$(ProjectName)\$(Platform)\$(Configuration)\</OutDir>
-    <PublicIncludeDirectories>..\..\FreeRTOS\Source\portable\MSVC-MingW;..\..\FreeRTOS\Source\include;.\;$(PublicIncludeDirectories)</PublicIncludeDirectories>
+    <PublicIncludeDirectories>..\..\..\FreeRTOS\Source\portable\MSVC-MingW;..\..\..\FreeRTOS\Source\include;.\;$(PublicIncludeDirectories)</PublicIncludeDirectories>
     <AllProjectIncludesArePublic>true</AllProjectIncludesArePublic>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -116,7 +116,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup>
     <ClCompile>
-      <AdditionalIncludeDirectories>.\;..\..\FreeRTOS\Source\portable\MSVC-MingW;..\..\FreeRTOS\Source\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.\;..\..\..\FreeRTOS\Source\portable\MSVC-MingW;..\..\..\FreeRTOS\Source\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <MultiProcessorCompilation Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</MultiProcessorCompilation>
       <MultiProcessorCompilation Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</MultiProcessorCompilation>
       <MultiProcessorCompilation Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</MultiProcessorCompilation>
@@ -126,37 +126,40 @@
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\FreeRTOS\Source\include\atomic.h" />
-    <ClInclude Include="..\..\FreeRTOS\Source\include\croutine.h" />
-    <ClInclude Include="..\..\FreeRTOS\Source\include\deprecated_definitions.h" />
-    <ClInclude Include="..\..\FreeRTOS\Source\include\event_groups.h" />
-    <ClInclude Include="..\..\FreeRTOS\Source\include\FreeRTOS.h" />
-    <ClInclude Include="..\..\FreeRTOS\Source\include\list.h" />
-    <ClInclude Include="..\..\FreeRTOS\Source\include\message_buffer.h" />
-    <ClInclude Include="..\..\FreeRTOS\Source\include\mpu_prototypes.h" />
-    <ClInclude Include="..\..\FreeRTOS\Source\include\mpu_wrappers.h" />
-    <ClInclude Include="..\..\FreeRTOS\Source\include\portable.h" />
-    <ClInclude Include="..\..\FreeRTOS\Source\include\projdefs.h" />
-    <ClInclude Include="..\..\FreeRTOS\Source\include\queue.h" />
-    <ClInclude Include="..\..\FreeRTOS\Source\include\semphr.h" />
-    <ClInclude Include="..\..\FreeRTOS\Source\include\StackMacros.h" />
-    <ClInclude Include="..\..\FreeRTOS\Source\include\stack_macros.h" />
-    <ClInclude Include="..\..\FreeRTOS\Source\include\stream_buffer.h" />
-    <ClInclude Include="..\..\FreeRTOS\Source\include\task.h" />
-    <ClInclude Include="..\..\FreeRTOS\Source\include\timers.h" />
-    <ClInclude Include="..\..\FreeRTOS\Source\portable\MSVC-MingW\portmacro.h" />
+    <ClInclude Include="..\..\..\FreeRTOS\Source\include\atomic.h" />
+    <ClInclude Include="..\..\..\FreeRTOS\Source\include\croutine.h" />
+    <ClInclude Include="..\..\..\FreeRTOS\Source\include\deprecated_definitions.h" />
+    <ClInclude Include="..\..\..\FreeRTOS\Source\include\event_groups.h" />
+    <ClInclude Include="..\..\..\FreeRTOS\Source\include\FreeRTOS.h" />
+    <ClInclude Include="..\..\..\FreeRTOS\Source\include\list.h" />
+    <ClInclude Include="..\..\..\FreeRTOS\Source\include\message_buffer.h" />
+    <ClInclude Include="..\..\..\FreeRTOS\Source\include\mpu_prototypes.h" />
+    <ClInclude Include="..\..\..\FreeRTOS\Source\include\mpu_wrappers.h" />
+    <ClInclude Include="..\..\..\FreeRTOS\Source\include\portable.h" />
+    <ClInclude Include="..\..\..\FreeRTOS\Source\include\projdefs.h" />
+    <ClInclude Include="..\..\..\FreeRTOS\Source\include\queue.h" />
+    <ClInclude Include="..\..\..\FreeRTOS\Source\include\semphr.h" />
+    <ClInclude Include="..\..\..\FreeRTOS\Source\include\StackMacros.h" />
+    <ClInclude Include="..\..\..\FreeRTOS\Source\include\stack_macros.h" />
+    <ClInclude Include="..\..\..\FreeRTOS\Source\include\stream_buffer.h" />
+    <ClInclude Include="..\..\..\FreeRTOS\Source\include\task.h" />
+    <ClInclude Include="..\..\..\FreeRTOS\Source\include\timers.h" />
+    <ClInclude Include="..\..\..\FreeRTOS\Source\portable\MSVC-MingW\portmacro.h" />
     <ClInclude Include="FreeRTOSConfig.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\FreeRTOS\Source\croutine.c" />
-    <ClCompile Include="..\..\FreeRTOS\Source\event_groups.c" />
-    <ClCompile Include="..\..\FreeRTOS\Source\list.c" />
-    <ClCompile Include="..\..\FreeRTOS\Source\portable\MemMang\heap_4.c" />
-    <ClCompile Include="..\..\FreeRTOS\Source\portable\MSVC-MingW\port.c" />
-    <ClCompile Include="..\..\FreeRTOS\Source\queue.c" />
-    <ClCompile Include="..\..\FreeRTOS\Source\stream_buffer.c" />
-    <ClCompile Include="..\..\FreeRTOS\Source\tasks.c" />
-    <ClCompile Include="..\..\FreeRTOS\Source\timers.c" />
+    <ClCompile Include="..\..\..\FreeRTOS\Source\croutine.c" />
+    <ClCompile Include="..\..\..\FreeRTOS\Source\event_groups.c" />
+    <ClCompile Include="..\..\..\FreeRTOS\Source\list.c" />
+    <ClCompile Include="..\..\..\FreeRTOS\Source\portable\MemMang\heap_4.c" />
+    <ClCompile Include="..\..\..\FreeRTOS\Source\portable\MSVC-MingW\port.c" />
+    <ClCompile Include="..\..\..\FreeRTOS\Source\queue.c" />
+    <ClCompile Include="..\..\..\FreeRTOS\Source\stream_buffer.c" />
+    <ClCompile Include="..\..\..\FreeRTOS\Source\tasks.c" />
+    <ClCompile Include="..\..\..\FreeRTOS\Source\timers.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\..\..\FreeRTOS\Source\include\stdint.readme" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
diff --git a/FreeRTOS-Plus/WindowsSimulator/FreeRTOS-Kernel/FreeRTOS-Kernel.vcxproj.filters b/FreeRTOS-Plus/WindowsSimulator/FreeRTOS-Kernel/FreeRTOS-Kernel.vcxproj.filters
new file mode 100644
index 0000000000..94e8f4c5e1
--- /dev/null
+++ b/FreeRTOS-Plus/WindowsSimulator/FreeRTOS-Kernel/FreeRTOS-Kernel.vcxproj.filters
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="include">
+      <UniqueIdentifier>{03334b83-3266-4cf4-9640-4962e653bdba}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="port">
+      <UniqueIdentifier>{3bd8627d-a57b-4847-9d16-23c7676efd72}</UniqueIdentifier>
+      <Extensions>c;h</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\FreeRTOS\Source\portable\MSVC-MingW\portmacro.h">
+      <Filter>port</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\FreeRTOS\Source\include\list.h">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\FreeRTOS\Source\include\message_buffer.h">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\FreeRTOS\Source\include\mpu_prototypes.h">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\FreeRTOS\Source\include\mpu_wrappers.h">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\FreeRTOS\Source\include\portable.h">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\FreeRTOS\Source\include\projdefs.h">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\FreeRTOS\Source\include\queue.h">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\FreeRTOS\Source\include\semphr.h">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\FreeRTOS\Source\include\stack_macros.h">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\FreeRTOS\Source\include\StackMacros.h">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\FreeRTOS\Source\include\stream_buffer.h">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\FreeRTOS\Source\include\task.h">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\FreeRTOS\Source\include\timers.h">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\FreeRTOS\Source\include\atomic.h">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\FreeRTOS\Source\include\croutine.h">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\FreeRTOS\Source\include\deprecated_definitions.h">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\FreeRTOS\Source\include\event_groups.h">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\FreeRTOS\Source\include\FreeRTOS.h">
+      <Filter>include</Filter>
+    </ClInclude>
+    <ClInclude Include="FreeRTOSConfig.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\..\FreeRTOS\Source\list.c" />
+    <ClCompile Include="..\..\..\FreeRTOS\Source\event_groups.c" />
+    <ClCompile Include="..\..\..\FreeRTOS\Source\croutine.c" />
+    <ClCompile Include="..\..\..\FreeRTOS\Source\stream_buffer.c" />
+    <ClCompile Include="..\..\..\FreeRTOS\Source\queue.c" />
+    <ClCompile Include="..\..\..\FreeRTOS\Source\tasks.c" />
+    <ClCompile Include="..\..\..\FreeRTOS\Source\timers.c" />
+    <ClCompile Include="..\..\..\FreeRTOS\Source\portable\MemMang\heap_4.c">
+      <Filter>port</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\..\FreeRTOS\Source\portable\MSVC-MingW\port.c">
+      <Filter>port</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\..\..\FreeRTOS\Source\include\stdint.readme">
+      <Filter>include</Filter>
+    </None>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/FreeRTOS-Plus/WindowsSimulator/FreeRTOSConfig.h b/FreeRTOS-Plus/WindowsSimulator/FreeRTOS-Kernel/FreeRTOSConfig.h
similarity index 100%
rename from FreeRTOS-Plus/WindowsSimulator/FreeRTOSConfig.h
rename to FreeRTOS-Plus/WindowsSimulator/FreeRTOS-Kernel/FreeRTOSConfig.h
diff --git a/FreeRTOS-Plus/WindowsSimulator/FreeRTOS_Plus_Libs.sln b/FreeRTOS-Plus/WindowsSimulator/FreeRTOS_Plus_Libs.sln
index d389a0d174..b0ef219fee 100644
--- a/FreeRTOS-Plus/WindowsSimulator/FreeRTOS_Plus_Libs.sln
+++ b/FreeRTOS-Plus/WindowsSimulator/FreeRTOS_Plus_Libs.sln
@@ -3,11 +3,11 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.3.32819.101
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreeRTOS+TCP", "FreeRTOS+TCP.vcxproj", "{C90E6CC5-818B-4C97-8876-0986D989387C}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreeRTOS+TCP", "FreeRTOS+TCP\FreeRTOS+TCP.vcxproj", "{C90E6CC5-818B-4C97-8876-0986D989387C}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreeRTOS-Kernel", "FreeRTOS-Kernel.vcxproj", "{72C209C4-49A4-4942-A201-44706C9D77EC}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FreeRTOS-Kernel", "FreeRTOS-Kernel\FreeRTOS-Kernel.vcxproj", "{72C209C4-49A4-4942-A201-44706C9D77EC}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MbedTLS", "MbedTLS.vcxproj", "{E1016F3E-94E9-4864-9FD8-1D7C1FEFBFD7}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MbedTLS", "MbedTLS\MbedTLS.vcxproj", "{E1016F3E-94E9-4864-9FD8-1D7C1FEFBFD7}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/FreeRTOS-Plus/WindowsSimulator/MbedTLS.vcxproj b/FreeRTOS-Plus/WindowsSimulator/MbedTLS.vcxproj
deleted file mode 100644
index b292c8275e..0000000000
--- a/FreeRTOS-Plus/WindowsSimulator/MbedTLS.vcxproj
+++ /dev/null
@@ -1,375 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\aes.h" />
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\aria.h" />
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\asn1.h" />
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\asn1write.h" />
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\base64.h" />
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\bignum.h" />
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\build_info.h" />
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\camellia.h" />
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\ccm.h" />
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\chacha20.h" />
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\chachapoly.h" />
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\check_config.h" />
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\cipher.h" />
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\cmac.h" />
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\compat-2.x.h" />
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\config_psa.h" />
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\constant_time.h" />
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\ctr_drbg.h" />
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\debug.h" />
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\des.h" />
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\dhm.h" />
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\ecdh.h" />
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\ecdsa.h" />
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\ecjpake.h" />
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\ecp.h" />
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\entropy.h" />
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\error.h" />
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\gcm.h" />
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\hkdf.h" />
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\hmac_drbg.h" />
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\mbedtls_config.h" />
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\md.h" />
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\md5.h" />
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\memory_buffer_alloc.h" />
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\net_sockets.h" />
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\nist_kw.h" />
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\oid.h" />
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\pem.h" />
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\pk.h" />
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\pkcs12.h" />
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\pkcs5.h" />
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\platform.h" />
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\platform_time.h" />
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\platform_util.h" />
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\poly1305.h" />
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\private_access.h" />
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\psa_util.h" />
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\ripemd160.h" />
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\rsa.h" />
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\sha1.h" />
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\sha256.h" />
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\sha512.h" />
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\ssl.h" />
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\ssl_cache.h" />
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\ssl_ciphersuites.h" />
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\ssl_cookie.h" />
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\ssl_ticket.h" />
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\threading.h" />
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\timing.h" />
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\version.h" />
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\x509.h" />
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\x509_crl.h" />
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\x509_crt.h" />
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\x509_csr.h" />
-    <ClInclude Include="..\ThirdParty\mbedtls\include\psa\crypto.h" />
-    <ClInclude Include="..\ThirdParty\mbedtls\include\psa\crypto_builtin_composites.h" />
-    <ClInclude Include="..\ThirdParty\mbedtls\include\psa\crypto_builtin_primitives.h" />
-    <ClInclude Include="..\ThirdParty\mbedtls\include\psa\crypto_compat.h" />
-    <ClInclude Include="..\ThirdParty\mbedtls\include\psa\crypto_config.h" />
-    <ClInclude Include="..\ThirdParty\mbedtls\include\psa\crypto_driver_common.h" />
-    <ClInclude Include="..\ThirdParty\mbedtls\include\psa\crypto_driver_contexts_composites.h" />
-    <ClInclude Include="..\ThirdParty\mbedtls\include\psa\crypto_driver_contexts_primitives.h" />
-    <ClInclude Include="..\ThirdParty\mbedtls\include\psa\crypto_extra.h" />
-    <ClInclude Include="..\ThirdParty\mbedtls\include\psa\crypto_platform.h" />
-    <ClInclude Include="..\ThirdParty\mbedtls\include\psa\crypto_se_driver.h" />
-    <ClInclude Include="..\ThirdParty\mbedtls\include\psa\crypto_sizes.h" />
-    <ClInclude Include="..\ThirdParty\mbedtls\include\psa\crypto_struct.h" />
-    <ClInclude Include="..\ThirdParty\mbedtls\include\psa\crypto_types.h" />
-    <ClInclude Include="..\ThirdParty\mbedtls\include\psa\crypto_values.h" />
-    <ClInclude Include="..\ThirdParty\mbedtls\library\aesni.h" />
-    <ClInclude Include="..\ThirdParty\mbedtls\library\bignum_internal.h" />
-    <ClInclude Include="..\ThirdParty\mbedtls\library\bn_mul.h" />
-    <ClInclude Include="..\ThirdParty\mbedtls\library\check_crypto_config.h" />
-    <ClInclude Include="..\ThirdParty\mbedtls\library\cipher_wrap.h" />
-    <ClInclude Include="..\ThirdParty\mbedtls\library\common.h" />
-    <ClInclude Include="..\ThirdParty\mbedtls\library\constant_time_internal.h" />
-    <ClInclude Include="..\ThirdParty\mbedtls\library\constant_time_invasive.h" />
-    <ClInclude Include="..\ThirdParty\mbedtls\library\ecp_internal_alt.h" />
-    <ClInclude Include="..\ThirdParty\mbedtls\library\ecp_invasive.h" />
-    <ClInclude Include="..\ThirdParty\mbedtls\library\entropy_poll.h" />
-    <ClInclude Include="..\ThirdParty\mbedtls\library\md_wrap.h" />
-    <ClInclude Include="..\ThirdParty\mbedtls\library\mps_common.h" />
-    <ClInclude Include="..\ThirdParty\mbedtls\library\mps_error.h" />
-    <ClInclude Include="..\ThirdParty\mbedtls\library\mps_reader.h" />
-    <ClInclude Include="..\ThirdParty\mbedtls\library\mps_trace.h" />
-    <ClInclude Include="..\ThirdParty\mbedtls\library\padlock.h" />
-    <ClInclude Include="..\ThirdParty\mbedtls\library\pkwrite.h" />
-    <ClInclude Include="..\ThirdParty\mbedtls\library\pk_wrap.h" />
-    <ClInclude Include="..\ThirdParty\mbedtls\library\psa_crypto_aead.h" />
-    <ClInclude Include="..\ThirdParty\mbedtls\library\psa_crypto_cipher.h" />
-    <ClInclude Include="..\ThirdParty\mbedtls\library\psa_crypto_core.h" />
-    <ClInclude Include="..\ThirdParty\mbedtls\library\psa_crypto_driver_wrappers.h" />
-    <ClInclude Include="..\ThirdParty\mbedtls\library\psa_crypto_ecp.h" />
-    <ClInclude Include="..\ThirdParty\mbedtls\library\psa_crypto_hash.h" />
-    <ClInclude Include="..\ThirdParty\mbedtls\library\psa_crypto_invasive.h" />
-    <ClInclude Include="..\ThirdParty\mbedtls\library\psa_crypto_its.h" />
-    <ClInclude Include="..\ThirdParty\mbedtls\library\psa_crypto_mac.h" />
-    <ClInclude Include="..\ThirdParty\mbedtls\library\psa_crypto_random_impl.h" />
-    <ClInclude Include="..\ThirdParty\mbedtls\library\psa_crypto_rsa.h" />
-    <ClInclude Include="..\ThirdParty\mbedtls\library\psa_crypto_se.h" />
-    <ClInclude Include="..\ThirdParty\mbedtls\library\psa_crypto_slot_management.h" />
-    <ClInclude Include="..\ThirdParty\mbedtls\library\psa_crypto_storage.h" />
-    <ClInclude Include="..\ThirdParty\mbedtls\library\rsa_alt_helpers.h" />
-    <ClInclude Include="..\ThirdParty\mbedtls\library\ssl_client.h" />
-    <ClInclude Include="..\ThirdParty\mbedtls\library\ssl_debug_helpers.h" />
-    <ClInclude Include="..\ThirdParty\mbedtls\library\ssl_misc.h" />
-    <ClInclude Include="..\ThirdParty\mbedtls\library\ssl_tls13_invasive.h" />
-    <ClInclude Include="..\ThirdParty\mbedtls\library\ssl_tls13_keys.h" />
-    <ClInclude Include="mbedtls_config_v3.2.1.h" />
-    <ClInclude Include="mbedtls_port\mbedtls_freertos_port.h" />
-    <ClInclude Include="mbedtls_port\threading_alt.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\ThirdParty\mbedtls\library\aes.c" />
-    <ClCompile Include="..\ThirdParty\mbedtls\library\aesni.c" />
-    <ClCompile Include="..\ThirdParty\mbedtls\library\aria.c" />
-    <ClCompile Include="..\ThirdParty\mbedtls\library\asn1parse.c" />
-    <ClCompile Include="..\ThirdParty\mbedtls\library\asn1write.c" />
-    <ClCompile Include="..\ThirdParty\mbedtls\library\base64.c" />
-    <ClCompile Include="..\ThirdParty\mbedtls\library\bignum.c" />
-    <ClCompile Include="..\ThirdParty\mbedtls\library\camellia.c" />
-    <ClCompile Include="..\ThirdParty\mbedtls\library\ccm.c" />
-    <ClCompile Include="..\ThirdParty\mbedtls\library\chacha20.c" />
-    <ClCompile Include="..\ThirdParty\mbedtls\library\chachapoly.c" />
-    <ClCompile Include="..\ThirdParty\mbedtls\library\cipher.c" />
-    <ClCompile Include="..\ThirdParty\mbedtls\library\cipher_wrap.c" />
-    <ClCompile Include="..\ThirdParty\mbedtls\library\cmac.c" />
-    <ClCompile Include="..\ThirdParty\mbedtls\library\constant_time.c" />
-    <ClCompile Include="..\ThirdParty\mbedtls\library\ctr_drbg.c" />
-    <ClCompile Include="..\ThirdParty\mbedtls\library\debug.c" />
-    <ClCompile Include="..\ThirdParty\mbedtls\library\des.c" />
-    <ClCompile Include="..\ThirdParty\mbedtls\library\dhm.c" />
-    <ClCompile Include="..\ThirdParty\mbedtls\library\ecdh.c" />
-    <ClCompile Include="..\ThirdParty\mbedtls\library\ecdsa.c" />
-    <ClCompile Include="..\ThirdParty\mbedtls\library\ecjpake.c" />
-    <ClCompile Include="..\ThirdParty\mbedtls\library\ecp.c" />
-    <ClCompile Include="..\ThirdParty\mbedtls\library\ecp_curves.c" />
-    <ClCompile Include="..\ThirdParty\mbedtls\library\entropy.c" />
-    <ClCompile Include="..\ThirdParty\mbedtls\library\entropy_poll.c" />
-    <ClCompile Include="..\ThirdParty\mbedtls\library\error.c" />
-    <ClCompile Include="..\ThirdParty\mbedtls\library\gcm.c" />
-    <ClCompile Include="..\ThirdParty\mbedtls\library\hkdf.c" />
-    <ClCompile Include="..\ThirdParty\mbedtls\library\hmac_drbg.c" />
-    <ClCompile Include="..\ThirdParty\mbedtls\library\md.c" />
-    <ClCompile Include="..\ThirdParty\mbedtls\library\md5.c" />
-    <ClCompile Include="..\ThirdParty\mbedtls\library\memory_buffer_alloc.c" />
-    <ClCompile Include="..\ThirdParty\mbedtls\library\mps_reader.c" />
-    <ClCompile Include="..\ThirdParty\mbedtls\library\mps_trace.c" />
-    <ClCompile Include="..\ThirdParty\mbedtls\library\net_sockets.c" />
-    <ClCompile Include="..\ThirdParty\mbedtls\library\nist_kw.c" />
-    <ClCompile Include="..\ThirdParty\mbedtls\library\oid.c" />
-    <ClCompile Include="..\ThirdParty\mbedtls\library\padlock.c" />
-    <ClCompile Include="..\ThirdParty\mbedtls\library\pem.c" />
-    <ClCompile Include="..\ThirdParty\mbedtls\library\pk.c" />
-    <ClCompile Include="..\ThirdParty\mbedtls\library\pkcs12.c" />
-    <ClCompile Include="..\ThirdParty\mbedtls\library\pkcs5.c" />
-    <ClCompile Include="..\ThirdParty\mbedtls\library\pkparse.c" />
-    <ClCompile Include="..\ThirdParty\mbedtls\library\pkwrite.c" />
-    <ClCompile Include="..\ThirdParty\mbedtls\library\pk_wrap.c" />
-    <ClCompile Include="..\ThirdParty\mbedtls\library\platform.c" />
-    <ClCompile Include="..\ThirdParty\mbedtls\library\platform_util.c" />
-    <ClCompile Include="..\ThirdParty\mbedtls\library\poly1305.c" />
-    <ClCompile Include="..\ThirdParty\mbedtls\library\psa_crypto.c" />
-    <ClCompile Include="..\ThirdParty\mbedtls\library\psa_crypto_aead.c" />
-    <ClCompile Include="..\ThirdParty\mbedtls\library\psa_crypto_cipher.c" />
-    <ClCompile Include="..\ThirdParty\mbedtls\library\psa_crypto_client.c" />
-    <ClCompile Include="..\ThirdParty\mbedtls\library\psa_crypto_driver_wrappers.c" />
-    <ClCompile Include="..\ThirdParty\mbedtls\library\psa_crypto_ecp.c" />
-    <ClCompile Include="..\ThirdParty\mbedtls\library\psa_crypto_hash.c" />
-    <ClCompile Include="..\ThirdParty\mbedtls\library\psa_crypto_mac.c" />
-    <ClCompile Include="..\ThirdParty\mbedtls\library\psa_crypto_rsa.c" />
-    <ClCompile Include="..\ThirdParty\mbedtls\library\psa_crypto_se.c" />
-    <ClCompile Include="..\ThirdParty\mbedtls\library\psa_crypto_slot_management.c" />
-    <ClCompile Include="..\ThirdParty\mbedtls\library\psa_crypto_storage.c" />
-    <ClCompile Include="..\ThirdParty\mbedtls\library\psa_its_file.c" />
-    <ClCompile Include="..\ThirdParty\mbedtls\library\ripemd160.c" />
-    <ClCompile Include="..\ThirdParty\mbedtls\library\rsa.c" />
-    <ClCompile Include="..\ThirdParty\mbedtls\library\rsa_alt_helpers.c" />
-    <ClCompile Include="..\ThirdParty\mbedtls\library\sha1.c" />
-    <ClCompile Include="..\ThirdParty\mbedtls\library\sha256.c" />
-    <ClCompile Include="..\ThirdParty\mbedtls\library\sha512.c" />
-    <ClCompile Include="..\ThirdParty\mbedtls\library\ssl_cache.c" />
-    <ClCompile Include="..\ThirdParty\mbedtls\library\ssl_ciphersuites.c" />
-    <ClCompile Include="..\ThirdParty\mbedtls\library\ssl_client.c" />
-    <ClCompile Include="..\ThirdParty\mbedtls\library\ssl_cookie.c" />
-    <ClCompile Include="..\ThirdParty\mbedtls\library\ssl_debug_helpers_generated.c" />
-    <ClCompile Include="..\ThirdParty\mbedtls\library\ssl_msg.c" />
-    <ClCompile Include="..\ThirdParty\mbedtls\library\ssl_ticket.c" />
-    <ClCompile Include="..\ThirdParty\mbedtls\library\ssl_tls.c" />
-    <ClCompile Include="..\ThirdParty\mbedtls\library\ssl_tls12_client.c" />
-    <ClCompile Include="..\ThirdParty\mbedtls\library\ssl_tls12_server.c" />
-    <ClCompile Include="..\ThirdParty\mbedtls\library\ssl_tls13_client.c" />
-    <ClCompile Include="..\ThirdParty\mbedtls\library\ssl_tls13_generic.c" />
-    <ClCompile Include="..\ThirdParty\mbedtls\library\ssl_tls13_keys.c" />
-    <ClCompile Include="..\ThirdParty\mbedtls\library\ssl_tls13_server.c" />
-    <ClCompile Include="..\ThirdParty\mbedtls\library\threading.c" />
-    <ClCompile Include="..\ThirdParty\mbedtls\library\timing.c" />
-    <ClCompile Include="..\ThirdParty\mbedtls\library\version.c" />
-    <ClCompile Include="..\ThirdParty\mbedtls\library\version_features.c" />
-    <ClCompile Include="..\ThirdParty\mbedtls\library\x509.c" />
-    <ClCompile Include="..\ThirdParty\mbedtls\library\x509write_crt.c" />
-    <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_csr.c" />
-    <ClCompile Include="mbedtls_port\mbedtls_freertos_port.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="FreeRTOS-Kernel.vcxproj">
-      <Project>{72c209c4-49a4-4942-a201-44706c9d77ec}</Project>
-      <LinkLibraryDependencies>true</LinkLibraryDependencies>
-      <Private>false</Private>
-    </ProjectReference>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <VCProjectVersion>16.0</VCProjectVersion>
-    <Keyword>Win32Proj</Keyword>
-    <ProjectGuid>{e1016f3e-94e9-4864-9fd8-1d7c1fefbfd7}</ProjectGuid>
-    <RootNamespace>MbedTLS</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <OutDir>build\$(ProjectName)\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>build\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-    <PublicIncludeDirectories>..\ThirdParty\mbedtls\include;.\;$(PublicIncludeDirectories)</PublicIncludeDirectories>
-    <AllProjectIncludesArePublic>true</AllProjectIncludesArePublic>
-  </PropertyGroup>
-  <PropertyGroup Label="Vcpkg">
-    <VcpkgEnabled>false</VcpkgEnabled>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions);MBEDTLS_CONFIG_FILE="mbedtls_config_v3.2.1.h"</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>.\mbedtls_port;..\ThirdParty\mbedtls\library;..\ThirdParty\mbedtls\include</AdditionalIncludeDirectories>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions);MBEDTLS_CONFIG_FILE="mbedtls_config_v3.2.1.h"</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>.\mbedtls_port;..\ThirdParty\mbedtls\library;..\ThirdParty\mbedtls\include</AdditionalIncludeDirectories>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions);MBEDTLS_CONFIG_FILE="mbedtls_config_v3.2.1.h"</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>.\mbedtls_port;..\ThirdParty\mbedtls\library;..\ThirdParty\mbedtls\include</AdditionalIncludeDirectories>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions);MBEDTLS_CONFIG_FILE="mbedtls_config_v3.2.1.h"</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>.\mbedtls_port;..\ThirdParty\mbedtls\library;..\ThirdParty\mbedtls\include</AdditionalIncludeDirectories>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/FreeRTOS-Plus/WindowsSimulator/MbedTLS.vcxproj.filters b/FreeRTOS-Plus/WindowsSimulator/MbedTLS.vcxproj.filters
deleted file mode 100644
index ea681ecd31..0000000000
--- a/FreeRTOS-Plus/WindowsSimulator/MbedTLS.vcxproj.filters
+++ /dev/null
@@ -1,678 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <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="config">
-      <UniqueIdentifier>{e1db5e2a-0be3-479f-807d-2c0f85549c4c}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\mbedtls">
-      <UniqueIdentifier>{d6421bca-1a38-4144-b1c3-ac3a279ac261}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\psa">
-      <UniqueIdentifier>{7cf97e0d-061b-496a-a961-2ef5816190ec}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="freertos_port">
-      <UniqueIdentifier>{5418aa15-1ba0-4bbb-8b8a-f859b3f102ad}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\compat-2.x.h">
-      <Filter>Header Files\mbedtls</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\pem.h">
-      <Filter>Header Files\mbedtls</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\check_config.h">
-      <Filter>Header Files\mbedtls</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\error.h">
-      <Filter>Header Files\mbedtls</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\oid.h">
-      <Filter>Header Files\mbedtls</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\build_info.h">
-      <Filter>Header Files\mbedtls</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\pkcs5.h">
-      <Filter>Header Files\mbedtls</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\ripemd160.h">
-      <Filter>Header Files\mbedtls</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\debug.h">
-      <Filter>Header Files\mbedtls</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\x509.h">
-      <Filter>Header Files\mbedtls</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\version.h">
-      <Filter>Header Files\mbedtls</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\ecp.h">
-      <Filter>Header Files\mbedtls</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\base64.h">
-      <Filter>Header Files\mbedtls</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\asn1.h">
-      <Filter>Header Files\mbedtls</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\memory_buffer_alloc.h">
-      <Filter>Header Files\mbedtls</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\x509_csr.h">
-      <Filter>Header Files\mbedtls</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\platform_util.h">
-      <Filter>Header Files\mbedtls</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\poly1305.h">
-      <Filter>Header Files\mbedtls</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\threading.h">
-      <Filter>Header Files\mbedtls</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\hkdf.h">
-      <Filter>Header Files\mbedtls</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\md5.h">
-      <Filter>Header Files\mbedtls</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\timing.h">
-      <Filter>Header Files\mbedtls</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\chachapoly.h">
-      <Filter>Header Files\mbedtls</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\sha256.h">
-      <Filter>Header Files\mbedtls</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\ecdsa.h">
-      <Filter>Header Files\mbedtls</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\nist_kw.h">
-      <Filter>Header Files\mbedtls</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\md.h">
-      <Filter>Header Files\mbedtls</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\cipher.h">
-      <Filter>Header Files\mbedtls</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\ecjpake.h">
-      <Filter>Header Files\mbedtls</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\net_sockets.h">
-      <Filter>Header Files\mbedtls</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\entropy.h">
-      <Filter>Header Files\mbedtls</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\pkcs12.h">
-      <Filter>Header Files\mbedtls</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\sha512.h">
-      <Filter>Header Files\mbedtls</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\pk.h">
-      <Filter>Header Files\mbedtls</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\ssl.h">
-      <Filter>Header Files\mbedtls</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\platform_time.h">
-      <Filter>Header Files\mbedtls</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\constant_time.h">
-      <Filter>Header Files\mbedtls</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\camellia.h">
-      <Filter>Header Files\mbedtls</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\x509_crt.h">
-      <Filter>Header Files\mbedtls</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\aes.h">
-      <Filter>Header Files\mbedtls</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\ssl_cookie.h">
-      <Filter>Header Files\mbedtls</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\config_psa.h">
-      <Filter>Header Files\mbedtls</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\dhm.h">
-      <Filter>Header Files\mbedtls</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\ctr_drbg.h">
-      <Filter>Header Files\mbedtls</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\chacha20.h">
-      <Filter>Header Files\mbedtls</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\des.h">
-      <Filter>Header Files\mbedtls</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\x509_crl.h">
-      <Filter>Header Files\mbedtls</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\ecdh.h">
-      <Filter>Header Files\mbedtls</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\psa_util.h">
-      <Filter>Header Files\mbedtls</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\sha1.h">
-      <Filter>Header Files\mbedtls</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\gcm.h">
-      <Filter>Header Files\mbedtls</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\rsa.h">
-      <Filter>Header Files\mbedtls</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\hmac_drbg.h">
-      <Filter>Header Files\mbedtls</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\private_access.h">
-      <Filter>Header Files\mbedtls</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\ssl_ticket.h">
-      <Filter>Header Files\mbedtls</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\ssl_ciphersuites.h">
-      <Filter>Header Files\mbedtls</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\ssl_cache.h">
-      <Filter>Header Files\mbedtls</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\cmac.h">
-      <Filter>Header Files\mbedtls</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\platform.h">
-      <Filter>Header Files\mbedtls</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\bignum.h">
-      <Filter>Header Files\mbedtls</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\aria.h">
-      <Filter>Header Files\mbedtls</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\asn1write.h">
-      <Filter>Header Files\mbedtls</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\mbedtls_config.h">
-      <Filter>Header Files\mbedtls</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\mbedtls\include\mbedtls\ccm.h">
-      <Filter>Header Files\mbedtls</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\mbedtls\include\psa\crypto_se_driver.h">
-      <Filter>Header Files\psa</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\mbedtls\include\psa\crypto_extra.h">
-      <Filter>Header Files\psa</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\mbedtls\include\psa\crypto_builtin_composites.h">
-      <Filter>Header Files\psa</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\mbedtls\include\psa\crypto_struct.h">
-      <Filter>Header Files\psa</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\mbedtls\include\psa\crypto_builtin_primitives.h">
-      <Filter>Header Files\psa</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\mbedtls\include\psa\crypto_driver_contexts_primitives.h">
-      <Filter>Header Files\psa</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\mbedtls\include\psa\crypto_platform.h">
-      <Filter>Header Files\psa</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\mbedtls\include\psa\crypto_config.h">
-      <Filter>Header Files\psa</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\mbedtls\include\psa\crypto_driver_contexts_composites.h">
-      <Filter>Header Files\psa</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\mbedtls\include\psa\crypto.h">
-      <Filter>Header Files\psa</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\mbedtls\include\psa\crypto_sizes.h">
-      <Filter>Header Files\psa</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\mbedtls\include\psa\crypto_types.h">
-      <Filter>Header Files\psa</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\mbedtls\include\psa\crypto_values.h">
-      <Filter>Header Files\psa</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\mbedtls\include\psa\crypto_driver_common.h">
-      <Filter>Header Files\psa</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\mbedtls\include\psa\crypto_compat.h">
-      <Filter>Header Files\psa</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\mbedtls\library\aesni.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\mbedtls\library\bignum_internal.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\mbedtls\library\bn_mul.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\mbedtls\library\check_crypto_config.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\mbedtls\library\cipher_wrap.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\mbedtls\library\common.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\mbedtls\library\constant_time_internal.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\mbedtls\library\constant_time_invasive.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\mbedtls\library\ecp_internal_alt.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\mbedtls\library\ecp_invasive.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\mbedtls\library\entropy_poll.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\mbedtls\library\md_wrap.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\mbedtls\library\mps_common.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\mbedtls\library\mps_error.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\mbedtls\library\mps_reader.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\mbedtls\library\mps_trace.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\mbedtls\library\padlock.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\mbedtls\library\pk_wrap.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\mbedtls\library\pkwrite.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\mbedtls\library\psa_crypto_aead.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\mbedtls\library\psa_crypto_cipher.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\mbedtls\library\psa_crypto_core.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\mbedtls\library\psa_crypto_driver_wrappers.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\mbedtls\library\psa_crypto_ecp.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\mbedtls\library\psa_crypto_hash.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\mbedtls\library\psa_crypto_invasive.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\mbedtls\library\psa_crypto_its.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\mbedtls\library\psa_crypto_mac.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\mbedtls\library\psa_crypto_random_impl.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\mbedtls\library\psa_crypto_rsa.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\mbedtls\library\psa_crypto_se.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\mbedtls\library\psa_crypto_slot_management.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\mbedtls\library\psa_crypto_storage.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\mbedtls\library\rsa_alt_helpers.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\mbedtls\library\ssl_client.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\mbedtls\library\ssl_debug_helpers.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\mbedtls\library\ssl_misc.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\mbedtls\library\ssl_tls13_invasive.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\ThirdParty\mbedtls\library\ssl_tls13_keys.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-    <ClInclude Include="mbedtls_config_v3.2.1.h">
-      <Filter>config</Filter>
-    </ClInclude>
-    <ClInclude Include="mbedtls_port\mbedtls_freertos_port.h">
-      <Filter>freertos_port</Filter>
-    </ClInclude>
-    <ClInclude Include="mbedtls_port\threading_alt.h">
-      <Filter>freertos_port</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\ThirdParty\mbedtls\library\timing.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\ThirdParty\mbedtls\library\version.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\ThirdParty\mbedtls\library\version_features.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\ThirdParty\mbedtls\library\x509.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\ThirdParty\mbedtls\library\x509_create.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\ThirdParty\mbedtls\library\x509_crl.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\ThirdParty\mbedtls\library\x509_crt.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\ThirdParty\mbedtls\library\x509_csr.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\ThirdParty\mbedtls\library\x509write_crt.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\ThirdParty\mbedtls\library\x509write_csr.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\ThirdParty\mbedtls\library\aes.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\ThirdParty\mbedtls\library\aesni.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\ThirdParty\mbedtls\library\aria.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\ThirdParty\mbedtls\library\asn1parse.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\ThirdParty\mbedtls\library\asn1write.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\ThirdParty\mbedtls\library\base64.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\ThirdParty\mbedtls\library\bignum.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\ThirdParty\mbedtls\library\camellia.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\ThirdParty\mbedtls\library\ccm.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\ThirdParty\mbedtls\library\chacha20.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\ThirdParty\mbedtls\library\chachapoly.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\ThirdParty\mbedtls\library\cipher.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\ThirdParty\mbedtls\library\cipher_wrap.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\ThirdParty\mbedtls\library\cmac.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\ThirdParty\mbedtls\library\constant_time.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\ThirdParty\mbedtls\library\ctr_drbg.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\ThirdParty\mbedtls\library\debug.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\ThirdParty\mbedtls\library\des.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\ThirdParty\mbedtls\library\dhm.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\ThirdParty\mbedtls\library\ecdh.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\ThirdParty\mbedtls\library\ecdsa.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\ThirdParty\mbedtls\library\ecjpake.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\ThirdParty\mbedtls\library\ecp.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\ThirdParty\mbedtls\library\ecp_curves.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\ThirdParty\mbedtls\library\entropy.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\ThirdParty\mbedtls\library\entropy_poll.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\ThirdParty\mbedtls\library\error.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\ThirdParty\mbedtls\library\gcm.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\ThirdParty\mbedtls\library\hkdf.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\ThirdParty\mbedtls\library\hmac_drbg.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\ThirdParty\mbedtls\library\md.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\ThirdParty\mbedtls\library\md5.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\ThirdParty\mbedtls\library\memory_buffer_alloc.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\ThirdParty\mbedtls\library\mps_reader.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\ThirdParty\mbedtls\library\mps_trace.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\ThirdParty\mbedtls\library\net_sockets.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\ThirdParty\mbedtls\library\nist_kw.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\ThirdParty\mbedtls\library\oid.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\ThirdParty\mbedtls\library\padlock.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\ThirdParty\mbedtls\library\pem.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\ThirdParty\mbedtls\library\pk.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\ThirdParty\mbedtls\library\pk_wrap.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\ThirdParty\mbedtls\library\pkcs5.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\ThirdParty\mbedtls\library\pkcs12.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\ThirdParty\mbedtls\library\pkparse.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\ThirdParty\mbedtls\library\pkwrite.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\ThirdParty\mbedtls\library\platform.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\ThirdParty\mbedtls\library\platform_util.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\ThirdParty\mbedtls\library\poly1305.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\ThirdParty\mbedtls\library\psa_crypto.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\ThirdParty\mbedtls\library\psa_crypto_aead.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\ThirdParty\mbedtls\library\psa_crypto_cipher.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\ThirdParty\mbedtls\library\psa_crypto_client.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\ThirdParty\mbedtls\library\psa_crypto_driver_wrappers.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\ThirdParty\mbedtls\library\psa_crypto_ecp.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\ThirdParty\mbedtls\library\psa_crypto_hash.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\ThirdParty\mbedtls\library\psa_crypto_mac.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\ThirdParty\mbedtls\library\psa_crypto_rsa.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\ThirdParty\mbedtls\library\psa_crypto_se.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\ThirdParty\mbedtls\library\psa_crypto_slot_management.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\ThirdParty\mbedtls\library\psa_crypto_storage.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\ThirdParty\mbedtls\library\psa_its_file.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\ThirdParty\mbedtls\library\ripemd160.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\ThirdParty\mbedtls\library\rsa.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\ThirdParty\mbedtls\library\rsa_alt_helpers.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\ThirdParty\mbedtls\library\sha1.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\ThirdParty\mbedtls\library\sha256.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\ThirdParty\mbedtls\library\sha512.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\ThirdParty\mbedtls\library\ssl_cache.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\ThirdParty\mbedtls\library\ssl_ciphersuites.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\ThirdParty\mbedtls\library\ssl_client.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\ThirdParty\mbedtls\library\ssl_cookie.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\ThirdParty\mbedtls\library\ssl_debug_helpers_generated.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\ThirdParty\mbedtls\library\ssl_msg.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\ThirdParty\mbedtls\library\ssl_ticket.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\ThirdParty\mbedtls\library\ssl_tls.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\ThirdParty\mbedtls\library\ssl_tls12_client.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\ThirdParty\mbedtls\library\ssl_tls12_server.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\ThirdParty\mbedtls\library\ssl_tls13_client.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\ThirdParty\mbedtls\library\ssl_tls13_generic.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\ThirdParty\mbedtls\library\ssl_tls13_keys.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\ThirdParty\mbedtls\library\ssl_tls13_server.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\ThirdParty\mbedtls\library\threading.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="mbedtls_port\mbedtls_freertos_port.c">
-      <Filter>freertos_port</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/FreeRTOS-Plus/WindowsSimulator/MbedTLS/MbedTLS.vcxproj b/FreeRTOS-Plus/WindowsSimulator/MbedTLS/MbedTLS.vcxproj
new file mode 100644
index 0000000000..1eedf32ccb
--- /dev/null
+++ b/FreeRTOS-Plus/WindowsSimulator/MbedTLS/MbedTLS.vcxproj
@@ -0,0 +1,375 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\aes.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\aria.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\asn1.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\asn1write.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\base64.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\bignum.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\build_info.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\camellia.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\ccm.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\chacha20.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\chachapoly.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\check_config.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\cipher.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\cmac.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\compat-2.x.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\config_psa.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\constant_time.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\ctr_drbg.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\debug.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\des.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\dhm.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\ecdh.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\ecdsa.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\ecjpake.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\ecp.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\entropy.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\error.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\gcm.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\hkdf.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\hmac_drbg.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\mbedtls_config.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\md.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\md5.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\memory_buffer_alloc.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\net_sockets.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\nist_kw.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\oid.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\pem.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\pk.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\pkcs12.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\pkcs5.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\platform.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\platform_time.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\platform_util.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\poly1305.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\private_access.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\psa_util.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\ripemd160.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\rsa.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\sha1.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\sha256.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\sha512.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\ssl.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\ssl_cache.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\ssl_ciphersuites.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\ssl_cookie.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\ssl_ticket.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\threading.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\timing.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\version.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\x509.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\x509_crl.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\x509_crt.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\x509_csr.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\psa\crypto.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\psa\crypto_builtin_composites.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\psa\crypto_builtin_primitives.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\psa\crypto_compat.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\psa\crypto_config.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\psa\crypto_driver_common.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\psa\crypto_driver_contexts_composites.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\psa\crypto_driver_contexts_primitives.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\psa\crypto_extra.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\psa\crypto_platform.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\psa\crypto_se_driver.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\psa\crypto_sizes.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\psa\crypto_struct.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\psa\crypto_types.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\psa\crypto_values.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\library\aesni.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\library\bignum_internal.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\library\bn_mul.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\library\check_crypto_config.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\library\cipher_wrap.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\library\common.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\library\constant_time_internal.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\library\constant_time_invasive.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\library\ecp_internal_alt.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\library\ecp_invasive.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\library\entropy_poll.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\library\md_wrap.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\library\mps_common.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\library\mps_error.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\library\mps_reader.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\library\mps_trace.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\library\padlock.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\library\pkwrite.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\library\pk_wrap.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\library\psa_crypto_aead.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\library\psa_crypto_cipher.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\library\psa_crypto_core.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\library\psa_crypto_driver_wrappers.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\library\psa_crypto_ecp.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\library\psa_crypto_hash.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\library\psa_crypto_invasive.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\library\psa_crypto_its.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\library\psa_crypto_mac.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\library\psa_crypto_random_impl.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\library\psa_crypto_rsa.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\library\psa_crypto_se.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\library\psa_crypto_slot_management.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\library\psa_crypto_storage.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\library\rsa_alt_helpers.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\library\ssl_client.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\library\ssl_debug_helpers.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\library\ssl_misc.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\library\ssl_tls13_invasive.h" />
+    <ClInclude Include="..\..\ThirdParty\mbedtls\library\ssl_tls13_keys.h" />
+    <ClInclude Include="mbedtls_config_v3.2.1.h" />
+    <ClInclude Include="mbedtls_port\mbedtls_freertos_port.h" />
+    <ClInclude Include="mbedtls_port\threading_alt.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\aes.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\aesni.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\aria.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\asn1parse.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\asn1write.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\base64.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\bignum.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\camellia.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\ccm.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\chacha20.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\chachapoly.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\cipher.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\cipher_wrap.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\cmac.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\constant_time.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\ctr_drbg.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\debug.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\des.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\dhm.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\ecdh.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\ecdsa.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\ecjpake.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\ecp.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\ecp_curves.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\entropy.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\entropy_poll.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\error.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\gcm.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\hkdf.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\hmac_drbg.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\md.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\md5.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\memory_buffer_alloc.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\mps_reader.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\mps_trace.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\net_sockets.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\nist_kw.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\oid.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\padlock.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\pem.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\pk.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\pkcs12.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\pkcs5.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\pkparse.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\pkwrite.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\pk_wrap.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\platform.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\platform_util.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\poly1305.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\psa_crypto.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\psa_crypto_aead.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\psa_crypto_cipher.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\psa_crypto_client.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\psa_crypto_driver_wrappers.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\psa_crypto_ecp.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\psa_crypto_hash.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\psa_crypto_mac.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\psa_crypto_rsa.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\psa_crypto_se.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\psa_crypto_slot_management.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\psa_crypto_storage.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\psa_its_file.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\ripemd160.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\rsa.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\rsa_alt_helpers.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\sha1.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\sha256.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\sha512.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\ssl_cache.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\ssl_ciphersuites.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\ssl_client.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\ssl_cookie.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\ssl_debug_helpers_generated.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\ssl_msg.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\ssl_ticket.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\ssl_tls.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\ssl_tls12_client.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\ssl_tls12_server.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\ssl_tls13_client.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\ssl_tls13_generic.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\ssl_tls13_keys.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\ssl_tls13_server.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\threading.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\timing.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\version.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\version_features.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\x509.c" />
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\x509write_crt.c" />
+    <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_csr.c" />
+    <ClCompile Include="mbedtls_port\mbedtls_freertos_port.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\FreeRTOS-Kernel\FreeRTOS-Kernel.vcxproj">
+      <Project>{72c209c4-49a4-4942-a201-44706c9d77ec}</Project>
+      <LinkLibraryDependencies>true</LinkLibraryDependencies>
+      <Private>false</Private>
+    </ProjectReference>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <VCProjectVersion>16.0</VCProjectVersion>
+    <Keyword>Win32Proj</Keyword>
+    <ProjectGuid>{e1016f3e-94e9-4864-9fd8-1d7c1fefbfd7}</ProjectGuid>
+    <RootNamespace>MbedTLS</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v142</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v142</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v142</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v142</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <OutDir>build\$(ProjectName)\$(Platform)\$(Configuration)\</OutDir>
+    <IntDir>build\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
+    <PublicIncludeDirectories>..\..\ThirdParty\mbedtls\include;.\;$(PublicIncludeDirectories)</PublicIncludeDirectories>
+    <AllProjectIncludesArePublic>true</AllProjectIncludesArePublic>
+  </PropertyGroup>
+  <PropertyGroup Label="Vcpkg">
+    <VcpkgEnabled>false</VcpkgEnabled>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions);MBEDTLS_CONFIG_FILE="mbedtls_config_v3.2.1.h"</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <AdditionalIncludeDirectories>.\;..\..\ThirdParty\mbedtls\library;..\..\ThirdParty\mbedtls\include</AdditionalIncludeDirectories>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions);MBEDTLS_CONFIG_FILE="mbedtls_config_v3.2.1.h"</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <AdditionalIncludeDirectories>.\;..\..\ThirdParty\mbedtls\library;..\..\ThirdParty\mbedtls\include</AdditionalIncludeDirectories>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions);MBEDTLS_CONFIG_FILE="mbedtls_config_v3.2.1.h"</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <AdditionalIncludeDirectories>.\;..\..\ThirdParty\mbedtls\library;..\..\ThirdParty\mbedtls\include</AdditionalIncludeDirectories>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions);MBEDTLS_CONFIG_FILE="mbedtls_config_v3.2.1.h"</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+      <AdditionalIncludeDirectories>.\;..\..\ThirdParty\mbedtls\library;..\..\ThirdParty\mbedtls\include</AdditionalIncludeDirectories>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
\ No newline at end of file
diff --git a/FreeRTOS-Plus/WindowsSimulator/MbedTLS/MbedTLS.vcxproj.filters b/FreeRTOS-Plus/WindowsSimulator/MbedTLS/MbedTLS.vcxproj.filters
new file mode 100644
index 0000000000..d6ee652a61
--- /dev/null
+++ b/FreeRTOS-Plus/WindowsSimulator/MbedTLS/MbedTLS.vcxproj.filters
@@ -0,0 +1,664 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Resource Files">
+      <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="MbedTLS Headers">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd</Extensions>
+    </Filter>
+    <Filter Include="MbedTLS Headers\mbedtls">
+      <UniqueIdentifier>{d6421bca-1a38-4144-b1c3-ac3a279ac261}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="MbedTLS Headers\psa">
+      <UniqueIdentifier>{7cf97e0d-061b-496a-a961-2ef5816190ec}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="MbedTLS Source">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\compat-2.x.h">
+      <Filter>MbedTLS Headers\mbedtls</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\pem.h">
+      <Filter>MbedTLS Headers\mbedtls</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\check_config.h">
+      <Filter>MbedTLS Headers\mbedtls</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\error.h">
+      <Filter>MbedTLS Headers\mbedtls</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\oid.h">
+      <Filter>MbedTLS Headers\mbedtls</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\build_info.h">
+      <Filter>MbedTLS Headers\mbedtls</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\pkcs5.h">
+      <Filter>MbedTLS Headers\mbedtls</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\ripemd160.h">
+      <Filter>MbedTLS Headers\mbedtls</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\debug.h">
+      <Filter>MbedTLS Headers\mbedtls</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\x509.h">
+      <Filter>MbedTLS Headers\mbedtls</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\version.h">
+      <Filter>MbedTLS Headers\mbedtls</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\ecp.h">
+      <Filter>MbedTLS Headers\mbedtls</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\base64.h">
+      <Filter>MbedTLS Headers\mbedtls</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\asn1.h">
+      <Filter>MbedTLS Headers\mbedtls</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\memory_buffer_alloc.h">
+      <Filter>MbedTLS Headers\mbedtls</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\x509_csr.h">
+      <Filter>MbedTLS Headers\mbedtls</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\platform_util.h">
+      <Filter>MbedTLS Headers\mbedtls</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\poly1305.h">
+      <Filter>MbedTLS Headers\mbedtls</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\threading.h">
+      <Filter>MbedTLS Headers\mbedtls</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\hkdf.h">
+      <Filter>MbedTLS Headers\mbedtls</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\md5.h">
+      <Filter>MbedTLS Headers\mbedtls</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\timing.h">
+      <Filter>MbedTLS Headers\mbedtls</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\chachapoly.h">
+      <Filter>MbedTLS Headers\mbedtls</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\sha256.h">
+      <Filter>MbedTLS Headers\mbedtls</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\ecdsa.h">
+      <Filter>MbedTLS Headers\mbedtls</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\nist_kw.h">
+      <Filter>MbedTLS Headers\mbedtls</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\md.h">
+      <Filter>MbedTLS Headers\mbedtls</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\cipher.h">
+      <Filter>MbedTLS Headers\mbedtls</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\ecjpake.h">
+      <Filter>MbedTLS Headers\mbedtls</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\net_sockets.h">
+      <Filter>MbedTLS Headers\mbedtls</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\entropy.h">
+      <Filter>MbedTLS Headers\mbedtls</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\pkcs12.h">
+      <Filter>MbedTLS Headers\mbedtls</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\sha512.h">
+      <Filter>MbedTLS Headers\mbedtls</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\pk.h">
+      <Filter>MbedTLS Headers\mbedtls</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\ssl.h">
+      <Filter>MbedTLS Headers\mbedtls</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\platform_time.h">
+      <Filter>MbedTLS Headers\mbedtls</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\constant_time.h">
+      <Filter>MbedTLS Headers\mbedtls</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\camellia.h">
+      <Filter>MbedTLS Headers\mbedtls</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\x509_crt.h">
+      <Filter>MbedTLS Headers\mbedtls</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\aes.h">
+      <Filter>MbedTLS Headers\mbedtls</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\ssl_cookie.h">
+      <Filter>MbedTLS Headers\mbedtls</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\config_psa.h">
+      <Filter>MbedTLS Headers\mbedtls</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\dhm.h">
+      <Filter>MbedTLS Headers\mbedtls</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\ctr_drbg.h">
+      <Filter>MbedTLS Headers\mbedtls</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\chacha20.h">
+      <Filter>MbedTLS Headers\mbedtls</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\des.h">
+      <Filter>MbedTLS Headers\mbedtls</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\x509_crl.h">
+      <Filter>MbedTLS Headers\mbedtls</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\ecdh.h">
+      <Filter>MbedTLS Headers\mbedtls</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\psa_util.h">
+      <Filter>MbedTLS Headers\mbedtls</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\sha1.h">
+      <Filter>MbedTLS Headers\mbedtls</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\gcm.h">
+      <Filter>MbedTLS Headers\mbedtls</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\rsa.h">
+      <Filter>MbedTLS Headers\mbedtls</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\hmac_drbg.h">
+      <Filter>MbedTLS Headers\mbedtls</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\private_access.h">
+      <Filter>MbedTLS Headers\mbedtls</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\ssl_ticket.h">
+      <Filter>MbedTLS Headers\mbedtls</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\ssl_ciphersuites.h">
+      <Filter>MbedTLS Headers\mbedtls</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\ssl_cache.h">
+      <Filter>MbedTLS Headers\mbedtls</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\cmac.h">
+      <Filter>MbedTLS Headers\mbedtls</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\platform.h">
+      <Filter>MbedTLS Headers\mbedtls</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\bignum.h">
+      <Filter>MbedTLS Headers\mbedtls</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\aria.h">
+      <Filter>MbedTLS Headers\mbedtls</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\asn1write.h">
+      <Filter>MbedTLS Headers\mbedtls</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\mbedtls_config.h">
+      <Filter>MbedTLS Headers\mbedtls</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\mbedtls\ccm.h">
+      <Filter>MbedTLS Headers\mbedtls</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\psa\crypto_se_driver.h">
+      <Filter>MbedTLS Headers\psa</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\psa\crypto_extra.h">
+      <Filter>MbedTLS Headers\psa</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\psa\crypto_builtin_composites.h">
+      <Filter>MbedTLS Headers\psa</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\psa\crypto_struct.h">
+      <Filter>MbedTLS Headers\psa</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\psa\crypto_builtin_primitives.h">
+      <Filter>MbedTLS Headers\psa</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\psa\crypto_driver_contexts_primitives.h">
+      <Filter>MbedTLS Headers\psa</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\psa\crypto_platform.h">
+      <Filter>MbedTLS Headers\psa</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\psa\crypto_config.h">
+      <Filter>MbedTLS Headers\psa</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\psa\crypto_driver_contexts_composites.h">
+      <Filter>MbedTLS Headers\psa</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\psa\crypto.h">
+      <Filter>MbedTLS Headers\psa</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\psa\crypto_sizes.h">
+      <Filter>MbedTLS Headers\psa</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\psa\crypto_types.h">
+      <Filter>MbedTLS Headers\psa</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\psa\crypto_values.h">
+      <Filter>MbedTLS Headers\psa</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\psa\crypto_driver_common.h">
+      <Filter>MbedTLS Headers\psa</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\include\psa\crypto_compat.h">
+      <Filter>MbedTLS Headers\psa</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\library\aesni.h">
+      <Filter>MbedTLS Source</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\library\bignum_internal.h">
+      <Filter>MbedTLS Source</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\library\bn_mul.h">
+      <Filter>MbedTLS Source</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\library\check_crypto_config.h">
+      <Filter>MbedTLS Source</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\library\cipher_wrap.h">
+      <Filter>MbedTLS Source</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\library\common.h">
+      <Filter>MbedTLS Source</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\library\constant_time_internal.h">
+      <Filter>MbedTLS Source</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\library\constant_time_invasive.h">
+      <Filter>MbedTLS Source</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\library\ecp_internal_alt.h">
+      <Filter>MbedTLS Source</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\library\ecp_invasive.h">
+      <Filter>MbedTLS Source</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\library\entropy_poll.h">
+      <Filter>MbedTLS Source</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\library\md_wrap.h">
+      <Filter>MbedTLS Source</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\library\mps_common.h">
+      <Filter>MbedTLS Source</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\library\mps_error.h">
+      <Filter>MbedTLS Source</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\library\mps_reader.h">
+      <Filter>MbedTLS Source</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\library\mps_trace.h">
+      <Filter>MbedTLS Source</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\library\padlock.h">
+      <Filter>MbedTLS Source</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\library\pk_wrap.h">
+      <Filter>MbedTLS Source</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\library\pkwrite.h">
+      <Filter>MbedTLS Source</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\library\psa_crypto_aead.h">
+      <Filter>MbedTLS Source</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\library\psa_crypto_cipher.h">
+      <Filter>MbedTLS Source</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\library\psa_crypto_core.h">
+      <Filter>MbedTLS Source</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\library\psa_crypto_driver_wrappers.h">
+      <Filter>MbedTLS Source</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\library\psa_crypto_ecp.h">
+      <Filter>MbedTLS Source</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\library\psa_crypto_hash.h">
+      <Filter>MbedTLS Source</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\library\psa_crypto_invasive.h">
+      <Filter>MbedTLS Source</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\library\psa_crypto_its.h">
+      <Filter>MbedTLS Source</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\library\psa_crypto_mac.h">
+      <Filter>MbedTLS Source</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\library\psa_crypto_random_impl.h">
+      <Filter>MbedTLS Source</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\library\psa_crypto_rsa.h">
+      <Filter>MbedTLS Source</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\library\psa_crypto_se.h">
+      <Filter>MbedTLS Source</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\library\psa_crypto_slot_management.h">
+      <Filter>MbedTLS Source</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\library\psa_crypto_storage.h">
+      <Filter>MbedTLS Source</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\library\rsa_alt_helpers.h">
+      <Filter>MbedTLS Source</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\library\ssl_client.h">
+      <Filter>MbedTLS Source</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\library\ssl_debug_helpers.h">
+      <Filter>MbedTLS Source</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\library\ssl_misc.h">
+      <Filter>MbedTLS Source</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\library\ssl_tls13_invasive.h">
+      <Filter>MbedTLS Source</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ThirdParty\mbedtls\library\ssl_tls13_keys.h">
+      <Filter>MbedTLS Source</Filter>
+    </ClInclude>
+    <ClInclude Include="mbedtls_port\mbedtls_freertos_port.h" />
+    <ClInclude Include="mbedtls_port\threading_alt.h" />
+    <ClInclude Include="mbedtls_config_v3.2.1.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\timing.c">
+      <Filter>MbedTLS Source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\version.c">
+      <Filter>MbedTLS Source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\version_features.c">
+      <Filter>MbedTLS Source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\x509.c">
+      <Filter>MbedTLS Source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\x509_create.c">
+      <Filter>MbedTLS Source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\x509_crl.c">
+      <Filter>MbedTLS Source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\x509_crt.c">
+      <Filter>MbedTLS Source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\x509_csr.c">
+      <Filter>MbedTLS Source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\x509write_crt.c">
+      <Filter>MbedTLS Source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\x509write_csr.c">
+      <Filter>MbedTLS Source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\aes.c">
+      <Filter>MbedTLS Source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\aesni.c">
+      <Filter>MbedTLS Source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\aria.c">
+      <Filter>MbedTLS Source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\asn1parse.c">
+      <Filter>MbedTLS Source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\asn1write.c">
+      <Filter>MbedTLS Source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\base64.c">
+      <Filter>MbedTLS Source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\bignum.c">
+      <Filter>MbedTLS Source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\camellia.c">
+      <Filter>MbedTLS Source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\ccm.c">
+      <Filter>MbedTLS Source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\chacha20.c">
+      <Filter>MbedTLS Source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\chachapoly.c">
+      <Filter>MbedTLS Source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\cipher.c">
+      <Filter>MbedTLS Source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\cipher_wrap.c">
+      <Filter>MbedTLS Source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\cmac.c">
+      <Filter>MbedTLS Source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\constant_time.c">
+      <Filter>MbedTLS Source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\ctr_drbg.c">
+      <Filter>MbedTLS Source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\debug.c">
+      <Filter>MbedTLS Source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\des.c">
+      <Filter>MbedTLS Source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\dhm.c">
+      <Filter>MbedTLS Source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\ecdh.c">
+      <Filter>MbedTLS Source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\ecdsa.c">
+      <Filter>MbedTLS Source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\ecjpake.c">
+      <Filter>MbedTLS Source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\ecp.c">
+      <Filter>MbedTLS Source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\ecp_curves.c">
+      <Filter>MbedTLS Source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\entropy.c">
+      <Filter>MbedTLS Source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\entropy_poll.c">
+      <Filter>MbedTLS Source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\error.c">
+      <Filter>MbedTLS Source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\gcm.c">
+      <Filter>MbedTLS Source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\hkdf.c">
+      <Filter>MbedTLS Source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\hmac_drbg.c">
+      <Filter>MbedTLS Source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\md.c">
+      <Filter>MbedTLS Source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\md5.c">
+      <Filter>MbedTLS Source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\memory_buffer_alloc.c">
+      <Filter>MbedTLS Source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\mps_reader.c">
+      <Filter>MbedTLS Source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\mps_trace.c">
+      <Filter>MbedTLS Source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\net_sockets.c">
+      <Filter>MbedTLS Source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\nist_kw.c">
+      <Filter>MbedTLS Source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\oid.c">
+      <Filter>MbedTLS Source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\padlock.c">
+      <Filter>MbedTLS Source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\pem.c">
+      <Filter>MbedTLS Source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\pk.c">
+      <Filter>MbedTLS Source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\pk_wrap.c">
+      <Filter>MbedTLS Source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\pkcs5.c">
+      <Filter>MbedTLS Source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\pkcs12.c">
+      <Filter>MbedTLS Source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\pkparse.c">
+      <Filter>MbedTLS Source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\pkwrite.c">
+      <Filter>MbedTLS Source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\platform.c">
+      <Filter>MbedTLS Source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\platform_util.c">
+      <Filter>MbedTLS Source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\poly1305.c">
+      <Filter>MbedTLS Source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\psa_crypto.c">
+      <Filter>MbedTLS Source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\psa_crypto_aead.c">
+      <Filter>MbedTLS Source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\psa_crypto_cipher.c">
+      <Filter>MbedTLS Source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\psa_crypto_client.c">
+      <Filter>MbedTLS Source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\psa_crypto_driver_wrappers.c">
+      <Filter>MbedTLS Source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\psa_crypto_ecp.c">
+      <Filter>MbedTLS Source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\psa_crypto_hash.c">
+      <Filter>MbedTLS Source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\psa_crypto_mac.c">
+      <Filter>MbedTLS Source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\psa_crypto_rsa.c">
+      <Filter>MbedTLS Source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\psa_crypto_se.c">
+      <Filter>MbedTLS Source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\psa_crypto_slot_management.c">
+      <Filter>MbedTLS Source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\psa_crypto_storage.c">
+      <Filter>MbedTLS Source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\psa_its_file.c">
+      <Filter>MbedTLS Source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\ripemd160.c">
+      <Filter>MbedTLS Source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\rsa.c">
+      <Filter>MbedTLS Source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\rsa_alt_helpers.c">
+      <Filter>MbedTLS Source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\sha1.c">
+      <Filter>MbedTLS Source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\sha256.c">
+      <Filter>MbedTLS Source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\sha512.c">
+      <Filter>MbedTLS Source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\ssl_cache.c">
+      <Filter>MbedTLS Source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\ssl_ciphersuites.c">
+      <Filter>MbedTLS Source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\ssl_client.c">
+      <Filter>MbedTLS Source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\ssl_cookie.c">
+      <Filter>MbedTLS Source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\ssl_debug_helpers_generated.c">
+      <Filter>MbedTLS Source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\ssl_msg.c">
+      <Filter>MbedTLS Source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\ssl_ticket.c">
+      <Filter>MbedTLS Source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\ssl_tls.c">
+      <Filter>MbedTLS Source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\ssl_tls12_client.c">
+      <Filter>MbedTLS Source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\ssl_tls12_server.c">
+      <Filter>MbedTLS Source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\ssl_tls13_client.c">
+      <Filter>MbedTLS Source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\ssl_tls13_generic.c">
+      <Filter>MbedTLS Source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\ssl_tls13_keys.c">
+      <Filter>MbedTLS Source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\ssl_tls13_server.c">
+      <Filter>MbedTLS Source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThirdParty\mbedtls\library\threading.c">
+      <Filter>MbedTLS Source</Filter>
+    </ClCompile>
+    <ClCompile Include="mbedtls_port\mbedtls_freertos_port.c" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/FreeRTOS-Plus/WindowsSimulator/mbedtls_config_v3.2.1.h b/FreeRTOS-Plus/WindowsSimulator/MbedTLS/mbedtls_config_v3.2.1.h
similarity index 100%
rename from FreeRTOS-Plus/WindowsSimulator/mbedtls_config_v3.2.1.h
rename to FreeRTOS-Plus/WindowsSimulator/MbedTLS/mbedtls_config_v3.2.1.h
diff --git a/FreeRTOS-Plus/WindowsSimulator/mbedtls_port/mbedtls_freertos_port.c b/FreeRTOS-Plus/WindowsSimulator/MbedTLS/mbedtls_freertos_port.c
similarity index 100%
rename from FreeRTOS-Plus/WindowsSimulator/mbedtls_port/mbedtls_freertos_port.c
rename to FreeRTOS-Plus/WindowsSimulator/MbedTLS/mbedtls_freertos_port.c
diff --git a/FreeRTOS-Plus/WindowsSimulator/mbedtls_port/mbedtls_freertos_port.h b/FreeRTOS-Plus/WindowsSimulator/MbedTLS/mbedtls_freertos_port.h
similarity index 100%
rename from FreeRTOS-Plus/WindowsSimulator/mbedtls_port/mbedtls_freertos_port.h
rename to FreeRTOS-Plus/WindowsSimulator/MbedTLS/mbedtls_freertos_port.h
diff --git a/FreeRTOS-Plus/WindowsSimulator/mbedtls_port/threading_alt.h b/FreeRTOS-Plus/WindowsSimulator/MbedTLS/threading_alt.h
similarity index 100%
rename from FreeRTOS-Plus/WindowsSimulator/mbedtls_port/threading_alt.h
rename to FreeRTOS-Plus/WindowsSimulator/MbedTLS/threading_alt.h