diff --git a/qiboot/Makefile b/qiboot/Makefile
index 794748c..1a620f9 100644
--- a/qiboot/Makefile
+++ b/qiboot/Makefile
@@ -34,7 +34,7 @@ LDFLAGS =
 #START	= start.o lowlevel_init.o
 S_SRCS	= src/start.S src/lowlevel_init.S
 S_OBJS	= $(patsubst %.S,%.o, $(S_SRCS))
-C_SRCS	= $(wildcard src/*.c) $(wildcard src/gt*/*.c)
+C_SRCS	= $(wildcard src/*.c) $(wildcard src/gt*/*.c) $(wildcard src/drivers/*.c)
 C_OBJS	= $(patsubst %.c,%.o, $(C_SRCS))
 
 #SRCS	:= $(START: .o=.S) $(COBJS: .o=.c)
diff --git a/qiboot/src/fat.h b/qiboot/include/fat.h
similarity index 100%
rename from qiboot/src/fat.h
rename to qiboot/include/fat.h
diff --git a/qiboot/src/mmc.c b/qiboot/src/drivers/s3c24xx-mci.c
similarity index 100%
rename from qiboot/src/mmc.c
rename to qiboot/src/drivers/s3c24xx-mci.c
diff --git a/qiboot/src/mmc.h b/qiboot/src/drivers/s3c24xx-mci.h
similarity index 100%
rename from qiboot/src/mmc.h
rename to qiboot/src/drivers/s3c24xx-mci.h