Pointless huge refactor

src/core/CMakeLists.txt

@@ -1,42 +1,42 @@
 add_library(core STATIC
-  data_container.cpp
-  data_container.h
+  cia_builder.cpp
+  cia_builder.h
+  db/seed_db.cpp
+  db/seed_db.h
+  db/title_db.cpp
+  db/title_db.h
+  db/title_keys_bin.cpp
+  db/title_keys_bin.h
   decryptor.cpp
   decryptor.h
-  extdata.cpp
-  extdata.h
+  file_sys/certificate.cpp
+  file_sys/certificate.h
+  file_sys/cia_common.h
+  file_sys/data/data_container.cpp
+  file_sys/data/data_container.h
+  file_sys/data/extdata.cpp
+  file_sys/data/extdata.h
+  file_sys/data/inner_fat.hpp
+  file_sys/data/savegame.cpp
+  file_sys/data/savegame.h
+  file_sys/ncch_container.cpp
+  file_sys/ncch_container.h
+  file_sys/signature.cpp
+  file_sys/signature.h
+  file_sys/smdh.cpp
+  file_sys/smdh.h
+  file_sys/ticket.cpp
+  file_sys/ticket.h
+  file_sys/title_metadata.cpp
+  file_sys/title_metadata.h
   importer.cpp
   importer.h
-  inner_fat.hpp
   key/arithmetic128.cpp
   key/arithmetic128.h
   key/key.cpp
   key/key.h
-  ncch/certificate.cpp
-  ncch/certificate.h
-  ncch/cia_builder.cpp
-  ncch/cia_builder.h
-  ncch/cia_common.h
-  ncch/ncch_container.cpp
-  ncch/ncch_container.h
-  ncch/signature.cpp
-  ncch/signature.h
-  ncch/seed_db.cpp
-  ncch/seed_db.h
-  ncch/smdh.cpp
-  ncch/smdh.h
-  ncch/ticket.cpp
-  ncch/ticket.h
-  ncch/title_metadata.cpp
-  ncch/title_metadata.h
   quick_decryptor.cpp
   quick_decryptor.h
-  savegame.cpp
-  savegame.h
-  title_db.cpp
-  title_db.h
-  title_keys_bin.cpp
-  title_keys_bin.h
 )
 
 target_link_libraries(core PRIVATE common cryptopp)

src/core/cia_builder.cpp

@@ -6,14 +6,14 @@
 #include <cryptopp/modes.h>
 #include <cryptopp/sha.h>
 #include "common/alignment.h"
+#include "core/cia_builder.h"
+#include "core/db/title_db.h"
+#include "core/db/title_keys_bin.h"
+#include "core/file_sys/certificate.h"
+#include "core/file_sys/cia_common.h"
+#include "core/file_sys/ticket.h"
+#include "core/file_sys/title_metadata.h"
 #include "core/importer.h"
-#include "core/ncch/certificate.h"
-#include "core/ncch/cia_builder.h"
-#include "core/ncch/cia_common.h"
-#include "core/ncch/ticket.h"
-#include "core/ncch/title_metadata.h"
-#include "core/title_db.h"
-#include "core/title_keys_bin.h"
 
 namespace Core {
 

src/core/cia_builder.h

@@ -10,10 +10,10 @@
 #include "common/file_util.h"
 #include "common/progress_callback.h"
 #include "common/swap.h"
+#include "core/file_sys/cia_common.h"
+#include "core/file_sys/ncch_container.h"
+#include "core/file_sys/title_metadata.h"
 #include "core/key/key.h"
-#include "core/ncch/cia_common.h"
-#include "core/ncch/ncch_container.h"
-#include "core/ncch/title_metadata.h"
 #include "core/quick_decryptor.h"
 
 namespace Core {

src/core/db/seed_db.cpp

@@ -7,7 +7,7 @@
 #include <fmt/format.h>
 #include "common/file_util.h"
 #include "common/logging/log.h"
-#include "core/ncch/seed_db.h"
+#include "core/db/seed_db.h"
 
 namespace Core {
 

src/core/db/title_db.cpp

@@ -4,8 +4,8 @@
 
 #include "common/file_util.h"
 #include "common/logging/log.h"
-#include "core/data_container.h"
-#include "core/title_db.h"
+#include "core/db/title_db.h"
+#include "core/file_sys/data/data_container.h"
 
 namespace Core {
 

src/core/db/title_db.h

@@ -10,8 +10,8 @@
 #include "common/common_funcs.h"
 #include "common/common_types.h"
 #include "common/swap.h"
-#include "core/inner_fat.hpp"
-#include "core/ncch/ticket.h"
+#include "core/file_sys/data/inner_fat.hpp"
+#include "core/file_sys/ticket.h"
 
 namespace Core {
 

src/core/db/title_keys_bin.cpp

@@ -3,7 +3,7 @@
 // Refer to the license.txt file included.
 
 #include "common/file_util.h"
-#include "core/title_keys_bin.h"
+#include "core/db/title_keys_bin.h"
 
 namespace Core {
 

src/core/file_sys/certificate.cpp

@@ -11,9 +11,9 @@
 #include "common/file_util.h"
 #include "common/logging/log.h"
 #include "common/string_util.h"
-#include "core/data_container.h"
-#include "core/ncch/certificate.h"
-#include "core/ncch/cia_common.h"
+#include "core/file_sys/certificate.h"
+#include "core/file_sys/cia_common.h"
+#include "core/file_sys/data/data_container.h"
 
 namespace Core {
 

src/core/file_sys/certificate.h

@@ -9,7 +9,7 @@
 #include <vector>
 #include "common/common_funcs.h"
 #include "common/swap.h"
-#include "core/ncch/signature.h"
+#include "core/file_sys/signature.h"
 
 namespace CryptoPP {
 class Integer;

src/core/file_sys/data/data_container.cpp

@@ -5,7 +5,7 @@
 #include <cmath>
 #include "common/assert.h"
 #include "common/common_funcs.h"
-#include "core/data_container.h"
+#include "core/file_sys/data/data_container.h"
 
 namespace Core {
 

src/core/file_sys/data/extdata.cpp

@@ -2,9 +2,9 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "core/data_container.h"
 #include "core/decryptor.h"
-#include "core/extdata.h"
+#include "core/file_sys/data/data_container.h"
+#include "core/file_sys/data/extdata.h"
 
 namespace Core {
 

src/core/file_sys/data/extdata.h

@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "core/inner_fat.hpp"
+#include "core/file_sys/data/inner_fat.hpp"
 
 namespace Core {
 

src/core/file_sys/data/savegame.cpp

@@ -2,7 +2,7 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include "core/savegame.h"
+#include "core/file_sys/data/savegame.h"
 
 namespace Core {
 

src/core/file_sys/data/savegame.h

@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "core/inner_fat.hpp"
+#include "core/file_sys/data/inner_fat.hpp"
 
 namespace Core {
 

src/core/file_sys/ncch_container.cpp

@@ -14,11 +14,11 @@
 #include "common/common_funcs.h"
 #include "common/common_types.h"
 #include "common/logging/log.h"
-#include "core/data_container.h"
+#include "core/db/seed_db.h"
+#include "core/file_sys/data/data_container.h"
+#include "core/file_sys/ncch_container.h"
 #include "core/importer.h"
 #include "core/key/key.h"
-#include "core/ncch/ncch_container.h"
-#include "core/ncch/seed_db.h"
 
 namespace Core {
 

src/core/file_sys/signature.cpp

@@ -7,8 +7,8 @@
 #include "common/common_funcs.h"
 #include "common/file_util.h"
 #include "common/logging/log.h"
-#include "core/ncch/certificate.h"
-#include "core/ncch/signature.h"
+#include "core/file_sys/certificate.h"
+#include "core/file_sys/signature.h"
 
 namespace Core {
 

src/core/file_sys/smdh.cpp

@@ -6,7 +6,7 @@
 #include <vector>
 #include "common/common_funcs.h"
 #include "common/common_types.h"
-#include "core/ncch/smdh.h"
+#include "core/file_sys/smdh.h"
 
 namespace Core {
 

src/core/file_sys/ticket.cpp

@@ -10,8 +10,8 @@
 #include "common/common_funcs.h"
 #include "common/file_util.h"
 #include "common/string_util.h"
-#include "core/ncch/cia_common.h"
-#include "core/ncch/ticket.h"
+#include "core/file_sys/cia_common.h"
+#include "core/file_sys/ticket.h"
 
 namespace Core {
 

src/core/file_sys/ticket.h

@@ -9,7 +9,7 @@
 #include "common/common_funcs.h"
 #include "common/common_types.h"
 #include "common/swap.h"
-#include "core/ncch/signature.h"
+#include "core/file_sys/signature.h"
 
 namespace FileUtil {
 class IOFile;

src/core/file_sys/title_metadata.cpp

@@ -11,9 +11,9 @@
 #include "common/file_util.h"
 #include "common/logging/log.h"
 #include "common/string_util.h"
-#include "core/ncch/certificate.h"
-#include "core/ncch/cia_common.h"
-#include "core/ncch/title_metadata.h"
+#include "core/file_sys/certificate.h"
+#include "core/file_sys/cia_common.h"
+#include "core/file_sys/title_metadata.h"
 
 namespace Core {
 

src/core/file_sys/title_metadata.h

@@ -9,7 +9,7 @@
 #include <vector>
 #include "common/common_types.h"
 #include "common/swap.h"
-#include "core/ncch/signature.h"
+#include "core/file_sys/signature.h"
 
 namespace Core {
 

src/core/importer.cpp

@@ -8,19 +8,19 @@
 #include "common/file_util.h"
 #include "common/scope_exit.h"
 #include "common/string_util.h"
-#include "core/data_container.h"
+#include "core/cia_builder.h"
+#include "core/db/seed_db.h"
+#include "core/db/title_db.h"
 #include "core/decryptor.h"
-#include "core/extdata.h"
+#include "core/file_sys/certificate.h"
+#include "core/file_sys/data/data_container.h"
+#include "core/file_sys/data/extdata.h"
+#include "core/file_sys/data/savegame.h"
+#include "core/file_sys/ncch_container.h"
+#include "core/file_sys/smdh.h"
+#include "core/file_sys/title_metadata.h"
 #include "core/importer.h"
 #include "core/key/key.h"
-#include "core/ncch/certificate.h"
-#include "core/ncch/cia_builder.h"
-#include "core/ncch/ncch_container.h"
-#include "core/ncch/seed_db.h"
-#include "core/ncch/smdh.h"
-#include "core/ncch/title_metadata.h"
-#include "core/savegame.h"
-#include "core/title_db.h"
 
 namespace Core {
 

src/core/importer.h

@@ -11,7 +11,7 @@
 #include <vector>
 #include "common/common_types.h"
 #include "common/progress_callback.h"
-#include "core/ncch/cia_common.h"
+#include "core/file_sys/cia_common.h"
 
 namespace Core {
 

src/frontend/cia_build_dialog.h

@@ -5,7 +5,7 @@
 #include <memory>
 #include <utility>
 #include <QDialog>
-#include "core/ncch/cia_common.h"
+#include "core/file_sys/cia_common.h"
 
 namespace Ui {
 class CIABuildDialog;

src/frontend/import_dialog.h

@@ -9,8 +9,8 @@
 #include <vector>
 #include <QDialog>
 #include <QPixmap>
+#include "core/file_sys/ncch_container.h"
 #include "core/importer.h"
-#include "core/ncch/ncch_container.h"
 
 class AdvancedMenu;
 class MultiJob;

src/frontend/utilities.cpp

@@ -8,12 +8,12 @@
 #include <QMessageBox>
 #include <QProgressDialog>
 #include <QtConcurrent/QtConcurrentRun>
-#include "core/data_container.h"
 #include "core/decryptor.h"
-#include "core/extdata.h"
+#include "core/file_sys/data/data_container.h"
+#include "core/file_sys/data/extdata.h"
+#include "core/file_sys/data/savegame.h"
+#include "core/file_sys/ncch_container.h"
 #include "core/key/key.h"
-#include "core/ncch/ncch_container.h"
-#include "core/savegame.h"
 #include "frontend/select_files_dialog.h"
 #include "frontend/utilities.h"
 #include "ui_utilities.h"