diff --git a/src/raspberrypi/Makefile b/src/raspberrypi/Makefile
index bee1788..84a6fe4 100644
--- a/src/raspberrypi/Makefile
+++ b/src/raspberrypi/Makefile
@@ -48,10 +48,7 @@ BIN_ALL = $(BINDIR)/$(RASCSI) $(BINDIR)/$(RASCTL)
 SRC_RASCSI = \
 	rascsi.cpp \
 	scsi.cpp \
-	disk.cpp \
 	gpiobus.cpp \
-	ctapdriver.cpp \
-	cfilesystem.cpp \
 	filepath.cpp \
 	fileio.cpp
 SRC_RASCSI += $(notdir $(shell find ./controllers -name '*.cpp'))
diff --git a/src/raspberrypi/cfilesystem.cpp b/src/raspberrypi/disks/cfilesystem.cpp
similarity index 100%
rename from src/raspberrypi/cfilesystem.cpp
rename to src/raspberrypi/disks/cfilesystem.cpp
diff --git a/src/raspberrypi/cfilesystem.h b/src/raspberrypi/disks/cfilesystem.h
similarity index 100%
rename from src/raspberrypi/cfilesystem.h
rename to src/raspberrypi/disks/cfilesystem.h
diff --git a/src/raspberrypi/ctapdriver.cpp b/src/raspberrypi/disks/ctapdriver.cpp
similarity index 100%
rename from src/raspberrypi/ctapdriver.cpp
rename to src/raspberrypi/disks/ctapdriver.cpp
diff --git a/src/raspberrypi/ctapdriver.h b/src/raspberrypi/disks/ctapdriver.h
similarity index 100%
rename from src/raspberrypi/ctapdriver.h
rename to src/raspberrypi/disks/ctapdriver.h
diff --git a/src/raspberrypi/disk.cpp b/src/raspberrypi/disks/disk.cpp
similarity index 100%
rename from src/raspberrypi/disk.cpp
rename to src/raspberrypi/disks/disk.cpp
diff --git a/src/raspberrypi/disk.h b/src/raspberrypi/disks/disk.h
similarity index 100%
rename from src/raspberrypi/disk.h
rename to src/raspberrypi/disks/disk.h