diff --git a/bsp_q7s/CMakeLists.txt b/bsp_q7s/CMakeLists.txt
index f6dbf590..2c1bae48 100644
--- a/bsp_q7s/CMakeLists.txt
+++ b/bsp_q7s/CMakeLists.txt
@@ -24,3 +24,4 @@ endif()
 add_subdirectory(memory)
 add_subdirectory(callbacks)
 add_subdirectory(xadc)
+add_subdirectory(fs)
diff --git a/bsp_q7s/boardtest/Q7STestTask.cpp b/bsp_q7s/boardtest/Q7STestTask.cpp
index 3e08bf13..cbd1fbed 100644
--- a/bsp_q7s/boardtest/Q7STestTask.cpp
+++ b/bsp_q7s/boardtest/Q7STestTask.cpp
@@ -17,7 +17,7 @@
 #include <nlohmann/json.hpp>
 
 #include "OBSWConfig.h"
-#include "bsp_q7s/memory/SdCardManager.h"
+#include "bsp_q7s/fs/SdCardManager.h"
 #include "bsp_q7s/memory/scratchApi.h"
 #include "fsfw/tasks/TaskFactory.h"
 #include "fsfw/timemanager/Stopwatch.h"
diff --git a/bsp_q7s/core/CoreController.cpp b/bsp_q7s/core/CoreController.cpp
index de36b01a..8406d78b 100644
--- a/bsp_q7s/core/CoreController.cpp
+++ b/bsp_q7s/core/CoreController.cpp
@@ -20,7 +20,7 @@
 #include <algorithm>
 #include <filesystem>
 
-#include "bsp_q7s/memory/SdCardManager.h"
+#include "bsp_q7s/fs/SdCardManager.h"
 #include "bsp_q7s/memory/scratchApi.h"
 #include "bsp_q7s/xadc/Xadc.h"
 #include "linux/utility/utility.h"
diff --git a/bsp_q7s/core/CoreController.h b/bsp_q7s/core/CoreController.h
index 2ebdd4ec..c1cdbf93 100644
--- a/bsp_q7s/core/CoreController.h
+++ b/bsp_q7s/core/CoreController.h
@@ -7,7 +7,7 @@
 #include <cstddef>
 
 #include "CoreDefinitions.h"
-#include "bsp_q7s/memory/SdCardManager.h"
+#include "bsp_q7s/fs/SdCardManager.h"
 #include "events/subsystemIdRanges.h"
 #include "fsfw/controller/ExtendedControllerBase.h"
 #include "mission/devices/devicedefinitions/GPSDefinitions.h"
diff --git a/bsp_q7s/fs/CMakeLists.txt b/bsp_q7s/fs/CMakeLists.txt
new file mode 100644
index 00000000..0e51683d
--- /dev/null
+++ b/bsp_q7s/fs/CMakeLists.txt
@@ -0,0 +1,2 @@
+target_sources(${OBSW_NAME} PRIVATE helpers.cpp SdCardManager.cpp
+                                    FilesystemHelper.cpp)
diff --git a/bsp_q7s/memory/FilesystemHelper.cpp b/bsp_q7s/fs/FilesystemHelper.cpp
similarity index 92%
rename from bsp_q7s/memory/FilesystemHelper.cpp
rename to bsp_q7s/fs/FilesystemHelper.cpp
index 91dfa9c5..4a0df9e2 100644
--- a/bsp_q7s/memory/FilesystemHelper.cpp
+++ b/bsp_q7s/fs/FilesystemHelper.cpp
@@ -3,8 +3,8 @@
 #include <filesystem>
 #include <fstream>
 
-#include "bsp_q7s/memory/SdCardManager.h"
-#include "fsfw/serviceinterface/ServiceInterfaceStream.h"
+#include "SdCardManager.h"
+#include "fsfw/serviceinterface.h"
 
 FilesystemHelper::FilesystemHelper() {}
 
diff --git a/bsp_q7s/memory/FilesystemHelper.h b/bsp_q7s/fs/FilesystemHelper.h
similarity index 100%
rename from bsp_q7s/memory/FilesystemHelper.h
rename to bsp_q7s/fs/FilesystemHelper.h
diff --git a/bsp_q7s/memory/SdCardManager.cpp b/bsp_q7s/fs/SdCardManager.cpp
similarity index 99%
rename from bsp_q7s/memory/SdCardManager.cpp
rename to bsp_q7s/fs/SdCardManager.cpp
index e2702771..2a835806 100644
--- a/bsp_q7s/memory/SdCardManager.cpp
+++ b/bsp_q7s/fs/SdCardManager.cpp
@@ -10,11 +10,11 @@
 #include <memory>
 
 #include "OBSWConfig.h"
+#include "bsp_q7s/memory/scratchApi.h"
 #include "common/config/commonObjects.h"
 #include "fsfw/ipc/MutexFactory.h"
 #include "fsfw/serviceinterface/ServiceInterface.h"
 #include "linux/utility/utility.h"
-#include "scratchApi.h"
 
 SdCardManager* SdCardManager::INSTANCE = nullptr;
 
diff --git a/bsp_q7s/memory/SdCardManager.h b/bsp_q7s/fs/SdCardManager.h
similarity index 100%
rename from bsp_q7s/memory/SdCardManager.h
rename to bsp_q7s/fs/SdCardManager.h
diff --git a/bsp_q7s/memory/helpers.cpp b/bsp_q7s/fs/helpers.cpp
similarity index 100%
rename from bsp_q7s/memory/helpers.cpp
rename to bsp_q7s/fs/helpers.cpp
diff --git a/bsp_q7s/memory/helpers.h b/bsp_q7s/fs/helpers.h
similarity index 87%
rename from bsp_q7s/memory/helpers.h
rename to bsp_q7s/fs/helpers.h
index 16c5f7c8..0b13fc26 100644
--- a/bsp_q7s/memory/helpers.h
+++ b/bsp_q7s/fs/helpers.h
@@ -1,10 +1,10 @@
 #ifndef BSP_Q7S_MEMORY_HELPERS_H_
 #define BSP_Q7S_MEMORY_HELPERS_H_
 
-#include <bsp_q7s/memory/SdCardManager.h>
-
 #include <filesystem>
 
+#include "SdCardManager.h"
+
 namespace fshelpers {
 
 std::filesystem::path buildPrefixedPath(SdCardManager& man,
diff --git a/bsp_q7s/memory/CMakeLists.txt b/bsp_q7s/memory/CMakeLists.txt
index 8598f44c..06909a0a 100644
--- a/bsp_q7s/memory/CMakeLists.txt
+++ b/bsp_q7s/memory/CMakeLists.txt
@@ -1,2 +1 @@
-target_sources(${OBSW_NAME} PRIVATE helpers.cpp SdCardManager.cpp
-                                    scratchApi.cpp FilesystemHelper.cpp)
+target_sources(${OBSW_NAME} PRIVATE scratchApi.cpp)
diff --git a/linux/devices/ploc/PlocMPSoCHelper.cpp b/linux/devices/ploc/PlocMPSoCHelper.cpp
index 965c63e6..980b8889 100644
--- a/linux/devices/ploc/PlocMPSoCHelper.cpp
+++ b/linux/devices/ploc/PlocMPSoCHelper.cpp
@@ -5,7 +5,7 @@
 
 #include "OBSWConfig.h"
 #ifdef XIPHOS_Q7S
-#include "bsp_q7s/memory/FilesystemHelper.h"
+#include "bsp_q7s/fs/FilesystemHelper.h"
 #endif
 
 #include "mission/utility/Timestamp.h"
diff --git a/linux/devices/ploc/PlocMPSoCHelper.h b/linux/devices/ploc/PlocMPSoCHelper.h
index 3adffa77..b669b51b 100644
--- a/linux/devices/ploc/PlocMPSoCHelper.h
+++ b/linux/devices/ploc/PlocMPSoCHelper.h
@@ -12,7 +12,7 @@
 #include "fsfw_hal/linux/uart/UartComIF.h"
 #include "linux/devices/devicedefinitions/PlocMPSoCDefinitions.h"
 #ifdef XIPHOS_Q7S
-#include "bsp_q7s/memory/SdCardManager.h"
+#include "bsp_q7s/fs/SdCardManager.h"
 #endif
 
 /**
diff --git a/linux/devices/ploc/PlocMemoryDumper.h b/linux/devices/ploc/PlocMemoryDumper.h
index b41ee420..da72c558 100644
--- a/linux/devices/ploc/PlocMemoryDumper.h
+++ b/linux/devices/ploc/PlocMemoryDumper.h
@@ -5,7 +5,7 @@
 #include <linux/devices/devicedefinitions/PlocSupervisorDefinitions.h>
 
 #include "OBSWConfig.h"
-#include "bsp_q7s/memory/SdCardManager.h"
+#include "bsp_q7s/fs/SdCardManager.h"
 #include "fsfw/action/ActionHelper.h"
 #include "fsfw/action/CommandActionHelper.h"
 #include "fsfw/action/CommandsActionsIF.h"
diff --git a/linux/devices/ploc/PlocSupervisorHandler.h b/linux/devices/ploc/PlocSupervisorHandler.h
index 82ab4545..4bdf2efa 100644
--- a/linux/devices/ploc/PlocSupervisorHandler.h
+++ b/linux/devices/ploc/PlocSupervisorHandler.h
@@ -3,7 +3,7 @@
 
 #include "OBSWConfig.h"
 #include "PlocSupvHelper.h"
-#include "bsp_q7s/memory/SdCardManager.h"
+#include "bsp_q7s/fs/SdCardManager.h"
 #include "devices/powerSwitcherList.h"
 #include "fsfw/devicehandlers/DeviceHandlerBase.h"
 #include "fsfw/timemanager/Countdown.h"
diff --git a/linux/devices/ploc/PlocSupvHelper.cpp b/linux/devices/ploc/PlocSupvHelper.cpp
index c34fdbe3..f0f94635 100644
--- a/linux/devices/ploc/PlocSupvHelper.cpp
+++ b/linux/devices/ploc/PlocSupvHelper.cpp
@@ -8,8 +8,8 @@
 
 #include "OBSWConfig.h"
 #ifdef XIPHOS_Q7S
-#include "bsp_q7s/memory/FilesystemHelper.h"
-#include "bsp_q7s/memory/SdCardManager.h"
+#include "bsp_q7s/fs/FilesystemHelper.h"
+#include "bsp_q7s/fs/SdCardManager.h"
 #endif
 
 #include "fsfw/tasks/TaskFactory.h"
diff --git a/linux/devices/ploc/PlocSupvHelper.h b/linux/devices/ploc/PlocSupvHelper.h
index 82ce7522..30152e65 100644
--- a/linux/devices/ploc/PlocSupvHelper.h
+++ b/linux/devices/ploc/PlocSupvHelper.h
@@ -13,7 +13,7 @@
 #include "linux/devices/devicedefinitions/PlocSupervisorDefinitions.h"
 
 #ifdef XIPHOS_Q7S
-#include "bsp_q7s/memory/SdCardManager.h"
+#include "bsp_q7s/fs/SdCardManager.h"
 #endif
 
 /**
diff --git a/linux/devices/startracker/StrHelper.h b/linux/devices/startracker/StrHelper.h
index 1bfff60b..a9c80d77 100644
--- a/linux/devices/startracker/StrHelper.h
+++ b/linux/devices/startracker/StrHelper.h
@@ -7,7 +7,7 @@
 #include "OBSWConfig.h"
 
 #ifdef XIPHOS_Q7S
-#include "bsp_q7s/memory/SdCardManager.h"
+#include "bsp_q7s/fs/SdCardManager.h"
 #endif
 
 #include "fsfw/devicehandlers/CookieIF.h"