diff --git a/Extract.lean b/Extract.lean
index bad932f..8cd905d 100644
--- a/Extract.lean
+++ b/Extract.lean
@@ -8,10 +8,12 @@ def main : (args : List String) → IO UInt32
   | [mod, outFile] => do
     try
       initSearchPath (← findSysroot)
-      let env ← importModules #[{module := mod.toName, runtimeOnly := false}] {}
+      let modName := mod.toName
+      let env ← importModules #[{module := modName, runtimeOnly := false}] {}
       let modExamples := highlighted.getState env
-      let exJson := Json.mkObj <| modExamples.toList.map (fun p => {p with fst := p.fst.toString (escape := false)})
-      IO.println s!"Processed {modExamples.size} examples"
+      let useful := relevant modName modExamples
+      let exJson := Json.mkObj useful
+      IO.println s!"Processed {useful.length} examples for module '{modName}'"
       if let some p := (outFile : System.FilePath).parent then
         IO.FS.createDirAll p
       IO.FS.writeFile outFile (toString exJson ++ "\n")
@@ -22,3 +24,6 @@ def main : (args : List String) → IO UInt32
   | other => do
     IO.eprintln s!"Didn't understand args: {other}"
     pure 1
+where
+  relevant (mod : Name) (examples : NameMap (NameMap Json)) : List (String × Json) :=
+    examples.find? mod |>.getD {} |>.toList |>.map fun p => {p with fst := p.fst.toString (escape := false)}
diff --git a/Tests.lean b/Tests.lean
index c1daddd..8dfc057 100644
--- a/Tests.lean
+++ b/Tests.lean
@@ -15,14 +15,4 @@ def main : IO UInt32 := do
   IO.println "Checking that the test project generates at least some deserializable JSON"
   let examples ← loadExamples "demo"
   assert "Examples are non-empty" fun () => !examples.isEmpty
-  let _exs : List (List (String × Example)) ← examples.toList.mapM fun (n, ex) => do
-    let mut out := []
-    match ex.getObj? with
-    | .error err => throw <| IO.userError <| s!"Expected object for {n}: " ++ err
-    | .ok val =>
-      for ⟨k, v⟩ in val.toArray do
-        match Lean.FromJson.fromJson? v with
-        | .error err => throw <| IO.userError <| s!"Failed to deserialize {n}: " ++ err
-        | .ok val => out := (k, val) :: out
-      pure out
   pure 0
diff --git a/src/examples/Subverso/Examples.lean b/src/examples/Subverso/Examples.lean
index 1d38f85..c153b6e 100644
--- a/src/examples/Subverso/Examples.lean
+++ b/src/examples/Subverso/Examples.lean
@@ -68,28 +68,30 @@ elab_rules : command
       | throwErrorAt allCommands.back "Failed to get source position"
     let text ← getFileMap
     let str := text.source.extract leading.startPos trailing.stopPos
-    modifyEnv fun ρ => highlighted.addEntry ρ (name.getId, {highlighted := hl, original := str, start := text.toPosition startPos, stop := text.toPosition stopPos, messages := freshMsgs})
-    for (name, term) in termExamples do
+    let mod ← getMainModule
+    modifyEnv fun ρ => highlighted.addEntry ρ (mod, name.getId, {highlighted := hl, original := str, start := text.toPosition startPos, stop := text.toPosition stopPos, messages := freshMsgs})
+    for (tmName, term) in termExamples do
       let hl ← liftTermElabM (highlight term newMessages.toList.toArray trees)
       let .original leading startPos _ _ := term.getHeadInfo
         | throwErrorAt term "Failed to get source position"
       let .original _ _ trailing stopPos := term.getTailInfo
         | throwErrorAt term "Failed to get source position"
       let str := text.source.extract leading.startPos trailing.stopPos
-      modifyEnv fun ρ => highlighted.addEntry ρ (name, {highlighted := #[hl], original := str, start := text.toPosition startPos, stop := text.toPosition stopPos, messages := freshMsgs})
+      modifyEnv fun ρ => highlighted.addEntry ρ (mod, name.getId ++ tmName, {highlighted := #[hl], original := str, start := text.toPosition startPos, stop := text.toPosition stopPos, messages := freshMsgs})
 
 scoped syntax "%dump" ident : command
 
 elab_rules : command
   | `(%dump%$kw $name:ident) => do
-    let st := highlighted.getState (← getEnv)
+    let mod ← getMainModule
+    let st := highlighted.getState (← getEnv) |>.find? mod |>.getD {}
     if let some json := st.find? name.getId then
       logInfoAt kw m!"{toString json}"
     else
       throwErrorAt name "No highlighting found for '{name}'"
 
 open System in
-partial def loadExamples (leanProject : FilePath) : IO (NameMap Json) := do
+partial def loadExamples (leanProject : FilePath) : IO (NameMap (NameMap Example)) := do
   -- Validate that the path is really a Lean project
   let lakefile := leanProject / "lakefile.lean"
   if !(← lakefile.pathExists) then
@@ -110,23 +112,28 @@ partial def loadExamples (leanProject : FilePath) : IO (NameMap Json) := do
 where
   decorateOut (name : String) (out : String) : String :=
     if out.isEmpty then "" else s!"\n{name}:\n{out}\n"
-  collectExamples (name : Name) (dir : FilePath) : IO (NameMap Json) := do
+  collectExamples (modName : Name) (dir : FilePath) : IO (NameMap (NameMap Example)) := do
     let contents ← dir.readDir
     let mut out := {}
     for f in contents do
       match (← f.path.metadata).type with
       | .dir =>
-        let sub ← collectExamples (.str name f.fileName) f.path
-        out := out.mergeBy (fun _ _ j2 => j2) sub
+        let sub ← collectExamples (.str modName f.fileName) f.path
+        out := out.mergeBy (fun _ j1 j2 => j1.mergeBy (fun _ _ x => x) j2) sub
       | .file =>
         if f.path.extension == some "json" then
           if let some mod := f.path.fileStem then
-            let name' : Name := .str name mod
+            let name' : Name := .str modName mod
             let contents := Json.parse (← IO.FS.readFile f.path)
             match contents with
             | .error err => throw <| .userError s!"Couldn't parse {f.path} as JSON: {err}"
             | .ok val =>
-              out := out.insert name' val
+              let .ok o := val.getObj?
+                | throw <| IO.userError "Expected JSON object in '{f.path}'"
+              for ⟨exName, exJson⟩ in o.toArray do
+                match FromJson.fromJson? (α := Example) exJson with
+                | .error err => throw <| IO.userError s!"Couldn't deserialized example: {err}"
+                | .ok ex => out := out.insert name' (out.find? name' |>.getD {} |>.insert exName.toName ex)
       | _ => pure ()
     return out
 
@@ -144,5 +151,5 @@ def xyz (n : Nat) := 1 + %ex{test2}{3 + n}
 -- %end
 
 -- %dump test
-%dump test2
+%dump test3.test2
 %dump test3
diff --git a/src/examples/Subverso/Examples/Env.lean b/src/examples/Subverso/Examples/Env.lean
index fda414f..3db33c6 100644
--- a/src/examples/Subverso/Examples/Env.lean
+++ b/src/examples/Subverso/Examples/Env.lean
@@ -40,15 +40,17 @@ structure Example where
   stop : Lean.Position
 deriving ToJson, FromJson
 
-initialize highlighted : PersistentEnvExtension (NameMap Json) (Name × Example) (NameMap Json) ←
+initialize highlighted : PersistentEnvExtension (NameMap (NameMap Json)) (Name × Name × Example) (NameMap (NameMap Json)) ←
   registerPersistentEnvExtension {
     mkInitial := pure {}
     addImportedFn := fun imported => do
       let mut s := {}
       for imp in imported do
         for found in imp do
-          s := s.mergeBy (fun _ _ json => json) found
+          s := s.mergeBy (fun _ exs1 exs2 => exs1.mergeBy (fun _ _ v => v) exs2) found
       pure s
-    addEntryFn := fun s (n, val) => s.insert n (toJson val)
+    addEntryFn := fun s (mod, ex, val) =>
+      let forMod := s.find? mod |>.getD .empty
+      s.insert mod (forMod.insert ex (toJson val))
     exportEntriesFn := fun s => #[s]
   }