diff --git a/include/myke/fs/blockdev.h b/include/myke/vfs/blockdev.h
similarity index 100%
rename from include/myke/fs/blockdev.h
rename to include/myke/vfs/blockdev.h
diff --git a/include/myke/fs/mbr.h b/include/myke/vfs/part/mbr.h
similarity index 100%
rename from include/myke/fs/mbr.h
rename to include/myke/vfs/part/mbr.h
diff --git a/kernel/command.c b/kernel/command.c
index 31791eb..9c7be2b 100644
--- a/kernel/command.c
+++ b/kernel/command.c
@@ -12,8 +12,8 @@
 #include <myke/cpu/timer.h>
 #include <myke/drivers/pci/ide.h>
 #include <myke/drivers/pci/pci.h>
-#include <myke/fs/blockdev.h>
-#include <myke/fs/mbr.h>
+#include <myke/vfs/blockdev.h>
+#include <myke/vfs/part/mbr.h>
 #include <myke/libk/libk.h>
 #include <myke/mem/malloc.h>
 #include <myke/mem/mem.h>
diff --git a/kernel/drivers/pci/ide.c b/kernel/drivers/pci/ide.c
index 92156d6..2db9c1d 100644
--- a/kernel/drivers/pci/ide.c
+++ b/kernel/drivers/pci/ide.c
@@ -14,7 +14,7 @@
 #include <myke/drivers/pci/ide.h>
 #include <myke/drivers/pci/pci.h>
 #include <myke/drivers/ports.h>
-#include <myke/fs/blockdev.h>
+#include <myke/vfs/blockdev.h>
 #include <myke/libk/kprint.h>
 #include <myke/libk/libk.h>
 #include <myke/tasks/locking.h>
diff --git a/kernel/kernel.c b/kernel/kernel.c
index a607001..c13acd8 100644
--- a/kernel/kernel.c
+++ b/kernel/kernel.c
@@ -14,7 +14,7 @@
 #include <myke/drivers/pci/pci.h>
 #include <myke/drivers/serial.h>
 #include <myke/drivers/vgascreen.h>
-#include <myke/fs/blockdev.h>
+#include <myke/vfs/blockdev.h>
 #include <myke/libk/kprint.h>
 #include <myke/libk/libk.h>
 #include <myke/libk/syscall.h>
diff --git a/kernel/fs/blockdev.c b/kernel/vfs/blockdev.c
similarity index 99%
rename from kernel/fs/blockdev.c
rename to kernel/vfs/blockdev.c
index 3086dc2..b4d4071 100644
--- a/kernel/fs/blockdev.c
+++ b/kernel/vfs/blockdev.c
@@ -7,7 +7,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <myke/fs/blockdev.h>
+#include <myke/vfs/blockdev.h>
 #include <myke/libk/libk.h>
 #include <myke/tasks/locking.h>
 #include <myke/tasks/task.h>
diff --git a/kernel/fs/fat.c b/kernel/vfs/lfs/fat.c
similarity index 99%
rename from kernel/fs/fat.c
rename to kernel/vfs/lfs/fat.c
index f5a91e7..8ec0306 100644
--- a/kernel/fs/fat.c
+++ b/kernel/vfs/lfs/fat.c
@@ -8,7 +8,7 @@
 #include <string.h>
 #include <sys/types.h>
 
-#include <myke/fs/blockdev.h>
+#include <myke/vfs/blockdev.h>
 
 #define FAT_TYPE_12 1
 #define FAT_TYPE_16 2
diff --git a/kernel/fs/ustar.c b/kernel/vfs/lfs/ustar.c
similarity index 98%
rename from kernel/fs/ustar.c
rename to kernel/vfs/lfs/ustar.c
index 1547a5f..282e3fd 100644
--- a/kernel/fs/ustar.c
+++ b/kernel/vfs/lfs/ustar.c
@@ -7,7 +7,7 @@
 #include <string.h>
 #include <sys/types.h>
 
-#include <myke/fs/blockdev.h>
+#include <myke/vfs/blockdev.h>
 
 typedef struct {
     char filename[100];
diff --git a/kernel/fs/mbr.c b/kernel/vfs/part/mbr.c
similarity index 98%
rename from kernel/fs/mbr.c
rename to kernel/vfs/part/mbr.c
index f315df7..805927e 100644
--- a/kernel/fs/mbr.c
+++ b/kernel/vfs/part/mbr.c
@@ -9,8 +9,8 @@
 #include <sys/types.h>
 
 #include <myke/drivers/pci/ide.h>
-#include <myke/fs/blockdev.h>
-#include <myke/fs/mbr.h>
+#include <myke/vfs/blockdev.h>
+#include <myke/vfs/part/mbr.h>
 
 typedef struct {
     uint8_t bootable;