swarm-game · mergify · Nov 1, 2025 · Aug 23, 2025 · Oct 28, 2025 · Oct 28, 2025
diff --git a/data/scenarios/Challenges/00-ORDER.txt b/data/scenarios/Challenges/00-ORDER.txt
@@ -1,29 +1,5 @@
-arbitrage.yaml
-chess_horse.yaml
-bridge-building.yaml
-maypole.yaml
-teleport.yaml
-2048.yaml
-word-search.yaml
-gopher.yaml
-ice-cream.yaml
-combo-lock.yaml
-hanoi.yaml
-hackman.yaml
-lights-out.yaml
-bucket-brigade.yaml
-wave.yaml
-gallery.yaml
-wolf-goat-cabbage.yaml
-blender.yaml
-dna.yaml
-friend.yaml
-pack-tetrominoes.yaml
-dimsum.yaml
-photocopier.yaml
-telephone.yaml
-flower-count.yaml
+Story
+Algorithmic
+Logic
 Mazes
-Ranching
-Sokoban
-Sliding Puzzles
+Mechanics
diff --git a/data/scenarios/Challenges/Algorithmic/00-ORDER.txt b/data/scenarios/Challenges/Algorithmic/00-ORDER.txt
@@ -0,0 +1,5 @@
+2048.yaml
+combo-lock.yaml
+dimsum.yaml
+gallery.yaml
+word-search.yaml
diff --git a/data/scenarios/Challenges/2048.yaml → ...cenarios/Challenges/Algorithmic/2048.yaml b/data/scenarios/Challenges/2048.yaml → ...cenarios/Challenges/Algorithmic/2048.yaml
diff --git a/...scenarios/Challenges/_combo-lock/setup.sw → ...allenges/Algorithmic/_combo-lock/setup.sw b/...scenarios/Challenges/_combo-lock/setup.sw → ...allenges/Algorithmic/_combo-lock/setup.sw
diff --git a/...narios/Challenges/_combo-lock/solution.sw → ...enges/Algorithmic/_combo-lock/solution.sw b/...narios/Challenges/_combo-lock/solution.sw → ...enges/Algorithmic/_combo-lock/solution.sw
diff --git a/data/scenarios/Challenges/_dimsum/cook.sw → ...os/Challenges/Algorithmic/_dimsum/cook.sw b/data/scenarios/Challenges/_dimsum/cook.sw → ...os/Challenges/Algorithmic/_dimsum/cook.sw
diff --git a/data/scenarios/Challenges/_dimsum/patron.sw → .../Challenges/Algorithmic/_dimsum/patron.sw b/data/scenarios/Challenges/_dimsum/patron.sw → .../Challenges/Algorithmic/_dimsum/patron.sw
diff --git a/.../scenarios/Challenges/_dimsum/solution.sw → ...hallenges/Algorithmic/_dimsum/solution.sw b/.../scenarios/Challenges/_dimsum/solution.sw → ...hallenges/Algorithmic/_dimsum/solution.sw
diff --git a/data/scenarios/Challenges/_gallery/setup.sw → .../Challenges/Algorithmic/_gallery/setup.sw b/data/scenarios/Challenges/_gallery/setup.sw → .../Challenges/Algorithmic/_gallery/setup.sw
diff --git a/...scenarios/Challenges/_gallery/solution.sw → ...allenges/Algorithmic/_gallery/solution.sw b/...scenarios/Challenges/_gallery/solution.sw → ...allenges/Algorithmic/_gallery/solution.sw
diff --git a/.../Challenges/_word-search/create-puzzle.sw → ...Algorithmic/_word-search/create-puzzle.sw b/.../Challenges/_word-search/create-puzzle.sw → ...Algorithmic/_word-search/create-puzzle.sw
diff --git a/...arios/Challenges/_word-search/solution.sw → ...nges/Algorithmic/_word-search/solution.sw b/...arios/Challenges/_word-search/solution.sw → ...nges/Algorithmic/_word-search/solution.sw
diff --git a/data/scenarios/Challenges/combo-lock.yaml → ...os/Challenges/Algorithmic/combo-lock.yaml b/data/scenarios/Challenges/combo-lock.yaml → ...os/Challenges/Algorithmic/combo-lock.yaml
@@ -48,9 +48,9 @@ robots:
     display:
       invisible: true
     program: |
-      run "scenarios/Challenges/_combo-lock/setup.sw"
+      run "scenarios/Challenges/Algorithmic/_combo-lock/setup.sw"
 solution: |
-  run "scenarios/Challenges/_combo-lock/solution.sw"
+  run "scenarios/Challenges/Algorithmic/_combo-lock/solution.sw"
 entities:
   - name: gate
     display:

diff --git a/data/scenarios/Challenges/dimsum.yaml → ...narios/Challenges/Algorithmic/dimsum.yaml b/data/scenarios/Challenges/dimsum.yaml → ...narios/Challenges/Algorithmic/dimsum.yaml
@@ -15,7 +15,7 @@ objectives:
         pure $ foodCount >= 2;
       }
 solution: |
-  run "scenarios/Challenges/_dimsum/solution.sw"
+  run "scenarios/Challenges/Algorithmic/_dimsum/solution.sw"
 attrs:
   - name: barrier
     fg: "#222222"
@@ -54,7 +54,7 @@ robots:
       - scanner
       - spatula
     program: |
-      run "scenarios/Challenges/_dimsum/cook.sw"
+      run "scenarios/Challenges/Algorithmic/_dimsum/cook.sw"
   - name: patron
     dir: [0, 1]
     system: false
@@ -75,7 +75,7 @@ robots:
     inventory:
       - [2, bitcoin]
     program: |
-      run "scenarios/Challenges/_dimsum/patron.sw"
+      run "scenarios/Challenges/Algorithmic/_dimsum/patron.sw"
 entities:
   - name: wall
     display:

diff --git a/data/scenarios/Challenges/gallery.yaml → ...arios/Challenges/Algorithmic/gallery.yaml b/data/scenarios/Challenges/gallery.yaml → ...arios/Challenges/Algorithmic/gallery.yaml
@@ -106,9 +106,9 @@ robots:
     display:
       invisible: true
     program: |
-      run "scenarios/Challenges/_gallery/setup.sw"
+      run "scenarios/Challenges/Algorithmic/_gallery/setup.sw"
 solution: |
-  run "scenarios/Challenges/_gallery/solution.sw"
+  run "scenarios/Challenges/Algorithmic/_gallery/solution.sw"
 entities:
   - name: wall
     display:

diff --git a/data/scenarios/Challenges/word-search.yaml → ...s/Challenges/Algorithmic/word-search.yaml b/data/scenarios/Challenges/word-search.yaml → ...s/Challenges/Algorithmic/word-search.yaml
@@ -50,7 +50,7 @@ robots:
       - [376, capital O]
       - [376, capital W]
     program: |
-      run "scenarios/Challenges/_word-search/create-puzzle.sw"
+      run "scenarios/Challenges/Algorithmic/_word-search/create-puzzle.sw"
 solution: |
   // Hard-coded for seed=2:
   def doN = \n. \f. if (n > 0) {f; doN (n - 1) f} {}; end;
@@ -70,7 +70,7 @@ solution: |
   drill down;
   move;
   drill down;
-  // run "scenarios/Challenges/_word-search/solution.sw"
+  // run "scenarios/Challenges/Algorithmic/_word-search/solution.sw"
 entities:
   - name: capital C
     display:

diff --git a/data/scenarios/Challenges/Logic/00-ORDER.txt b/data/scenarios/Challenges/Logic/00-ORDER.txt
@@ -0,0 +1,5 @@
+wolf-goat-cabbage.yaml
+hanoi.yaml
+lights-out.yaml
+Sokoban
+Sliding Puzzles
diff --git a/...s/Challenges/Sliding Puzzles/00-ORDER.txt → ...lenges/Logic/Sliding Puzzles/00-ORDER.txt b/...s/Challenges/Sliding Puzzles/00-ORDER.txt → ...lenges/Logic/Sliding Puzzles/00-ORDER.txt
diff --git a/...arios/Challenges/Sliding Puzzles/3x3.yaml → ...Challenges/Logic/Sliding Puzzles/3x3.yaml b/...arios/Challenges/Sliding Puzzles/3x3.yaml → ...Challenges/Logic/Sliding Puzzles/3x3.yaml
@@ -28,7 +28,7 @@ objectives:
         succession.
     condition: |
       j <- robotnamed "setup";
-      as j {run "scenarios/Challenges/Sliding Puzzles/_sliding-puzzle/validate-board.sw"};
+      as j {run "scenarios/Challenges/Logic/Sliding Puzzles/_sliding-puzzle/validate-board.sw"};
 robots:
   - name: base
     dir: east
@@ -115,7 +115,7 @@ robots:
       - [24, x-tile-ordinal]
       - [25, y-tile-ordinal]
     program: |
-      run "scenarios/Challenges/Sliding Puzzles/_sliding-puzzle/maintainer.sw";
+      run "scenarios/Challenges/Logic/Sliding Puzzles/_sliding-puzzle/maintainer.sw";
   - name: setup
     system: true
     dir: east
@@ -149,9 +149,9 @@ robots:
       - [24, x-tile-ordinal]
       - [25, y-tile-ordinal]
     program: |
-      run "scenarios/Challenges/Sliding Puzzles/_sliding-puzzle/setup.sw";
+      run "scenarios/Challenges/Logic/Sliding Puzzles/_sliding-puzzle/setup.sw";
 solution: |
-  run "scenarios/Challenges/Sliding Puzzles/_sliding-puzzle/solution.sw"
+  run "scenarios/Challenges/Logic/Sliding Puzzles/_sliding-puzzle/solution.sw"
 entities:
   - name: gradiator
     display:

diff --git a/...zles/_sliding-puzzle/design-commentary.md → ...zles/_sliding-puzzle/design-commentary.md b/...zles/_sliding-puzzle/design-commentary.md → ...zles/_sliding-puzzle/design-commentary.md
diff --git a/...ing Puzzles/_sliding-puzzle/maintainer.sw → ...ing Puzzles/_sliding-puzzle/maintainer.sw b/...ing Puzzles/_sliding-puzzle/maintainer.sw → ...ing Puzzles/_sliding-puzzle/maintainer.sw
diff --git a/.../Sliding Puzzles/_sliding-puzzle/setup.sw → .../Sliding Puzzles/_sliding-puzzle/setup.sw b/.../Sliding Puzzles/_sliding-puzzle/setup.sw → .../Sliding Puzzles/_sliding-puzzle/setup.sw
diff --git a/...iding Puzzles/_sliding-puzzle/solution.sw → ...iding Puzzles/_sliding-puzzle/solution.sw b/...iding Puzzles/_sliding-puzzle/solution.sw → ...iding Puzzles/_sliding-puzzle/solution.sw
diff --git a/...Puzzles/_sliding-puzzle/validate-board.sw → ...Puzzles/_sliding-puzzle/validate-board.sw b/...Puzzles/_sliding-puzzle/validate-board.sw → ...Puzzles/_sliding-puzzle/validate-board.sw
diff --git a/...scenarios/Challenges/Sokoban/00-ORDER.txt → ...ios/Challenges/Logic/Sokoban/00-ORDER.txt b/...scenarios/Challenges/Sokoban/00-ORDER.txt → ...ios/Challenges/Logic/Sokoban/00-ORDER.txt
diff --git a/...s/Challenges/Sokoban/Gadgets/00-ORDER.txt → ...lenges/Logic/Sokoban/Gadgets/00-ORDER.txt b/...s/Challenges/Sokoban/Gadgets/00-ORDER.txt → ...lenges/Logic/Sokoban/Gadgets/00-ORDER.txt
diff --git a/...rios/Challenges/Sokoban/Gadgets/README.md → ...hallenges/Logic/Sokoban/Gadgets/README.md b/...rios/Challenges/Sokoban/Gadgets/README.md → ...hallenges/Logic/Sokoban/Gadgets/README.md
diff --git a/...hallenges/Sokoban/Gadgets/no-reverse.yaml → ...ges/Logic/Sokoban/Gadgets/no-reverse.yaml b/...hallenges/Sokoban/Gadgets/no-reverse.yaml → ...ges/Logic/Sokoban/Gadgets/no-reverse.yaml
diff --git a/...s/Challenges/Sokoban/Gadgets/one-way.yaml → ...lenges/Logic/Sokoban/Gadgets/one-way.yaml b/...s/Challenges/Sokoban/Gadgets/one-way.yaml → ...lenges/Logic/Sokoban/Gadgets/one-way.yaml
diff --git a/...os/Challenges/Sokoban/Simple/00-ORDER.txt → ...llenges/Logic/Sokoban/Simple/00-ORDER.txt b/...os/Challenges/Sokoban/Simple/00-ORDER.txt → ...llenges/Logic/Sokoban/Simple/00-ORDER.txt
diff --git a/...s/Challenges/Sokoban/Simple/trapdoor.yaml → ...lenges/Logic/Sokoban/Simple/trapdoor.yaml b/...s/Challenges/Sokoban/Simple/trapdoor.yaml → ...lenges/Logic/Sokoban/Simple/trapdoor.yaml
diff --git a/...Challenges/Sokoban/_foresight/solution.sw → ...nges/Logic/Sokoban/_foresight/solution.sw b/...Challenges/Sokoban/_foresight/solution.sw → ...nges/Logic/Sokoban/_foresight/solution.sw
diff --git a/...enarios/Challenges/Sokoban/foresight.yaml → ...s/Challenges/Logic/Sokoban/foresight.yaml b/...enarios/Challenges/Sokoban/foresight.yaml → ...s/Challenges/Logic/Sokoban/foresight.yaml
@@ -70,7 +70,7 @@ robots:
       - [5, strange loop]
       - [5, treads]
 solution: |
-  run "scenarios/Challenges/Sokoban/_foresight/solution.sw"
+  run "scenarios/Challenges/Logic/Sokoban/_foresight/solution.sw"
 entities:
   - name: monolith
     display:

diff --git a/...cenarios/Challenges/_hanoi/hanoi-count.sw → ...os/Challenges/Logic/_hanoi/hanoi-count.sw b/...cenarios/Challenges/_hanoi/hanoi-count.sw → ...os/Challenges/Logic/_hanoi/hanoi-count.sw
diff --git a/...ios/Challenges/_hanoi/hanoi-increasing.sw → ...allenges/Logic/_hanoi/hanoi-increasing.sw b/...ios/Challenges/_hanoi/hanoi-increasing.sw → ...allenges/Logic/_hanoi/hanoi-increasing.sw
diff --git a/...rios/Challenges/_hanoi/hanoi-invariant.sw → ...hallenges/Logic/_hanoi/hanoi-invariant.sw b/...rios/Challenges/_hanoi/hanoi-invariant.sw → ...hallenges/Logic/_hanoi/hanoi-invariant.sw
diff --git a/...arios/Challenges/_hanoi/hanoi-solution.sw → ...Challenges/Logic/_hanoi/hanoi-solution.sw b/...arios/Challenges/_hanoi/hanoi-solution.sw → ...Challenges/Logic/_hanoi/hanoi-solution.sw
diff --git a/...arios/Challenges/_lights-out/assistant.sw → ...Challenges/Logic/_lights-out/assistant.sw b/...arios/Challenges/_lights-out/assistant.sw → ...Challenges/Logic/_lights-out/assistant.sw
diff --git a/...allenges/_lights-out/design-commentary.md → ...es/Logic/_lights-out/design-commentary.md b/...allenges/_lights-out/design-commentary.md → ...es/Logic/_lights-out/design-commentary.md
diff --git a/...narios/Challenges/_lights-out/solution.sw → .../Challenges/Logic/_lights-out/solution.sw b/...narios/Challenges/_lights-out/solution.sw → .../Challenges/Logic/_lights-out/solution.sw
diff --git a/...os/Challenges/_wolf-goat-cabbage/cross.sw → ...llenges/Logic/_wolf-goat-cabbage/cross.sw b/...os/Challenges/_wolf-goat-cabbage/cross.sw → ...llenges/Logic/_wolf-goat-cabbage/cross.sw
diff --git a/...olf-goat-cabbage/multi-item-possession.sw → ...olf-goat-cabbage/multi-item-possession.sw b/...olf-goat-cabbage/multi-item-possession.sw → ...olf-goat-cabbage/multi-item-possession.sw
diff --git a/...olf-goat-cabbage/together-on-east-bank.sw → ...olf-goat-cabbage/together-on-east-bank.sw b/...olf-goat-cabbage/together-on-east-bank.sw → ...olf-goat-cabbage/together-on-east-bank.sw
diff --git a/..._wolf-goat-cabbage/unattended-together.sw → ..._wolf-goat-cabbage/unattended-together.sw b/..._wolf-goat-cabbage/unattended-together.sw → ..._wolf-goat-cabbage/unattended-together.sw
diff --git a/data/scenarios/Challenges/hanoi.yaml → data/scenarios/Challenges/Logic/hanoi.yaml b/data/scenarios/Challenges/hanoi.yaml → data/scenarios/Challenges/Logic/hanoi.yaml
@@ -15,7 +15,7 @@ objectives:
       z <- ishere "blocked three";
       pure (x && y && z)
 solution: |
-  run "scenarios/Challenges/_hanoi/hanoi-solution.sw"
+  run "scenarios/Challenges/Logic/_hanoi/hanoi-solution.sw"
 robots:
   - name: base
     dir: south
@@ -58,7 +58,7 @@ robots:
       //  1. place north of me is NOT empty
       // then
       //  - lock X
-      run "scenarios/Challenges/_hanoi/hanoi-invariant.sw"
+      run "scenarios/Challenges/Logic/_hanoi/hanoi-invariant.sw"
   - name: increasing
     dir: [0, 0]
     system: true
@@ -73,7 +73,7 @@ robots:
       //  - place "OK"
       // else
       //  - try to grab "OK"
-      run "scenarios/Challenges/_hanoi/hanoi-increasing.sw"
+      run "scenarios/Challenges/Logic/_hanoi/hanoi-increasing.sw"
   - name: count
     dir: [0, 0]
     system: true
@@ -86,7 +86,7 @@ robots:
       // count all entities placed in columns
       // the final count should be either 2 or 3
       // place "two" or "three" at x=0 y=-6
-      run "scenarios/Challenges/_hanoi/hanoi-count.sw"
+      run "scenarios/Challenges/Logic/_hanoi/hanoi-count.sw"
 entities:
   - name: bottom tee
     display:

diff --git a/data/scenarios/Challenges/lights-out.yaml → ...cenarios/Challenges/Logic/lights-out.yaml b/data/scenarios/Challenges/lights-out.yaml → ...cenarios/Challenges/Logic/lights-out.yaml
@@ -95,9 +95,9 @@ robots:
     display:
       invisible: true
     program: |
-      run "scenarios/Challenges/_lights-out/assistant.sw";
+      run "scenarios/Challenges/Logic/_lights-out/assistant.sw";
 solution: |
-  run "scenarios/Challenges/_lights-out/solution.sw"
+  run "scenarios/Challenges/Logic/_lights-out/solution.sw"
 entities:
   - name: pending-off
     display:

diff --git a/...enarios/Challenges/wolf-goat-cabbage.yaml → ...s/Challenges/Logic/wolf-goat-cabbage.yaml b/...enarios/Challenges/wolf-goat-cabbage.yaml → ...s/Challenges/Logic/wolf-goat-cabbage.yaml
diff --git a/data/scenarios/Challenges/Mechanics/00-ORDER.txt b/data/scenarios/Challenges/Mechanics/00-ORDER.txt
@@ -0,0 +1,9 @@
+chess_horse.yaml
+teleport.yaml
+wave.yaml
+maypole.yaml
+pack-tetrominoes.yaml
+bucket-brigade.yaml
+friend.yaml
+photocopier.yaml
+telephone.yaml
diff --git a/...ios/Challenges/_bucket-brigade/brigade.sw → ...nges/Mechanics/_bucket-brigade/brigade.sw b/...ios/Challenges/_bucket-brigade/brigade.sw → ...nges/Mechanics/_bucket-brigade/brigade.sw
diff --git a/...rios/Challenges/_bucket-brigade/hauler.sw → ...enges/Mechanics/_bucket-brigade/hauler.sw b/...rios/Challenges/_bucket-brigade/hauler.sw → ...enges/Mechanics/_bucket-brigade/hauler.sw
diff --git a/.../Challenges/_bucket-brigade/powerplant.sw → ...s/Mechanics/_bucket-brigade/powerplant.sw b/.../Challenges/_bucket-brigade/powerplant.sw → ...s/Mechanics/_bucket-brigade/powerplant.sw
diff --git a/data/scenarios/Challenges/_friend/cat.sw → ...arios/Challenges/Mechanics/_friend/cat.sw b/data/scenarios/Challenges/_friend/cat.sw → ...arios/Challenges/Mechanics/_friend/cat.sw
diff --git a/...ios/Challenges/_friend/friend-solution.sw → ...nges/Mechanics/_friend/friend-solution.sw b/...ios/Challenges/_friend/friend-solution.sw → ...nges/Mechanics/_friend/friend-solution.sw
diff --git a/.../scenarios/Challenges/_maypole/monitor.sw → .../Challenges/Mechanics/_maypole/monitor.sw b/.../scenarios/Challenges/_maypole/monitor.sw → .../Challenges/Mechanics/_maypole/monitor.sw
diff --git a/...scenarios/Challenges/_maypole/solution.sw → ...Challenges/Mechanics/_maypole/solution.sw b/...scenarios/Challenges/_maypole/solution.sw → ...Challenges/Mechanics/_maypole/solution.sw
diff --git a/.../Challenges/_pack-tetrominoes/solution.sw → ...s/Mechanics/_pack-tetrominoes/solution.sw b/.../Challenges/_pack-tetrominoes/solution.sw → ...s/Mechanics/_pack-tetrominoes/solution.sw
diff --git a/...cenarios/Challenges/_photocopier/judge.sw → ...hallenges/Mechanics/_photocopier/judge.sw b/...cenarios/Challenges/_photocopier/judge.sw → ...hallenges/Mechanics/_photocopier/judge.sw
diff --git a/...arios/Challenges/_photocopier/solution.sw → ...lenges/Mechanics/_photocopier/solution.sw b/...arios/Challenges/_photocopier/solution.sw → ...lenges/Mechanics/_photocopier/solution.sw
diff --git a/.../scenarios/Challenges/_telephone/judge.sw → .../Challenges/Mechanics/_telephone/judge.sw b/.../scenarios/Challenges/_telephone/judge.sw → .../Challenges/Mechanics/_telephone/judge.sw
diff --git a/...rios/Challenges/_telephone/photocopier.sw → ...enges/Mechanics/_telephone/photocopier.sw b/...rios/Challenges/_telephone/photocopier.sw → ...enges/Mechanics/_telephone/photocopier.sw
diff --git a/...cenarios/Challenges/_telephone/shuttle.sw → ...hallenges/Mechanics/_telephone/shuttle.sw b/...cenarios/Challenges/_telephone/shuttle.sw → ...hallenges/Mechanics/_telephone/shuttle.sw
diff --git a/...enarios/Challenges/_telephone/solution.sw → ...allenges/Mechanics/_telephone/solution.sw b/...enarios/Challenges/_telephone/solution.sw → ...allenges/Mechanics/_telephone/solution.sw
diff --git a/data/scenarios/Challenges/_wave/solution.sw → ...os/Challenges/Mechanics/_wave/solution.sw b/data/scenarios/Challenges/_wave/solution.sw → ...os/Challenges/Mechanics/_wave/solution.sw
diff --git a/.../scenarios/Challenges/bucket-brigade.yaml → .../Challenges/Mechanics/bucket-brigade.yaml b/.../scenarios/Challenges/bucket-brigade.yaml → .../Challenges/Mechanics/bucket-brigade.yaml
@@ -43,7 +43,7 @@ robots:
       char: '='
       attr: robot
     program: |
-      run "scenarios/Challenges/_bucket-brigade/hauler.sw"
+      run "scenarios/Challenges/Mechanics/_bucket-brigade/hauler.sw"
   - name: powerplant
     system: true
     dir: east
@@ -52,7 +52,7 @@ robots:
       char: '▒'
       attr: gold
     program: |
-      run "scenarios/Challenges/_bucket-brigade/powerplant.sw"
+      run "scenarios/Challenges/Mechanics/_bucket-brigade/powerplant.sw"
 objectives:
   - id: deliver_coal_lump
     teaser: Get coal to base
@@ -77,7 +77,7 @@ objectives:
       as hauler {has "coal briquette"}
     prerequisite: deliver_coal_lump
 solution: |
-  run "scenarios/Challenges/_bucket-brigade/brigade.sw"
+  run "scenarios/Challenges/Mechanics/_bucket-brigade/brigade.sw"
 entities:
   - name: upper left corner
     display:

diff --git a/data/scenarios/Challenges/chess_horse.yaml → ...ios/Challenges/Mechanics/chess_horse.yaml b/data/scenarios/Challenges/chess_horse.yaml → ...ios/Challenges/Mechanics/chess_horse.yaml
diff --git a/data/scenarios/Challenges/friend.yaml → ...cenarios/Challenges/Mechanics/friend.yaml b/data/scenarios/Challenges/friend.yaml → ...cenarios/Challenges/Mechanics/friend.yaml
@@ -55,7 +55,7 @@ robots:
     devices:
       - logger
     program: |
-      run "scenarios/Challenges/_friend/cat.sw"
+      run "scenarios/Challenges/Mechanics/_friend/cat.sw"
 objectives:
   - goal:
       - There's a cat wandering around in the field.  Bring it back to your base.  If you give it something it likes, perhaps you can get it to follow you.
@@ -65,7 +65,7 @@ objectives:
       baseLoc <- as base {whereami};
       pure (catLoc == baseLoc)
 solution: |
-  run "scenarios/Challenges/_friend/friend-solution.sw"
+  run "scenarios/Challenges/Mechanics/_friend/friend-solution.sw"
 entities:
   - name: fish
     display:

diff --git a/data/scenarios/Challenges/maypole.yaml → ...enarios/Challenges/Mechanics/maypole.yaml b/data/scenarios/Challenges/maypole.yaml → ...enarios/Challenges/Mechanics/maypole.yaml
@@ -54,9 +54,9 @@ robots:
       - [1, maypole 2]
       - [1, maypole 3]
     program: |
-      run "scenarios/Challenges/_maypole/monitor.sw"
+      run "scenarios/Challenges/Mechanics/_maypole/monitor.sw"
 solution: |
-  run "scenarios/Challenges/_maypole/solution.sw"
+  run "scenarios/Challenges/Mechanics/_maypole/solution.sw"
 entities:
   - name: dizzy
     display:

diff --git a/...cenarios/Challenges/pack-tetrominoes.yaml → ...hallenges/Mechanics/pack-tetrominoes.yaml b/...cenarios/Challenges/pack-tetrominoes.yaml → ...hallenges/Mechanics/pack-tetrominoes.yaml
@@ -80,7 +80,7 @@ entities:
       - z-tile
     properties: [known, pickable]
 solution: |
-  run "scenarios/Challenges/_pack-tetrominoes/solution.sw"
+  run "scenarios/Challenges/Mechanics/_pack-tetrominoes/solution.sw"
 structures:
   - name: tee
     recognize: [north, south, east, west]

diff --git a/data/scenarios/Challenges/photocopier.yaml → ...ios/Challenges/Mechanics/photocopier.yaml b/data/scenarios/Challenges/photocopier.yaml → ...ios/Challenges/Mechanics/photocopier.yaml
@@ -18,7 +18,7 @@ objectives:
       judge <- robotNamed "judge";
       as judge { has "gold" }
 solution: |
-  run "scenarios/Challenges/_photocopier/solution.sw"
+  run "scenarios/Challenges/Mechanics/_photocopier/solution.sw"
 robots:
   - name: base
     dir: north
@@ -47,7 +47,7 @@ robots:
     devices:
       - logger
     program: |
-      run "scenarios/Challenges/_photocopier/judge.sw"
+      run "scenarios/Challenges/Mechanics/_photocopier/judge.sw"
 entities:
   - name: pixel (W)
     display:

diff --git a/data/scenarios/Challenges/telephone.yaml → ...arios/Challenges/Mechanics/telephone.yaml b/data/scenarios/Challenges/telephone.yaml → ...arios/Challenges/Mechanics/telephone.yaml
@@ -57,7 +57,7 @@ objectives:
       judge <- robotNamed "judge";
       as judge { has "X" }
 solution: |
-  run "scenarios/Challenges/_telephone/solution.sw"
+  run "scenarios/Challenges/Mechanics/_telephone/solution.sw"
 robots:
   - name: base
     dir: north
@@ -90,7 +90,7 @@ robots:
       char: 'Ξ'
       priority: 8
     program: |
-      run "scenarios/Challenges/_telephone/shuttle.sw"
+      run "scenarios/Challenges/Mechanics/_telephone/shuttle.sw"
   - name: photocopier
     system: true
     dir: east
@@ -101,14 +101,14 @@ robots:
       - [100, 'O']
       - [100, 'X']
     program: |
-      run "scenarios/Challenges/_telephone/photocopier.sw"
+      run "scenarios/Challenges/Mechanics/_telephone/photocopier.sw"
   - name: judge
     system: true
     dir: east
     devices:
       - logger
     program: |
-      run "scenarios/Challenges/_telephone/judge.sw"
+      run "scenarios/Challenges/Mechanics/_telephone/judge.sw"
 attrs:
   - name: greyborder
     fg: '#cccccc'

diff --git a/data/scenarios/Challenges/teleport.yaml → ...narios/Challenges/Mechanics/teleport.yaml b/data/scenarios/Challenges/teleport.yaml → ...narios/Challenges/Mechanics/teleport.yaml
diff --git a/data/scenarios/Challenges/wave.yaml → .../scenarios/Challenges/Mechanics/wave.yaml b/data/scenarios/Challenges/wave.yaml → .../scenarios/Challenges/Mechanics/wave.yaml
@@ -62,7 +62,7 @@ robots:
           end;
       start;
 solution: |
-  run "scenarios/Challenges/_wave/solution.sw"
+  run "scenarios/Challenges/Mechanics/_wave/solution.sw"
 entities: []
 known: [wavy water, water, bitcoin]
 world:

diff --git a/data/scenarios/Challenges/Story/00-ORDER.txt b/data/scenarios/Challenges/Story/00-ORDER.txt
@@ -0,0 +1,9 @@
+arbitrage.yaml
+flower-count.yaml
+ice-cream.yaml
+hackman.yaml
+gopher.yaml
+dna.yaml
+blender.yaml
+bridge-building.yaml
+Ranching
diff --git a/...cenarios/Challenges/Ranching/00-ORDER.txt → ...os/Challenges/Story/Ranching/00-ORDER.txt b/...cenarios/Challenges/Ranching/00-ORDER.txt → ...os/Challenges/Story/Ranching/00-ORDER.txt
diff --git a/...allenges/Ranching/_beekeeping/queenbee.sw → ...es/Story/Ranching/_beekeeping/queenbee.sw b/...allenges/Ranching/_beekeeping/queenbee.sw → ...es/Story/Ranching/_beekeeping/queenbee.sw
diff --git a/...allenges/Ranching/_beekeeping/solution.sw → ...es/Story/Ranching/_beekeeping/solution.sw b/...allenges/Ranching/_beekeeping/solution.sw → ...es/Story/Ranching/_beekeeping/solution.sw
diff --git a/...es/Ranching/_capture/design-commentary.md → ...ry/Ranching/_capture/design-commentary.md b/...es/Ranching/_capture/design-commentary.md → ...ry/Ranching/_capture/design-commentary.md
diff --git a/.../Challenges/Ranching/_capture/opponent.sw → ...enges/Story/Ranching/_capture/opponent.sw b/.../Challenges/Ranching/_capture/opponent.sw → ...enges/Story/Ranching/_capture/opponent.sw
diff --git a/.../Challenges/Ranching/_capture/solution.sw → ...enges/Story/Ranching/_capture/solution.sw b/.../Challenges/Ranching/_capture/solution.sw → ...enges/Story/Ranching/_capture/solution.sw
diff --git a/...os/Challenges/Ranching/_fishing/hauler.sw → ...llenges/Story/Ranching/_fishing/hauler.sw b/...os/Challenges/Ranching/_fishing/hauler.sw → ...llenges/Story/Ranching/_fishing/hauler.sw
diff --git a/...ios/Challenges/Ranching/_fishing/shark.sw → ...allenges/Story/Ranching/_fishing/shark.sw b/...ios/Challenges/Ranching/_fishing/shark.sw → ...allenges/Story/Ranching/_fishing/shark.sw
diff --git a/.../Challenges/Ranching/_fishing/solution.sw → ...enges/Story/Ranching/_fishing/solution.sw b/.../Challenges/Ranching/_fishing/solution.sw → ...enges/Story/Ranching/_fishing/solution.sw
diff --git a/...hing/_gated-paddock/enclosure-checking.sw → ...hing/_gated-paddock/enclosure-checking.sw b/...hing/_gated-paddock/enclosure-checking.sw → ...hing/_gated-paddock/enclosure-checking.sw
diff --git a/...hing/_gated-paddock/fence-construction.sw → ...hing/_gated-paddock/fence-construction.sw b/...hing/_gated-paddock/fence-construction.sw → ...hing/_gated-paddock/fence-construction.sw
diff --git a/...nching/_gated-paddock/meandering-sheep.sw → ...nching/_gated-paddock/meandering-sheep.sw b/...nching/_gated-paddock/meandering-sheep.sw → ...nching/_gated-paddock/meandering-sheep.sw
diff --git a/...anching/_gated-paddock/update-and-test.sh → ...anching/_gated-paddock/update-and-test.sh b/...anching/_gated-paddock/update-and-test.sh → ...anching/_gated-paddock/update-and-test.sh
diff --git a/...os/Challenges/Ranching/_pied-piper/rat.sw → ...llenges/Story/Ranching/_pied-piper/rat.sw b/...os/Challenges/Ranching/_pied-piper/rat.sw → ...llenges/Story/Ranching/_pied-piper/rat.sw
diff --git a/...allenges/Ranching/_pied-piper/solution.sw → ...es/Story/Ranching/_pied-piper/solution.sw b/...allenges/Ranching/_pied-piper/solution.sw → ...es/Story/Ranching/_pied-piper/solution.sw
diff --git a/...os/Challenges/Ranching/_powerset/setup.sw → ...llenges/Story/Ranching/_powerset/setup.sw b/...os/Challenges/Ranching/_powerset/setup.sw → ...llenges/Story/Ranching/_powerset/setup.sw
diff --git a/...Challenges/Ranching/_powerset/solution.sw → ...nges/Story/Ranching/_powerset/solution.sw b/...Challenges/Ranching/_powerset/solution.sw → ...nges/Story/Ranching/_powerset/solution.sw
diff --git a/...arios/Challenges/Ranching/beekeeping.yaml → ...Challenges/Story/Ranching/beekeeping.yaml b/...arios/Challenges/Ranching/beekeeping.yaml → ...Challenges/Story/Ranching/beekeeping.yaml
@@ -120,9 +120,9 @@ robots:
       char: 'Q'
       attr: bee
     program: |
-      run "scenarios/Challenges/Ranching/_beekeeping/queenbee.sw"
+      run "scenarios/Challenges/Story/Ranching/_beekeeping/queenbee.sw"
 solution: |
-  run "scenarios/Challenges/Ranching/_beekeeping/solution.sw"
+  run "scenarios/Challenges/Story/Ranching/_beekeeping/solution.sw"
 structures:
   - name: beehive
     recognize: [north]

diff --git a/...cenarios/Challenges/Ranching/capture.yaml → ...os/Challenges/Story/Ranching/capture.yaml b/...cenarios/Challenges/Ranching/capture.yaml → ...os/Challenges/Story/Ranching/capture.yaml
@@ -120,9 +120,9 @@ robots:
       attr: pig
       invisible: false
     program: |
-      run "scenarios/Challenges/Ranching/_capture/opponent.sw"
+      run "scenarios/Challenges/Story/Ranching/_capture/opponent.sw"
 solution: |
-  run "scenarios/Challenges/Ranching/_capture/solution.sw"
+  run "scenarios/Challenges/Story/Ranching/_capture/solution.sw"
 entities:
   - name: monolith
     display:

diff --git a/...cenarios/Challenges/Ranching/fishing.yaml → ...os/Challenges/Story/Ranching/fishing.yaml b/...cenarios/Challenges/Ranching/fishing.yaml → ...os/Challenges/Story/Ranching/fishing.yaml
@@ -157,7 +157,7 @@ robots:
       char: W
       invisible: false
     program: |
-      run "scenarios/Challenges/Ranching/_fishing/hauler.sw"
+      run "scenarios/Challenges/Story/Ranching/_fishing/hauler.sw"
   - name: shark
     dir: [1, 0]
     system: true
@@ -166,9 +166,9 @@ robots:
       attr: shark
       invisible: false
     program: |
-      run "scenarios/Challenges/Ranching/_fishing/shark.sw"
+      run "scenarios/Challenges/Story/Ranching/_fishing/shark.sw"
 solution: |
-  run "scenarios/Challenges/Ranching/_fishing/solution.sw"
+  run "scenarios/Challenges/Story/Ranching/_fishing/solution.sw"
 structures:
   - name: rubbish enclosure
     recognize: [north, south]