diff --git a/src/raspberrypi/Makefile b/src/raspberrypi/Makefile
index b77a93c..be2118e 100644
--- a/src/raspberrypi/Makefile
+++ b/src/raspberrypi/Makefile
@@ -15,8 +15,8 @@ else
 	CXXFLAGS += -O3 -Wall -Werror
 	BUILD_TYPE = Release
 endif
-CFLAGS += -Idisks -Icontrollers -I.
-CXXFLAGS += -Idisks -Icontrollers -I. -std=c++14
+CFLAGS += -Idevices -Icontrollers -I.
+CXXFLAGS += -Idevices -Icontrollers -I. -std=c++14
 
 # If its not specified, build for STANDARD configuration
 CONNECT_TYPE ?= STANDARD
@@ -56,7 +56,7 @@ SRC_RASCSI = \
 	os.cpp\
 	rasctl_command.cpp
 SRC_RASCSI += $(notdir $(shell find ./controllers -name '*.cpp'))
-SRC_RASCSI += $(notdir $(shell find ./disks -name '*.cpp'))
+SRC_RASCSI += $(notdir $(shell find ./devices -name '*.cpp'))
 
 SRC_RASCTL = \
 	rasctl.cpp\
@@ -76,8 +76,8 @@ SRC_SASIDUMP = \
 	filepath.cpp \
 	fileio.cpp
 
-vpath %.h ./ ./controllers ./disks
-vpath %.cpp ./ ./controllers ./disks
+vpath %.h ./ ./controllers ./devices
+vpath %.cpp ./ ./controllers ./devices
 vpath %.o ./$(OBJDIR)
 vpath ./$(BINDIR)
 
diff --git a/src/raspberrypi/disks/cfilesystem.cpp b/src/raspberrypi/devices/cfilesystem.cpp
similarity index 100%
rename from src/raspberrypi/disks/cfilesystem.cpp
rename to src/raspberrypi/devices/cfilesystem.cpp
diff --git a/src/raspberrypi/disks/cfilesystem.h b/src/raspberrypi/devices/cfilesystem.h
similarity index 100%
rename from src/raspberrypi/disks/cfilesystem.h
rename to src/raspberrypi/devices/cfilesystem.h
diff --git a/src/raspberrypi/disks/ctapdriver.cpp b/src/raspberrypi/devices/ctapdriver.cpp
similarity index 100%
rename from src/raspberrypi/disks/ctapdriver.cpp
rename to src/raspberrypi/devices/ctapdriver.cpp
diff --git a/src/raspberrypi/disks/ctapdriver.h b/src/raspberrypi/devices/ctapdriver.h
similarity index 100%
rename from src/raspberrypi/disks/ctapdriver.h
rename to src/raspberrypi/devices/ctapdriver.h
diff --git a/src/raspberrypi/disks/disk.cpp b/src/raspberrypi/devices/disk.cpp
similarity index 100%
rename from src/raspberrypi/disks/disk.cpp
rename to src/raspberrypi/devices/disk.cpp
diff --git a/src/raspberrypi/disks/disk.h b/src/raspberrypi/devices/disk.h
similarity index 100%
rename from src/raspberrypi/disks/disk.h
rename to src/raspberrypi/devices/disk.h
diff --git a/src/raspberrypi/disks/sasihd.cpp b/src/raspberrypi/devices/sasihd.cpp
similarity index 100%
rename from src/raspberrypi/disks/sasihd.cpp
rename to src/raspberrypi/devices/sasihd.cpp
diff --git a/src/raspberrypi/disks/sasihd.h b/src/raspberrypi/devices/sasihd.h
similarity index 100%
rename from src/raspberrypi/disks/sasihd.h
rename to src/raspberrypi/devices/sasihd.h
diff --git a/src/raspberrypi/disks/scsi_host_bridge.cpp b/src/raspberrypi/devices/scsi_host_bridge.cpp
similarity index 100%
rename from src/raspberrypi/disks/scsi_host_bridge.cpp
rename to src/raspberrypi/devices/scsi_host_bridge.cpp
diff --git a/src/raspberrypi/disks/scsi_host_bridge.h b/src/raspberrypi/devices/scsi_host_bridge.h
similarity index 100%
rename from src/raspberrypi/disks/scsi_host_bridge.h
rename to src/raspberrypi/devices/scsi_host_bridge.h
diff --git a/src/raspberrypi/disks/scsicd.cpp b/src/raspberrypi/devices/scsicd.cpp
similarity index 100%
rename from src/raspberrypi/disks/scsicd.cpp
rename to src/raspberrypi/devices/scsicd.cpp
diff --git a/src/raspberrypi/disks/scsicd.h b/src/raspberrypi/devices/scsicd.h
similarity index 100%
rename from src/raspberrypi/disks/scsicd.h
rename to src/raspberrypi/devices/scsicd.h
diff --git a/src/raspberrypi/disks/scsihd.cpp b/src/raspberrypi/devices/scsihd.cpp
similarity index 100%
rename from src/raspberrypi/disks/scsihd.cpp
rename to src/raspberrypi/devices/scsihd.cpp
diff --git a/src/raspberrypi/disks/scsihd.h b/src/raspberrypi/devices/scsihd.h
similarity index 100%
rename from src/raspberrypi/disks/scsihd.h
rename to src/raspberrypi/devices/scsihd.h
diff --git a/src/raspberrypi/disks/scsihd_apple.cpp b/src/raspberrypi/devices/scsihd_apple.cpp
similarity index 100%
rename from src/raspberrypi/disks/scsihd_apple.cpp
rename to src/raspberrypi/devices/scsihd_apple.cpp
diff --git a/src/raspberrypi/disks/scsihd_apple.h b/src/raspberrypi/devices/scsihd_apple.h
similarity index 100%
rename from src/raspberrypi/disks/scsihd_apple.h
rename to src/raspberrypi/devices/scsihd_apple.h
diff --git a/src/raspberrypi/disks/scsihd_nec.cpp b/src/raspberrypi/devices/scsihd_nec.cpp
similarity index 100%
rename from src/raspberrypi/disks/scsihd_nec.cpp
rename to src/raspberrypi/devices/scsihd_nec.cpp
diff --git a/src/raspberrypi/disks/scsihd_nec.h b/src/raspberrypi/devices/scsihd_nec.h
similarity index 100%
rename from src/raspberrypi/disks/scsihd_nec.h
rename to src/raspberrypi/devices/scsihd_nec.h
diff --git a/src/raspberrypi/disks/scsimo.cpp b/src/raspberrypi/devices/scsimo.cpp
similarity index 100%
rename from src/raspberrypi/disks/scsimo.cpp
rename to src/raspberrypi/devices/scsimo.cpp
diff --git a/src/raspberrypi/disks/scsimo.h b/src/raspberrypi/devices/scsimo.h
similarity index 100%
rename from src/raspberrypi/disks/scsimo.h
rename to src/raspberrypi/devices/scsimo.h