diff --git a/gdb_script.gdb b/build/device/gdb_script.gdb
similarity index 100%
rename from gdb_script.gdb
rename to build/device/gdb_script.gdb
diff --git a/ion/src/device/boot/memory_map.awk b/build/device/memory_map.awk
similarity index 100%
rename from ion/src/device/boot/memory_map.awk
rename to build/device/memory_map.awk
diff --git a/openocd.cfg b/build/device/openocd.cfg
similarity index 100%
rename from openocd.cfg
rename to build/device/openocd.cfg
diff --git a/build/targets.device.mak b/build/targets.device.mak
index 2736c46c4..3f46fafc2 100644
--- a/build/targets.device.mak
+++ b/build/targets.device.mak
@@ -17,7 +17,7 @@ products += $(products:.$(EXE)=.hex) $(products:.$(EXE)=.bin) $(products:.$(EXE)
 
 .PHONY: %_run
 %_run: %.$(EXE)
-	$(GDB) -x gdb_script.gdb $<
+	$(GDB) -x build/device/gdb_script.gdb $<
 
 %.map: %.elf
 	@echo "LDMAP   $@"
@@ -26,7 +26,7 @@ products += $(products:.$(EXE)=.hex) $(products:.$(EXE)=.bin) $(products:.$(EXE)
 .PHONY: %_memory_map
 %_memory_map: %.map
 	@echo "========== MEMORY MAP ========="
-	$(Q) awk -f ion/src/device/boot/memory_map.awk < $<
+	$(Q) awk -f build/device/memory_map.awk < $<
 	@echo "==============================="
 
 .PHONY: %_flash
@@ -37,3 +37,7 @@ products += $(products:.$(EXE)=.hex) $(products:.$(EXE)=.bin) $(products:.$(EXE)
 	@until dfu-util -l | grep "Internal Flash" > /dev/null 2>&1; do sleep 1;done
 	@echo "DFU     $@"
 	@dfu-util -i 0 -a 0 -s 0x08000000:leave -D $<
+
+.PHONY: openocd
+openocd:
+	openocd -f build/device/openocd.cfg
diff --git a/build/targets.emscripten.mak b/build/targets.emscripten.mak
index 02823a4ca..cb0380f2a 100644
--- a/build/targets.emscripten.mak
+++ b/build/targets.emscripten.mak
@@ -13,4 +13,4 @@ numworks_simulator.zip: epsilon.packed.js
 	@zip -r -9 $@ $(basename $@) > /dev/null
 	@rm -rf $(basename $@)
 
-products += $(addprefix epsilon.,js mem etb) epsilon.packed.js numworks_simulator.zip
+products += $(addprefix epsilon.,js js.mem etb) epsilon.packed.js numworks_simulator.zip