diff --git a/.gitignore b/.gitignore
index 4022f43..15b50e6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,9 +10,11 @@ _autosave-*
 fp-info-cache
 WarpSE-backups/*
 PowerAdapter/SEPowerAdapter-backups/*
-rombuild/*
 
 *.DS_Store
 Documentation/Thumbs.db
 *.kicad_prl
 *.kicad_sch-bak
+rom/bin/*
+!rom/bin/warpse_1508.bin
+!rom/bin/warpse_0700.bin
diff --git a/rom/Makefile b/rom/Makefile
new file mode 100644
index 0000000..ca995fc
--- /dev/null
+++ b/rom/Makefile
@@ -0,0 +1,22 @@
+.PHONY: bin
+
+all: bin/warpse_0700.bin bin/warpse_1508.bin
+
+bin:
+	mkdir -p bin 
+
+clean:
+	rm -fr bin
+
+bin/warpse_1508_preswap.bin: bin se.bin
+	rm -f bin/warpse_1508_preswap.bin
+	rm -f bin/warpse_0700_preswap.bin
+	../../romtools/bin/bytesplit se.bin 2 bin/warpse_1508_preswap.bin bin/warpse_0700_preswap.bin
+
+bin/warpse_0700_preswap.bin: bin se.bin bin/warpse_1508_preswap.bin
+
+bin/warpse_1508.bin: bin/warpse_1508_preswap.bin
+	../../romtools/bin/romswap 11,9,8,13,0,1,14,17,2,3,18,10,12,7,6,5,15,4,16 7,6,5,4,3,2,1,0 bin/warpse_1508_preswap.bin $@
+
+bin/warpse_0700.bin: bin/warpse_0700_preswap.bin
+	../../romtools/bin/romswap 14,13,8,9,18,15,11,10,12,7,16,17,0,1,2,3,4,5,6 7,6,5,4,3,2,1,0 bin/warpse_0700_preswap.bin $@
diff --git a/rom/warpse_0007.bin b/rom/bin/warpse_0700.bin
similarity index 100%
rename from rom/warpse_0007.bin
rename to rom/bin/warpse_0700.bin
diff --git a/rom/warpse_0815.bin b/rom/bin/warpse_1508.bin
similarity index 100%
rename from rom/warpse_0815.bin
rename to rom/bin/warpse_1508.bin
diff --git a/romsrc/se.bin b/rom/se.bin
similarity index 100%
rename from romsrc/se.bin
rename to rom/se.bin