diff --git a/os/hal/complex/mfs/mfs.mk b/os/hal/complex/mfs/mfs.mk
deleted file mode 100644
index 200655196..000000000
--- a/os/hal/complex/mfs/mfs.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-# List of all the MFS subsystem files.
-MFSSRC := $(CHIBIOS)/os/hal/complex/mfs/mfs.c
-
-# Required include directories
-MFSINC := $(CHIBIOS)/os/hal/complex/mfs
\ No newline at end of file
diff --git a/os/hal/complex/mfs/mfs.c b/os/hal/lib/complex/mfs/mfs.c
similarity index 100%
rename from os/hal/complex/mfs/mfs.c
rename to os/hal/lib/complex/mfs/mfs.c
diff --git a/os/hal/complex/mfs/mfs.h b/os/hal/lib/complex/mfs/mfs.h
similarity index 100%
rename from os/hal/complex/mfs/mfs.h
rename to os/hal/lib/complex/mfs/mfs.h
diff --git a/os/hal/lib/complex/mfs/mfs.mk b/os/hal/lib/complex/mfs/mfs.mk
new file mode 100644
index 000000000..eeec6da84
--- /dev/null
+++ b/os/hal/lib/complex/mfs/mfs.mk
@@ -0,0 +1,5 @@
+# List of all the MFS subsystem files.
+MFSSRC := $(CHIBIOS)/os/hal/lib/complex/mfs/mfs.c
+
+# Required include directories
+MFSINC := $(CHIBIOS)/os/hal/lib/complex/mfs
\ No newline at end of file
diff --git a/os/hal/complex/readme.txt b/os/hal/lib/complex/readme.txt
similarity index 100%
rename from os/hal/complex/readme.txt
rename to os/hal/lib/complex/readme.txt
diff --git a/testex/STM32/STM32L4xx/QSPI-N25Q128/Makefile b/testex/STM32/STM32L4xx/QSPI-N25Q128/Makefile
index 0b9b33cdd..c54cb27b2 100644
--- a/testex/STM32/STM32L4xx/QSPI-N25Q128/Makefile
+++ b/testex/STM32/STM32L4xx/QSPI-N25Q128/Makefile
@@ -99,7 +99,7 @@ include $(CHIBIOS)/os/rt/rt.mk
 include $(CHIBIOS)/os/common/ports/ARMCMx/compilers/GCC/mk/port_v7m.mk
 # Other files (optional).
 include $(CHIBIOS)/os/ex/Micron/m25q.mk
-include $(CHIBIOS)/os/ex/subsystems/mfs/mfs.mk
+include $(CHIBIOS)/os/hal/lib/complex/mfs/mfs.mk
 include $(CHIBIOS)/os/hal/lib/streams/streams.mk
 
 # Define linker script file here