diff --git a/build.mk b/make/build.mk
similarity index 100%
rename from build.mk
rename to make/build.mk
diff --git a/macros.mk b/make/macros.mk
similarity index 100%
rename from macros.mk
rename to make/macros.mk
diff --git a/module.mk b/make/module.mk
similarity index 95%
rename from module.mk
rename to make/module.mk
index 3e07813..9e82ef3 100644
--- a/module.mk
+++ b/make/module.mk
@@ -15,7 +15,7 @@
 $(info including $(INCMODULES))
 include $(addsuffix /rules.mk,$(INCMODULES))
 
-include module.mk
+include make/module.mk
 
 endif
 
diff --git a/makefile b/makefile
index fe533da..b045e71 100644
--- a/makefile
+++ b/makefile
@@ -1,5 +1,5 @@
 -include local.mk
-include macros.mk
+include make/macros.mk
 
 PROJECT ?= beagle-test
 DEBUG ?= 2
@@ -65,7 +65,7 @@
 
 # recursively include any modules in the MODULE variable, leaving a trail of included
 # modules in the ALLMODULES list
-include module.mk
+include make/module.mk
 
 # any extra top level build dependencies that someone declared
 all:: $(EXTRA_BUILDDEPS)
@@ -106,7 +106,7 @@
 NOECHO ?= @
 
 # the logic to compile and link stuff is in here
-include build.mk
+include make/build.mk
 
 clean: $(EXTRA_CLEANDEPS)
 	rm -f $(ALLOBJS) $(DEPS) $(GENERATED) $(OUTBIN) $(OUTELF) $(OUTELF).lst