diff --git a/extra/balloon-bomber/authors.txt b/extra/roms/balloon-bomber/authors.txt
similarity index 100%
rename from extra/balloon-bomber/authors.txt
rename to extra/roms/balloon-bomber/authors.txt
diff --git a/extra/balloon-bomber/balloon-bomber-docs.factor b/extra/roms/balloon-bomber/balloon-bomber-docs.factor
similarity index 94%
rename from extra/balloon-bomber/balloon-bomber-docs.factor
rename to extra/roms/balloon-bomber/balloon-bomber-docs.factor
index bdbe8e5bc2..0eed3427c2 100644
--- a/extra/balloon-bomber/balloon-bomber-docs.factor
+++ b/extra/roms/balloon-bomber/balloon-bomber-docs.factor
@@ -1,14 +1,14 @@
 ! Copyright (C) 2007 Chris Double.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: help.syntax help.markup cpu.8080.emulator ;
-IN: balloon-bomber
+IN: roms.balloon-bomber
 
 HELP: run-balloon
 { $description
 "Run the Balloon Bomber emulator in a new window." $nl
 { $link rom-root } " must be set to the directory containing the "
 "location of the Balloon Bomber ROM files. See "
-{ $link { "balloon-bomber" "balloon-bomber" } } " for details."
+{ $link "balloon-bomber" } " for details."
 } ;
 
 ARTICLE: "balloon-bomber" "Balloon Bomber Emulator"
diff --git a/extra/balloon-bomber/balloon-bomber.factor b/extra/roms/balloon-bomber/balloon-bomber.factor
similarity index 90%
rename from extra/balloon-bomber/balloon-bomber.factor
rename to extra/roms/balloon-bomber/balloon-bomber.factor
index 7b832c1813..efdc9250b9 100644
--- a/extra/balloon-bomber/balloon-bomber.factor
+++ b/extra/roms/balloon-bomber/balloon-bomber.factor
@@ -2,8 +2,8 @@
 ! See http://factorcode.org/license.txt for BSD license.
 !
 ! Balloon Bomber: https://www.emuparadise.me/M.A.M.E._-_Multiple_Arcade_Machine_Emulator_ROMs/Balloon_Bomber/11301
-USING: kernel space-invaders ui ;
-IN: balloon-bomber
+USING: kernel roms.space-invaders ui ;
+IN: roms.balloon-bomber
 
 TUPLE: balloon-bomber < space-invaders ;
 
diff --git a/extra/balloon-bomber/summary.txt b/extra/roms/balloon-bomber/summary.txt
similarity index 100%
rename from extra/balloon-bomber/summary.txt
rename to extra/roms/balloon-bomber/summary.txt
diff --git a/extra/balloon-bomber/tags.txt b/extra/roms/balloon-bomber/tags.txt
similarity index 100%
rename from extra/balloon-bomber/tags.txt
rename to extra/roms/balloon-bomber/tags.txt
diff --git a/extra/lunar-rescue/authors.txt b/extra/roms/lunar-rescue/authors.txt
similarity index 100%
rename from extra/lunar-rescue/authors.txt
rename to extra/roms/lunar-rescue/authors.txt
diff --git a/extra/lunar-rescue/lunar-rescue-docs.factor b/extra/roms/lunar-rescue/lunar-rescue-docs.factor
similarity index 98%
rename from extra/lunar-rescue/lunar-rescue-docs.factor
rename to extra/roms/lunar-rescue/lunar-rescue-docs.factor
index 93b579c541..457dbf38a0 100644
--- a/extra/lunar-rescue/lunar-rescue-docs.factor
+++ b/extra/roms/lunar-rescue/lunar-rescue-docs.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2007 Chris Double.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: help.syntax help.markup cpu.8080.emulator ;
-IN: lunar-rescue
+IN: roms.lunar-rescue
 
 HELP: run-lunar
 { $description
diff --git a/extra/lunar-rescue/lunar-rescue.factor b/extra/roms/lunar-rescue/lunar-rescue.factor
similarity index 91%
rename from extra/lunar-rescue/lunar-rescue.factor
rename to extra/roms/lunar-rescue/lunar-rescue.factor
index 7cbb5642b9..44bced73a2 100644
--- a/extra/lunar-rescue/lunar-rescue.factor
+++ b/extra/roms/lunar-rescue/lunar-rescue.factor
@@ -2,8 +2,8 @@
 ! See http://factorcode.org/license.txt for BSD license.
 !
 ! Lunar Rescue: https://www.emuparadise.me/M.A.M.E._-_Multiple_Arcade_Machine_Emulator_ROMs/Lunar_Rescue/14294
-USING: kernel space-invaders ui ;
-IN: lunar-rescue
+USING: kernel roms.space-invaders ui ;
+IN: roms.lunar-rescue
 
 TUPLE: lunar-rescue < space-invaders ;
 
diff --git a/extra/lunar-rescue/summary.txt b/extra/roms/lunar-rescue/summary.txt
similarity index 100%
rename from extra/lunar-rescue/summary.txt
rename to extra/roms/lunar-rescue/summary.txt
diff --git a/extra/lunar-rescue/tags.txt b/extra/roms/lunar-rescue/tags.txt
similarity index 100%
rename from extra/lunar-rescue/tags.txt
rename to extra/roms/lunar-rescue/tags.txt
diff --git a/extra/space-invaders/authors.txt b/extra/roms/space-invaders/authors.txt
similarity index 100%
rename from extra/space-invaders/authors.txt
rename to extra/roms/space-invaders/authors.txt
diff --git a/extra/space-invaders/resources/BaseHit.wav b/extra/roms/space-invaders/resources/BaseHit.wav
similarity index 100%
rename from extra/space-invaders/resources/BaseHit.wav
rename to extra/roms/space-invaders/resources/BaseHit.wav
diff --git a/extra/space-invaders/resources/InvHit.Wav b/extra/roms/space-invaders/resources/InvHit.Wav
similarity index 100%
rename from extra/space-invaders/resources/InvHit.Wav
rename to extra/roms/space-invaders/resources/InvHit.Wav
diff --git a/extra/space-invaders/resources/Shot.wav b/extra/roms/space-invaders/resources/Shot.wav
similarity index 100%
rename from extra/space-invaders/resources/Shot.wav
rename to extra/roms/space-invaders/resources/Shot.wav
diff --git a/extra/space-invaders/resources/Ufo.wav b/extra/roms/space-invaders/resources/Ufo.wav
similarity index 100%
rename from extra/space-invaders/resources/Ufo.wav
rename to extra/roms/space-invaders/resources/Ufo.wav
diff --git a/extra/space-invaders/resources/UfoHit.wav b/extra/roms/space-invaders/resources/UfoHit.wav
similarity index 100%
rename from extra/space-invaders/resources/UfoHit.wav
rename to extra/roms/space-invaders/resources/UfoHit.wav
diff --git a/extra/space-invaders/resources/Walk1.wav b/extra/roms/space-invaders/resources/Walk1.wav
similarity index 100%
rename from extra/space-invaders/resources/Walk1.wav
rename to extra/roms/space-invaders/resources/Walk1.wav
diff --git a/extra/space-invaders/resources/Walk2.wav b/extra/roms/space-invaders/resources/Walk2.wav
similarity index 100%
rename from extra/space-invaders/resources/Walk2.wav
rename to extra/roms/space-invaders/resources/Walk2.wav
diff --git a/extra/space-invaders/resources/Walk3.wav b/extra/roms/space-invaders/resources/Walk3.wav
similarity index 100%
rename from extra/space-invaders/resources/Walk3.wav
rename to extra/roms/space-invaders/resources/Walk3.wav
diff --git a/extra/space-invaders/resources/Walk4.wav b/extra/roms/space-invaders/resources/Walk4.wav
similarity index 100%
rename from extra/space-invaders/resources/Walk4.wav
rename to extra/roms/space-invaders/resources/Walk4.wav
diff --git a/extra/space-invaders/space-invaders-docs.factor b/extra/roms/space-invaders/space-invaders-docs.factor
similarity index 98%
rename from extra/space-invaders/space-invaders-docs.factor
rename to extra/roms/space-invaders/space-invaders-docs.factor
index 9fc3710d4e..e0c76f0f8b 100644
--- a/extra/space-invaders/space-invaders-docs.factor
+++ b/extra/roms/space-invaders/space-invaders-docs.factor
@@ -1,7 +1,7 @@
 ! Copyright (C) 2007 Chris Double.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: help.syntax help.markup cpu.8080.emulator ;
-IN: space-invaders
+IN: roms.space-invaders
 
 HELP: run-invaders
 { $description
diff --git a/extra/space-invaders/space-invaders.factor b/extra/roms/space-invaders/space-invaders.factor
similarity index 93%
rename from extra/space-invaders/space-invaders.factor
rename to extra/roms/space-invaders/space-invaders.factor
index fd385162c5..614e5c7007 100755
--- a/extra/space-invaders/space-invaders.factor
+++ b/extra/roms/space-invaders/space-invaders.factor
@@ -9,7 +9,7 @@ specialized-arrays ui ui.gadgets ui.gestures ui.render ;
 QUALIFIED: threads
 QUALIFIED: system
 SPECIALIZED-ARRAY: uchar
-IN: space-invaders
+IN: roms.space-invaders
 
 TUPLE: space-invaders < cpu
     port1 port2i port2o port3o port4lo port4hi port5o
@@ -55,16 +55,16 @@ CONSTANT: SOUND-UFO-HIT      8
 : init-sounds ( cpu -- )
     init-openal {
         [ 9 gen-sources swap sounds<< ]
-        [ SOUND-SHOT "vocab:space-invaders/resources/Shot.wav" init-sound ]
-        [ SOUND-UFO "vocab:space-invaders/resources/Ufo.wav" init-sound ]
+        [ SOUND-SHOT "vocab:roms/space-invaders/resources/Shot.wav" init-sound ]
+        [ SOUND-UFO "vocab:roms/space-invaders/resources/Ufo.wav" init-sound ]
         [ sounds>> SOUND-UFO swap nth AL_LOOPING AL_TRUE set-source-param ]
-        [ SOUND-BASE-HIT "vocab:space-invaders/resources/BaseHit.wav" init-sound ]
-        [ SOUND-INVADER-HIT "vocab:space-invaders/resources/InvHit.Wav" init-sound ]
-        [ SOUND-WALK1 "vocab:space-invaders/resources/Walk1.wav" init-sound ]
-        [ SOUND-WALK2 "vocab:space-invaders/resources/Walk2.wav" init-sound ]
-        [ SOUND-WALK3 "vocab:space-invaders/resources/Walk3.wav" init-sound ]
-        [ SOUND-WALK4 "vocab:space-invaders/resources/Walk4.wav" init-sound ]
-        [ SOUND-UFO-HIT "vocab:space-invaders/resources/UfoHit.wav" init-sound ]
+        [ SOUND-BASE-HIT "vocab:roms/space-invaders/resources/BaseHit.wav" init-sound ]
+        [ SOUND-INVADER-HIT "vocab:roms/space-invaders/resources/InvHit.Wav" init-sound ]
+        [ SOUND-WALK1 "vocab:roms/space-invaders/resources/Walk1.wav" init-sound ]
+        [ SOUND-WALK2 "vocab:roms/space-invaders/resources/Walk2.wav" init-sound ]
+        [ SOUND-WALK3 "vocab:roms/space-invaders/resources/Walk3.wav" init-sound ]
+        [ SOUND-WALK4 "vocab:roms/space-invaders/resources/Walk4.wav" init-sound ]
+        [ SOUND-UFO-HIT "vocab:roms/space-invaders/resources/UfoHit.wav" init-sound ]
         [ f swap looping?<< ]
     } cleave ;
 
diff --git a/extra/space-invaders/summary.txt b/extra/roms/space-invaders/summary.txt
similarity index 100%
rename from extra/space-invaders/summary.txt
rename to extra/roms/space-invaders/summary.txt
diff --git a/extra/space-invaders/tags.txt b/extra/roms/space-invaders/tags.txt
similarity index 100%
rename from extra/space-invaders/tags.txt
rename to extra/roms/space-invaders/tags.txt