diff --git a/reactos/drivers/fs/cdfs/cdfs.c b/reactos/drivers/filesystems/cdfs/cdfs.c
similarity index 100%
rename from reactos/drivers/fs/cdfs/cdfs.c
rename to reactos/drivers/filesystems/cdfs/cdfs.c
diff --git a/reactos/drivers/fs/cdfs/cdfs.h b/reactos/drivers/filesystems/cdfs/cdfs.h
similarity index 100%
rename from reactos/drivers/fs/cdfs/cdfs.h
rename to reactos/drivers/filesystems/cdfs/cdfs.h
diff --git a/reactos/drivers/fs/cdfs/cdfs.rc b/reactos/drivers/filesystems/cdfs/cdfs.rc
similarity index 100%
rename from reactos/drivers/fs/cdfs/cdfs.rc
rename to reactos/drivers/filesystems/cdfs/cdfs.rc
diff --git a/reactos/drivers/fs/cdfs/cdfs.xml b/reactos/drivers/filesystems/cdfs/cdfs.xml
similarity index 100%
rename from reactos/drivers/fs/cdfs/cdfs.xml
rename to reactos/drivers/filesystems/cdfs/cdfs.xml
diff --git a/reactos/drivers/fs/cdfs/cleanup.c b/reactos/drivers/filesystems/cdfs/cleanup.c
similarity index 100%
rename from reactos/drivers/fs/cdfs/cleanup.c
rename to reactos/drivers/filesystems/cdfs/cleanup.c
diff --git a/reactos/drivers/fs/cdfs/close.c b/reactos/drivers/filesystems/cdfs/close.c
similarity index 100%
rename from reactos/drivers/fs/cdfs/close.c
rename to reactos/drivers/filesystems/cdfs/close.c
diff --git a/reactos/drivers/fs/cdfs/common.c b/reactos/drivers/filesystems/cdfs/common.c
similarity index 100%
rename from reactos/drivers/fs/cdfs/common.c
rename to reactos/drivers/filesystems/cdfs/common.c
diff --git a/reactos/drivers/fs/cdfs/create.c b/reactos/drivers/filesystems/cdfs/create.c
similarity index 100%
rename from reactos/drivers/fs/cdfs/create.c
rename to reactos/drivers/filesystems/cdfs/create.c
diff --git a/reactos/drivers/fs/cdfs/dirctl.c b/reactos/drivers/filesystems/cdfs/dirctl.c
similarity index 100%
rename from reactos/drivers/fs/cdfs/dirctl.c
rename to reactos/drivers/filesystems/cdfs/dirctl.c
diff --git a/reactos/drivers/fs/cdfs/fcb.c b/reactos/drivers/filesystems/cdfs/fcb.c
similarity index 100%
rename from reactos/drivers/fs/cdfs/fcb.c
rename to reactos/drivers/filesystems/cdfs/fcb.c
diff --git a/reactos/drivers/fs/cdfs/finfo.c b/reactos/drivers/filesystems/cdfs/finfo.c
similarity index 100%
rename from reactos/drivers/fs/cdfs/finfo.c
rename to reactos/drivers/filesystems/cdfs/finfo.c
diff --git a/reactos/drivers/fs/cdfs/fsctl.c b/reactos/drivers/filesystems/cdfs/fsctl.c
similarity index 100%
rename from reactos/drivers/fs/cdfs/fsctl.c
rename to reactos/drivers/filesystems/cdfs/fsctl.c
diff --git a/reactos/drivers/fs/cdfs/misc.c b/reactos/drivers/filesystems/cdfs/misc.c
similarity index 100%
rename from reactos/drivers/fs/cdfs/misc.c
rename to reactos/drivers/filesystems/cdfs/misc.c
diff --git a/reactos/drivers/fs/cdfs/rw.c b/reactos/drivers/filesystems/cdfs/rw.c
similarity index 100%
rename from reactos/drivers/fs/cdfs/rw.c
rename to reactos/drivers/filesystems/cdfs/rw.c
diff --git a/reactos/drivers/fs/cdfs/volinfo.c b/reactos/drivers/filesystems/cdfs/volinfo.c
similarity index 100%
rename from reactos/drivers/fs/cdfs/volinfo.c
rename to reactos/drivers/filesystems/cdfs/volinfo.c
diff --git a/reactos/drivers/fs/directory.xml b/reactos/drivers/filesystems/directory.xml
similarity index 100%
rename from reactos/drivers/fs/directory.xml
rename to reactos/drivers/filesystems/directory.xml
diff --git a/reactos/drivers/fs/ext2/attr.c b/reactos/drivers/filesystems/ext2/attr.c
similarity index 100%
rename from reactos/drivers/fs/ext2/attr.c
rename to reactos/drivers/filesystems/ext2/attr.c
diff --git a/reactos/drivers/fs/ext2/blockdev.c b/reactos/drivers/filesystems/ext2/blockdev.c
similarity index 100%
rename from reactos/drivers/fs/ext2/blockdev.c
rename to reactos/drivers/filesystems/ext2/blockdev.c
diff --git a/reactos/drivers/fs/ext2/dir.c b/reactos/drivers/filesystems/ext2/dir.c
similarity index 100%
rename from reactos/drivers/fs/ext2/dir.c
rename to reactos/drivers/filesystems/ext2/dir.c
diff --git a/reactos/drivers/fs/ext2/ext2fs.h b/reactos/drivers/filesystems/ext2/ext2fs.h
similarity index 100%
rename from reactos/drivers/fs/ext2/ext2fs.h
rename to reactos/drivers/filesystems/ext2/ext2fs.h
diff --git a/reactos/drivers/fs/ext2/ext2fs.rc b/reactos/drivers/filesystems/ext2/ext2fs.rc
similarity index 100%
rename from reactos/drivers/fs/ext2/ext2fs.rc
rename to reactos/drivers/filesystems/ext2/ext2fs.rc
diff --git a/reactos/drivers/fs/ext2/file.c b/reactos/drivers/filesystems/ext2/file.c
similarity index 100%
rename from reactos/drivers/fs/ext2/file.c
rename to reactos/drivers/filesystems/ext2/file.c
diff --git a/reactos/drivers/fs/ext2/inode.c b/reactos/drivers/filesystems/ext2/inode.c
similarity index 100%
rename from reactos/drivers/fs/ext2/inode.c
rename to reactos/drivers/filesystems/ext2/inode.c
diff --git a/reactos/drivers/fs/ext2/quota.c b/reactos/drivers/filesystems/ext2/quota.c
similarity index 100%
rename from reactos/drivers/fs/ext2/quota.c
rename to reactos/drivers/filesystems/ext2/quota.c
diff --git a/reactos/drivers/fs/ext2/rw.c b/reactos/drivers/filesystems/ext2/rw.c
similarity index 100%
rename from reactos/drivers/fs/ext2/rw.c
rename to reactos/drivers/filesystems/ext2/rw.c
diff --git a/reactos/drivers/fs/ext2/security.c b/reactos/drivers/filesystems/ext2/security.c
similarity index 100%
rename from reactos/drivers/fs/ext2/security.c
rename to reactos/drivers/filesystems/ext2/security.c
diff --git a/reactos/drivers/fs/ext2/super.c b/reactos/drivers/filesystems/ext2/super.c
similarity index 100%
rename from reactos/drivers/fs/ext2/super.c
rename to reactos/drivers/filesystems/ext2/super.c
diff --git a/reactos/drivers/fs/fs_rec/blockdev.c b/reactos/drivers/filesystems/fs_rec/blockdev.c
similarity index 100%
rename from reactos/drivers/fs/fs_rec/blockdev.c
rename to reactos/drivers/filesystems/fs_rec/blockdev.c
diff --git a/reactos/drivers/fs/fs_rec/cdfs.c b/reactos/drivers/filesystems/fs_rec/cdfs.c
similarity index 100%
rename from reactos/drivers/fs/fs_rec/cdfs.c
rename to reactos/drivers/filesystems/fs_rec/cdfs.c
diff --git a/reactos/drivers/fs/fs_rec/fat.c b/reactos/drivers/filesystems/fs_rec/fat.c
similarity index 100%
rename from reactos/drivers/fs/fs_rec/fat.c
rename to reactos/drivers/filesystems/fs_rec/fat.c
diff --git a/reactos/drivers/fs/fs_rec/fs_rec.c b/reactos/drivers/filesystems/fs_rec/fs_rec.c
similarity index 100%
rename from reactos/drivers/fs/fs_rec/fs_rec.c
rename to reactos/drivers/filesystems/fs_rec/fs_rec.c
diff --git a/reactos/drivers/fs/fs_rec/fs_rec.h b/reactos/drivers/filesystems/fs_rec/fs_rec.h
similarity index 100%
rename from reactos/drivers/fs/fs_rec/fs_rec.h
rename to reactos/drivers/filesystems/fs_rec/fs_rec.h
diff --git a/reactos/drivers/fs/fs_rec/fs_rec.rc b/reactos/drivers/filesystems/fs_rec/fs_rec.rc
similarity index 100%
rename from reactos/drivers/fs/fs_rec/fs_rec.rc
rename to reactos/drivers/filesystems/fs_rec/fs_rec.rc
diff --git a/reactos/drivers/fs/fs_rec/fs_rec.xml b/reactos/drivers/filesystems/fs_rec/fs_rec.xml
similarity index 100%
rename from reactos/drivers/fs/fs_rec/fs_rec.xml
rename to reactos/drivers/filesystems/fs_rec/fs_rec.xml
diff --git a/reactos/drivers/fs/fs_rec/ntfs.c b/reactos/drivers/filesystems/fs_rec/ntfs.c
similarity index 100%
rename from reactos/drivers/fs/fs_rec/ntfs.c
rename to reactos/drivers/filesystems/fs_rec/ntfs.c
diff --git a/reactos/drivers/fs/fs_rec/udfs.c b/reactos/drivers/filesystems/fs_rec/udfs.c
similarity index 100%
rename from reactos/drivers/fs/fs_rec/udfs.c
rename to reactos/drivers/filesystems/fs_rec/udfs.c
diff --git a/reactos/drivers/fs/minix/bitops.c b/reactos/drivers/filesystems/minix/bitops.c
similarity index 100%
rename from reactos/drivers/fs/minix/bitops.c
rename to reactos/drivers/filesystems/minix/bitops.c
diff --git a/reactos/drivers/fs/minix/bitops.h b/reactos/drivers/filesystems/minix/bitops.h
similarity index 100%
rename from reactos/drivers/fs/minix/bitops.h
rename to reactos/drivers/filesystems/minix/bitops.h
diff --git a/reactos/drivers/fs/minix/block.c b/reactos/drivers/filesystems/minix/block.c
similarity index 100%
rename from reactos/drivers/fs/minix/block.c
rename to reactos/drivers/filesystems/minix/block.c
diff --git a/reactos/drivers/fs/minix/blockdev.c b/reactos/drivers/filesystems/minix/blockdev.c
similarity index 100%
rename from reactos/drivers/fs/minix/blockdev.c
rename to reactos/drivers/filesystems/minix/blockdev.c
diff --git a/reactos/drivers/fs/minix/cache.c b/reactos/drivers/filesystems/minix/cache.c
similarity index 100%
rename from reactos/drivers/fs/minix/cache.c
rename to reactos/drivers/filesystems/minix/cache.c
diff --git a/reactos/drivers/fs/minix/dir.c b/reactos/drivers/filesystems/minix/dir.c
similarity index 100%
rename from reactos/drivers/fs/minix/dir.c
rename to reactos/drivers/filesystems/minix/dir.c
diff --git a/reactos/drivers/fs/minix/inode.c b/reactos/drivers/filesystems/minix/inode.c
similarity index 100%
rename from reactos/drivers/fs/minix/inode.c
rename to reactos/drivers/filesystems/minix/inode.c
diff --git a/reactos/drivers/fs/minix/minix.h b/reactos/drivers/filesystems/minix/minix.h
similarity index 100%
rename from reactos/drivers/fs/minix/minix.h
rename to reactos/drivers/filesystems/minix/minix.h
diff --git a/reactos/drivers/fs/minix/minix.rc b/reactos/drivers/filesystems/minix/minix.rc
similarity index 100%
rename from reactos/drivers/fs/minix/minix.rc
rename to reactos/drivers/filesystems/minix/minix.rc
diff --git a/reactos/drivers/fs/minix/minix_fs.h b/reactos/drivers/filesystems/minix/minix_fs.h
similarity index 100%
rename from reactos/drivers/fs/minix/minix_fs.h
rename to reactos/drivers/filesystems/minix/minix_fs.h
diff --git a/reactos/drivers/fs/minix/mount.c b/reactos/drivers/filesystems/minix/mount.c
similarity index 100%
rename from reactos/drivers/fs/minix/mount.c
rename to reactos/drivers/filesystems/minix/mount.c
diff --git a/reactos/drivers/fs/minix/rw.c b/reactos/drivers/filesystems/minix/rw.c
similarity index 100%
rename from reactos/drivers/fs/minix/rw.c
rename to reactos/drivers/filesystems/minix/rw.c
diff --git a/reactos/drivers/fs/ms/create.c b/reactos/drivers/filesystems/ms/create.c
similarity index 100%
rename from reactos/drivers/fs/ms/create.c
rename to reactos/drivers/filesystems/ms/create.c
diff --git a/reactos/drivers/fs/ms/finfo.c b/reactos/drivers/filesystems/ms/finfo.c
similarity index 100%
rename from reactos/drivers/fs/ms/finfo.c
rename to reactos/drivers/filesystems/ms/finfo.c
diff --git a/reactos/drivers/fs/ms/fsctrl.c b/reactos/drivers/filesystems/ms/fsctrl.c
similarity index 100%
rename from reactos/drivers/fs/ms/fsctrl.c
rename to reactos/drivers/filesystems/ms/fsctrl.c
diff --git a/reactos/drivers/fs/ms/msfs.c b/reactos/drivers/filesystems/ms/msfs.c
similarity index 100%
rename from reactos/drivers/fs/ms/msfs.c
rename to reactos/drivers/filesystems/ms/msfs.c
diff --git a/reactos/drivers/fs/ms/msfs.h b/reactos/drivers/filesystems/ms/msfs.h
similarity index 100%
rename from reactos/drivers/fs/ms/msfs.h
rename to reactos/drivers/filesystems/ms/msfs.h
diff --git a/reactos/drivers/fs/ms/msfs.rc b/reactos/drivers/filesystems/ms/msfs.rc
similarity index 100%
rename from reactos/drivers/fs/ms/msfs.rc
rename to reactos/drivers/filesystems/ms/msfs.rc
diff --git a/reactos/drivers/fs/ms/msfs.xml b/reactos/drivers/filesystems/ms/msfs.xml
similarity index 100%
rename from reactos/drivers/fs/ms/msfs.xml
rename to reactos/drivers/filesystems/ms/msfs.xml
diff --git a/reactos/drivers/fs/ms/rw.c b/reactos/drivers/filesystems/ms/rw.c
similarity index 100%
rename from reactos/drivers/fs/ms/rw.c
rename to reactos/drivers/filesystems/ms/rw.c
diff --git a/reactos/drivers/fs/mup/create.c b/reactos/drivers/filesystems/mup/create.c
similarity index 100%
rename from reactos/drivers/fs/mup/create.c
rename to reactos/drivers/filesystems/mup/create.c
diff --git a/reactos/drivers/fs/mup/mup.c b/reactos/drivers/filesystems/mup/mup.c
similarity index 100%
rename from reactos/drivers/fs/mup/mup.c
rename to reactos/drivers/filesystems/mup/mup.c
diff --git a/reactos/drivers/fs/mup/mup.h b/reactos/drivers/filesystems/mup/mup.h
similarity index 100%
rename from reactos/drivers/fs/mup/mup.h
rename to reactos/drivers/filesystems/mup/mup.h
diff --git a/reactos/drivers/fs/mup/mup.rc b/reactos/drivers/filesystems/mup/mup.rc
similarity index 100%
rename from reactos/drivers/fs/mup/mup.rc
rename to reactos/drivers/filesystems/mup/mup.rc
diff --git a/reactos/drivers/fs/mup/mup.xml b/reactos/drivers/filesystems/mup/mup.xml
similarity index 100%
rename from reactos/drivers/fs/mup/mup.xml
rename to reactos/drivers/filesystems/mup/mup.xml
diff --git a/reactos/drivers/fs/np/create.c b/reactos/drivers/filesystems/np/create.c
similarity index 100%
rename from reactos/drivers/fs/np/create.c
rename to reactos/drivers/filesystems/np/create.c
diff --git a/reactos/drivers/fs/np/finfo.c b/reactos/drivers/filesystems/np/finfo.c
similarity index 100%
rename from reactos/drivers/fs/np/finfo.c
rename to reactos/drivers/filesystems/np/finfo.c
diff --git a/reactos/drivers/fs/np/fsctrl.c b/reactos/drivers/filesystems/np/fsctrl.c
similarity index 100%
rename from reactos/drivers/fs/np/fsctrl.c
rename to reactos/drivers/filesystems/np/fsctrl.c
diff --git a/reactos/drivers/fs/np/npfs.c b/reactos/drivers/filesystems/np/npfs.c
similarity index 100%
rename from reactos/drivers/fs/np/npfs.c
rename to reactos/drivers/filesystems/np/npfs.c
diff --git a/reactos/drivers/fs/np/npfs.h b/reactos/drivers/filesystems/np/npfs.h
similarity index 100%
rename from reactos/drivers/fs/np/npfs.h
rename to reactos/drivers/filesystems/np/npfs.h
diff --git a/reactos/drivers/fs/np/npfs.rc b/reactos/drivers/filesystems/np/npfs.rc
similarity index 100%
rename from reactos/drivers/fs/np/npfs.rc
rename to reactos/drivers/filesystems/np/npfs.rc
diff --git a/reactos/drivers/fs/np/npfs.xml b/reactos/drivers/filesystems/np/npfs.xml
similarity index 100%
rename from reactos/drivers/fs/np/npfs.xml
rename to reactos/drivers/filesystems/np/npfs.xml
diff --git a/reactos/drivers/fs/np/rw.c b/reactos/drivers/filesystems/np/rw.c
similarity index 100%
rename from reactos/drivers/fs/np/rw.c
rename to reactos/drivers/filesystems/np/rw.c
diff --git a/reactos/drivers/fs/np/volume.c b/reactos/drivers/filesystems/np/volume.c
similarity index 100%
rename from reactos/drivers/fs/np/volume.c
rename to reactos/drivers/filesystems/np/volume.c
diff --git a/reactos/drivers/fs/ntfs/attrib.c b/reactos/drivers/filesystems/ntfs/attrib.c
similarity index 100%
rename from reactos/drivers/fs/ntfs/attrib.c
rename to reactos/drivers/filesystems/ntfs/attrib.c
diff --git a/reactos/drivers/fs/ntfs/blockdev.c b/reactos/drivers/filesystems/ntfs/blockdev.c
similarity index 100%
rename from reactos/drivers/fs/ntfs/blockdev.c
rename to reactos/drivers/filesystems/ntfs/blockdev.c
diff --git a/reactos/drivers/fs/ntfs/close.c b/reactos/drivers/filesystems/ntfs/close.c
similarity index 100%
rename from reactos/drivers/fs/ntfs/close.c
rename to reactos/drivers/filesystems/ntfs/close.c
diff --git a/reactos/drivers/fs/ntfs/create.c b/reactos/drivers/filesystems/ntfs/create.c
similarity index 100%
rename from reactos/drivers/fs/ntfs/create.c
rename to reactos/drivers/filesystems/ntfs/create.c
diff --git a/reactos/drivers/fs/ntfs/dirctl.c b/reactos/drivers/filesystems/ntfs/dirctl.c
similarity index 100%
rename from reactos/drivers/fs/ntfs/dirctl.c
rename to reactos/drivers/filesystems/ntfs/dirctl.c
diff --git a/reactos/drivers/fs/ntfs/fcb.c b/reactos/drivers/filesystems/ntfs/fcb.c
similarity index 100%
rename from reactos/drivers/fs/ntfs/fcb.c
rename to reactos/drivers/filesystems/ntfs/fcb.c
diff --git a/reactos/drivers/fs/ntfs/finfo.c b/reactos/drivers/filesystems/ntfs/finfo.c
similarity index 100%
rename from reactos/drivers/fs/ntfs/finfo.c
rename to reactos/drivers/filesystems/ntfs/finfo.c
diff --git a/reactos/drivers/fs/ntfs/fsctl.c b/reactos/drivers/filesystems/ntfs/fsctl.c
similarity index 100%
rename from reactos/drivers/fs/ntfs/fsctl.c
rename to reactos/drivers/filesystems/ntfs/fsctl.c
diff --git a/reactos/drivers/fs/ntfs/linux-ntfs/ChangeLog b/reactos/drivers/filesystems/ntfs/linux-ntfs/ChangeLog
similarity index 100%
rename from reactos/drivers/fs/ntfs/linux-ntfs/ChangeLog
rename to reactos/drivers/filesystems/ntfs/linux-ntfs/ChangeLog
diff --git a/reactos/drivers/fs/ntfs/linux-ntfs/aops.c b/reactos/drivers/filesystems/ntfs/linux-ntfs/aops.c
similarity index 100%
rename from reactos/drivers/fs/ntfs/linux-ntfs/aops.c
rename to reactos/drivers/filesystems/ntfs/linux-ntfs/aops.c
diff --git a/reactos/drivers/fs/ntfs/linux-ntfs/attrib.c b/reactos/drivers/filesystems/ntfs/linux-ntfs/attrib.c
similarity index 100%
rename from reactos/drivers/fs/ntfs/linux-ntfs/attrib.c
rename to reactos/drivers/filesystems/ntfs/linux-ntfs/attrib.c
diff --git a/reactos/drivers/fs/ntfs/linux-ntfs/attrib.h b/reactos/drivers/filesystems/ntfs/linux-ntfs/attrib.h
similarity index 100%
rename from reactos/drivers/fs/ntfs/linux-ntfs/attrib.h
rename to reactos/drivers/filesystems/ntfs/linux-ntfs/attrib.h
diff --git a/reactos/drivers/fs/ntfs/linux-ntfs/compress.c b/reactos/drivers/filesystems/ntfs/linux-ntfs/compress.c
similarity index 100%
rename from reactos/drivers/fs/ntfs/linux-ntfs/compress.c
rename to reactos/drivers/filesystems/ntfs/linux-ntfs/compress.c
diff --git a/reactos/drivers/fs/ntfs/linux-ntfs/debug.c b/reactos/drivers/filesystems/ntfs/linux-ntfs/debug.c
similarity index 100%
rename from reactos/drivers/fs/ntfs/linux-ntfs/debug.c
rename to reactos/drivers/filesystems/ntfs/linux-ntfs/debug.c
diff --git a/reactos/drivers/fs/ntfs/linux-ntfs/debug.h b/reactos/drivers/filesystems/ntfs/linux-ntfs/debug.h
similarity index 100%
rename from reactos/drivers/fs/ntfs/linux-ntfs/debug.h
rename to reactos/drivers/filesystems/ntfs/linux-ntfs/debug.h
diff --git a/reactos/drivers/fs/ntfs/linux-ntfs/dir.c b/reactos/drivers/filesystems/ntfs/linux-ntfs/dir.c
similarity index 100%
rename from reactos/drivers/fs/ntfs/linux-ntfs/dir.c
rename to reactos/drivers/filesystems/ntfs/linux-ntfs/dir.c
diff --git a/reactos/drivers/fs/ntfs/linux-ntfs/dir.h b/reactos/drivers/filesystems/ntfs/linux-ntfs/dir.h
similarity index 100%
rename from reactos/drivers/fs/ntfs/linux-ntfs/dir.h
rename to reactos/drivers/filesystems/ntfs/linux-ntfs/dir.h
diff --git a/reactos/drivers/fs/ntfs/linux-ntfs/endian.h b/reactos/drivers/filesystems/ntfs/linux-ntfs/endian.h
similarity index 100%
rename from reactos/drivers/fs/ntfs/linux-ntfs/endian.h
rename to reactos/drivers/filesystems/ntfs/linux-ntfs/endian.h
diff --git a/reactos/drivers/fs/ntfs/linux-ntfs/file.c b/reactos/drivers/filesystems/ntfs/linux-ntfs/file.c
similarity index 100%
rename from reactos/drivers/fs/ntfs/linux-ntfs/file.c
rename to reactos/drivers/filesystems/ntfs/linux-ntfs/file.c
diff --git a/reactos/drivers/fs/ntfs/linux-ntfs/inode.c b/reactos/drivers/filesystems/ntfs/linux-ntfs/inode.c
similarity index 100%
rename from reactos/drivers/fs/ntfs/linux-ntfs/inode.c
rename to reactos/drivers/filesystems/ntfs/linux-ntfs/inode.c
diff --git a/reactos/drivers/fs/ntfs/linux-ntfs/inode.h b/reactos/drivers/filesystems/ntfs/linux-ntfs/inode.h
similarity index 100%
rename from reactos/drivers/fs/ntfs/linux-ntfs/inode.h
rename to reactos/drivers/filesystems/ntfs/linux-ntfs/inode.h
diff --git a/reactos/drivers/fs/ntfs/linux-ntfs/layout.h b/reactos/drivers/filesystems/ntfs/linux-ntfs/layout.h
similarity index 100%
rename from reactos/drivers/fs/ntfs/linux-ntfs/layout.h
rename to reactos/drivers/filesystems/ntfs/linux-ntfs/layout.h
diff --git a/reactos/drivers/fs/ntfs/linux-ntfs/malloc.h b/reactos/drivers/filesystems/ntfs/linux-ntfs/malloc.h
similarity index 100%
rename from reactos/drivers/fs/ntfs/linux-ntfs/malloc.h
rename to reactos/drivers/filesystems/ntfs/linux-ntfs/malloc.h
diff --git a/reactos/drivers/fs/ntfs/linux-ntfs/mft.c b/reactos/drivers/filesystems/ntfs/linux-ntfs/mft.c
similarity index 100%
rename from reactos/drivers/fs/ntfs/linux-ntfs/mft.c
rename to reactos/drivers/filesystems/ntfs/linux-ntfs/mft.c
diff --git a/reactos/drivers/fs/ntfs/linux-ntfs/mft.h b/reactos/drivers/filesystems/ntfs/linux-ntfs/mft.h
similarity index 100%
rename from reactos/drivers/fs/ntfs/linux-ntfs/mft.h
rename to reactos/drivers/filesystems/ntfs/linux-ntfs/mft.h
diff --git a/reactos/drivers/fs/ntfs/linux-ntfs/mst.c b/reactos/drivers/filesystems/ntfs/linux-ntfs/mst.c
similarity index 100%
rename from reactos/drivers/fs/ntfs/linux-ntfs/mst.c
rename to reactos/drivers/filesystems/ntfs/linux-ntfs/mst.c
diff --git a/reactos/drivers/fs/ntfs/linux-ntfs/namei.c b/reactos/drivers/filesystems/ntfs/linux-ntfs/namei.c
similarity index 100%
rename from reactos/drivers/fs/ntfs/linux-ntfs/namei.c
rename to reactos/drivers/filesystems/ntfs/linux-ntfs/namei.c
diff --git a/reactos/drivers/fs/ntfs/linux-ntfs/ntfs.h b/reactos/drivers/filesystems/ntfs/linux-ntfs/ntfs.h
similarity index 100%
rename from reactos/drivers/fs/ntfs/linux-ntfs/ntfs.h
rename to reactos/drivers/filesystems/ntfs/linux-ntfs/ntfs.h
diff --git a/reactos/drivers/fs/ntfs/linux-ntfs/super.c b/reactos/drivers/filesystems/ntfs/linux-ntfs/super.c
similarity index 100%
rename from reactos/drivers/fs/ntfs/linux-ntfs/super.c
rename to reactos/drivers/filesystems/ntfs/linux-ntfs/super.c
diff --git a/reactos/drivers/fs/ntfs/linux-ntfs/sysctl.c b/reactos/drivers/filesystems/ntfs/linux-ntfs/sysctl.c
similarity index 100%
rename from reactos/drivers/fs/ntfs/linux-ntfs/sysctl.c
rename to reactos/drivers/filesystems/ntfs/linux-ntfs/sysctl.c
diff --git a/reactos/drivers/fs/ntfs/linux-ntfs/sysctl.h b/reactos/drivers/filesystems/ntfs/linux-ntfs/sysctl.h
similarity index 100%
rename from reactos/drivers/fs/ntfs/linux-ntfs/sysctl.h
rename to reactos/drivers/filesystems/ntfs/linux-ntfs/sysctl.h
diff --git a/reactos/drivers/fs/ntfs/linux-ntfs/time.c b/reactos/drivers/filesystems/ntfs/linux-ntfs/time.c
similarity index 100%
rename from reactos/drivers/fs/ntfs/linux-ntfs/time.c
rename to reactos/drivers/filesystems/ntfs/linux-ntfs/time.c
diff --git a/reactos/drivers/fs/ntfs/linux-ntfs/types.h b/reactos/drivers/filesystems/ntfs/linux-ntfs/types.h
similarity index 100%
rename from reactos/drivers/fs/ntfs/linux-ntfs/types.h
rename to reactos/drivers/filesystems/ntfs/linux-ntfs/types.h
diff --git a/reactos/drivers/fs/ntfs/linux-ntfs/unistr.c b/reactos/drivers/filesystems/ntfs/linux-ntfs/unistr.c
similarity index 100%
rename from reactos/drivers/fs/ntfs/linux-ntfs/unistr.c
rename to reactos/drivers/filesystems/ntfs/linux-ntfs/unistr.c
diff --git a/reactos/drivers/fs/ntfs/linux-ntfs/upcase.c b/reactos/drivers/filesystems/ntfs/linux-ntfs/upcase.c
similarity index 100%
rename from reactos/drivers/fs/ntfs/linux-ntfs/upcase.c
rename to reactos/drivers/filesystems/ntfs/linux-ntfs/upcase.c
diff --git a/reactos/drivers/fs/ntfs/linux-ntfs/volume.h b/reactos/drivers/filesystems/ntfs/linux-ntfs/volume.h
similarity index 100%
rename from reactos/drivers/fs/ntfs/linux-ntfs/volume.h
rename to reactos/drivers/filesystems/ntfs/linux-ntfs/volume.h
diff --git a/reactos/drivers/fs/ntfs/mft.c b/reactos/drivers/filesystems/ntfs/mft.c
similarity index 100%
rename from reactos/drivers/fs/ntfs/mft.c
rename to reactos/drivers/filesystems/ntfs/mft.c
diff --git a/reactos/drivers/fs/ntfs/notes.txt b/reactos/drivers/filesystems/ntfs/notes.txt
similarity index 100%
rename from reactos/drivers/fs/ntfs/notes.txt
rename to reactos/drivers/filesystems/ntfs/notes.txt
diff --git a/reactos/drivers/fs/ntfs/ntfs.c b/reactos/drivers/filesystems/ntfs/ntfs.c
similarity index 100%
rename from reactos/drivers/fs/ntfs/ntfs.c
rename to reactos/drivers/filesystems/ntfs/ntfs.c
diff --git a/reactos/drivers/fs/ntfs/ntfs.h b/reactos/drivers/filesystems/ntfs/ntfs.h
similarity index 100%
rename from reactos/drivers/fs/ntfs/ntfs.h
rename to reactos/drivers/filesystems/ntfs/ntfs.h
diff --git a/reactos/drivers/fs/ntfs/ntfs.rc b/reactos/drivers/filesystems/ntfs/ntfs.rc
similarity index 100%
rename from reactos/drivers/fs/ntfs/ntfs.rc
rename to reactos/drivers/filesystems/ntfs/ntfs.rc
diff --git a/reactos/drivers/fs/ntfs/ntfs.xml b/reactos/drivers/filesystems/ntfs/ntfs.xml
similarity index 100%
rename from reactos/drivers/fs/ntfs/ntfs.xml
rename to reactos/drivers/filesystems/ntfs/ntfs.xml
diff --git a/reactos/drivers/fs/ntfs/rw.c b/reactos/drivers/filesystems/ntfs/rw.c
similarity index 100%
rename from reactos/drivers/fs/ntfs/rw.c
rename to reactos/drivers/filesystems/ntfs/rw.c
diff --git a/reactos/drivers/fs/ntfs/volinfo.c b/reactos/drivers/filesystems/ntfs/volinfo.c
similarity index 100%
rename from reactos/drivers/fs/ntfs/volinfo.c
rename to reactos/drivers/filesystems/ntfs/volinfo.c
diff --git a/reactos/drivers/fs/template/template.c b/reactos/drivers/filesystems/template/template.c
similarity index 100%
rename from reactos/drivers/fs/template/template.c
rename to reactos/drivers/filesystems/template/template.c
diff --git a/reactos/drivers/fs/vfat/blockdev.c b/reactos/drivers/filesystems/vfat/blockdev.c
similarity index 100%
rename from reactos/drivers/fs/vfat/blockdev.c
rename to reactos/drivers/filesystems/vfat/blockdev.c
diff --git a/reactos/drivers/fs/vfat/cleanup.c b/reactos/drivers/filesystems/vfat/cleanup.c
similarity index 100%
rename from reactos/drivers/fs/vfat/cleanup.c
rename to reactos/drivers/filesystems/vfat/cleanup.c
diff --git a/reactos/drivers/fs/vfat/close.c b/reactos/drivers/filesystems/vfat/close.c
similarity index 100%
rename from reactos/drivers/fs/vfat/close.c
rename to reactos/drivers/filesystems/vfat/close.c
diff --git a/reactos/drivers/fs/vfat/create.c b/reactos/drivers/filesystems/vfat/create.c
similarity index 100%
rename from reactos/drivers/fs/vfat/create.c
rename to reactos/drivers/filesystems/vfat/create.c
diff --git a/reactos/drivers/fs/vfat/dir.c b/reactos/drivers/filesystems/vfat/dir.c
similarity index 100%
rename from reactos/drivers/fs/vfat/dir.c
rename to reactos/drivers/filesystems/vfat/dir.c
diff --git a/reactos/drivers/fs/vfat/direntry.c b/reactos/drivers/filesystems/vfat/direntry.c
similarity index 100%
rename from reactos/drivers/fs/vfat/direntry.c
rename to reactos/drivers/filesystems/vfat/direntry.c
diff --git a/reactos/drivers/fs/vfat/dirwr.c b/reactos/drivers/filesystems/vfat/dirwr.c
similarity index 100%
rename from reactos/drivers/fs/vfat/dirwr.c
rename to reactos/drivers/filesystems/vfat/dirwr.c
diff --git a/reactos/drivers/fs/vfat/ea.c b/reactos/drivers/filesystems/vfat/ea.c
similarity index 100%
rename from reactos/drivers/fs/vfat/ea.c
rename to reactos/drivers/filesystems/vfat/ea.c
diff --git a/reactos/drivers/fs/vfat/fastio.c b/reactos/drivers/filesystems/vfat/fastio.c
similarity index 100%
rename from reactos/drivers/fs/vfat/fastio.c
rename to reactos/drivers/filesystems/vfat/fastio.c
diff --git a/reactos/drivers/fs/vfat/fat.c b/reactos/drivers/filesystems/vfat/fat.c
similarity index 100%
rename from reactos/drivers/fs/vfat/fat.c
rename to reactos/drivers/filesystems/vfat/fat.c
diff --git a/reactos/drivers/fs/vfat/fcb.c b/reactos/drivers/filesystems/vfat/fcb.c
similarity index 100%
rename from reactos/drivers/fs/vfat/fcb.c
rename to reactos/drivers/filesystems/vfat/fcb.c
diff --git a/reactos/drivers/fs/vfat/finfo.c b/reactos/drivers/filesystems/vfat/finfo.c
similarity index 100%
rename from reactos/drivers/fs/vfat/finfo.c
rename to reactos/drivers/filesystems/vfat/finfo.c
diff --git a/reactos/drivers/fs/vfat/flush.c b/reactos/drivers/filesystems/vfat/flush.c
similarity index 100%
rename from reactos/drivers/fs/vfat/flush.c
rename to reactos/drivers/filesystems/vfat/flush.c
diff --git a/reactos/drivers/fs/vfat/fsctl.c b/reactos/drivers/filesystems/vfat/fsctl.c
similarity index 100%
rename from reactos/drivers/fs/vfat/fsctl.c
rename to reactos/drivers/filesystems/vfat/fsctl.c
diff --git a/reactos/drivers/fs/vfat/iface.c b/reactos/drivers/filesystems/vfat/iface.c
similarity index 100%
rename from reactos/drivers/fs/vfat/iface.c
rename to reactos/drivers/filesystems/vfat/iface.c
diff --git a/reactos/drivers/fs/vfat/misc.c b/reactos/drivers/filesystems/vfat/misc.c
similarity index 100%
rename from reactos/drivers/fs/vfat/misc.c
rename to reactos/drivers/filesystems/vfat/misc.c
diff --git a/reactos/drivers/fs/vfat/rw.c b/reactos/drivers/filesystems/vfat/rw.c
similarity index 100%
rename from reactos/drivers/fs/vfat/rw.c
rename to reactos/drivers/filesystems/vfat/rw.c
diff --git a/reactos/drivers/fs/vfat/shutdown.c b/reactos/drivers/filesystems/vfat/shutdown.c
similarity index 100%
rename from reactos/drivers/fs/vfat/shutdown.c
rename to reactos/drivers/filesystems/vfat/shutdown.c
diff --git a/reactos/drivers/fs/vfat/string.c b/reactos/drivers/filesystems/vfat/string.c
similarity index 100%
rename from reactos/drivers/fs/vfat/string.c
rename to reactos/drivers/filesystems/vfat/string.c
diff --git a/reactos/drivers/fs/vfat/vfat.h b/reactos/drivers/filesystems/vfat/vfat.h
similarity index 100%
rename from reactos/drivers/fs/vfat/vfat.h
rename to reactos/drivers/filesystems/vfat/vfat.h
diff --git a/reactos/drivers/fs/vfat/vfat005.1st b/reactos/drivers/filesystems/vfat/vfat005.1st
similarity index 100%
rename from reactos/drivers/fs/vfat/vfat005.1st
rename to reactos/drivers/filesystems/vfat/vfat005.1st
diff --git a/reactos/drivers/fs/vfat/vfat_fr.txt b/reactos/drivers/filesystems/vfat/vfat_fr.txt
similarity index 100%
rename from reactos/drivers/fs/vfat/vfat_fr.txt
rename to reactos/drivers/filesystems/vfat/vfat_fr.txt
diff --git a/reactos/drivers/fs/vfat/vfatfs.def b/reactos/drivers/filesystems/vfat/vfatfs.def
similarity index 100%
rename from reactos/drivers/fs/vfat/vfatfs.def
rename to reactos/drivers/filesystems/vfat/vfatfs.def
diff --git a/reactos/drivers/fs/vfat/vfatfs.rc b/reactos/drivers/filesystems/vfat/vfatfs.rc
similarity index 100%
rename from reactos/drivers/fs/vfat/vfatfs.rc
rename to reactos/drivers/filesystems/vfat/vfatfs.rc
diff --git a/reactos/drivers/fs/vfat/vfatfs.xml b/reactos/drivers/filesystems/vfat/vfatfs.xml
similarity index 100%
rename from reactos/drivers/fs/vfat/vfatfs.xml
rename to reactos/drivers/filesystems/vfat/vfatfs.xml
diff --git a/reactos/drivers/fs/vfat/volume.c b/reactos/drivers/filesystems/vfat/volume.c
similarity index 100%
rename from reactos/drivers/fs/vfat/volume.c
rename to reactos/drivers/filesystems/vfat/volume.c