diff --git a/charsets/DES_full.hcchr b/charsets/des-full.hcchr
similarity index 100%
rename from charsets/DES_full.hcchr
rename to charsets/des-full.hcchr
diff --git a/charsets/DES_special/DES_alpha.hcchr b/charsets/des/DES_alpha.hcchr
similarity index 100%
rename from charsets/DES_special/DES_alpha.hcchr
rename to charsets/des/DES_alpha.hcchr
diff --git a/charsets/DES_special/DES_numeral.hcchr b/charsets/des/DES_numeral.hcchr
similarity index 100%
rename from charsets/DES_special/DES_numeral.hcchr
rename to charsets/des/DES_numeral.hcchr
diff --git a/charsets/DES_special/multiple_nodes/DES_portion_0.hcchr b/charsets/des/multiple_nodes/DES_portion_0.hcchr
similarity index 100%
rename from charsets/DES_special/multiple_nodes/DES_portion_0.hcchr
rename to charsets/des/multiple_nodes/DES_portion_0.hcchr
diff --git a/charsets/DES_special/multiple_nodes/DES_portion_1.hcchr b/charsets/des/multiple_nodes/DES_portion_1.hcchr
similarity index 100%
rename from charsets/DES_special/multiple_nodes/DES_portion_1.hcchr
rename to charsets/des/multiple_nodes/DES_portion_1.hcchr
diff --git a/charsets/DES_special/multiple_nodes/DES_portion_2.hcchr b/charsets/des/multiple_nodes/DES_portion_2.hcchr
similarity index 100%
rename from charsets/DES_special/multiple_nodes/DES_portion_2.hcchr
rename to charsets/des/multiple_nodes/DES_portion_2.hcchr
diff --git a/charsets/DES_special/multiple_nodes/DES_portion_3.hcchr b/charsets/des/multiple_nodes/DES_portion_3.hcchr
similarity index 100%
rename from charsets/DES_special/multiple_nodes/DES_portion_3.hcchr
rename to charsets/des/multiple_nodes/DES_portion_3.hcchr
diff --git a/charsets/DES_special/multiple_nodes/DES_portion_4.hcchr b/charsets/des/multiple_nodes/DES_portion_4.hcchr
similarity index 100%
rename from charsets/DES_special/multiple_nodes/DES_portion_4.hcchr
rename to charsets/des/multiple_nodes/DES_portion_4.hcchr
diff --git a/charsets/DES_special/multiple_nodes/DES_portion_5.hcchr b/charsets/des/multiple_nodes/DES_portion_5.hcchr
similarity index 100%
rename from charsets/DES_special/multiple_nodes/DES_portion_5.hcchr
rename to charsets/des/multiple_nodes/DES_portion_5.hcchr
diff --git a/charsets/DES_special/multiple_nodes/DES_portion_6.hcchr b/charsets/des/multiple_nodes/DES_portion_6.hcchr
similarity index 100%
rename from charsets/DES_special/multiple_nodes/DES_portion_6.hcchr
rename to charsets/des/multiple_nodes/DES_portion_6.hcchr
diff --git a/charsets/DES_special/multiple_nodes/DES_portion_7.hcchr b/charsets/des/multiple_nodes/DES_portion_7.hcchr
similarity index 100%
rename from charsets/DES_special/multiple_nodes/DES_portion_7.hcchr
rename to charsets/des/multiple_nodes/DES_portion_7.hcchr
diff --git a/charsets/DES_special/multiple_nodes/DES_portion_8.hcchr b/charsets/des/multiple_nodes/DES_portion_8.hcchr
similarity index 100%
rename from charsets/DES_special/multiple_nodes/DES_portion_8.hcchr
rename to charsets/des/multiple_nodes/DES_portion_8.hcchr
diff --git a/charsets/DES_special/multiple_nodes/DES_portion_9.hcchr b/charsets/des/multiple_nodes/DES_portion_9.hcchr
similarity index 100%
rename from charsets/DES_special/multiple_nodes/DES_portion_9.hcchr
rename to charsets/des/multiple_nodes/DES_portion_9.hcchr
diff --git a/charsets/DES_special/multiple_nodes/DES_portion_A.hcchr b/charsets/des/multiple_nodes/DES_portion_A.hcchr
similarity index 100%
rename from charsets/DES_special/multiple_nodes/DES_portion_A.hcchr
rename to charsets/des/multiple_nodes/DES_portion_A.hcchr
diff --git a/charsets/DES_special/multiple_nodes/DES_portion_B.hcchr b/charsets/des/multiple_nodes/DES_portion_B.hcchr
similarity index 100%
rename from charsets/DES_special/multiple_nodes/DES_portion_B.hcchr
rename to charsets/des/multiple_nodes/DES_portion_B.hcchr
diff --git a/charsets/DES_special/multiple_nodes/DES_portion_C.hcchr b/charsets/des/multiple_nodes/DES_portion_C.hcchr
similarity index 100%
rename from charsets/DES_special/multiple_nodes/DES_portion_C.hcchr
rename to charsets/des/multiple_nodes/DES_portion_C.hcchr
diff --git a/charsets/DES_special/multiple_nodes/DES_portion_D.hcchr b/charsets/des/multiple_nodes/DES_portion_D.hcchr
similarity index 100%
rename from charsets/DES_special/multiple_nodes/DES_portion_D.hcchr
rename to charsets/des/multiple_nodes/DES_portion_D.hcchr
diff --git a/charsets/DES_special/multiple_nodes/DES_portion_E.hcchr b/charsets/des/multiple_nodes/DES_portion_E.hcchr
similarity index 100%
rename from charsets/DES_special/multiple_nodes/DES_portion_E.hcchr
rename to charsets/des/multiple_nodes/DES_portion_E.hcchr
diff --git a/charsets/DES_special/multiple_nodes/DES_portion_F.hcchr b/charsets/des/multiple_nodes/DES_portion_F.hcchr
similarity index 100%
rename from charsets/DES_special/multiple_nodes/DES_portion_F.hcchr
rename to charsets/des/multiple_nodes/DES_portion_F.hcchr
diff --git a/deps/OpenCL-Headers/CL/cl.h b/deps/headers/CL/cl.h
similarity index 100%
rename from deps/OpenCL-Headers/CL/cl.h
rename to deps/headers/CL/cl.h
diff --git a/deps/OpenCL-Headers/CL/cl_d3d10.h b/deps/headers/CL/cl_d3d10.h
similarity index 100%
rename from deps/OpenCL-Headers/CL/cl_d3d10.h
rename to deps/headers/CL/cl_d3d10.h
diff --git a/deps/OpenCL-Headers/CL/cl_d3d11.h b/deps/headers/CL/cl_d3d11.h
similarity index 100%
rename from deps/OpenCL-Headers/CL/cl_d3d11.h
rename to deps/headers/CL/cl_d3d11.h
diff --git a/deps/OpenCL-Headers/CL/cl_dx9_media_sharing.h b/deps/headers/CL/cl_dx9_media_sharing.h
similarity index 100%
rename from deps/OpenCL-Headers/CL/cl_dx9_media_sharing.h
rename to deps/headers/CL/cl_dx9_media_sharing.h
diff --git a/deps/OpenCL-Headers/CL/cl_dx9_media_sharing_intel.h b/deps/headers/CL/cl_dx9_media_sharing_intel.h
similarity index 100%
rename from deps/OpenCL-Headers/CL/cl_dx9_media_sharing_intel.h
rename to deps/headers/CL/cl_dx9_media_sharing_intel.h
diff --git a/deps/OpenCL-Headers/CL/cl_egl.h b/deps/headers/CL/cl_egl.h
similarity index 100%
rename from deps/OpenCL-Headers/CL/cl_egl.h
rename to deps/headers/CL/cl_egl.h
diff --git a/deps/OpenCL-Headers/CL/cl_ext.h b/deps/headers/CL/cl_ext.h
similarity index 100%
rename from deps/OpenCL-Headers/CL/cl_ext.h
rename to deps/headers/CL/cl_ext.h
diff --git a/deps/OpenCL-Headers/CL/cl_ext_intel.h b/deps/headers/CL/cl_ext_intel.h
similarity index 100%
rename from deps/OpenCL-Headers/CL/cl_ext_intel.h
rename to deps/headers/CL/cl_ext_intel.h
diff --git a/deps/OpenCL-Headers/CL/cl_gl.h b/deps/headers/CL/cl_gl.h
similarity index 100%
rename from deps/OpenCL-Headers/CL/cl_gl.h
rename to deps/headers/CL/cl_gl.h
diff --git a/deps/OpenCL-Headers/CL/cl_gl_ext.h b/deps/headers/CL/cl_gl_ext.h
similarity index 100%
rename from deps/OpenCL-Headers/CL/cl_gl_ext.h
rename to deps/headers/CL/cl_gl_ext.h
diff --git a/deps/OpenCL-Headers/CL/cl_half.h b/deps/headers/CL/cl_half.h
similarity index 100%
rename from deps/OpenCL-Headers/CL/cl_half.h
rename to deps/headers/CL/cl_half.h
diff --git a/deps/OpenCL-Headers/CL/cl_icd.h b/deps/headers/CL/cl_icd.h
similarity index 100%
rename from deps/OpenCL-Headers/CL/cl_icd.h
rename to deps/headers/CL/cl_icd.h
diff --git a/deps/OpenCL-Headers/CL/cl_layer.h b/deps/headers/CL/cl_layer.h
similarity index 100%
rename from deps/OpenCL-Headers/CL/cl_layer.h
rename to deps/headers/CL/cl_layer.h
diff --git a/deps/OpenCL-Headers/CL/cl_platform.h b/deps/headers/CL/cl_platform.h
similarity index 100%
rename from deps/OpenCL-Headers/CL/cl_platform.h
rename to deps/headers/CL/cl_platform.h
diff --git a/deps/OpenCL-Headers/CL/cl_va_api_media_sharing_intel.h b/deps/headers/CL/cl_va_api_media_sharing_intel.h
similarity index 100%
rename from deps/OpenCL-Headers/CL/cl_va_api_media_sharing_intel.h
rename to deps/headers/CL/cl_va_api_media_sharing_intel.h
diff --git a/deps/OpenCL-Headers/CL/cl_version.h b/deps/headers/CL/cl_version.h
similarity index 100%
rename from deps/OpenCL-Headers/CL/cl_version.h
rename to deps/headers/CL/cl_version.h
diff --git a/deps/OpenCL-Headers/CL/opencl.h b/deps/headers/CL/opencl.h
similarity index 100%
rename from deps/OpenCL-Headers/CL/opencl.h
rename to deps/headers/CL/opencl.h
diff --git a/deps/OpenCL-Headers/CODE_OF_CONDUCT.md b/deps/headers/CODE_OF_CONDUCT.md
similarity index 100%
rename from deps/OpenCL-Headers/CODE_OF_CONDUCT.md
rename to deps/headers/CODE_OF_CONDUCT.md
diff --git a/deps/OpenCL-Headers/LICENSE b/deps/headers/LICENSE
similarity index 100%
rename from deps/OpenCL-Headers/LICENSE
rename to deps/headers/LICENSE
diff --git a/deps/OpenCL-Headers/README.md b/deps/headers/README.md
similarity index 100%
rename from deps/OpenCL-Headers/README.md
rename to deps/headers/README.md
diff --git a/deps/LZMA-SDK/C/7z.h b/deps/sdk/C/7z.h
similarity index 100%
rename from deps/LZMA-SDK/C/7z.h
rename to deps/sdk/C/7z.h
diff --git a/deps/LZMA-SDK/C/7zAlloc.c b/deps/sdk/C/7zAlloc.c
similarity index 100%
rename from deps/LZMA-SDK/C/7zAlloc.c
rename to deps/sdk/C/7zAlloc.c
diff --git a/deps/LZMA-SDK/C/7zAlloc.h b/deps/sdk/C/7zAlloc.h
similarity index 100%
rename from deps/LZMA-SDK/C/7zAlloc.h
rename to deps/sdk/C/7zAlloc.h
diff --git a/deps/LZMA-SDK/C/7zArcIn.c b/deps/sdk/C/7zArcIn.c
similarity index 100%
rename from deps/LZMA-SDK/C/7zArcIn.c
rename to deps/sdk/C/7zArcIn.c
diff --git a/deps/LZMA-SDK/C/7zBuf.c b/deps/sdk/C/7zBuf.c
similarity index 100%
rename from deps/LZMA-SDK/C/7zBuf.c
rename to deps/sdk/C/7zBuf.c
diff --git a/deps/LZMA-SDK/C/7zBuf.h b/deps/sdk/C/7zBuf.h
similarity index 100%
rename from deps/LZMA-SDK/C/7zBuf.h
rename to deps/sdk/C/7zBuf.h
diff --git a/deps/LZMA-SDK/C/7zBuf2.c b/deps/sdk/C/7zBuf2.c
similarity index 100%
rename from deps/LZMA-SDK/C/7zBuf2.c
rename to deps/sdk/C/7zBuf2.c
diff --git a/deps/LZMA-SDK/C/7zCrc.c b/deps/sdk/C/7zCrc.c
similarity index 100%
rename from deps/LZMA-SDK/C/7zCrc.c
rename to deps/sdk/C/7zCrc.c
diff --git a/deps/LZMA-SDK/C/7zCrc.h b/deps/sdk/C/7zCrc.h
similarity index 100%
rename from deps/LZMA-SDK/C/7zCrc.h
rename to deps/sdk/C/7zCrc.h
diff --git a/deps/LZMA-SDK/C/7zCrcOpt.c b/deps/sdk/C/7zCrcOpt.c
similarity index 100%
rename from deps/LZMA-SDK/C/7zCrcOpt.c
rename to deps/sdk/C/7zCrcOpt.c
diff --git a/deps/LZMA-SDK/C/7zDec.c b/deps/sdk/C/7zDec.c
similarity index 100%
rename from deps/LZMA-SDK/C/7zDec.c
rename to deps/sdk/C/7zDec.c
diff --git a/deps/LZMA-SDK/C/7zFile.c b/deps/sdk/C/7zFile.c
similarity index 100%
rename from deps/LZMA-SDK/C/7zFile.c
rename to deps/sdk/C/7zFile.c
diff --git a/deps/LZMA-SDK/C/7zFile.h b/deps/sdk/C/7zFile.h
similarity index 100%
rename from deps/LZMA-SDK/C/7zFile.h
rename to deps/sdk/C/7zFile.h
diff --git a/deps/LZMA-SDK/C/7zStream.c b/deps/sdk/C/7zStream.c
similarity index 100%
rename from deps/LZMA-SDK/C/7zStream.c
rename to deps/sdk/C/7zStream.c
diff --git a/deps/LZMA-SDK/C/7zTypes.h b/deps/sdk/C/7zTypes.h
similarity index 100%
rename from deps/LZMA-SDK/C/7zTypes.h
rename to deps/sdk/C/7zTypes.h
diff --git a/deps/LZMA-SDK/C/7zVersion.h b/deps/sdk/C/7zVersion.h
similarity index 100%
rename from deps/LZMA-SDK/C/7zVersion.h
rename to deps/sdk/C/7zVersion.h
diff --git a/deps/LZMA-SDK/C/7zVersion.rc b/deps/sdk/C/7zVersion.rc
similarity index 100%
rename from deps/LZMA-SDK/C/7zVersion.rc
rename to deps/sdk/C/7zVersion.rc
diff --git a/deps/LZMA-SDK/C/7zip_gcc_c.mak b/deps/sdk/C/7zip_gcc_c.mak
similarity index 100%
rename from deps/LZMA-SDK/C/7zip_gcc_c.mak
rename to deps/sdk/C/7zip_gcc_c.mak
diff --git a/deps/LZMA-SDK/C/Aes.c b/deps/sdk/C/Aes.c
similarity index 100%
rename from deps/LZMA-SDK/C/Aes.c
rename to deps/sdk/C/Aes.c
diff --git a/deps/LZMA-SDK/C/Aes.h b/deps/sdk/C/Aes.h
similarity index 100%
rename from deps/LZMA-SDK/C/Aes.h
rename to deps/sdk/C/Aes.h
diff --git a/deps/LZMA-SDK/C/AesOpt.c b/deps/sdk/C/AesOpt.c
similarity index 100%
rename from deps/LZMA-SDK/C/AesOpt.c
rename to deps/sdk/C/AesOpt.c
diff --git a/deps/LZMA-SDK/C/Alloc.c b/deps/sdk/C/Alloc.c
similarity index 100%
rename from deps/LZMA-SDK/C/Alloc.c
rename to deps/sdk/C/Alloc.c
diff --git a/deps/LZMA-SDK/C/Alloc.h b/deps/sdk/C/Alloc.h
similarity index 100%
rename from deps/LZMA-SDK/C/Alloc.h
rename to deps/sdk/C/Alloc.h
diff --git a/deps/LZMA-SDK/C/Bcj2.c b/deps/sdk/C/Bcj2.c
similarity index 100%
rename from deps/LZMA-SDK/C/Bcj2.c
rename to deps/sdk/C/Bcj2.c
diff --git a/deps/LZMA-SDK/C/Bcj2.h b/deps/sdk/C/Bcj2.h
similarity index 100%
rename from deps/LZMA-SDK/C/Bcj2.h
rename to deps/sdk/C/Bcj2.h
diff --git a/deps/LZMA-SDK/C/Bcj2Enc.c b/deps/sdk/C/Bcj2Enc.c
similarity index 100%
rename from deps/LZMA-SDK/C/Bcj2Enc.c
rename to deps/sdk/C/Bcj2Enc.c
diff --git a/deps/LZMA-SDK/C/Bra.c b/deps/sdk/C/Bra.c
similarity index 100%
rename from deps/LZMA-SDK/C/Bra.c
rename to deps/sdk/C/Bra.c
diff --git a/deps/LZMA-SDK/C/Bra.h b/deps/sdk/C/Bra.h
similarity index 100%
rename from deps/LZMA-SDK/C/Bra.h
rename to deps/sdk/C/Bra.h
diff --git a/deps/LZMA-SDK/C/Bra86.c b/deps/sdk/C/Bra86.c
similarity index 100%
rename from deps/LZMA-SDK/C/Bra86.c
rename to deps/sdk/C/Bra86.c
diff --git a/deps/LZMA-SDK/C/BraIA64.c b/deps/sdk/C/BraIA64.c
similarity index 100%
rename from deps/LZMA-SDK/C/BraIA64.c
rename to deps/sdk/C/BraIA64.c
diff --git a/deps/LZMA-SDK/C/Compiler.h b/deps/sdk/C/Compiler.h
similarity index 100%
rename from deps/LZMA-SDK/C/Compiler.h
rename to deps/sdk/C/Compiler.h
diff --git a/deps/LZMA-SDK/C/CpuArch.c b/deps/sdk/C/CpuArch.c
similarity index 100%
rename from deps/LZMA-SDK/C/CpuArch.c
rename to deps/sdk/C/CpuArch.c
diff --git a/deps/LZMA-SDK/C/CpuArch.h b/deps/sdk/C/CpuArch.h
similarity index 100%
rename from deps/LZMA-SDK/C/CpuArch.h
rename to deps/sdk/C/CpuArch.h
diff --git a/deps/LZMA-SDK/C/Delta.c b/deps/sdk/C/Delta.c
similarity index 100%
rename from deps/LZMA-SDK/C/Delta.c
rename to deps/sdk/C/Delta.c
diff --git a/deps/LZMA-SDK/C/Delta.h b/deps/sdk/C/Delta.h
similarity index 100%
rename from deps/LZMA-SDK/C/Delta.h
rename to deps/sdk/C/Delta.h
diff --git a/deps/LZMA-SDK/C/DllSecur.c b/deps/sdk/C/DllSecur.c
similarity index 100%
rename from deps/LZMA-SDK/C/DllSecur.c
rename to deps/sdk/C/DllSecur.c
diff --git a/deps/LZMA-SDK/C/DllSecur.h b/deps/sdk/C/DllSecur.h
similarity index 100%
rename from deps/LZMA-SDK/C/DllSecur.h
rename to deps/sdk/C/DllSecur.h
diff --git a/deps/LZMA-SDK/C/LzFind.c b/deps/sdk/C/LzFind.c
similarity index 100%
rename from deps/LZMA-SDK/C/LzFind.c
rename to deps/sdk/C/LzFind.c
diff --git a/deps/LZMA-SDK/C/LzFind.h b/deps/sdk/C/LzFind.h
similarity index 100%
rename from deps/LZMA-SDK/C/LzFind.h
rename to deps/sdk/C/LzFind.h
diff --git a/deps/LZMA-SDK/C/LzFindMt.c b/deps/sdk/C/LzFindMt.c
similarity index 100%
rename from deps/LZMA-SDK/C/LzFindMt.c
rename to deps/sdk/C/LzFindMt.c
diff --git a/deps/LZMA-SDK/C/LzFindMt.h b/deps/sdk/C/LzFindMt.h
similarity index 100%
rename from deps/LZMA-SDK/C/LzFindMt.h
rename to deps/sdk/C/LzFindMt.h
diff --git a/deps/LZMA-SDK/C/LzFindOpt.c b/deps/sdk/C/LzFindOpt.c
similarity index 100%
rename from deps/LZMA-SDK/C/LzFindOpt.c
rename to deps/sdk/C/LzFindOpt.c
diff --git a/deps/LZMA-SDK/C/LzHash.h b/deps/sdk/C/LzHash.h
similarity index 100%
rename from deps/LZMA-SDK/C/LzHash.h
rename to deps/sdk/C/LzHash.h
diff --git a/deps/LZMA-SDK/C/Lzma2Dec.c b/deps/sdk/C/Lzma2Dec.c
similarity index 100%
rename from deps/LZMA-SDK/C/Lzma2Dec.c
rename to deps/sdk/C/Lzma2Dec.c
diff --git a/deps/LZMA-SDK/C/Lzma2Dec.h b/deps/sdk/C/Lzma2Dec.h
similarity index 100%
rename from deps/LZMA-SDK/C/Lzma2Dec.h
rename to deps/sdk/C/Lzma2Dec.h
diff --git a/deps/LZMA-SDK/C/Lzma2DecMt.c b/deps/sdk/C/Lzma2DecMt.c
similarity index 100%
rename from deps/LZMA-SDK/C/Lzma2DecMt.c
rename to deps/sdk/C/Lzma2DecMt.c
diff --git a/deps/LZMA-SDK/C/Lzma2DecMt.h b/deps/sdk/C/Lzma2DecMt.h
similarity index 100%
rename from deps/LZMA-SDK/C/Lzma2DecMt.h
rename to deps/sdk/C/Lzma2DecMt.h
diff --git a/deps/LZMA-SDK/C/Lzma2Enc.c b/deps/sdk/C/Lzma2Enc.c
similarity index 100%
rename from deps/LZMA-SDK/C/Lzma2Enc.c
rename to deps/sdk/C/Lzma2Enc.c
diff --git a/deps/LZMA-SDK/C/Lzma2Enc.h b/deps/sdk/C/Lzma2Enc.h
similarity index 100%
rename from deps/LZMA-SDK/C/Lzma2Enc.h
rename to deps/sdk/C/Lzma2Enc.h
diff --git a/deps/LZMA-SDK/C/Lzma86.h b/deps/sdk/C/Lzma86.h
similarity index 100%
rename from deps/LZMA-SDK/C/Lzma86.h
rename to deps/sdk/C/Lzma86.h
diff --git a/deps/LZMA-SDK/C/Lzma86Dec.c b/deps/sdk/C/Lzma86Dec.c
similarity index 100%
rename from deps/LZMA-SDK/C/Lzma86Dec.c
rename to deps/sdk/C/Lzma86Dec.c
diff --git a/deps/LZMA-SDK/C/Lzma86Enc.c b/deps/sdk/C/Lzma86Enc.c
similarity index 100%
rename from deps/LZMA-SDK/C/Lzma86Enc.c
rename to deps/sdk/C/Lzma86Enc.c
diff --git a/deps/LZMA-SDK/C/LzmaDec.c b/deps/sdk/C/LzmaDec.c
similarity index 100%
rename from deps/LZMA-SDK/C/LzmaDec.c
rename to deps/sdk/C/LzmaDec.c
diff --git a/deps/LZMA-SDK/C/LzmaDec.h b/deps/sdk/C/LzmaDec.h
similarity index 100%
rename from deps/LZMA-SDK/C/LzmaDec.h
rename to deps/sdk/C/LzmaDec.h
diff --git a/deps/LZMA-SDK/C/LzmaEnc.c b/deps/sdk/C/LzmaEnc.c
similarity index 100%
rename from deps/LZMA-SDK/C/LzmaEnc.c
rename to deps/sdk/C/LzmaEnc.c
diff --git a/deps/LZMA-SDK/C/LzmaEnc.h b/deps/sdk/C/LzmaEnc.h
similarity index 100%
rename from deps/LZMA-SDK/C/LzmaEnc.h
rename to deps/sdk/C/LzmaEnc.h
diff --git a/deps/LZMA-SDK/C/LzmaLib.c b/deps/sdk/C/LzmaLib.c
similarity index 100%
rename from deps/LZMA-SDK/C/LzmaLib.c
rename to deps/sdk/C/LzmaLib.c
diff --git a/deps/LZMA-SDK/C/LzmaLib.h b/deps/sdk/C/LzmaLib.h
similarity index 100%
rename from deps/LZMA-SDK/C/LzmaLib.h
rename to deps/sdk/C/LzmaLib.h
diff --git a/deps/LZMA-SDK/C/MtCoder.c b/deps/sdk/C/MtCoder.c
similarity index 100%
rename from deps/LZMA-SDK/C/MtCoder.c
rename to deps/sdk/C/MtCoder.c
diff --git a/deps/LZMA-SDK/C/MtCoder.h b/deps/sdk/C/MtCoder.h
similarity index 100%
rename from deps/LZMA-SDK/C/MtCoder.h
rename to deps/sdk/C/MtCoder.h
diff --git a/deps/LZMA-SDK/C/MtDec.c b/deps/sdk/C/MtDec.c
similarity index 100%
rename from deps/LZMA-SDK/C/MtDec.c
rename to deps/sdk/C/MtDec.c
diff --git a/deps/LZMA-SDK/C/MtDec.h b/deps/sdk/C/MtDec.h
similarity index 100%
rename from deps/LZMA-SDK/C/MtDec.h
rename to deps/sdk/C/MtDec.h
diff --git a/deps/LZMA-SDK/C/Ppmd.h b/deps/sdk/C/Ppmd.h
similarity index 100%
rename from deps/LZMA-SDK/C/Ppmd.h
rename to deps/sdk/C/Ppmd.h
diff --git a/deps/LZMA-SDK/C/Ppmd7.c b/deps/sdk/C/Ppmd7.c
similarity index 100%
rename from deps/LZMA-SDK/C/Ppmd7.c
rename to deps/sdk/C/Ppmd7.c
diff --git a/deps/LZMA-SDK/C/Ppmd7.h b/deps/sdk/C/Ppmd7.h
similarity index 100%
rename from deps/LZMA-SDK/C/Ppmd7.h
rename to deps/sdk/C/Ppmd7.h
diff --git a/deps/LZMA-SDK/C/Ppmd7Dec.c b/deps/sdk/C/Ppmd7Dec.c
similarity index 100%
rename from deps/LZMA-SDK/C/Ppmd7Dec.c
rename to deps/sdk/C/Ppmd7Dec.c
diff --git a/deps/LZMA-SDK/C/Ppmd7Enc.c b/deps/sdk/C/Ppmd7Enc.c
similarity index 100%
rename from deps/LZMA-SDK/C/Ppmd7Enc.c
rename to deps/sdk/C/Ppmd7Enc.c
diff --git a/deps/LZMA-SDK/C/Precomp.h b/deps/sdk/C/Precomp.h
similarity index 100%
rename from deps/LZMA-SDK/C/Precomp.h
rename to deps/sdk/C/Precomp.h
diff --git a/deps/LZMA-SDK/C/RotateDefs.h b/deps/sdk/C/RotateDefs.h
similarity index 100%
rename from deps/LZMA-SDK/C/RotateDefs.h
rename to deps/sdk/C/RotateDefs.h
diff --git a/deps/LZMA-SDK/C/Sha256.c b/deps/sdk/C/Sha256.c
similarity index 100%
rename from deps/LZMA-SDK/C/Sha256.c
rename to deps/sdk/C/Sha256.c
diff --git a/deps/LZMA-SDK/C/Sha256.h b/deps/sdk/C/Sha256.h
similarity index 100%
rename from deps/LZMA-SDK/C/Sha256.h
rename to deps/sdk/C/Sha256.h
diff --git a/deps/LZMA-SDK/C/Sha256Opt.c b/deps/sdk/C/Sha256Opt.c
similarity index 100%
rename from deps/LZMA-SDK/C/Sha256Opt.c
rename to deps/sdk/C/Sha256Opt.c
diff --git a/deps/LZMA-SDK/C/Sort.c b/deps/sdk/C/Sort.c
similarity index 100%
rename from deps/LZMA-SDK/C/Sort.c
rename to deps/sdk/C/Sort.c
diff --git a/deps/LZMA-SDK/C/Sort.h b/deps/sdk/C/Sort.h
similarity index 100%
rename from deps/LZMA-SDK/C/Sort.h
rename to deps/sdk/C/Sort.h
diff --git a/deps/LZMA-SDK/C/Threads.c b/deps/sdk/C/Threads.c
similarity index 100%
rename from deps/LZMA-SDK/C/Threads.c
rename to deps/sdk/C/Threads.c
diff --git a/deps/LZMA-SDK/C/Threads.h b/deps/sdk/C/Threads.h
similarity index 100%
rename from deps/LZMA-SDK/C/Threads.h
rename to deps/sdk/C/Threads.h
diff --git a/deps/LZMA-SDK/C/Util/7z/7z.dsp b/deps/sdk/C/Util/7z/7z.dsp
similarity index 100%
rename from deps/LZMA-SDK/C/Util/7z/7z.dsp
rename to deps/sdk/C/Util/7z/7z.dsp
diff --git a/deps/LZMA-SDK/C/Util/7z/7z.dsw b/deps/sdk/C/Util/7z/7z.dsw
similarity index 100%
rename from deps/LZMA-SDK/C/Util/7z/7z.dsw
rename to deps/sdk/C/Util/7z/7z.dsw
diff --git a/deps/LZMA-SDK/C/Util/7z/7zMain.c b/deps/sdk/C/Util/7z/7zMain.c
similarity index 100%
rename from deps/LZMA-SDK/C/Util/7z/7zMain.c
rename to deps/sdk/C/Util/7z/7zMain.c
diff --git a/deps/LZMA-SDK/C/Util/7z/Precomp.c b/deps/sdk/C/Util/7z/Precomp.c
similarity index 100%
rename from deps/LZMA-SDK/C/Util/7z/Precomp.c
rename to deps/sdk/C/Util/7z/Precomp.c
diff --git a/deps/LZMA-SDK/C/Util/7z/Precomp.h b/deps/sdk/C/Util/7z/Precomp.h
similarity index 100%
rename from deps/LZMA-SDK/C/Util/7z/Precomp.h
rename to deps/sdk/C/Util/7z/Precomp.h
diff --git a/deps/LZMA-SDK/C/Util/7z/makefile b/deps/sdk/C/Util/7z/makefile
similarity index 100%
rename from deps/LZMA-SDK/C/Util/7z/makefile
rename to deps/sdk/C/Util/7z/makefile
diff --git a/deps/LZMA-SDK/C/Util/7z/makefile.gcc b/deps/sdk/C/Util/7z/makefile.gcc
similarity index 100%
rename from deps/LZMA-SDK/C/Util/7z/makefile.gcc
rename to deps/sdk/C/Util/7z/makefile.gcc
diff --git a/deps/LZMA-SDK/C/Util/Lzma/LzmaUtil.c b/deps/sdk/C/Util/Lzma/LzmaUtil.c
similarity index 100%
rename from deps/LZMA-SDK/C/Util/Lzma/LzmaUtil.c
rename to deps/sdk/C/Util/Lzma/LzmaUtil.c
diff --git a/deps/LZMA-SDK/C/Util/Lzma/LzmaUtil.dsp b/deps/sdk/C/Util/Lzma/LzmaUtil.dsp
similarity index 100%
rename from deps/LZMA-SDK/C/Util/Lzma/LzmaUtil.dsp
rename to deps/sdk/C/Util/Lzma/LzmaUtil.dsp
diff --git a/deps/LZMA-SDK/C/Util/Lzma/LzmaUtil.dsw b/deps/sdk/C/Util/Lzma/LzmaUtil.dsw
similarity index 100%
rename from deps/LZMA-SDK/C/Util/Lzma/LzmaUtil.dsw
rename to deps/sdk/C/Util/Lzma/LzmaUtil.dsw
diff --git a/deps/LZMA-SDK/C/Util/Lzma/makefile b/deps/sdk/C/Util/Lzma/makefile
similarity index 100%
rename from deps/LZMA-SDK/C/Util/Lzma/makefile
rename to deps/sdk/C/Util/Lzma/makefile
diff --git a/deps/LZMA-SDK/C/Util/Lzma/makefile.gcc b/deps/sdk/C/Util/Lzma/makefile.gcc
similarity index 100%
rename from deps/LZMA-SDK/C/Util/Lzma/makefile.gcc
rename to deps/sdk/C/Util/Lzma/makefile.gcc
diff --git a/deps/LZMA-SDK/C/Util/LzmaLib/LzmaLib.def b/deps/sdk/C/Util/LzmaLib/LzmaLib.def
similarity index 100%
rename from deps/LZMA-SDK/C/Util/LzmaLib/LzmaLib.def
rename to deps/sdk/C/Util/LzmaLib/LzmaLib.def
diff --git a/deps/LZMA-SDK/C/Util/LzmaLib/LzmaLib.dsp b/deps/sdk/C/Util/LzmaLib/LzmaLib.dsp
similarity index 100%
rename from deps/LZMA-SDK/C/Util/LzmaLib/LzmaLib.dsp
rename to deps/sdk/C/Util/LzmaLib/LzmaLib.dsp
diff --git a/deps/LZMA-SDK/C/Util/LzmaLib/LzmaLib.dsw b/deps/sdk/C/Util/LzmaLib/LzmaLib.dsw
similarity index 100%
rename from deps/LZMA-SDK/C/Util/LzmaLib/LzmaLib.dsw
rename to deps/sdk/C/Util/LzmaLib/LzmaLib.dsw
diff --git a/deps/LZMA-SDK/C/Util/LzmaLib/LzmaLibExports.c b/deps/sdk/C/Util/LzmaLib/LzmaLibExports.c
similarity index 100%
rename from deps/LZMA-SDK/C/Util/LzmaLib/LzmaLibExports.c
rename to deps/sdk/C/Util/LzmaLib/LzmaLibExports.c
diff --git a/deps/LZMA-SDK/C/Util/LzmaLib/makefile b/deps/sdk/C/Util/LzmaLib/makefile
similarity index 100%
rename from deps/LZMA-SDK/C/Util/LzmaLib/makefile
rename to deps/sdk/C/Util/LzmaLib/makefile
diff --git a/deps/LZMA-SDK/C/Util/LzmaLib/resource.rc b/deps/sdk/C/Util/LzmaLib/resource.rc
similarity index 100%
rename from deps/LZMA-SDK/C/Util/LzmaLib/resource.rc
rename to deps/sdk/C/Util/LzmaLib/resource.rc
diff --git a/deps/LZMA-SDK/C/Util/SfxSetup/Precomp.c b/deps/sdk/C/Util/SfxSetup/Precomp.c
similarity index 100%
rename from deps/LZMA-SDK/C/Util/SfxSetup/Precomp.c
rename to deps/sdk/C/Util/SfxSetup/Precomp.c
diff --git a/deps/LZMA-SDK/C/Util/SfxSetup/Precomp.h b/deps/sdk/C/Util/SfxSetup/Precomp.h
similarity index 100%
rename from deps/LZMA-SDK/C/Util/SfxSetup/Precomp.h
rename to deps/sdk/C/Util/SfxSetup/Precomp.h
diff --git a/deps/LZMA-SDK/C/Util/SfxSetup/SfxSetup.c b/deps/sdk/C/Util/SfxSetup/SfxSetup.c
similarity index 100%
rename from deps/LZMA-SDK/C/Util/SfxSetup/SfxSetup.c
rename to deps/sdk/C/Util/SfxSetup/SfxSetup.c
diff --git a/deps/LZMA-SDK/C/Util/SfxSetup/SfxSetup.dsp b/deps/sdk/C/Util/SfxSetup/SfxSetup.dsp
similarity index 100%
rename from deps/LZMA-SDK/C/Util/SfxSetup/SfxSetup.dsp
rename to deps/sdk/C/Util/SfxSetup/SfxSetup.dsp
diff --git a/deps/LZMA-SDK/C/Util/SfxSetup/SfxSetup.dsw b/deps/sdk/C/Util/SfxSetup/SfxSetup.dsw
similarity index 100%
rename from deps/LZMA-SDK/C/Util/SfxSetup/SfxSetup.dsw
rename to deps/sdk/C/Util/SfxSetup/SfxSetup.dsw
diff --git a/deps/LZMA-SDK/C/Util/SfxSetup/makefile b/deps/sdk/C/Util/SfxSetup/makefile
similarity index 100%
rename from deps/LZMA-SDK/C/Util/SfxSetup/makefile
rename to deps/sdk/C/Util/SfxSetup/makefile
diff --git a/deps/LZMA-SDK/C/Util/SfxSetup/makefile_con b/deps/sdk/C/Util/SfxSetup/makefile_con
similarity index 100%
rename from deps/LZMA-SDK/C/Util/SfxSetup/makefile_con
rename to deps/sdk/C/Util/SfxSetup/makefile_con
diff --git a/deps/LZMA-SDK/C/Util/SfxSetup/resource.rc b/deps/sdk/C/Util/SfxSetup/resource.rc
similarity index 100%
rename from deps/LZMA-SDK/C/Util/SfxSetup/resource.rc
rename to deps/sdk/C/Util/SfxSetup/resource.rc
diff --git a/deps/LZMA-SDK/C/Util/SfxSetup/setup.ico b/deps/sdk/C/Util/SfxSetup/setup.ico
similarity index 100%
rename from deps/LZMA-SDK/C/Util/SfxSetup/setup.ico
rename to deps/sdk/C/Util/SfxSetup/setup.ico
diff --git a/deps/LZMA-SDK/C/Xz.c b/deps/sdk/C/Xz.c
similarity index 100%
rename from deps/LZMA-SDK/C/Xz.c
rename to deps/sdk/C/Xz.c
diff --git a/deps/LZMA-SDK/C/Xz.h b/deps/sdk/C/Xz.h
similarity index 100%
rename from deps/LZMA-SDK/C/Xz.h
rename to deps/sdk/C/Xz.h
diff --git a/deps/LZMA-SDK/C/XzCrc64.c b/deps/sdk/C/XzCrc64.c
similarity index 100%
rename from deps/LZMA-SDK/C/XzCrc64.c
rename to deps/sdk/C/XzCrc64.c
diff --git a/deps/LZMA-SDK/C/XzCrc64.h b/deps/sdk/C/XzCrc64.h
similarity index 100%
rename from deps/LZMA-SDK/C/XzCrc64.h
rename to deps/sdk/C/XzCrc64.h
diff --git a/deps/LZMA-SDK/C/XzCrc64Opt.c b/deps/sdk/C/XzCrc64Opt.c
similarity index 100%
rename from deps/LZMA-SDK/C/XzCrc64Opt.c
rename to deps/sdk/C/XzCrc64Opt.c
diff --git a/deps/LZMA-SDK/C/XzDec.c b/deps/sdk/C/XzDec.c
similarity index 100%
rename from deps/LZMA-SDK/C/XzDec.c
rename to deps/sdk/C/XzDec.c
diff --git a/deps/LZMA-SDK/C/XzEnc.c b/deps/sdk/C/XzEnc.c
similarity index 100%
rename from deps/LZMA-SDK/C/XzEnc.c
rename to deps/sdk/C/XzEnc.c
diff --git a/deps/LZMA-SDK/C/XzEnc.h b/deps/sdk/C/XzEnc.h
similarity index 100%
rename from deps/LZMA-SDK/C/XzEnc.h
rename to deps/sdk/C/XzEnc.h
diff --git a/deps/LZMA-SDK/C/XzIn.c b/deps/sdk/C/XzIn.c
similarity index 100%
rename from deps/LZMA-SDK/C/XzIn.c
rename to deps/sdk/C/XzIn.c
diff --git a/deps/LZMA-SDK/C/var_clang.mak b/deps/sdk/C/var_clang.mak
similarity index 100%
rename from deps/LZMA-SDK/C/var_clang.mak
rename to deps/sdk/C/var_clang.mak
diff --git a/deps/LZMA-SDK/C/var_clang_arm64.mak b/deps/sdk/C/var_clang_arm64.mak
similarity index 100%
rename from deps/LZMA-SDK/C/var_clang_arm64.mak
rename to deps/sdk/C/var_clang_arm64.mak
diff --git a/deps/LZMA-SDK/C/var_clang_x64.mak b/deps/sdk/C/var_clang_x64.mak
similarity index 100%
rename from deps/LZMA-SDK/C/var_clang_x64.mak
rename to deps/sdk/C/var_clang_x64.mak
diff --git a/deps/LZMA-SDK/C/var_clang_x86.mak b/deps/sdk/C/var_clang_x86.mak
similarity index 100%
rename from deps/LZMA-SDK/C/var_clang_x86.mak
rename to deps/sdk/C/var_clang_x86.mak
diff --git a/deps/LZMA-SDK/C/var_gcc.mak b/deps/sdk/C/var_gcc.mak
similarity index 100%
rename from deps/LZMA-SDK/C/var_gcc.mak
rename to deps/sdk/C/var_gcc.mak
diff --git a/deps/LZMA-SDK/C/var_gcc_arm64.mak b/deps/sdk/C/var_gcc_arm64.mak
similarity index 100%
rename from deps/LZMA-SDK/C/var_gcc_arm64.mak
rename to deps/sdk/C/var_gcc_arm64.mak
diff --git a/deps/LZMA-SDK/C/var_gcc_x64.mak b/deps/sdk/C/var_gcc_x64.mak
similarity index 100%
rename from deps/LZMA-SDK/C/var_gcc_x64.mak
rename to deps/sdk/C/var_gcc_x64.mak
diff --git a/deps/LZMA-SDK/C/var_gcc_x86.mak b/deps/sdk/C/var_gcc_x86.mak
similarity index 100%
rename from deps/LZMA-SDK/C/var_gcc_x86.mak
rename to deps/sdk/C/var_gcc_x86.mak
diff --git a/deps/LZMA-SDK/C/var_mac_arm64.mak b/deps/sdk/C/var_mac_arm64.mak
similarity index 100%
rename from deps/LZMA-SDK/C/var_mac_arm64.mak
rename to deps/sdk/C/var_mac_arm64.mak
diff --git a/deps/LZMA-SDK/C/var_mac_x64.mak b/deps/sdk/C/var_mac_x64.mak
similarity index 100%
rename from deps/LZMA-SDK/C/var_mac_x64.mak
rename to deps/sdk/C/var_mac_x64.mak
diff --git a/deps/LZMA-SDK/C/warn_clang.mak b/deps/sdk/C/warn_clang.mak
similarity index 100%
rename from deps/LZMA-SDK/C/warn_clang.mak
rename to deps/sdk/C/warn_clang.mak
diff --git a/deps/LZMA-SDK/C/warn_clang_mac.mak b/deps/sdk/C/warn_clang_mac.mak
similarity index 100%
rename from deps/LZMA-SDK/C/warn_clang_mac.mak
rename to deps/sdk/C/warn_clang_mac.mak
diff --git a/deps/LZMA-SDK/C/warn_gcc.mak b/deps/sdk/C/warn_gcc.mak
similarity index 100%
rename from deps/LZMA-SDK/C/warn_gcc.mak
rename to deps/sdk/C/warn_gcc.mak
diff --git a/deps/LZMA-SDK/DOC/7zC.txt b/deps/sdk/DOC/7zC.txt
similarity index 100%
rename from deps/LZMA-SDK/DOC/7zC.txt
rename to deps/sdk/DOC/7zC.txt
diff --git a/deps/LZMA-SDK/DOC/7zFormat.txt b/deps/sdk/DOC/7zFormat.txt
similarity index 100%
rename from deps/LZMA-SDK/DOC/7zFormat.txt
rename to deps/sdk/DOC/7zFormat.txt
diff --git a/deps/LZMA-SDK/DOC/Methods.txt b/deps/sdk/DOC/Methods.txt
similarity index 100%
rename from deps/LZMA-SDK/DOC/Methods.txt
rename to deps/sdk/DOC/Methods.txt
diff --git a/deps/LZMA-SDK/DOC/installer.txt b/deps/sdk/DOC/installer.txt
similarity index 100%
rename from deps/LZMA-SDK/DOC/installer.txt
rename to deps/sdk/DOC/installer.txt
diff --git a/deps/LZMA-SDK/DOC/lzma-history.txt b/deps/sdk/DOC/lzma-history.txt
similarity index 100%
rename from deps/LZMA-SDK/DOC/lzma-history.txt
rename to deps/sdk/DOC/lzma-history.txt
diff --git a/deps/LZMA-SDK/DOC/lzma-sdk.txt b/deps/sdk/DOC/lzma-sdk.txt
similarity index 100%
rename from deps/LZMA-SDK/DOC/lzma-sdk.txt
rename to deps/sdk/DOC/lzma-sdk.txt
diff --git a/deps/LZMA-SDK/DOC/lzma-specification.txt b/deps/sdk/DOC/lzma-specification.txt
similarity index 100%
rename from deps/LZMA-SDK/DOC/lzma-specification.txt
rename to deps/sdk/DOC/lzma-specification.txt
diff --git a/deps/LZMA-SDK/DOC/lzma.txt b/deps/sdk/DOC/lzma.txt
similarity index 100%
rename from deps/LZMA-SDK/DOC/lzma.txt
rename to deps/sdk/DOC/lzma.txt
diff --git a/deps/xxHash/.gitattributes b/deps/xhash/.gitattributes
similarity index 100%
rename from deps/xxHash/.gitattributes
rename to deps/xhash/.gitattributes
diff --git a/deps/xxHash/.gitignore b/deps/xhash/.gitignore
similarity index 100%
rename from deps/xxHash/.gitignore
rename to deps/xhash/.gitignore
diff --git a/deps/xxHash/.travis.yml b/deps/xhash/.travis.yml
similarity index 100%
rename from deps/xxHash/.travis.yml
rename to deps/xhash/.travis.yml
diff --git a/deps/xxHash/CHANGELOG b/deps/xhash/CHANGELOG
similarity index 100%
rename from deps/xxHash/CHANGELOG
rename to deps/xhash/CHANGELOG
diff --git a/deps/xxHash/LICENSE b/deps/xhash/LICENSE
similarity index 100%
rename from deps/xxHash/LICENSE
rename to deps/xhash/LICENSE
diff --git a/deps/xxHash/Makefile b/deps/xhash/Makefile
similarity index 100%
rename from deps/xxHash/Makefile
rename to deps/xhash/Makefile
diff --git a/deps/xxHash/README.md b/deps/xhash/README.md
similarity index 100%
rename from deps/xxHash/README.md
rename to deps/xhash/README.md
diff --git a/deps/xxHash/appveyor.yml b/deps/xhash/appveyor.yml
similarity index 100%
rename from deps/xxHash/appveyor.yml
rename to deps/xhash/appveyor.yml
diff --git a/deps/xxHash/cmake_unofficial/.gitignore b/deps/xhash/cmake_unofficial/.gitignore
similarity index 100%
rename from deps/xxHash/cmake_unofficial/.gitignore
rename to deps/xhash/cmake_unofficial/.gitignore
diff --git a/deps/xxHash/cmake_unofficial/CMakeLists.txt b/deps/xhash/cmake_unofficial/CMakeLists.txt
similarity index 100%
rename from deps/xxHash/cmake_unofficial/CMakeLists.txt
rename to deps/xhash/cmake_unofficial/CMakeLists.txt
diff --git a/deps/xxHash/cmake_unofficial/README.md b/deps/xhash/cmake_unofficial/README.md
similarity index 100%
rename from deps/xxHash/cmake_unofficial/README.md
rename to deps/xhash/cmake_unofficial/README.md
diff --git a/deps/xxHash/cmake_unofficial/xxHashConfig.cmake.in b/deps/xhash/cmake_unofficial/xxHashConfig.cmake.in
similarity index 100%
rename from deps/xxHash/cmake_unofficial/xxHashConfig.cmake.in
rename to deps/xhash/cmake_unofficial/xxHashConfig.cmake.in
diff --git a/deps/xxHash/doc/README.md b/deps/xhash/doc/README.md
similarity index 100%
rename from deps/xxHash/doc/README.md
rename to deps/xhash/doc/README.md
diff --git a/deps/xxHash/doc/xxhash.cry b/deps/xhash/doc/xxhash.cry
similarity index 100%
rename from deps/xxHash/doc/xxhash.cry
rename to deps/xhash/doc/xxhash.cry
diff --git a/deps/xxHash/doc/xxhash_spec.md b/deps/xhash/doc/xxhash_spec.md
similarity index 100%
rename from deps/xxHash/doc/xxhash_spec.md
rename to deps/xhash/doc/xxhash_spec.md
diff --git a/deps/xxHash/libxxhash.pc.in b/deps/xhash/libxxhash.pc.in
similarity index 100%
rename from deps/xxHash/libxxhash.pc.in
rename to deps/xhash/libxxhash.pc.in
diff --git a/deps/xxHash/tests/Makefile b/deps/xhash/tests/Makefile
similarity index 100%
rename from deps/xxHash/tests/Makefile
rename to deps/xhash/tests/Makefile
diff --git a/deps/xxHash/tests/bench/.gitignore b/deps/xhash/tests/bench/.gitignore
similarity index 100%
rename from deps/xxHash/tests/bench/.gitignore
rename to deps/xhash/tests/bench/.gitignore
diff --git a/deps/xxHash/tests/bench/LICENSE b/deps/xhash/tests/bench/LICENSE
similarity index 100%
rename from deps/xxHash/tests/bench/LICENSE
rename to deps/xhash/tests/bench/LICENSE
diff --git a/deps/xxHash/tests/bench/Makefile b/deps/xhash/tests/bench/Makefile
similarity index 100%
rename from deps/xxHash/tests/bench/Makefile
rename to deps/xhash/tests/bench/Makefile
diff --git a/deps/xxHash/tests/bench/benchHash.c b/deps/xhash/tests/bench/benchHash.c
similarity index 100%
rename from deps/xxHash/tests/bench/benchHash.c
rename to deps/xhash/tests/bench/benchHash.c
diff --git a/deps/xxHash/tests/bench/benchHash.h b/deps/xhash/tests/bench/benchHash.h
similarity index 100%
rename from deps/xxHash/tests/bench/benchHash.h
rename to deps/xhash/tests/bench/benchHash.h
diff --git a/deps/xxHash/tests/bench/benchfn.c b/deps/xhash/tests/bench/benchfn.c
similarity index 100%
rename from deps/xxHash/tests/bench/benchfn.c
rename to deps/xhash/tests/bench/benchfn.c
diff --git a/deps/xxHash/tests/bench/benchfn.h b/deps/xhash/tests/bench/benchfn.h
similarity index 100%
rename from deps/xxHash/tests/bench/benchfn.h
rename to deps/xhash/tests/bench/benchfn.h
diff --git a/deps/xxHash/tests/bench/bhDisplay.c b/deps/xhash/tests/bench/bhDisplay.c
similarity index 100%
rename from deps/xxHash/tests/bench/bhDisplay.c
rename to deps/xhash/tests/bench/bhDisplay.c
diff --git a/deps/xxHash/tests/bench/bhDisplay.h b/deps/xhash/tests/bench/bhDisplay.h
similarity index 100%
rename from deps/xxHash/tests/bench/bhDisplay.h
rename to deps/xhash/tests/bench/bhDisplay.h
diff --git a/deps/xxHash/tests/bench/hashes.h b/deps/xhash/tests/bench/hashes.h
similarity index 100%
rename from deps/xxHash/tests/bench/hashes.h
rename to deps/xhash/tests/bench/hashes.h
diff --git a/deps/xxHash/tests/bench/main.c b/deps/xhash/tests/bench/main.c
similarity index 100%
rename from deps/xxHash/tests/bench/main.c
rename to deps/xhash/tests/bench/main.c
diff --git a/deps/xxHash/tests/bench/timefn.c b/deps/xhash/tests/bench/timefn.c
similarity index 100%
rename from deps/xxHash/tests/bench/timefn.c
rename to deps/xhash/tests/bench/timefn.c
diff --git a/deps/xxHash/tests/bench/timefn.h b/deps/xhash/tests/bench/timefn.h
similarity index 100%
rename from deps/xxHash/tests/bench/timefn.h
rename to deps/xhash/tests/bench/timefn.h
diff --git a/deps/xxHash/tests/collisions/.gitignore b/deps/xhash/tests/collisions/.gitignore
similarity index 100%
rename from deps/xxHash/tests/collisions/.gitignore
rename to deps/xhash/tests/collisions/.gitignore
diff --git a/deps/xxHash/tests/collisions/LICENSE b/deps/xhash/tests/collisions/LICENSE
similarity index 100%
rename from deps/xxHash/tests/collisions/LICENSE
rename to deps/xhash/tests/collisions/LICENSE
diff --git a/deps/xxHash/tests/collisions/Makefile b/deps/xhash/tests/collisions/Makefile
similarity index 100%
rename from deps/xxHash/tests/collisions/Makefile
rename to deps/xhash/tests/collisions/Makefile
diff --git a/deps/xxHash/tests/collisions/README.md b/deps/xhash/tests/collisions/README.md
similarity index 100%
rename from deps/xxHash/tests/collisions/README.md
rename to deps/xhash/tests/collisions/README.md
diff --git a/deps/xxHash/tests/collisions/allcodecs/README.md b/deps/xhash/tests/collisions/allcodecs/README.md
similarity index 100%
rename from deps/xxHash/tests/collisions/allcodecs/README.md
rename to deps/xhash/tests/collisions/allcodecs/README.md
diff --git a/deps/xxHash/tests/collisions/allcodecs/dummy.c b/deps/xhash/tests/collisions/allcodecs/dummy.c
similarity index 100%
rename from deps/xxHash/tests/collisions/allcodecs/dummy.c
rename to deps/xhash/tests/collisions/allcodecs/dummy.c
diff --git a/deps/xxHash/tests/collisions/allcodecs/dummy.h b/deps/xhash/tests/collisions/allcodecs/dummy.h
similarity index 100%
rename from deps/xxHash/tests/collisions/allcodecs/dummy.h
rename to deps/xhash/tests/collisions/allcodecs/dummy.h
diff --git a/deps/xxHash/tests/collisions/hashes.h b/deps/xhash/tests/collisions/hashes.h
similarity index 100%
rename from deps/xxHash/tests/collisions/hashes.h
rename to deps/xhash/tests/collisions/hashes.h
diff --git a/deps/xxHash/tests/collisions/main.c b/deps/xhash/tests/collisions/main.c
similarity index 100%
rename from deps/xxHash/tests/collisions/main.c
rename to deps/xhash/tests/collisions/main.c
diff --git a/deps/xxHash/tests/collisions/pool.c b/deps/xhash/tests/collisions/pool.c
similarity index 100%
rename from deps/xxHash/tests/collisions/pool.c
rename to deps/xhash/tests/collisions/pool.c
diff --git a/deps/xxHash/tests/collisions/pool.h b/deps/xhash/tests/collisions/pool.h
similarity index 100%
rename from deps/xxHash/tests/collisions/pool.h
rename to deps/xhash/tests/collisions/pool.h
diff --git a/deps/xxHash/tests/collisions/sort.cc b/deps/xhash/tests/collisions/sort.cc
similarity index 100%
rename from deps/xxHash/tests/collisions/sort.cc
rename to deps/xhash/tests/collisions/sort.cc
diff --git a/deps/xxHash/tests/collisions/sort.hh b/deps/xhash/tests/collisions/sort.hh
similarity index 100%
rename from deps/xxHash/tests/collisions/sort.hh
rename to deps/xhash/tests/collisions/sort.hh
diff --git a/deps/xxHash/tests/collisions/threading.c b/deps/xhash/tests/collisions/threading.c
similarity index 100%
rename from deps/xxHash/tests/collisions/threading.c
rename to deps/xhash/tests/collisions/threading.c
diff --git a/deps/xxHash/tests/collisions/threading.h b/deps/xhash/tests/collisions/threading.h
similarity index 100%
rename from deps/xxHash/tests/collisions/threading.h
rename to deps/xhash/tests/collisions/threading.h
diff --git a/deps/xxHash/tests/generate_unicode_test.c b/deps/xhash/tests/generate_unicode_test.c
similarity index 100%
rename from deps/xxHash/tests/generate_unicode_test.c
rename to deps/xhash/tests/generate_unicode_test.c
diff --git a/deps/xxHash/tests/multiInclude.c b/deps/xhash/tests/multiInclude.c
similarity index 100%
rename from deps/xxHash/tests/multiInclude.c
rename to deps/xhash/tests/multiInclude.c
diff --git a/deps/xxHash/tests/ppc_define.c b/deps/xhash/tests/ppc_define.c
similarity index 100%
rename from deps/xxHash/tests/ppc_define.c
rename to deps/xhash/tests/ppc_define.c
diff --git a/deps/xxHash/xxh3.h b/deps/xhash/xxh3.h
similarity index 100%
rename from deps/xxHash/xxh3.h
rename to deps/xhash/xxh3.h
diff --git a/deps/xxHash/xxh_x86dispatch.c b/deps/xhash/xxh_x86dispatch.c
similarity index 100%
rename from deps/xxHash/xxh_x86dispatch.c
rename to deps/xhash/xxh_x86dispatch.c
diff --git a/deps/xxHash/xxh_x86dispatch.h b/deps/xhash/xxh_x86dispatch.h
similarity index 100%
rename from deps/xxHash/xxh_x86dispatch.h
rename to deps/xhash/xxh_x86dispatch.h
diff --git a/deps/xxHash/xxhash.c b/deps/xhash/xxhash.c
similarity index 100%
rename from deps/xxHash/xxhash.c
rename to deps/xhash/xxhash.c
diff --git a/deps/xxHash/xxhash.h b/deps/xhash/xxhash.h
similarity index 100%
rename from deps/xxHash/xxhash.h
rename to deps/xhash/xxhash.h
diff --git a/deps/xxHash/xxhsum.1 b/deps/xhash/xxhsum.1
similarity index 100%
rename from deps/xxHash/xxhsum.1
rename to deps/xhash/xxhsum.1
diff --git a/deps/xxHash/xxhsum.1.md b/deps/xhash/xxhsum.1.md
similarity index 100%
rename from deps/xxHash/xxhsum.1.md
rename to deps/xhash/xxhsum.1.md
diff --git a/deps/xxHash/xxhsum.c b/deps/xhash/xxhsum.c
similarity index 100%
rename from deps/xxHash/xxhsum.c
rename to deps/xhash/xxhsum.c
diff --git a/tools/2hashcat_tests/metamask2hashcat-test.py b/tools/2tests/metamask2hashcat-test.py
similarity index 100%
rename from tools/2hashcat_tests/metamask2hashcat-test.py
rename to tools/2tests/metamask2hashcat-test.py
diff --git a/tools/2hashcat_tests/metamask2hashcat.android.json b/tools/2tests/metamask2hashcat.android.json
similarity index 100%
rename from tools/2hashcat_tests/metamask2hashcat.android.json
rename to tools/2tests/metamask2hashcat.android.json
diff --git a/tools/2hashcat_tests/metamask2hashcat.ios.json b/tools/2tests/metamask2hashcat.ios.json
similarity index 100%
rename from tools/2hashcat_tests/metamask2hashcat.ios.json
rename to tools/2tests/metamask2hashcat.ios.json
diff --git a/tools/2hashcat_tests/metamask2hashcat.json b/tools/2tests/metamask2hashcat.json
similarity index 100%
rename from tools/2hashcat_tests/metamask2hashcat.json
rename to tools/2tests/metamask2hashcat.json
diff --git a/tunings/README.md b/tunings/README.md
deleted file mode 100644
index d56b9064..00000000
--- a/tunings/README.md
+++ /dev/null
@@ -1,49 +0,0 @@
-The files in this folder are used to override autotune settings
-
-You can override configuration settings for Vector-Width, Kernel-Accel and/or Kernel-Loops values
-You can filter by Device-Name, Device-Name alias, Attack-Mode and/or Hash-Type
-
-Each file in this folder with the filename suffix .hctune will be automatically loaded by hashcat on startup with random order
-
-- A valid line consists of the following fields (in that order):
-  - Device-Name
-  - Attack-Mode
-  - Hash-Type
-  - Vector-Width
-  - Kernel-Accel
-  - Kernel-Loops
-- The first three columns define the filter, the other three is what is assigned when that filter matches
-- If no filter matches, autotune is used
-- Columns are separated with one or many spaces or tabs
-- A line can not start with a space or a tab
-- Comment lines are allowed, use a # as first character
-- Invalid lines are ignored
-- The Device-Name is the OpenCL Device-Name. It's shown on hashcat startup.
-  - If the device contains spaces, replace all spaces with _ character.
-  - Device Names prefixed with 'NVIDIA' will be matched with or without 'NVIDIA' present in the alias. e.g. 'NVIDIA_Tesla_T4' vs 'Tesla_T4'
-- The Device-Name can be assigned an alias. This is useful if many devices share the same chip
-  - If you assign an alias, make sure to not use the devices name directly
-- There's also a hard-wired Device-Name which matches all device types called:
-  - DEVICE_TYPE_CPU
-  - DEVICE_TYPE_GPU
-  - DEVICE_TYPE_ACCELERATOR
-- The use of wildcards is allowed, some rules:
-  - Wildcards can only replace an entire Device-Name, not parts just of it. eg: not Geforce_*
-  - The policy is local > global, means the closer you configure something, the more likely it is selected
-  - The policy testing order is from left to right
-- Attack modes can be:
-  - 0 = Dictionary-Attack
-  - 1 = Combinator-Attack, will also be used for attack-mode 6 and 7 since they share the same kernel
-  - 3 = Mask-Attack
-- The Kernel-Accel is a multiplier to OpenCL's concept of a workitem, not the workitem count
-- The Kernel-Loops has a functionality depending on the hash-type:
-  - Slow Hash: Number of iterations calculated per workitem
-  - Fast Hash: Number of mutations calculated per workitem
-- None of both should be confused with the OpenCL concept of a "thread", this one is maintained automatically
-- The Vector-Width can have only the values 1, 2, 4, 8 or 'N', where 'N' stands for native, which is an OpenCl-queried data value
-- The Kernel-Accel is limited to 1024
-- The Kernel-Loops is limited to 1024
-- The Kernel-Accel can have 'A', where 'A' stands for autotune
-- The Kernel-Accel can have 'M', where 'M' stands for maximum possible
-- The Kernel-Loops can have 'A', where 'A' stands for autotune
-- The Kernel-Loops can have 'M', where 'M' stands for maximum possible
diff --git a/tunings/Device_GeForce_GTX_TITAN.hctune b/tunings/titan.hctune
similarity index 100%
rename from tunings/Device_GeForce_GTX_TITAN.hctune
rename to tunings/titan.hctune