diff --git a/frontend/README.md b/frontend/README.md
index 5564ab0a..a9c027fe 100644
--- a/frontend/README.md
+++ b/frontend/README.md
@@ -17,7 +17,7 @@ npm run build          # builds every workspace into packages/*/dist/
 
 The Rust binaries serve `packages/dashboard/dist/` and
 `packages/agent/dist/` via `tower_http::ServeDir` at runtime; the
-build derivation is wired up in `nix/modules/frontend.nix`. Per-agent
+build derivation is wired up in `nix/packages/frontend.nix`. Per-agent
 additions are layered on top of the default agent dist via the
 `hyperhive.frontend.extraFiles` option in `agent.nix`.
 
diff --git a/hive-agent-mcp/src/mcp/mod.rs b/hive-agent-mcp/src/mcp/mod.rs
index 4ccbc384..46decbe0 100644
--- a/hive-agent-mcp/src/mcp/mod.rs
+++ b/hive-agent-mcp/src/mcp/mod.rs
@@ -45,11 +45,11 @@ use render::{
 /// harness runs as the agent user and has write access to `state/`, whereas
 /// hive-c0re's `hive-core` user does not after the privsep migration).
 ///
-/// Mirrors the validation in `hive-c0re::limits::check_status_text` so
+/// Mirrors the validation in `hive-c0re::agent_config::limits::check_status_text` so
 /// the file is never written with text the server would later reject (which
 /// would leave a stale invalid entry on disk).
 fn write_status_file(text: &str) -> Result<(), String> {
-    // 200 chars mirrors STATUS_MAX_CHARS in hive-c0re/src/limits.rs.
+    // 200 chars mirrors STATUS_MAX_CHARS in hive-c0re/src/agent_config/limits.rs.
     // Keep in sync if that constant changes.
     const STATUS_MAX_CHARS: usize = 200;
     let trimmed = text.trim();
diff --git a/hive-c0re/src/agent_config/limits.rs b/hive-c0re/src/agent_config/limits.rs
index 955d1074..279a3050 100644
--- a/hive-c0re/src/agent_config/limits.rs
+++ b/hive-c0re/src/agent_config/limits.rs
@@ -48,7 +48,7 @@ pub fn check_size(label: &str, body: &str) -> Result<(), String> {
 /// payload. Cap at 200 chars to fit the chip plus a little
 /// descriptive padding without forcing the operator to read a
 /// scrolling chunk.
-/// NOTE: `hive-agent/src/mcp.rs::write_status_file` mirrors this constant
+/// NOTE: `hive-agent-mcp/src/mcp/mod.rs::write_status_file` mirrors this constant
 /// client-side so invalid text is caught before the file is written.
 /// Keep in sync if this value changes.
 pub const STATUS_MAX_CHARS: usize = 200;
diff --git a/hive-c0re/src/forge/mod.rs b/hive-c0re/src/forge/mod.rs
index dd6458ae..dfcec6c9 100644
--- a/hive-c0re/src/forge/mod.rs
+++ b/hive-c0re/src/forge/mod.rs
@@ -115,7 +115,7 @@ const SHARED_DOCS_REPO: &str = "docs";
 /// The hive-wide knowledge repo inside `SHARED_ORG`. Public — agents
 /// can fork it and open PRs without explicit collaborator grants.
 /// Bind-mounted read-only into every container at `/knowledge`.
-/// See `hive-c0re/src/knowledge.rs`.
+/// See `hive-c0re/src/workers/knowledge.rs`.
 const KNOWLEDGE_REPO: &str = crate::knowledge::REPO;
 /// Forgejo org that owns agent-created repos. Agents can't create
 /// repos with their own token (`max_repo_creation = 0`); instead hive-c0re
diff --git a/nix/agent-modules/network.nix b/nix/agent-modules/network.nix
index b5fec1a1..e51909e0 100644
--- a/nix/agent-modules/network.nix
+++ b/nix/agent-modules/network.nix
@@ -19,7 +19,7 @@
   # the hyperhive-isolated-dns oneshot owns resolv.conf. (Same "take
   # resolvconf out of the loop" approach the matrix container uses.)
   # All agent containers receive their bridge IP via DHCP from the hive
-  # dnsmasq pool (see nix/host-modules/hive-gateway.nix). useDHCP runs dhcpcd
+  # dnsmasq pool (see nix/host-modules/hive-gateway/dnsmasq.nix). useDHCP runs dhcpcd
   # on every interface (just eth0 in practice — the nspawn bridge veth).
   config = {
     networking.useDHCP = true;
diff --git a/nix/host-modules/hive-c0re/options.nix b/nix/host-modules/hive-c0re/options.nix
index 0994a649..8d672d46 100644
--- a/nix/host-modules/hive-c0re/options.nix
+++ b/nix/host-modules/hive-c0re/options.nix
@@ -279,7 +279,7 @@
       # 4.x, Sonnet 4.x, Haiku 4.5); cache_write is the 1-hour cache-TTL
       # price (the default through the Claude subscription the agents run
       # on). Keep in sync with `builtin_prices` in
-      # hive-c0re/src/hive_stats.rs.
+      # hive-c0re/src/stats/hive_stats.rs.
       default = {
         opus = {
           input = 5.0;
diff --git a/nix/packages/default.nix b/nix/packages/default.nix
index 25b8a848..9f673613 100644
--- a/nix/packages/default.nix
+++ b/nix/packages/default.nix
@@ -247,7 +247,7 @@ in
   # so operators can `nix build .#agent-base-toplevel` (or wire
   # them into their host system closure via the
   # `preBuildAgentTemplates` option on the hive-c0re module —
-  # see nix/host-modules/hive-c0re.nix). Speeds up the first agent
+  # see nix/host-modules/hive-c0re/options.nix). Speeds up the first agent
   # spawn dramatically because the heavy lifting (nixpkgs +
   # claude-code + hive-agent binary) is already in the store
   # when the meta evaluator goes to build the container.