diff --git a/sw/Makefile b/sw/Makefile
index 86e6789..1e984c9 100644
--- a/sw/Makefile
+++ b/sw/Makefile
@@ -16,6 +16,7 @@ TESTS=tests
 
 SRCS=$(wildcard *.s) $(wildcard *.c)
 SRCS+=$(wildcard filesystem/*.s) $(wildcard filesystem/*.c)
+SRCS+=$(wildcard devices/*.s) $(wildcard devices/*.c)
 OBJS+=$(patsubst %.s,%.o,$(filter %s,$(SRCS)))
 OBJS+=$(patsubst %.c,%.o,$(filter %c,$(SRCS)))
 
diff --git a/sw/board_io.h b/sw/devices/board_io.h
similarity index 100%
rename from sw/board_io.h
rename to sw/devices/board_io.h
diff --git a/sw/board_io.s b/sw/devices/board_io.s
similarity index 100%
rename from sw/board_io.s
rename to sw/devices/board_io.s
diff --git a/sw/conio.s b/sw/devices/conio.s
similarity index 100%
rename from sw/conio.s
rename to sw/devices/conio.s
diff --git a/sw/interrupt.h b/sw/devices/interrupt.h
similarity index 100%
rename from sw/interrupt.h
rename to sw/devices/interrupt.h
diff --git a/sw/interrupt.s b/sw/devices/interrupt.s
similarity index 100%
rename from sw/interrupt.s
rename to sw/devices/interrupt.s
diff --git a/sw/io.inc65 b/sw/devices/io.inc65
similarity index 100%
rename from sw/io.inc65
rename to sw/devices/io.inc65
diff --git a/sw/mapper.h b/sw/devices/mapper.h
similarity index 100%
rename from sw/mapper.h
rename to sw/devices/mapper.h
diff --git a/sw/mapper.s b/sw/devices/mapper.s
similarity index 100%
rename from sw/mapper.s
rename to sw/devices/mapper.s
diff --git a/sw/sd_card.c b/sw/devices/sd_card.c
similarity index 97%
rename from sw/sd_card.c
rename to sw/devices/sd_card.c
index 24646df..33bf986 100644
--- a/sw/sd_card.c
+++ b/sw/devices/sd_card.c
@@ -1,7 +1,7 @@
 #include <stdint.h>
 #include <conio.h>
 
-#include "sd_card.h"
+#include "devices/sd_card.h"
 
 void sd_init() {
 	uint32_t resp;
diff --git a/sw/sd_card.h b/sw/devices/sd_card.h
similarity index 100%
rename from sw/sd_card.h
rename to sw/devices/sd_card.h
diff --git a/sw/sd_card_asm.s b/sw/devices/sd_card_asm.s
similarity index 100%
rename from sw/sd_card_asm.s
rename to sw/devices/sd_card_asm.s
diff --git a/sw/uart.h b/sw/devices/uart.h
similarity index 100%
rename from sw/uart.h
rename to sw/devices/uart.h
diff --git a/sw/uart.s b/sw/devices/uart.s
similarity index 100%
rename from sw/uart.s
rename to sw/devices/uart.s
diff --git a/sw/filesystem/fat.c b/sw/filesystem/fat.c
index 7583210..e07359a 100644
--- a/sw/filesystem/fat.c
+++ b/sw/filesystem/fat.c
@@ -1,8 +1,8 @@
 #include <conio.h>
 #include <string.h>
 
-#include "filesystem/fat.h"
-#include "sd_card.h"
+#include "fat.h"
+#include "devices/sd_card.h"
 
 uint8_t fat_buf[512];
 
diff --git a/sw/irq.c b/sw/irq.c
index 313ea7d..4d2c0d8 100644
--- a/sw/irq.c
+++ b/sw/irq.c
@@ -2,8 +2,8 @@
 #include <stdint.h>
 #include <conio.h>
 
-#include "interrupt.h"
-#include "uart.h"
+#include "devices/interrupt.h"
+#include "devices/uart.h"
 
 char lastchar;
 
diff --git a/sw/main.c b/sw/main.c
index f57a9cc..c753882 100644
--- a/sw/main.c
+++ b/sw/main.c
@@ -2,10 +2,10 @@
 #include <conio.h>
 #include <string.h>
 
-#include "board_io.h"
-#include "uart.h"
-#include "mapper.h"
-#include "sd_card.h"
+#include "devices/board_io.h"
+#include "devices/uart.h"
+#include "devices/mapper.h"
+#include "devices/sd_card.h"
 #include "filesystem/fat.h"
 #include "exec.h"