diff --git a/Makefile b/Makefile
index ab69791..0c65772 100644
--- a/Makefile
+++ b/Makefile
@@ -23,7 +23,7 @@ endif
 BUILD		:=	build
 SOURCES		:=	source source/fatfs source/nand source/abstraction
 DATA		:=	data
-INCLUDES	:=	source source/fatfs source/nand
+INCLUDES	:=	source source/font source/fatfs source/nand
 
 #---------------------------------------------------------------------------------
 # options for code generation
diff --git a/source/font.h b/source/font/font.h
similarity index 100%
rename from source/font.h
rename to source/font/font.h
diff --git a/source/font_6x10.h b/source/font/font_6x10.h
similarity index 100%
rename from source/font_6x10.h
rename to source/font/font_6x10.h
diff --git a/source/font_acorn_8x8.h b/source/font/font_acorn_8x8.h
similarity index 100%
rename from source/font_acorn_8x8.h
rename to source/font/font_acorn_8x8.h
diff --git a/source/font_orig.h b/source/font/font_orig.h
similarity index 100%
rename from source/font_orig.h
rename to source/font/font_orig.h