diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8a2e246bc..a86f645e8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -143,10 +143,10 @@ set(SYSTEM_LIBS src/core/libraries/system/commondialog.cpp
                 src/core/libraries/system/msgdialog.h
                 src/core/libraries/system/posix.cpp
                 src/core/libraries/system/posix.h
-                src/core/libraries/system/savedata.cpp
+                src/core/libraries/save_data/save_data.cpp
+                src/core/libraries/save_data/save_data.h
                 src/core/libraries/system/savedatadialog.cpp
                 src/core/libraries/system/savedatadialog.h
-                src/core/libraries/system/savedata.h
                 src/core/libraries/system/sysmodule.cpp
                 src/core/libraries/system/sysmodule.h
                 src/core/libraries/system/systemservice.cpp
diff --git a/src/core/libraries/libs.cpp b/src/core/libraries/libs.cpp
index 5995a652e..68c67cffb 100644
--- a/src/core/libraries/libs.cpp
+++ b/src/core/libraries/libs.cpp
@@ -17,7 +17,7 @@
 #include "core/libraries/system/commondialog.h"
 #include "core/libraries/system/msgdialog.h"
 #include "core/libraries/system/posix.h"
-#include "core/libraries/system/savedata.h"
+#include "core/libraries/save_data/save_data.h"
 #include "core/libraries/system/savedatadialog.h"
 #include "core/libraries/system/sysmodule.h"
 #include "core/libraries/system/systemservice.h"
diff --git a/src/core/libraries/system/savedata.cpp b/src/core/libraries/save_data/save_data.cpp
similarity index 99%
rename from src/core/libraries/system/savedata.cpp
rename to src/core/libraries/save_data/save_data.cpp
index c7437cec1..93a97d3eb 100644
--- a/src/core/libraries/system/savedata.cpp
+++ b/src/core/libraries/save_data/save_data.cpp
@@ -5,7 +5,7 @@
 #include "common/logging/log.h"
 #include "core/libraries/error_codes.h"
 #include "core/libraries/libs.h"
-#include "core/libraries/system/savedata.h"
+#include "core/libraries/save_data/save_data.h"
 
 namespace Libraries::SaveData {
 
diff --git a/src/core/libraries/system/savedata.h b/src/core/libraries/save_data/save_data.h
similarity index 100%
rename from src/core/libraries/system/savedata.h
rename to src/core/libraries/save_data/save_data.h