diff --git a/.gitignore b/.gitignore
index d329e1e27..b4955cfd3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -57,11 +57,11 @@ exosphere/bpmpfw/out/**
 exosphere/bpmpfw/build/**
 exosphere/build/**
 exosphere/out/**
-fusee/fusee-loader/out/**
-fusee/fusee-loader/build/**
-fusee/fusee-stage1/out/**
-fusee/fusee-stage1/build/**
-fusee/fusee/out/**
-fusee/fusee/build/**
+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/**
diff --git a/fusee/Makefile b/fusee/Makefile
index a1250b108..b5a081403 100644
--- a/fusee/Makefile
+++ b/fusee/Makefile
@@ -9,9 +9,9 @@ include $(DEVKITARM)/base_tools
 dir_source := src
 dir_out := out
 dir_exosphere := ../exosphere
-dir_main := fusee
-dir_loader := fusee-loader
-dir_stage1 := fusee-stage1
+dir_main := fusee-tertiary
+dir_loader := fusee-secondary
+dir_stage1 := fusee-primary
 
 ARCH := -march=armv4t -mtune=arm7tdmi -mthumb -mthumb-interwork
 
diff --git a/fusee/fusee-loader/Makefile b/fusee/fusee-primary/Makefile
similarity index 98%
rename from fusee/fusee-loader/Makefile
rename to fusee/fusee-primary/Makefile
index 618aa7921..a1e8a1e82 100644
--- a/fusee/fusee-loader/Makefile
+++ b/fusee/fusee-primary/Makefile
@@ -6,7 +6,7 @@ endif
 
 include $(DEVKITARM)/base_tools
 
-name := fusee-loader
+name := fusee-primary
 
 dir_source := src
 dir_build := build
diff --git a/fusee/fusee-stage1/linker.ld b/fusee/fusee-primary/linker.ld
similarity index 100%
rename from fusee/fusee-stage1/linker.ld
rename to fusee/fusee-primary/linker.ld
diff --git a/fusee/fusee-loader/linker.specs b/fusee/fusee-primary/linker.specs
similarity index 100%
rename from fusee/fusee-loader/linker.specs
rename to fusee/fusee-primary/linker.specs
diff --git a/fusee/fusee-loader/src/fuse.c b/fusee/fusee-primary/src/fuse.c
similarity index 100%
rename from fusee/fusee-loader/src/fuse.c
rename to fusee/fusee-primary/src/fuse.c
diff --git a/fusee/fusee-loader/src/fuse.h b/fusee/fusee-primary/src/fuse.h
similarity index 100%
rename from fusee/fusee-loader/src/fuse.h
rename to fusee/fusee-primary/src/fuse.h
diff --git a/fusee/fusee-loader/src/hwinit.h b/fusee/fusee-primary/src/hwinit.h
similarity index 100%
rename from fusee/fusee-loader/src/hwinit.h
rename to fusee/fusee-primary/src/hwinit.h
diff --git a/fusee/fusee-loader/src/hwinit/btn.c b/fusee/fusee-primary/src/hwinit/btn.c
similarity index 100%
rename from fusee/fusee-loader/src/hwinit/btn.c
rename to fusee/fusee-primary/src/hwinit/btn.c
diff --git a/fusee/fusee-loader/src/hwinit/btn.h b/fusee/fusee-primary/src/hwinit/btn.h
similarity index 100%
rename from fusee/fusee-loader/src/hwinit/btn.h
rename to fusee/fusee-primary/src/hwinit/btn.h
diff --git a/fusee/fusee-loader/src/hwinit/clock.c b/fusee/fusee-primary/src/hwinit/clock.c
similarity index 100%
rename from fusee/fusee-loader/src/hwinit/clock.c
rename to fusee/fusee-primary/src/hwinit/clock.c
diff --git a/fusee/fusee-loader/src/hwinit/clock.h b/fusee/fusee-primary/src/hwinit/clock.h
similarity index 100%
rename from fusee/fusee-loader/src/hwinit/clock.h
rename to fusee/fusee-primary/src/hwinit/clock.h
diff --git a/fusee/fusee-loader/src/hwinit/cluster.c b/fusee/fusee-primary/src/hwinit/cluster.c
similarity index 100%
rename from fusee/fusee-loader/src/hwinit/cluster.c
rename to fusee/fusee-primary/src/hwinit/cluster.c
diff --git a/fusee/fusee-loader/src/hwinit/cluster.h b/fusee/fusee-primary/src/hwinit/cluster.h
similarity index 100%
rename from fusee/fusee-loader/src/hwinit/cluster.h
rename to fusee/fusee-primary/src/hwinit/cluster.h
diff --git a/fusee/fusee-loader/src/hwinit/di.c b/fusee/fusee-primary/src/hwinit/di.c
similarity index 100%
rename from fusee/fusee-loader/src/hwinit/di.c
rename to fusee/fusee-primary/src/hwinit/di.c
diff --git a/fusee/fusee-loader/src/hwinit/di.h b/fusee/fusee-primary/src/hwinit/di.h
similarity index 100%
rename from fusee/fusee-loader/src/hwinit/di.h
rename to fusee/fusee-primary/src/hwinit/di.h
diff --git a/fusee/fusee-loader/src/hwinit/di.inl b/fusee/fusee-primary/src/hwinit/di.inl
similarity index 100%
rename from fusee/fusee-loader/src/hwinit/di.inl
rename to fusee/fusee-primary/src/hwinit/di.inl
diff --git a/fusee/fusee-loader/src/hwinit/emc.h b/fusee/fusee-primary/src/hwinit/emc.h
similarity index 100%
rename from fusee/fusee-loader/src/hwinit/emc.h
rename to fusee/fusee-primary/src/hwinit/emc.h
diff --git a/fusee/fusee-loader/src/hwinit/fuse.c b/fusee/fusee-primary/src/hwinit/fuse.c
similarity index 100%
rename from fusee/fusee-loader/src/hwinit/fuse.c
rename to fusee/fusee-primary/src/hwinit/fuse.c
diff --git a/fusee/fusee-loader/src/hwinit/fuse.h b/fusee/fusee-primary/src/hwinit/fuse.h
similarity index 100%
rename from fusee/fusee-loader/src/hwinit/fuse.h
rename to fusee/fusee-primary/src/hwinit/fuse.h
diff --git a/fusee/fusee-loader/src/hwinit/hwinit.c b/fusee/fusee-primary/src/hwinit/hwinit.c
similarity index 100%
rename from fusee/fusee-loader/src/hwinit/hwinit.c
rename to fusee/fusee-primary/src/hwinit/hwinit.c
diff --git a/fusee/fusee-loader/src/hwinit/hwinit.h b/fusee/fusee-primary/src/hwinit/hwinit.h
similarity index 100%
rename from fusee/fusee-loader/src/hwinit/hwinit.h
rename to fusee/fusee-primary/src/hwinit/hwinit.h
diff --git a/fusee/fusee-loader/src/hwinit/i2c.c b/fusee/fusee-primary/src/hwinit/i2c.c
similarity index 100%
rename from fusee/fusee-loader/src/hwinit/i2c.c
rename to fusee/fusee-primary/src/hwinit/i2c.c
diff --git a/fusee/fusee-loader/src/hwinit/i2c.h b/fusee/fusee-primary/src/hwinit/i2c.h
similarity index 100%
rename from fusee/fusee-loader/src/hwinit/i2c.h
rename to fusee/fusee-primary/src/hwinit/i2c.h
diff --git a/fusee/fusee-loader/src/hwinit/max77620.h b/fusee/fusee-primary/src/hwinit/max77620.h
similarity index 100%
rename from fusee/fusee-loader/src/hwinit/max77620.h
rename to fusee/fusee-primary/src/hwinit/max77620.h
diff --git a/fusee/fusee-loader/src/hwinit/mc.h b/fusee/fusee-primary/src/hwinit/mc.h
similarity index 100%
rename from fusee/fusee-loader/src/hwinit/mc.h
rename to fusee/fusee-primary/src/hwinit/mc.h
diff --git a/fusee/fusee-loader/src/hwinit/pinmux.c b/fusee/fusee-primary/src/hwinit/pinmux.c
similarity index 100%
rename from fusee/fusee-loader/src/hwinit/pinmux.c
rename to fusee/fusee-primary/src/hwinit/pinmux.c
diff --git a/fusee/fusee-loader/src/hwinit/pinmux.h b/fusee/fusee-primary/src/hwinit/pinmux.h
similarity index 100%
rename from fusee/fusee-loader/src/hwinit/pinmux.h
rename to fusee/fusee-primary/src/hwinit/pinmux.h
diff --git a/fusee/fusee-loader/src/hwinit/pmc.h b/fusee/fusee-primary/src/hwinit/pmc.h
similarity index 100%
rename from fusee/fusee-loader/src/hwinit/pmc.h
rename to fusee/fusee-primary/src/hwinit/pmc.h
diff --git a/fusee/fusee-loader/src/hwinit/sdram.c b/fusee/fusee-primary/src/hwinit/sdram.c
similarity index 100%
rename from fusee/fusee-loader/src/hwinit/sdram.c
rename to fusee/fusee-primary/src/hwinit/sdram.c
diff --git a/fusee/fusee-loader/src/hwinit/sdram.h b/fusee/fusee-primary/src/hwinit/sdram.h
similarity index 100%
rename from fusee/fusee-loader/src/hwinit/sdram.h
rename to fusee/fusee-primary/src/hwinit/sdram.h
diff --git a/fusee/fusee-loader/src/hwinit/sdram.inl b/fusee/fusee-primary/src/hwinit/sdram.inl
similarity index 100%
rename from fusee/fusee-loader/src/hwinit/sdram.inl
rename to fusee/fusee-primary/src/hwinit/sdram.inl
diff --git a/fusee/fusee-loader/src/hwinit/t210.h b/fusee/fusee-primary/src/hwinit/t210.h
similarity index 100%
rename from fusee/fusee-loader/src/hwinit/t210.h
rename to fusee/fusee-primary/src/hwinit/t210.h
diff --git a/fusee/fusee-loader/src/hwinit/tsec.c b/fusee/fusee-primary/src/hwinit/tsec.c
similarity index 100%
rename from fusee/fusee-loader/src/hwinit/tsec.c
rename to fusee/fusee-primary/src/hwinit/tsec.c
diff --git a/fusee/fusee-loader/src/hwinit/tsec.h b/fusee/fusee-primary/src/hwinit/tsec.h
similarity index 100%
rename from fusee/fusee-loader/src/hwinit/tsec.h
rename to fusee/fusee-primary/src/hwinit/tsec.h
diff --git a/fusee/fusee-loader/src/hwinit/types.h b/fusee/fusee-primary/src/hwinit/types.h
similarity index 100%
rename from fusee/fusee-loader/src/hwinit/types.h
rename to fusee/fusee-primary/src/hwinit/types.h
diff --git a/fusee/fusee-loader/src/hwinit/uart.c b/fusee/fusee-primary/src/hwinit/uart.c
similarity index 100%
rename from fusee/fusee-loader/src/hwinit/uart.c
rename to fusee/fusee-primary/src/hwinit/uart.c
diff --git a/fusee/fusee-loader/src/hwinit/uart.h b/fusee/fusee-primary/src/hwinit/uart.h
similarity index 100%
rename from fusee/fusee-loader/src/hwinit/uart.h
rename to fusee/fusee-primary/src/hwinit/uart.h
diff --git a/fusee/fusee-loader/src/hwinit/util.c b/fusee/fusee-primary/src/hwinit/util.c
similarity index 100%
rename from fusee/fusee-loader/src/hwinit/util.c
rename to fusee/fusee-primary/src/hwinit/util.c
diff --git a/fusee/fusee-loader/src/hwinit/util.h b/fusee/fusee-primary/src/hwinit/util.h
similarity index 100%
rename from fusee/fusee-loader/src/hwinit/util.h
rename to fusee/fusee-primary/src/hwinit/util.h
diff --git a/fusee/fusee-stage1/src/main.c b/fusee/fusee-primary/src/main.c
similarity index 100%
rename from fusee/fusee-stage1/src/main.c
rename to fusee/fusee-primary/src/main.c
diff --git a/fusee/fusee-loader/src/panic_color.h b/fusee/fusee-primary/src/panic_color.h
similarity index 100%
rename from fusee/fusee-loader/src/panic_color.h
rename to fusee/fusee-primary/src/panic_color.h
diff --git a/fusee/fusee-loader/src/pmc.h b/fusee/fusee-primary/src/pmc.h
similarity index 100%
rename from fusee/fusee-loader/src/pmc.h
rename to fusee/fusee-primary/src/pmc.h
diff --git a/fusee/fusee-loader/src/preprocessor.h b/fusee/fusee-primary/src/preprocessor.h
similarity index 100%
rename from fusee/fusee-loader/src/preprocessor.h
rename to fusee/fusee-primary/src/preprocessor.h
diff --git a/fusee/fusee-loader/src/sd_utils.c b/fusee/fusee-primary/src/sd_utils.c
similarity index 100%
rename from fusee/fusee-loader/src/sd_utils.c
rename to fusee/fusee-primary/src/sd_utils.c
diff --git a/fusee/fusee-loader/src/sd_utils.h b/fusee/fusee-primary/src/sd_utils.h
similarity index 100%
rename from fusee/fusee-loader/src/sd_utils.h
rename to fusee/fusee-primary/src/sd_utils.h
diff --git a/fusee/fusee-loader/src/sdmmc.c b/fusee/fusee-primary/src/sdmmc.c
similarity index 100%
rename from fusee/fusee-loader/src/sdmmc.c
rename to fusee/fusee-primary/src/sdmmc.c
diff --git a/fusee/fusee-loader/src/sdmmc.h b/fusee/fusee-primary/src/sdmmc.h
similarity index 100%
rename from fusee/fusee-loader/src/sdmmc.h
rename to fusee/fusee-primary/src/sdmmc.h
diff --git a/fusee/fusee-loader/src/se.c b/fusee/fusee-primary/src/se.c
similarity index 100%
rename from fusee/fusee-loader/src/se.c
rename to fusee/fusee-primary/src/se.c
diff --git a/fusee/fusee-loader/src/se.h b/fusee/fusee-primary/src/se.h
similarity index 100%
rename from fusee/fusee-loader/src/se.h
rename to fusee/fusee-primary/src/se.h
diff --git a/fusee/fusee-loader/src/start.s b/fusee/fusee-primary/src/start.s
similarity index 100%
rename from fusee/fusee-loader/src/start.s
rename to fusee/fusee-primary/src/start.s
diff --git a/fusee/fusee-loader/src/timers.h b/fusee/fusee-primary/src/timers.h
similarity index 100%
rename from fusee/fusee-loader/src/timers.h
rename to fusee/fusee-primary/src/timers.h
diff --git a/fusee/fusee-loader/src/utils.c b/fusee/fusee-primary/src/utils.c
similarity index 100%
rename from fusee/fusee-loader/src/utils.c
rename to fusee/fusee-primary/src/utils.c
diff --git a/fusee/fusee-loader/src/utils.h b/fusee/fusee-primary/src/utils.h
similarity index 100%
rename from fusee/fusee-loader/src/utils.h
rename to fusee/fusee-primary/src/utils.h
diff --git a/fusee/fusee/Makefile b/fusee/fusee-secondary/Makefile
similarity index 98%
rename from fusee/fusee/Makefile
rename to fusee/fusee-secondary/Makefile
index 897b997c6..c5f6271e6 100644
--- a/fusee/fusee/Makefile
+++ b/fusee/fusee-secondary/Makefile
@@ -6,7 +6,7 @@ endif
 
 include $(DEVKITARM)/base_tools
 
-name := fusee
+name := fusee-secondary
 
 dir_source := src
 dir_build := build
diff --git a/fusee/fusee-loader/linker.ld b/fusee/fusee-secondary/linker.ld
similarity index 100%
rename from fusee/fusee-loader/linker.ld
rename to fusee/fusee-secondary/linker.ld
diff --git a/fusee/fusee-stage1/linker.specs b/fusee/fusee-secondary/linker.specs
similarity index 100%
rename from fusee/fusee-stage1/linker.specs
rename to fusee/fusee-secondary/linker.specs
diff --git a/fusee/fusee-stage1/src/fuse.c b/fusee/fusee-secondary/src/fuse.c
similarity index 100%
rename from fusee/fusee-stage1/src/fuse.c
rename to fusee/fusee-secondary/src/fuse.c
diff --git a/fusee/fusee-stage1/src/fuse.h b/fusee/fusee-secondary/src/fuse.h
similarity index 100%
rename from fusee/fusee-stage1/src/fuse.h
rename to fusee/fusee-secondary/src/fuse.h
diff --git a/fusee/fusee-stage1/src/hwinit.h b/fusee/fusee-secondary/src/hwinit.h
similarity index 100%
rename from fusee/fusee-stage1/src/hwinit.h
rename to fusee/fusee-secondary/src/hwinit.h
diff --git a/fusee/fusee-stage1/src/hwinit/btn.c b/fusee/fusee-secondary/src/hwinit/btn.c
similarity index 100%
rename from fusee/fusee-stage1/src/hwinit/btn.c
rename to fusee/fusee-secondary/src/hwinit/btn.c
diff --git a/fusee/fusee-stage1/src/hwinit/btn.h b/fusee/fusee-secondary/src/hwinit/btn.h
similarity index 100%
rename from fusee/fusee-stage1/src/hwinit/btn.h
rename to fusee/fusee-secondary/src/hwinit/btn.h
diff --git a/fusee/fusee-stage1/src/hwinit/clock.c b/fusee/fusee-secondary/src/hwinit/clock.c
similarity index 100%
rename from fusee/fusee-stage1/src/hwinit/clock.c
rename to fusee/fusee-secondary/src/hwinit/clock.c
diff --git a/fusee/fusee-stage1/src/hwinit/clock.h b/fusee/fusee-secondary/src/hwinit/clock.h
similarity index 100%
rename from fusee/fusee-stage1/src/hwinit/clock.h
rename to fusee/fusee-secondary/src/hwinit/clock.h
diff --git a/fusee/fusee-stage1/src/hwinit/cluster.c b/fusee/fusee-secondary/src/hwinit/cluster.c
similarity index 100%
rename from fusee/fusee-stage1/src/hwinit/cluster.c
rename to fusee/fusee-secondary/src/hwinit/cluster.c
diff --git a/fusee/fusee-stage1/src/hwinit/cluster.h b/fusee/fusee-secondary/src/hwinit/cluster.h
similarity index 100%
rename from fusee/fusee-stage1/src/hwinit/cluster.h
rename to fusee/fusee-secondary/src/hwinit/cluster.h
diff --git a/fusee/fusee-stage1/src/hwinit/di.c b/fusee/fusee-secondary/src/hwinit/di.c
similarity index 100%
rename from fusee/fusee-stage1/src/hwinit/di.c
rename to fusee/fusee-secondary/src/hwinit/di.c
diff --git a/fusee/fusee-stage1/src/hwinit/di.h b/fusee/fusee-secondary/src/hwinit/di.h
similarity index 100%
rename from fusee/fusee-stage1/src/hwinit/di.h
rename to fusee/fusee-secondary/src/hwinit/di.h
diff --git a/fusee/fusee-stage1/src/hwinit/di.inl b/fusee/fusee-secondary/src/hwinit/di.inl
similarity index 100%
rename from fusee/fusee-stage1/src/hwinit/di.inl
rename to fusee/fusee-secondary/src/hwinit/di.inl
diff --git a/fusee/fusee-stage1/src/hwinit/emc.h b/fusee/fusee-secondary/src/hwinit/emc.h
similarity index 100%
rename from fusee/fusee-stage1/src/hwinit/emc.h
rename to fusee/fusee-secondary/src/hwinit/emc.h
diff --git a/fusee/fusee-stage1/src/hwinit/fuse.c b/fusee/fusee-secondary/src/hwinit/fuse.c
similarity index 100%
rename from fusee/fusee-stage1/src/hwinit/fuse.c
rename to fusee/fusee-secondary/src/hwinit/fuse.c
diff --git a/fusee/fusee-stage1/src/hwinit/fuse.h b/fusee/fusee-secondary/src/hwinit/fuse.h
similarity index 100%
rename from fusee/fusee-stage1/src/hwinit/fuse.h
rename to fusee/fusee-secondary/src/hwinit/fuse.h
diff --git a/fusee/fusee-stage1/src/hwinit/hwinit.c b/fusee/fusee-secondary/src/hwinit/hwinit.c
similarity index 100%
rename from fusee/fusee-stage1/src/hwinit/hwinit.c
rename to fusee/fusee-secondary/src/hwinit/hwinit.c
diff --git a/fusee/fusee-stage1/src/hwinit/hwinit.h b/fusee/fusee-secondary/src/hwinit/hwinit.h
similarity index 100%
rename from fusee/fusee-stage1/src/hwinit/hwinit.h
rename to fusee/fusee-secondary/src/hwinit/hwinit.h
diff --git a/fusee/fusee-stage1/src/hwinit/i2c.c b/fusee/fusee-secondary/src/hwinit/i2c.c
similarity index 100%
rename from fusee/fusee-stage1/src/hwinit/i2c.c
rename to fusee/fusee-secondary/src/hwinit/i2c.c
diff --git a/fusee/fusee-stage1/src/hwinit/i2c.h b/fusee/fusee-secondary/src/hwinit/i2c.h
similarity index 100%
rename from fusee/fusee-stage1/src/hwinit/i2c.h
rename to fusee/fusee-secondary/src/hwinit/i2c.h
diff --git a/fusee/fusee-stage1/src/hwinit/max77620.h b/fusee/fusee-secondary/src/hwinit/max77620.h
similarity index 100%
rename from fusee/fusee-stage1/src/hwinit/max77620.h
rename to fusee/fusee-secondary/src/hwinit/max77620.h
diff --git a/fusee/fusee-stage1/src/hwinit/mc.h b/fusee/fusee-secondary/src/hwinit/mc.h
similarity index 100%
rename from fusee/fusee-stage1/src/hwinit/mc.h
rename to fusee/fusee-secondary/src/hwinit/mc.h
diff --git a/fusee/fusee-stage1/src/hwinit/pinmux.c b/fusee/fusee-secondary/src/hwinit/pinmux.c
similarity index 100%
rename from fusee/fusee-stage1/src/hwinit/pinmux.c
rename to fusee/fusee-secondary/src/hwinit/pinmux.c
diff --git a/fusee/fusee-stage1/src/hwinit/pinmux.h b/fusee/fusee-secondary/src/hwinit/pinmux.h
similarity index 100%
rename from fusee/fusee-stage1/src/hwinit/pinmux.h
rename to fusee/fusee-secondary/src/hwinit/pinmux.h
diff --git a/fusee/fusee-stage1/src/hwinit/pmc.h b/fusee/fusee-secondary/src/hwinit/pmc.h
similarity index 100%
rename from fusee/fusee-stage1/src/hwinit/pmc.h
rename to fusee/fusee-secondary/src/hwinit/pmc.h
diff --git a/fusee/fusee-stage1/src/hwinit/sdram.c b/fusee/fusee-secondary/src/hwinit/sdram.c
similarity index 100%
rename from fusee/fusee-stage1/src/hwinit/sdram.c
rename to fusee/fusee-secondary/src/hwinit/sdram.c
diff --git a/fusee/fusee-stage1/src/hwinit/sdram.h b/fusee/fusee-secondary/src/hwinit/sdram.h
similarity index 100%
rename from fusee/fusee-stage1/src/hwinit/sdram.h
rename to fusee/fusee-secondary/src/hwinit/sdram.h
diff --git a/fusee/fusee-stage1/src/hwinit/sdram.inl b/fusee/fusee-secondary/src/hwinit/sdram.inl
similarity index 100%
rename from fusee/fusee-stage1/src/hwinit/sdram.inl
rename to fusee/fusee-secondary/src/hwinit/sdram.inl
diff --git a/fusee/fusee-stage1/src/hwinit/t210.h b/fusee/fusee-secondary/src/hwinit/t210.h
similarity index 100%
rename from fusee/fusee-stage1/src/hwinit/t210.h
rename to fusee/fusee-secondary/src/hwinit/t210.h
diff --git a/fusee/fusee-stage1/src/hwinit/tsec.c b/fusee/fusee-secondary/src/hwinit/tsec.c
similarity index 100%
rename from fusee/fusee-stage1/src/hwinit/tsec.c
rename to fusee/fusee-secondary/src/hwinit/tsec.c
diff --git a/fusee/fusee-stage1/src/hwinit/tsec.h b/fusee/fusee-secondary/src/hwinit/tsec.h
similarity index 100%
rename from fusee/fusee-stage1/src/hwinit/tsec.h
rename to fusee/fusee-secondary/src/hwinit/tsec.h
diff --git a/fusee/fusee-stage1/src/hwinit/types.h b/fusee/fusee-secondary/src/hwinit/types.h
similarity index 100%
rename from fusee/fusee-stage1/src/hwinit/types.h
rename to fusee/fusee-secondary/src/hwinit/types.h
diff --git a/fusee/fusee-stage1/src/hwinit/uart.c b/fusee/fusee-secondary/src/hwinit/uart.c
similarity index 100%
rename from fusee/fusee-stage1/src/hwinit/uart.c
rename to fusee/fusee-secondary/src/hwinit/uart.c
diff --git a/fusee/fusee-stage1/src/hwinit/uart.h b/fusee/fusee-secondary/src/hwinit/uart.h
similarity index 100%
rename from fusee/fusee-stage1/src/hwinit/uart.h
rename to fusee/fusee-secondary/src/hwinit/uart.h
diff --git a/fusee/fusee-stage1/src/hwinit/util.c b/fusee/fusee-secondary/src/hwinit/util.c
similarity index 100%
rename from fusee/fusee-stage1/src/hwinit/util.c
rename to fusee/fusee-secondary/src/hwinit/util.c
diff --git a/fusee/fusee-stage1/src/hwinit/util.h b/fusee/fusee-secondary/src/hwinit/util.h
similarity index 100%
rename from fusee/fusee-stage1/src/hwinit/util.h
rename to fusee/fusee-secondary/src/hwinit/util.h
diff --git a/fusee/fusee-loader/src/loader.c b/fusee/fusee-secondary/src/loader.c
similarity index 100%
rename from fusee/fusee-loader/src/loader.c
rename to fusee/fusee-secondary/src/loader.c
diff --git a/fusee/fusee-loader/src/loader.h b/fusee/fusee-secondary/src/loader.h
similarity index 100%
rename from fusee/fusee-loader/src/loader.h
rename to fusee/fusee-secondary/src/loader.h
diff --git a/fusee/fusee-loader/src/main.c b/fusee/fusee-secondary/src/main.c
similarity index 100%
rename from fusee/fusee-loader/src/main.c
rename to fusee/fusee-secondary/src/main.c
diff --git a/fusee/fusee-stage1/src/panic_color.h b/fusee/fusee-secondary/src/panic_color.h
similarity index 100%
rename from fusee/fusee-stage1/src/panic_color.h
rename to fusee/fusee-secondary/src/panic_color.h
diff --git a/fusee/fusee-stage1/src/pmc.h b/fusee/fusee-secondary/src/pmc.h
similarity index 100%
rename from fusee/fusee-stage1/src/pmc.h
rename to fusee/fusee-secondary/src/pmc.h
diff --git a/fusee/fusee-stage1/src/preprocessor.h b/fusee/fusee-secondary/src/preprocessor.h
similarity index 100%
rename from fusee/fusee-stage1/src/preprocessor.h
rename to fusee/fusee-secondary/src/preprocessor.h
diff --git a/fusee/fusee-stage1/src/sd_utils.c b/fusee/fusee-secondary/src/sd_utils.c
similarity index 100%
rename from fusee/fusee-stage1/src/sd_utils.c
rename to fusee/fusee-secondary/src/sd_utils.c
diff --git a/fusee/fusee-stage1/src/sd_utils.h b/fusee/fusee-secondary/src/sd_utils.h
similarity index 100%
rename from fusee/fusee-stage1/src/sd_utils.h
rename to fusee/fusee-secondary/src/sd_utils.h
diff --git a/fusee/fusee-stage1/src/sdmmc.c b/fusee/fusee-secondary/src/sdmmc.c
similarity index 100%
rename from fusee/fusee-stage1/src/sdmmc.c
rename to fusee/fusee-secondary/src/sdmmc.c
diff --git a/fusee/fusee-stage1/src/sdmmc.h b/fusee/fusee-secondary/src/sdmmc.h
similarity index 100%
rename from fusee/fusee-stage1/src/sdmmc.h
rename to fusee/fusee-secondary/src/sdmmc.h
diff --git a/fusee/fusee-stage1/src/se.c b/fusee/fusee-secondary/src/se.c
similarity index 100%
rename from fusee/fusee-stage1/src/se.c
rename to fusee/fusee-secondary/src/se.c
diff --git a/fusee/fusee-stage1/src/se.h b/fusee/fusee-secondary/src/se.h
similarity index 100%
rename from fusee/fusee-stage1/src/se.h
rename to fusee/fusee-secondary/src/se.h
diff --git a/fusee/fusee-stage1/src/start.s b/fusee/fusee-secondary/src/start.s
similarity index 100%
rename from fusee/fusee-stage1/src/start.s
rename to fusee/fusee-secondary/src/start.s
diff --git a/fusee/fusee-stage1/src/timers.h b/fusee/fusee-secondary/src/timers.h
similarity index 100%
rename from fusee/fusee-stage1/src/timers.h
rename to fusee/fusee-secondary/src/timers.h
diff --git a/fusee/fusee-stage1/src/utils.c b/fusee/fusee-secondary/src/utils.c
similarity index 100%
rename from fusee/fusee-stage1/src/utils.c
rename to fusee/fusee-secondary/src/utils.c
diff --git a/fusee/fusee-stage1/src/utils.h b/fusee/fusee-secondary/src/utils.h
similarity index 100%
rename from fusee/fusee-stage1/src/utils.h
rename to fusee/fusee-secondary/src/utils.h
diff --git a/fusee/fusee-stage1/Makefile b/fusee/fusee-tertiary/Makefile
similarity index 98%
rename from fusee/fusee-stage1/Makefile
rename to fusee/fusee-tertiary/Makefile
index 3eca11a30..97fed797e 100644
--- a/fusee/fusee-stage1/Makefile
+++ b/fusee/fusee-tertiary/Makefile
@@ -6,7 +6,7 @@ endif
 
 include $(DEVKITARM)/base_tools
 
-name := fusee-stage1
+name := fusee-tertiary
 
 dir_source := src
 dir_build := build
diff --git a/fusee/fusee/linker.ld b/fusee/fusee-tertiary/linker.ld
similarity index 100%
rename from fusee/fusee/linker.ld
rename to fusee/fusee-tertiary/linker.ld
diff --git a/fusee/fusee/linker.specs b/fusee/fusee-tertiary/linker.specs
similarity index 100%
rename from fusee/fusee/linker.specs
rename to fusee/fusee-tertiary/linker.specs
diff --git a/fusee/fusee/src/bpmp.h b/fusee/fusee-tertiary/src/bpmp.h
similarity index 100%
rename from fusee/fusee/src/bpmp.h
rename to fusee/fusee-tertiary/src/bpmp.h
diff --git a/fusee/fusee/src/display/cfb_console.c b/fusee/fusee-tertiary/src/display/cfb_console.c
similarity index 100%
rename from fusee/fusee/src/display/cfb_console.c
rename to fusee/fusee-tertiary/src/display/cfb_console.c
diff --git a/fusee/fusee/src/display/video_fb.h b/fusee/fusee-tertiary/src/display/video_fb.h
similarity index 100%
rename from fusee/fusee/src/display/video_fb.h
rename to fusee/fusee-tertiary/src/display/video_fb.h
diff --git a/fusee/fusee/src/display/video_font_large.h b/fusee/fusee-tertiary/src/display/video_font_large.h
similarity index 100%
rename from fusee/fusee/src/display/video_font_large.h
rename to fusee/fusee-tertiary/src/display/video_font_large.h
diff --git a/fusee/fusee/src/display/video_font_small.h b/fusee/fusee-tertiary/src/display/video_font_small.h
similarity index 100%
rename from fusee/fusee/src/display/video_font_small.h
rename to fusee/fusee-tertiary/src/display/video_font_small.h
diff --git a/fusee/fusee/src/exocfg.h b/fusee/fusee-tertiary/src/exocfg.h
similarity index 100%
rename from fusee/fusee/src/exocfg.h
rename to fusee/fusee-tertiary/src/exocfg.h
diff --git a/fusee/fusee/src/flow.h b/fusee/fusee-tertiary/src/flow.h
similarity index 100%
rename from fusee/fusee/src/flow.h
rename to fusee/fusee-tertiary/src/flow.h
diff --git a/fusee/fusee/src/fuse.c b/fusee/fusee-tertiary/src/fuse.c
similarity index 100%
rename from fusee/fusee/src/fuse.c
rename to fusee/fusee-tertiary/src/fuse.c
diff --git a/fusee/fusee/src/fuse.h b/fusee/fusee-tertiary/src/fuse.h
similarity index 100%
rename from fusee/fusee/src/fuse.h
rename to fusee/fusee-tertiary/src/fuse.h
diff --git a/fusee/fusee/src/hwinit.h b/fusee/fusee-tertiary/src/hwinit.h
similarity index 100%
rename from fusee/fusee/src/hwinit.h
rename to fusee/fusee-tertiary/src/hwinit.h
diff --git a/fusee/fusee/src/hwinit/btn.c b/fusee/fusee-tertiary/src/hwinit/btn.c
similarity index 100%
rename from fusee/fusee/src/hwinit/btn.c
rename to fusee/fusee-tertiary/src/hwinit/btn.c
diff --git a/fusee/fusee/src/hwinit/btn.h b/fusee/fusee-tertiary/src/hwinit/btn.h
similarity index 100%
rename from fusee/fusee/src/hwinit/btn.h
rename to fusee/fusee-tertiary/src/hwinit/btn.h
diff --git a/fusee/fusee/src/hwinit/clock.c b/fusee/fusee-tertiary/src/hwinit/clock.c
similarity index 100%
rename from fusee/fusee/src/hwinit/clock.c
rename to fusee/fusee-tertiary/src/hwinit/clock.c
diff --git a/fusee/fusee/src/hwinit/clock.h b/fusee/fusee-tertiary/src/hwinit/clock.h
similarity index 100%
rename from fusee/fusee/src/hwinit/clock.h
rename to fusee/fusee-tertiary/src/hwinit/clock.h
diff --git a/fusee/fusee/src/hwinit/cluster.c b/fusee/fusee-tertiary/src/hwinit/cluster.c
similarity index 100%
rename from fusee/fusee/src/hwinit/cluster.c
rename to fusee/fusee-tertiary/src/hwinit/cluster.c
diff --git a/fusee/fusee/src/hwinit/cluster.h b/fusee/fusee-tertiary/src/hwinit/cluster.h
similarity index 100%
rename from fusee/fusee/src/hwinit/cluster.h
rename to fusee/fusee-tertiary/src/hwinit/cluster.h
diff --git a/fusee/fusee/src/hwinit/di.c b/fusee/fusee-tertiary/src/hwinit/di.c
similarity index 100%
rename from fusee/fusee/src/hwinit/di.c
rename to fusee/fusee-tertiary/src/hwinit/di.c
diff --git a/fusee/fusee/src/hwinit/di.h b/fusee/fusee-tertiary/src/hwinit/di.h
similarity index 100%
rename from fusee/fusee/src/hwinit/di.h
rename to fusee/fusee-tertiary/src/hwinit/di.h
diff --git a/fusee/fusee/src/hwinit/di.inl b/fusee/fusee-tertiary/src/hwinit/di.inl
similarity index 100%
rename from fusee/fusee/src/hwinit/di.inl
rename to fusee/fusee-tertiary/src/hwinit/di.inl
diff --git a/fusee/fusee/src/hwinit/emc.h b/fusee/fusee-tertiary/src/hwinit/emc.h
similarity index 100%
rename from fusee/fusee/src/hwinit/emc.h
rename to fusee/fusee-tertiary/src/hwinit/emc.h
diff --git a/fusee/fusee/src/hwinit/fuse.c b/fusee/fusee-tertiary/src/hwinit/fuse.c
similarity index 100%
rename from fusee/fusee/src/hwinit/fuse.c
rename to fusee/fusee-tertiary/src/hwinit/fuse.c
diff --git a/fusee/fusee/src/hwinit/fuse.h b/fusee/fusee-tertiary/src/hwinit/fuse.h
similarity index 100%
rename from fusee/fusee/src/hwinit/fuse.h
rename to fusee/fusee-tertiary/src/hwinit/fuse.h
diff --git a/fusee/fusee/src/hwinit/hwinit.c b/fusee/fusee-tertiary/src/hwinit/hwinit.c
similarity index 100%
rename from fusee/fusee/src/hwinit/hwinit.c
rename to fusee/fusee-tertiary/src/hwinit/hwinit.c
diff --git a/fusee/fusee/src/hwinit/hwinit.h b/fusee/fusee-tertiary/src/hwinit/hwinit.h
similarity index 100%
rename from fusee/fusee/src/hwinit/hwinit.h
rename to fusee/fusee-tertiary/src/hwinit/hwinit.h
diff --git a/fusee/fusee/src/hwinit/i2c.c b/fusee/fusee-tertiary/src/hwinit/i2c.c
similarity index 100%
rename from fusee/fusee/src/hwinit/i2c.c
rename to fusee/fusee-tertiary/src/hwinit/i2c.c
diff --git a/fusee/fusee/src/hwinit/i2c.h b/fusee/fusee-tertiary/src/hwinit/i2c.h
similarity index 100%
rename from fusee/fusee/src/hwinit/i2c.h
rename to fusee/fusee-tertiary/src/hwinit/i2c.h
diff --git a/fusee/fusee/src/hwinit/max77620.h b/fusee/fusee-tertiary/src/hwinit/max77620.h
similarity index 100%
rename from fusee/fusee/src/hwinit/max77620.h
rename to fusee/fusee-tertiary/src/hwinit/max77620.h
diff --git a/fusee/fusee/src/hwinit/mc.h b/fusee/fusee-tertiary/src/hwinit/mc.h
similarity index 100%
rename from fusee/fusee/src/hwinit/mc.h
rename to fusee/fusee-tertiary/src/hwinit/mc.h
diff --git a/fusee/fusee/src/hwinit/pinmux.c b/fusee/fusee-tertiary/src/hwinit/pinmux.c
similarity index 100%
rename from fusee/fusee/src/hwinit/pinmux.c
rename to fusee/fusee-tertiary/src/hwinit/pinmux.c
diff --git a/fusee/fusee/src/hwinit/pinmux.h b/fusee/fusee-tertiary/src/hwinit/pinmux.h
similarity index 100%
rename from fusee/fusee/src/hwinit/pinmux.h
rename to fusee/fusee-tertiary/src/hwinit/pinmux.h
diff --git a/fusee/fusee/src/hwinit/pmc.h b/fusee/fusee-tertiary/src/hwinit/pmc.h
similarity index 100%
rename from fusee/fusee/src/hwinit/pmc.h
rename to fusee/fusee-tertiary/src/hwinit/pmc.h
diff --git a/fusee/fusee/src/hwinit/sdram.c b/fusee/fusee-tertiary/src/hwinit/sdram.c
similarity index 100%
rename from fusee/fusee/src/hwinit/sdram.c
rename to fusee/fusee-tertiary/src/hwinit/sdram.c
diff --git a/fusee/fusee/src/hwinit/sdram.h b/fusee/fusee-tertiary/src/hwinit/sdram.h
similarity index 100%
rename from fusee/fusee/src/hwinit/sdram.h
rename to fusee/fusee-tertiary/src/hwinit/sdram.h
diff --git a/fusee/fusee/src/hwinit/sdram.inl b/fusee/fusee-tertiary/src/hwinit/sdram.inl
similarity index 100%
rename from fusee/fusee/src/hwinit/sdram.inl
rename to fusee/fusee-tertiary/src/hwinit/sdram.inl
diff --git a/fusee/fusee/src/hwinit/t210.h b/fusee/fusee-tertiary/src/hwinit/t210.h
similarity index 100%
rename from fusee/fusee/src/hwinit/t210.h
rename to fusee/fusee-tertiary/src/hwinit/t210.h
diff --git a/fusee/fusee/src/hwinit/tsec.c b/fusee/fusee-tertiary/src/hwinit/tsec.c
similarity index 100%
rename from fusee/fusee/src/hwinit/tsec.c
rename to fusee/fusee-tertiary/src/hwinit/tsec.c
diff --git a/fusee/fusee/src/hwinit/tsec.h b/fusee/fusee-tertiary/src/hwinit/tsec.h
similarity index 100%
rename from fusee/fusee/src/hwinit/tsec.h
rename to fusee/fusee-tertiary/src/hwinit/tsec.h
diff --git a/fusee/fusee/src/hwinit/types.h b/fusee/fusee-tertiary/src/hwinit/types.h
similarity index 100%
rename from fusee/fusee/src/hwinit/types.h
rename to fusee/fusee-tertiary/src/hwinit/types.h
diff --git a/fusee/fusee/src/hwinit/uart.c b/fusee/fusee-tertiary/src/hwinit/uart.c
similarity index 100%
rename from fusee/fusee/src/hwinit/uart.c
rename to fusee/fusee-tertiary/src/hwinit/uart.c
diff --git a/fusee/fusee/src/hwinit/uart.h b/fusee/fusee-tertiary/src/hwinit/uart.h
similarity index 100%
rename from fusee/fusee/src/hwinit/uart.h
rename to fusee/fusee-tertiary/src/hwinit/uart.h
diff --git a/fusee/fusee/src/hwinit/util.c b/fusee/fusee-tertiary/src/hwinit/util.c
similarity index 100%
rename from fusee/fusee/src/hwinit/util.c
rename to fusee/fusee-tertiary/src/hwinit/util.c
diff --git a/fusee/fusee/src/hwinit/util.h b/fusee/fusee-tertiary/src/hwinit/util.h
similarity index 100%
rename from fusee/fusee/src/hwinit/util.h
rename to fusee/fusee-tertiary/src/hwinit/util.h
diff --git a/fusee/fusee/src/key_derivation.c b/fusee/fusee-tertiary/src/key_derivation.c
similarity index 100%
rename from fusee/fusee/src/key_derivation.c
rename to fusee/fusee-tertiary/src/key_derivation.c
diff --git a/fusee/fusee/src/key_derivation.h b/fusee/fusee-tertiary/src/key_derivation.h
similarity index 100%
rename from fusee/fusee/src/key_derivation.h
rename to fusee/fusee-tertiary/src/key_derivation.h
diff --git a/fusee/fusee/src/lib/printk.c b/fusee/fusee-tertiary/src/lib/printk.c
similarity index 100%
rename from fusee/fusee/src/lib/printk.c
rename to fusee/fusee-tertiary/src/lib/printk.c
diff --git a/fusee/fusee/src/lib/printk.h b/fusee/fusee-tertiary/src/lib/printk.h
similarity index 100%
rename from fusee/fusee/src/lib/printk.h
rename to fusee/fusee-tertiary/src/lib/printk.h
diff --git a/fusee/fusee/src/lib/vsprintf.c b/fusee/fusee-tertiary/src/lib/vsprintf.c
similarity index 100%
rename from fusee/fusee/src/lib/vsprintf.c
rename to fusee/fusee-tertiary/src/lib/vsprintf.c
diff --git a/fusee/fusee/src/lib/vsprintf.h b/fusee/fusee-tertiary/src/lib/vsprintf.h
similarity index 100%
rename from fusee/fusee/src/lib/vsprintf.h
rename to fusee/fusee-tertiary/src/lib/vsprintf.h
diff --git a/fusee/fusee/src/main.c b/fusee/fusee-tertiary/src/main.c
similarity index 100%
rename from fusee/fusee/src/main.c
rename to fusee/fusee-tertiary/src/main.c
diff --git a/fusee/fusee/src/panic_color.h b/fusee/fusee-tertiary/src/panic_color.h
similarity index 100%
rename from fusee/fusee/src/panic_color.h
rename to fusee/fusee-tertiary/src/panic_color.h
diff --git a/fusee/fusee/src/pmc.h b/fusee/fusee-tertiary/src/pmc.h
similarity index 100%
rename from fusee/fusee/src/pmc.h
rename to fusee/fusee-tertiary/src/pmc.h
diff --git a/fusee/fusee/src/preprocessor.h b/fusee/fusee-tertiary/src/preprocessor.h
similarity index 100%
rename from fusee/fusee/src/preprocessor.h
rename to fusee/fusee-tertiary/src/preprocessor.h
diff --git a/fusee/fusee/src/sdmmc.c b/fusee/fusee-tertiary/src/sdmmc.c
similarity index 100%
rename from fusee/fusee/src/sdmmc.c
rename to fusee/fusee-tertiary/src/sdmmc.c
diff --git a/fusee/fusee/src/sdmmc.h b/fusee/fusee-tertiary/src/sdmmc.h
similarity index 100%
rename from fusee/fusee/src/sdmmc.h
rename to fusee/fusee-tertiary/src/sdmmc.h
diff --git a/fusee/fusee/src/se.c b/fusee/fusee-tertiary/src/se.c
similarity index 100%
rename from fusee/fusee/src/se.c
rename to fusee/fusee-tertiary/src/se.c
diff --git a/fusee/fusee/src/se.h b/fusee/fusee-tertiary/src/se.h
similarity index 100%
rename from fusee/fusee/src/se.h
rename to fusee/fusee-tertiary/src/se.h
diff --git a/fusee/fusee/src/start.s b/fusee/fusee-tertiary/src/start.s
similarity index 100%
rename from fusee/fusee/src/start.s
rename to fusee/fusee-tertiary/src/start.s
diff --git a/fusee/fusee/src/timers.h b/fusee/fusee-tertiary/src/timers.h
similarity index 100%
rename from fusee/fusee/src/timers.h
rename to fusee/fusee-tertiary/src/timers.h
diff --git a/fusee/fusee/src/utils.c b/fusee/fusee-tertiary/src/utils.c
similarity index 100%
rename from fusee/fusee/src/utils.c
rename to fusee/fusee-tertiary/src/utils.c
diff --git a/fusee/fusee/src/utils.h b/fusee/fusee-tertiary/src/utils.h
similarity index 100%
rename from fusee/fusee/src/utils.h
rename to fusee/fusee-tertiary/src/utils.h