diff --git a/README.md b/README.md
index 0dc7138b..66d2257d 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,6 @@
-libstratosphere is a work-in-progress C++ library for development of system modules for the Nintendo Switch.
-
-It is built around extending [libnx](https://github.com/switchbrew/libnx).
-
-It also provides bindings for custom extensions to Horizon OS implemented by [Atmosphère](https://github.com/Atmosphere-NX).
+Atmosphere-libs is a collection of libraries for doing operating system development for the Nintendo Switch.
Licensing
=====
@@ -14,18 +10,19 @@ This software is licensed under the terms of the GPLv2, with exemptions for spec
You can find a copy of the license in the [LICENSE file](LICENSE).
Exemptions:
-* The [yuzu emulator project](https://github.com/yuzu-emu/yuzu) is exempt from GPLv2 licensing and may (at its option) instead license any source code authored for the libstratosphere project as GPLv2 or later.
+* The [yuzu emulator project](https://github.com/yuzu-emu/yuzu) is exempt from GPLv2 licensing and may (at its option) instead license any source code authored for the atmosphere-libs project as GPLv2 or later.
Credits
=====
-libstratosphere is currently being developed and maintained by __SciresM__.
+Atmosphere-libs is currently being developed and maintained by __SciresM__.
-In addition to those credited in [Atmosphère's credits](https://github.com/Atmosphere-NX/Atmosphere/blob/master/README.md#Credits), we would like to thank for contributing to libstratosphere in some significant way:
+In addition to those credited in [Atmosphère's credits](https://github.com/Atmosphere-NX/Atmosphere/blob/master/README.md#Credits), we would like to thank for contributing to atmosphere-libs in some significant way:
-* __hthh__
-* __fincs__
-* __lioncash__
-* __misson20000__
-* __neobrain__
-* __yellows8__
+* @[devkitPro](https://github.com/devkitPro)
+* @[yellows8](https://github.com/yellows8)
+* @[qlutoo](https://github.com/plutooo)
+* @[Nintendo](https://github.com/Nintendo)
+* @[NVidia](https://github.com/NVidia)
+
+Additional credits may be found in the README.md for specific libraries.
\ No newline at end of file
diff --git a/Makefile b/libstratosphere/Makefile
similarity index 100%
rename from Makefile
rename to libstratosphere/Makefile
diff --git a/libstratosphere/README.md b/libstratosphere/README.md
new file mode 100644
index 00000000..0dc7138b
--- /dev/null
+++ b/libstratosphere/README.md
@@ -0,0 +1,31 @@
+
+
+libstratosphere is a work-in-progress C++ library for development of system modules for the Nintendo Switch.
+
+It is built around extending [libnx](https://github.com/switchbrew/libnx).
+
+It also provides bindings for custom extensions to Horizon OS implemented by [Atmosphère](https://github.com/Atmosphere-NX).
+
+Licensing
+=====
+
+This software is licensed under the terms of the GPLv2, with exemptions for specific projects noted below.
+
+You can find a copy of the license in the [LICENSE file](LICENSE).
+
+Exemptions:
+* The [yuzu emulator project](https://github.com/yuzu-emu/yuzu) is exempt from GPLv2 licensing and may (at its option) instead license any source code authored for the libstratosphere project as GPLv2 or later.
+
+Credits
+=====
+
+libstratosphere is currently being developed and maintained by __SciresM__.
+
+In addition to those credited in [Atmosphère's credits](https://github.com/Atmosphere-NX/Atmosphere/blob/master/README.md#Credits), we would like to thank for contributing to libstratosphere in some significant way:
+
+* __hthh__
+* __fincs__
+* __lioncash__
+* __misson20000__
+* __neobrain__
+* __yellows8__
diff --git a/include/atmosphere/common.hpp b/libstratosphere/include/atmosphere/common.hpp
similarity index 100%
rename from include/atmosphere/common.hpp
rename to libstratosphere/include/atmosphere/common.hpp
diff --git a/include/atmosphere/common_includes.hpp b/libstratosphere/include/atmosphere/common_includes.hpp
similarity index 100%
rename from include/atmosphere/common_includes.hpp
rename to libstratosphere/include/atmosphere/common_includes.hpp
diff --git a/include/atmosphere/defines.hpp b/libstratosphere/include/atmosphere/defines.hpp
similarity index 100%
rename from include/atmosphere/defines.hpp
rename to libstratosphere/include/atmosphere/defines.hpp
diff --git a/include/atmosphere/results.hpp b/libstratosphere/include/atmosphere/results.hpp
similarity index 100%
rename from include/atmosphere/results.hpp
rename to libstratosphere/include/atmosphere/results.hpp
diff --git a/include/atmosphere/results/cal_results.hpp b/libstratosphere/include/atmosphere/results/cal_results.hpp
similarity index 100%
rename from include/atmosphere/results/cal_results.hpp
rename to libstratosphere/include/atmosphere/results/cal_results.hpp
diff --git a/include/atmosphere/results/creport_results.hpp b/libstratosphere/include/atmosphere/results/creport_results.hpp
similarity index 100%
rename from include/atmosphere/results/creport_results.hpp
rename to libstratosphere/include/atmosphere/results/creport_results.hpp
diff --git a/include/atmosphere/results/debug_results.hpp b/libstratosphere/include/atmosphere/results/debug_results.hpp
similarity index 100%
rename from include/atmosphere/results/debug_results.hpp
rename to libstratosphere/include/atmosphere/results/debug_results.hpp
diff --git a/include/atmosphere/results/dmnt_results.hpp b/libstratosphere/include/atmosphere/results/dmnt_results.hpp
similarity index 100%
rename from include/atmosphere/results/dmnt_results.hpp
rename to libstratosphere/include/atmosphere/results/dmnt_results.hpp
diff --git a/include/atmosphere/results/err_results.hpp b/libstratosphere/include/atmosphere/results/err_results.hpp
similarity index 100%
rename from include/atmosphere/results/err_results.hpp
rename to libstratosphere/include/atmosphere/results/err_results.hpp
diff --git a/include/atmosphere/results/exosphere_results.hpp b/libstratosphere/include/atmosphere/results/exosphere_results.hpp
similarity index 100%
rename from include/atmosphere/results/exosphere_results.hpp
rename to libstratosphere/include/atmosphere/results/exosphere_results.hpp
diff --git a/include/atmosphere/results/fatal_results.hpp b/libstratosphere/include/atmosphere/results/fatal_results.hpp
similarity index 100%
rename from include/atmosphere/results/fatal_results.hpp
rename to libstratosphere/include/atmosphere/results/fatal_results.hpp
diff --git a/include/atmosphere/results/fs_results.hpp b/libstratosphere/include/atmosphere/results/fs_results.hpp
similarity index 100%
rename from include/atmosphere/results/fs_results.hpp
rename to libstratosphere/include/atmosphere/results/fs_results.hpp
diff --git a/include/atmosphere/results/hipc_results.hpp b/libstratosphere/include/atmosphere/results/hipc_results.hpp
similarity index 100%
rename from include/atmosphere/results/hipc_results.hpp
rename to libstratosphere/include/atmosphere/results/hipc_results.hpp
diff --git a/include/atmosphere/results/i2c_results.hpp b/libstratosphere/include/atmosphere/results/i2c_results.hpp
similarity index 100%
rename from include/atmosphere/results/i2c_results.hpp
rename to libstratosphere/include/atmosphere/results/i2c_results.hpp
diff --git a/include/atmosphere/results/kvdb_results.hpp b/libstratosphere/include/atmosphere/results/kvdb_results.hpp
similarity index 100%
rename from include/atmosphere/results/kvdb_results.hpp
rename to libstratosphere/include/atmosphere/results/kvdb_results.hpp
diff --git a/include/atmosphere/results/loader_results.hpp b/libstratosphere/include/atmosphere/results/loader_results.hpp
similarity index 100%
rename from include/atmosphere/results/loader_results.hpp
rename to libstratosphere/include/atmosphere/results/loader_results.hpp
diff --git a/include/atmosphere/results/lr_results.hpp b/libstratosphere/include/atmosphere/results/lr_results.hpp
similarity index 100%
rename from include/atmosphere/results/lr_results.hpp
rename to libstratosphere/include/atmosphere/results/lr_results.hpp
diff --git a/include/atmosphere/results/ncm_results.hpp b/libstratosphere/include/atmosphere/results/ncm_results.hpp
similarity index 100%
rename from include/atmosphere/results/ncm_results.hpp
rename to libstratosphere/include/atmosphere/results/ncm_results.hpp
diff --git a/include/atmosphere/results/os_results.hpp b/libstratosphere/include/atmosphere/results/os_results.hpp
similarity index 100%
rename from include/atmosphere/results/os_results.hpp
rename to libstratosphere/include/atmosphere/results/os_results.hpp
diff --git a/include/atmosphere/results/pm_results.hpp b/libstratosphere/include/atmosphere/results/pm_results.hpp
similarity index 100%
rename from include/atmosphere/results/pm_results.hpp
rename to libstratosphere/include/atmosphere/results/pm_results.hpp
diff --git a/include/atmosphere/results/results_common.hpp b/libstratosphere/include/atmosphere/results/results_common.hpp
similarity index 100%
rename from include/atmosphere/results/results_common.hpp
rename to libstratosphere/include/atmosphere/results/results_common.hpp
diff --git a/include/atmosphere/results/ro_results.hpp b/libstratosphere/include/atmosphere/results/ro_results.hpp
similarity index 100%
rename from include/atmosphere/results/ro_results.hpp
rename to libstratosphere/include/atmosphere/results/ro_results.hpp
diff --git a/include/atmosphere/results/settings_results.hpp b/libstratosphere/include/atmosphere/results/settings_results.hpp
similarity index 100%
rename from include/atmosphere/results/settings_results.hpp
rename to libstratosphere/include/atmosphere/results/settings_results.hpp
diff --git a/include/atmosphere/results/sf_results.hpp b/libstratosphere/include/atmosphere/results/sf_results.hpp
similarity index 100%
rename from include/atmosphere/results/sf_results.hpp
rename to libstratosphere/include/atmosphere/results/sf_results.hpp
diff --git a/include/atmosphere/results/sm_results.hpp b/libstratosphere/include/atmosphere/results/sm_results.hpp
similarity index 100%
rename from include/atmosphere/results/sm_results.hpp
rename to libstratosphere/include/atmosphere/results/sm_results.hpp
diff --git a/include/atmosphere/results/spl_results.hpp b/libstratosphere/include/atmosphere/results/spl_results.hpp
similarity index 100%
rename from include/atmosphere/results/spl_results.hpp
rename to libstratosphere/include/atmosphere/results/spl_results.hpp
diff --git a/include/atmosphere/results/svc_results.hpp b/libstratosphere/include/atmosphere/results/svc_results.hpp
similarity index 100%
rename from include/atmosphere/results/svc_results.hpp
rename to libstratosphere/include/atmosphere/results/svc_results.hpp
diff --git a/include/atmosphere/results/updater_results.hpp b/libstratosphere/include/atmosphere/results/updater_results.hpp
similarity index 100%
rename from include/atmosphere/results/updater_results.hpp
rename to libstratosphere/include/atmosphere/results/updater_results.hpp
diff --git a/include/atmosphere/results/vi_results.hpp b/libstratosphere/include/atmosphere/results/vi_results.hpp
similarity index 100%
rename from include/atmosphere/results/vi_results.hpp
rename to libstratosphere/include/atmosphere/results/vi_results.hpp
diff --git a/include/atmosphere/svc.hpp b/libstratosphere/include/atmosphere/svc.hpp
similarity index 100%
rename from include/atmosphere/svc.hpp
rename to libstratosphere/include/atmosphere/svc.hpp
diff --git a/include/atmosphere/svc/svc_types.hpp b/libstratosphere/include/atmosphere/svc/svc_types.hpp
similarity index 100%
rename from include/atmosphere/svc/svc_types.hpp
rename to libstratosphere/include/atmosphere/svc/svc_types.hpp
diff --git a/include/atmosphere/util.hpp b/libstratosphere/include/atmosphere/util.hpp
similarity index 100%
rename from include/atmosphere/util.hpp
rename to libstratosphere/include/atmosphere/util.hpp
diff --git a/include/atmosphere/util/util_alignment.hpp b/libstratosphere/include/atmosphere/util/util_alignment.hpp
similarity index 100%
rename from include/atmosphere/util/util_alignment.hpp
rename to libstratosphere/include/atmosphere/util/util_alignment.hpp
diff --git a/include/atmosphere/util/util_compression.hpp b/libstratosphere/include/atmosphere/util/util_compression.hpp
similarity index 100%
rename from include/atmosphere/util/util_compression.hpp
rename to libstratosphere/include/atmosphere/util/util_compression.hpp
diff --git a/include/atmosphere/util/util_ini.hpp b/libstratosphere/include/atmosphere/util/util_ini.hpp
similarity index 100%
rename from include/atmosphere/util/util_ini.hpp
rename to libstratosphere/include/atmosphere/util/util_ini.hpp
diff --git a/include/atmosphere/util/util_intrusive_list.hpp b/libstratosphere/include/atmosphere/util/util_intrusive_list.hpp
similarity index 100%
rename from include/atmosphere/util/util_intrusive_list.hpp
rename to libstratosphere/include/atmosphere/util/util_intrusive_list.hpp
diff --git a/include/atmosphere/util/util_intrusive_red_black_tree.hpp b/libstratosphere/include/atmosphere/util/util_intrusive_red_black_tree.hpp
similarity index 100%
rename from include/atmosphere/util/util_intrusive_red_black_tree.hpp
rename to libstratosphere/include/atmosphere/util/util_intrusive_red_black_tree.hpp
diff --git a/include/atmosphere/util/util_parent_of_member.hpp b/libstratosphere/include/atmosphere/util/util_parent_of_member.hpp
similarity index 100%
rename from include/atmosphere/util/util_parent_of_member.hpp
rename to libstratosphere/include/atmosphere/util/util_parent_of_member.hpp
diff --git a/include/atmosphere/util/util_scope_guard.hpp b/libstratosphere/include/atmosphere/util/util_scope_guard.hpp
similarity index 100%
rename from include/atmosphere/util/util_scope_guard.hpp
rename to libstratosphere/include/atmosphere/util/util_scope_guard.hpp
diff --git a/include/atmosphere/util/util_size.hpp b/libstratosphere/include/atmosphere/util/util_size.hpp
similarity index 100%
rename from include/atmosphere/util/util_size.hpp
rename to libstratosphere/include/atmosphere/util/util_size.hpp
diff --git a/include/atmosphere/util/util_typed_storage.hpp b/libstratosphere/include/atmosphere/util/util_typed_storage.hpp
similarity index 100%
rename from include/atmosphere/util/util_typed_storage.hpp
rename to libstratosphere/include/atmosphere/util/util_typed_storage.hpp
diff --git a/include/freebsd/sys/tree.h b/libstratosphere/include/freebsd/sys/tree.h
similarity index 100%
rename from include/freebsd/sys/tree.h
rename to libstratosphere/include/freebsd/sys/tree.h
diff --git a/include/stratosphere.hpp b/libstratosphere/include/stratosphere.hpp
similarity index 100%
rename from include/stratosphere.hpp
rename to libstratosphere/include/stratosphere.hpp
diff --git a/include/stratosphere/ams.hpp b/libstratosphere/include/stratosphere/ams.hpp
similarity index 100%
rename from include/stratosphere/ams.hpp
rename to libstratosphere/include/stratosphere/ams.hpp
diff --git a/include/stratosphere/ams/ams_emummc_api.hpp b/libstratosphere/include/stratosphere/ams/ams_emummc_api.hpp
similarity index 100%
rename from include/stratosphere/ams/ams_emummc_api.hpp
rename to libstratosphere/include/stratosphere/ams/ams_emummc_api.hpp
diff --git a/include/stratosphere/ams/ams_environment.hpp b/libstratosphere/include/stratosphere/ams/ams_environment.hpp
similarity index 100%
rename from include/stratosphere/ams/ams_environment.hpp
rename to libstratosphere/include/stratosphere/ams/ams_environment.hpp
diff --git a/include/stratosphere/ams/ams_exosphere_api.hpp b/libstratosphere/include/stratosphere/ams/ams_exosphere_api.hpp
similarity index 100%
rename from include/stratosphere/ams/ams_exosphere_api.hpp
rename to libstratosphere/include/stratosphere/ams/ams_exosphere_api.hpp
diff --git a/include/stratosphere/ams/ams_types.hpp b/libstratosphere/include/stratosphere/ams/ams_types.hpp
similarity index 100%
rename from include/stratosphere/ams/ams_types.hpp
rename to libstratosphere/include/stratosphere/ams/ams_types.hpp
diff --git a/include/stratosphere/boot2.hpp b/libstratosphere/include/stratosphere/boot2.hpp
similarity index 100%
rename from include/stratosphere/boot2.hpp
rename to libstratosphere/include/stratosphere/boot2.hpp
diff --git a/include/stratosphere/boot2/boot2_api.hpp b/libstratosphere/include/stratosphere/boot2/boot2_api.hpp
similarity index 100%
rename from include/stratosphere/boot2/boot2_api.hpp
rename to libstratosphere/include/stratosphere/boot2/boot2_api.hpp
diff --git a/include/stratosphere/cfg.hpp b/libstratosphere/include/stratosphere/cfg.hpp
similarity index 100%
rename from include/stratosphere/cfg.hpp
rename to libstratosphere/include/stratosphere/cfg.hpp
diff --git a/include/stratosphere/cfg/cfg_api.hpp b/libstratosphere/include/stratosphere/cfg/cfg_api.hpp
similarity index 100%
rename from include/stratosphere/cfg/cfg_api.hpp
rename to libstratosphere/include/stratosphere/cfg/cfg_api.hpp
diff --git a/include/stratosphere/cfg/cfg_locale_types.hpp b/libstratosphere/include/stratosphere/cfg/cfg_locale_types.hpp
similarity index 100%
rename from include/stratosphere/cfg/cfg_locale_types.hpp
rename to libstratosphere/include/stratosphere/cfg/cfg_locale_types.hpp
diff --git a/include/stratosphere/cfg/cfg_types.hpp b/libstratosphere/include/stratosphere/cfg/cfg_types.hpp
similarity index 100%
rename from include/stratosphere/cfg/cfg_types.hpp
rename to libstratosphere/include/stratosphere/cfg/cfg_types.hpp
diff --git a/include/stratosphere/dd.hpp b/libstratosphere/include/stratosphere/dd.hpp
similarity index 100%
rename from include/stratosphere/dd.hpp
rename to libstratosphere/include/stratosphere/dd.hpp
diff --git a/include/stratosphere/dd/dd_io_mappings.hpp b/libstratosphere/include/stratosphere/dd/dd_io_mappings.hpp
similarity index 100%
rename from include/stratosphere/dd/dd_io_mappings.hpp
rename to libstratosphere/include/stratosphere/dd/dd_io_mappings.hpp
diff --git a/include/stratosphere/dd/dd_process_handle.hpp b/libstratosphere/include/stratosphere/dd/dd_process_handle.hpp
similarity index 100%
rename from include/stratosphere/dd/dd_process_handle.hpp
rename to libstratosphere/include/stratosphere/dd/dd_process_handle.hpp
diff --git a/include/stratosphere/dmnt.hpp b/libstratosphere/include/stratosphere/dmnt.hpp
similarity index 100%
rename from include/stratosphere/dmnt.hpp
rename to libstratosphere/include/stratosphere/dmnt.hpp
diff --git a/include/stratosphere/dmnt/dmnt_cheat_types.hpp b/libstratosphere/include/stratosphere/dmnt/dmnt_cheat_types.hpp
similarity index 100%
rename from include/stratosphere/dmnt/dmnt_cheat_types.hpp
rename to libstratosphere/include/stratosphere/dmnt/dmnt_cheat_types.hpp
diff --git a/include/stratosphere/fatal.hpp b/libstratosphere/include/stratosphere/fatal.hpp
similarity index 100%
rename from include/stratosphere/fatal.hpp
rename to libstratosphere/include/stratosphere/fatal.hpp
diff --git a/include/stratosphere/fatal/fatal_types.hpp b/libstratosphere/include/stratosphere/fatal/fatal_types.hpp
similarity index 100%
rename from include/stratosphere/fatal/fatal_types.hpp
rename to libstratosphere/include/stratosphere/fatal/fatal_types.hpp
diff --git a/include/stratosphere/fs.hpp b/libstratosphere/include/stratosphere/fs.hpp
similarity index 100%
rename from include/stratosphere/fs.hpp
rename to libstratosphere/include/stratosphere/fs.hpp
diff --git a/include/stratosphere/fs/fs_common.hpp b/libstratosphere/include/stratosphere/fs/fs_common.hpp
similarity index 100%
rename from include/stratosphere/fs/fs_common.hpp
rename to libstratosphere/include/stratosphere/fs/fs_common.hpp
diff --git a/include/stratosphere/fs/fs_directory.hpp b/libstratosphere/include/stratosphere/fs/fs_directory.hpp
similarity index 100%
rename from include/stratosphere/fs/fs_directory.hpp
rename to libstratosphere/include/stratosphere/fs/fs_directory.hpp
diff --git a/include/stratosphere/fs/fs_file.hpp b/libstratosphere/include/stratosphere/fs/fs_file.hpp
similarity index 100%
rename from include/stratosphere/fs/fs_file.hpp
rename to libstratosphere/include/stratosphere/fs/fs_file.hpp
diff --git a/include/stratosphere/fs/fs_file_storage.hpp b/libstratosphere/include/stratosphere/fs/fs_file_storage.hpp
similarity index 100%
rename from include/stratosphere/fs/fs_file_storage.hpp
rename to libstratosphere/include/stratosphere/fs/fs_file_storage.hpp
diff --git a/include/stratosphere/fs/fs_filesystem.hpp b/libstratosphere/include/stratosphere/fs/fs_filesystem.hpp
similarity index 100%
rename from include/stratosphere/fs/fs_filesystem.hpp
rename to libstratosphere/include/stratosphere/fs/fs_filesystem.hpp
diff --git a/include/stratosphere/fs/fs_istorage.hpp b/libstratosphere/include/stratosphere/fs/fs_istorage.hpp
similarity index 100%
rename from include/stratosphere/fs/fs_istorage.hpp
rename to libstratosphere/include/stratosphere/fs/fs_istorage.hpp
diff --git a/include/stratosphere/fs/fs_operate_range.hpp b/libstratosphere/include/stratosphere/fs/fs_operate_range.hpp
similarity index 100%
rename from include/stratosphere/fs/fs_operate_range.hpp
rename to libstratosphere/include/stratosphere/fs/fs_operate_range.hpp
diff --git a/include/stratosphere/fs/fs_path_tool.hpp b/libstratosphere/include/stratosphere/fs/fs_path_tool.hpp
similarity index 100%
rename from include/stratosphere/fs/fs_path_tool.hpp
rename to libstratosphere/include/stratosphere/fs/fs_path_tool.hpp
diff --git a/include/stratosphere/fs/fs_path_utils.hpp b/libstratosphere/include/stratosphere/fs/fs_path_utils.hpp
similarity index 100%
rename from include/stratosphere/fs/fs_path_utils.hpp
rename to libstratosphere/include/stratosphere/fs/fs_path_utils.hpp
diff --git a/include/stratosphere/fs/fs_query_range.hpp b/libstratosphere/include/stratosphere/fs/fs_query_range.hpp
similarity index 100%
rename from include/stratosphere/fs/fs_query_range.hpp
rename to libstratosphere/include/stratosphere/fs/fs_query_range.hpp
diff --git a/include/stratosphere/fs/fs_remote_filesystem.hpp b/libstratosphere/include/stratosphere/fs/fs_remote_filesystem.hpp
similarity index 100%
rename from include/stratosphere/fs/fs_remote_filesystem.hpp
rename to libstratosphere/include/stratosphere/fs/fs_remote_filesystem.hpp
diff --git a/include/stratosphere/fs/fs_remote_storage.hpp b/libstratosphere/include/stratosphere/fs/fs_remote_storage.hpp
similarity index 100%
rename from include/stratosphere/fs/fs_remote_storage.hpp
rename to libstratosphere/include/stratosphere/fs/fs_remote_storage.hpp
diff --git a/include/stratosphere/fs/fsa/fs_idirectory.hpp b/libstratosphere/include/stratosphere/fs/fsa/fs_idirectory.hpp
similarity index 100%
rename from include/stratosphere/fs/fsa/fs_idirectory.hpp
rename to libstratosphere/include/stratosphere/fs/fsa/fs_idirectory.hpp
diff --git a/include/stratosphere/fs/fsa/fs_ifile.hpp b/libstratosphere/include/stratosphere/fs/fsa/fs_ifile.hpp
similarity index 100%
rename from include/stratosphere/fs/fsa/fs_ifile.hpp
rename to libstratosphere/include/stratosphere/fs/fsa/fs_ifile.hpp
diff --git a/include/stratosphere/fs/fsa/fs_ifilesystem.hpp b/libstratosphere/include/stratosphere/fs/fsa/fs_ifilesystem.hpp
similarity index 100%
rename from include/stratosphere/fs/fsa/fs_ifilesystem.hpp
rename to libstratosphere/include/stratosphere/fs/fsa/fs_ifilesystem.hpp
diff --git a/include/stratosphere/fssrv.hpp b/libstratosphere/include/stratosphere/fssrv.hpp
similarity index 100%
rename from include/stratosphere/fssrv.hpp
rename to libstratosphere/include/stratosphere/fssrv.hpp
diff --git a/include/stratosphere/fssrv/fssrv_interface_adapters.hpp b/libstratosphere/include/stratosphere/fssrv/fssrv_interface_adapters.hpp
similarity index 100%
rename from include/stratosphere/fssrv/fssrv_interface_adapters.hpp
rename to libstratosphere/include/stratosphere/fssrv/fssrv_interface_adapters.hpp
diff --git a/include/stratosphere/fssrv/fssrv_path_normalizer.hpp b/libstratosphere/include/stratosphere/fssrv/fssrv_path_normalizer.hpp
similarity index 100%
rename from include/stratosphere/fssrv/fssrv_path_normalizer.hpp
rename to libstratosphere/include/stratosphere/fssrv/fssrv_path_normalizer.hpp
diff --git a/include/stratosphere/fssrv/fssrv_sf_path.hpp b/libstratosphere/include/stratosphere/fssrv/fssrv_sf_path.hpp
similarity index 100%
rename from include/stratosphere/fssrv/fssrv_sf_path.hpp
rename to libstratosphere/include/stratosphere/fssrv/fssrv_sf_path.hpp
diff --git a/include/stratosphere/fssrv/interface_adapters/fssrv_filesystem_interface_adapter.hpp b/libstratosphere/include/stratosphere/fssrv/interface_adapters/fssrv_filesystem_interface_adapter.hpp
similarity index 100%
rename from include/stratosphere/fssrv/interface_adapters/fssrv_filesystem_interface_adapter.hpp
rename to libstratosphere/include/stratosphere/fssrv/interface_adapters/fssrv_filesystem_interface_adapter.hpp
diff --git a/include/stratosphere/fssrv/interface_adapters/fssrv_storage_interface_adapter.hpp b/libstratosphere/include/stratosphere/fssrv/interface_adapters/fssrv_storage_interface_adapter.hpp
similarity index 100%
rename from include/stratosphere/fssrv/interface_adapters/fssrv_storage_interface_adapter.hpp
rename to libstratosphere/include/stratosphere/fssrv/interface_adapters/fssrv_storage_interface_adapter.hpp
diff --git a/include/stratosphere/fssystem.hpp b/libstratosphere/include/stratosphere/fssystem.hpp
similarity index 100%
rename from include/stratosphere/fssystem.hpp
rename to libstratosphere/include/stratosphere/fssystem.hpp
diff --git a/include/stratosphere/fssystem/fssystem_directory_redirection_filesystem.hpp b/libstratosphere/include/stratosphere/fssystem/fssystem_directory_redirection_filesystem.hpp
similarity index 100%
rename from include/stratosphere/fssystem/fssystem_directory_redirection_filesystem.hpp
rename to libstratosphere/include/stratosphere/fssystem/fssystem_directory_redirection_filesystem.hpp
diff --git a/include/stratosphere/fssystem/fssystem_directory_savedata_filesystem.hpp b/libstratosphere/include/stratosphere/fssystem/fssystem_directory_savedata_filesystem.hpp
similarity index 100%
rename from include/stratosphere/fssystem/fssystem_directory_savedata_filesystem.hpp
rename to libstratosphere/include/stratosphere/fssystem/fssystem_directory_savedata_filesystem.hpp
diff --git a/include/stratosphere/fssystem/fssystem_path_tool.hpp b/libstratosphere/include/stratosphere/fssystem/fssystem_path_tool.hpp
similarity index 100%
rename from include/stratosphere/fssystem/fssystem_path_tool.hpp
rename to libstratosphere/include/stratosphere/fssystem/fssystem_path_tool.hpp
diff --git a/include/stratosphere/fssystem/fssystem_subdirectory_filesystem.hpp b/libstratosphere/include/stratosphere/fssystem/fssystem_subdirectory_filesystem.hpp
similarity index 100%
rename from include/stratosphere/fssystem/fssystem_subdirectory_filesystem.hpp
rename to libstratosphere/include/stratosphere/fssystem/fssystem_subdirectory_filesystem.hpp
diff --git a/include/stratosphere/fssystem/fssystem_utility.hpp b/libstratosphere/include/stratosphere/fssystem/fssystem_utility.hpp
similarity index 100%
rename from include/stratosphere/fssystem/fssystem_utility.hpp
rename to libstratosphere/include/stratosphere/fssystem/fssystem_utility.hpp
diff --git a/include/stratosphere/fssystem/impl/fssystem_path_resolution_filesystem.hpp b/libstratosphere/include/stratosphere/fssystem/impl/fssystem_path_resolution_filesystem.hpp
similarity index 100%
rename from include/stratosphere/fssystem/impl/fssystem_path_resolution_filesystem.hpp
rename to libstratosphere/include/stratosphere/fssystem/impl/fssystem_path_resolution_filesystem.hpp
diff --git a/include/stratosphere/hid.hpp b/libstratosphere/include/stratosphere/hid.hpp
similarity index 100%
rename from include/stratosphere/hid.hpp
rename to libstratosphere/include/stratosphere/hid.hpp
diff --git a/include/stratosphere/hid/hid_api.hpp b/libstratosphere/include/stratosphere/hid/hid_api.hpp
similarity index 100%
rename from include/stratosphere/hid/hid_api.hpp
rename to libstratosphere/include/stratosphere/hid/hid_api.hpp
diff --git a/include/stratosphere/hos.hpp b/libstratosphere/include/stratosphere/hos.hpp
similarity index 100%
rename from include/stratosphere/hos.hpp
rename to libstratosphere/include/stratosphere/hos.hpp
diff --git a/include/stratosphere/hos/hos_types.hpp b/libstratosphere/include/stratosphere/hos/hos_types.hpp
similarity index 100%
rename from include/stratosphere/hos/hos_types.hpp
rename to libstratosphere/include/stratosphere/hos/hos_types.hpp
diff --git a/include/stratosphere/hos/hos_version_api.hpp b/libstratosphere/include/stratosphere/hos/hos_version_api.hpp
similarity index 100%
rename from include/stratosphere/hos/hos_version_api.hpp
rename to libstratosphere/include/stratosphere/hos/hos_version_api.hpp
diff --git a/include/stratosphere/kvdb.hpp b/libstratosphere/include/stratosphere/kvdb.hpp
similarity index 100%
rename from include/stratosphere/kvdb.hpp
rename to libstratosphere/include/stratosphere/kvdb.hpp
diff --git a/include/stratosphere/kvdb/kvdb_archive.hpp b/libstratosphere/include/stratosphere/kvdb/kvdb_archive.hpp
similarity index 100%
rename from include/stratosphere/kvdb/kvdb_archive.hpp
rename to libstratosphere/include/stratosphere/kvdb/kvdb_archive.hpp
diff --git a/include/stratosphere/kvdb/kvdb_auto_buffer.hpp b/libstratosphere/include/stratosphere/kvdb/kvdb_auto_buffer.hpp
similarity index 100%
rename from include/stratosphere/kvdb/kvdb_auto_buffer.hpp
rename to libstratosphere/include/stratosphere/kvdb/kvdb_auto_buffer.hpp
diff --git a/include/stratosphere/kvdb/kvdb_bounded_string.hpp b/libstratosphere/include/stratosphere/kvdb/kvdb_bounded_string.hpp
similarity index 100%
rename from include/stratosphere/kvdb/kvdb_bounded_string.hpp
rename to libstratosphere/include/stratosphere/kvdb/kvdb_bounded_string.hpp
diff --git a/include/stratosphere/kvdb/kvdb_file_key_value_cache.hpp b/libstratosphere/include/stratosphere/kvdb/kvdb_file_key_value_cache.hpp
similarity index 100%
rename from include/stratosphere/kvdb/kvdb_file_key_value_cache.hpp
rename to libstratosphere/include/stratosphere/kvdb/kvdb_file_key_value_cache.hpp
diff --git a/include/stratosphere/kvdb/kvdb_file_key_value_store.hpp b/libstratosphere/include/stratosphere/kvdb/kvdb_file_key_value_store.hpp
similarity index 100%
rename from include/stratosphere/kvdb/kvdb_file_key_value_store.hpp
rename to libstratosphere/include/stratosphere/kvdb/kvdb_file_key_value_store.hpp
diff --git a/include/stratosphere/kvdb/kvdb_memory_key_value_store.hpp b/libstratosphere/include/stratosphere/kvdb/kvdb_memory_key_value_store.hpp
similarity index 100%
rename from include/stratosphere/kvdb/kvdb_memory_key_value_store.hpp
rename to libstratosphere/include/stratosphere/kvdb/kvdb_memory_key_value_store.hpp
diff --git a/include/stratosphere/ldr.hpp b/libstratosphere/include/stratosphere/ldr.hpp
similarity index 100%
rename from include/stratosphere/ldr.hpp
rename to libstratosphere/include/stratosphere/ldr.hpp
diff --git a/include/stratosphere/ldr/ldr_pm_api.hpp b/libstratosphere/include/stratosphere/ldr/ldr_pm_api.hpp
similarity index 100%
rename from include/stratosphere/ldr/ldr_pm_api.hpp
rename to libstratosphere/include/stratosphere/ldr/ldr_pm_api.hpp
diff --git a/include/stratosphere/ldr/ldr_types.hpp b/libstratosphere/include/stratosphere/ldr/ldr_types.hpp
similarity index 100%
rename from include/stratosphere/ldr/ldr_types.hpp
rename to libstratosphere/include/stratosphere/ldr/ldr_types.hpp
diff --git a/include/stratosphere/map.hpp b/libstratosphere/include/stratosphere/map.hpp
similarity index 100%
rename from include/stratosphere/map.hpp
rename to libstratosphere/include/stratosphere/map.hpp
diff --git a/include/stratosphere/map/map_api.hpp b/libstratosphere/include/stratosphere/map/map_api.hpp
similarity index 100%
rename from include/stratosphere/map/map_api.hpp
rename to libstratosphere/include/stratosphere/map/map_api.hpp
diff --git a/include/stratosphere/map/map_types.hpp b/libstratosphere/include/stratosphere/map/map_types.hpp
similarity index 100%
rename from include/stratosphere/map/map_types.hpp
rename to libstratosphere/include/stratosphere/map/map_types.hpp
diff --git a/include/stratosphere/ncm.hpp b/libstratosphere/include/stratosphere/ncm.hpp
similarity index 100%
rename from include/stratosphere/ncm.hpp
rename to libstratosphere/include/stratosphere/ncm.hpp
diff --git a/include/stratosphere/ncm/ncm_types.hpp b/libstratosphere/include/stratosphere/ncm/ncm_types.hpp
similarity index 100%
rename from include/stratosphere/ncm/ncm_types.hpp
rename to libstratosphere/include/stratosphere/ncm/ncm_types.hpp
diff --git a/include/stratosphere/os.hpp b/libstratosphere/include/stratosphere/os.hpp
similarity index 100%
rename from include/stratosphere/os.hpp
rename to libstratosphere/include/stratosphere/os.hpp
diff --git a/include/stratosphere/os/os_common_types.hpp b/libstratosphere/include/stratosphere/os/os_common_types.hpp
similarity index 100%
rename from include/stratosphere/os/os_common_types.hpp
rename to libstratosphere/include/stratosphere/os/os_common_types.hpp
diff --git a/include/stratosphere/os/os_condvar.hpp b/libstratosphere/include/stratosphere/os/os_condvar.hpp
similarity index 100%
rename from include/stratosphere/os/os_condvar.hpp
rename to libstratosphere/include/stratosphere/os/os_condvar.hpp
diff --git a/include/stratosphere/os/os_event.hpp b/libstratosphere/include/stratosphere/os/os_event.hpp
similarity index 100%
rename from include/stratosphere/os/os_event.hpp
rename to libstratosphere/include/stratosphere/os/os_event.hpp
diff --git a/include/stratosphere/os/os_interrupt_event.hpp b/libstratosphere/include/stratosphere/os/os_interrupt_event.hpp
similarity index 100%
rename from include/stratosphere/os/os_interrupt_event.hpp
rename to libstratosphere/include/stratosphere/os/os_interrupt_event.hpp
diff --git a/include/stratosphere/os/os_managed_handle.hpp b/libstratosphere/include/stratosphere/os/os_managed_handle.hpp
similarity index 100%
rename from include/stratosphere/os/os_managed_handle.hpp
rename to libstratosphere/include/stratosphere/os/os_managed_handle.hpp
diff --git a/include/stratosphere/os/os_memory_common.hpp b/libstratosphere/include/stratosphere/os/os_memory_common.hpp
similarity index 100%
rename from include/stratosphere/os/os_memory_common.hpp
rename to libstratosphere/include/stratosphere/os/os_memory_common.hpp
diff --git a/include/stratosphere/os/os_message_queue.hpp b/libstratosphere/include/stratosphere/os/os_message_queue.hpp
similarity index 100%
rename from include/stratosphere/os/os_message_queue.hpp
rename to libstratosphere/include/stratosphere/os/os_message_queue.hpp
diff --git a/include/stratosphere/os/os_mutex.hpp b/libstratosphere/include/stratosphere/os/os_mutex.hpp
similarity index 100%
rename from include/stratosphere/os/os_mutex.hpp
rename to libstratosphere/include/stratosphere/os/os_mutex.hpp
diff --git a/include/stratosphere/os/os_process_handle.hpp b/libstratosphere/include/stratosphere/os/os_process_handle.hpp
similarity index 100%
rename from include/stratosphere/os/os_process_handle.hpp
rename to libstratosphere/include/stratosphere/os/os_process_handle.hpp
diff --git a/include/stratosphere/os/os_rw_lock.hpp b/libstratosphere/include/stratosphere/os/os_rw_lock.hpp
similarity index 100%
rename from include/stratosphere/os/os_rw_lock.hpp
rename to libstratosphere/include/stratosphere/os/os_rw_lock.hpp
diff --git a/include/stratosphere/os/os_semaphore.hpp b/libstratosphere/include/stratosphere/os/os_semaphore.hpp
similarity index 100%
rename from include/stratosphere/os/os_semaphore.hpp
rename to libstratosphere/include/stratosphere/os/os_semaphore.hpp
diff --git a/include/stratosphere/os/os_system_event.hpp b/libstratosphere/include/stratosphere/os/os_system_event.hpp
similarity index 100%
rename from include/stratosphere/os/os_system_event.hpp
rename to libstratosphere/include/stratosphere/os/os_system_event.hpp
diff --git a/include/stratosphere/os/os_thread.hpp b/libstratosphere/include/stratosphere/os/os_thread.hpp
similarity index 100%
rename from include/stratosphere/os/os_thread.hpp
rename to libstratosphere/include/stratosphere/os/os_thread.hpp
diff --git a/include/stratosphere/os/os_timeout_helper.hpp b/libstratosphere/include/stratosphere/os/os_timeout_helper.hpp
similarity index 100%
rename from include/stratosphere/os/os_timeout_helper.hpp
rename to libstratosphere/include/stratosphere/os/os_timeout_helper.hpp
diff --git a/include/stratosphere/os/os_waitable_holder.hpp b/libstratosphere/include/stratosphere/os/os_waitable_holder.hpp
similarity index 100%
rename from include/stratosphere/os/os_waitable_holder.hpp
rename to libstratosphere/include/stratosphere/os/os_waitable_holder.hpp
diff --git a/include/stratosphere/os/os_waitable_manager.hpp b/libstratosphere/include/stratosphere/os/os_waitable_manager.hpp
similarity index 100%
rename from include/stratosphere/os/os_waitable_manager.hpp
rename to libstratosphere/include/stratosphere/os/os_waitable_manager.hpp
diff --git a/include/stratosphere/patcher.hpp b/libstratosphere/include/stratosphere/patcher.hpp
similarity index 100%
rename from include/stratosphere/patcher.hpp
rename to libstratosphere/include/stratosphere/patcher.hpp
diff --git a/include/stratosphere/patcher/patcher_api.hpp b/libstratosphere/include/stratosphere/patcher/patcher_api.hpp
similarity index 100%
rename from include/stratosphere/patcher/patcher_api.hpp
rename to libstratosphere/include/stratosphere/patcher/patcher_api.hpp
diff --git a/include/stratosphere/pm.hpp b/libstratosphere/include/stratosphere/pm.hpp
similarity index 100%
rename from include/stratosphere/pm.hpp
rename to libstratosphere/include/stratosphere/pm.hpp
diff --git a/include/stratosphere/pm/pm_boot_mode_api.hpp b/libstratosphere/include/stratosphere/pm/pm_boot_mode_api.hpp
similarity index 100%
rename from include/stratosphere/pm/pm_boot_mode_api.hpp
rename to libstratosphere/include/stratosphere/pm/pm_boot_mode_api.hpp
diff --git a/include/stratosphere/pm/pm_dmnt_api.hpp b/libstratosphere/include/stratosphere/pm/pm_dmnt_api.hpp
similarity index 100%
rename from include/stratosphere/pm/pm_dmnt_api.hpp
rename to libstratosphere/include/stratosphere/pm/pm_dmnt_api.hpp
diff --git a/include/stratosphere/pm/pm_info_api.hpp b/libstratosphere/include/stratosphere/pm/pm_info_api.hpp
similarity index 100%
rename from include/stratosphere/pm/pm_info_api.hpp
rename to libstratosphere/include/stratosphere/pm/pm_info_api.hpp
diff --git a/include/stratosphere/pm/pm_shell_api.hpp b/libstratosphere/include/stratosphere/pm/pm_shell_api.hpp
similarity index 100%
rename from include/stratosphere/pm/pm_shell_api.hpp
rename to libstratosphere/include/stratosphere/pm/pm_shell_api.hpp
diff --git a/include/stratosphere/pm/pm_types.hpp b/libstratosphere/include/stratosphere/pm/pm_types.hpp
similarity index 100%
rename from include/stratosphere/pm/pm_types.hpp
rename to libstratosphere/include/stratosphere/pm/pm_types.hpp
diff --git a/include/stratosphere/reg.hpp b/libstratosphere/include/stratosphere/reg.hpp
similarity index 100%
rename from include/stratosphere/reg.hpp
rename to libstratosphere/include/stratosphere/reg.hpp
diff --git a/include/stratosphere/rnd.hpp b/libstratosphere/include/stratosphere/rnd.hpp
similarity index 100%
rename from include/stratosphere/rnd.hpp
rename to libstratosphere/include/stratosphere/rnd.hpp
diff --git a/include/stratosphere/rnd/rnd_api.hpp b/libstratosphere/include/stratosphere/rnd/rnd_api.hpp
similarity index 100%
rename from include/stratosphere/rnd/rnd_api.hpp
rename to libstratosphere/include/stratosphere/rnd/rnd_api.hpp
diff --git a/include/stratosphere/ro.hpp b/libstratosphere/include/stratosphere/ro.hpp
similarity index 100%
rename from include/stratosphere/ro.hpp
rename to libstratosphere/include/stratosphere/ro.hpp
diff --git a/include/stratosphere/ro/ro_types.hpp b/libstratosphere/include/stratosphere/ro/ro_types.hpp
similarity index 100%
rename from include/stratosphere/ro/ro_types.hpp
rename to libstratosphere/include/stratosphere/ro/ro_types.hpp
diff --git a/include/stratosphere/settings.hpp b/libstratosphere/include/stratosphere/settings.hpp
similarity index 100%
rename from include/stratosphere/settings.hpp
rename to libstratosphere/include/stratosphere/settings.hpp
diff --git a/include/stratosphere/settings/settings_fwdbg_api.hpp b/libstratosphere/include/stratosphere/settings/settings_fwdbg_api.hpp
similarity index 100%
rename from include/stratosphere/settings/settings_fwdbg_api.hpp
rename to libstratosphere/include/stratosphere/settings/settings_fwdbg_api.hpp
diff --git a/include/stratosphere/settings/settings_fwdbg_types.hpp b/libstratosphere/include/stratosphere/settings/settings_fwdbg_types.hpp
similarity index 100%
rename from include/stratosphere/settings/settings_fwdbg_types.hpp
rename to libstratosphere/include/stratosphere/settings/settings_fwdbg_types.hpp
diff --git a/include/stratosphere/settings/settings_types.hpp b/libstratosphere/include/stratosphere/settings/settings_types.hpp
similarity index 100%
rename from include/stratosphere/settings/settings_types.hpp
rename to libstratosphere/include/stratosphere/settings/settings_types.hpp
diff --git a/include/stratosphere/sf.hpp b/libstratosphere/include/stratosphere/sf.hpp
similarity index 100%
rename from include/stratosphere/sf.hpp
rename to libstratosphere/include/stratosphere/sf.hpp
diff --git a/include/stratosphere/sf/cmif/sf_cmif_domain_api.hpp b/libstratosphere/include/stratosphere/sf/cmif/sf_cmif_domain_api.hpp
similarity index 100%
rename from include/stratosphere/sf/cmif/sf_cmif_domain_api.hpp
rename to libstratosphere/include/stratosphere/sf/cmif/sf_cmif_domain_api.hpp
diff --git a/include/stratosphere/sf/cmif/sf_cmif_domain_manager.hpp b/libstratosphere/include/stratosphere/sf/cmif/sf_cmif_domain_manager.hpp
similarity index 100%
rename from include/stratosphere/sf/cmif/sf_cmif_domain_manager.hpp
rename to libstratosphere/include/stratosphere/sf/cmif/sf_cmif_domain_manager.hpp
diff --git a/include/stratosphere/sf/cmif/sf_cmif_domain_service_object.hpp b/libstratosphere/include/stratosphere/sf/cmif/sf_cmif_domain_service_object.hpp
similarity index 100%
rename from include/stratosphere/sf/cmif/sf_cmif_domain_service_object.hpp
rename to libstratosphere/include/stratosphere/sf/cmif/sf_cmif_domain_service_object.hpp
diff --git a/include/stratosphere/sf/cmif/sf_cmif_pointer_and_size.hpp b/libstratosphere/include/stratosphere/sf/cmif/sf_cmif_pointer_and_size.hpp
similarity index 100%
rename from include/stratosphere/sf/cmif/sf_cmif_pointer_and_size.hpp
rename to libstratosphere/include/stratosphere/sf/cmif/sf_cmif_pointer_and_size.hpp
diff --git a/include/stratosphere/sf/cmif/sf_cmif_server_message_processor.hpp b/libstratosphere/include/stratosphere/sf/cmif/sf_cmif_server_message_processor.hpp
similarity index 100%
rename from include/stratosphere/sf/cmif/sf_cmif_server_message_processor.hpp
rename to libstratosphere/include/stratosphere/sf/cmif/sf_cmif_server_message_processor.hpp
diff --git a/include/stratosphere/sf/cmif/sf_cmif_service_dispatch.hpp b/libstratosphere/include/stratosphere/sf/cmif/sf_cmif_service_dispatch.hpp
similarity index 100%
rename from include/stratosphere/sf/cmif/sf_cmif_service_dispatch.hpp
rename to libstratosphere/include/stratosphere/sf/cmif/sf_cmif_service_dispatch.hpp
diff --git a/include/stratosphere/sf/cmif/sf_cmif_service_object_holder.hpp b/libstratosphere/include/stratosphere/sf/cmif/sf_cmif_service_object_holder.hpp
similarity index 100%
rename from include/stratosphere/sf/cmif/sf_cmif_service_object_holder.hpp
rename to libstratosphere/include/stratosphere/sf/cmif/sf_cmif_service_object_holder.hpp
diff --git a/include/stratosphere/sf/hipc/sf_hipc_api.hpp b/libstratosphere/include/stratosphere/sf/hipc/sf_hipc_api.hpp
similarity index 100%
rename from include/stratosphere/sf/hipc/sf_hipc_api.hpp
rename to libstratosphere/include/stratosphere/sf/hipc/sf_hipc_api.hpp
diff --git a/include/stratosphere/sf/hipc/sf_hipc_server_domain_session_manager.hpp b/libstratosphere/include/stratosphere/sf/hipc/sf_hipc_server_domain_session_manager.hpp
similarity index 100%
rename from include/stratosphere/sf/hipc/sf_hipc_server_domain_session_manager.hpp
rename to libstratosphere/include/stratosphere/sf/hipc/sf_hipc_server_domain_session_manager.hpp
diff --git a/include/stratosphere/sf/hipc/sf_hipc_server_manager.hpp b/libstratosphere/include/stratosphere/sf/hipc/sf_hipc_server_manager.hpp
similarity index 100%
rename from include/stratosphere/sf/hipc/sf_hipc_server_manager.hpp
rename to libstratosphere/include/stratosphere/sf/hipc/sf_hipc_server_manager.hpp
diff --git a/include/stratosphere/sf/hipc/sf_hipc_server_session_manager.hpp b/libstratosphere/include/stratosphere/sf/hipc/sf_hipc_server_session_manager.hpp
similarity index 100%
rename from include/stratosphere/sf/hipc/sf_hipc_server_session_manager.hpp
rename to libstratosphere/include/stratosphere/sf/hipc/sf_hipc_server_session_manager.hpp
diff --git a/include/stratosphere/sf/impl/sf_impl_command_serialization.hpp b/libstratosphere/include/stratosphere/sf/impl/sf_impl_command_serialization.hpp
similarity index 100%
rename from include/stratosphere/sf/impl/sf_impl_command_serialization.hpp
rename to libstratosphere/include/stratosphere/sf/impl/sf_impl_command_serialization.hpp
diff --git a/include/stratosphere/sf/sf_buffer_tags.hpp b/libstratosphere/include/stratosphere/sf/sf_buffer_tags.hpp
similarity index 100%
rename from include/stratosphere/sf/sf_buffer_tags.hpp
rename to libstratosphere/include/stratosphere/sf/sf_buffer_tags.hpp
diff --git a/include/stratosphere/sf/sf_buffers.hpp b/libstratosphere/include/stratosphere/sf/sf_buffers.hpp
similarity index 100%
rename from include/stratosphere/sf/sf_buffers.hpp
rename to libstratosphere/include/stratosphere/sf/sf_buffers.hpp
diff --git a/include/stratosphere/sf/sf_common.hpp b/libstratosphere/include/stratosphere/sf/sf_common.hpp
similarity index 100%
rename from include/stratosphere/sf/sf_common.hpp
rename to libstratosphere/include/stratosphere/sf/sf_common.hpp
diff --git a/include/stratosphere/sf/sf_handles.hpp b/libstratosphere/include/stratosphere/sf/sf_handles.hpp
similarity index 100%
rename from include/stratosphere/sf/sf_handles.hpp
rename to libstratosphere/include/stratosphere/sf/sf_handles.hpp
diff --git a/include/stratosphere/sf/sf_mitm_dispatch.h b/libstratosphere/include/stratosphere/sf/sf_mitm_dispatch.h
similarity index 100%
rename from include/stratosphere/sf/sf_mitm_dispatch.h
rename to libstratosphere/include/stratosphere/sf/sf_mitm_dispatch.h
diff --git a/include/stratosphere/sf/sf_out.hpp b/libstratosphere/include/stratosphere/sf/sf_out.hpp
similarity index 100%
rename from include/stratosphere/sf/sf_out.hpp
rename to libstratosphere/include/stratosphere/sf/sf_out.hpp
diff --git a/include/stratosphere/sf/sf_service_object.hpp b/libstratosphere/include/stratosphere/sf/sf_service_object.hpp
similarity index 100%
rename from include/stratosphere/sf/sf_service_object.hpp
rename to libstratosphere/include/stratosphere/sf/sf_service_object.hpp
diff --git a/include/stratosphere/sm.hpp b/libstratosphere/include/stratosphere/sm.hpp
similarity index 100%
rename from include/stratosphere/sm.hpp
rename to libstratosphere/include/stratosphere/sm.hpp
diff --git a/include/stratosphere/sm/sm_api.hpp b/libstratosphere/include/stratosphere/sm/sm_api.hpp
similarity index 100%
rename from include/stratosphere/sm/sm_api.hpp
rename to libstratosphere/include/stratosphere/sm/sm_api.hpp
diff --git a/include/stratosphere/sm/sm_manager_api.hpp b/libstratosphere/include/stratosphere/sm/sm_manager_api.hpp
similarity index 100%
rename from include/stratosphere/sm/sm_manager_api.hpp
rename to libstratosphere/include/stratosphere/sm/sm_manager_api.hpp
diff --git a/include/stratosphere/sm/sm_mitm_api.hpp b/libstratosphere/include/stratosphere/sm/sm_mitm_api.hpp
similarity index 100%
rename from include/stratosphere/sm/sm_mitm_api.hpp
rename to libstratosphere/include/stratosphere/sm/sm_mitm_api.hpp
diff --git a/include/stratosphere/sm/sm_scoped_holder.hpp b/libstratosphere/include/stratosphere/sm/sm_scoped_holder.hpp
similarity index 100%
rename from include/stratosphere/sm/sm_scoped_holder.hpp
rename to libstratosphere/include/stratosphere/sm/sm_scoped_holder.hpp
diff --git a/include/stratosphere/sm/sm_types.hpp b/libstratosphere/include/stratosphere/sm/sm_types.hpp
similarity index 100%
rename from include/stratosphere/sm/sm_types.hpp
rename to libstratosphere/include/stratosphere/sm/sm_types.hpp
diff --git a/include/stratosphere/spl.hpp b/libstratosphere/include/stratosphere/spl.hpp
similarity index 100%
rename from include/stratosphere/spl.hpp
rename to libstratosphere/include/stratosphere/spl.hpp
diff --git a/include/stratosphere/spl/smc/spl_smc.hpp b/libstratosphere/include/stratosphere/spl/smc/spl_smc.hpp
similarity index 100%
rename from include/stratosphere/spl/smc/spl_smc.hpp
rename to libstratosphere/include/stratosphere/spl/smc/spl_smc.hpp
diff --git a/include/stratosphere/spl/spl_api.hpp b/libstratosphere/include/stratosphere/spl/spl_api.hpp
similarity index 100%
rename from include/stratosphere/spl/spl_api.hpp
rename to libstratosphere/include/stratosphere/spl/spl_api.hpp
diff --git a/include/stratosphere/spl/spl_types.hpp b/libstratosphere/include/stratosphere/spl/spl_types.hpp
similarity index 100%
rename from include/stratosphere/spl/spl_types.hpp
rename to libstratosphere/include/stratosphere/spl/spl_types.hpp
diff --git a/include/stratosphere/updater.hpp b/libstratosphere/include/stratosphere/updater.hpp
similarity index 100%
rename from include/stratosphere/updater.hpp
rename to libstratosphere/include/stratosphere/updater.hpp
diff --git a/include/stratosphere/updater/updater_api.hpp b/libstratosphere/include/stratosphere/updater/updater_api.hpp
similarity index 100%
rename from include/stratosphere/updater/updater_api.hpp
rename to libstratosphere/include/stratosphere/updater/updater_api.hpp
diff --git a/include/stratosphere/updater/updater_types.hpp b/libstratosphere/include/stratosphere/updater/updater_types.hpp
similarity index 100%
rename from include/stratosphere/updater/updater_types.hpp
rename to libstratosphere/include/stratosphere/updater/updater_types.hpp
diff --git a/source/ams/ams_bpc.c b/libstratosphere/source/ams/ams_bpc.c
similarity index 100%
rename from source/ams/ams_bpc.c
rename to libstratosphere/source/ams/ams_bpc.c
diff --git a/source/ams/ams_bpc.h b/libstratosphere/source/ams/ams_bpc.h
similarity index 100%
rename from source/ams/ams_bpc.h
rename to libstratosphere/source/ams/ams_bpc.h
diff --git a/source/ams/ams_emummc_api.cpp b/libstratosphere/source/ams/ams_emummc_api.cpp
similarity index 100%
rename from source/ams/ams_emummc_api.cpp
rename to libstratosphere/source/ams/ams_emummc_api.cpp
diff --git a/source/ams/ams_environment.cpp b/libstratosphere/source/ams/ams_environment.cpp
similarity index 100%
rename from source/ams/ams_environment.cpp
rename to libstratosphere/source/ams/ams_environment.cpp
diff --git a/source/ams/ams_exosphere_api.cpp b/libstratosphere/source/ams/ams_exosphere_api.cpp
similarity index 100%
rename from source/ams/ams_exosphere_api.cpp
rename to libstratosphere/source/ams/ams_exosphere_api.cpp
diff --git a/source/boot2/boot2_api.cpp b/libstratosphere/source/boot2/boot2_api.cpp
similarity index 100%
rename from source/boot2/boot2_api.cpp
rename to libstratosphere/source/boot2/boot2_api.cpp
diff --git a/source/cfg/cfg_flags.cpp b/libstratosphere/source/cfg/cfg_flags.cpp
similarity index 100%
rename from source/cfg/cfg_flags.cpp
rename to libstratosphere/source/cfg/cfg_flags.cpp
diff --git a/source/cfg/cfg_override.cpp b/libstratosphere/source/cfg/cfg_override.cpp
similarity index 100%
rename from source/cfg/cfg_override.cpp
rename to libstratosphere/source/cfg/cfg_override.cpp
diff --git a/source/cfg/cfg_privileged_process.cpp b/libstratosphere/source/cfg/cfg_privileged_process.cpp
similarity index 100%
rename from source/cfg/cfg_privileged_process.cpp
rename to libstratosphere/source/cfg/cfg_privileged_process.cpp
diff --git a/source/cfg/cfg_sd_card.cpp b/libstratosphere/source/cfg/cfg_sd_card.cpp
similarity index 100%
rename from source/cfg/cfg_sd_card.cpp
rename to libstratosphere/source/cfg/cfg_sd_card.cpp
diff --git a/source/dd/dd_io_mappings.cpp b/libstratosphere/source/dd/dd_io_mappings.cpp
similarity index 100%
rename from source/dd/dd_io_mappings.cpp
rename to libstratosphere/source/dd/dd_io_mappings.cpp
diff --git a/source/dmnt/dmntcht.c b/libstratosphere/source/dmnt/dmntcht.c
similarity index 100%
rename from source/dmnt/dmntcht.c
rename to libstratosphere/source/dmnt/dmntcht.c
diff --git a/source/dmnt/dmntcht.h b/libstratosphere/source/dmnt/dmntcht.h
similarity index 100%
rename from source/dmnt/dmntcht.h
rename to libstratosphere/source/dmnt/dmntcht.h
diff --git a/source/fs/fs_file_storage.cpp b/libstratosphere/source/fs/fs_file_storage.cpp
similarity index 100%
rename from source/fs/fs_file_storage.cpp
rename to libstratosphere/source/fs/fs_file_storage.cpp
diff --git a/source/fs/fs_path_tool.cpp b/libstratosphere/source/fs/fs_path_tool.cpp
similarity index 100%
rename from source/fs/fs_path_tool.cpp
rename to libstratosphere/source/fs/fs_path_tool.cpp
diff --git a/source/fs/fs_path_utils.cpp b/libstratosphere/source/fs/fs_path_utils.cpp
similarity index 100%
rename from source/fs/fs_path_utils.cpp
rename to libstratosphere/source/fs/fs_path_utils.cpp
diff --git a/source/fssrv/fssrv_filesystem_interface_adapter.cpp b/libstratosphere/source/fssrv/fssrv_filesystem_interface_adapter.cpp
similarity index 100%
rename from source/fssrv/fssrv_filesystem_interface_adapter.cpp
rename to libstratosphere/source/fssrv/fssrv_filesystem_interface_adapter.cpp
diff --git a/source/fssrv/fssrv_path_normalizer.cpp b/libstratosphere/source/fssrv/fssrv_path_normalizer.cpp
similarity index 100%
rename from source/fssrv/fssrv_path_normalizer.cpp
rename to libstratosphere/source/fssrv/fssrv_path_normalizer.cpp
diff --git a/source/fssrv/fssrv_storage_interface_adapter.cpp b/libstratosphere/source/fssrv/fssrv_storage_interface_adapter.cpp
similarity index 100%
rename from source/fssrv/fssrv_storage_interface_adapter.cpp
rename to libstratosphere/source/fssrv/fssrv_storage_interface_adapter.cpp
diff --git a/source/fssystem/fssystem_directory_redirection_filesystem.cpp b/libstratosphere/source/fssystem/fssystem_directory_redirection_filesystem.cpp
similarity index 100%
rename from source/fssystem/fssystem_directory_redirection_filesystem.cpp
rename to libstratosphere/source/fssystem/fssystem_directory_redirection_filesystem.cpp
diff --git a/source/fssystem/fssystem_directory_savedata_filesystem.cpp b/libstratosphere/source/fssystem/fssystem_directory_savedata_filesystem.cpp
similarity index 100%
rename from source/fssystem/fssystem_directory_savedata_filesystem.cpp
rename to libstratosphere/source/fssystem/fssystem_directory_savedata_filesystem.cpp
diff --git a/source/fssystem/fssystem_subdirectory_filesystem.cpp b/libstratosphere/source/fssystem/fssystem_subdirectory_filesystem.cpp
similarity index 100%
rename from source/fssystem/fssystem_subdirectory_filesystem.cpp
rename to libstratosphere/source/fssystem/fssystem_subdirectory_filesystem.cpp
diff --git a/source/fssystem/fssystem_utility.cpp b/libstratosphere/source/fssystem/fssystem_utility.cpp
similarity index 100%
rename from source/fssystem/fssystem_utility.cpp
rename to libstratosphere/source/fssystem/fssystem_utility.cpp
diff --git a/source/hid/hid_api.cpp b/libstratosphere/source/hid/hid_api.cpp
similarity index 100%
rename from source/hid/hid_api.cpp
rename to libstratosphere/source/hid/hid_api.cpp
diff --git a/source/hos/hos_version_api.cpp b/libstratosphere/source/hos/hos_version_api.cpp
similarity index 100%
rename from source/hos/hos_version_api.cpp
rename to libstratosphere/source/hos/hos_version_api.cpp
diff --git a/source/kvdb/kvdb_archive.cpp b/libstratosphere/source/kvdb/kvdb_archive.cpp
similarity index 100%
rename from source/kvdb/kvdb_archive.cpp
rename to libstratosphere/source/kvdb/kvdb_archive.cpp
diff --git a/source/kvdb/kvdb_file_key_value_store.cpp b/libstratosphere/source/kvdb/kvdb_file_key_value_store.cpp
similarity index 100%
rename from source/kvdb/kvdb_file_key_value_store.cpp
rename to libstratosphere/source/kvdb/kvdb_file_key_value_store.cpp
diff --git a/source/ldr/ldr_ams.c b/libstratosphere/source/ldr/ldr_ams.c
similarity index 100%
rename from source/ldr/ldr_ams.c
rename to libstratosphere/source/ldr/ldr_ams.c
diff --git a/source/ldr/ldr_ams.h b/libstratosphere/source/ldr/ldr_ams.h
similarity index 100%
rename from source/ldr/ldr_ams.h
rename to libstratosphere/source/ldr/ldr_ams.h
diff --git a/source/ldr/ldr_pm_api.cpp b/libstratosphere/source/ldr/ldr_pm_api.cpp
similarity index 100%
rename from source/ldr/ldr_pm_api.cpp
rename to libstratosphere/source/ldr/ldr_pm_api.cpp
diff --git a/source/map/map_api.cpp b/libstratosphere/source/map/map_api.cpp
similarity index 100%
rename from source/map/map_api.cpp
rename to libstratosphere/source/map/map_api.cpp
diff --git a/source/os/impl/os_inter_process_event.cpp b/libstratosphere/source/os/impl/os_inter_process_event.cpp
similarity index 100%
rename from source/os/impl/os_inter_process_event.cpp
rename to libstratosphere/source/os/impl/os_inter_process_event.cpp
diff --git a/source/os/impl/os_inter_process_event.hpp b/libstratosphere/source/os/impl/os_inter_process_event.hpp
similarity index 100%
rename from source/os/impl/os_inter_process_event.hpp
rename to libstratosphere/source/os/impl/os_inter_process_event.hpp
diff --git a/source/os/impl/os_waitable_holder_base.hpp b/libstratosphere/source/os/impl/os_waitable_holder_base.hpp
similarity index 100%
rename from source/os/impl/os_waitable_holder_base.hpp
rename to libstratosphere/source/os/impl/os_waitable_holder_base.hpp
diff --git a/source/os/impl/os_waitable_holder_impl.hpp b/libstratosphere/source/os/impl/os_waitable_holder_impl.hpp
similarity index 100%
rename from source/os/impl/os_waitable_holder_impl.hpp
rename to libstratosphere/source/os/impl/os_waitable_holder_impl.hpp
diff --git a/source/os/impl/os_waitable_holder_of_event.hpp b/libstratosphere/source/os/impl/os_waitable_holder_of_event.hpp
similarity index 100%
rename from source/os/impl/os_waitable_holder_of_event.hpp
rename to libstratosphere/source/os/impl/os_waitable_holder_of_event.hpp
diff --git a/source/os/impl/os_waitable_holder_of_handle.hpp b/libstratosphere/source/os/impl/os_waitable_holder_of_handle.hpp
similarity index 100%
rename from source/os/impl/os_waitable_holder_of_handle.hpp
rename to libstratosphere/source/os/impl/os_waitable_holder_of_handle.hpp
diff --git a/source/os/impl/os_waitable_holder_of_inter_process_event.hpp b/libstratosphere/source/os/impl/os_waitable_holder_of_inter_process_event.hpp
similarity index 100%
rename from source/os/impl/os_waitable_holder_of_inter_process_event.hpp
rename to libstratosphere/source/os/impl/os_waitable_holder_of_inter_process_event.hpp
diff --git a/source/os/impl/os_waitable_holder_of_interrupt_event.hpp b/libstratosphere/source/os/impl/os_waitable_holder_of_interrupt_event.hpp
similarity index 100%
rename from source/os/impl/os_waitable_holder_of_interrupt_event.hpp
rename to libstratosphere/source/os/impl/os_waitable_holder_of_interrupt_event.hpp
diff --git a/source/os/impl/os_waitable_holder_of_message_queue.hpp b/libstratosphere/source/os/impl/os_waitable_holder_of_message_queue.hpp
similarity index 100%
rename from source/os/impl/os_waitable_holder_of_message_queue.hpp
rename to libstratosphere/source/os/impl/os_waitable_holder_of_message_queue.hpp
diff --git a/source/os/impl/os_waitable_holder_of_semaphore.hpp b/libstratosphere/source/os/impl/os_waitable_holder_of_semaphore.hpp
similarity index 100%
rename from source/os/impl/os_waitable_holder_of_semaphore.hpp
rename to libstratosphere/source/os/impl/os_waitable_holder_of_semaphore.hpp
diff --git a/source/os/impl/os_waitable_holder_of_thread.hpp b/libstratosphere/source/os/impl/os_waitable_holder_of_thread.hpp
similarity index 100%
rename from source/os/impl/os_waitable_holder_of_thread.hpp
rename to libstratosphere/source/os/impl/os_waitable_holder_of_thread.hpp
diff --git a/source/os/impl/os_waitable_manager_impl.cpp b/libstratosphere/source/os/impl/os_waitable_manager_impl.cpp
similarity index 100%
rename from source/os/impl/os_waitable_manager_impl.cpp
rename to libstratosphere/source/os/impl/os_waitable_manager_impl.cpp
diff --git a/source/os/impl/os_waitable_manager_impl.hpp b/libstratosphere/source/os/impl/os_waitable_manager_impl.hpp
similarity index 100%
rename from source/os/impl/os_waitable_manager_impl.hpp
rename to libstratosphere/source/os/impl/os_waitable_manager_impl.hpp
diff --git a/source/os/impl/os_waitable_object_list.hpp b/libstratosphere/source/os/impl/os_waitable_object_list.hpp
similarity index 100%
rename from source/os/impl/os_waitable_object_list.hpp
rename to libstratosphere/source/os/impl/os_waitable_object_list.hpp
diff --git a/source/os/os_event.cpp b/libstratosphere/source/os/os_event.cpp
similarity index 100%
rename from source/os/os_event.cpp
rename to libstratosphere/source/os/os_event.cpp
diff --git a/source/os/os_interrupt_event.cpp b/libstratosphere/source/os/os_interrupt_event.cpp
similarity index 100%
rename from source/os/os_interrupt_event.cpp
rename to libstratosphere/source/os/os_interrupt_event.cpp
diff --git a/source/os/os_message_queue.cpp b/libstratosphere/source/os/os_message_queue.cpp
similarity index 100%
rename from source/os/os_message_queue.cpp
rename to libstratosphere/source/os/os_message_queue.cpp
diff --git a/source/os/os_process_handle.cpp b/libstratosphere/source/os/os_process_handle.cpp
similarity index 100%
rename from source/os/os_process_handle.cpp
rename to libstratosphere/source/os/os_process_handle.cpp
diff --git a/source/os/os_semaphore.cpp b/libstratosphere/source/os/os_semaphore.cpp
similarity index 100%
rename from source/os/os_semaphore.cpp
rename to libstratosphere/source/os/os_semaphore.cpp
diff --git a/source/os/os_system_event.cpp b/libstratosphere/source/os/os_system_event.cpp
similarity index 100%
rename from source/os/os_system_event.cpp
rename to libstratosphere/source/os/os_system_event.cpp
diff --git a/source/os/os_waitable_holder.cpp b/libstratosphere/source/os/os_waitable_holder.cpp
similarity index 100%
rename from source/os/os_waitable_holder.cpp
rename to libstratosphere/source/os/os_waitable_holder.cpp
diff --git a/source/os/os_waitable_manager.cpp b/libstratosphere/source/os/os_waitable_manager.cpp
similarity index 100%
rename from source/os/os_waitable_manager.cpp
rename to libstratosphere/source/os/os_waitable_manager.cpp
diff --git a/source/patcher/patcher_api.cpp b/libstratosphere/source/patcher/patcher_api.cpp
similarity index 100%
rename from source/patcher/patcher_api.cpp
rename to libstratosphere/source/patcher/patcher_api.cpp
diff --git a/source/pm/pm_ams.c b/libstratosphere/source/pm/pm_ams.c
similarity index 100%
rename from source/pm/pm_ams.c
rename to libstratosphere/source/pm/pm_ams.c
diff --git a/source/pm/pm_ams.h b/libstratosphere/source/pm/pm_ams.h
similarity index 100%
rename from source/pm/pm_ams.h
rename to libstratosphere/source/pm/pm_ams.h
diff --git a/source/pm/pm_boot_mode_api.cpp b/libstratosphere/source/pm/pm_boot_mode_api.cpp
similarity index 100%
rename from source/pm/pm_boot_mode_api.cpp
rename to libstratosphere/source/pm/pm_boot_mode_api.cpp
diff --git a/source/pm/pm_dmnt_api.cpp b/libstratosphere/source/pm/pm_dmnt_api.cpp
similarity index 100%
rename from source/pm/pm_dmnt_api.cpp
rename to libstratosphere/source/pm/pm_dmnt_api.cpp
diff --git a/source/pm/pm_info_api.cpp b/libstratosphere/source/pm/pm_info_api.cpp
similarity index 100%
rename from source/pm/pm_info_api.cpp
rename to libstratosphere/source/pm/pm_info_api.cpp
diff --git a/source/pm/pm_shell_api.cpp b/libstratosphere/source/pm/pm_shell_api.cpp
similarity index 100%
rename from source/pm/pm_shell_api.cpp
rename to libstratosphere/source/pm/pm_shell_api.cpp
diff --git a/source/result/result_on_assertion.cpp b/libstratosphere/source/result/result_on_assertion.cpp
similarity index 100%
rename from source/result/result_on_assertion.cpp
rename to libstratosphere/source/result/result_on_assertion.cpp
diff --git a/source/rnd/rnd_api.cpp b/libstratosphere/source/rnd/rnd_api.cpp
similarity index 100%
rename from source/rnd/rnd_api.cpp
rename to libstratosphere/source/rnd/rnd_api.cpp
diff --git a/source/service_guard.h b/libstratosphere/source/service_guard.h
similarity index 100%
rename from source/service_guard.h
rename to libstratosphere/source/service_guard.h
diff --git a/source/settings/settings_fwdbg_api.cpp b/libstratosphere/source/settings/settings_fwdbg_api.cpp
similarity index 100%
rename from source/settings/settings_fwdbg_api.cpp
rename to libstratosphere/source/settings/settings_fwdbg_api.cpp
diff --git a/source/sf/cmif/sf_cmif_domain_manager.cpp b/libstratosphere/source/sf/cmif/sf_cmif_domain_manager.cpp
similarity index 100%
rename from source/sf/cmif/sf_cmif_domain_manager.cpp
rename to libstratosphere/source/sf/cmif/sf_cmif_domain_manager.cpp
diff --git a/source/sf/cmif/sf_cmif_domain_service_object.cpp b/libstratosphere/source/sf/cmif/sf_cmif_domain_service_object.cpp
similarity index 100%
rename from source/sf/cmif/sf_cmif_domain_service_object.cpp
rename to libstratosphere/source/sf/cmif/sf_cmif_domain_service_object.cpp
diff --git a/source/sf/cmif/sf_cmif_service_dispatch.cpp b/libstratosphere/source/sf/cmif/sf_cmif_service_dispatch.cpp
similarity index 100%
rename from source/sf/cmif/sf_cmif_service_dispatch.cpp
rename to libstratosphere/source/sf/cmif/sf_cmif_service_dispatch.cpp
diff --git a/source/sf/cmif/sf_cmif_service_object_holder.cpp b/libstratosphere/source/sf/cmif/sf_cmif_service_object_holder.cpp
similarity index 100%
rename from source/sf/cmif/sf_cmif_service_object_holder.cpp
rename to libstratosphere/source/sf/cmif/sf_cmif_service_object_holder.cpp
diff --git a/source/sf/hipc/sf_hipc_api.cpp b/libstratosphere/source/sf/hipc/sf_hipc_api.cpp
similarity index 100%
rename from source/sf/hipc/sf_hipc_api.cpp
rename to libstratosphere/source/sf/hipc/sf_hipc_api.cpp
diff --git a/source/sf/hipc/sf_hipc_mitm_query_api.cpp b/libstratosphere/source/sf/hipc/sf_hipc_mitm_query_api.cpp
similarity index 100%
rename from source/sf/hipc/sf_hipc_mitm_query_api.cpp
rename to libstratosphere/source/sf/hipc/sf_hipc_mitm_query_api.cpp
diff --git a/source/sf/hipc/sf_hipc_mitm_query_api.hpp b/libstratosphere/source/sf/hipc/sf_hipc_mitm_query_api.hpp
similarity index 100%
rename from source/sf/hipc/sf_hipc_mitm_query_api.hpp
rename to libstratosphere/source/sf/hipc/sf_hipc_mitm_query_api.hpp
diff --git a/source/sf/hipc/sf_hipc_server_domain_session_manager.cpp b/libstratosphere/source/sf/hipc/sf_hipc_server_domain_session_manager.cpp
similarity index 100%
rename from source/sf/hipc/sf_hipc_server_domain_session_manager.cpp
rename to libstratosphere/source/sf/hipc/sf_hipc_server_domain_session_manager.cpp
diff --git a/source/sf/hipc/sf_hipc_server_manager.cpp b/libstratosphere/source/sf/hipc/sf_hipc_server_manager.cpp
similarity index 100%
rename from source/sf/hipc/sf_hipc_server_manager.cpp
rename to libstratosphere/source/sf/hipc/sf_hipc_server_manager.cpp
diff --git a/source/sf/hipc/sf_hipc_server_session_manager.cpp b/libstratosphere/source/sf/hipc/sf_hipc_server_session_manager.cpp
similarity index 100%
rename from source/sf/hipc/sf_hipc_server_session_manager.cpp
rename to libstratosphere/source/sf/hipc/sf_hipc_server_session_manager.cpp
diff --git a/source/sm/sm_ams.c b/libstratosphere/source/sm/sm_ams.c
similarity index 100%
rename from source/sm/sm_ams.c
rename to libstratosphere/source/sm/sm_ams.c
diff --git a/source/sm/sm_ams.h b/libstratosphere/source/sm/sm_ams.h
similarity index 100%
rename from source/sm/sm_ams.h
rename to libstratosphere/source/sm/sm_ams.h
diff --git a/source/sm/sm_api.cpp b/libstratosphere/source/sm/sm_api.cpp
similarity index 100%
rename from source/sm/sm_api.cpp
rename to libstratosphere/source/sm/sm_api.cpp
diff --git a/source/sm/sm_manager_api.cpp b/libstratosphere/source/sm/sm_manager_api.cpp
similarity index 100%
rename from source/sm/sm_manager_api.cpp
rename to libstratosphere/source/sm/sm_manager_api.cpp
diff --git a/source/sm/sm_mitm_api.cpp b/libstratosphere/source/sm/sm_mitm_api.cpp
similarity index 100%
rename from source/sm/sm_mitm_api.cpp
rename to libstratosphere/source/sm/sm_mitm_api.cpp
diff --git a/source/sm/sm_utils.cpp b/libstratosphere/source/sm/sm_utils.cpp
similarity index 100%
rename from source/sm/sm_utils.cpp
rename to libstratosphere/source/sm/sm_utils.cpp
diff --git a/source/sm/sm_utils.hpp b/libstratosphere/source/sm/sm_utils.hpp
similarity index 100%
rename from source/sm/sm_utils.hpp
rename to libstratosphere/source/sm/sm_utils.hpp
diff --git a/source/sm/smm_ams.c b/libstratosphere/source/sm/smm_ams.c
similarity index 100%
rename from source/sm/smm_ams.c
rename to libstratosphere/source/sm/smm_ams.c
diff --git a/source/sm/smm_ams.h b/libstratosphere/source/sm/smm_ams.h
similarity index 100%
rename from source/sm/smm_ams.h
rename to libstratosphere/source/sm/smm_ams.h
diff --git a/source/spl/smc/spl_smc.cpp b/libstratosphere/source/spl/smc/spl_smc.cpp
similarity index 100%
rename from source/spl/smc/spl_smc.cpp
rename to libstratosphere/source/spl/smc/spl_smc.cpp
diff --git a/source/spl/spl_api.cpp b/libstratosphere/source/spl/spl_api.cpp
similarity index 100%
rename from source/spl/spl_api.cpp
rename to libstratosphere/source/spl/spl_api.cpp
diff --git a/source/updater/updater_api.cpp b/libstratosphere/source/updater/updater_api.cpp
similarity index 100%
rename from source/updater/updater_api.cpp
rename to libstratosphere/source/updater/updater_api.cpp
diff --git a/source/updater/updater_bis_management.cpp b/libstratosphere/source/updater/updater_bis_management.cpp
similarity index 100%
rename from source/updater/updater_bis_management.cpp
rename to libstratosphere/source/updater/updater_bis_management.cpp
diff --git a/source/updater/updater_bis_management.hpp b/libstratosphere/source/updater/updater_bis_management.hpp
similarity index 100%
rename from source/updater/updater_bis_management.hpp
rename to libstratosphere/source/updater/updater_bis_management.hpp
diff --git a/source/updater/updater_bis_save.cpp b/libstratosphere/source/updater/updater_bis_save.cpp
similarity index 100%
rename from source/updater/updater_bis_save.cpp
rename to libstratosphere/source/updater/updater_bis_save.cpp
diff --git a/source/updater/updater_bis_save.hpp b/libstratosphere/source/updater/updater_bis_save.hpp
similarity index 100%
rename from source/updater/updater_bis_save.hpp
rename to libstratosphere/source/updater/updater_bis_save.hpp
diff --git a/source/updater/updater_files.cpp b/libstratosphere/source/updater/updater_files.cpp
similarity index 100%
rename from source/updater/updater_files.cpp
rename to libstratosphere/source/updater/updater_files.cpp
diff --git a/source/updater/updater_files.hpp b/libstratosphere/source/updater/updater_files.hpp
similarity index 100%
rename from source/updater/updater_files.hpp
rename to libstratosphere/source/updater/updater_files.hpp
diff --git a/source/updater/updater_paths.cpp b/libstratosphere/source/updater/updater_paths.cpp
similarity index 100%
rename from source/updater/updater_paths.cpp
rename to libstratosphere/source/updater/updater_paths.cpp
diff --git a/source/updater/updater_paths.hpp b/libstratosphere/source/updater/updater_paths.hpp
similarity index 100%
rename from source/updater/updater_paths.hpp
rename to libstratosphere/source/updater/updater_paths.hpp
diff --git a/source/util/ini.c b/libstratosphere/source/util/ini.c
similarity index 100%
rename from source/util/ini.c
rename to libstratosphere/source/util/ini.c
diff --git a/source/util/ini.h b/libstratosphere/source/util/ini.h
similarity index 100%
rename from source/util/ini.h
rename to libstratosphere/source/util/ini.h
diff --git a/source/util/lz4.c b/libstratosphere/source/util/lz4.c
similarity index 100%
rename from source/util/lz4.c
rename to libstratosphere/source/util/lz4.c
diff --git a/source/util/lz4.h b/libstratosphere/source/util/lz4.h
similarity index 100%
rename from source/util/lz4.h
rename to libstratosphere/source/util/lz4.h
diff --git a/source/util/util_compression.cpp b/libstratosphere/source/util/util_compression.cpp
similarity index 100%
rename from source/util/util_compression.cpp
rename to libstratosphere/source/util/util_compression.cpp
diff --git a/source/util/util_ini.cpp b/libstratosphere/source/util/util_ini.cpp
similarity index 100%
rename from source/util/util_ini.cpp
rename to libstratosphere/source/util/util_ini.cpp