diff --git a/Makefile b/Makefile
index 148aaccc1..1ee603e58 100644
--- a/Makefile
+++ b/Makefile
@@ -61,6 +61,7 @@ BASE_CFLAGS := -O2 -Wall -g -Wundef -Werror=strict-prototypes -fno-common -fno-P
 	-Wsign-compare -Wunused-parameter -Wno-multichar \
 	-ffreestanding -fpic -ffunction-sections -fdata-sections \
 	-nostdinc -isystem $(shell $(CC) -print-file-name=include) -isystem sysinc \
+	-Isrc \
 	-fno-stack-protector -mstrict-align -march=armv8.2-a \
 	$(EXTRA_CFLAGS)
 
@@ -101,6 +102,18 @@ LIBFDT_OBJECTS := $(patsubst %,libfdt/%, \
 	fdt_addresses.o fdt_empty_tree.o fdt_ro.o fdt_rw.o fdt_strerror.o fdt_sw.o \
 	fdt_wip.o fdt.o)
 
+CHICKENS_OBJECTS := $(patsubst %,chickens/%, \
+	avalanche.o \
+	blizzard.o \
+	cyclone_typhoon.o \
+	everest.o \
+	firestorm.o \
+	hurricane_zephyr.o \
+	icestorm.o \
+	monsoon_mistral.o \
+	sawtooth.o \
+	twister.o)
+
 DCP_OBJECTS := $(patsubst %,dcp/%, \
 	dpav_ep.o \
 	dptx_phy.o \
@@ -117,16 +130,6 @@ OBJECTS := \
 	chainload.o \
 	chainload_asm.o \
 	chickens.o \
-	chickens_avalanche.o \
-	chickens_blizzard.o \
-	chickens_cyclone_typhoon.o \
-	chickens_everest.o \
-	chickens_firestorm.o \
-	chickens_hurricane_zephyr.o \
-	chickens_monsoon_mistral.o \
-	chickens_icestorm.o \
-	chickens_sawtooth.o \
-	chickens_twister.o \
 	clk.o \
 	cpufreq.o \
 	dapf.o \
@@ -176,6 +179,7 @@ OBJECTS := \
 	utils.o utils_asm.o \
 	vsprintf.o \
 	wdt.o \
+	$(CHICKENS_OBJECTS) \
 	$(DCP_OBJECTS) \
 	$(MINILZLIB_OBJECTS) $(TINF_OBJECTS) $(DLMALLOC_OBJECTS) $(LIBFDT_OBJECTS)
 
@@ -201,9 +205,9 @@ all: build/$(TARGET) build/$(TARGET_RAW)
 clean:
 	rm -rf build/* build/.deps
 format:
-	$(CLANG_FORMAT) -i src/*.c src/dcp/*.c src/math/*.c src/*.h src/dcp/*.h src/math/*.h sysinc/*.h
+	$(CLANG_FORMAT) -i src/*.c src/chickens/*.c src/dcp/*.c src/math/*.c src/*.h src/dcp/*.h src/math/*.h sysinc/*.h
 format-check:
-	$(CLANG_FORMAT) --dry-run --Werror src/*.c src/dcp/*.c src/math/*.c src/*.h src/dcp/*.h src/math/*.h sysinc/*.h
+	$(CLANG_FORMAT) --dry-run --Werror src/*.c src/chickens/*.c src/dcp/*.c src/math/*.c src/*.h src/dcp/*.h src/math/*.h sysinc/*.h
 rustfmt:
 	cd rust && cargo fmt
 rustfmt-check:
diff --git a/src/chickens_avalanche.c b/src/chickens/avalanche.c
similarity index 100%
rename from src/chickens_avalanche.c
rename to src/chickens/avalanche.c
diff --git a/src/chickens_blizzard.c b/src/chickens/blizzard.c
similarity index 100%
rename from src/chickens_blizzard.c
rename to src/chickens/blizzard.c
diff --git a/src/chickens_cyclone_typhoon.c b/src/chickens/cyclone_typhoon.c
similarity index 100%
rename from src/chickens_cyclone_typhoon.c
rename to src/chickens/cyclone_typhoon.c
diff --git a/src/chickens_everest.c b/src/chickens/everest.c
similarity index 100%
rename from src/chickens_everest.c
rename to src/chickens/everest.c
diff --git a/src/chickens_firestorm.c b/src/chickens/firestorm.c
similarity index 100%
rename from src/chickens_firestorm.c
rename to src/chickens/firestorm.c
diff --git a/src/chickens_hurricane_zephyr.c b/src/chickens/hurricane_zephyr.c
similarity index 100%
rename from src/chickens_hurricane_zephyr.c
rename to src/chickens/hurricane_zephyr.c
diff --git a/src/chickens_icestorm.c b/src/chickens/icestorm.c
similarity index 100%
rename from src/chickens_icestorm.c
rename to src/chickens/icestorm.c
diff --git a/src/chickens_monsoon_mistral.c b/src/chickens/monsoon_mistral.c
similarity index 100%
rename from src/chickens_monsoon_mistral.c
rename to src/chickens/monsoon_mistral.c
diff --git a/src/chickens_sawtooth.c b/src/chickens/sawtooth.c
similarity index 100%
rename from src/chickens_sawtooth.c
rename to src/chickens/sawtooth.c
diff --git a/src/chickens_twister.c b/src/chickens/twister.c
similarity index 100%
rename from src/chickens_twister.c
rename to src/chickens/twister.c