diff --git a/include/3way.h b/include/cryptopp/3way.h
similarity index 100%
rename from include/3way.h
rename to include/cryptopp/3way.h
diff --git a/include/adler32.h b/include/cryptopp/adler32.h
similarity index 100%
rename from include/adler32.h
rename to include/cryptopp/adler32.h
diff --git a/include/adv_simd.h b/include/cryptopp/adv_simd.h
similarity index 100%
rename from include/adv_simd.h
rename to include/cryptopp/adv_simd.h
diff --git a/include/aes.h b/include/cryptopp/aes.h
similarity index 100%
rename from include/aes.h
rename to include/cryptopp/aes.h
diff --git a/include/aes_armv4.h b/include/cryptopp/aes_armv4.h
similarity index 100%
rename from include/aes_armv4.h
rename to include/cryptopp/aes_armv4.h
diff --git a/include/algebra.h b/include/cryptopp/algebra.h
similarity index 100%
rename from include/algebra.h
rename to include/cryptopp/algebra.h
diff --git a/include/algparam.h b/include/cryptopp/algparam.h
similarity index 100%
rename from include/algparam.h
rename to include/cryptopp/algparam.h
diff --git a/include/allocate.h b/include/cryptopp/allocate.h
similarity index 100%
rename from include/allocate.h
rename to include/cryptopp/allocate.h
diff --git a/include/arc4.h b/include/cryptopp/arc4.h
similarity index 100%
rename from include/arc4.h
rename to include/cryptopp/arc4.h
diff --git a/include/argnames.h b/include/cryptopp/argnames.h
similarity index 100%
rename from include/argnames.h
rename to include/cryptopp/argnames.h
diff --git a/include/aria.h b/include/cryptopp/aria.h
similarity index 100%
rename from include/aria.h
rename to include/cryptopp/aria.h
diff --git a/include/arm_simd.h b/include/cryptopp/arm_simd.h
similarity index 100%
rename from include/arm_simd.h
rename to include/cryptopp/arm_simd.h
diff --git a/include/asn.h b/include/cryptopp/asn.h
similarity index 100%
rename from include/asn.h
rename to include/cryptopp/asn.h
diff --git a/include/authenc.h b/include/cryptopp/authenc.h
similarity index 100%
rename from include/authenc.h
rename to include/cryptopp/authenc.h
diff --git a/include/base32.h b/include/cryptopp/base32.h
similarity index 100%
rename from include/base32.h
rename to include/cryptopp/base32.h
diff --git a/include/base64.h b/include/cryptopp/base64.h
similarity index 100%
rename from include/base64.h
rename to include/cryptopp/base64.h
diff --git a/include/basecode.h b/include/cryptopp/basecode.h
similarity index 100%
rename from include/basecode.h
rename to include/cryptopp/basecode.h
diff --git a/include/bench.h b/include/cryptopp/bench.h
similarity index 100%
rename from include/bench.h
rename to include/cryptopp/bench.h
diff --git a/include/blake2.h b/include/cryptopp/blake2.h
similarity index 100%
rename from include/blake2.h
rename to include/cryptopp/blake2.h
diff --git a/include/blowfish.h b/include/cryptopp/blowfish.h
similarity index 100%
rename from include/blowfish.h
rename to include/cryptopp/blowfish.h
diff --git a/include/blumshub.h b/include/cryptopp/blumshub.h
similarity index 100%
rename from include/blumshub.h
rename to include/cryptopp/blumshub.h
diff --git a/include/camellia.h b/include/cryptopp/camellia.h
similarity index 100%
rename from include/camellia.h
rename to include/cryptopp/camellia.h
diff --git a/include/cast.h b/include/cryptopp/cast.h
similarity index 100%
rename from include/cast.h
rename to include/cryptopp/cast.h
diff --git a/include/cbcmac.h b/include/cryptopp/cbcmac.h
similarity index 100%
rename from include/cbcmac.h
rename to include/cryptopp/cbcmac.h
diff --git a/include/ccm.h b/include/cryptopp/ccm.h
similarity index 100%
rename from include/ccm.h
rename to include/cryptopp/ccm.h
diff --git a/include/chacha.h b/include/cryptopp/chacha.h
similarity index 100%
rename from include/chacha.h
rename to include/cryptopp/chacha.h
diff --git a/include/chachapoly.h b/include/cryptopp/chachapoly.h
similarity index 100%
rename from include/chachapoly.h
rename to include/cryptopp/chachapoly.h
diff --git a/include/cham.h b/include/cryptopp/cham.h
similarity index 100%
rename from include/cham.h
rename to include/cryptopp/cham.h
diff --git a/include/channels.h b/include/cryptopp/channels.h
similarity index 100%
rename from include/channels.h
rename to include/cryptopp/channels.h
diff --git a/include/cmac.h b/include/cryptopp/cmac.h
similarity index 100%
rename from include/cmac.h
rename to include/cryptopp/cmac.h
diff --git a/include/config.h b/include/cryptopp/config.h
similarity index 100%
rename from include/config.h
rename to include/cryptopp/config.h
diff --git a/include/config_align.h b/include/cryptopp/config_align.h
similarity index 100%
rename from include/config_align.h
rename to include/cryptopp/config_align.h
diff --git a/include/config_asm.h b/include/cryptopp/config_asm.h
similarity index 100%
rename from include/config_asm.h
rename to include/cryptopp/config_asm.h
diff --git a/include/config_cpu.h b/include/cryptopp/config_cpu.h
similarity index 100%
rename from include/config_cpu.h
rename to include/cryptopp/config_cpu.h
diff --git a/include/config_cxx.h b/include/cryptopp/config_cxx.h
similarity index 100%
rename from include/config_cxx.h
rename to include/cryptopp/config_cxx.h
diff --git a/include/config_dll.h b/include/cryptopp/config_dll.h
similarity index 100%
rename from include/config_dll.h
rename to include/cryptopp/config_dll.h
diff --git a/include/config_int.h b/include/cryptopp/config_int.h
similarity index 100%
rename from include/config_int.h
rename to include/cryptopp/config_int.h
diff --git a/include/config_misc.h b/include/cryptopp/config_misc.h
similarity index 100%
rename from include/config_misc.h
rename to include/cryptopp/config_misc.h
diff --git a/include/config_ns.h b/include/cryptopp/config_ns.h
similarity index 100%
rename from include/config_ns.h
rename to include/cryptopp/config_ns.h
diff --git a/include/config_os.h b/include/cryptopp/config_os.h
similarity index 100%
rename from include/config_os.h
rename to include/cryptopp/config_os.h
diff --git a/include/config_ver.h b/include/cryptopp/config_ver.h
similarity index 100%
rename from include/config_ver.h
rename to include/cryptopp/config_ver.h
diff --git a/include/cpu.h b/include/cryptopp/cpu.h
similarity index 100%
rename from include/cpu.h
rename to include/cryptopp/cpu.h
diff --git a/include/crc.h b/include/cryptopp/crc.h
similarity index 100%
rename from include/crc.h
rename to include/cryptopp/crc.h
diff --git a/include/cryptlib.h b/include/cryptopp/cryptlib.h
similarity index 100%
rename from include/cryptlib.h
rename to include/cryptopp/cryptlib.h
diff --git a/include/darn.h b/include/cryptopp/darn.h
similarity index 100%
rename from include/darn.h
rename to include/cryptopp/darn.h
diff --git a/include/default.h b/include/cryptopp/default.h
similarity index 100%
rename from include/default.h
rename to include/cryptopp/default.h
diff --git a/include/des.h b/include/cryptopp/des.h
similarity index 100%
rename from include/des.h
rename to include/cryptopp/des.h
diff --git a/include/dh.h b/include/cryptopp/dh.h
similarity index 100%
rename from include/dh.h
rename to include/cryptopp/dh.h
diff --git a/include/dh2.h b/include/cryptopp/dh2.h
similarity index 100%
rename from include/dh2.h
rename to include/cryptopp/dh2.h
diff --git a/include/dll.h b/include/cryptopp/dll.h
similarity index 100%
rename from include/dll.h
rename to include/cryptopp/dll.h
diff --git a/include/dmac.h b/include/cryptopp/dmac.h
similarity index 100%
rename from include/dmac.h
rename to include/cryptopp/dmac.h
diff --git a/include/donna.h b/include/cryptopp/donna.h
similarity index 100%
rename from include/donna.h
rename to include/cryptopp/donna.h
diff --git a/include/donna_32.h b/include/cryptopp/donna_32.h
similarity index 100%
rename from include/donna_32.h
rename to include/cryptopp/donna_32.h
diff --git a/include/donna_64.h b/include/cryptopp/donna_64.h
similarity index 100%
rename from include/donna_64.h
rename to include/cryptopp/donna_64.h
diff --git a/include/donna_sse.h b/include/cryptopp/donna_sse.h
similarity index 100%
rename from include/donna_sse.h
rename to include/cryptopp/donna_sse.h
diff --git a/include/drbg.h b/include/cryptopp/drbg.h
similarity index 100%
rename from include/drbg.h
rename to include/cryptopp/drbg.h
diff --git a/include/dsa.h b/include/cryptopp/dsa.h
similarity index 100%
rename from include/dsa.h
rename to include/cryptopp/dsa.h
diff --git a/include/eax.h b/include/cryptopp/eax.h
similarity index 100%
rename from include/eax.h
rename to include/cryptopp/eax.h
diff --git a/include/ec2n.h b/include/cryptopp/ec2n.h
similarity index 100%
rename from include/ec2n.h
rename to include/cryptopp/ec2n.h
diff --git a/include/eccrypto.h b/include/cryptopp/eccrypto.h
similarity index 100%
rename from include/eccrypto.h
rename to include/cryptopp/eccrypto.h
diff --git a/include/ecp.h b/include/cryptopp/ecp.h
similarity index 100%
rename from include/ecp.h
rename to include/cryptopp/ecp.h
diff --git a/include/ecpoint.h b/include/cryptopp/ecpoint.h
similarity index 100%
rename from include/ecpoint.h
rename to include/cryptopp/ecpoint.h
diff --git a/include/elgamal.h b/include/cryptopp/elgamal.h
similarity index 100%
rename from include/elgamal.h
rename to include/cryptopp/elgamal.h
diff --git a/include/emsa2.h b/include/cryptopp/emsa2.h
similarity index 100%
rename from include/emsa2.h
rename to include/cryptopp/emsa2.h
diff --git a/include/eprecomp.h b/include/cryptopp/eprecomp.h
similarity index 100%
rename from include/eprecomp.h
rename to include/cryptopp/eprecomp.h
diff --git a/include/esign.h b/include/cryptopp/esign.h
similarity index 100%
rename from include/esign.h
rename to include/cryptopp/esign.h
diff --git a/include/factory.h b/include/cryptopp/factory.h
similarity index 100%
rename from include/factory.h
rename to include/cryptopp/factory.h
diff --git a/include/fhmqv.h b/include/cryptopp/fhmqv.h
similarity index 100%
rename from include/fhmqv.h
rename to include/cryptopp/fhmqv.h
diff --git a/include/files.h b/include/cryptopp/files.h
similarity index 100%
rename from include/files.h
rename to include/cryptopp/files.h
diff --git a/include/filters.h b/include/cryptopp/filters.h
similarity index 100%
rename from include/filters.h
rename to include/cryptopp/filters.h
diff --git a/include/fips140.h b/include/cryptopp/fips140.h
similarity index 100%
rename from include/fips140.h
rename to include/cryptopp/fips140.h
diff --git a/include/fltrimpl.h b/include/cryptopp/fltrimpl.h
similarity index 100%
rename from include/fltrimpl.h
rename to include/cryptopp/fltrimpl.h
diff --git a/include/gcm.h b/include/cryptopp/gcm.h
similarity index 100%
rename from include/gcm.h
rename to include/cryptopp/gcm.h
diff --git a/include/gf256.h b/include/cryptopp/gf256.h
similarity index 100%
rename from include/gf256.h
rename to include/cryptopp/gf256.h
diff --git a/include/gf2_32.h b/include/cryptopp/gf2_32.h
similarity index 100%
rename from include/gf2_32.h
rename to include/cryptopp/gf2_32.h
diff --git a/include/gf2n.h b/include/cryptopp/gf2n.h
similarity index 100%
rename from include/gf2n.h
rename to include/cryptopp/gf2n.h
diff --git a/include/gfpcrypt.h b/include/cryptopp/gfpcrypt.h
similarity index 100%
rename from include/gfpcrypt.h
rename to include/cryptopp/gfpcrypt.h
diff --git a/include/gost.h b/include/cryptopp/gost.h
similarity index 100%
rename from include/gost.h
rename to include/cryptopp/gost.h
diff --git a/include/gzip.h b/include/cryptopp/gzip.h
similarity index 100%
rename from include/gzip.h
rename to include/cryptopp/gzip.h
diff --git a/include/hashfwd.h b/include/cryptopp/hashfwd.h
similarity index 100%
rename from include/hashfwd.h
rename to include/cryptopp/hashfwd.h
diff --git a/include/hc128.h b/include/cryptopp/hc128.h
similarity index 100%
rename from include/hc128.h
rename to include/cryptopp/hc128.h
diff --git a/include/hc256.h b/include/cryptopp/hc256.h
similarity index 100%
rename from include/hc256.h
rename to include/cryptopp/hc256.h
diff --git a/include/hex.h b/include/cryptopp/hex.h
similarity index 100%
rename from include/hex.h
rename to include/cryptopp/hex.h
diff --git a/include/hight.h b/include/cryptopp/hight.h
similarity index 100%
rename from include/hight.h
rename to include/cryptopp/hight.h
diff --git a/include/hkdf.h b/include/cryptopp/hkdf.h
similarity index 100%
rename from include/hkdf.h
rename to include/cryptopp/hkdf.h
diff --git a/include/hmac.h b/include/cryptopp/hmac.h
similarity index 100%
rename from include/hmac.h
rename to include/cryptopp/hmac.h
diff --git a/include/hmqv.h b/include/cryptopp/hmqv.h
similarity index 100%
rename from include/hmqv.h
rename to include/cryptopp/hmqv.h
diff --git a/include/hrtimer.h b/include/cryptopp/hrtimer.h
similarity index 100%
rename from include/hrtimer.h
rename to include/cryptopp/hrtimer.h
diff --git a/include/ida.h b/include/cryptopp/ida.h
similarity index 100%
rename from include/ida.h
rename to include/cryptopp/ida.h
diff --git a/include/idea.h b/include/cryptopp/idea.h
similarity index 100%
rename from include/idea.h
rename to include/cryptopp/idea.h
diff --git a/include/integer.h b/include/cryptopp/integer.h
similarity index 100%
rename from include/integer.h
rename to include/cryptopp/integer.h
diff --git a/include/iterhash.h b/include/cryptopp/iterhash.h
similarity index 100%
rename from include/iterhash.h
rename to include/cryptopp/iterhash.h
diff --git a/include/kalyna.h b/include/cryptopp/kalyna.h
similarity index 100%
rename from include/kalyna.h
rename to include/cryptopp/kalyna.h
diff --git a/include/keccak.h b/include/cryptopp/keccak.h
similarity index 100%
rename from include/keccak.h
rename to include/cryptopp/keccak.h
diff --git a/include/lea.h b/include/cryptopp/lea.h
similarity index 100%
rename from include/lea.h
rename to include/cryptopp/lea.h
diff --git a/include/lsh.h b/include/cryptopp/lsh.h
similarity index 100%
rename from include/lsh.h
rename to include/cryptopp/lsh.h
diff --git a/include/lubyrack.h b/include/cryptopp/lubyrack.h
similarity index 100%
rename from include/lubyrack.h
rename to include/cryptopp/lubyrack.h
diff --git a/include/luc.h b/include/cryptopp/luc.h
similarity index 100%
rename from include/luc.h
rename to include/cryptopp/luc.h
diff --git a/include/mars.h b/include/cryptopp/mars.h
similarity index 100%
rename from include/mars.h
rename to include/cryptopp/mars.h
diff --git a/include/md2.h b/include/cryptopp/md2.h
similarity index 100%
rename from include/md2.h
rename to include/cryptopp/md2.h
diff --git a/include/md4.h b/include/cryptopp/md4.h
similarity index 100%
rename from include/md4.h
rename to include/cryptopp/md4.h
diff --git a/include/md5.h b/include/cryptopp/md5.h
similarity index 100%
rename from include/md5.h
rename to include/cryptopp/md5.h
diff --git a/include/mdc.h b/include/cryptopp/mdc.h
similarity index 100%
rename from include/mdc.h
rename to include/cryptopp/mdc.h
diff --git a/include/mersenne.h b/include/cryptopp/mersenne.h
similarity index 100%
rename from include/mersenne.h
rename to include/cryptopp/mersenne.h
diff --git a/include/misc.h b/include/cryptopp/misc.h
similarity index 100%
rename from include/misc.h
rename to include/cryptopp/misc.h
diff --git a/include/modarith.h b/include/cryptopp/modarith.h
similarity index 100%
rename from include/modarith.h
rename to include/cryptopp/modarith.h
diff --git a/include/modes.h b/include/cryptopp/modes.h
similarity index 100%
rename from include/modes.h
rename to include/cryptopp/modes.h
diff --git a/include/modexppc.h b/include/cryptopp/modexppc.h
similarity index 100%
rename from include/modexppc.h
rename to include/cryptopp/modexppc.h
diff --git a/include/mqueue.h b/include/cryptopp/mqueue.h
similarity index 100%
rename from include/mqueue.h
rename to include/cryptopp/mqueue.h
diff --git a/include/mqv.h b/include/cryptopp/mqv.h
similarity index 100%
rename from include/mqv.h
rename to include/cryptopp/mqv.h
diff --git a/include/naclite.h b/include/cryptopp/naclite.h
similarity index 100%
rename from include/naclite.h
rename to include/cryptopp/naclite.h
diff --git a/include/nbtheory.h b/include/cryptopp/nbtheory.h
similarity index 100%
rename from include/nbtheory.h
rename to include/cryptopp/nbtheory.h
diff --git a/include/nr.h b/include/cryptopp/nr.h
similarity index 100%
rename from include/nr.h
rename to include/cryptopp/nr.h
diff --git a/include/oaep.h b/include/cryptopp/oaep.h
similarity index 100%
rename from include/oaep.h
rename to include/cryptopp/oaep.h
diff --git a/include/oids.h b/include/cryptopp/oids.h
similarity index 100%
rename from include/oids.h
rename to include/cryptopp/oids.h
diff --git a/include/osrng.h b/include/cryptopp/osrng.h
similarity index 100%
rename from include/osrng.h
rename to include/cryptopp/osrng.h
diff --git a/include/ossig.h b/include/cryptopp/ossig.h
similarity index 100%
rename from include/ossig.h
rename to include/cryptopp/ossig.h
diff --git a/include/padlkrng.h b/include/cryptopp/padlkrng.h
similarity index 100%
rename from include/padlkrng.h
rename to include/cryptopp/padlkrng.h
diff --git a/include/panama.h b/include/cryptopp/panama.h
similarity index 100%
rename from include/panama.h
rename to include/cryptopp/panama.h
diff --git a/include/pch.h b/include/cryptopp/pch.h
similarity index 100%
rename from include/pch.h
rename to include/cryptopp/pch.h
diff --git a/include/pkcspad.h b/include/cryptopp/pkcspad.h
similarity index 100%
rename from include/pkcspad.h
rename to include/cryptopp/pkcspad.h
diff --git a/include/poly1305.h b/include/cryptopp/poly1305.h
similarity index 100%
rename from include/poly1305.h
rename to include/cryptopp/poly1305.h
diff --git a/include/polynomi.h b/include/cryptopp/polynomi.h
similarity index 100%
rename from include/polynomi.h
rename to include/cryptopp/polynomi.h
diff --git a/include/ppc_simd.h b/include/cryptopp/ppc_simd.h
similarity index 100%
rename from include/ppc_simd.h
rename to include/cryptopp/ppc_simd.h
diff --git a/include/pssr.h b/include/cryptopp/pssr.h
similarity index 100%
rename from include/pssr.h
rename to include/cryptopp/pssr.h
diff --git a/include/pubkey.h b/include/cryptopp/pubkey.h
similarity index 100%
rename from include/pubkey.h
rename to include/cryptopp/pubkey.h
diff --git a/include/pwdbased.h b/include/cryptopp/pwdbased.h
similarity index 100%
rename from include/pwdbased.h
rename to include/cryptopp/pwdbased.h
diff --git a/include/queue.h b/include/cryptopp/queue.h
similarity index 100%
rename from include/queue.h
rename to include/cryptopp/queue.h
diff --git a/include/rabbit.h b/include/cryptopp/rabbit.h
similarity index 100%
rename from include/rabbit.h
rename to include/cryptopp/rabbit.h
diff --git a/include/rabin.h b/include/cryptopp/rabin.h
similarity index 100%
rename from include/rabin.h
rename to include/cryptopp/rabin.h
diff --git a/include/randpool.h b/include/cryptopp/randpool.h
similarity index 100%
rename from include/randpool.h
rename to include/cryptopp/randpool.h
diff --git a/include/rc2.h b/include/cryptopp/rc2.h
similarity index 100%
rename from include/rc2.h
rename to include/cryptopp/rc2.h
diff --git a/include/rc5.h b/include/cryptopp/rc5.h
similarity index 100%
rename from include/rc5.h
rename to include/cryptopp/rc5.h
diff --git a/include/rc6.h b/include/cryptopp/rc6.h
similarity index 100%
rename from include/rc6.h
rename to include/cryptopp/rc6.h
diff --git a/include/rdrand.h b/include/cryptopp/rdrand.h
similarity index 100%
rename from include/rdrand.h
rename to include/cryptopp/rdrand.h
diff --git a/include/resource.h b/include/cryptopp/resource.h
similarity index 100%
rename from include/resource.h
rename to include/cryptopp/resource.h
diff --git a/include/rijndael.h b/include/cryptopp/rijndael.h
similarity index 100%
rename from include/rijndael.h
rename to include/cryptopp/rijndael.h
diff --git a/include/ripemd.h b/include/cryptopp/ripemd.h
similarity index 100%
rename from include/ripemd.h
rename to include/cryptopp/ripemd.h
diff --git a/include/rng.h b/include/cryptopp/rng.h
similarity index 100%
rename from include/rng.h
rename to include/cryptopp/rng.h
diff --git a/include/rsa.h b/include/cryptopp/rsa.h
similarity index 100%
rename from include/rsa.h
rename to include/cryptopp/rsa.h
diff --git a/include/rw.h b/include/cryptopp/rw.h
similarity index 100%
rename from include/rw.h
rename to include/cryptopp/rw.h
diff --git a/include/safer.h b/include/cryptopp/safer.h
similarity index 100%
rename from include/safer.h
rename to include/cryptopp/safer.h
diff --git a/include/salsa.h b/include/cryptopp/salsa.h
similarity index 100%
rename from include/salsa.h
rename to include/cryptopp/salsa.h
diff --git a/include/scrypt.h b/include/cryptopp/scrypt.h
similarity index 100%
rename from include/scrypt.h
rename to include/cryptopp/scrypt.h
diff --git a/include/seal.h b/include/cryptopp/seal.h
similarity index 100%
rename from include/seal.h
rename to include/cryptopp/seal.h
diff --git a/include/secblock.h b/include/cryptopp/secblock.h
similarity index 100%
rename from include/secblock.h
rename to include/cryptopp/secblock.h
diff --git a/include/secblockfwd.h b/include/cryptopp/secblockfwd.h
similarity index 100%
rename from include/secblockfwd.h
rename to include/cryptopp/secblockfwd.h
diff --git a/include/seckey.h b/include/cryptopp/seckey.h
similarity index 100%
rename from include/seckey.h
rename to include/cryptopp/seckey.h
diff --git a/include/seed.h b/include/cryptopp/seed.h
similarity index 100%
rename from include/seed.h
rename to include/cryptopp/seed.h
diff --git a/include/serpent.h b/include/cryptopp/serpent.h
similarity index 100%
rename from include/serpent.h
rename to include/cryptopp/serpent.h
diff --git a/include/serpentp.h b/include/cryptopp/serpentp.h
similarity index 100%
rename from include/serpentp.h
rename to include/cryptopp/serpentp.h
diff --git a/include/sha.h b/include/cryptopp/sha.h
similarity index 100%
rename from include/sha.h
rename to include/cryptopp/sha.h
diff --git a/include/sha1_armv4.h b/include/cryptopp/sha1_armv4.h
similarity index 100%
rename from include/sha1_armv4.h
rename to include/cryptopp/sha1_armv4.h
diff --git a/include/sha256_armv4.h b/include/cryptopp/sha256_armv4.h
similarity index 100%
rename from include/sha256_armv4.h
rename to include/cryptopp/sha256_armv4.h
diff --git a/include/sha3.h b/include/cryptopp/sha3.h
similarity index 100%
rename from include/sha3.h
rename to include/cryptopp/sha3.h
diff --git a/include/sha512_armv4.h b/include/cryptopp/sha512_armv4.h
similarity index 100%
rename from include/sha512_armv4.h
rename to include/cryptopp/sha512_armv4.h
diff --git a/include/shacal2.h b/include/cryptopp/shacal2.h
similarity index 100%
rename from include/shacal2.h
rename to include/cryptopp/shacal2.h
diff --git a/include/shake.h b/include/cryptopp/shake.h
similarity index 100%
rename from include/shake.h
rename to include/cryptopp/shake.h
diff --git a/include/shark.h b/include/cryptopp/shark.h
similarity index 100%
rename from include/shark.h
rename to include/cryptopp/shark.h
diff --git a/include/simeck.h b/include/cryptopp/simeck.h
similarity index 100%
rename from include/simeck.h
rename to include/cryptopp/simeck.h
diff --git a/include/simon.h b/include/cryptopp/simon.h
similarity index 100%
rename from include/simon.h
rename to include/cryptopp/simon.h
diff --git a/include/simple.h b/include/cryptopp/simple.h
similarity index 100%
rename from include/simple.h
rename to include/cryptopp/simple.h
diff --git a/include/siphash.h b/include/cryptopp/siphash.h
similarity index 100%
rename from include/siphash.h
rename to include/cryptopp/siphash.h
diff --git a/include/skipjack.h b/include/cryptopp/skipjack.h
similarity index 100%
rename from include/skipjack.h
rename to include/cryptopp/skipjack.h
diff --git a/include/sm3.h b/include/cryptopp/sm3.h
similarity index 100%
rename from include/sm3.h
rename to include/cryptopp/sm3.h
diff --git a/include/sm4.h b/include/cryptopp/sm4.h
similarity index 100%
rename from include/sm4.h
rename to include/cryptopp/sm4.h
diff --git a/include/smartptr.h b/include/cryptopp/smartptr.h
similarity index 100%
rename from include/smartptr.h
rename to include/cryptopp/smartptr.h
diff --git a/include/sosemanuk.h b/include/cryptopp/sosemanuk.h
similarity index 100%
rename from include/sosemanuk.h
rename to include/cryptopp/sosemanuk.h
diff --git a/include/speck.h b/include/cryptopp/speck.h
similarity index 100%
rename from include/speck.h
rename to include/cryptopp/speck.h
diff --git a/include/square.h b/include/cryptopp/square.h
similarity index 100%
rename from include/square.h
rename to include/cryptopp/square.h
diff --git a/include/stdcpp.h b/include/cryptopp/stdcpp.h
similarity index 100%
rename from include/stdcpp.h
rename to include/cryptopp/stdcpp.h
diff --git a/include/strciphr.h b/include/cryptopp/strciphr.h
similarity index 100%
rename from include/strciphr.h
rename to include/cryptopp/strciphr.h
diff --git a/include/tea.h b/include/cryptopp/tea.h
similarity index 100%
rename from include/tea.h
rename to include/cryptopp/tea.h
diff --git a/include/threefish.h b/include/cryptopp/threefish.h
similarity index 100%
rename from include/threefish.h
rename to include/cryptopp/threefish.h
diff --git a/include/tiger.h b/include/cryptopp/tiger.h
similarity index 100%
rename from include/tiger.h
rename to include/cryptopp/tiger.h
diff --git a/include/trap.h b/include/cryptopp/trap.h
similarity index 100%
rename from include/trap.h
rename to include/cryptopp/trap.h
diff --git a/include/trunhash.h b/include/cryptopp/trunhash.h
similarity index 100%
rename from include/trunhash.h
rename to include/cryptopp/trunhash.h
diff --git a/include/ttmac.h b/include/cryptopp/ttmac.h
similarity index 100%
rename from include/ttmac.h
rename to include/cryptopp/ttmac.h
diff --git a/include/tweetnacl.h b/include/cryptopp/tweetnacl.h
similarity index 100%
rename from include/tweetnacl.h
rename to include/cryptopp/tweetnacl.h
diff --git a/include/twofish.h b/include/cryptopp/twofish.h
similarity index 100%
rename from include/twofish.h
rename to include/cryptopp/twofish.h
diff --git a/include/validate.h b/include/cryptopp/validate.h
similarity index 100%
rename from include/validate.h
rename to include/cryptopp/validate.h
diff --git a/include/vmac.h b/include/cryptopp/vmac.h
similarity index 100%
rename from include/vmac.h
rename to include/cryptopp/vmac.h
diff --git a/include/wake.h b/include/cryptopp/wake.h
similarity index 100%
rename from include/wake.h
rename to include/cryptopp/wake.h
diff --git a/include/whrlpool.h b/include/cryptopp/whrlpool.h
similarity index 100%
rename from include/whrlpool.h
rename to include/cryptopp/whrlpool.h
diff --git a/include/words.h b/include/cryptopp/words.h
similarity index 100%
rename from include/words.h
rename to include/cryptopp/words.h
diff --git a/include/xed25519.h b/include/cryptopp/xed25519.h
similarity index 100%
rename from include/xed25519.h
rename to include/cryptopp/xed25519.h
diff --git a/include/xtr.h b/include/cryptopp/xtr.h
similarity index 100%
rename from include/xtr.h
rename to include/cryptopp/xtr.h
diff --git a/include/xtrcrypt.h b/include/cryptopp/xtrcrypt.h
similarity index 100%
rename from include/xtrcrypt.h
rename to include/cryptopp/xtrcrypt.h
diff --git a/include/xts.h b/include/cryptopp/xts.h
similarity index 100%
rename from include/xts.h
rename to include/cryptopp/xts.h
diff --git a/include/zdeflate.h b/include/cryptopp/zdeflate.h
similarity index 100%
rename from include/zdeflate.h
rename to include/cryptopp/zdeflate.h
diff --git a/include/zinflate.h b/include/cryptopp/zinflate.h
similarity index 100%
rename from include/zinflate.h
rename to include/cryptopp/zinflate.h
diff --git a/include/zlib.h b/include/cryptopp/zlib.h
similarity index 100%
rename from include/zlib.h
rename to include/cryptopp/zlib.h