diff --git a/Makefile b/Makefile
index 45897d5..8938f5f 100644
--- a/Makefile
+++ b/Makefile
@@ -15,7 +15,7 @@ TAGS = ctags
 OBJS	+= 8250-serial.o
 OBJS	+= cpuid.o
 OBJS	+= read-write.o
-OBJS	+= disk-image.o
+OBJS	+= disk/disk-image.o
 OBJS	+= interrupt.o
 OBJS	+= ioport.o
 OBJS	+= kvm.o
@@ -37,7 +37,7 @@ OBJS    += util/strbuf.o
 OBJS    += kvm-help.o
 OBJS    += kvm-cmd.o
 OBJS    += kvm-run.o
-OBJS    += qcow.o
+OBJS    += disk/qcow.o
 OBJS    += mptable.o
 OBJS    += threadpool.o
 OBJS    += irq.o
diff --git a/disk-image.c b/disk/disk-image.c
similarity index 100%
rename from disk-image.c
rename to disk/disk-image.c
diff --git a/qcow.c b/disk/qcow.c
similarity index 100%
rename from qcow.c
rename to disk/qcow.c