diff --git a/src/blosc2/internal-complibs/zstd-1.5.2/.gitignore b/src/blosc2/internal-complibs/zstd/.gitignore similarity index 100% rename from src/blosc2/internal-complibs/zstd-1.5.2/.gitignore rename to src/blosc2/internal-complibs/zstd/.gitignore diff --git a/src/blosc2/internal-complibs/zstd-1.5.2/BUCK b/src/blosc2/internal-complibs/zstd/BUCK similarity index 100% rename from src/blosc2/internal-complibs/zstd-1.5.2/BUCK rename to src/blosc2/internal-complibs/zstd/BUCK diff --git a/src/blosc2/internal-complibs/zstd-1.5.2/Makefile b/src/blosc2/internal-complibs/zstd/Makefile similarity index 100% rename from src/blosc2/internal-complibs/zstd-1.5.2/Makefile rename to src/blosc2/internal-complibs/zstd/Makefile diff --git a/src/blosc2/internal-complibs/zstd-1.5.2/README.md b/src/blosc2/internal-complibs/zstd/README.md similarity index 100% rename from src/blosc2/internal-complibs/zstd-1.5.2/README.md rename to src/blosc2/internal-complibs/zstd/README.md diff --git a/src/blosc2/internal-complibs/zstd-1.5.2/common/bitstream.h b/src/blosc2/internal-complibs/zstd/common/bitstream.h similarity index 100% rename from src/blosc2/internal-complibs/zstd-1.5.2/common/bitstream.h rename to src/blosc2/internal-complibs/zstd/common/bitstream.h diff --git a/src/blosc2/internal-complibs/zstd-1.5.2/common/compiler.h b/src/blosc2/internal-complibs/zstd/common/compiler.h similarity index 100% rename from src/blosc2/internal-complibs/zstd-1.5.2/common/compiler.h rename to src/blosc2/internal-complibs/zstd/common/compiler.h diff --git a/src/blosc2/internal-complibs/zstd-1.5.2/common/cpu.h b/src/blosc2/internal-complibs/zstd/common/cpu.h similarity index 100% rename from src/blosc2/internal-complibs/zstd-1.5.2/common/cpu.h rename to src/blosc2/internal-complibs/zstd/common/cpu.h diff --git a/src/blosc2/internal-complibs/zstd-1.5.2/common/debug.c b/src/blosc2/internal-complibs/zstd/common/debug.c similarity index 100% rename from src/blosc2/internal-complibs/zstd-1.5.2/common/debug.c rename to src/blosc2/internal-complibs/zstd/common/debug.c diff --git a/src/blosc2/internal-complibs/zstd-1.5.2/common/debug.h b/src/blosc2/internal-complibs/zstd/common/debug.h similarity index 100% rename from src/blosc2/internal-complibs/zstd-1.5.2/common/debug.h rename to src/blosc2/internal-complibs/zstd/common/debug.h diff --git a/src/blosc2/internal-complibs/zstd-1.5.2/common/entropy_common.c b/src/blosc2/internal-complibs/zstd/common/entropy_common.c similarity index 100% rename from src/blosc2/internal-complibs/zstd-1.5.2/common/entropy_common.c rename to src/blosc2/internal-complibs/zstd/common/entropy_common.c diff --git a/src/blosc2/internal-complibs/zstd-1.5.2/common/error_private.c b/src/blosc2/internal-complibs/zstd/common/error_private.c similarity index 100% rename from src/blosc2/internal-complibs/zstd-1.5.2/common/error_private.c rename to src/blosc2/internal-complibs/zstd/common/error_private.c diff --git a/src/blosc2/internal-complibs/zstd-1.5.2/common/error_private.h b/src/blosc2/internal-complibs/zstd/common/error_private.h similarity index 100% rename from src/blosc2/internal-complibs/zstd-1.5.2/common/error_private.h rename to src/blosc2/internal-complibs/zstd/common/error_private.h diff --git a/src/blosc2/internal-complibs/zstd-1.5.2/common/fse.h b/src/blosc2/internal-complibs/zstd/common/fse.h similarity index 100% rename from src/blosc2/internal-complibs/zstd-1.5.2/common/fse.h rename to src/blosc2/internal-complibs/zstd/common/fse.h diff --git a/src/blosc2/internal-complibs/zstd-1.5.2/common/fse_decompress.c b/src/blosc2/internal-complibs/zstd/common/fse_decompress.c similarity index 100% rename from src/blosc2/internal-complibs/zstd-1.5.2/common/fse_decompress.c rename to src/blosc2/internal-complibs/zstd/common/fse_decompress.c diff --git a/src/blosc2/internal-complibs/zstd-1.5.2/common/huf.h b/src/blosc2/internal-complibs/zstd/common/huf.h similarity index 100% rename from src/blosc2/internal-complibs/zstd-1.5.2/common/huf.h rename to src/blosc2/internal-complibs/zstd/common/huf.h diff --git a/src/blosc2/internal-complibs/zstd-1.5.2/common/mem.h b/src/blosc2/internal-complibs/zstd/common/mem.h similarity index 100% rename from src/blosc2/internal-complibs/zstd-1.5.2/common/mem.h rename to src/blosc2/internal-complibs/zstd/common/mem.h diff --git a/src/blosc2/internal-complibs/zstd-1.5.2/common/pool.c b/src/blosc2/internal-complibs/zstd/common/pool.c similarity index 100% rename from src/blosc2/internal-complibs/zstd-1.5.2/common/pool.c rename to src/blosc2/internal-complibs/zstd/common/pool.c diff --git a/src/blosc2/internal-complibs/zstd-1.5.2/common/pool.h b/src/blosc2/internal-complibs/zstd/common/pool.h similarity index 100% rename from src/blosc2/internal-complibs/zstd-1.5.2/common/pool.h rename to src/blosc2/internal-complibs/zstd/common/pool.h diff --git a/src/blosc2/internal-complibs/zstd-1.5.2/common/portability_macros.h b/src/blosc2/internal-complibs/zstd/common/portability_macros.h similarity index 100% rename from src/blosc2/internal-complibs/zstd-1.5.2/common/portability_macros.h rename to src/blosc2/internal-complibs/zstd/common/portability_macros.h diff --git a/src/blosc2/internal-complibs/zstd-1.5.2/common/threading.c b/src/blosc2/internal-complibs/zstd/common/threading.c similarity index 100% rename from src/blosc2/internal-complibs/zstd-1.5.2/common/threading.c rename to src/blosc2/internal-complibs/zstd/common/threading.c diff --git a/src/blosc2/internal-complibs/zstd-1.5.2/common/threading.h b/src/blosc2/internal-complibs/zstd/common/threading.h similarity index 100% rename from src/blosc2/internal-complibs/zstd-1.5.2/common/threading.h rename to src/blosc2/internal-complibs/zstd/common/threading.h diff --git a/src/blosc2/internal-complibs/zstd-1.5.2/common/xxhash.c b/src/blosc2/internal-complibs/zstd/common/xxhash.c similarity index 100% rename from src/blosc2/internal-complibs/zstd-1.5.2/common/xxhash.c rename to src/blosc2/internal-complibs/zstd/common/xxhash.c diff --git a/src/blosc2/internal-complibs/zstd-1.5.2/common/xxhash.h b/src/blosc2/internal-complibs/zstd/common/xxhash.h similarity index 100% rename from src/blosc2/internal-complibs/zstd-1.5.2/common/xxhash.h rename to src/blosc2/internal-complibs/zstd/common/xxhash.h diff --git a/src/blosc2/internal-complibs/zstd-1.5.2/common/zstd_common.c b/src/blosc2/internal-complibs/zstd/common/zstd_common.c similarity index 100% rename from src/blosc2/internal-complibs/zstd-1.5.2/common/zstd_common.c rename to src/blosc2/internal-complibs/zstd/common/zstd_common.c diff --git a/src/blosc2/internal-complibs/zstd-1.5.2/common/zstd_deps.h b/src/blosc2/internal-complibs/zstd/common/zstd_deps.h similarity index 100% rename from src/blosc2/internal-complibs/zstd-1.5.2/common/zstd_deps.h rename to src/blosc2/internal-complibs/zstd/common/zstd_deps.h diff --git a/src/blosc2/internal-complibs/zstd-1.5.2/common/zstd_internal.h b/src/blosc2/internal-complibs/zstd/common/zstd_internal.h similarity index 100% rename from src/blosc2/internal-complibs/zstd-1.5.2/common/zstd_internal.h rename to src/blosc2/internal-complibs/zstd/common/zstd_internal.h diff --git a/src/blosc2/internal-complibs/zstd-1.5.2/common/zstd_trace.h b/src/blosc2/internal-complibs/zstd/common/zstd_trace.h similarity index 100% rename from src/blosc2/internal-complibs/zstd-1.5.2/common/zstd_trace.h rename to src/blosc2/internal-complibs/zstd/common/zstd_trace.h diff --git a/src/blosc2/internal-complibs/zstd-1.5.2/compress/clevels.h b/src/blosc2/internal-complibs/zstd/compress/clevels.h similarity index 100% rename from src/blosc2/internal-complibs/zstd-1.5.2/compress/clevels.h rename to src/blosc2/internal-complibs/zstd/compress/clevels.h diff --git a/src/blosc2/internal-complibs/zstd-1.5.2/compress/fse_compress.c b/src/blosc2/internal-complibs/zstd/compress/fse_compress.c similarity index 100% rename from src/blosc2/internal-complibs/zstd-1.5.2/compress/fse_compress.c rename to src/blosc2/internal-complibs/zstd/compress/fse_compress.c diff --git a/src/blosc2/internal-complibs/zstd-1.5.2/compress/hist.c b/src/blosc2/internal-complibs/zstd/compress/hist.c similarity index 100% rename from src/blosc2/internal-complibs/zstd-1.5.2/compress/hist.c rename to src/blosc2/internal-complibs/zstd/compress/hist.c diff --git a/src/blosc2/internal-complibs/zstd-1.5.2/compress/hist.h b/src/blosc2/internal-complibs/zstd/compress/hist.h similarity index 100% rename from src/blosc2/internal-complibs/zstd-1.5.2/compress/hist.h rename to src/blosc2/internal-complibs/zstd/compress/hist.h diff --git a/src/blosc2/internal-complibs/zstd-1.5.2/compress/huf_compress.c b/src/blosc2/internal-complibs/zstd/compress/huf_compress.c similarity index 100% rename from src/blosc2/internal-complibs/zstd-1.5.2/compress/huf_compress.c rename to src/blosc2/internal-complibs/zstd/compress/huf_compress.c diff --git a/src/blosc2/internal-complibs/zstd-1.5.2/compress/zstd_compress.c b/src/blosc2/internal-complibs/zstd/compress/zstd_compress.c similarity index 100% rename from src/blosc2/internal-complibs/zstd-1.5.2/compress/zstd_compress.c rename to src/blosc2/internal-complibs/zstd/compress/zstd_compress.c diff --git a/src/blosc2/internal-complibs/zstd-1.5.2/compress/zstd_compress_internal.h b/src/blosc2/internal-complibs/zstd/compress/zstd_compress_internal.h similarity index 100% rename from src/blosc2/internal-complibs/zstd-1.5.2/compress/zstd_compress_internal.h rename to src/blosc2/internal-complibs/zstd/compress/zstd_compress_internal.h diff --git a/src/blosc2/internal-complibs/zstd-1.5.2/compress/zstd_compress_literals.c b/src/blosc2/internal-complibs/zstd/compress/zstd_compress_literals.c similarity index 100% rename from src/blosc2/internal-complibs/zstd-1.5.2/compress/zstd_compress_literals.c rename to src/blosc2/internal-complibs/zstd/compress/zstd_compress_literals.c diff --git a/src/blosc2/internal-complibs/zstd-1.5.2/compress/zstd_compress_literals.h b/src/blosc2/internal-complibs/zstd/compress/zstd_compress_literals.h similarity index 100% rename from src/blosc2/internal-complibs/zstd-1.5.2/compress/zstd_compress_literals.h rename to src/blosc2/internal-complibs/zstd/compress/zstd_compress_literals.h diff --git a/src/blosc2/internal-complibs/zstd-1.5.2/compress/zstd_compress_sequences.c b/src/blosc2/internal-complibs/zstd/compress/zstd_compress_sequences.c similarity index 100% rename from src/blosc2/internal-complibs/zstd-1.5.2/compress/zstd_compress_sequences.c rename to src/blosc2/internal-complibs/zstd/compress/zstd_compress_sequences.c diff --git a/src/blosc2/internal-complibs/zstd-1.5.2/compress/zstd_compress_sequences.h b/src/blosc2/internal-complibs/zstd/compress/zstd_compress_sequences.h similarity index 100% rename from src/blosc2/internal-complibs/zstd-1.5.2/compress/zstd_compress_sequences.h rename to src/blosc2/internal-complibs/zstd/compress/zstd_compress_sequences.h diff --git a/src/blosc2/internal-complibs/zstd-1.5.2/compress/zstd_compress_superblock.c b/src/blosc2/internal-complibs/zstd/compress/zstd_compress_superblock.c similarity index 100% rename from src/blosc2/internal-complibs/zstd-1.5.2/compress/zstd_compress_superblock.c rename to src/blosc2/internal-complibs/zstd/compress/zstd_compress_superblock.c diff --git a/src/blosc2/internal-complibs/zstd-1.5.2/compress/zstd_compress_superblock.h b/src/blosc2/internal-complibs/zstd/compress/zstd_compress_superblock.h similarity index 100% rename from src/blosc2/internal-complibs/zstd-1.5.2/compress/zstd_compress_superblock.h rename to src/blosc2/internal-complibs/zstd/compress/zstd_compress_superblock.h diff --git a/src/blosc2/internal-complibs/zstd-1.5.2/compress/zstd_cwksp.h b/src/blosc2/internal-complibs/zstd/compress/zstd_cwksp.h similarity index 100% rename from src/blosc2/internal-complibs/zstd-1.5.2/compress/zstd_cwksp.h rename to src/blosc2/internal-complibs/zstd/compress/zstd_cwksp.h diff --git a/src/blosc2/internal-complibs/zstd-1.5.2/compress/zstd_double_fast.c b/src/blosc2/internal-complibs/zstd/compress/zstd_double_fast.c similarity index 100% rename from src/blosc2/internal-complibs/zstd-1.5.2/compress/zstd_double_fast.c rename to src/blosc2/internal-complibs/zstd/compress/zstd_double_fast.c diff --git a/src/blosc2/internal-complibs/zstd-1.5.2/compress/zstd_double_fast.h b/src/blosc2/internal-complibs/zstd/compress/zstd_double_fast.h similarity index 100% rename from src/blosc2/internal-complibs/zstd-1.5.2/compress/zstd_double_fast.h rename to src/blosc2/internal-complibs/zstd/compress/zstd_double_fast.h diff --git a/src/blosc2/internal-complibs/zstd-1.5.2/compress/zstd_fast.c b/src/blosc2/internal-complibs/zstd/compress/zstd_fast.c similarity index 100% rename from src/blosc2/internal-complibs/zstd-1.5.2/compress/zstd_fast.c rename to src/blosc2/internal-complibs/zstd/compress/zstd_fast.c diff --git a/src/blosc2/internal-complibs/zstd-1.5.2/compress/zstd_fast.h b/src/blosc2/internal-complibs/zstd/compress/zstd_fast.h similarity index 100% rename from src/blosc2/internal-complibs/zstd-1.5.2/compress/zstd_fast.h rename to src/blosc2/internal-complibs/zstd/compress/zstd_fast.h diff --git a/src/blosc2/internal-complibs/zstd-1.5.2/compress/zstd_lazy.c b/src/blosc2/internal-complibs/zstd/compress/zstd_lazy.c similarity index 100% rename from src/blosc2/internal-complibs/zstd-1.5.2/compress/zstd_lazy.c rename to src/blosc2/internal-complibs/zstd/compress/zstd_lazy.c diff --git a/src/blosc2/internal-complibs/zstd-1.5.2/compress/zstd_lazy.h b/src/blosc2/internal-complibs/zstd/compress/zstd_lazy.h similarity index 100% rename from src/blosc2/internal-complibs/zstd-1.5.2/compress/zstd_lazy.h rename to src/blosc2/internal-complibs/zstd/compress/zstd_lazy.h diff --git a/src/blosc2/internal-complibs/zstd-1.5.2/compress/zstd_ldm.c b/src/blosc2/internal-complibs/zstd/compress/zstd_ldm.c similarity index 100% rename from src/blosc2/internal-complibs/zstd-1.5.2/compress/zstd_ldm.c rename to src/blosc2/internal-complibs/zstd/compress/zstd_ldm.c diff --git a/src/blosc2/internal-complibs/zstd-1.5.2/compress/zstd_ldm.h b/src/blosc2/internal-complibs/zstd/compress/zstd_ldm.h similarity index 100% rename from src/blosc2/internal-complibs/zstd-1.5.2/compress/zstd_ldm.h rename to src/blosc2/internal-complibs/zstd/compress/zstd_ldm.h diff --git a/src/blosc2/internal-complibs/zstd-1.5.2/compress/zstd_ldm_geartab.h b/src/blosc2/internal-complibs/zstd/compress/zstd_ldm_geartab.h similarity index 100% rename from src/blosc2/internal-complibs/zstd-1.5.2/compress/zstd_ldm_geartab.h rename to src/blosc2/internal-complibs/zstd/compress/zstd_ldm_geartab.h diff --git a/src/blosc2/internal-complibs/zstd-1.5.2/compress/zstd_opt.c b/src/blosc2/internal-complibs/zstd/compress/zstd_opt.c similarity index 100% rename from src/blosc2/internal-complibs/zstd-1.5.2/compress/zstd_opt.c rename to src/blosc2/internal-complibs/zstd/compress/zstd_opt.c diff --git a/src/blosc2/internal-complibs/zstd-1.5.2/compress/zstd_opt.h b/src/blosc2/internal-complibs/zstd/compress/zstd_opt.h similarity index 100% rename from src/blosc2/internal-complibs/zstd-1.5.2/compress/zstd_opt.h rename to src/blosc2/internal-complibs/zstd/compress/zstd_opt.h diff --git a/src/blosc2/internal-complibs/zstd-1.5.2/compress/zstdmt_compress.c b/src/blosc2/internal-complibs/zstd/compress/zstdmt_compress.c similarity index 100% rename from src/blosc2/internal-complibs/zstd-1.5.2/compress/zstdmt_compress.c rename to src/blosc2/internal-complibs/zstd/compress/zstdmt_compress.c diff --git a/src/blosc2/internal-complibs/zstd-1.5.2/compress/zstdmt_compress.h b/src/blosc2/internal-complibs/zstd/compress/zstdmt_compress.h similarity index 100% rename from src/blosc2/internal-complibs/zstd-1.5.2/compress/zstdmt_compress.h rename to src/blosc2/internal-complibs/zstd/compress/zstdmt_compress.h diff --git a/src/blosc2/internal-complibs/zstd-1.5.2/decompress/huf_decompress.c b/src/blosc2/internal-complibs/zstd/decompress/huf_decompress.c similarity index 100% rename from src/blosc2/internal-complibs/zstd-1.5.2/decompress/huf_decompress.c rename to src/blosc2/internal-complibs/zstd/decompress/huf_decompress.c diff --git a/src/blosc2/internal-complibs/zstd-1.5.2/decompress/huf_decompress_amd64.S b/src/blosc2/internal-complibs/zstd/decompress/huf_decompress_amd64.S similarity index 100% rename from src/blosc2/internal-complibs/zstd-1.5.2/decompress/huf_decompress_amd64.S rename to src/blosc2/internal-complibs/zstd/decompress/huf_decompress_amd64.S diff --git a/src/blosc2/internal-complibs/zstd-1.5.2/decompress/zstd_ddict.c b/src/blosc2/internal-complibs/zstd/decompress/zstd_ddict.c similarity index 100% rename from src/blosc2/internal-complibs/zstd-1.5.2/decompress/zstd_ddict.c rename to src/blosc2/internal-complibs/zstd/decompress/zstd_ddict.c diff --git a/src/blosc2/internal-complibs/zstd-1.5.2/decompress/zstd_ddict.h b/src/blosc2/internal-complibs/zstd/decompress/zstd_ddict.h similarity index 100% rename from src/blosc2/internal-complibs/zstd-1.5.2/decompress/zstd_ddict.h rename to src/blosc2/internal-complibs/zstd/decompress/zstd_ddict.h diff --git a/src/blosc2/internal-complibs/zstd-1.5.2/decompress/zstd_decompress.c b/src/blosc2/internal-complibs/zstd/decompress/zstd_decompress.c similarity index 100% rename from src/blosc2/internal-complibs/zstd-1.5.2/decompress/zstd_decompress.c rename to src/blosc2/internal-complibs/zstd/decompress/zstd_decompress.c diff --git a/src/blosc2/internal-complibs/zstd-1.5.2/decompress/zstd_decompress_block.c b/src/blosc2/internal-complibs/zstd/decompress/zstd_decompress_block.c similarity index 100% rename from src/blosc2/internal-complibs/zstd-1.5.2/decompress/zstd_decompress_block.c rename to src/blosc2/internal-complibs/zstd/decompress/zstd_decompress_block.c diff --git a/src/blosc2/internal-complibs/zstd-1.5.2/decompress/zstd_decompress_block.h b/src/blosc2/internal-complibs/zstd/decompress/zstd_decompress_block.h similarity index 100% rename from src/blosc2/internal-complibs/zstd-1.5.2/decompress/zstd_decompress_block.h rename to src/blosc2/internal-complibs/zstd/decompress/zstd_decompress_block.h diff --git a/src/blosc2/internal-complibs/zstd-1.5.2/decompress/zstd_decompress_internal.h b/src/blosc2/internal-complibs/zstd/decompress/zstd_decompress_internal.h similarity index 100% rename from src/blosc2/internal-complibs/zstd-1.5.2/decompress/zstd_decompress_internal.h rename to src/blosc2/internal-complibs/zstd/decompress/zstd_decompress_internal.h diff --git a/src/blosc2/internal-complibs/zstd-1.5.2/deprecated/zbuff.h b/src/blosc2/internal-complibs/zstd/deprecated/zbuff.h similarity index 100% rename from src/blosc2/internal-complibs/zstd-1.5.2/deprecated/zbuff.h rename to src/blosc2/internal-complibs/zstd/deprecated/zbuff.h diff --git a/src/blosc2/internal-complibs/zstd-1.5.2/deprecated/zbuff_common.c b/src/blosc2/internal-complibs/zstd/deprecated/zbuff_common.c similarity index 100% rename from src/blosc2/internal-complibs/zstd-1.5.2/deprecated/zbuff_common.c rename to src/blosc2/internal-complibs/zstd/deprecated/zbuff_common.c diff --git a/src/blosc2/internal-complibs/zstd-1.5.2/deprecated/zbuff_compress.c b/src/blosc2/internal-complibs/zstd/deprecated/zbuff_compress.c similarity index 100% rename from src/blosc2/internal-complibs/zstd-1.5.2/deprecated/zbuff_compress.c rename to src/blosc2/internal-complibs/zstd/deprecated/zbuff_compress.c diff --git a/src/blosc2/internal-complibs/zstd-1.5.2/deprecated/zbuff_decompress.c b/src/blosc2/internal-complibs/zstd/deprecated/zbuff_decompress.c similarity index 100% rename from src/blosc2/internal-complibs/zstd-1.5.2/deprecated/zbuff_decompress.c rename to src/blosc2/internal-complibs/zstd/deprecated/zbuff_decompress.c diff --git a/src/blosc2/internal-complibs/zstd-1.5.2/dictBuilder/cover.c b/src/blosc2/internal-complibs/zstd/dictBuilder/cover.c similarity index 100% rename from src/blosc2/internal-complibs/zstd-1.5.2/dictBuilder/cover.c rename to src/blosc2/internal-complibs/zstd/dictBuilder/cover.c diff --git a/src/blosc2/internal-complibs/zstd-1.5.2/dictBuilder/cover.h b/src/blosc2/internal-complibs/zstd/dictBuilder/cover.h similarity index 100% rename from src/blosc2/internal-complibs/zstd-1.5.2/dictBuilder/cover.h rename to src/blosc2/internal-complibs/zstd/dictBuilder/cover.h diff --git a/src/blosc2/internal-complibs/zstd-1.5.2/dictBuilder/divsufsort.c b/src/blosc2/internal-complibs/zstd/dictBuilder/divsufsort.c similarity index 100% rename from src/blosc2/internal-complibs/zstd-1.5.2/dictBuilder/divsufsort.c rename to src/blosc2/internal-complibs/zstd/dictBuilder/divsufsort.c diff --git a/src/blosc2/internal-complibs/zstd-1.5.2/dictBuilder/divsufsort.h b/src/blosc2/internal-complibs/zstd/dictBuilder/divsufsort.h similarity index 100% rename from src/blosc2/internal-complibs/zstd-1.5.2/dictBuilder/divsufsort.h rename to src/blosc2/internal-complibs/zstd/dictBuilder/divsufsort.h diff --git a/src/blosc2/internal-complibs/zstd-1.5.2/dictBuilder/fastcover.c b/src/blosc2/internal-complibs/zstd/dictBuilder/fastcover.c similarity index 100% rename from src/blosc2/internal-complibs/zstd-1.5.2/dictBuilder/fastcover.c rename to src/blosc2/internal-complibs/zstd/dictBuilder/fastcover.c diff --git a/src/blosc2/internal-complibs/zstd-1.5.2/dictBuilder/zdict.c b/src/blosc2/internal-complibs/zstd/dictBuilder/zdict.c similarity index 100% rename from src/blosc2/internal-complibs/zstd-1.5.2/dictBuilder/zdict.c rename to src/blosc2/internal-complibs/zstd/dictBuilder/zdict.c diff --git a/src/blosc2/internal-complibs/zstd-1.5.2/dll/example/Makefile b/src/blosc2/internal-complibs/zstd/dll/example/Makefile similarity index 100% rename from src/blosc2/internal-complibs/zstd-1.5.2/dll/example/Makefile rename to src/blosc2/internal-complibs/zstd/dll/example/Makefile diff --git a/src/blosc2/internal-complibs/zstd-1.5.2/dll/example/README.md b/src/blosc2/internal-complibs/zstd/dll/example/README.md similarity index 100% rename from src/blosc2/internal-complibs/zstd-1.5.2/dll/example/README.md rename to src/blosc2/internal-complibs/zstd/dll/example/README.md diff --git a/src/blosc2/internal-complibs/zstd-1.5.2/dll/example/fullbench-dll.sln b/src/blosc2/internal-complibs/zstd/dll/example/fullbench-dll.sln similarity index 100% rename from src/blosc2/internal-complibs/zstd-1.5.2/dll/example/fullbench-dll.sln rename to src/blosc2/internal-complibs/zstd/dll/example/fullbench-dll.sln diff --git a/src/blosc2/internal-complibs/zstd-1.5.2/dll/example/fullbench-dll.vcxproj b/src/blosc2/internal-complibs/zstd/dll/example/fullbench-dll.vcxproj similarity index 100% rename from src/blosc2/internal-complibs/zstd-1.5.2/dll/example/fullbench-dll.vcxproj rename to src/blosc2/internal-complibs/zstd/dll/example/fullbench-dll.vcxproj diff --git a/src/blosc2/internal-complibs/zstd-1.5.2/legacy/zstd_legacy.h b/src/blosc2/internal-complibs/zstd/legacy/zstd_legacy.h similarity index 100% rename from src/blosc2/internal-complibs/zstd-1.5.2/legacy/zstd_legacy.h rename to src/blosc2/internal-complibs/zstd/legacy/zstd_legacy.h diff --git a/src/blosc2/internal-complibs/zstd-1.5.2/libzstd.mk b/src/blosc2/internal-complibs/zstd/libzstd.mk similarity index 100% rename from src/blosc2/internal-complibs/zstd-1.5.2/libzstd.mk rename to src/blosc2/internal-complibs/zstd/libzstd.mk diff --git a/src/blosc2/internal-complibs/zstd-1.5.2/libzstd.pc.in b/src/blosc2/internal-complibs/zstd/libzstd.pc.in similarity index 100% rename from src/blosc2/internal-complibs/zstd-1.5.2/libzstd.pc.in rename to src/blosc2/internal-complibs/zstd/libzstd.pc.in diff --git a/src/blosc2/internal-complibs/zstd-1.5.2/module.modulemap b/src/blosc2/internal-complibs/zstd/module.modulemap similarity index 100% rename from src/blosc2/internal-complibs/zstd-1.5.2/module.modulemap rename to src/blosc2/internal-complibs/zstd/module.modulemap diff --git a/src/blosc2/internal-complibs/zstd-1.5.2/zdict.h b/src/blosc2/internal-complibs/zstd/zdict.h similarity index 100% rename from src/blosc2/internal-complibs/zstd-1.5.2/zdict.h rename to src/blosc2/internal-complibs/zstd/zdict.h diff --git a/src/blosc2/internal-complibs/zstd-1.5.2/zstd.h b/src/blosc2/internal-complibs/zstd/zstd.h similarity index 100% rename from src/blosc2/internal-complibs/zstd-1.5.2/zstd.h rename to src/blosc2/internal-complibs/zstd/zstd.h diff --git a/src/blosc2/internal-complibs/zstd-1.5.2/zstd_errors.h b/src/blosc2/internal-complibs/zstd/zstd_errors.h similarity index 100% rename from src/blosc2/internal-complibs/zstd-1.5.2/zstd_errors.h rename to src/blosc2/internal-complibs/zstd/zstd_errors.h