diff --git a/flight/Bootloaders/AHRS/Makefile b/flight/Bootloaders/AHRS/Makefile
index 976113c6c..60bbc4755 100644
--- a/flight/Bootloaders/AHRS/Makefile
+++ b/flight/Bootloaders/AHRS/Makefile
@@ -54,7 +54,7 @@ MODEL    = MD
 
 
 # Directory for output files (lst, obj, dep, elf, sym, map, hex, bin etc.)
-OUTDIR = $(TOP)/build/bootloaders/ahrs
+OUTDIR = $(TOP)/build/bl_ahrs
 
 # Target file name (without extension).
 TARGET = AHRS_BL
diff --git a/flight/Bootloaders/CopterControl/Makefile b/flight/Bootloaders/CopterControl/Makefile
index a87a737c4..ce0f9020b 100644
--- a/flight/Bootloaders/CopterControl/Makefile
+++ b/flight/Bootloaders/CopterControl/Makefile
@@ -68,7 +68,7 @@ BOOT_MODEL    = $(MODEL)_NB
 endif
 
 # Directory for output files (lst, obj, dep, elf, sym, map, hex, bin etc.)
-OUTDIR = $(TOP)/build/bootloaders/coptercontrol
+OUTDIR = $(TOP)/build/bl_coptercontrol
 
 # Target file name (without extension).
 TARGET = CopterControl_BL
diff --git a/flight/Bootloaders/OpenPilot/Makefile b/flight/Bootloaders/OpenPilot/Makefile
index 0abe63c8c..41d527d0d 100644
--- a/flight/Bootloaders/OpenPilot/Makefile
+++ b/flight/Bootloaders/OpenPilot/Makefile
@@ -68,7 +68,7 @@ BOOT_MODEL    = $(MODEL)_NB
 endif
 
 # Directory for output files (lst, obj, dep, elf, sym, map, hex, bin etc.)
-OUTDIR = $(TOP)/build/bootloaders/openpilot
+OUTDIR = $(TOP)/build/bl_openpilot
 
 # Target file name (without extension).
 TARGET = OpenPilot_BL
diff --git a/flight/Bootloaders/PipXtreme/Makefile b/flight/Bootloaders/PipXtreme/Makefile
index df552f4ef..fe8a29636 100644
--- a/flight/Bootloaders/PipXtreme/Makefile
+++ b/flight/Bootloaders/PipXtreme/Makefile
@@ -68,7 +68,7 @@ BOOT_MODEL    = $(MODEL)_NB
 endif
 
 # Directory for output files (lst, obj, dep, elf, sym, map, hex, bin etc.)
-OUTDIR = $(TOP)/build/bootloaders/pipxtreme
+OUTDIR = $(TOP)/build/bl_pipxtreme
 
 # Target file name (without extension).
 TARGET = PipXtreme_BL