diff --git a/extra/joystick-demo/authors.txt b/extra/game/input/demos/joysticks/authors.txt
similarity index 100%
rename from extra/joystick-demo/authors.txt
rename to extra/game/input/demos/joysticks/authors.txt
diff --git a/extra/joystick-demo/deploy.factor b/extra/game/input/demos/joysticks/deploy.factor
similarity index 100%
rename from extra/joystick-demo/deploy.factor
rename to extra/game/input/demos/joysticks/deploy.factor
diff --git a/extra/joystick-demo/joystick-demo.factor b/extra/game/input/demos/joysticks/joysticks.factor
similarity index 99%
rename from extra/joystick-demo/joystick-demo.factor
rename to extra/game/input/demos/joysticks/joysticks.factor
index 6ac7978011..ab65369ea1 100644
--- a/extra/joystick-demo/joystick-demo.factor
+++ b/extra/game/input/demos/joysticks/joysticks.factor
@@ -3,7 +3,7 @@ colors.constants ui.render ui.pens.polygon ui.pens.solid math.vectors
 accessors fry ui.gadgets.packs game.input ui.gadgets.labels
 ui.gadgets.borders alarms calendar locals strings ui.gadgets.buttons
 combinators math.parser assocs threads ;
-IN: joystick-demo
+IN: game.input.demos.joysticks
 
 CONSTANT: SIZE { 151 151 }
 CONSTANT: INDICATOR-SIZE { 4 4 }
diff --git a/extra/joystick-demo/summary.txt b/extra/game/input/demos/joysticks/summary.txt
similarity index 100%
rename from extra/joystick-demo/summary.txt
rename to extra/game/input/demos/joysticks/summary.txt
diff --git a/extra/joystick-demo/tags.txt b/extra/game/input/demos/joysticks/tags.txt
similarity index 100%
rename from extra/joystick-demo/tags.txt
rename to extra/game/input/demos/joysticks/tags.txt
diff --git a/extra/key-caps/authors.txt b/extra/game/input/demos/key-caps/authors.txt
similarity index 100%
rename from extra/key-caps/authors.txt
rename to extra/game/input/demos/key-caps/authors.txt
diff --git a/extra/key-caps/key-caps.factor b/extra/game/input/demos/key-caps/key-caps.factor
similarity index 99%
rename from extra/key-caps/key-caps.factor
rename to extra/game/input/demos/key-caps/key-caps.factor
index af0832c095..363c7c801c 100644
--- a/extra/key-caps/key-caps.factor
+++ b/extra/game/input/demos/key-caps/key-caps.factor
@@ -2,7 +2,7 @@ USING: game.input game.input.scancodes
 kernel ui.gadgets ui.gadgets.buttons sequences accessors
 words arrays assocs math calendar fry alarms ui
 ui.gadgets.borders ui.gestures literals ;
-IN: key-caps
+IN: game.input.demos.key-caps
 
 CONSTANT: key-locations H{
     { key-escape        { {   0   0 } {  10  10 } } }
diff --git a/extra/key-caps/summary.txt b/extra/game/input/demos/key-caps/summary.txt
similarity index 100%
rename from extra/key-caps/summary.txt
rename to extra/game/input/demos/key-caps/summary.txt
diff --git a/extra/key-caps/tags.txt b/extra/game/input/demos/key-caps/tags.txt
similarity index 100%
rename from extra/key-caps/tags.txt
rename to extra/game/input/demos/key-caps/tags.txt