diff --git a/WIP/fs/bis_factory.cpp b/core/fs/bis_factory.cpp similarity index 100% rename from WIP/fs/bis_factory.cpp rename to core/fs/bis_factory.cpp diff --git a/WIP/fs/bis_factory.h b/core/fs/bis_factory.h similarity index 100% rename from WIP/fs/bis_factory.h rename to core/fs/bis_factory.h diff --git a/WIP/fs/card_image.cpp b/core/fs/card_image.cpp similarity index 100% rename from WIP/fs/card_image.cpp rename to core/fs/card_image.cpp diff --git a/WIP/fs/card_image.h b/core/fs/card_image.h similarity index 100% rename from WIP/fs/card_image.h rename to core/fs/card_image.h diff --git a/WIP/fs/common_funcs.h b/core/fs/common_funcs.h similarity index 100% rename from WIP/fs/common_funcs.h rename to core/fs/common_funcs.h diff --git a/WIP/fs/content_archive.cpp b/core/fs/content_archive.cpp similarity index 100% rename from WIP/fs/content_archive.cpp rename to core/fs/content_archive.cpp diff --git a/WIP/fs/content_archive.h b/core/fs/content_archive.h similarity index 100% rename from WIP/fs/content_archive.h rename to core/fs/content_archive.h diff --git a/WIP/fs/control_metadata.cpp b/core/fs/control_metadata.cpp similarity index 100% rename from WIP/fs/control_metadata.cpp rename to core/fs/control_metadata.cpp diff --git a/WIP/fs/control_metadata.h b/core/fs/control_metadata.h similarity index 100% rename from WIP/fs/control_metadata.h rename to core/fs/control_metadata.h diff --git a/WIP/fs/errors.h b/core/fs/errors.h similarity index 100% rename from WIP/fs/errors.h rename to core/fs/errors.h diff --git a/WIP/fs/fs_directory.h b/core/fs/fs_directory.h similarity index 100% rename from WIP/fs/fs_directory.h rename to core/fs/fs_directory.h diff --git a/WIP/fs/fs_file.h b/core/fs/fs_file.h similarity index 100% rename from WIP/fs/fs_file.h rename to core/fs/fs_file.h diff --git a/WIP/fs/fs_filesystem.h b/core/fs/fs_filesystem.h similarity index 100% rename from WIP/fs/fs_filesystem.h rename to core/fs/fs_filesystem.h diff --git a/WIP/fs/fs_memory_management.h b/core/fs/fs_memory_management.h similarity index 100% rename from WIP/fs/fs_memory_management.h rename to core/fs/fs_memory_management.h diff --git a/WIP/fs/fs_operate_range.h b/core/fs/fs_operate_range.h similarity index 100% rename from WIP/fs/fs_operate_range.h rename to core/fs/fs_operate_range.h diff --git a/WIP/fs/fs_path.h b/core/fs/fs_path.h similarity index 100% rename from WIP/fs/fs_path.h rename to core/fs/fs_path.h diff --git a/WIP/fs/fs_path_utility.h b/core/fs/fs_path_utility.h similarity index 100% rename from WIP/fs/fs_path_utility.h rename to core/fs/fs_path_utility.h diff --git a/WIP/fs/fs_save_data_types.h b/core/fs/fs_save_data_types.h similarity index 100% rename from WIP/fs/fs_save_data_types.h rename to core/fs/fs_save_data_types.h diff --git a/WIP/fs/fs_string_util.h b/core/fs/fs_string_util.h similarity index 100% rename from WIP/fs/fs_string_util.h rename to core/fs/fs_string_util.h diff --git a/WIP/fs/fsa/fs_i_directory.h b/core/fs/fsa/fs_i_directory.h similarity index 100% rename from WIP/fs/fsa/fs_i_directory.h rename to core/fs/fsa/fs_i_directory.h diff --git a/WIP/fs/fsa/fs_i_file.h b/core/fs/fsa/fs_i_file.h similarity index 100% rename from WIP/fs/fsa/fs_i_file.h rename to core/fs/fsa/fs_i_file.h diff --git a/WIP/fs/fsa/fs_i_filesystem.h b/core/fs/fsa/fs_i_filesystem.h similarity index 100% rename from WIP/fs/fsa/fs_i_filesystem.h rename to core/fs/fsa/fs_i_filesystem.h diff --git a/WIP/fs/fsmitm_romfsbuild.cpp b/core/fs/fsmitm_romfsbuild.cpp similarity index 100% rename from WIP/fs/fsmitm_romfsbuild.cpp rename to core/fs/fsmitm_romfsbuild.cpp diff --git a/WIP/fs/fsmitm_romfsbuild.h b/core/fs/fsmitm_romfsbuild.h similarity index 100% rename from WIP/fs/fsmitm_romfsbuild.h rename to core/fs/fsmitm_romfsbuild.h diff --git a/WIP/fs/fssrv/fssrv_sf_path.h b/core/fs/fssrv/fssrv_sf_path.h similarity index 100% rename from WIP/fs/fssrv/fssrv_sf_path.h rename to core/fs/fssrv/fssrv_sf_path.h diff --git a/WIP/fs/fssystem/fs_i_storage.h b/core/fs/fssystem/fs_i_storage.h similarity index 100% rename from WIP/fs/fssystem/fs_i_storage.h rename to core/fs/fssystem/fs_i_storage.h diff --git a/WIP/fs/fssystem/fs_types.h b/core/fs/fssystem/fs_types.h similarity index 100% rename from WIP/fs/fssystem/fs_types.h rename to core/fs/fssystem/fs_types.h diff --git a/WIP/fs/fssystem/fssystem_aes_ctr_counter_extended_storage.cpp b/core/fs/fssystem/fssystem_aes_ctr_counter_extended_storage.cpp similarity index 100% rename from WIP/fs/fssystem/fssystem_aes_ctr_counter_extended_storage.cpp rename to core/fs/fssystem/fssystem_aes_ctr_counter_extended_storage.cpp diff --git a/WIP/fs/fssystem/fssystem_aes_ctr_counter_extended_storage.h b/core/fs/fssystem/fssystem_aes_ctr_counter_extended_storage.h similarity index 100% rename from WIP/fs/fssystem/fssystem_aes_ctr_counter_extended_storage.h rename to core/fs/fssystem/fssystem_aes_ctr_counter_extended_storage.h diff --git a/WIP/fs/fssystem/fssystem_aes_ctr_storage.cpp b/core/fs/fssystem/fssystem_aes_ctr_storage.cpp similarity index 100% rename from WIP/fs/fssystem/fssystem_aes_ctr_storage.cpp rename to core/fs/fssystem/fssystem_aes_ctr_storage.cpp diff --git a/WIP/fs/fssystem/fssystem_aes_ctr_storage.h b/core/fs/fssystem/fssystem_aes_ctr_storage.h similarity index 100% rename from WIP/fs/fssystem/fssystem_aes_ctr_storage.h rename to core/fs/fssystem/fssystem_aes_ctr_storage.h diff --git a/WIP/fs/fssystem/fssystem_aes_xts_storage.cpp b/core/fs/fssystem/fssystem_aes_xts_storage.cpp similarity index 100% rename from WIP/fs/fssystem/fssystem_aes_xts_storage.cpp rename to core/fs/fssystem/fssystem_aes_xts_storage.cpp diff --git a/WIP/fs/fssystem/fssystem_aes_xts_storage.h b/core/fs/fssystem/fssystem_aes_xts_storage.h similarity index 100% rename from WIP/fs/fssystem/fssystem_aes_xts_storage.h rename to core/fs/fssystem/fssystem_aes_xts_storage.h diff --git a/WIP/fs/fssystem/fssystem_alignment_matching_storage.h b/core/fs/fssystem/fssystem_alignment_matching_storage.h similarity index 100% rename from WIP/fs/fssystem/fssystem_alignment_matching_storage.h rename to core/fs/fssystem/fssystem_alignment_matching_storage.h diff --git a/WIP/fs/fssystem/fssystem_alignment_matching_storage_impl.cpp b/core/fs/fssystem/fssystem_alignment_matching_storage_impl.cpp similarity index 100% rename from WIP/fs/fssystem/fssystem_alignment_matching_storage_impl.cpp rename to core/fs/fssystem/fssystem_alignment_matching_storage_impl.cpp diff --git a/WIP/fs/fssystem/fssystem_alignment_matching_storage_impl.h b/core/fs/fssystem/fssystem_alignment_matching_storage_impl.h similarity index 100% rename from WIP/fs/fssystem/fssystem_alignment_matching_storage_impl.h rename to core/fs/fssystem/fssystem_alignment_matching_storage_impl.h diff --git a/WIP/fs/fssystem/fssystem_bucket_tree.cpp b/core/fs/fssystem/fssystem_bucket_tree.cpp similarity index 100% rename from WIP/fs/fssystem/fssystem_bucket_tree.cpp rename to core/fs/fssystem/fssystem_bucket_tree.cpp diff --git a/WIP/fs/fssystem/fssystem_bucket_tree.h b/core/fs/fssystem/fssystem_bucket_tree.h similarity index 100% rename from WIP/fs/fssystem/fssystem_bucket_tree.h rename to core/fs/fssystem/fssystem_bucket_tree.h diff --git a/WIP/fs/fssystem/fssystem_bucket_tree_template_impl.h b/core/fs/fssystem/fssystem_bucket_tree_template_impl.h similarity index 100% rename from WIP/fs/fssystem/fssystem_bucket_tree_template_impl.h rename to core/fs/fssystem/fssystem_bucket_tree_template_impl.h diff --git a/WIP/fs/fssystem/fssystem_bucket_tree_utils.h b/core/fs/fssystem/fssystem_bucket_tree_utils.h similarity index 100% rename from WIP/fs/fssystem/fssystem_bucket_tree_utils.h rename to core/fs/fssystem/fssystem_bucket_tree_utils.h diff --git a/WIP/fs/fssystem/fssystem_compressed_storage.h b/core/fs/fssystem/fssystem_compressed_storage.h similarity index 100% rename from WIP/fs/fssystem/fssystem_compressed_storage.h rename to core/fs/fssystem/fssystem_compressed_storage.h diff --git a/WIP/fs/fssystem/fssystem_compression_common.h b/core/fs/fssystem/fssystem_compression_common.h similarity index 100% rename from WIP/fs/fssystem/fssystem_compression_common.h rename to core/fs/fssystem/fssystem_compression_common.h diff --git a/WIP/fs/fssystem/fssystem_compression_configuration.cpp b/core/fs/fssystem/fssystem_compression_configuration.cpp similarity index 100% rename from WIP/fs/fssystem/fssystem_compression_configuration.cpp rename to core/fs/fssystem/fssystem_compression_configuration.cpp diff --git a/WIP/fs/fssystem/fssystem_compression_configuration.h b/core/fs/fssystem/fssystem_compression_configuration.h similarity index 100% rename from WIP/fs/fssystem/fssystem_compression_configuration.h rename to core/fs/fssystem/fssystem_compression_configuration.h diff --git a/WIP/fs/fssystem/fssystem_crypto_configuration.cpp b/core/fs/fssystem/fssystem_crypto_configuration.cpp similarity index 100% rename from WIP/fs/fssystem/fssystem_crypto_configuration.cpp rename to core/fs/fssystem/fssystem_crypto_configuration.cpp diff --git a/WIP/fs/fssystem/fssystem_crypto_configuration.h b/core/fs/fssystem/fssystem_crypto_configuration.h similarity index 100% rename from WIP/fs/fssystem/fssystem_crypto_configuration.h rename to core/fs/fssystem/fssystem_crypto_configuration.h diff --git a/WIP/fs/fssystem/fssystem_hierarchical_integrity_verification_storage.cpp b/core/fs/fssystem/fssystem_hierarchical_integrity_verification_storage.cpp similarity index 100% rename from WIP/fs/fssystem/fssystem_hierarchical_integrity_verification_storage.cpp rename to core/fs/fssystem/fssystem_hierarchical_integrity_verification_storage.cpp diff --git a/WIP/fs/fssystem/fssystem_hierarchical_integrity_verification_storage.h b/core/fs/fssystem/fssystem_hierarchical_integrity_verification_storage.h similarity index 100% rename from WIP/fs/fssystem/fssystem_hierarchical_integrity_verification_storage.h rename to core/fs/fssystem/fssystem_hierarchical_integrity_verification_storage.h diff --git a/WIP/fs/fssystem/fssystem_hierarchical_sha256_storage.cpp b/core/fs/fssystem/fssystem_hierarchical_sha256_storage.cpp similarity index 100% rename from WIP/fs/fssystem/fssystem_hierarchical_sha256_storage.cpp rename to core/fs/fssystem/fssystem_hierarchical_sha256_storage.cpp diff --git a/WIP/fs/fssystem/fssystem_hierarchical_sha256_storage.h b/core/fs/fssystem/fssystem_hierarchical_sha256_storage.h similarity index 100% rename from WIP/fs/fssystem/fssystem_hierarchical_sha256_storage.h rename to core/fs/fssystem/fssystem_hierarchical_sha256_storage.h diff --git a/WIP/fs/fssystem/fssystem_indirect_storage.cpp b/core/fs/fssystem/fssystem_indirect_storage.cpp similarity index 100% rename from WIP/fs/fssystem/fssystem_indirect_storage.cpp rename to core/fs/fssystem/fssystem_indirect_storage.cpp diff --git a/WIP/fs/fssystem/fssystem_indirect_storage.h b/core/fs/fssystem/fssystem_indirect_storage.h similarity index 100% rename from WIP/fs/fssystem/fssystem_indirect_storage.h rename to core/fs/fssystem/fssystem_indirect_storage.h diff --git a/WIP/fs/fssystem/fssystem_integrity_romfs_storage.cpp b/core/fs/fssystem/fssystem_integrity_romfs_storage.cpp similarity index 100% rename from WIP/fs/fssystem/fssystem_integrity_romfs_storage.cpp rename to core/fs/fssystem/fssystem_integrity_romfs_storage.cpp diff --git a/WIP/fs/fssystem/fssystem_integrity_romfs_storage.h b/core/fs/fssystem/fssystem_integrity_romfs_storage.h similarity index 100% rename from WIP/fs/fssystem/fssystem_integrity_romfs_storage.h rename to core/fs/fssystem/fssystem_integrity_romfs_storage.h diff --git a/WIP/fs/fssystem/fssystem_integrity_verification_storage.cpp b/core/fs/fssystem/fssystem_integrity_verification_storage.cpp similarity index 100% rename from WIP/fs/fssystem/fssystem_integrity_verification_storage.cpp rename to core/fs/fssystem/fssystem_integrity_verification_storage.cpp diff --git a/WIP/fs/fssystem/fssystem_integrity_verification_storage.h b/core/fs/fssystem/fssystem_integrity_verification_storage.h similarity index 100% rename from WIP/fs/fssystem/fssystem_integrity_verification_storage.h rename to core/fs/fssystem/fssystem_integrity_verification_storage.h diff --git a/WIP/fs/fssystem/fssystem_memory_resource_buffer_hold_storage.h b/core/fs/fssystem/fssystem_memory_resource_buffer_hold_storage.h similarity index 100% rename from WIP/fs/fssystem/fssystem_memory_resource_buffer_hold_storage.h rename to core/fs/fssystem/fssystem_memory_resource_buffer_hold_storage.h diff --git a/WIP/fs/fssystem/fssystem_nca_file_system_driver.cpp b/core/fs/fssystem/fssystem_nca_file_system_driver.cpp similarity index 100% rename from WIP/fs/fssystem/fssystem_nca_file_system_driver.cpp rename to core/fs/fssystem/fssystem_nca_file_system_driver.cpp diff --git a/WIP/fs/fssystem/fssystem_nca_file_system_driver.h b/core/fs/fssystem/fssystem_nca_file_system_driver.h similarity index 100% rename from WIP/fs/fssystem/fssystem_nca_file_system_driver.h rename to core/fs/fssystem/fssystem_nca_file_system_driver.h diff --git a/WIP/fs/fssystem/fssystem_nca_header.cpp b/core/fs/fssystem/fssystem_nca_header.cpp similarity index 100% rename from WIP/fs/fssystem/fssystem_nca_header.cpp rename to core/fs/fssystem/fssystem_nca_header.cpp diff --git a/WIP/fs/fssystem/fssystem_nca_header.h b/core/fs/fssystem/fssystem_nca_header.h similarity index 100% rename from WIP/fs/fssystem/fssystem_nca_header.h rename to core/fs/fssystem/fssystem_nca_header.h diff --git a/WIP/fs/fssystem/fssystem_nca_reader.cpp b/core/fs/fssystem/fssystem_nca_reader.cpp similarity index 100% rename from WIP/fs/fssystem/fssystem_nca_reader.cpp rename to core/fs/fssystem/fssystem_nca_reader.cpp diff --git a/WIP/fs/fssystem/fssystem_pooled_buffer.cpp b/core/fs/fssystem/fssystem_pooled_buffer.cpp similarity index 100% rename from WIP/fs/fssystem/fssystem_pooled_buffer.cpp rename to core/fs/fssystem/fssystem_pooled_buffer.cpp diff --git a/WIP/fs/fssystem/fssystem_pooled_buffer.h b/core/fs/fssystem/fssystem_pooled_buffer.h similarity index 100% rename from WIP/fs/fssystem/fssystem_pooled_buffer.h rename to core/fs/fssystem/fssystem_pooled_buffer.h diff --git a/WIP/fs/fssystem/fssystem_sparse_storage.cpp b/core/fs/fssystem/fssystem_sparse_storage.cpp similarity index 100% rename from WIP/fs/fssystem/fssystem_sparse_storage.cpp rename to core/fs/fssystem/fssystem_sparse_storage.cpp diff --git a/WIP/fs/fssystem/fssystem_sparse_storage.h b/core/fs/fssystem/fssystem_sparse_storage.h similarity index 100% rename from WIP/fs/fssystem/fssystem_sparse_storage.h rename to core/fs/fssystem/fssystem_sparse_storage.h diff --git a/WIP/fs/fssystem/fssystem_switch_storage.h b/core/fs/fssystem/fssystem_switch_storage.h similarity index 100% rename from WIP/fs/fssystem/fssystem_switch_storage.h rename to core/fs/fssystem/fssystem_switch_storage.h diff --git a/WIP/fs/fssystem/fssystem_utility.cpp b/core/fs/fssystem/fssystem_utility.cpp similarity index 100% rename from WIP/fs/fssystem/fssystem_utility.cpp rename to core/fs/fssystem/fssystem_utility.cpp diff --git a/WIP/fs/fssystem/fssystem_utility.h b/core/fs/fssystem/fssystem_utility.h similarity index 100% rename from WIP/fs/fssystem/fssystem_utility.h rename to core/fs/fssystem/fssystem_utility.h diff --git a/WIP/fs/ips_layer.cpp b/core/fs/ips_layer.cpp similarity index 100% rename from WIP/fs/ips_layer.cpp rename to core/fs/ips_layer.cpp diff --git a/WIP/fs/ips_layer.h b/core/fs/ips_layer.h similarity index 100% rename from WIP/fs/ips_layer.h rename to core/fs/ips_layer.h diff --git a/WIP/fs/kernel_executable.cpp b/core/fs/kernel_executable.cpp similarity index 100% rename from WIP/fs/kernel_executable.cpp rename to core/fs/kernel_executable.cpp diff --git a/WIP/fs/kernel_executable.h b/core/fs/kernel_executable.h similarity index 100% rename from WIP/fs/kernel_executable.h rename to core/fs/kernel_executable.h diff --git a/WIP/fs/nca_metadata.cpp b/core/fs/nca_metadata.cpp similarity index 100% rename from WIP/fs/nca_metadata.cpp rename to core/fs/nca_metadata.cpp diff --git a/WIP/fs/nca_metadata.h b/core/fs/nca_metadata.h similarity index 100% rename from WIP/fs/nca_metadata.h rename to core/fs/nca_metadata.h diff --git a/WIP/fs/partition_filesystem.cpp b/core/fs/partition_filesystem.cpp similarity index 100% rename from WIP/fs/partition_filesystem.cpp rename to core/fs/partition_filesystem.cpp diff --git a/WIP/fs/partition_filesystem.h b/core/fs/partition_filesystem.h similarity index 100% rename from WIP/fs/partition_filesystem.h rename to core/fs/partition_filesystem.h diff --git a/WIP/fs/patch_manager.cpp b/core/fs/patch_manager.cpp similarity index 100% rename from WIP/fs/patch_manager.cpp rename to core/fs/patch_manager.cpp diff --git a/WIP/fs/patch_manager.h b/core/fs/patch_manager.h similarity index 100% rename from WIP/fs/patch_manager.h rename to core/fs/patch_manager.h diff --git a/WIP/fs/program_metadata.cpp b/core/fs/program_metadata.cpp similarity index 100% rename from WIP/fs/program_metadata.cpp rename to core/fs/program_metadata.cpp diff --git a/WIP/fs/program_metadata.h b/core/fs/program_metadata.h similarity index 100% rename from WIP/fs/program_metadata.h rename to core/fs/program_metadata.h diff --git a/WIP/fs/registered_cache.cpp b/core/fs/registered_cache.cpp similarity index 100% rename from WIP/fs/registered_cache.cpp rename to core/fs/registered_cache.cpp diff --git a/WIP/fs/registered_cache.h b/core/fs/registered_cache.h similarity index 100% rename from WIP/fs/registered_cache.h rename to core/fs/registered_cache.h diff --git a/WIP/fs/romfs.cpp b/core/fs/romfs.cpp similarity index 100% rename from WIP/fs/romfs.cpp rename to core/fs/romfs.cpp diff --git a/WIP/fs/romfs.h b/core/fs/romfs.h similarity index 100% rename from WIP/fs/romfs.h rename to core/fs/romfs.h diff --git a/WIP/fs/romfs_factory.cpp b/core/fs/romfs_factory.cpp similarity index 100% rename from WIP/fs/romfs_factory.cpp rename to core/fs/romfs_factory.cpp diff --git a/WIP/fs/romfs_factory.h b/core/fs/romfs_factory.h similarity index 100% rename from WIP/fs/romfs_factory.h rename to core/fs/romfs_factory.h diff --git a/WIP/fs/savedata_factory.cpp b/core/fs/savedata_factory.cpp similarity index 100% rename from WIP/fs/savedata_factory.cpp rename to core/fs/savedata_factory.cpp diff --git a/WIP/fs/savedata_factory.h b/core/fs/savedata_factory.h similarity index 100% rename from WIP/fs/savedata_factory.h rename to core/fs/savedata_factory.h diff --git a/WIP/fs/sdmc_factory.cpp b/core/fs/sdmc_factory.cpp similarity index 100% rename from WIP/fs/sdmc_factory.cpp rename to core/fs/sdmc_factory.cpp diff --git a/WIP/fs/sdmc_factory.h b/core/fs/sdmc_factory.h similarity index 100% rename from WIP/fs/sdmc_factory.h rename to core/fs/sdmc_factory.h diff --git a/WIP/fs/submission_package.cpp b/core/fs/submission_package.cpp similarity index 100% rename from WIP/fs/submission_package.cpp rename to core/fs/submission_package.cpp diff --git a/WIP/fs/submission_package.h b/core/fs/submission_package.h similarity index 100% rename from WIP/fs/submission_package.h rename to core/fs/submission_package.h diff --git a/WIP/fs/system_archive/data/font_chinese_simplified.cpp b/core/fs/system_archive/data/font_chinese_simplified.cpp similarity index 100% rename from WIP/fs/system_archive/data/font_chinese_simplified.cpp rename to core/fs/system_archive/data/font_chinese_simplified.cpp diff --git a/WIP/fs/system_archive/data/font_chinese_simplified.h b/core/fs/system_archive/data/font_chinese_simplified.h similarity index 100% rename from WIP/fs/system_archive/data/font_chinese_simplified.h rename to core/fs/system_archive/data/font_chinese_simplified.h diff --git a/WIP/fs/system_archive/data/font_chinese_traditional.cpp b/core/fs/system_archive/data/font_chinese_traditional.cpp similarity index 100% rename from WIP/fs/system_archive/data/font_chinese_traditional.cpp rename to core/fs/system_archive/data/font_chinese_traditional.cpp diff --git a/WIP/fs/system_archive/data/font_chinese_traditional.h b/core/fs/system_archive/data/font_chinese_traditional.h similarity index 100% rename from WIP/fs/system_archive/data/font_chinese_traditional.h rename to core/fs/system_archive/data/font_chinese_traditional.h diff --git a/WIP/fs/system_archive/data/font_extended_chinese_simplified.cpp b/core/fs/system_archive/data/font_extended_chinese_simplified.cpp similarity index 100% rename from WIP/fs/system_archive/data/font_extended_chinese_simplified.cpp rename to core/fs/system_archive/data/font_extended_chinese_simplified.cpp diff --git a/WIP/fs/system_archive/data/font_extended_chinese_simplified.h b/core/fs/system_archive/data/font_extended_chinese_simplified.h similarity index 100% rename from WIP/fs/system_archive/data/font_extended_chinese_simplified.h rename to core/fs/system_archive/data/font_extended_chinese_simplified.h diff --git a/WIP/fs/system_archive/data/font_korean.cpp b/core/fs/system_archive/data/font_korean.cpp similarity index 100% rename from WIP/fs/system_archive/data/font_korean.cpp rename to core/fs/system_archive/data/font_korean.cpp diff --git a/WIP/fs/system_archive/data/font_korean.h b/core/fs/system_archive/data/font_korean.h similarity index 100% rename from WIP/fs/system_archive/data/font_korean.h rename to core/fs/system_archive/data/font_korean.h diff --git a/WIP/fs/system_archive/data/font_nintendo_extended.cpp b/core/fs/system_archive/data/font_nintendo_extended.cpp similarity index 100% rename from WIP/fs/system_archive/data/font_nintendo_extended.cpp rename to core/fs/system_archive/data/font_nintendo_extended.cpp diff --git a/WIP/fs/system_archive/data/font_nintendo_extended.h b/core/fs/system_archive/data/font_nintendo_extended.h similarity index 100% rename from WIP/fs/system_archive/data/font_nintendo_extended.h rename to core/fs/system_archive/data/font_nintendo_extended.h diff --git a/WIP/fs/system_archive/data/font_standard.cpp b/core/fs/system_archive/data/font_standard.cpp similarity index 100% rename from WIP/fs/system_archive/data/font_standard.cpp rename to core/fs/system_archive/data/font_standard.cpp diff --git a/WIP/fs/system_archive/data/font_standard.h b/core/fs/system_archive/data/font_standard.h similarity index 100% rename from WIP/fs/system_archive/data/font_standard.h rename to core/fs/system_archive/data/font_standard.h diff --git a/WIP/fs/system_archive/mii_model.cpp b/core/fs/system_archive/mii_model.cpp similarity index 100% rename from WIP/fs/system_archive/mii_model.cpp rename to core/fs/system_archive/mii_model.cpp diff --git a/WIP/fs/system_archive/mii_model.h b/core/fs/system_archive/mii_model.h similarity index 100% rename from WIP/fs/system_archive/mii_model.h rename to core/fs/system_archive/mii_model.h diff --git a/WIP/fs/system_archive/ng_word.cpp b/core/fs/system_archive/ng_word.cpp similarity index 100% rename from WIP/fs/system_archive/ng_word.cpp rename to core/fs/system_archive/ng_word.cpp diff --git a/WIP/fs/system_archive/ng_word.h b/core/fs/system_archive/ng_word.h similarity index 100% rename from WIP/fs/system_archive/ng_word.h rename to core/fs/system_archive/ng_word.h diff --git a/WIP/fs/system_archive/shared_font.cpp b/core/fs/system_archive/shared_font.cpp similarity index 100% rename from WIP/fs/system_archive/shared_font.cpp rename to core/fs/system_archive/shared_font.cpp diff --git a/WIP/fs/system_archive/shared_font.h b/core/fs/system_archive/shared_font.h similarity index 100% rename from WIP/fs/system_archive/shared_font.h rename to core/fs/system_archive/shared_font.h diff --git a/WIP/fs/system_archive/system_archive.cpp b/core/fs/system_archive/system_archive.cpp similarity index 100% rename from WIP/fs/system_archive/system_archive.cpp rename to core/fs/system_archive/system_archive.cpp diff --git a/WIP/fs/system_archive/system_archive.h b/core/fs/system_archive/system_archive.h similarity index 100% rename from WIP/fs/system_archive/system_archive.h rename to core/fs/system_archive/system_archive.h diff --git a/WIP/fs/system_archive/system_version.cpp b/core/fs/system_archive/system_version.cpp similarity index 100% rename from WIP/fs/system_archive/system_version.cpp rename to core/fs/system_archive/system_version.cpp diff --git a/WIP/fs/system_archive/system_version.h b/core/fs/system_archive/system_version.h similarity index 100% rename from WIP/fs/system_archive/system_version.h rename to core/fs/system_archive/system_version.h diff --git a/WIP/fs/system_archive/time_zone_binary.cpp b/core/fs/system_archive/time_zone_binary.cpp similarity index 100% rename from WIP/fs/system_archive/time_zone_binary.cpp rename to core/fs/system_archive/time_zone_binary.cpp diff --git a/WIP/fs/system_archive/time_zone_binary.h b/core/fs/system_archive/time_zone_binary.h similarity index 100% rename from WIP/fs/system_archive/time_zone_binary.h rename to core/fs/system_archive/time_zone_binary.h diff --git a/WIP/fs/vfs/vfs.cpp b/core/fs/vfs/vfs.cpp similarity index 100% rename from WIP/fs/vfs/vfs.cpp rename to core/fs/vfs/vfs.cpp diff --git a/WIP/fs/vfs/vfs.h b/core/fs/vfs/vfs.h similarity index 100% rename from WIP/fs/vfs/vfs.h rename to core/fs/vfs/vfs.h diff --git a/WIP/fs/vfs/vfs_cached.cpp b/core/fs/vfs/vfs_cached.cpp similarity index 100% rename from WIP/fs/vfs/vfs_cached.cpp rename to core/fs/vfs/vfs_cached.cpp diff --git a/WIP/fs/vfs/vfs_cached.h b/core/fs/vfs/vfs_cached.h similarity index 100% rename from WIP/fs/vfs/vfs_cached.h rename to core/fs/vfs/vfs_cached.h diff --git a/WIP/fs/vfs/vfs_concat.cpp b/core/fs/vfs/vfs_concat.cpp similarity index 100% rename from WIP/fs/vfs/vfs_concat.cpp rename to core/fs/vfs/vfs_concat.cpp diff --git a/WIP/fs/vfs/vfs_concat.h b/core/fs/vfs/vfs_concat.h similarity index 100% rename from WIP/fs/vfs/vfs_concat.h rename to core/fs/vfs/vfs_concat.h diff --git a/WIP/fs/vfs/vfs_layered.cpp b/core/fs/vfs/vfs_layered.cpp similarity index 100% rename from WIP/fs/vfs/vfs_layered.cpp rename to core/fs/vfs/vfs_layered.cpp diff --git a/WIP/fs/vfs/vfs_layered.h b/core/fs/vfs/vfs_layered.h similarity index 100% rename from WIP/fs/vfs/vfs_layered.h rename to core/fs/vfs/vfs_layered.h diff --git a/WIP/fs/vfs/vfs_offset.cpp b/core/fs/vfs/vfs_offset.cpp similarity index 100% rename from WIP/fs/vfs/vfs_offset.cpp rename to core/fs/vfs/vfs_offset.cpp diff --git a/WIP/fs/vfs/vfs_offset.h b/core/fs/vfs/vfs_offset.h similarity index 100% rename from WIP/fs/vfs/vfs_offset.h rename to core/fs/vfs/vfs_offset.h diff --git a/WIP/fs/vfs/vfs_real.cpp b/core/fs/vfs/vfs_real.cpp similarity index 100% rename from WIP/fs/vfs/vfs_real.cpp rename to core/fs/vfs/vfs_real.cpp diff --git a/WIP/fs/vfs/vfs_real.h b/core/fs/vfs/vfs_real.h similarity index 100% rename from WIP/fs/vfs/vfs_real.h rename to core/fs/vfs/vfs_real.h diff --git a/WIP/fs/vfs/vfs_static.h b/core/fs/vfs/vfs_static.h similarity index 100% rename from WIP/fs/vfs/vfs_static.h rename to core/fs/vfs/vfs_static.h diff --git a/WIP/fs/vfs/vfs_types.h b/core/fs/vfs/vfs_types.h similarity index 100% rename from WIP/fs/vfs/vfs_types.h rename to core/fs/vfs/vfs_types.h diff --git a/WIP/fs/vfs/vfs_vector.cpp b/core/fs/vfs/vfs_vector.cpp similarity index 100% rename from WIP/fs/vfs/vfs_vector.cpp rename to core/fs/vfs/vfs_vector.cpp diff --git a/WIP/fs/vfs/vfs_vector.h b/core/fs/vfs/vfs_vector.h similarity index 100% rename from WIP/fs/vfs/vfs_vector.h rename to core/fs/vfs/vfs_vector.h diff --git a/WIP/fs/xts_archive.cpp b/core/fs/xts_archive.cpp similarity index 100% rename from WIP/fs/xts_archive.cpp rename to core/fs/xts_archive.cpp diff --git a/WIP/fs/xts_archive.h b/core/fs/xts_archive.h similarity index 100% rename from WIP/fs/xts_archive.h rename to core/fs/xts_archive.h