diff --git a/3rdparty/7z/7zlib/7zlib.vcxproj b/3rdparty/7zlib.vcxproj
similarity index 67%
rename from 3rdparty/7z/7zlib/7zlib.vcxproj
rename to 3rdparty/7zlib.vcxproj
index f7cf99f68e..2049eeab4c 100644
--- a/3rdparty/7z/7zlib/7zlib.vcxproj
+++ b/3rdparty/7zlib.vcxproj
@@ -19,121 +19,118 @@
     </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\7z.h" />
-    <ClInclude Include="..\7zAlloc.h" />
-    <ClInclude Include="..\7zBuf.h" />
-    <ClInclude Include="..\7zCrc.h" />
-    <ClInclude Include="..\7zFile.h" />
-    <ClInclude Include="..\7zTypes.h" />
-    <ClInclude Include="..\7zVersion.h" />
-    <ClInclude Include="..\Aes.h" />
-    <ClInclude Include="..\Alloc.h" />
-    <ClInclude Include="..\Bcj2.h" />
-    <ClInclude Include="..\Bra.h" />
-    <ClInclude Include="..\Compiler.h" />
-    <ClInclude Include="..\CpuArch.h" />
-    <ClInclude Include="..\Delta.h" />
-    <ClInclude Include="..\DllSecur.h" />
-    <ClInclude Include="..\LzFind.h" />
-    <ClInclude Include="..\LzFindMt.h" />
-    <ClInclude Include="..\LzHash.h" />
-    <ClInclude Include="..\Lzma2Dec.h" />
-    <ClInclude Include="..\Lzma2DecMt.h" />
-    <ClInclude Include="..\Lzma2Enc.h" />
-    <ClInclude Include="..\Lzma86.h" />
-    <ClInclude Include="..\LzmaDec.h" />
-    <ClInclude Include="..\LzmaEnc.h" />
-    <ClInclude Include="..\LzmaLib.h" />
-    <ClInclude Include="..\MtCoder.h" />
-    <ClInclude Include="..\MtDec.h" />
-    <ClInclude Include="..\Ppmd.h" />
-    <ClInclude Include="..\Ppmd7.h" />
-    <ClInclude Include="..\Precomp.h" />
-    <ClInclude Include="..\RotateDefs.h" />
-    <ClInclude Include="..\Sha256.h" />
-    <ClInclude Include="..\Sort.h" />
-    <ClInclude Include="..\Threads.h" />
-    <ClInclude Include="..\Xz.h" />
-    <ClInclude Include="..\XzCrc64.h" />
-    <ClInclude Include="..\XzEnc.h" />
+    <ClInclude Include="7z\7z.h" />
+    <ClInclude Include="7z\7zAlloc.h" />
+    <ClInclude Include="7z\7zBuf.h" />
+    <ClInclude Include="7z\7zCrc.h" />
+    <ClInclude Include="7z\7zFile.h" />
+    <ClInclude Include="7z\7zTypes.h" />
+    <ClInclude Include="7z\7zVersion.h" />
+    <ClInclude Include="7z\Aes.h" />
+    <ClInclude Include="7z\Alloc.h" />
+    <ClInclude Include="7z\Bcj2.h" />
+    <ClInclude Include="7z\Bra.h" />
+    <ClInclude Include="7z\Compiler.h" />
+    <ClInclude Include="7z\CpuArch.h" />
+    <ClInclude Include="7z\Delta.h" />
+    <ClInclude Include="7z\DllSecur.h" />
+    <ClInclude Include="7z\LzFind.h" />
+    <ClInclude Include="7z\LzFindMt.h" />
+    <ClInclude Include="7z\LzHash.h" />
+    <ClInclude Include="7z\Lzma2Dec.h" />
+    <ClInclude Include="7z\Lzma2DecMt.h" />
+    <ClInclude Include="7z\Lzma2Enc.h" />
+    <ClInclude Include="7z\Lzma86.h" />
+    <ClInclude Include="7z\LzmaDec.h" />
+    <ClInclude Include="7z\LzmaEnc.h" />
+    <ClInclude Include="7z\LzmaLib.h" />
+    <ClInclude Include="7z\MtCoder.h" />
+    <ClInclude Include="7z\MtDec.h" />
+    <ClInclude Include="7z\Ppmd.h" />
+    <ClInclude Include="7z\Ppmd7.h" />
+    <ClInclude Include="7z\Precomp.h" />
+    <ClInclude Include="7z\RotateDefs.h" />
+    <ClInclude Include="7z\Sha256.h" />
+    <ClInclude Include="7z\Sort.h" />
+    <ClInclude Include="7z\Threads.h" />
+    <ClInclude Include="7z\Xz.h" />
+    <ClInclude Include="7z\XzCrc64.h" />
+    <ClInclude Include="7z\XzEnc.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\7zAlloc.c" />
-    <ClCompile Include="..\7zArcIn.c" />
-    <ClCompile Include="..\7zBuf.c" />
-    <ClCompile Include="..\7zBuf2.c" />
-    <ClCompile Include="..\7zCrc.c" />
-    <ClCompile Include="..\7zCrcOpt.c" />
-    <ClCompile Include="..\7zDec.c" />
-    <ClCompile Include="..\7zFile.c" />
-    <ClCompile Include="..\7zStream.c" />
-    <ClCompile Include="..\Aes.c" />
-    <ClCompile Include="..\AesOpt.c" />
-    <ClCompile Include="..\Alloc.c" />
-    <ClCompile Include="..\Bcj2.c" />
-    <ClCompile Include="..\Bcj2Enc.c" />
-    <ClCompile Include="..\Bra.c" />
-    <ClCompile Include="..\Bra86.c" />
-    <ClCompile Include="..\BraIA64.c" />
-    <ClCompile Include="..\CpuArch.c" />
-    <ClCompile Include="..\Delta.c" />
-    <ClCompile Include="..\DllSecur.c" />
-    <ClCompile Include="..\LzFind.c" />
-    <ClCompile Include="..\LzFindMt.c" />
-    <ClCompile Include="..\Lzma2Dec.c" />
-    <ClCompile Include="..\Lzma2DecMt.c" />
-    <ClCompile Include="..\Lzma2Enc.c" />
-    <ClCompile Include="..\Lzma86Dec.c" />
-    <ClCompile Include="..\Lzma86Enc.c" />
-    <ClCompile Include="..\LzmaDec.c" />
-    <ClCompile Include="..\LzmaEnc.c" />
-    <ClCompile Include="..\LzmaLib.c" />
-    <ClCompile Include="..\MtCoder.c" />
-    <ClCompile Include="..\MtDec.c" />
-    <ClCompile Include="..\Ppmd7.c" />
-    <ClCompile Include="..\Ppmd7Dec.c" />
-    <ClCompile Include="..\Ppmd7Enc.c" />
-    <ClCompile Include="..\Sha256.c" />
-    <ClCompile Include="..\Sort.c" />
-    <ClCompile Include="..\Threads.c" />
-    <ClCompile Include="..\Xz.c" />
-    <ClCompile Include="..\XzCrc64.c" />
-    <ClCompile Include="..\XzCrc64Opt.c" />
-    <ClCompile Include="..\XzDec.c" />
-    <ClCompile Include="..\XzEnc.c" />
-    <ClCompile Include="..\XzIn.c" />
+    <ClCompile Include="7z\7zAlloc.c" />
+    <ClCompile Include="7z\7zArcIn.c" />
+    <ClCompile Include="7z\7zBuf.c" />
+    <ClCompile Include="7z\7zBuf2.c" />
+    <ClCompile Include="7z\7zCrc.c" />
+    <ClCompile Include="7z\7zCrcOpt.c" />
+    <ClCompile Include="7z\7zDec.c" />
+    <ClCompile Include="7z\7zFile.c" />
+    <ClCompile Include="7z\7zStream.c" />
+    <ClCompile Include="7z\Aes.c" />
+    <ClCompile Include="7z\AesOpt.c" />
+    <ClCompile Include="7z\Alloc.c" />
+    <ClCompile Include="7z\Bcj2.c" />
+    <ClCompile Include="7z\Bcj2Enc.c" />
+    <ClCompile Include="7z\Bra.c" />
+    <ClCompile Include="7z\Bra86.c" />
+    <ClCompile Include="7z\BraIA64.c" />
+    <ClCompile Include="7z\CpuArch.c" />
+    <ClCompile Include="7z\Delta.c" />
+    <ClCompile Include="7z\DllSecur.c" />
+    <ClCompile Include="7z\LzFind.c" />
+    <ClCompile Include="7z\LzFindMt.c" />
+    <ClCompile Include="7z\Lzma2Dec.c" />
+    <ClCompile Include="7z\Lzma2DecMt.c" />
+    <ClCompile Include="7z\Lzma2Enc.c" />
+    <ClCompile Include="7z\Lzma86Dec.c" />
+    <ClCompile Include="7z\Lzma86Enc.c" />
+    <ClCompile Include="7z\LzmaDec.c" />
+    <ClCompile Include="7z\LzmaEnc.c" />
+    <ClCompile Include="7z\LzmaLib.c" />
+    <ClCompile Include="7z\MtCoder.c" />
+    <ClCompile Include="7z\MtDec.c" />
+    <ClCompile Include="7z\Ppmd7.c" />
+    <ClCompile Include="7z\Ppmd7Dec.c" />
+    <ClCompile Include="7z\Ppmd7Enc.c" />
+    <ClCompile Include="7z\Sha256.c" />
+    <ClCompile Include="7z\Sort.c" />
+    <ClCompile Include="7z\Threads.c" />
+    <ClCompile Include="7z\Xz.c" />
+    <ClCompile Include="7z\XzCrc64.c" />
+    <ClCompile Include="7z\XzCrc64Opt.c" />
+    <ClCompile Include="7z\XzDec.c" />
+    <ClCompile Include="7z\XzEnc.c" />
+    <ClCompile Include="7z\XzIn.c" />
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <VCProjectVersion>16.0</VCProjectVersion>
     <ProjectGuid>{5B146DEA-9ACE-4D32-A7FD-3F42464DD69C}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>My7zlib</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
+  <Import Project="..\common_default.props" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <Import Project="..\common_default_macros.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>
@@ -155,9 +152,12 @@
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <OutDir>$(SolutionDir)lib/$(Configuration)-$(Platform)/</OutDir>
+    <IntDir>$(SolutionDir)tmp\$(ProjectName)-$(Configuration)-$(Platform)/</IntDir>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
-    <OutDir>$(ProjectDir)$(Platform)\$(Configuration)\</OutDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
diff --git a/3rdparty/7z/7zlib/7zlib.vcxproj.filters b/3rdparty/7zlib.vcxproj.filters
similarity index 62%
rename from 3rdparty/7z/7zlib/7zlib.vcxproj.filters
rename to 3rdparty/7zlib.vcxproj.filters
index 9b6cdbfaaa..29c66c5dd4 100644
--- a/3rdparty/7z/7zlib/7zlib.vcxproj.filters
+++ b/3rdparty/7zlib.vcxproj.filters
@@ -15,249 +15,249 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\7z.h">
+    <ClInclude Include="7z\7z.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\7zAlloc.h">
+    <ClInclude Include="7z\7zAlloc.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\7zBuf.h">
+    <ClInclude Include="7z\7zBuf.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\7zCrc.h">
+    <ClInclude Include="7z\7zCrc.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\7zFile.h">
+    <ClInclude Include="7z\7zFile.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\7zTypes.h">
+    <ClInclude Include="7z\7zTypes.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\7zVersion.h">
+    <ClInclude Include="7z\7zVersion.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\Aes.h">
+    <ClInclude Include="7z\Aes.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\Alloc.h">
+    <ClInclude Include="7z\Alloc.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\Bcj2.h">
+    <ClInclude Include="7z\Bcj2.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\Bra.h">
+    <ClInclude Include="7z\Bra.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\Compiler.h">
+    <ClInclude Include="7z\Compiler.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\CpuArch.h">
+    <ClInclude Include="7z\CpuArch.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\Delta.h">
+    <ClInclude Include="7z\Delta.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\DllSecur.h">
+    <ClInclude Include="7z\DllSecur.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\LzFind.h">
+    <ClInclude Include="7z\LzFind.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\LzFindMt.h">
+    <ClInclude Include="7z\LzFindMt.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\LzHash.h">
+    <ClInclude Include="7z\LzHash.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\Lzma2Dec.h">
+    <ClInclude Include="7z\Lzma2Dec.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\Lzma2DecMt.h">
+    <ClInclude Include="7z\Lzma2DecMt.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\Lzma2Enc.h">
+    <ClInclude Include="7z\Lzma2Enc.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\Lzma86.h">
+    <ClInclude Include="7z\Lzma86.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\LzmaDec.h">
+    <ClInclude Include="7z\LzmaDec.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\LzmaEnc.h">
+    <ClInclude Include="7z\LzmaEnc.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\LzmaLib.h">
+    <ClInclude Include="7z\LzmaLib.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\MtCoder.h">
+    <ClInclude Include="7z\MtCoder.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\MtDec.h">
+    <ClInclude Include="7z\MtDec.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\Ppmd.h">
+    <ClInclude Include="7z\Ppmd.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\Ppmd7.h">
+    <ClInclude Include="7z\Ppmd7.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\Precomp.h">
+    <ClInclude Include="7z\Precomp.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\RotateDefs.h">
+    <ClInclude Include="7z\RotateDefs.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\Sha256.h">
+    <ClInclude Include="7z\Sha256.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\Sort.h">
+    <ClInclude Include="7z\Sort.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\Threads.h">
+    <ClInclude Include="7z\Threads.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\Xz.h">
+    <ClInclude Include="7z\Xz.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\XzCrc64.h">
+    <ClInclude Include="7z\XzCrc64.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\XzEnc.h">
+    <ClInclude Include="7z\XzEnc.h">
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\7zAlloc.c">
+    <ClCompile Include="7z\7zAlloc.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\7zArcIn.c">
+    <ClCompile Include="7z\7zArcIn.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\7zBuf.c">
+    <ClCompile Include="7z\7zBuf.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\7zBuf2.c">
+    <ClCompile Include="7z\7zBuf2.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\7zCrc.c">
+    <ClCompile Include="7z\7zCrc.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\7zCrcOpt.c">
+    <ClCompile Include="7z\7zCrcOpt.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\7zDec.c">
+    <ClCompile Include="7z\7zDec.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\7zFile.c">
+    <ClCompile Include="7z\7zFile.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\7zStream.c">
+    <ClCompile Include="7z\7zStream.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\Aes.c">
+    <ClCompile Include="7z\Aes.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\AesOpt.c">
+    <ClCompile Include="7z\AesOpt.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\Alloc.c">
+    <ClCompile Include="7z\Alloc.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\Bcj2.c">
+    <ClCompile Include="7z\Bcj2.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\Bcj2Enc.c">
+    <ClCompile Include="7z\Bcj2Enc.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\Bra.c">
+    <ClCompile Include="7z\Bra.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\Bra86.c">
+    <ClCompile Include="7z\Bra86.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\BraIA64.c">
+    <ClCompile Include="7z\BraIA64.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\CpuArch.c">
+    <ClCompile Include="7z\CpuArch.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\Delta.c">
+    <ClCompile Include="7z\Delta.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\DllSecur.c">
+    <ClCompile Include="7z\DllSecur.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\LzFind.c">
+    <ClCompile Include="7z\LzFind.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\LzFindMt.c">
+    <ClCompile Include="7z\LzFindMt.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\Lzma2Dec.c">
+    <ClCompile Include="7z\Lzma2Dec.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\Lzma2DecMt.c">
+    <ClCompile Include="7z\Lzma2DecMt.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\Lzma2Enc.c">
+    <ClCompile Include="7z\Lzma2Enc.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\Lzma86Dec.c">
+    <ClCompile Include="7z\Lzma86Dec.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\Lzma86Enc.c">
+    <ClCompile Include="7z\Lzma86Enc.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\LzmaDec.c">
+    <ClCompile Include="7z\LzmaDec.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\LzmaEnc.c">
+    <ClCompile Include="7z\LzmaEnc.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\LzmaLib.c">
+    <ClCompile Include="7z\LzmaLib.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\MtCoder.c">
+    <ClCompile Include="7z\MtCoder.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\MtDec.c">
+    <ClCompile Include="7z\MtDec.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\Ppmd7.c">
+    <ClCompile Include="7z\Ppmd7.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\Ppmd7Dec.c">
+    <ClCompile Include="7z\Ppmd7Dec.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\Ppmd7Enc.c">
+    <ClCompile Include="7z\Ppmd7Enc.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\Sha256.c">
+    <ClCompile Include="7z\Sha256.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\Sort.c">
+    <ClCompile Include="7z\Sort.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\Threads.c">
+    <ClCompile Include="7z\Threads.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\Xz.c">
+    <ClCompile Include="7z\Xz.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\XzCrc64.c">
+    <ClCompile Include="7z\XzCrc64.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\XzCrc64Opt.c">
+    <ClCompile Include="7z\XzCrc64Opt.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\XzDec.c">
+    <ClCompile Include="7z\XzDec.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\XzEnc.c">
+    <ClCompile Include="7z\XzEnc.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\XzIn.c">
+    <ClCompile Include="7z\XzIn.c">
       <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
diff --git a/rpcs3.sln b/rpcs3.sln
index 07ac32c760..cafef2e526 100644
--- a/rpcs3.sln
+++ b/rpcs3.sln
@@ -78,7 +78,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libusb-1.0 (static)", "3rdp
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "7z", "7z", "{CB3DD03E-074E-4FA5-B253-51A3372D1768}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "7zlib", "3rdparty\7z\7zlib\7zlib.vcxproj", "{5B146DEA-9ACE-4D32-A7FD-3F42464DD69C}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "7zlib", "3rdparty\7zlib.vcxproj", "{5B146DEA-9ACE-4D32-A7FD-3F42464DD69C}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/rpcs3/rpcs3.vcxproj b/rpcs3/rpcs3.vcxproj
index 05a863ae83..32a80da9c4 100644
--- a/rpcs3/rpcs3.vcxproj
+++ b/rpcs3/rpcs3.vcxproj
@@ -193,7 +193,7 @@
     </ClCompile>
     <Link>
       <AdditionalDependencies>gdi32.lib;..\hidapi.lib;..\libusb-1.0.lib;winmm.lib;OpenAL.lib;XAudio.lib;GLGSRender.lib;shlwapi.lib;VKGSRender.lib;vulkan-1.lib;glslang.lib;OSDependent.lib;OGLCompiler.lib;SPIRV.lib;HLSL.lib;Advapi32.lib;user32.lib;zlib.lib;..\libpng16.lib;asmjit.lib;yaml-cpp.lib;discord-rpc.lib;emucore.lib;dxgi.lib;$(QTDIR)\lib\qtmain.lib;shell32.lib;opengl32.lib;$(QTDIR)\lib\Qt5OpenGL.lib;$(QTDIR)\lib\Qt5Widgets.lib;$(QTDIR)\lib\Qt5Gui.lib;$(QTDIR)\lib\Qt5Qml.lib;$(QTDIR)\lib\Qt5Network.lib;$(QTDIR)\lib\Qt5Core.lib;Qt5Core.lib;Qt5Gui.lib;Qt5Widgets.lib;Qt5WinExtras.lib;Qt5Concurrent.lib;7zlib.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\3rdparty\7z\7zlib\x64\Release\;$(VULKAN_SDK)\Lib;..\3rdparty\OpenAL\libs\Win64;..\Vulkan\glslang-build\hlsl\Release;..\Vulkan\glslang-build\SPIRV\Release;..\Vulkan\glslang-build\OGLCompilersDLL\Release;..\Vulkan\glslang-build\glslang\OSDependent\Windows\Release;..\Vulkan\glslang-build\glslang\Release;..\lib\$(CONFIGURATION)-$(PLATFORM);..\3rdparty\minidx12\Lib;..\3rdparty\discord-rpc\lib;$(QTDIR)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>$(VULKAN_SDK)\Lib;..\3rdparty\OpenAL\libs\Win64;..\Vulkan\glslang-build\hlsl\Release;..\Vulkan\glslang-build\SPIRV\Release;..\Vulkan\glslang-build\OGLCompilersDLL\Release;..\Vulkan\glslang-build\glslang\OSDependent\Windows\Release;..\Vulkan\glslang-build\glslang\Release;..\lib\$(CONFIGURATION)-$(PLATFORM);..\3rdparty\minidx12\Lib;..\3rdparty\discord-rpc\lib;$(QTDIR)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalOptions>"/MANIFESTDEPENDENCY:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' publicKeyToken='6595b64144ccf1df' language='*' processorArchitecture='*'" %(AdditionalOptions)</AdditionalOptions>
       <DataExecutionPrevention>true</DataExecutionPrevention>
       <GenerateDebugInformation>Debug</GenerateDebugInformation>