diff --git a/makerom/LICENSE b/makerom/LICENSE
index 61db3e0..95cc9c3 100644
--- a/makerom/LICENSE
+++ b/makerom/LICENSE
@@ -2,7 +2,7 @@ MIT License
 
 Copyright (c) 2014 3DSGuy
 Copyright (c) 2014 applestash
-Copyright (c) 2015-2016 Jakcron
+Copyright (c) 2015-2022 Jakcron
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/makerom/makerom.sln b/makerom/build/visualstudio/makerom.sln
similarity index 100%
rename from makerom/makerom.sln
rename to makerom/build/visualstudio/makerom.sln
diff --git a/makerom/makerom.vcxproj b/makerom/build/visualstudio/makerom.vcxproj
similarity index 100%
rename from makerom/makerom.vcxproj
rename to makerom/build/visualstudio/makerom.vcxproj
diff --git a/makerom/makerom.vcxproj.filters b/makerom/build/visualstudio/makerom.vcxproj.filters
similarity index 100%
rename from makerom/makerom.vcxproj.filters
rename to makerom/build/visualstudio/makerom.vcxproj.filters
diff --git a/makerom/readme.txt b/makerom/build/visualstudio/readme.txt
similarity index 100%
rename from makerom/readme.txt
rename to makerom/build/visualstudio/readme.txt
diff --git a/makerom/libyaml/LICENSE b/makerom/deps/libyaml/LICENSE
similarity index 100%
rename from makerom/libyaml/LICENSE
rename to makerom/deps/libyaml/LICENSE
diff --git a/makerom/libyaml/api.c b/makerom/deps/libyaml/api.c
similarity index 100%
rename from makerom/libyaml/api.c
rename to makerom/deps/libyaml/api.c
diff --git a/makerom/libyaml/dumper.c b/makerom/deps/libyaml/dumper.c
similarity index 100%
rename from makerom/libyaml/dumper.c
rename to makerom/deps/libyaml/dumper.c
diff --git a/makerom/libyaml/emitter.c b/makerom/deps/libyaml/emitter.c
similarity index 100%
rename from makerom/libyaml/emitter.c
rename to makerom/deps/libyaml/emitter.c
diff --git a/makerom/libyaml/loader.c b/makerom/deps/libyaml/loader.c
similarity index 100%
rename from makerom/libyaml/loader.c
rename to makerom/deps/libyaml/loader.c
diff --git a/makerom/libyaml/parser.c b/makerom/deps/libyaml/parser.c
similarity index 100%
rename from makerom/libyaml/parser.c
rename to makerom/deps/libyaml/parser.c
diff --git a/makerom/libyaml/reader.c b/makerom/deps/libyaml/reader.c
similarity index 100%
rename from makerom/libyaml/reader.c
rename to makerom/deps/libyaml/reader.c
diff --git a/makerom/libyaml/scanner.c b/makerom/deps/libyaml/scanner.c
similarity index 100%
rename from makerom/libyaml/scanner.c
rename to makerom/deps/libyaml/scanner.c
diff --git a/makerom/libyaml/writer.c b/makerom/deps/libyaml/writer.c
similarity index 100%
rename from makerom/libyaml/writer.c
rename to makerom/deps/libyaml/writer.c
diff --git a/makerom/libyaml/yaml.h b/makerom/deps/libyaml/yaml.h
similarity index 100%
rename from makerom/libyaml/yaml.h
rename to makerom/deps/libyaml/yaml.h
diff --git a/makerom/libyaml/yaml_private.h b/makerom/deps/libyaml/yaml_private.h
similarity index 100%
rename from makerom/libyaml/yaml_private.h
rename to makerom/deps/libyaml/yaml_private.h
diff --git a/makerom/polarssl/aes.c b/makerom/deps/polarssl/aes.c
similarity index 100%
rename from makerom/polarssl/aes.c
rename to makerom/deps/polarssl/aes.c
diff --git a/makerom/polarssl/aes.h b/makerom/deps/polarssl/aes.h
similarity index 100%
rename from makerom/polarssl/aes.h
rename to makerom/deps/polarssl/aes.h
diff --git a/makerom/polarssl/base64.c b/makerom/deps/polarssl/base64.c
similarity index 100%
rename from makerom/polarssl/base64.c
rename to makerom/deps/polarssl/base64.c
diff --git a/makerom/polarssl/base64.h b/makerom/deps/polarssl/base64.h
similarity index 100%
rename from makerom/polarssl/base64.h
rename to makerom/deps/polarssl/base64.h
diff --git a/makerom/polarssl/bignum.c b/makerom/deps/polarssl/bignum.c
similarity index 100%
rename from makerom/polarssl/bignum.c
rename to makerom/deps/polarssl/bignum.c
diff --git a/makerom/polarssl/bignum.h b/makerom/deps/polarssl/bignum.h
similarity index 100%
rename from makerom/polarssl/bignum.h
rename to makerom/deps/polarssl/bignum.h
diff --git a/makerom/polarssl/bn_mul.h b/makerom/deps/polarssl/bn_mul.h
similarity index 100%
rename from makerom/polarssl/bn_mul.h
rename to makerom/deps/polarssl/bn_mul.h
diff --git a/makerom/polarssl/config.h b/makerom/deps/polarssl/config.h
similarity index 100%
rename from makerom/polarssl/config.h
rename to makerom/deps/polarssl/config.h
diff --git a/makerom/polarssl/rsa.c b/makerom/deps/polarssl/rsa.c
similarity index 100%
rename from makerom/polarssl/rsa.c
rename to makerom/deps/polarssl/rsa.c
diff --git a/makerom/polarssl/rsa.h b/makerom/deps/polarssl/rsa.h
similarity index 100%
rename from makerom/polarssl/rsa.h
rename to makerom/deps/polarssl/rsa.h
diff --git a/makerom/polarssl/sha1.c b/makerom/deps/polarssl/sha1.c
similarity index 100%
rename from makerom/polarssl/sha1.c
rename to makerom/deps/polarssl/sha1.c
diff --git a/makerom/polarssl/sha1.h b/makerom/deps/polarssl/sha1.h
similarity index 100%
rename from makerom/polarssl/sha1.h
rename to makerom/deps/polarssl/sha1.h
diff --git a/makerom/polarssl/sha2.c b/makerom/deps/polarssl/sha2.c
similarity index 100%
rename from makerom/polarssl/sha2.c
rename to makerom/deps/polarssl/sha2.c
diff --git a/makerom/polarssl/sha2.h b/makerom/deps/polarssl/sha2.h
similarity index 100%
rename from makerom/polarssl/sha2.h
rename to makerom/deps/polarssl/sha2.h
diff --git a/makerom/accessdesc.c b/makerom/src/accessdesc.c
similarity index 100%
rename from makerom/accessdesc.c
rename to makerom/src/accessdesc.c
diff --git a/makerom/accessdesc.h b/makerom/src/accessdesc.h
similarity index 100%
rename from makerom/accessdesc.h
rename to makerom/src/accessdesc.h
diff --git a/makerom/aes_keygen.c b/makerom/src/aes_keygen.c
similarity index 100%
rename from makerom/aes_keygen.c
rename to makerom/src/aes_keygen.c
diff --git a/makerom/aes_keygen.h b/makerom/src/aes_keygen.h
similarity index 100%
rename from makerom/aes_keygen.h
rename to makerom/src/aes_keygen.h
diff --git a/makerom/blz.c b/makerom/src/blz.c
similarity index 100%
rename from makerom/blz.c
rename to makerom/src/blz.c
diff --git a/makerom/blz.h b/makerom/src/blz.h
similarity index 100%
rename from makerom/blz.h
rename to makerom/src/blz.h
diff --git a/makerom/cardinfo.c b/makerom/src/cardinfo.c
similarity index 100%
rename from makerom/cardinfo.c
rename to makerom/src/cardinfo.c
diff --git a/makerom/cardinfo.h b/makerom/src/cardinfo.h
similarity index 100%
rename from makerom/cardinfo.h
rename to makerom/src/cardinfo.h
diff --git a/makerom/certs.c b/makerom/src/certs.c
similarity index 100%
rename from makerom/certs.c
rename to makerom/src/certs.c
diff --git a/makerom/certs.h b/makerom/src/certs.h
similarity index 100%
rename from makerom/certs.h
rename to makerom/src/certs.h
diff --git a/makerom/cia.c b/makerom/src/cia.c
similarity index 100%
rename from makerom/cia.c
rename to makerom/src/cia.c
diff --git a/makerom/cia.h b/makerom/src/cia.h
similarity index 100%
rename from makerom/cia.h
rename to makerom/src/cia.h
diff --git a/makerom/cia_build.h b/makerom/src/cia_build.h
similarity index 100%
rename from makerom/cia_build.h
rename to makerom/src/cia_build.h
diff --git a/makerom/cia_read.h b/makerom/src/cia_read.h
similarity index 100%
rename from makerom/cia_read.h
rename to makerom/src/cia_read.h
diff --git a/makerom/code.c b/makerom/src/code.c
similarity index 100%
rename from makerom/code.c
rename to makerom/src/code.c
diff --git a/makerom/code.h b/makerom/src/code.h
similarity index 100%
rename from makerom/code.h
rename to makerom/src/code.h
diff --git a/makerom/crr.h b/makerom/src/crr.h
similarity index 100%
rename from makerom/crr.h
rename to makerom/src/crr.h
diff --git a/makerom/crypto.c b/makerom/src/crypto.c
similarity index 100%
rename from makerom/crypto.c
rename to makerom/src/crypto.c
diff --git a/makerom/crypto.h b/makerom/src/crypto.h
similarity index 100%
rename from makerom/crypto.h
rename to makerom/src/crypto.h
diff --git a/makerom/ctr_utils.c b/makerom/src/ctr_utils.c
similarity index 100%
rename from makerom/ctr_utils.c
rename to makerom/src/ctr_utils.c
diff --git a/makerom/ctr_utils.h b/makerom/src/ctr_utils.h
similarity index 100%
rename from makerom/ctr_utils.h
rename to makerom/src/ctr_utils.h
diff --git a/makerom/desc/desc.h b/makerom/src/desc/desc.h
similarity index 100%
rename from makerom/desc/desc.h
rename to makerom/src/desc/desc.h
diff --git a/makerom/desc/dev_sigdata.h b/makerom/src/desc/dev_sigdata.h
similarity index 100%
rename from makerom/desc/dev_sigdata.h
rename to makerom/src/desc/dev_sigdata.h
diff --git a/makerom/desc/presets.h b/makerom/src/desc/presets.h
similarity index 100%
rename from makerom/desc/presets.h
rename to makerom/src/desc/presets.h
diff --git a/makerom/elf.c b/makerom/src/elf.c
similarity index 100%
rename from makerom/elf.c
rename to makerom/src/elf.c
diff --git a/makerom/elf.h b/makerom/src/elf.h
similarity index 100%
rename from makerom/elf.h
rename to makerom/src/elf.h
diff --git a/makerom/exefs.c b/makerom/src/exefs.c
similarity index 100%
rename from makerom/exefs.c
rename to makerom/src/exefs.c
diff --git a/makerom/exefs.h b/makerom/src/exefs.h
similarity index 100%
rename from makerom/exefs.h
rename to makerom/src/exefs.h
diff --git a/makerom/exefs_build.h b/makerom/src/exefs_build.h
similarity index 100%
rename from makerom/exefs_build.h
rename to makerom/src/exefs_build.h
diff --git a/makerom/exefs_read.h b/makerom/src/exefs_read.h
similarity index 100%
rename from makerom/exefs_read.h
rename to makerom/src/exefs_read.h
diff --git a/makerom/exheader.c b/makerom/src/exheader.c
similarity index 100%
rename from makerom/exheader.c
rename to makerom/src/exheader.c
diff --git a/makerom/exheader.h b/makerom/src/exheader.h
similarity index 100%
rename from makerom/exheader.h
rename to makerom/src/exheader.h
diff --git a/makerom/exheader_build.h b/makerom/src/exheader_build.h
similarity index 100%
rename from makerom/exheader_build.h
rename to makerom/src/exheader_build.h
diff --git a/makerom/exheader_read.h b/makerom/src/exheader_read.h
similarity index 100%
rename from makerom/exheader_read.h
rename to makerom/src/exheader_read.h
diff --git a/makerom/keyset.c b/makerom/src/keyset.c
similarity index 100%
rename from makerom/keyset.c
rename to makerom/src/keyset.c
diff --git a/makerom/keyset.h b/makerom/src/keyset.h
similarity index 100%
rename from makerom/keyset.h
rename to makerom/src/keyset.h
diff --git a/makerom/lib.h b/makerom/src/lib.h
similarity index 100%
rename from makerom/lib.h
rename to makerom/src/lib.h
diff --git a/makerom/makerom.c b/makerom/src/makerom.c
similarity index 100%
rename from makerom/makerom.c
rename to makerom/src/makerom.c
diff --git a/makerom/ncch.c b/makerom/src/ncch.c
similarity index 100%
rename from makerom/ncch.c
rename to makerom/src/ncch.c
diff --git a/makerom/ncch.h b/makerom/src/ncch.h
similarity index 100%
rename from makerom/ncch.h
rename to makerom/src/ncch.h
diff --git a/makerom/ncch_build.h b/makerom/src/ncch_build.h
similarity index 100%
rename from makerom/ncch_build.h
rename to makerom/src/ncch_build.h
diff --git a/makerom/ncch_logo.h b/makerom/src/ncch_logo.h
similarity index 100%
rename from makerom/ncch_logo.h
rename to makerom/src/ncch_logo.h
diff --git a/makerom/ncch_read.h b/makerom/src/ncch_read.h
similarity index 100%
rename from makerom/ncch_read.h
rename to makerom/src/ncch_read.h
diff --git a/makerom/ncsd.c b/makerom/src/ncsd.c
similarity index 100%
rename from makerom/ncsd.c
rename to makerom/src/ncsd.c
diff --git a/makerom/ncsd.h b/makerom/src/ncsd.h
similarity index 100%
rename from makerom/ncsd.h
rename to makerom/src/ncsd.h
diff --git a/makerom/ncsd_build.h b/makerom/src/ncsd_build.h
similarity index 100%
rename from makerom/ncsd_build.h
rename to makerom/src/ncsd_build.h
diff --git a/makerom/ncsd_read.h b/makerom/src/ncsd_read.h
similarity index 100%
rename from makerom/ncsd_read.h
rename to makerom/src/ncsd_read.h
diff --git a/makerom/oschar.c b/makerom/src/oschar.c
similarity index 100%
rename from makerom/oschar.c
rename to makerom/src/oschar.c
diff --git a/makerom/oschar.h b/makerom/src/oschar.h
similarity index 100%
rename from makerom/oschar.h
rename to makerom/src/oschar.h
diff --git a/makerom/pki/dev.h b/makerom/src/pki/dev.h
similarity index 100%
rename from makerom/pki/dev.h
rename to makerom/src/pki/dev.h
diff --git a/makerom/pki/dev_legacy.h b/makerom/src/pki/dev_legacy.h
similarity index 100%
rename from makerom/pki/dev_legacy.h
rename to makerom/src/pki/dev_legacy.h
diff --git a/makerom/pki/prod.h b/makerom/src/pki/prod.h
similarity index 100%
rename from makerom/pki/prod.h
rename to makerom/src/pki/prod.h
diff --git a/makerom/pki/prod_legacy.h b/makerom/src/pki/prod_legacy.h
similarity index 100%
rename from makerom/pki/prod_legacy.h
rename to makerom/src/pki/prod_legacy.h
diff --git a/makerom/pki/rsa_key.h b/makerom/src/pki/rsa_key.h
similarity index 100%
rename from makerom/pki/rsa_key.h
rename to makerom/src/pki/rsa_key.h
diff --git a/makerom/pki/test.h b/makerom/src/pki/test.h
similarity index 100%
rename from makerom/pki/test.h
rename to makerom/src/pki/test.h
diff --git a/makerom/romfs.c b/makerom/src/romfs.c
similarity index 100%
rename from makerom/romfs.c
rename to makerom/src/romfs.c
diff --git a/makerom/romfs.h b/makerom/src/romfs.h
similarity index 100%
rename from makerom/romfs.h
rename to makerom/src/romfs.h
diff --git a/makerom/romfs_fs.c b/makerom/src/romfs_fs.c
similarity index 100%
rename from makerom/romfs_fs.c
rename to makerom/src/romfs_fs.c
diff --git a/makerom/romfs_fs.h b/makerom/src/romfs_fs.h
similarity index 100%
rename from makerom/romfs_fs.h
rename to makerom/src/romfs_fs.h
diff --git a/makerom/romfs_gen.c b/makerom/src/romfs_gen.c
similarity index 100%
rename from makerom/romfs_gen.c
rename to makerom/src/romfs_gen.c
diff --git a/makerom/romfs_gen.h b/makerom/src/romfs_gen.h
similarity index 100%
rename from makerom/romfs_gen.h
rename to makerom/src/romfs_gen.h
diff --git a/makerom/romfs_import.c b/makerom/src/romfs_import.c
similarity index 100%
rename from makerom/romfs_import.c
rename to makerom/src/romfs_import.c
diff --git a/makerom/romfs_import.h b/makerom/src/romfs_import.h
similarity index 100%
rename from makerom/romfs_import.h
rename to makerom/src/romfs_import.h
diff --git a/makerom/rsf_settings.c b/makerom/src/rsf_settings.c
similarity index 100%
rename from makerom/rsf_settings.c
rename to makerom/src/rsf_settings.c
diff --git a/makerom/rsf_settings.h b/makerom/src/rsf_settings.h
similarity index 100%
rename from makerom/rsf_settings.h
rename to makerom/src/rsf_settings.h
diff --git a/makerom/srl.h b/makerom/src/srl.h
similarity index 100%
rename from makerom/srl.h
rename to makerom/src/srl.h
diff --git a/makerom/tik.c b/makerom/src/tik.c
similarity index 100%
rename from makerom/tik.c
rename to makerom/src/tik.c
diff --git a/makerom/tik.h b/makerom/src/tik.h
similarity index 100%
rename from makerom/tik.h
rename to makerom/src/tik.h
diff --git a/makerom/tik_build.h b/makerom/src/tik_build.h
similarity index 100%
rename from makerom/tik_build.h
rename to makerom/src/tik_build.h
diff --git a/makerom/tik_read.h b/makerom/src/tik_read.h
similarity index 100%
rename from makerom/tik_read.h
rename to makerom/src/tik_read.h
diff --git a/makerom/titleid.c b/makerom/src/titleid.c
similarity index 100%
rename from makerom/titleid.c
rename to makerom/src/titleid.c
diff --git a/makerom/titleid.h b/makerom/src/titleid.h
similarity index 100%
rename from makerom/titleid.h
rename to makerom/src/titleid.h
diff --git a/makerom/tmd.c b/makerom/src/tmd.c
similarity index 100%
rename from makerom/tmd.c
rename to makerom/src/tmd.c
diff --git a/makerom/tmd.h b/makerom/src/tmd.h
similarity index 100%
rename from makerom/tmd.h
rename to makerom/src/tmd.h
diff --git a/makerom/tmd_build.h b/makerom/src/tmd_build.h
similarity index 100%
rename from makerom/tmd_build.h
rename to makerom/src/tmd_build.h
diff --git a/makerom/tmd_read.h b/makerom/src/tmd_read.h
similarity index 100%
rename from makerom/tmd_read.h
rename to makerom/src/tmd_read.h
diff --git a/makerom/types.h b/makerom/src/types.h
similarity index 100%
rename from makerom/types.h
rename to makerom/src/types.h
diff --git a/makerom/user_settings.c b/makerom/src/user_settings.c
similarity index 100%
rename from makerom/user_settings.c
rename to makerom/src/user_settings.c
diff --git a/makerom/user_settings.h b/makerom/src/user_settings.h
similarity index 100%
rename from makerom/user_settings.h
rename to makerom/src/user_settings.h
diff --git a/makerom/utils.c b/makerom/src/utils.c
similarity index 100%
rename from makerom/utils.c
rename to makerom/src/utils.c
diff --git a/makerom/utils.h b/makerom/src/utils.h
similarity index 100%
rename from makerom/utils.h
rename to makerom/src/utils.h
diff --git a/makerom/yaml_parser.c b/makerom/src/yaml_parser.c
similarity index 100%
rename from makerom/yaml_parser.c
rename to makerom/src/yaml_parser.c
diff --git a/makerom/yaml_parser.h b/makerom/src/yaml_parser.h
similarity index 100%
rename from makerom/yaml_parser.h
rename to makerom/src/yaml_parser.h