diff --git a/.gitignore b/.gitignore
index 8a9d5ee58..e3c4e615c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,6 +11,7 @@
 *.ilk
 *.map
 *.exp
+*.lst
 
 # Precompiled Headers
 *.gch
@@ -60,25 +61,8 @@ dkms.conf
 
 .**/
 
-exosphere/bpmpfw/out/**
-exosphere/bpmpfw/build/**
-exosphere/build/**
-exosphere/out/**
-fusee/fusee-primary/out/**
-fusee/fusee-primary/build/**
-fusee/fusee-secondary/out/**
-fusee/fusee-secondary/build/**
-fusee/fusee-tertiary/out/**
-fusee/fusee-tertiary/build/**
-fusee/out/**
-fusee/build/**
-stratosphere/loader/out/**
-stratosphere/loader/build/**
-stratosphere/sm/out/**
-stratosphere/sm/build/**
-stratosphere/pm/out/**
-stratosphere/pm/build/**
-stratosphere/boot/out/**
-stratosphere/boot/build/**
-stratosphere/boot2/out/**
-stratosphere/boot2/build/**
+# NOTE: make sure to make exceptions to this pattern when needed!
+*.bin
+
+**/out
+**/build
diff --git a/Makefile b/Makefile
index 2441b5310..014cb646c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,10 @@
-SUBFOLDERS := exosphere fusee stratosphere thermosphere
-
 TOPTARGETS := all clean
 
-$(TOPTARGETS): $(SUBFOLDERS)
+all: fusee
+fusee:
+	$(MAKE) -C $@ all
 
-$(SUBFOLDERS):
-	$(MAKE) -C $@ $(MAKECMDGOALS)
+clean:
+	$(MAKE) -C fusee clean
 
-fusee: exosphere thermosphere stratosphere
- 
-.PHONY: $(TOPTARGETS) $(SUBFOLDERS)
+.PHONY: $(TOPTARGETS) fusee
diff --git a/exosphere/Makefile b/exosphere/Makefile
index c00fe3a98..079ae7bd4 100644
--- a/exosphere/Makefile
+++ b/exosphere/Makefile
@@ -1,24 +1,33 @@
-rwildcard = $(foreach d, $(wildcard $1*), $(filter $(subst *, %, $2), $d) $(call rwildcard, $d/, $2))
+#---------------------------------------------------------------------------------
+.SUFFIXES:
+#---------------------------------------------------------------------------------
 
 ifeq ($(strip $(DEVKITPRO)),)
-$(error "Please set DEVKITPRO in your environment. export DEVKITPRO=<path to>devkitPro")
+$(error "Please set DEVKITPRO in your environment. export DEVKITPRO=<path to>/devkitpro")
 endif
 
-include $(DEVKITPRO)/devkitA64/base_tools
+TOPDIR ?= $(CURDIR)
+include $(DEVKITPRO)/devkitA64/base_rules
 
-name := exosphere
+#---------------------------------------------------------------------------------
+# TARGET is the name of the output
+# BUILD is the directory where object files & intermediate files will be placed
+# SOURCES is a list of directories containing source code
+# DATA is a list of directories containing data files
+# INCLUDES is a list of directories containing header files
+#---------------------------------------------------------------------------------
+TARGET		:=	$(notdir $(CURDIR))
+BUILD		:=	build
+SOURCES		:=	src src/dbg
+DATA		:=	data
+INCLUDES	:=	include
 
-dir_source := src
-dir_build := build
-dir_out := out
-dir_bpmpfw := bpmpfw
-
-ARCH := -march=armv8-a -mtune=cortex-a57
-
-ASFLAGS := -g $(ARCH)
-
-CFLAGS = \
-	$(ARCH) \
+#---------------------------------------------------------------------------------
+# options for code generation
+#---------------------------------------------------------------------------------
+ARCH	:=	-march=armv8-a -mtune=cortex-a57
+DEFINES	:=	-D__CCPLEX__
+CFLAGS	:= \
 	-g \
 	-O2 \
 	-ffunction-sections \
@@ -26,51 +35,124 @@ CFLAGS = \
 	-fomit-frame-pointer \
 	-std=gnu11 \
 	-Werror \
-	-Wall
+	-Wall \
+	$(ARCH) $(DEFINES)
 
-LDFLAGS = -specs=linker.specs -g $(ARCH)
+CFLAGS	+=	$(INCLUDE)
 
-objects =	$(patsubst $(dir_source)/%.s, $(dir_build)/%.o, \
-			$(patsubst $(dir_source)/%.c, $(dir_build)/%.o, \
-			$(call rwildcard, $(dir_source), *.s *.c))) \
-			$(dir_build)/bpmpfw.bin.o
+CXXFLAGS	:= $(CFLAGS) -fno-rtti -fno-exceptions -std=gnu++11
 
-define bin2o
-	bin2s $< | $(AS) -o $(@)
-endef
+ASFLAGS	:=	-g $(ARCH)
+LDFLAGS	=	-specs=$(TOPDIR)/linker.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map)
 
-.PHONY: all
-all: $(dir_out)/$(name).bin
+LIBS	:=
 
-.PHONY: clean
+#---------------------------------------------------------------------------------
+# list of directories containing libraries, this must be the top level containing
+# include and lib
+#---------------------------------------------------------------------------------
+LIBDIRS	:=
+
+
+#---------------------------------------------------------------------------------
+# no real need to edit anything past this point unless you need to add additional
+# rules for different file extensions
+#---------------------------------------------------------------------------------
+ifneq ($(BUILD),$(notdir $(CURDIR)))
+#---------------------------------------------------------------------------------
+
+export OUTPUT	:=	$(CURDIR)/$(TARGET)
+export TOPDIR	:=	$(CURDIR)
+
+export VPATH	:=	$(foreach dir,$(SOURCES),$(CURDIR)/$(dir)) \
+			$(foreach dir,$(DATA),$(CURDIR)/$(dir)) \
+			$(TOPDIR)/bpmpfw
+
+export DEPSDIR	:=	$(CURDIR)/$(BUILD)
+
+CFILES		:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.c)))
+CPPFILES	:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.cpp)))
+SFILES		:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.s)))
+BINFILES	:=	$(foreach dir,$(DATA),$(notdir $(wildcard $(dir)/*.*))) bpmpfw.bin
+
+#---------------------------------------------------------------------------------
+# use CXX for linking C++ projects, CC for standard C
+#---------------------------------------------------------------------------------
+ifeq ($(strip $(CPPFILES)),)
+#---------------------------------------------------------------------------------
+	export LD	:=	$(CC)
+#---------------------------------------------------------------------------------
+else
+#---------------------------------------------------------------------------------
+	export LD	:=	$(CXX)
+#---------------------------------------------------------------------------------
+endif
+#---------------------------------------------------------------------------------
+
+export OFILES_BIN	:=	$(addsuffix .o,$(BINFILES))
+export OFILES_SRC	:=	$(CPPFILES:.cpp=.o) $(CFILES:.c=.o) $(SFILES:.s=.o)
+export OFILES 		:=	$(OFILES_BIN) $(OFILES_SRC)
+export HFILES_BIN	:=	$(addsuffix .h,$(subst .,_,$(BINFILES)))
+
+export INCLUDE	:=	$(foreach dir,$(INCLUDES),-I$(CURDIR)/$(dir)) \
+			$(foreach dir,$(LIBDIRS),-I$(dir)/include) \
+			-I$(CURDIR)/$(BUILD)
+
+export LIBPATHS	:=	$(foreach dir,$(LIBDIRS),-L$(dir)/lib)
+
+.PHONY: $(BUILD) build_bpmpfw clean all
+
+#---------------------------------------------------------------------------------
+all: $(BUILD)
+
+check_bpmpfw:
+	@$(MAKE) -C bpmpfw all
+
+$(BUILD): check_bpmpfw
+	@[ -d $@ ] || mkdir -p $@
+	@$(MAKE) --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile
+
+#---------------------------------------------------------------------------------
 clean:
-	@$(MAKE) -C $(dir_bpmpfw) clean
-	@rm -rf $(dir_build)
-	@rm -rf $(dir_out)
+	@echo clean ...
+	@$(MAKE) -C $(TOPDIR)/bpmpfw clean
+	@rm -fr $(BUILD) $(TARGET).bin $(TARGET).elf
 
-.PHONY: $(dir_bpmpfw)
 
-$(dir_out)/$(name).bin: $(dir_build)/$(name).elf
-	@mkdir -p "$(@D)"
+#---------------------------------------------------------------------------------
+else
+.PHONY:	all
+
+DEPENDS	:=	$(OFILES:.o=.d)
+
+#---------------------------------------------------------------------------------
+# main targets
+#---------------------------------------------------------------------------------
+all	:	$(OUTPUT).bin
+
+$(OUTPUT).bin	:	$(OUTPUT).elf
 	$(OBJCOPY) -S -O binary $< $@
+	@echo built ... $(notdir $@)
 
-$(dir_build)/$(name).elf: $(objects)
-	$(LINK.o) $(OUTPUT_OPTION) $^
+$(OUTPUT).elf	:	$(OFILES)
 
-$(dir_bpmpfw)/out/bpmpfw.bin: $(dir_bpmpfw)
-	@$(MAKE) -C $<
+%.elf:
+	@echo linking $(notdir $@)
+	$(LD) $(LDFLAGS) $(OFILES) $(LIBPATHS) $(LIBS) -o $@
+	@$(NM) -CSn $@ > $(notdir $*.lst)
 
-$(dir_build)/bpmpfw.bin: $(dir_bpmpfw)/out/bpmpfw.bin
-	@mkdir -p "$(@D)"
-	@cp $< $(@D)
+$(OFILES_SRC)	: $(HFILES_BIN)
 
-$(dir_build)/%.bin.o: $(dir_build)/%.bin
+#---------------------------------------------------------------------------------
+# you need a rule like this for each extension you use as binary data
+#---------------------------------------------------------------------------------
+%.bin.o	%_bin.h:	%.bin
+#---------------------------------------------------------------------------------
+	@echo $(notdir $<)
 	@$(bin2o)
 
-$(dir_build)/%.o: $(dir_source)/%.c
-	@mkdir -p "$(@D)"
-	$(COMPILE.c) $(OUTPUT_OPTION) $<
+-include $(DEPENDS)
 
-$(dir_build)/%.o: $(dir_source)/%.s
-	@mkdir -p "$(@D)"
-	$(COMPILE.c) -x assembler-with-cpp $(OUTPUT_OPTION) $<
+#---------------------------------------------------------------------------------------
+endif
+#---------------------------------------------------------------------------------------
diff --git a/exosphere/bpmpfw/Makefile b/exosphere/bpmpfw/Makefile
index 74ca355ba..0eadd1314 100644
--- a/exosphere/bpmpfw/Makefile
+++ b/exosphere/bpmpfw/Makefile
@@ -1,61 +1,154 @@
-rwildcard = $(foreach d, $(wildcard $1*), $(filter $(subst *, %, $2), $d) $(call rwildcard, $d/, $2))
+#---------------------------------------------------------------------------------
+.SUFFIXES:
+#---------------------------------------------------------------------------------
 
 ifeq ($(strip $(DEVKITARM)),)
 $(error "Please set DEVKITARM in your environment. export DEVKITARM=<path to>devkitARM")
 endif
 
-include $(DEVKITARM)/base_tools
+TOPDIR ?= $(CURDIR)
+include $(DEVKITARM)/base_rules
 
-name := bpmpfw
+#---------------------------------------------------------------------------------
+# TARGET is the name of the output
+# BUILD is the directory where object files & intermediate files will be placed
+# SOURCES is a list of directories containing source code
+# DATA is a list of directories containing data files
+# INCLUDES is a list of directories containing header files
+#---------------------------------------------------------------------------------
+TARGET		:=	$(notdir $(CURDIR))
+BUILD		:=	build
+SOURCES		:=	src
+DATA		:=	data
+INCLUDES	:=	include
 
-dir_source := src
-dir_build := build
-dir_out := out
+#---------------------------------------------------------------------------------
+# options for code generation
+#---------------------------------------------------------------------------------
+ARCH	:=	-march=armv4t -mtune=arm7tdmi -mthumb -mthumb-interwork
 
-ARCH := -march=armv4t -mtune=arm7tdmi -mthumb -mthumb-interwork
+CFLAGS	:= \
+		-g \
+		-O2 \
+		-ffunction-sections \
+		-fdata-sections \
+		-fomit-frame-pointer \
+		-fno-inline \
+		-std=gnu11 \
+		-Werror \
+		-Wall \
+		$(ARCH) $(DEFINES)
 
-ASFLAGS := -g $(ARCH)
+CFLAGS	+=	$(INCLUDE) -D__BPMP__
 
-CFLAGS = \
-	$(ARCH) \
-	-g \
-	-O2 \
-	-ffunction-sections \
-	-fdata-sections \
-	-fomit-frame-pointer \
-	-fno-inline \
-	-std=gnu11 \
-	-Werror \
-	-Wall
+CXXFLAGS	:= $(CFLAGS) -fno-rtti -fno-exceptions -std=gnu++11
 
-LDFLAGS = -g $(ARCH) -nostartfiles -nostdlib -Wl,--nmagic,--gc-sections
+ASFLAGS	:=	-g $(ARCH)
+LDFLAGS	=	-specs=$(TOPDIR)/linker.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map)
 
-objects = $(patsubst $(dir_source)/%.s, $(dir_build)/%.o, \
-          $(patsubst $(dir_source)/%.c, $(dir_build)/%.o, \
-          $(call rwildcard, $(dir_source), *.s *.c)))
+LIBS	:=
 
-.PHONY: all
-all: $(dir_out)/$(name).bin
+#---------------------------------------------------------------------------------
+# list of directories containing libraries, this must be the top level containing
+# include and lib
+#---------------------------------------------------------------------------------
+LIBDIRS	:=
 
-.PHONY: clean
+
+#---------------------------------------------------------------------------------
+# no real need to edit anything past this point unless you need to add additional
+# rules for different file extensions
+#---------------------------------------------------------------------------------
+ifneq ($(BUILD),$(notdir $(CURDIR)))
+#---------------------------------------------------------------------------------
+
+export OUTPUT	:=	$(CURDIR)/$(TARGET)
+export TOPDIR	:=	$(CURDIR)
+
+export VPATH	:=	$(foreach dir,$(SOURCES),$(CURDIR)/$(dir)) \
+			$(foreach dir,$(DATA),$(CURDIR)/$(dir))
+
+export DEPSDIR	:=	$(CURDIR)/$(BUILD)
+
+CFILES		:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.c)))
+CPPFILES	:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.cpp)))
+SFILES		:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.s)))
+BINFILES	:=	$(foreach dir,$(DATA),$(notdir $(wildcard $(dir)/*.*)))
+
+#---------------------------------------------------------------------------------
+# use CXX for linking C++ projects, CC for standard C
+#---------------------------------------------------------------------------------
+ifeq ($(strip $(CPPFILES)),)
+#---------------------------------------------------------------------------------
+	export LD	:=	$(CC)
+#---------------------------------------------------------------------------------
+else
+#---------------------------------------------------------------------------------
+	export LD	:=	$(CXX)
+#---------------------------------------------------------------------------------
+endif
+#---------------------------------------------------------------------------------
+
+export OFILES_BIN	:=	$(addsuffix .o,$(BINFILES))
+export OFILES_SRC	:=	$(CPPFILES:.cpp=.o) $(CFILES:.c=.o) $(SFILES:.s=.o)
+export OFILES 		:=	$(OFILES_BIN) $(OFILES_SRC)
+export HFILES_BIN	:=	$(addsuffix .h,$(subst .,_,$(BINFILES)))
+
+export INCLUDE	:=	$(foreach dir,$(INCLUDES),-I$(CURDIR)/$(dir)) \
+			$(foreach dir,$(LIBDIRS),-I$(dir)/include) \
+			-I$(CURDIR)/$(BUILD)
+
+export LIBPATHS	:=	$(foreach dir,$(LIBDIRS),-L$(dir)/lib)
+
+.PHONY: $(BUILD) clean all
+
+#---------------------------------------------------------------------------------
+all: $(BUILD)
+
+$(BUILD):
+	@[ -d $@ ] || mkdir -p $@
+	@$(MAKE) --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile
+
+#---------------------------------------------------------------------------------
 clean:
-	@rm -rf $(dir_build)
-	@rm -rf $(dir_out)
+	@echo clean ...
+	@rm -fr $(BUILD) $(TARGET).bin $(TARGET).elf
 
-$(dir_out)/$(name).bin: $(dir_build)/$(name).elf
-	@mkdir -p "$(@D)"
+
+#---------------------------------------------------------------------------------
+else
+.PHONY:	all
+
+DEPENDS	:=	$(OFILES:.o=.d)
+
+#---------------------------------------------------------------------------------
+# main targets
+#---------------------------------------------------------------------------------
+all	:	$(OUTPUT).bin
+
+$(OUTPUT).bin	:	$(OUTPUT).elf
 	$(OBJCOPY) -S -O binary $< $@
+	@echo built ... $(notdir $@)
 
-$(dir_build)/$(name).elf: $(objects)
-	$(LINK.o) -T linker.ld $(OUTPUT_OPTION) $^
+$(OUTPUT).elf	:	$(OFILES)
 
-$(dir_build)/%.bin.o: $(dir_build)/%.bin
+%.elf: $(OFILES)
+	@echo linking $(notdir $@)
+	@$(LD) $(LDFLAGS) $(OFILES) $(LIBPATHS) $(LIBS) -o $@
+	@$(NM) -CSn $@ > $(notdir $*.lst)
+
+$(OFILES_SRC)	: $(HFILES_BIN)
+
+#---------------------------------------------------------------------------------
+# you need a rule like this for each extension you use as binary data
+#---------------------------------------------------------------------------------
+%.bin.o	:	%.bin
+#---------------------------------------------------------------------------------
+	@echo $(notdir $<)
 	@$(bin2o)
 
-$(dir_build)/%.o: $(dir_source)/%.c
-	@mkdir -p "$(@D)"
-	$(COMPILE.c) $(OUTPUT_OPTION) $<
+-include $(DEPENDS)
 
-$(dir_build)/%.o: $(dir_source)/%.s
-	@mkdir -p "$(@D)"
-	$(COMPILE.c) -x assembler-with-cpp $(OUTPUT_OPTION) $<
+#---------------------------------------------------------------------------------------
+endif
+#---------------------------------------------------------------------------------------
diff --git a/exosphere/bpmpfw/linker.specs b/exosphere/bpmpfw/linker.specs
new file mode 100644
index 000000000..300990418
--- /dev/null
+++ b/exosphere/bpmpfw/linker.specs
@@ -0,0 +1,7 @@
+%rename link                old_link
+
+*link:
+%(old_link) -T %:getenv(TOPDIR /linker.ld) --nmagic --gc-sections
+
+*startfile:
+crti%O%s crtbegin%O%s
diff --git a/exosphere/linker.ld b/exosphere/linker.ld
index 20db711cd..5088a9bd5 100644
--- a/exosphere/linker.ld
+++ b/exosphere/linker.ld
@@ -33,14 +33,14 @@ SECTIONS
         __glob_origin__ = ORIGIN(glob);
         KEEP (*(.cold_crt0.text.start)) /* MUST be first */
         KEEP (*(.cold_crt0.text*))
-        KEEP (build/coldboot_init.o(.text*))
+        KEEP (coldboot_init.o(.text*))
         *(.cold_crt0.rodata*)
-        build/coldboot_init.o(.rodata*)
+        coldboot_init.o(.rodata*)
         *(.cold_crt0.data*)
-        build/coldboot_init.o(.data*)
+        coldboot_init.o(.data*)
         . = ALIGN(8);
         *(.cold_crt0.bss*)
-        build/coldboot_init.o(.bss* COMMON)
+        coldboot_init.o(.bss* COMMON)
         . = ALIGN(64);
         __cold_crt0_end__ = ABSOLUTE(.);
     } >ccrt0 AT>glob
@@ -50,9 +50,9 @@ SECTIONS
         . = ALIGN(4096);
         __pk2ldr_lma__   = LOADADDR(.pk2ldr);
         __pk2ldr_start__ = ABSOLUTE(.);
-        KEEP (build/package2.o(.text*))
-        build/package2.o(.rodata*)
-        build/package2.o(.data*)
+        KEEP (package2.o(.text*))
+        package2.o(.rodata*)
+        package2.o(.data*)
         . = ALIGN(8);
     } >pk2ldr AT>glob
 
@@ -60,7 +60,7 @@ SECTIONS
     {
         . = ALIGN(8);
         __pk2ldr_bss_start__ = ABSOLUTE(.);
-        build/package2.o(.bss* COMMON)
+        package2.o(.bss* COMMON)
         . = ALIGN(8);
         __pk2ldr_end__ = ABSOLUTE(.);
     } >pk2ldr AT>glob
@@ -82,14 +82,14 @@ SECTIONS
         __warmboot_crt0_start__ = ABSOLUTE(.);
         KEEP (*(.warm_crt0.text.start)) /* Should be first */
         KEEP (*(.warm_crt0.text*))
-        KEEP (build/warmboot_init.o(.text*))
+        KEEP (warmboot_init.o(.text*))
         *(.warm_crt0.rodata*)
-        build/warmboot_init.o(.rodata*)
+        warmboot_init.o(.rodata*)
         *(.warm_crt0.data*)
-        build/warmboot_init.o(.data*)
+        warmboot_init.o(.data*)
         . = ALIGN(8);
         *(.warm_crt0.bss*)
-        build/warmboot_init.o(.bss*)
+        warmboot_init.o(.bss*)
         . = ALIGN(64);
         __warmboot_crt0_end__ = ABSOLUTE(.);
     } >warmboot_crt0 AT>glob
diff --git a/exosphere/linker.specs b/exosphere/linker.specs
index 17b095afa..300990418 100644
--- a/exosphere/linker.specs
+++ b/exosphere/linker.specs
@@ -1,7 +1,7 @@
 %rename link                old_link
 
 *link:
-%(old_link) -T linker.ld --nmagic --gc-sections
+%(old_link) -T %:getenv(TOPDIR /linker.ld) --nmagic --gc-sections
 
 *startfile:
 crti%O%s crtbegin%O%s
diff --git a/exosphere/src/lp0.c b/exosphere/src/lp0.c
index 1675ab9e4..33041e9d9 100644
--- a/exosphere/src/lp0.c
+++ b/exosphere/src/lp0.c
@@ -21,45 +21,48 @@
 #include "misc.h"
 #include "exocfg.h"
 
-extern const uint8_t bpmpfw_bin[];
-extern const uint32_t bpmpfw_bin_size;
+#define u8 uint8_t
+#define u32 uint32_t
+#include "bpmpfw_bin.h"
+#undef u8
+#undef u32
 
 /* Save security engine, and go to sleep. */
-void save_se_and_power_down_cpu(void) {   
+void save_se_and_power_down_cpu(void) {
     uint32_t tzram_cmac[0x4] = {0};
-    
+
     uint8_t *tzram_encryption_dst = (uint8_t *)(LP0_ENTRY_GET_RAM_SEGMENT_ADDRESS(LP0_ENTRY_RAM_SEGMENT_ID_ENCRYPTED_TZRAM));
     uint8_t *tzram_encryption_src = (uint8_t *)(LP0_ENTRY_GET_RAM_SEGMENT_ADDRESS(LP0_ENTRY_RAM_SEGMENT_ID_CURRENT_TZRAM));
     uint8_t *tzram_store_address = (uint8_t *)(WARMBOOT_GET_RAM_SEGMENT_ADDRESS(WARMBOOT_RAM_SEGMENT_ID_TZRAM));
     clear_priv_smc_in_progress();
-    
+
     /* Flush cache. */
     flush_dcache_all();
-    
+
     /* Encrypt and save TZRAM into DRAM using a random aes-256 key. */
     se_generate_random_key(KEYSLOT_SWITCH_LP0TZRAMKEY, KEYSLOT_SWITCH_RNGKEY);
-    
+
     flush_dcache_range(tzram_encryption_dst, tzram_encryption_dst + LP0_TZRAM_SAVE_SIZE);
     flush_dcache_range(tzram_encryption_src, tzram_encryption_src + LP0_TZRAM_SAVE_SIZE);
-    
+
     /* Use the all-zero cmac buffer as an IV. */
     se_aes_256_cbc_encrypt(KEYSLOT_SWITCH_LP0TZRAMKEY, tzram_encryption_dst, LP0_TZRAM_SAVE_SIZE, tzram_encryption_src, LP0_TZRAM_SAVE_SIZE, tzram_cmac);
     flush_dcache_range(tzram_encryption_dst, tzram_encryption_dst + LP0_TZRAM_SAVE_SIZE);
-    
+
     /* Copy encrypted TZRAM from IRAM to DRAM. */
     memcpy(tzram_store_address, tzram_encryption_dst, LP0_TZRAM_SAVE_SIZE);
     flush_dcache_range(tzram_store_address, tzram_store_address + LP0_TZRAM_SAVE_SIZE);
-    
+
     /* Compute CMAC. */
     se_compute_aes_256_cmac(KEYSLOT_SWITCH_LP0TZRAMKEY, tzram_cmac, sizeof(tzram_cmac), tzram_encryption_src, LP0_TZRAM_SAVE_SIZE);
-    
+
     /* Write CMAC, lock registers. */
     APBDEV_PMC_SECURE_SCRATCH112_0 = tzram_cmac[0];
     APBDEV_PMC_SECURE_SCRATCH113_0 = tzram_cmac[1];
     APBDEV_PMC_SECURE_SCRATCH114_0 = tzram_cmac[2];
     APBDEV_PMC_SECURE_SCRATCH115_0 = tzram_cmac[3];
     APBDEV_PMC_SEC_DISABLE8_0 = 0x550000;
-    
+
     /* Save security engine state. */
     uint8_t *se_state_dst = (uint8_t *)(WARMBOOT_GET_RAM_SEGMENT_ADDRESS(WARMBOOT_RAM_SEGMENT_ID_SE_STATE));
     se_check_error_status_reg();
@@ -73,7 +76,7 @@ void save_se_and_power_down_cpu(void) {
     if (!configitem_is_retail()) {
         /* TODO: uart_log("OYASUMI"); */
     }
-        
+
     finalize_powerdown();
 }
 
@@ -82,11 +85,11 @@ uint32_t cpu_suspend(uint64_t power_state, uint64_t entrypoint, uint64_t argumen
     if ((power_state & 0x17FFF) != 0x1001B) {
         return 0xFFFFFFFD;
     }
-    
+
     unsigned int current_core = get_core_id();
-    
+
     clkrst_reboot(CARDEVICE_I2C1);
-    
+
     if (configitem_should_profile_battery() && !i2c_query_ti_charger_bit_7()) {
         /* Profile the battery. */
         i2c_set_ti_charger_bit_7();
@@ -104,7 +107,7 @@ uint32_t cpu_suspend(uint64_t power_state, uint64_t entrypoint, uint64_t argumen
         }
     }
     clkrst_disable(CARDEVICE_I2C1);
-    
+
     /* Enable LP0 Wake Event Detection. */
     wait(75);
     APBDEV_PMC_CNTRL2_0 |= 0x200; /* Set WAKE_DET_EN. */
@@ -112,24 +115,24 @@ uint32_t cpu_suspend(uint64_t power_state, uint64_t entrypoint, uint64_t argumen
     APBDEV_PM_0 = 0xFFFFFFFF; /* Set all wake events. */
     APBDEV_PMC_WAKE2_STATUS_0 = 0xFFFFFFFF; /* Set all wake events. */
     wait(75);
-    
+
     clkrst_reboot(CARDEVICE_I2C5);
     if (fuse_get_bootrom_patch_version() >= 0x7F) {
         i2c_send_pmic_cpu_shutdown_cmd();
     }
-    
+
     /* Jamais Vu mitigation #1: Ensure all other cores are off. */
     if (APBDEV_PMC_PWRGATE_STATUS_0 & 0xE00) {
         generic_panic();
     }
-    
+
     /* For debugging, make this check always pass. */
     if ((exosphere_get_target_firmware() < EXOSPHERE_TARGET_FIRMWARE_400 || (get_debug_authentication_status() & 3) == 3)) {
         FLOW_CTLR_HALT_COP_EVENTS_0 = 0x50000000;
     } else {
         FLOW_CTLR_HALT_COP_EVENTS_0 = 0x40000000;
     }
-        
+
     /* Jamais Vu mitigation #2: Ensure the BPMP is halted. */
     if (exosphere_get_target_firmware() < EXOSPHERE_TARGET_FIRMWARE_400 || (get_debug_authentication_status() & 3) == 3) {
         /* BPMP should just be plainly halted, in debugging conditions. */
@@ -142,21 +145,21 @@ uint32_t cpu_suspend(uint64_t power_state, uint64_t entrypoint, uint64_t argumen
             generic_panic();
         }
     }
-    
+
     /* Jamais Vu mitigation #3: Ensure all relevant DMA controllers are held in reset. */
     if ((CLK_RST_CONTROLLER_RST_DEVICES_H_0 & 0x4000004) != 0x4000004) {
         generic_panic();
     }
-    
+
     /* Signal to bootrom the next reset should be a warmboot. */
-    APBDEV_PMC_SCRATCH0_0 = 1; 
+    APBDEV_PMC_SCRATCH0_0 = 1;
     APBDEV_PMC_DPD_ENABLE_0 |= 2;
-    
+
     /* Prepare to boot the BPMP running our deep sleep firmware. */
-    
+
     /* Mark PMC registers as not secure-world only, so BPMP can access them. */
     APB_MISC_SECURE_REGS_APB_SLAVE_SECURITY_ENABLE_REG0_0 &= 0xFFFFDFFF;
-    
+
     /* Setup BPMP vectors. */
     BPMP_VECTOR_RESET = 0x40003000; /* lp0_entry_firmware_crt0 */
     BPMP_VECTOR_UNDEF = 0x40003004; /* Reboot. */
@@ -166,7 +169,7 @@ uint32_t cpu_suspend(uint64_t power_state, uint64_t entrypoint, uint64_t argumen
     BPMP_VECTOR_UNK = 0x40003004; /* Reboot. */
     BPMP_VECTOR_IRQ = 0x40003004; /* Reboot. */
     BPMP_VECTOR_FIQ = 0x40003004; /* Reboot. */
-    
+
     /* Hold the BPMP in reset. */
     MAKE_CAR_REG(0x300) = 2;
 
@@ -177,7 +180,7 @@ uint32_t cpu_suspend(uint64_t power_state, uint64_t entrypoint, uint64_t argumen
 
     /* Take the BPMP out of reset. */
     MAKE_CAR_REG(0x304) = 2;
-    
+
     /* Start executing BPMP firmware. */
     FLOW_CTLR_HALT_COP_EVENTS_0 = 0;
     /* Prepare the current core for sleep. */
@@ -185,11 +188,11 @@ uint32_t cpu_suspend(uint64_t power_state, uint64_t entrypoint, uint64_t argumen
     flow_set_halt_events(current_core, false);
     FLOW_CTLR_L2FLUSH_CONTROL_0 = 0;
     flow_set_csr(current_core, 2);
-    
+
     /* Save core context. */
     set_core_entrypoint_and_argument(current_core, entrypoint, argument);
     save_current_core_context();
-    set_current_core_inactive(); 
+    set_current_core_inactive();
     call_with_stack_pointer(get_smc_core012_stack_address(), save_se_and_power_down_cpu);
 
     generic_panic();
diff --git a/fusee/fusee-primary/Makefile b/fusee/fusee-primary/Makefile
index a6ae3eb22..16fcd8c07 100644
--- a/fusee/fusee-primary/Makefile
+++ b/fusee/fusee-primary/Makefile
@@ -1,24 +1,34 @@
-rwildcard = $(foreach d, $(wildcard $1*), $(filter $(subst *, %, $2), $d) $(call rwildcard, $d/, $2))
+#---------------------------------------------------------------------------------
+.SUFFIXES:
+#---------------------------------------------------------------------------------
 
 ifeq ($(strip $(DEVKITARM)),)
 $(error "Please set DEVKITARM in your environment. export DEVKITARM=<path to>devkitARM")
 endif
 
-include $(DEVKITARM)/base_tools
+TOPDIR ?= $(CURDIR)
+include $(DEVKITARM)/base_rules
 
-name := fusee-primary
+#---------------------------------------------------------------------------------
+# TARGET is the name of the output
+# BUILD is the directory where object files & intermediate files will be placed
+# SOURCES is a list of directories containing source code
+# DATA is a list of directories containing data files
+# INCLUDES is a list of directories containing header files
+#---------------------------------------------------------------------------------
+TARGET		:=	$(notdir $(CURDIR))
+BUILD		:=	build
+SOURCES		:=	src src/lib src/lib/fatfs src/display src/hwinit
+DATA		:=	data
+INCLUDES	:=	include
 
-dir_source := src
-dir_build := build
-dir_out := out
+#---------------------------------------------------------------------------------
+# options for code generation
+#---------------------------------------------------------------------------------
+ARCH	:=	-march=armv4t -mtune=arm7tdmi -mthumb -mthumb-interwork
+DEFINES :=	-D__BPMP__ -DFUSEE_STAGE1_SRC
 
-ARCH := -march=armv4t -mtune=arm7tdmi -mthumb -mthumb-interwork
-
-ASFLAGS := -g $(ARCH)
-
-# For debug builds, replace -O2 by -Og and comment -fomit-frame-pointer out
-CFLAGS = \
-	$(ARCH) \
+CFLAGS	:= \
 	-g \
 	-O2 \
 	-fomit-frame-pointer \
@@ -28,40 +38,118 @@ CFLAGS = \
 	-Werror \
 	-Wall \
 	-fstrict-volatile-bitfields \
-	-DFUSEE_STAGE1_SRC
+	$(ARCH) $(DEFINES)
 
-LDFLAGS = -specs=linker.specs -g $(ARCH)
+CFLAGS	+=	$(INCLUDE)
 
-objects =	$(patsubst $(dir_source)/%.s, $(dir_build)/%.o, \
-			$(patsubst $(dir_source)/%.c, $(dir_build)/%.o, \
-			$(call rwildcard, $(dir_source), *.s *.c)))
+CXXFLAGS	:= $(CFLAGS) -fno-rtti -fno-exceptions -std=gnu++11
 
-define bin2o
-	bin2s $< | $(AS) -o $(@)
-endef
+ASFLAGS	:=	-g $(ARCH)
+LDFLAGS	=	-specs=$(TOPDIR)/linker.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map)
 
-.PHONY: all
-all: $(dir_out)/$(name).bin
+LIBS	:=
 
-.PHONY: clean
+#---------------------------------------------------------------------------------
+# list of directories containing libraries, this must be the top level containing
+# include and lib
+#---------------------------------------------------------------------------------
+LIBDIRS	:=
+
+
+#---------------------------------------------------------------------------------
+# no real need to edit anything past this point unless you need to add additional
+# rules for different file extensions
+#---------------------------------------------------------------------------------
+ifneq ($(BUILD),$(notdir $(CURDIR)))
+#---------------------------------------------------------------------------------
+
+export OUTPUT	:=	$(CURDIR)/$(TARGET)
+export TOPDIR	:=	$(CURDIR)
+
+export VPATH	:=	$(foreach dir,$(SOURCES),$(CURDIR)/$(dir)) \
+			$(foreach dir,$(DATA),$(CURDIR)/$(dir))
+
+export DEPSDIR	:=	$(CURDIR)/$(BUILD)
+
+CFILES		:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.c)))
+CPPFILES	:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.cpp)))
+SFILES		:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.s)))
+BINFILES	:=	$(foreach dir,$(DATA),$(notdir $(wildcard $(dir)/*.*)))
+
+#---------------------------------------------------------------------------------
+# use CXX for linking C++ projects, CC for standard C
+#---------------------------------------------------------------------------------
+ifeq ($(strip $(CPPFILES)),)
+#---------------------------------------------------------------------------------
+	export LD	:=	$(CC)
+#---------------------------------------------------------------------------------
+else
+#---------------------------------------------------------------------------------
+	export LD	:=	$(CXX)
+#---------------------------------------------------------------------------------
+endif
+#---------------------------------------------------------------------------------
+
+export OFILES_BIN	:=	$(addsuffix .o,$(BINFILES))
+export OFILES_SRC	:=	$(CPPFILES:.cpp=.o) $(CFILES:.c=.o) $(SFILES:.s=.o)
+export OFILES 		:=	$(OFILES_BIN) $(OFILES_SRC)
+export HFILES_BIN	:=	$(addsuffix .h,$(subst .,_,$(BINFILES)))
+
+export INCLUDE	:=	$(foreach dir,$(INCLUDES),-I$(CURDIR)/$(dir)) \
+			$(foreach dir,$(LIBDIRS),-I$(dir)/include) \
+			-I$(CURDIR)/$(BUILD)
+
+export LIBPATHS	:=	$(foreach dir,$(LIBDIRS),-L$(dir)/lib)
+
+.PHONY: $(BUILD) clean all
+
+#---------------------------------------------------------------------------------
+all: $(BUILD)
+
+$(BUILD):
+	@[ -d $@ ] || mkdir -p $@
+	@$(MAKE) --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile
+
+#---------------------------------------------------------------------------------
 clean:
-	@rm -rf $(dir_build)
-	@rm -rf $(dir_out)
+	@echo clean ...
+	@rm -fr $(BUILD) $(TARGET).bin $(TARGET).elf
 
-$(dir_out)/$(name).bin: $(dir_build)/$(name).elf
-	@mkdir -p "$(@D)"
+
+#---------------------------------------------------------------------------------
+else
+.PHONY:	all
+
+DEPENDS	:=	$(OFILES:.o=.d)
+
+#---------------------------------------------------------------------------------
+# main targets
+#---------------------------------------------------------------------------------
+all	:	$(OUTPUT).bin
+
+$(OUTPUT).bin	:	$(OUTPUT).elf
 	$(OBJCOPY) -S -O binary $< $@
+	@echo built ... $(notdir $@)
 
-$(dir_build)/$(name).elf: $(objects)
-	$(LINK.o) $(OUTPUT_OPTION) $^
+$(OUTPUT).elf	:	$(OFILES)
 
-$(dir_build)/%.bin.o: $(dir_build)/%.bin
+%.elf: $(OFILES)
+	@echo linking $(notdir $@)
+	@$(LD) $(LDFLAGS) $(OFILES) $(LIBPATHS) $(LIBS) -o $@
+	@$(NM) -CSn $@ > $(notdir $*.lst)
+
+$(OFILES_SRC)	: $(HFILES_BIN)
+
+#---------------------------------------------------------------------------------
+# you need a rule like this for each extension you use as binary data
+#---------------------------------------------------------------------------------
+%.bin.o	:	%.bin
+#---------------------------------------------------------------------------------
+	@echo $(notdir $<)
 	@$(bin2o)
 
-$(dir_build)/%.o: $(dir_source)/%.c
-	@mkdir -p "$(@D)"
-	$(COMPILE.c) $(OUTPUT_OPTION) $<
+-include $(DEPENDS)
 
-$(dir_build)/%.o: $(dir_source)/%.s
-	@mkdir -p "$(@D)"
-	$(COMPILE.c) -x assembler-with-cpp $(OUTPUT_OPTION) $<
+#---------------------------------------------------------------------------------------
+endif
+#---------------------------------------------------------------------------------------
diff --git a/fusee/fusee-primary/linker.ld b/fusee/fusee-primary/linker.ld
index 7483c12df..980ae2448 100644
--- a/fusee/fusee-primary/linker.ld
+++ b/fusee/fusee-primary/linker.ld
@@ -35,9 +35,9 @@ SECTIONS
         PROVIDE (__chainloader_start__  = .);
         PROVIDE (__chainloader_lma__    = LOADADDR(.chainloader_loadable));
         KEEP(*(.chainloader.text.start))
-        build/chainloader.o(.text*)
-        build/chainloader.o(.rodata*)
-        build/chainloader.o(.data*)
+        chainloader.o(.text*)
+        chainloader.o(.rodata*)
+        chainloader.o(.data*)
         . = ALIGN(8);
 
     } >low_iram AT>main
@@ -46,7 +46,7 @@ SECTIONS
     {
         . = ALIGN(8);
         PROVIDE (__chainloader_bss_start__ = .);
-        build/chainloader.o(.bss* COMMON)
+        chainloader.o(.bss* COMMON)
         . = ALIGN(8);
         PROVIDE (__chainloader_end__ = .);
     } >low_iram AT>main
diff --git a/fusee/fusee-primary/linker.specs b/fusee/fusee-primary/linker.specs
index 17b095afa..300990418 100644
--- a/fusee/fusee-primary/linker.specs
+++ b/fusee/fusee-primary/linker.specs
@@ -1,7 +1,7 @@
 %rename link                old_link
 
 *link:
-%(old_link) -T linker.ld --nmagic --gc-sections
+%(old_link) -T %:getenv(TOPDIR /linker.ld) --nmagic --gc-sections
 
 *startfile:
 crti%O%s crtbegin%O%s
diff --git a/fusee/fusee-primary/src/hwinit/fuse.c b/fusee/fusee-primary/src/hwinit/hwinit_fuse.c
similarity index 100%
rename from fusee/fusee-primary/src/hwinit/fuse.c
rename to fusee/fusee-primary/src/hwinit/hwinit_fuse.c
diff --git a/fusee/fusee-secondary/Makefile b/fusee/fusee-secondary/Makefile
index 4fb23141a..56b9f74c7 100644
--- a/fusee/fusee-secondary/Makefile
+++ b/fusee/fusee-secondary/Makefile
@@ -1,27 +1,37 @@
-rwildcard = $(foreach d, $(wildcard $1*), $(filter $(subst *, %, $2), $d) $(call rwildcard, $d/, $2))
+#---------------------------------------------------------------------------------
+.SUFFIXES:
+#---------------------------------------------------------------------------------
 
 ifeq ($(strip $(DEVKITARM)),)
 $(error "Please set DEVKITARM in your environment. export DEVKITARM=<path to>devkitARM")
 endif
 
-include $(DEVKITARM)/base_tools
+TOPDIR	?= $(CURDIR)
 
-name := fusee-secondary
+AMS		:= $(TOPDIR)/../../
 
-dir_source := src
-dir_build := build
-dir_exosphere := ../../exosphere
-dir_thermosphere := ../../thermosphere
-dir_stratosphere := ../../stratosphere
-dir_out := out
+include $(DEVKITARM)/base_rules
 
-ARCH := -march=armv4t -mtune=arm7tdmi -marm
+#---------------------------------------------------------------------------------
+# TARGET is the name of the output
+# BUILD is the directory where object files & intermediate files will be placed
+# SOURCES is a list of directories containing source code
+# DATA is a list of directories containing data files
+# INCLUDES is a list of directories containing header files
+#---------------------------------------------------------------------------------
+TARGET		:=	$(notdir $(CURDIR))
+BUILD		:=	build
+SOURCES		:=	src src/lib src/lib/fatfs src/display src/hwinit
+DATA		:=	data
+INCLUDES	:=	include
 
-ASFLAGS := -g $(ARCH)
+#---------------------------------------------------------------------------------
+# options for code generation
+#---------------------------------------------------------------------------------
+ARCH	:=	-march=armv4t -mtune=arm7tdmi -marm
+DEFINES :=	-D__BPMP__ -DFUSEE_STAGE2_SRC
 
-# For debug builds, replace -O2 by -Og and comment -fomit-frame-pointer out
-CFLAGS = \
-	$(ARCH) \
+CFLAGS	:= \
 	-g \
 	-O2 \
 	-fomit-frame-pointer \
@@ -31,45 +41,139 @@ CFLAGS = \
 	-Werror \
 	-Wall \
 	-fstrict-volatile-bitfields \
-	-DFUSEE_STAGE2_SRC
+	$(ARCH) $(DEFINES)
 
-LDFLAGS = -specs=linker.specs -g $(ARCH)
+CFLAGS	+=	$(INCLUDE)
 
-bundled =	$(dir_exosphere)/out/exosphere.bin $(dir_thermosphere)/out/thermosphere.bin \
-			$(dir_stratosphere)/loader/loader.kip $(dir_stratosphere)/pm/pm.kip \
-			$(dir_stratosphere)/sm/sm.kip $(dir_stratosphere)/boot/boot_100.kip $(dir_stratosphere)/boot/boot_200.kip
+CXXFLAGS	:= $(CFLAGS) -fno-rtti -fno-exceptions -std=gnu++11
 
-objects =	$(patsubst $(dir_source)/%.s, $(dir_build)/%.o, \
-			$(patsubst $(dir_source)/%.c, $(dir_build)/%.o, \
-			$(call rwildcard, $(dir_source), *.s *.c))) \
-			$(dir_build)/bundled.o
+ASFLAGS	:=	-g $(ARCH)
+LDFLAGS	=	-specs=$(TOPDIR)/linker.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map)
 
-define bin2o
-	bin2s $< | $(AS) -o $(@)
-endef
+LIBS	:=
 
-.PHONY: all
-all: $(dir_out)/$(name).bin
+#---------------------------------------------------------------------------------
+# list of directories containing libraries, this must be the top level containing
+# include and lib
+#---------------------------------------------------------------------------------
+LIBDIRS	:=
 
-.PHONY: clean
+
+#---------------------------------------------------------------------------------
+# no real need to edit anything past this point unless you need to add additional
+# rules for different file extensions
+#---------------------------------------------------------------------------------
+ifneq ($(BUILD),$(notdir $(CURDIR)))
+#---------------------------------------------------------------------------------
+
+export OUTPUT	:=	$(CURDIR)/$(TARGET)
+export TOPDIR	:=	$(CURDIR)
+
+export KIPDIRS	:= $(AMS)/stratosphere/loader $(AMS)/stratosphere/pm $(AMS)/stratosphere/sm $(AMS)/stratosphere/boot
+export VPATH	:=	$(foreach dir,$(SOURCES),$(CURDIR)/$(dir)) \
+			$(foreach dir,$(DATA),$(CURDIR)/$(dir)) \
+			$(AMS)/exosphere $(AMS)/thermosphere $(KIPDIRS)
+
+export DEPSDIR	:=	$(CURDIR)/$(BUILD)
+
+CFILES		:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.c)))
+CPPFILES	:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.cpp)))
+SFILES		:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.s)))
+KIPFILES 	:=	loader.kip pm.kip sm.kip boot_100.kip boot_200.kip
+BINFILES	:=	$(foreach dir,$(DATA),$(notdir $(wildcard $(dir)/*.*))) exosphere.bin thermosphere.bin $(KIPFILES)
+
+#---------------------------------------------------------------------------------
+# use CXX for linking C++ projects, CC for standard C
+#---------------------------------------------------------------------------------
+ifeq ($(strip $(CPPFILES)),)
+#---------------------------------------------------------------------------------
+	export LD	:=	$(CC)
+#---------------------------------------------------------------------------------
+else
+#---------------------------------------------------------------------------------
+	export LD	:=	$(CXX)
+#---------------------------------------------------------------------------------
+endif
+#---------------------------------------------------------------------------------
+
+export OFILES_BIN	:=	$(addsuffix .o,$(BINFILES))
+export OFILES_SRC	:=	$(CPPFILES:.cpp=.o) $(CFILES:.c=.o) $(SFILES:.s=.o)
+export OFILES 		:=	$(OFILES_BIN) $(OFILES_SRC)
+export HFILES_BIN	:=	$(addsuffix .h,$(subst .,_,$(BINFILES)))
+
+export INCLUDE	:=	$(foreach dir,$(INCLUDES),-I$(CURDIR)/$(dir)) \
+			$(foreach dir,$(LIBDIRS),-I$(dir)/include) \
+			-I$(CURDIR)/$(BUILD)
+
+export LIBPATHS	:=	$(foreach dir,$(LIBDIRS),-L$(dir)/lib)
+
+.PHONY: $(BUILD) clean all
+.PHONY: check_exosphere check_thermosphere check_exosphere
+
+#---------------------------------------------------------------------------------
+all: $(BUILD)
+
+check_exosphere:
+	@$(MAKE) -C $(AMS)/exosphere all
+
+check_thermosphere:
+	@$(MAKE) -C $(AMS)/thermosphere all
+
+check_stratosphere:
+	@$(MAKE) -C $(AMS)/stratosphere all
+
+
+$(BUILD): check_exosphere check_thermosphere check_stratosphere
+	@[ -d $@ ] || mkdir -p $@
+	@$(MAKE) --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile
+
+#---------------------------------------------------------------------------------
 clean:
-	@rm -rf $(dir_build)
-	@rm -rf $(dir_out)
+	@echo clean ...
+	@$(MAKE) -C $(AMS)/exosphere clean
+	@$(MAKE) -C $(AMS)/thermosphere clean
+	@$(MAKE) -C $(AMS)/stratosphere clean
+	@rm -fr $(BUILD) $(TARGET).bin $(TARGET).elf
 
-$(dir_out)/$(name).bin: $(dir_build)/$(name).elf
-	@mkdir -p "$(@D)"
+#---------------------------------------------------------------------------------
+else
+.PHONY:	all
+
+DEPENDS	:=	$(OFILES:.o=.d)
+
+#---------------------------------------------------------------------------------
+# main targets
+#---------------------------------------------------------------------------------
+all	:	$(OUTPUT).bin
+
+$(OUTPUT).bin	:	$(OUTPUT).elf
 	$(OBJCOPY) -S -O binary $< $@
+	@echo built ... $(notdir $@)
 
-$(dir_build)/$(name).elf: $(objects)
-	$(LINK.o) $(OUTPUT_OPTION) $^
+$(OUTPUT).elf	:	$(OFILES)
 
-$(dir_build)/bundled.o: $(bundled)
-	@bin2s $^ | $(AS) -o $(@)
+%.elf: $(OFILES)
+	@echo linking $(notdir $@)
+	@$(LD) $(LDFLAGS) $(OFILES) $(LIBPATHS) $(LIBS) -o $@
+	@$(NM) -CSn $@ > $(notdir $*.lst)
 
-$(dir_build)/%.o: $(dir_source)/%.c
-	@mkdir -p "$(@D)"
-	$(COMPILE.c) $(OUTPUT_OPTION) $<
+$(OFILES_SRC)	: $(HFILES_BIN)
 
-$(dir_build)/%.o: $(dir_source)/%.s
-	@mkdir -p "$(@D)"
-	$(COMPILE.c) -x assembler-with-cpp $(OUTPUT_OPTION) $<
+#---------------------------------------------------------------------------------
+# you need a rule like this for each extension you use as binary data
+#---------------------------------------------------------------------------------
+%.bin.o	%_bin.h:	%.bin
+#---------------------------------------------------------------------------------
+	@echo $(notdir $<)
+	@$(bin2o)
+
+%.kip.o	%_kip.h:	%.kip
+#---------------------------------------------------------------------------------
+	@echo $(notdir $<)
+	@$(bin2o)
+
+-include $(DEPENDS)
+
+#---------------------------------------------------------------------------------------
+endif
+#---------------------------------------------------------------------------------------
diff --git a/fusee/fusee-secondary/linker.ld b/fusee/fusee-secondary/linker.ld
index e88e8bf3f..614b97e77 100644
--- a/fusee/fusee-secondary/linker.ld
+++ b/fusee/fusee-secondary/linker.ld
@@ -35,9 +35,9 @@ SECTIONS
         PROVIDE (__chainloader_start__  = .);
         PROVIDE (__chainloader_lma__    = LOADADDR(.chainloader_loadable));
         KEEP(*(.chainloader.text.start))
-        build/chainloader.o(.text*)
-        build/chainloader.o(.rodata*)
-        build/chainloader.o(.data*)
+        chainloader.o(.text*)
+        chainloader.o(.rodata*)
+        chainloader.o(.data*)
         . = ALIGN(8);
 
     } >low_iram AT>main
@@ -46,7 +46,7 @@ SECTIONS
     {
         . = ALIGN(8);
         PROVIDE (__chainloader_bss_start__ = .);
-        build/chainloader.o(.bss* COMMON)
+        chainloader.o(.bss* COMMON)
         . = ALIGN(8);
         PROVIDE (__chainloader_end__ = .);
     } >low_iram AT>main
diff --git a/fusee/fusee-secondary/linker.specs b/fusee/fusee-secondary/linker.specs
index 17b095afa..300990418 100644
--- a/fusee/fusee-secondary/linker.specs
+++ b/fusee/fusee-secondary/linker.specs
@@ -1,7 +1,7 @@
 %rename link                old_link
 
 *link:
-%(old_link) -T linker.ld --nmagic --gc-sections
+%(old_link) -T %:getenv(TOPDIR /linker.ld) --nmagic --gc-sections
 
 *startfile:
 crti%O%s crtbegin%O%s
diff --git a/fusee/fusee-secondary/src/hwinit/fuse.c b/fusee/fusee-secondary/src/hwinit/hwinit_fuse.c
similarity index 100%
rename from fusee/fusee-secondary/src/hwinit/fuse.c
rename to fusee/fusee-secondary/src/hwinit/hwinit_fuse.c
diff --git a/fusee/fusee-secondary/src/nxboot.c b/fusee/fusee-secondary/src/nxboot.c
index 765f9fc46..21258b1c1 100644
--- a/fusee/fusee-secondary/src/nxboot.c
+++ b/fusee/fusee-secondary/src/nxboot.c
@@ -14,6 +14,13 @@
 #include "exocfg.h"
 #include "display/video_fb.h"
 #include "lib/ini.h"
+
+#define u8 uint8_t
+#define u32 uint32_t
+#include "exosphere_bin.h"
+#undef u8
+#undef u32
+
 #include "hwinit/cluster.h"
 
 static int exosphere_ini_handler(void *user, const char *section, const char *name, const char *value) {
@@ -237,8 +244,6 @@ void nxboot_main(void) {
             generic_panic();
         }
     } else {
-        extern const uint8_t exosphere_bin[];
-        extern const uint32_t exosphere_bin_size;
         memcpy(exosphere_memaddr, exosphere_bin, exosphere_bin_size);
     }
 
diff --git a/fusee/fusee-secondary/src/package2.c b/fusee/fusee-secondary/src/package2.c
index 45c3ae8ef..88cd9345c 100644
--- a/fusee/fusee-secondary/src/package2.c
+++ b/fusee/fusee-secondary/src/package2.c
@@ -7,6 +7,12 @@
 #include "kip.h"
 #include "se.h"
 
+#define u8 uint8_t
+#define u32 uint32_t
+#include "thermosphere_bin.h"
+#undef u8
+#undef u32
+
 static void package2_decrypt(package2_header_t *package2);
 static size_t package2_get_thermosphere(void **thermosphere);
 static void package2_patch_kernel(void *kernel, size_t kernel_size);
diff --git a/fusee/fusee-secondary/src/stratosphere.c b/fusee/fusee-secondary/src/stratosphere.c
index aa0bfb6fc..223c9ab9c 100644
--- a/fusee/fusee-secondary/src/stratosphere.c
+++ b/fusee/fusee-secondary/src/stratosphere.c
@@ -7,6 +7,16 @@
 #include "stratosphere.h"
 #include "fs_utils.h"
 
+#define u8 uint8_t
+#define u32 uint32_t
+#include "loader_kip.h"
+#include "pm_kip.h"
+#include "sm_kip.h"
+#include "boot_100_kip.h"
+#include "boot_200_kip.h"
+#undef u8
+#undef u32
+
 static ini1_header_t *g_stratosphere_ini1 = NULL;
 
 extern const uint8_t boot_100_kip[], boot_200_kip[];
diff --git a/stratosphere/Makefile b/stratosphere/Makefile
index 5eadb0bdf..a14b69ffe 100644
--- a/stratosphere/Makefile
+++ b/stratosphere/Makefile
@@ -1,4 +1,7 @@
-KIPS := boot boot2 loader pm sm
+KIPS := loader pm sm boot
+
+#TODO: boot2 ?
+
 SUBFOLDERS := libstratosphere $(KIPS)
 
 TOPTARGETS := all clean
diff --git a/thermosphere/Makefile b/thermosphere/Makefile
index fad5c3a3b..f62bcf1f1 100644
--- a/thermosphere/Makefile
+++ b/thermosphere/Makefile
@@ -1,69 +1,155 @@
-rwildcard = $(foreach d, $(wildcard $1*), $(filter $(subst *, %, $2), $d) $(call rwildcard, $d/, $2))
+#---------------------------------------------------------------------------------
+.SUFFIXES:
+#---------------------------------------------------------------------------------
 
 ifeq ($(strip $(DEVKITPRO)),)
-$(error "Please set DEVKITPRO in your environment. export DEVKITPRO=<path to>devkitPro")
+$(error "Please set DEVKITPRO in your environment. export DEVKITPRO=<path to>/devkitpro")
 endif
 
-include $(DEVKITPRO)/devkitA64/base_tools
+TOPDIR ?= $(CURDIR)
+include $(DEVKITPRO)/devkitA64/base_rules
 
-name := thermosphere
+#---------------------------------------------------------------------------------
+# TARGET is the name of the output
+# BUILD is the directory where object files & intermediate files will be placed
+# SOURCES is a list of directories containing source code
+# DATA is a list of directories containing data files
+# INCLUDES is a list of directories containing header files
+#---------------------------------------------------------------------------------
+TARGET		:=	$(notdir $(CURDIR))
+BUILD		:=	build
+SOURCES		:=	src src/lib
+DATA		:=	data
+INCLUDES	:=	include
 
-dir_source := src
-dir_build := build
-dir_out := out
+#---------------------------------------------------------------------------------
+# options for code generation
+#---------------------------------------------------------------------------------
+ARCH	:=	-march=armv8-a -mtune=cortex-a57
 
-ARCH := -march=armv8-a -mtune=cortex-a57
+CFLAGS	:= \
+		-g \
+		-O2 \
+		-ffunction-sections \
+		-fdata-sections \
+		-mgeneral-regs-only \
+		-fomit-frame-pointer \
+		-std=gnu11 \
+		-Werror \
+		-Wall \
+		-Wno-main \
+		$(ARCH) $(DEFINES)
 
-ASFLAGS := -g $(ARCH)
+CFLAGS	+=	$(INCLUDE) -D__CCPLEX__
 
-CFLAGS = \
-	$(ARCH) \
-	-g \
-	-O2 \
-	-ffunction-sections \
-	-fdata-sections \
-	-mgeneral-regs-only \
-	-fomit-frame-pointer \
-	-std=gnu11 \
-	-Werror \
-	-Wall \
-	-Wno-main
+CXXFLAGS	:= $(CFLAGS) -fno-rtti -fno-exceptions -std=gnu++11
 
-LDFLAGS = -specs=linker.specs -g $(ARCH)
+ASFLAGS	:=	-g $(ARCH)
+LDFLAGS	=	-specs=$(TOPDIR)/linker.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map)
 
-objects =	$(patsubst $(dir_source)/%.s, $(dir_build)/%.o, \
-			$(patsubst $(dir_source)/%.c, $(dir_build)/%.o, \
-			$(patsubst $(dir_source)/%.S, $(dir_build)/%.o, \
-			$(call rwildcard, $(dir_source), *.s *.c *.S))))
+LIBS	:=
+
+#---------------------------------------------------------------------------------
+# list of directories containing libraries, this must be the top level containing
+# include and lib
+#---------------------------------------------------------------------------------
+LIBDIRS	:=
 
 
-define bin2o
-	bin2s $< | $(AS) -o $(@)
-endef
+#---------------------------------------------------------------------------------
+# no real need to edit anything past this point unless you need to add additional
+# rules for different file extensions
+#---------------------------------------------------------------------------------
+ifneq ($(BUILD),$(notdir $(CURDIR)))
+#---------------------------------------------------------------------------------
 
-.PHONY: all
-all: $(dir_out)/$(name).bin
+export OUTPUT	:=	$(CURDIR)/$(TARGET)
+export TOPDIR	:=	$(CURDIR)
 
-.PHONY: clean
+export VPATH	:=	$(foreach dir,$(SOURCES),$(CURDIR)/$(dir)) \
+			$(foreach dir,$(DATA),$(CURDIR)/$(dir))
+
+export DEPSDIR	:=	$(CURDIR)/$(BUILD)
+
+CFILES		:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.c)))
+CPPFILES	:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.cpp)))
+SFILES		:=	$(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.s)))
+BINFILES	:=	$(foreach dir,$(DATA),$(notdir $(wildcard $(dir)/*.*)))
+
+#---------------------------------------------------------------------------------
+# use CXX for linking C++ projects, CC for standard C
+#---------------------------------------------------------------------------------
+ifeq ($(strip $(CPPFILES)),)
+#---------------------------------------------------------------------------------
+	export LD	:=	$(CC)
+#---------------------------------------------------------------------------------
+else
+#---------------------------------------------------------------------------------
+	export LD	:=	$(CXX)
+#---------------------------------------------------------------------------------
+endif
+#---------------------------------------------------------------------------------
+
+export OFILES_BIN	:=	$(addsuffix .o,$(BINFILES))
+export OFILES_SRC	:=	$(CPPFILES:.cpp=.o) $(CFILES:.c=.o) $(SFILES:.s=.o)
+export OFILES 	:=	$(OFILES_BIN) $(OFILES_SRC)
+export HFILES_BIN	:=	$(addsuffix .h,$(subst .,_,$(BINFILES)))
+
+export INCLUDE	:=	$(foreach dir,$(INCLUDES),-I$(CURDIR)/$(dir)) \
+			$(foreach dir,$(LIBDIRS),-I$(dir)/include) \
+			-I$(CURDIR)/$(BUILD)
+
+export LIBPATHS	:=	$(foreach dir,$(LIBDIRS),-L$(dir)/lib)
+
+.PHONY: $(BUILD) clean all
+
+#---------------------------------------------------------------------------------
+all: $(BUILD)
+
+$(BUILD):
+	@[ -d $@ ] || mkdir -p $@
+	@$(MAKE) --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile
+
+#---------------------------------------------------------------------------------
 clean:
-	@rm -rf $(dir_build)
-	@rm -rf $(dir_out)
+	@echo clean ...
+	@rm -fr $(BUILD) $(TARGET).bin $(TARGET).elf
 
-$(dir_out)/$(name).bin: $(dir_build)/$(name).elf
-	@mkdir -p "$(@D)"
+
+#---------------------------------------------------------------------------------
+else
+.PHONY:	all
+
+DEPENDS	:=	$(OFILES:.o=.d)
+
+#---------------------------------------------------------------------------------
+# main targets
+#---------------------------------------------------------------------------------
+all	:	$(OUTPUT).bin
+
+$(OUTPUT).bin	:	$(OUTPUT).elf
 	$(OBJCOPY) -S -O binary $< $@
+	@echo built ... $(notdir $@)
 
-$(dir_build)/$(name).elf: $(objects)
-	$(LINK.o) $(OUTPUT_OPTION) $^
+$(OUTPUT).elf	:	$(OFILES)
 
-$(dir_build)/%.bin.o: $(dir_build)/%.bin
+%.elf:
+	@echo linking $(notdir $@)
+	$(LD) $(LDFLAGS) $(OFILES) $(LIBPATHS) $(LIBS) -o $@
+	@$(NM) -CSn $@ > $(notdir $*.lst)
+
+$(OFILES_SRC)	: $(HFILES_BIN)
+
+#---------------------------------------------------------------------------------
+# you need a rule like this for each extension you use as binary data
+#---------------------------------------------------------------------------------
+%.bin.o	:	%.bin
+#---------------------------------------------------------------------------------
+	@echo $(notdir $<)
 	@$(bin2o)
 
-$(dir_build)/%.o: $(dir_source)/%.c
-	@mkdir -p "$(@D)"
-	$(COMPILE.c) $(OUTPUT_OPTION) $<
-
-$(dir_build)/%.o: $(dir_source)/%.s
-	@mkdir -p "$(@D)"
-	$(COMPILE.c) -x assembler-with-cpp $(OUTPUT_OPTION) $<
+-include $(DEPENDS)
 
+#---------------------------------------------------------------------------------------
+endif
+#---------------------------------------------------------------------------------------
diff --git a/thermosphere/linker.ld b/thermosphere/linker.ld
index 33d3de24a..9e8374efa 100644
--- a/thermosphere/linker.ld
+++ b/thermosphere/linker.ld
@@ -9,7 +9,7 @@ SECTIONS
     . = ALIGN(4);
     .text : {
     PROVIDE(lds_thermo_start = .);
-        build/start.o (.text*)
+        start.o (.text*)
         *(.text*)
     }
 
@@ -35,16 +35,16 @@ SECTIONS
     . = ALIGN(16);
     . += 0x10000; /* 64 KiB stack */
     el2_stack_end = .;
-  
+
     /* Page align the end of binary */
     . = ALIGN(512);
     PROVIDE(lds_el2_thermo_end = .);
-  
+
     /* EL1 stack */
     . = ALIGN(16);
     . += 0x10000; /* 64 KiB stack */
     el1_stack_end = .;
-  
+
     lds_thermo_end = .;
 
     /DISCARD/ : { *(.dynstr*) }
diff --git a/thermosphere/linker.specs b/thermosphere/linker.specs
index 17b095afa..300990418 100644
--- a/thermosphere/linker.specs
+++ b/thermosphere/linker.specs
@@ -1,7 +1,7 @@
 %rename link                old_link
 
 *link:
-%(old_link) -T linker.ld --nmagic --gc-sections
+%(old_link) -T %:getenv(TOPDIR /linker.ld) --nmagic --gc-sections
 
 *startfile:
 crti%O%s crtbegin%O%s