diff --git a/CODEOWNERS b/CODEOWNERS
index fe17ea072da..f93cde130e2 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -185,7 +185,7 @@
 # Mount Point Manager
 #   M: HeisSpiter, Heis Spiter, Pierre Schweitzer
 #   S: Maintained
-/drivers/filters/mountmgr/ @HeisSpiter
+/drivers/storage/mountmgr/ @HeisSpiter
 
 # Network Drivers
 #   M:
diff --git a/drivers/filters/CMakeLists.txt b/drivers/filters/CMakeLists.txt
index 2d135dd9199..bd6c76497cb 100644
--- a/drivers/filters/CMakeLists.txt
+++ b/drivers/filters/CMakeLists.txt
@@ -1,2 +1 @@
 add_subdirectory(fltmgr)
-add_subdirectory(mountmgr)
diff --git a/drivers/storage/CMakeLists.txt b/drivers/storage/CMakeLists.txt
index aafce81c642..b3f0f02a4c4 100644
--- a/drivers/storage/CMakeLists.txt
+++ b/drivers/storage/CMakeLists.txt
@@ -1,4 +1,5 @@
 add_subdirectory(class)
 add_subdirectory(floppy)
 add_subdirectory(ide)
+add_subdirectory(mountmgr)
 add_subdirectory(port)
diff --git a/drivers/filters/mountmgr/CMakeLists.txt b/drivers/storage/mountmgr/CMakeLists.txt
similarity index 100%
rename from drivers/filters/mountmgr/CMakeLists.txt
rename to drivers/storage/mountmgr/CMakeLists.txt
diff --git a/drivers/filters/mountmgr/database.c b/drivers/storage/mountmgr/database.c
similarity index 100%
rename from drivers/filters/mountmgr/database.c
rename to drivers/storage/mountmgr/database.c
diff --git a/drivers/filters/mountmgr/device.c b/drivers/storage/mountmgr/device.c
similarity index 100%
rename from drivers/filters/mountmgr/device.c
rename to drivers/storage/mountmgr/device.c
diff --git a/drivers/filters/mountmgr/mntmgr.h b/drivers/storage/mountmgr/mntmgr.h
similarity index 100%
rename from drivers/filters/mountmgr/mntmgr.h
rename to drivers/storage/mountmgr/mntmgr.h
diff --git a/drivers/filters/mountmgr/mountmgr.c b/drivers/storage/mountmgr/mountmgr.c
similarity index 100%
rename from drivers/filters/mountmgr/mountmgr.c
rename to drivers/storage/mountmgr/mountmgr.c
diff --git a/drivers/filters/mountmgr/mountmgr.rc b/drivers/storage/mountmgr/mountmgr.rc
similarity index 100%
rename from drivers/filters/mountmgr/mountmgr.rc
rename to drivers/storage/mountmgr/mountmgr.rc
diff --git a/drivers/filters/mountmgr/notify.c b/drivers/storage/mountmgr/notify.c
similarity index 100%
rename from drivers/filters/mountmgr/notify.c
rename to drivers/storage/mountmgr/notify.c
diff --git a/drivers/filters/mountmgr/point.c b/drivers/storage/mountmgr/point.c
similarity index 100%
rename from drivers/filters/mountmgr/point.c
rename to drivers/storage/mountmgr/point.c
diff --git a/drivers/filters/mountmgr/symlink.c b/drivers/storage/mountmgr/symlink.c
similarity index 100%
rename from drivers/filters/mountmgr/symlink.c
rename to drivers/storage/mountmgr/symlink.c
diff --git a/drivers/filters/mountmgr/uniqueid.c b/drivers/storage/mountmgr/uniqueid.c
similarity index 100%
rename from drivers/filters/mountmgr/uniqueid.c
rename to drivers/storage/mountmgr/uniqueid.c