diff --git a/Makefile b/Makefile
index c900042c..0e75894f 100644
--- a/Makefile
+++ b/Makefile
@@ -68,7 +68,7 @@ SRCDIR_DOS_M65 = $(SRCDIR_COMMON) \
                  src/dos_m65/filesystem_vfs \
                  src/dos_m65/lowlevel \
                  src/dos_m65/pseudoiec \
-                 src/dos_m65/unit_floppy \
+                 src/dos_m65/unit_disk \
                  src/dos_m65/unit_ramdisk \
                  src/dos_m65/unit_sdcard \
                  src/dos_m65/utils
diff --git a/src/dos_m65/unit_floppy/unit_fd_cmd_close.s b/src/dos_m65/unit_disk/unit_fd_cmd_close.s
similarity index 100%
rename from src/dos_m65/unit_floppy/unit_fd_cmd_close.s
rename to src/dos_m65/unit_disk/unit_fd_cmd_close.s
diff --git a/src/dos_m65/unit_floppy/unit_fd_cmd_open.s b/src/dos_m65/unit_disk/unit_fd_cmd_open.s
similarity index 100%
rename from src/dos_m65/unit_floppy/unit_fd_cmd_open.s
rename to src/dos_m65/unit_disk/unit_fd_cmd_open.s
diff --git a/src/dos_m65/unit_floppy/unit_fd_cmd_read.s b/src/dos_m65/unit_disk/unit_fd_cmd_read.s
similarity index 100%
rename from src/dos_m65/unit_floppy/unit_fd_cmd_read.s
rename to src/dos_m65/unit_disk/unit_fd_cmd_read.s
diff --git a/src/dos_m65/unit_floppy/unit_fd_init.s b/src/dos_m65/unit_disk/unit_fd_init.s
similarity index 100%
rename from src/dos_m65/unit_floppy/unit_fd_init.s
rename to src/dos_m65/unit_disk/unit_fd_init.s
diff --git a/src/dos_m65/unit_ramdisk/unit_rd_init.s b/src/dos_m65/unit_disk/unit_rd_init.s
similarity index 100%
rename from src/dos_m65/unit_ramdisk/unit_rd_init.s
rename to src/dos_m65/unit_disk/unit_rd_init.s
diff --git a/src/dos_m65/unit_ramdisk/unit_rd_preload.s b/src/dos_m65/unit_disk/unit_rd_preload.s
similarity index 100%
rename from src/dos_m65/unit_ramdisk/unit_rd_preload.s
rename to src/dos_m65/unit_disk/unit_rd_preload.s
diff --git a/src/dos_m65/unit_ramdisk/unit_rd_cmd_close.s b/src/dos_m65/unit_ramdisk/unit_rd_cmd_close.s
index 60f9a9c3..0fb7d592 100644
--- a/src/dos_m65/unit_ramdisk/unit_rd_cmd_close.s
+++ b/src/dos_m65/unit_ramdisk/unit_rd_cmd_close.s
@@ -3,6 +3,8 @@
 ; Close currently opened file
 ;
 
+; XXX to be unified with floppy code
+
 
 unit_rd_cmd_CLOSE:
 
diff --git a/src/dos_m65/unit_ramdisk/unit_rd_cmd_open.s b/src/dos_m65/unit_ramdisk/unit_rd_cmd_open.s
index dba16a23..0eab1ee8 100644
--- a/src/dos_m65/unit_ramdisk/unit_rd_cmd_open.s
+++ b/src/dos_m65/unit_ramdisk/unit_rd_cmd_open.s
@@ -3,6 +3,8 @@
 ; Open file for reading
 ;
 
+; XXX to be unified with floppy code
+
 
 unit_rd_cmd_OPEN:
 
diff --git a/src/dos_m65/unit_ramdisk/unit_rd_cmd_read.s b/src/dos_m65/unit_ramdisk/unit_rd_cmd_read.s
index cd9a0b0c..ffbb3640 100644
--- a/src/dos_m65/unit_ramdisk/unit_rd_cmd_read.s
+++ b/src/dos_m65/unit_ramdisk/unit_rd_cmd_read.s
@@ -3,6 +3,8 @@
 ; Read more data into the buffer
 ;
 
+; XXX to be unified with floppy code
+
 
 unit_rd_cmd_READ: