diff --git a/Makefile b/Makefile
index 61941f1..30f0f61 100644
--- a/Makefile
+++ b/Makefile
@@ -15,7 +15,6 @@ FIND = find
 CSCOPE = cscope
 TAGS = ctags
 
-OBJS	+= 8250-serial.o
 OBJS	+= cpuid.o
 OBJS	+= read-write.o
 OBJS	+= interrupt.o
@@ -25,7 +24,8 @@ OBJS	+= kvm-cpu.o
 OBJS	+= main.o
 OBJS	+= mmio.o
 OBJS	+= pci.o
-OBJS	+= rtc.o
+OBJS	+= hw/rtc.o
+OBJS	+= hw/serial.o
 OBJS	+= term.o
 OBJS	+= util.o
 OBJS	+= virtio/blk.o
diff --git a/rtc.c b/hw/rtc.c
similarity index 100%
rename from rtc.c
rename to hw/rtc.c
diff --git a/8250-serial.c b/hw/serial.c
similarity index 100%
rename from 8250-serial.c
rename to hw/serial.c