diff --git a/Makefile b/Makefile
index 827c1b1..da9e7c4 100644
--- a/Makefile
+++ b/Makefile
@@ -21,9 +21,9 @@ ifeq ($(MODE),safe)
 	export TARGET	:=	SafeMode9
 endif
 BUILD		:=	build
-SOURCES		:=	source source/fatfs source/nand source/abstraction
+SOURCES		:=	source source/fatfs source/nand source/virtual source/abstraction
 DATA		:=	data
-INCLUDES	:=	source source/font source/fatfs source/nand
+INCLUDES	:=	source source/font source/fatfs source/nand source/virtual
 
 #---------------------------------------------------------------------------------
 # options for code generation
diff --git a/source/fs.h b/source/fs.h
index 52ff444..8c1dc29 100644
--- a/source/fs.h
+++ b/source/fs.h
@@ -24,7 +24,7 @@ typedef enum {
 #define DRV_MEMORY      (1<<8)
 #define DRV_ALIAS       (1<<9)
 #define DRV_SEARCH      (1<<10)
-#define DRV_STDFAT      (1<<11) // standard FAT drive without limitiations
+#define DRV_STDFAT      (1<<11) // standard FAT drive without limitations
 
 // permission types
 #define PERM_SDCARD     (1<<0)
@@ -34,14 +34,14 @@ typedef enum {
 #define PERM_IMAGE      (1<<4)
 #define PERM_MEMORY     (1<<5)
 #define PERM_A9LH       ((1<<6) | PERM_SYSNAND)
-#define PERM_SDDATA    ((1<<7) | PERM_SDCARD)
+#define PERM_SDDATA     ((1<<7) | PERM_SDCARD)
 #define PERM_BASE       (PERM_SDCARD | PERM_RAMDRIVE)
 #define PERM_ALL        (PERM_SDCARD | PERM_RAMDRIVE | PERM_EMUNAND | PERM_SYSNAND | PERM_IMAGE | PERM_MEMORY | PERM_SDDATA)
 
 // move / copy flags
-#define ASK_ALL       (1<<0)
-#define SKIP_ALL      (1<<1)
-#define OVERWRITE_ALL (1<<2)
+#define ASK_ALL         (1<<0)
+#define SKIP_ALL        (1<<1)
+#define OVERWRITE_ALL   (1<<2)
 
 typedef struct {
     char* name; // should point to the correct portion of the path
diff --git a/source/nand/sddata.c b/source/virtual/sddata.c
similarity index 100%
rename from source/nand/sddata.c
rename to source/virtual/sddata.c
diff --git a/source/nand/sddata.h b/source/virtual/sddata.h
similarity index 100%
rename from source/nand/sddata.h
rename to source/virtual/sddata.h
diff --git a/source/nand/virtual.c b/source/virtual/virtual.c
similarity index 100%
rename from source/nand/virtual.c
rename to source/virtual/virtual.c
diff --git a/source/nand/virtual.h b/source/virtual/virtual.h
similarity index 100%
rename from source/nand/virtual.h
rename to source/virtual/virtual.h