diff --git a/frontend/packages/swarm-ui/src/App.tsx b/frontend/packages/swarm-ui/src/App.tsx
index 8255a61c..99380be6 100644
--- a/frontend/packages/swarm-ui/src/App.tsx
+++ b/frontend/packages/swarm-ui/src/App.tsx
@@ -2,7 +2,7 @@
 // page component under `./pages/`; this file just maps paths to them.
 import { Route, Switch } from "wouter-preact";
 import { Shell } from "./shell/Shell.js";
-import { AgentsPage } from "./pages/AgentsPage.js";
+import { AgentsPage } from "./pages/agents/AgentsPage.js";
 import { ComponentsPage } from "./pages/ComponentsPage.js";
 import { JobsPage } from "./pages/JobsPage.js";
 import { HivesPage } from "./pages/HivesPage.js";
diff --git a/frontend/packages/swarm-ui/src/pages/AgentCard.css b/frontend/packages/swarm-ui/src/pages/agents/AgentCard.css
similarity index 100%
rename from frontend/packages/swarm-ui/src/pages/AgentCard.css
rename to frontend/packages/swarm-ui/src/pages/agents/AgentCard.css
diff --git a/frontend/packages/swarm-ui/src/pages/AgentCard.tsx b/frontend/packages/swarm-ui/src/pages/agents/AgentCard.tsx
similarity index 96%
rename from frontend/packages/swarm-ui/src/pages/AgentCard.tsx
rename to frontend/packages/swarm-ui/src/pages/agents/AgentCard.tsx
index fcf04a0c..e1ea8803 100644
--- a/frontend/packages/swarm-ui/src/pages/AgentCard.tsx
+++ b/frontend/packages/swarm-ui/src/pages/agents/AgentCard.tsx
@@ -14,8 +14,8 @@
 // `onClick` and opening the detail panel.
 import { Badge } from "@hive/shared/badge.js";
 import type { ProblemDetails } from "@hive/shared/api-error.js";
-import { Card } from "../ui/card/Card.js";
-import { RelativeTime } from "../ui/relative-time/RelativeTime.js";
+import { Card } from "../../ui/card/Card.js";
+import { RelativeTime } from "../../ui/relative-time/RelativeTime.js";
 import { FRESHNESS, type AgentRow } from "./AgentTypes.js";
 import { WantedMenu } from "./WantedMenu.js";
 import "./AgentCard.css";
diff --git a/frontend/packages/swarm-ui/src/pages/AgentTypes.ts b/frontend/packages/swarm-ui/src/pages/agents/AgentTypes.ts
similarity index 100%
rename from frontend/packages/swarm-ui/src/pages/AgentTypes.ts
rename to frontend/packages/swarm-ui/src/pages/agents/AgentTypes.ts
diff --git a/frontend/packages/swarm-ui/src/pages/AgentsPage.css b/frontend/packages/swarm-ui/src/pages/agents/AgentsPage.css
similarity index 100%
rename from frontend/packages/swarm-ui/src/pages/AgentsPage.css
rename to frontend/packages/swarm-ui/src/pages/agents/AgentsPage.css
diff --git a/frontend/packages/swarm-ui/src/pages/AgentsPage.tsx b/frontend/packages/swarm-ui/src/pages/agents/AgentsPage.tsx
similarity index 97%
rename from frontend/packages/swarm-ui/src/pages/AgentsPage.tsx
rename to frontend/packages/swarm-ui/src/pages/agents/AgentsPage.tsx
index ef8dbf8c..6ed2fb62 100644
--- a/frontend/packages/swarm-ui/src/pages/AgentsPage.tsx
+++ b/frontend/packages/swarm-ui/src/pages/agents/AgentsPage.tsx
@@ -32,21 +32,21 @@ import { Badge } from "@hive/shared/badge.js";
 import { LinkIcon } from "@hive/shared/icons.js";
 import { AgentCard } from "./AgentCard.js";
 import { FRESHNESS, type AgentRow } from "./AgentTypes.js";
-import { Button } from "../ui/button/Button.js";
-import { ConfirmDialog } from "../ui/confirm-dialog/ConfirmDialog.js";
-import { Dialog } from "../ui/dialog/Dialog.js";
-import { FilterableView } from "../ui/filterable-view/FilterableView.js";
-import { Panel } from "../ui/panel/Panel.js";
-import { RelativeTime } from "../ui/relative-time/RelativeTime.js";
+import { Button } from "../../ui/button/Button.js";
+import { ConfirmDialog } from "../../ui/confirm-dialog/ConfirmDialog.js";
+import { Dialog } from "../../ui/dialog/Dialog.js";
+import { FilterableView } from "../../ui/filterable-view/FilterableView.js";
+import { Panel } from "../../ui/panel/Panel.js";
+import { RelativeTime } from "../../ui/relative-time/RelativeTime.js";
 import {
   RefreshIntervalPicker,
   useRefreshInterval,
   type RefreshIntervalMs,
-} from "../ui/refresh-interval/RefreshInterval.js";
-import { SplitView } from "../ui/split-view/SplitView.js";
-import { type TableColumn } from "../ui/table/Table.js";
-import { CreateAgentForm } from "./CreateAgentForm.js";
-import { LinkMatrixAccountForm } from "./LinkMatrixAccountForm.js";
+} from "../../ui/refresh-interval/RefreshInterval.js";
+import { SplitView } from "../../ui/split-view/SplitView.js";
+import { type TableColumn } from "../../ui/table/Table.js";
+import { CreateAgentForm } from "../CreateAgentForm.js";
+import { LinkMatrixAccountForm } from "../LinkMatrixAccountForm.js";
 import { WantedMenu } from "./WantedMenu.js";
 import "./AgentsPage.css";
 
diff --git a/frontend/packages/swarm-ui/src/pages/WantedMenu.tsx b/frontend/packages/swarm-ui/src/pages/agents/WantedMenu.tsx
similarity index 100%
rename from frontend/packages/swarm-ui/src/pages/WantedMenu.tsx
rename to frontend/packages/swarm-ui/src/pages/agents/WantedMenu.tsx