diff --git a/micro/opter b/micro/opter
deleted file mode 160000
index 1d98a07..0000000
--- a/micro/opter
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 1d98a0707c3e61e362d2d3d5413b475437b5de0e
diff --git a/micro/assembler.js b/simulator/assembler.js
similarity index 100%
rename from micro/assembler.js
rename to simulator/assembler.js
diff --git a/micro/cardiograph.js b/simulator/cardiograph.js
similarity index 100%
rename from micro/cardiograph.js
rename to simulator/cardiograph.js
diff --git a/micro/conversions.js b/simulator/conversions.js
similarity index 100%
rename from micro/conversions.js
rename to simulator/conversions.js
diff --git a/micro/cpu.js b/simulator/cpu.js
similarity index 100%
rename from micro/cpu.js
rename to simulator/cpu.js
diff --git a/micro/dbg.js b/simulator/dbg.js
similarity index 100%
rename from micro/dbg.js
rename to simulator/dbg.js
diff --git a/micro/io.js b/simulator/io.js
similarity index 100%
rename from micro/io.js
rename to simulator/io.js
diff --git a/micro/jsconfig.json b/simulator/jsconfig.json
similarity index 100%
rename from micro/jsconfig.json
rename to simulator/jsconfig.json
diff --git a/micro/logging.js b/simulator/logging.js
similarity index 100%
rename from micro/logging.js
rename to simulator/logging.js
diff --git a/micro/machine.config.js b/simulator/machine.config.js
similarity index 100%
rename from micro/machine.config.js
rename to simulator/machine.config.js
diff --git a/micro/package-lock.json b/simulator/package-lock.json
similarity index 100%
rename from micro/package-lock.json
rename to simulator/package-lock.json
diff --git a/micro/package.json b/simulator/package.json
similarity index 100%
rename from micro/package.json
rename to simulator/package.json
diff --git a/micro/readme-micro.md b/simulator/readme-micro.md
similarity index 100%
rename from micro/readme-micro.md
rename to simulator/readme-micro.md
diff --git a/micro/test-programs/add-sub.asm b/simulator/test-programs/add-sub.asm
similarity index 100%
rename from micro/test-programs/add-sub.asm
rename to simulator/test-programs/add-sub.asm
diff --git a/micro/test-programs/constants.asm b/simulator/test-programs/constants.asm
similarity index 100%
rename from micro/test-programs/constants.asm
rename to simulator/test-programs/constants.asm
diff --git a/micro/test-programs/draw-xy.asm b/simulator/test-programs/draw-xy.asm
similarity index 100%
rename from micro/test-programs/draw-xy.asm
rename to simulator/test-programs/draw-xy.asm
diff --git a/micro/test-programs/fill-display.asm b/simulator/test-programs/fill-display.asm
similarity index 100%
rename from micro/test-programs/fill-display.asm
rename to simulator/test-programs/fill-display.asm
diff --git a/micro/test-programs/flag-carry--fhp-ftg.asm b/simulator/test-programs/flag-carry--fhp-ftg.asm
similarity index 100%
rename from micro/test-programs/flag-carry--fhp-ftg.asm
rename to simulator/test-programs/flag-carry--fhp-ftg.asm
diff --git a/micro/test-programs/flag-overflow-2.asm b/simulator/test-programs/flag-overflow-2.asm
similarity index 100%
rename from micro/test-programs/flag-overflow-2.asm
rename to simulator/test-programs/flag-overflow-2.asm
diff --git a/micro/test-programs/flag-overflow.asm b/simulator/test-programs/flag-overflow.asm
similarity index 100%
rename from micro/test-programs/flag-overflow.asm
rename to simulator/test-programs/flag-overflow.asm
diff --git a/micro/test-programs/jmp-to-label.asm b/simulator/test-programs/jmp-to-label.asm
similarity index 100%
rename from micro/test-programs/jmp-to-label.asm
rename to simulator/test-programs/jmp-to-label.asm
diff --git a/micro/test-programs/keypad.asm b/simulator/test-programs/keypad.asm
similarity index 100%
rename from micro/test-programs/keypad.asm
rename to simulator/test-programs/keypad.asm
diff --git a/micro/test-programs/life.asm b/simulator/test-programs/life.asm
similarity index 100%
rename from micro/test-programs/life.asm
rename to simulator/test-programs/life.asm
diff --git a/micro/test-programs/move-pixel-with-keypad.asm b/simulator/test-programs/move-pixel-with-keypad.asm
similarity index 100%
rename from micro/test-programs/move-pixel-with-keypad.asm
rename to simulator/test-programs/move-pixel-with-keypad.asm
diff --git a/micro/test-programs/nop.asm b/simulator/test-programs/nop.asm
similarity index 100%
rename from micro/test-programs/nop.asm
rename to simulator/test-programs/nop.asm
diff --git a/micro/test-programs/referencing-program-counter-during-assembly.asm b/simulator/test-programs/referencing-program-counter-during-assembly.asm
similarity index 100%
rename from micro/test-programs/referencing-program-counter-during-assembly.asm
rename to simulator/test-programs/referencing-program-counter-during-assembly.asm
diff --git a/micro/test-programs/relocate-display-mem.asm b/simulator/test-programs/relocate-display-mem.asm
similarity index 100%
rename from micro/test-programs/relocate-display-mem.asm
rename to simulator/test-programs/relocate-display-mem.asm
diff --git a/micro/test-programs/subroutines.asm b/simulator/test-programs/subroutines.asm
similarity index 100%
rename from micro/test-programs/subroutines.asm
rename to simulator/test-programs/subroutines.asm