diff --git a/WORK-RECORDS.md b/WORK-RECORDS.md
index b3731c9..e1374af 100644
--- a/WORK-RECORDS.md
+++ b/WORK-RECORDS.md
@@ -20,7 +20,7 @@
 | workplan | REUSE-WP-0010 | finished | — | workplans/REUSE-WP-0010-network-federation.md |
 | workplan | REUSE-WP-0016 | finished | — | workplans/REUSE-WP-0016-interactive-registry-maintain.md |
 | workplan | REUSE-WP-0020 | finished | — | workplans/REUSE-WP-0020-coulombcore-retirement-cutover.md |
-| workplan | REUSE-WP-0021 | active | — | workplans/REUSE-WP-0021-commerce-canon-source-rename.md |
+| workplan | REUSE-WP-0021 | finished | — | workplans/REUSE-WP-0021-commerce-canon-source-rename.md |
 | workplan | REUSE-WP-0022 | finished | — | workplans/REUSE-WP-0022-hosted-plan-check.md |
 | task | REUSE-WP-0001-T01 | done | — | workplans/REUSE-WP-0001-statehub-bootstrap.md |
 | task | REUSE-WP-0001-T02 | done | — | workplans/REUSE-WP-0001-statehub-bootstrap.md |
@@ -82,6 +82,6 @@
 | task | REUSE-WP-0020-T08 | done | — | workplans/REUSE-WP-0020-coulombcore-retirement-cutover.md |
 | task | REUSE-WP-0020-T09 | done | — | workplans/REUSE-WP-0020-coulombcore-retirement-cutover.md |
 | task | REUSE-WP-0021-T01 | done | — | workplans/REUSE-WP-0021-commerce-canon-source-rename.md |
-| task | REUSE-WP-0021-T02 | wait | — | workplans/REUSE-WP-0021-commerce-canon-source-rename.md |
+| task | REUSE-WP-0021-T02 | done | — | workplans/REUSE-WP-0021-commerce-canon-source-rename.md |
 | task | REUSE-WP-0022-T01 | done | — | workplans/REUSE-WP-0022-hosted-plan-check.md |
 | task | REUSE-WP-0022-T02 | done | — | workplans/REUSE-WP-0022-hosted-plan-check.md |
diff --git a/workplans/REUSE-WP-0001-statehub-bootstrap.md b/workplans/archived/260615-REUSE-WP-0001-statehub-bootstrap.md
similarity index 100%
rename from workplans/REUSE-WP-0001-statehub-bootstrap.md
rename to workplans/archived/260615-REUSE-WP-0001-statehub-bootstrap.md
diff --git a/workplans/REUSE-WP-0002-mvp-registry-foundation.md b/workplans/archived/260615-REUSE-WP-0002-mvp-registry-foundation.md
similarity index 100%
rename from workplans/REUSE-WP-0002-mvp-registry-foundation.md
rename to workplans/archived/260615-REUSE-WP-0002-mvp-registry-foundation.md
diff --git a/workplans/REUSE-WP-0003-intent-scope-gap-closure.md b/workplans/archived/260615-REUSE-WP-0003-intent-scope-gap-closure.md
similarity index 100%
rename from workplans/REUSE-WP-0003-intent-scope-gap-closure.md
rename to workplans/archived/260615-REUSE-WP-0003-intent-scope-gap-closure.md
diff --git a/workplans/REUSE-WP-0004-registry-hardening.md b/workplans/archived/260615-REUSE-WP-0004-registry-hardening.md
similarity index 100%
rename from workplans/REUSE-WP-0004-registry-hardening.md
rename to workplans/archived/260615-REUSE-WP-0004-registry-hardening.md
diff --git a/workplans/REUSE-WP-0005-registry-federation.md b/workplans/archived/260615-REUSE-WP-0005-registry-federation.md
similarity index 100%
rename from workplans/REUSE-WP-0005-registry-federation.md
rename to workplans/archived/260615-REUSE-WP-0005-registry-federation.md
diff --git a/workplans/REUSE-WP-0006-registry-hygiene-and-coverage.md b/workplans/archived/260615-REUSE-WP-0006-registry-hygiene-and-coverage.md
similarity index 100%
rename from workplans/REUSE-WP-0006-registry-hygiene-and-coverage.md
rename to workplans/archived/260615-REUSE-WP-0006-registry-hygiene-and-coverage.md
diff --git a/workplans/REUSE-WP-0007-interactive-catalog.md b/workplans/archived/260615-REUSE-WP-0007-interactive-catalog.md
similarity index 100%
rename from workplans/REUSE-WP-0007-interactive-catalog.md
rename to workplans/archived/260615-REUSE-WP-0007-interactive-catalog.md
diff --git a/workplans/REUSE-WP-0008-graph-explorer.md b/workplans/archived/260615-REUSE-WP-0008-graph-explorer.md
similarity index 100%
rename from workplans/REUSE-WP-0008-graph-explorer.md
rename to workplans/archived/260615-REUSE-WP-0008-graph-explorer.md
diff --git a/workplans/REUSE-WP-0009-cli-hardening.md b/workplans/archived/260615-REUSE-WP-0009-cli-hardening.md
similarity index 100%
rename from workplans/REUSE-WP-0009-cli-hardening.md
rename to workplans/archived/260615-REUSE-WP-0009-cli-hardening.md
diff --git a/workplans/REUSE-WP-0010-network-federation.md b/workplans/archived/260615-REUSE-WP-0010-network-federation.md
similarity index 100%
rename from workplans/REUSE-WP-0010-network-federation.md
rename to workplans/archived/260615-REUSE-WP-0010-network-federation.md
diff --git a/workplans/REUSE-WP-0016-interactive-registry-maintain.md b/workplans/archived/260617-REUSE-WP-0016-interactive-registry-maintain.md
similarity index 100%
rename from workplans/REUSE-WP-0016-interactive-registry-maintain.md
rename to workplans/archived/260617-REUSE-WP-0016-interactive-registry-maintain.md
diff --git a/workplans/REUSE-WP-0020-coulombcore-retirement-cutover.md b/workplans/archived/260821-REUSE-WP-0020-coulombcore-retirement-cutover.md
similarity index 100%
rename from workplans/REUSE-WP-0020-coulombcore-retirement-cutover.md
rename to workplans/archived/260821-REUSE-WP-0020-coulombcore-retirement-cutover.md
diff --git a/workplans/REUSE-WP-0022-hosted-plan-check.md b/workplans/archived/260908-REUSE-WP-0022-hosted-plan-check.md
similarity index 100%
rename from workplans/REUSE-WP-0022-hosted-plan-check.md
rename to workplans/archived/260908-REUSE-WP-0022-hosted-plan-check.md
diff --git a/workplans/REUSE-WP-0021-commerce-canon-source-rename.md b/workplans/archived/260920-REUSE-WP-0021-commerce-canon-source-rename.md
similarity index 100%
rename from workplans/REUSE-WP-0021-commerce-canon-source-rename.md
rename to workplans/archived/260920-REUSE-WP-0021-commerce-canon-source-rename.md