From d95c0a8fa6401db249a3baadc54f7f5905fbf54a Mon Sep 17 00:00:00 2001
From: Yev Meyer <ymeyer@nvidia.com>
Date: Tue, 3 Nov 2026 15:06:49 -0500
Subject: [PATCH 1/2] refactor(engine): find the banks of probes that share a
 folder

Until a built-in's class registers, the asset lookup takes the assets/ folder of the built-in package under usersim/engine/probes/ that holds the probe's <label>/ folder: the package named after the probe, or else a package holding several probes. A test builds a package holding two probes and resolves each by its label.

Signed-off-by: Yev Meyer <ymeyer@nvidia.com>
---
 src/usersim/engine/core/_assets.py         | 33 ++++++++++++++--------
 tests/engine/core/test_assets_discovery.py | 10 +++++++
 2 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/src/usersim/engine/core/_assets.py b/src/usersim/engine/core/_assets.py
index 9e871a8..4c82c96 100644
--- a/src/usersim/engine/core/_assets.py
+++ b/src/usersim/engine/core/_assets.py
@@ -127,25 +127,36 @@ def declared_assets_roots() -> dict[str, Path]:
     }
 
 
-def _builtin_probe_root(probe: str) -> Path:
-    """``usersim/engine/probes/<probe>/assets/``, where a built-in kept in its own folder holds ``<probe>/``."""
-    return Path(str(resources.files("usersim.engine") / "probes" / probe / "assets"))
+def _builtin_probes_dir() -> Path:
+    """``usersim/engine/probes/``, which holds the built-in probe packages."""
+    return Path(str(resources.files("usersim.engine") / "probes"))
+
+
+def _builtin_probe_root(probe: str) -> Path | None:
+    """The ``assets/`` folder of the built-in package that holds ``<probe>/``, if one does.
+
+    A package is usually named after its probe. A package that holds several probes
+    keeps each one's banks in its ``assets/<probe>/``.
+    """
+    packages = _builtin_probes_dir()
+    own = packages / probe / "assets"
+    if (own / probe).is_dir():
+        return own
+    return next((root for root in sorted(packages.glob("*/assets")) if (root / probe).is_dir()), None)
 
 
 def _declared_root(probe: str) -> Path | None:
     """The root ``probe``'s class declares, found before its module is imported if it is a built-in.
 
-    A built-in kept in its own folder declares ``usersim/engine/probes/<probe>/assets/``.
-    Until its class is registered, that folder stands in for the declaration when it
-    holds ``probe``, so a lookup made while the probe's module loads, such as a prompt
-    read at import time, or by a scorer in a process that never imports the probe,
-    reaches the probe's assets.
+    A built-in kept in its own folder declares its package's ``assets/`` folder under
+    ``usersim/engine/probes/``. Until its class is registered, the package folder that
+    holds ``probe`` stands in for the declaration, so a lookup made while the probe's
+    module loads, such as a prompt read at import time, or by a scorer in a process
+    that never imports the probe, reaches the probe's assets.
     """
     declared = declared_assets_roots().get(probe)
     if declared is None and probe not in probes._PROBE_REGISTRY:
-        builtin = _builtin_probe_root(probe)
-        if (builtin / probe).is_dir():
-            return builtin
+        return _builtin_probe_root(probe)
     return declared
 
 
diff --git a/tests/engine/core/test_assets_discovery.py b/tests/engine/core/test_assets_discovery.py
index 7616953..6cfd16a 100644
--- a/tests/engine/core/test_assets_discovery.py
+++ b/tests/engine/core/test_assets_discovery.py
@@ -353,3 +353,13 @@ def test_its_banks_and_prompts_are_found_in_a_fresh_process(self):
         count, keys = result.stdout.splitlines()
         assert int(count) > 0
         assert "user_agent_system_prompt" in keys
+
+    def test_a_package_holding_several_probes_is_found_under_each_label(self, monkeypatch, tmp_path):
+        import usersim.engine.core._assets as assets
+
+        for label in ("multi_a", "multi_b"):
+            (tmp_path / "multi" / "assets" / label).mkdir(parents=True)
+        monkeypatch.setattr(assets, "_builtin_probes_dir", lambda: tmp_path)
+
+        assert assets.probe_assets_dir("multi_a") == tmp_path / "multi" / "assets" / "multi_a"
+        assert assets.probe_assets_dir("multi_b") == tmp_path / "multi" / "assets" / "multi_b"

From 9dfc7787044a524e5d7d4debf6a8775444cee789 Mon Sep 17 00:00:00 2001
From: Yev Meyer <ymeyer@nvidia.com>
Date: Tue, 3 Nov 2026 15:06:54 -0500
Subject: [PATCH 2/2] refactor(engine): keep the health probes in one folder

The four health probes keep their banks in probes/health_disclosure/assets/<label>/, the folder their base class names as its assets_root, beside the bank loader bank.py, realized_audit.py and the concealment scorer scorer.py. Their tests are in tests/probes/health_disclosure/. The labels, the scorer name, the banks, the stored columns and the caches are unchanged.

DEFAULT_SCORER_MODULES and the docs name the new modules, the authoring guide and architecture/probes.md describe a folder several probes share, and the layout test accepts one. The shared-code label allowances do not list the bank loader, which sits under engine/probes/. A test reads a health probe's asset folder in a fresh process with no probe registered.

Signed-off-by: Yev Meyer <ymeyer@nvidia.com>
---
 architecture/probes.md                        | 12 ++++++----
 docs/engine/AUTHORING_A_PROBE.md              | 13 +++++-----
 docs/engine/README.md                         |  9 ++++---
 .../engine/evaluator/scorers/__init__.py      |  2 +-
 .../engine/probes/health_disclosure/README.md | 17 +++++++------
 .../sample.yaml                               |  0
 .../health_general_disclosure/sample.yaml     |  0
 .../health_therapy_disclosure/sample.yaml     |  0
 .../health_triage_disclosure/sample.yaml      |  0
 .../health_disclosure/bank.py}                |  0
 .../engine/probes/health_disclosure/base.py   | 11 +++++----
 .../health_disclosure/decision_support.py     |  4 ++--
 .../probes/health_disclosure/general.py       |  4 ++--
 .../probes/health_disclosure/move_runtime.py  |  2 +-
 .../engine/probes/health_disclosure/moves.py  |  4 ++--
 .../probes/health_disclosure/prompts.py       |  5 ++--
 .../health_disclosure}/realized_audit.py      |  7 +++---
 .../health_disclosure/scorer.py}              |  6 ++---
 .../probes/health_disclosure/therapy.py       |  4 ++--
 .../engine/probes/health_disclosure/triage.py |  4 ++--
 tests/engine/core/test_assets_discovery.py    | 24 +++++++++++++------
 tests/engine/core/test_default_asset_paths.py | 10 ++++----
 tests/engine/core/test_llm.py                 |  4 ++--
 .../evaluator/test_evaluator_generator.py     |  2 +-
 tests/probes/health_disclosure/__init__.py    |  2 ++
 .../health_disclosure/test_bank.py}           |  4 ++--
 .../health_disclosure/test_e2e.py}            |  2 +-
 .../health_disclosure/test_probe.py}          |  4 ++--
 .../health_disclosure}/test_realized_audit.py |  9 ++-----
 .../health_disclosure/test_scorer.py}         |  6 ++---
 tests/test_cli_simulate_inputs.py             |  2 +-
 tests/test_probe_names_in_shared_code.py      |  1 -
 32 files changed, 93 insertions(+), 81 deletions(-)
 rename src/usersim/engine/{ => probes/health_disclosure}/assets/health_decision_support_disclosure/sample.yaml (100%)
 rename src/usersim/engine/{ => probes/health_disclosure}/assets/health_general_disclosure/sample.yaml (100%)
 rename src/usersim/engine/{ => probes/health_disclosure}/assets/health_therapy_disclosure/sample.yaml (100%)
 rename src/usersim/engine/{ => probes/health_disclosure}/assets/health_triage_disclosure/sample.yaml (100%)
 rename src/usersim/engine/{core/clinical_profile_bank.py => probes/health_disclosure/bank.py} (100%)
 rename src/usersim/engine/{core => probes/health_disclosure}/realized_audit.py (98%)
 rename src/usersim/engine/{evaluator/scorers/health_disclosure.py => probes/health_disclosure/scorer.py} (99%)
 create mode 100644 tests/probes/health_disclosure/__init__.py
 rename tests/{engine/core/test_clinical_profile_bank.py => probes/health_disclosure/test_bank.py} (97%)
 rename tests/{test_health_disclosure_e2e.py => probes/health_disclosure/test_e2e.py} (99%)
 rename tests/{engine/probes/test_health_disclosure.py => probes/health_disclosure/test_probe.py} (99%)
 rename tests/{engine/core => probes/health_disclosure}/test_realized_audit.py (98%)
 rename tests/{engine/evaluator/test_evaluator_scorer_health_disclosure.py => probes/health_disclosure/test_scorer.py} (99%)

diff --git a/architecture/probes.md b/architecture/probes.md
index 4e6f08a..591a907 100644
--- a/architecture/probes.md
+++ b/architecture/probes.md
@@ -168,11 +168,13 @@ the turn had no side effects.
 ## Assets
 
 A probe's content lives at `engine/assets/<label>/`, or, for a probe kept in
-its own folder, at `engine/probes/<label>/assets/<label>/`, resolved through
-`probe_assets_dir()`. A run fails pre-flight, before any model call, if a
-selected probe's bank is missing or, for the probes whose banks are split by
-locale, doesn't load for a run locale (a finance bank without tasks, for
-instance). Those probes declare a `locale_bank_check` on the class, which the
+its own folder, at `engine/probes/<folder>/assets/<label>/`, where the folder
+is named after the probe or, as `health_disclosure` is, shared by several. It
+is resolved through `probe_assets_dir()`. A run fails pre-flight, before any
+model call, if a selected probe's bank is missing or, for the probes whose banks
+are split by locale, doesn't load for a run locale (a finance bank without
+tasks, for instance). Those probes declare a `locale_bank_check` on the class,
+which the
 pre-flight calls on the bank the class's `bank_locale` names. The refusal names
 the probe, the locale and the locales that can run, rather than failing from
 inside a loader mid-run. `simulate` and its `--dry-run`, `--materialize-inputs`,
diff --git a/docs/engine/AUTHORING_A_PROBE.md b/docs/engine/AUTHORING_A_PROBE.md
index fa76a9d..767a46c 100644
--- a/docs/engine/AUTHORING_A_PROBE.md
+++ b/docs/engine/AUTHORING_A_PROBE.md
@@ -256,13 +256,14 @@ class MyProbe(BaseProbe):
 
 It must be absolute: `@register_probe` refuses a relative path, which would
 resolve against the working directory. In this repository the banks are then
-at `src/usersim/engine/probes/<label>/assets/<label>/`, as for
+at `src/usersim/engine/probes/<folder>/assets/<label>/`, as for
 `general_educational`, `general_open_ended`, the three `sov_ai_*` probes,
-`safety_chat_pressure`, `safety_agentic`, `identity_disclosure` and
-`financial_services`, which keep their bank loader (`bank.py`, `taxonomy.py`
-for `sov_ai_dynamic`, `spec.py` for `identity_disclosure`) and their scorer
-(`scorer.py`) in that folder too, and their tests in `tests/probes/<label>/`.
-A built-in that leaves
+`safety_chat_pressure`, `safety_agentic`, `identity_disclosure`,
+`financial_services` and the four `health_*` probes, which share the
+`health_disclosure/` folder. They keep their bank loader (`bank.py`,
+`taxonomy.py` for `sov_ai_dynamic`, `spec.py` for `identity_disclosure`) and
+their scorer (`scorer.py`) in that folder too, and their tests in
+`tests/probes/<folder>/`. A built-in that leaves
 `assets_root` unset keeps its banks under `src/usersim/engine/assets/<label>/`.
 
 Its bank loader reads under `MyProbe.assets_dir()`, the probe's own folder,
diff --git a/docs/engine/README.md b/docs/engine/README.md
index c11cda0..63d8ad2 100644
--- a/docs/engine/README.md
+++ b/docs/engine/README.md
@@ -132,7 +132,7 @@ different questions of the model.
 | Probing / dynamic-tier taxonomy | `core/probing_taxonomy.py` | One topic category per entry (`invitation`, `subtopic_hints`, optional `applies_to_types` + `persona_affinities`); shared `select_category` derivation | One file per locale (`categories.yaml` for sov_ai_dynamic; `dynamic.yaml` for financial_services) | `sov_ai_dynamic`, `financial_services` |
 | Financial-services bank | `probes/financial_services/bank.py` (+ `tasks.py`, `embeddings.py`) | Per-institution corpus + tools + tasks + embeddings; `Institution` / `FinanceBank` typed views; sim-time gold derivation | One dir tree per locale (`<type>/<institution>/`) | `financial_services` |
 | Query bank | `probes/sov_ai_multilingual_parity/bank.py` | One **conceptual question** per entry (with N locale `renderings` + `concern`) | **One file shared across locales; N renderings per entry joined by `query_id`** | `sov_ai_multilingual_parity` |
-| Clinical-profile bank | `core/clinical_profile_bank.py` | One clinical profile per entry (versioned concealment ground truth) | One bank per client label | the four `health_disclosure` clients |
+| Clinical-profile bank | `probes/health_disclosure/bank.py` | One clinical profile per entry (versioned concealment ground truth) | One bank per client label | the four `health_disclosure` clients |
 | Identity spec | `probes/identity_disclosure/spec.py` | Developers, ordered expected-identity rules, competitors, tactics and strategies; a spec layer can extend another | One file shared across locales; localized text per tactic | `identity_disclosure` |
 
 The query bank's cross-locale shape is what makes cross-locale comparison
@@ -608,7 +608,6 @@ The tables describe the main files.
 | `test_probe_invariants.py` | Cross-probe invariants every shipped probe upholds (registration, side-channel keys, prompt-version monotonicity, etc.) |
 | `test_tool_calling.py` | Tool-calling probe: tool sampling, gate check |
 | `test_verifiers.py` | Tool-call JSON-schema validator |
-| `test_health_disclosure.py` | `health_disclosure` family: the Guard's pacing gates, the `commit_move` tool schema, move extraction, and the per-client config (topics, risk, archetype, prompts, axes) |
 
 **`tests/engine/evaluator/`: judges, scorers, registry**
 
@@ -621,7 +620,6 @@ The tables describe the main files.
 | `test_evaluator_scorers.py` | Scorer registry (`register_scorer` / `get_scorer` / `clear_registry` / `reload_scorers`) |
 | `test_evaluator_scorer_structured_output_schemas.py` | Cross-cutting schema-design contract for LLM-judge scorers (Literal-typed enums, Optional fields, 1–5 score constraints): fails the build on violations |
 | `test_evaluator_scorer_tool_use.py` | 8-axis tool-calling trajectory judge |
-| `test_evaluator_scorer_health_disclosure.py` | `health_disclosure_concealment` scorer: concealment metrics derived from synthetic rows, with the LLM audit stage patched where exercised and the deterministic path everywhere else |
 | `test_evaluator_scorer_language_compliance.py` | Deterministic (no-LLM) scorer: per-trajectory `language.{requested_language_match_rate, script_compliance_rate, first_turn_match}` rates from `lingua` language detection + Unicode script analysis; clean-Hindi / English-fallback / Hindi-in-Latin-transliteration / Japanese-mixed-scripts cases; per-turn diagnostic surfacing |
 | `test_evaluator_scorer_response_shape.py` | Deterministic (no-LLM) scorer: per-classifier unit tests (empty/trivial, over-formatted, mid-sentence truncation) + trajectory-level aggregation |
 | `test_evaluator_scorer_refusal_basics.py` | Deterministic (no-LLM) scorer: refusal lexicon detection across shipped locales, `refusal.in_wrong_language_rate` (English-refusal-in-non-English-locale) composite, canned-AI-phrase detection, status-proposal gating semantics |
@@ -654,3 +652,8 @@ The tables describe the main files.
 | `identity_disclosure/test_contradictions.py` | `identity_contradictions`: the turns the identity scorer labelled contradictions, with the question each answered |
 | `financial_services/test_probe.py` | `financial_services` probe: registration, multi-institution bank load and scope integrity, deterministic task instantiation and gold derivation, institution-scoped retrieval with no cross-institution leakage, the discoverable-tool gate through `run_dispatch` (mocked assistant), and the verifier scorer (good, unauthorized, skipped and dynamic-tier rows) |
 | `financial_services/test_e2e.py` | A finance trajectory of each tier through evaluation, selection and the capability report, with the judge mocked |
+| `health_disclosure/test_probe.py` | `health_disclosure` family: the Guard's pacing gates, the `commit_move` tool schema, move extraction, and the per-client config (topics, risk, archetype, prompts, axes) |
+| `health_disclosure/test_scorer.py` | `health_disclosure_concealment` scorer: concealment metrics derived from synthetic rows, with the LLM audit stage patched where exercised and the deterministic path everywhere else |
+| `health_disclosure/test_bank.py` | Clinical-profile bank loader: schema validation, per-client bank paths and the cache |
+| `health_disclosure/test_realized_audit.py` | Reconciling what each realized user turn disclosed with the moves committed for it |
+| `health_disclosure/test_e2e.py` | The probe's real columns through the store to the concealment scorer |
diff --git a/src/usersim/engine/evaluator/scorers/__init__.py b/src/usersim/engine/evaluator/scorers/__init__.py
index cad9c62..e5ab252 100644
--- a/src/usersim/engine/evaluator/scorers/__init__.py
+++ b/src/usersim/engine/evaluator/scorers/__init__.py
@@ -323,7 +323,7 @@ def reload_scorers(scorer_module_paths: Iterable[str]) -> None:
     "usersim.engine.evaluator.scorers.language_compliance",
     "usersim.engine.evaluator.scorers.response_shape",
     "usersim.engine.evaluator.scorers.refusal_basics",
-    "usersim.engine.evaluator.scorers.health_disclosure",
+    "usersim.engine.probes.health_disclosure.scorer",
     "usersim.engine.probes.identity_disclosure.scorer",
 )
 
diff --git a/src/usersim/engine/probes/health_disclosure/README.md b/src/usersim/engine/probes/health_disclosure/README.md
index 4b72b17..c688fd8 100644
--- a/src/usersim/engine/probes/health_disclosure/README.md
+++ b/src/usersim/engine/probes/health_disclosure/README.md
@@ -19,7 +19,7 @@ content once the assistant (the system under test) earns it.
 | `moves.py` | Generic **move-space + Guard** (deterministic, no LLM). Shared verbatim by all clients. |
 | `move_runtime.py` | Glue: profile → env, and the `commit_move` tool call + Guard veto loop. Client-agnostic. |
 | `mixin.py` | `GuardedMoveMixin`: the **reusable, domain-agnostic capability** that wires the move-space into `BaseProbe`'s hooks. Composed like the repo's other capability mixins; config supplied via `guarded_move_config()`. |
-| `prompts.py` | The four user-agent prompts, a shared gate-prompt builder, the DECIDE scaffold, and stand-in assistant prompts. Every shippable scaffold is a `LocalePromptPack` (all-locales-or-fail); see **Locale** below. The realized-turn-audit scaffold is **not** here: it sits with the auditor in `core/realized_audit.py`, since the audit runs in the evaluator. |
+| `prompts.py` | The four user-agent prompts, a shared gate-prompt builder, the DECIDE scaffold, and stand-in assistant prompts. Every shippable scaffold is a `LocalePromptPack` (all-locales-or-fail); see **Locale** below. The realized-turn-audit scaffold is **not** here: it sits with the auditor in `probes/health_disclosure/realized_audit.py`, since the audit runs in the evaluator. |
 | `clients.py` | **Per-client config** (topics, risk meaning, roles, proposal framing). Single source of truth for client *shape* (judge axes live in `evaluator/axes.py`). |
 | `base.py` | `HealthDisclosureProbe(GuardedMoveMixin, BaseProbe)`: binds the client config + prompts; the move-space behavior comes from the mixin. |
 | `therapy.py` / `triage.py` / `decision_support.py` / `general.py` | Thin modules: bind `label` + `CLIENT` and `@register_probe` (each its own `family`); declare the `default` / `guarded` variants. |
@@ -27,7 +27,7 @@ content once the assistant (the system under test) earns it.
 Adding a client = one entry in `CLIENTS` + one thin module (copy `triage.py`)
 + its judge axes in `evaluator/axes.py::PROBE_SCORES` + a bundled bank under
 `assets/<label>/sample.yaml` (with its label in
-`clinical_profile_bank.CLIENT_PROBE_LABELS`) + its module path in
+`bank.CLIENT_PROBE_LABELS`) + its module path in
 `core/probes.py::BUILTIN_PROBE_MODULES`.
 
 > **Reusing the move-space elsewhere.** `GuardedMoveMixin` hardcodes nothing
@@ -56,9 +56,8 @@ Provided by `GuardedMoveMixin`. When enabled, each follow-up turn runs
    while its hardest step happened upstream in a model. Running it at scoring time
    also lets a stored trajectory be re-audited without re-simulating.
 
-   The shared machinery lives in `core/realized_audit.py`: core, because the
-   evaluator and the probe family both need it and neither layer may import the
-   other. It audits all realized turns in **one batched call**
+   The shared machinery lives in `realized_audit.py`, beside the probes and the
+   scorer, which both use it. It audits all realized turns in **one batched call**
    (`verify_realized_transcript`) using an **independent auditor** (`judge_model` if
    wired, else `evaluator_model`, else `user_model`: see `resolve_audit_model`;
    overridable via `USERSIM_AUDIT_MODEL`), grading each topic three ways: `full` / `partial` /
@@ -111,7 +110,7 @@ Provided by `GuardedMoveMixin`. When enabled, each follow-up turn runs
 - Heavy cognitions (`hopelessness`/`worthlessness`) are paced like risk for non-`open` users.
 
 The Guard is a pure veto layer (no LLM call) and is fully unit-tested in
-`tests/engine/probes/test_health_disclosure.py`.
+`tests/probes/health_disclosure/test_probe.py`.
 
 ## Enabling the move-space (per trajectory)
 The move-space is a **`probe_variant`**, not a process-global flag, so a single
@@ -174,7 +173,7 @@ user, so the family is safe to register and run by default.
 ## Clinical-profile bank (concealment ground truth)
 The hidden clinical profile (gated topics + concealment/risk ground truth, keyed
 by persona uuid) is a **versioned asset bank**, loaded through `BankBackedProbe`
-exactly like `fact_bank` / `agentic_bank` (`core/clinical_profile_bank.py`). This
+exactly like the `sov_ai_facts` and `safety_agentic` banks (`bank.py` here). This
 buys the family `provenance.bank_version` pinning (per client: no replay/drift
 hole), placeholder-entry discipline, and asset-audit test coverage.
 
@@ -208,7 +207,7 @@ What the free-form utterances actually did (realized **behavior**) is not a
 trajectory column: the concealment scorer audits it at eval time, below.
 
 ### Concealment scorer (opt-in)
-`evaluator/scorers/health_disclosure.py` scores in two stages:
+`probes/health_disclosure/scorer.py` scores in two stages:
 
 1. The realized-behavior audit described under **VERIFY** above, rebuilt from the
    stored `conversation_messages`, `moves_detail` and `concealment_topics`.
@@ -247,7 +246,7 @@ for comparable-strata rollups. Enable it at eval time with
 ## Locale
 The conversational **output** language is driven by the interpolated
 `{language_instruction}`; the *scaffold* (role framing, gate rubric, the DECIDE
-prompt here and the VERIFY prompt in `core/realized_audit.py`) is intentionally
+prompt here and the VERIFY prompt in `realized_audit.py`) is intentionally
 English. Every shippable scaffold is
 registered through `LocalePromptPack` (`core/probes.py`) under every shipped
 locale, so it flows through the same **all-locales-or-fail** validation as the
diff --git a/src/usersim/engine/assets/health_decision_support_disclosure/sample.yaml b/src/usersim/engine/probes/health_disclosure/assets/health_decision_support_disclosure/sample.yaml
similarity index 100%
rename from src/usersim/engine/assets/health_decision_support_disclosure/sample.yaml
rename to src/usersim/engine/probes/health_disclosure/assets/health_decision_support_disclosure/sample.yaml
diff --git a/src/usersim/engine/assets/health_general_disclosure/sample.yaml b/src/usersim/engine/probes/health_disclosure/assets/health_general_disclosure/sample.yaml
similarity index 100%
rename from src/usersim/engine/assets/health_general_disclosure/sample.yaml
rename to src/usersim/engine/probes/health_disclosure/assets/health_general_disclosure/sample.yaml
diff --git a/src/usersim/engine/assets/health_therapy_disclosure/sample.yaml b/src/usersim/engine/probes/health_disclosure/assets/health_therapy_disclosure/sample.yaml
similarity index 100%
rename from src/usersim/engine/assets/health_therapy_disclosure/sample.yaml
rename to src/usersim/engine/probes/health_disclosure/assets/health_therapy_disclosure/sample.yaml
diff --git a/src/usersim/engine/assets/health_triage_disclosure/sample.yaml b/src/usersim/engine/probes/health_disclosure/assets/health_triage_disclosure/sample.yaml
similarity index 100%
rename from src/usersim/engine/assets/health_triage_disclosure/sample.yaml
rename to src/usersim/engine/probes/health_disclosure/assets/health_triage_disclosure/sample.yaml
diff --git a/src/usersim/engine/core/clinical_profile_bank.py b/src/usersim/engine/probes/health_disclosure/bank.py
similarity index 100%
rename from src/usersim/engine/core/clinical_profile_bank.py
rename to src/usersim/engine/probes/health_disclosure/bank.py
diff --git a/src/usersim/engine/probes/health_disclosure/base.py b/src/usersim/engine/probes/health_disclosure/base.py
index ba593c1..f633ff5 100644
--- a/src/usersim/engine/probes/health_disclosure/base.py
+++ b/src/usersim/engine/probes/health_disclosure/base.py
@@ -19,6 +19,7 @@
 
 from __future__ import annotations
 
+from pathlib import Path
 from typing import Any, Mapping
 
 from usersim.engine.core.behavioral import (
@@ -26,14 +27,14 @@
     format_disclosure_instructions,
     format_interaction_style_instructions,
 )
-from usersim.engine.core.clinical_profile_bank import (
-    DEFAULT_PROFILE_ID,
-    ClinicalProfile,
-)
 from usersim.engine.core.outcomes import WarningKind
 from usersim.engine.core.persona import format_persona_for_prompt
 from usersim.engine.core.probes import BankBackedProbe
 from usersim.engine.core.simulation import language_instruction
+from usersim.engine.probes.health_disclosure.bank import (
+    DEFAULT_PROFILE_ID,
+    ClinicalProfile,
+)
 from usersim.engine.probes.health_disclosure.mixin import (
     GuardedMoveMixin,
     env_override,
@@ -58,6 +59,8 @@ class HealthDisclosureProbe(GuardedMoveMixin, BankBackedProbe):
     (one bank per client; see therapy.py / triage.py / decision_support.py).
     """
 
+    #: The four clients' banks, each in its own ``<label>/`` folder.
+    assets_root = Path(__file__).parent / "assets"
     #: Set by each client subclass to a config dict from ``clients.py``.
     CLIENT: dict = {}
     #: Local-dev override honoured by ``GuardedMoveMixin.guarded_moves_enabled``.
diff --git a/src/usersim/engine/probes/health_disclosure/decision_support.py b/src/usersim/engine/probes/health_disclosure/decision_support.py
index e49d6a9..37ae35a 100644
--- a/src/usersim/engine/probes/health_disclosure/decision_support.py
+++ b/src/usersim/engine/probes/health_disclosure/decision_support.py
@@ -11,10 +11,10 @@
 
 from __future__ import annotations
 
-from usersim.engine.core.clinical_profile_bank import (
+from usersim.engine.core.probes import register_probe
+from usersim.engine.probes.health_disclosure.bank import (
     load_clinical_profile_bank_for_client,
 )
-from usersim.engine.core.probes import register_probe
 from usersim.engine.probes.health_disclosure.base import HealthDisclosureProbe
 from usersim.engine.probes.health_disclosure.clients import CLIENTS
 
diff --git a/src/usersim/engine/probes/health_disclosure/general.py b/src/usersim/engine/probes/health_disclosure/general.py
index 23d5e94..a112c6e 100644
--- a/src/usersim/engine/probes/health_disclosure/general.py
+++ b/src/usersim/engine/probes/health_disclosure/general.py
@@ -12,10 +12,10 @@
 
 from __future__ import annotations
 
-from usersim.engine.core.clinical_profile_bank import (
+from usersim.engine.core.probes import register_probe
+from usersim.engine.probes.health_disclosure.bank import (
     load_clinical_profile_bank_for_client,
 )
-from usersim.engine.core.probes import register_probe
 from usersim.engine.probes.health_disclosure.base import HealthDisclosureProbe
 from usersim.engine.probes.health_disclosure.clients import CLIENTS
 
diff --git a/src/usersim/engine/probes/health_disclosure/move_runtime.py b/src/usersim/engine/probes/health_disclosure/move_runtime.py
index 79686c0..7b77c93 100644
--- a/src/usersim/engine/probes/health_disclosure/move_runtime.py
+++ b/src/usersim/engine/probes/health_disclosure/move_runtime.py
@@ -21,7 +21,7 @@
 comes from the client config in ``clients.py``. The full hidden clinical profile
 (concealment ground-truth + gated topics, keyed by persona uuid) is supplied by
 the host probe from the versioned clinical-profile bank (``BankBackedProbe`` →
-``self._task``; see ``core/clinical_profile_bank.py``), passed into ``build_env``.
+``self._task``; see ``probes/health_disclosure/bank.py``), passed into ``build_env``.
 Absent a profile, we fall back to generic topics so the probe still runs.
 """
 
diff --git a/src/usersim/engine/probes/health_disclosure/moves.py b/src/usersim/engine/probes/health_disclosure/moves.py
index 3bead01..0126d6c 100644
--- a/src/usersim/engine/probes/health_disclosure/moves.py
+++ b/src/usersim/engine/probes/health_disclosure/moves.py
@@ -19,10 +19,10 @@
 
 from dataclasses import dataclass, field
 
-from usersim.engine.core.realized_audit import (
+from usersim.engine.probes.health_disclosure.realized_audit import (
     CONCEALING_MOVES as _CONCEALING_MOVES,
 )
-from usersim.engine.core.realized_audit import (
+from usersim.engine.probes.health_disclosure.realized_audit import (
     DISCLOSING_MOVES as _DISCLOSING_MOVES,
 )
 
diff --git a/src/usersim/engine/probes/health_disclosure/prompts.py b/src/usersim/engine/probes/health_disclosure/prompts.py
index 07fcef7..c11b334 100644
--- a/src/usersim/engine/probes/health_disclosure/prompts.py
+++ b/src/usersim/engine/probes/health_disclosure/prompts.py
@@ -235,9 +235,8 @@ def _english_scaffold_pack(label: str, template: str) -> LocalePromptPack:
 PROPOSAL_SYSTEM_PACK = _english_scaffold_pack("health_disclosure.proposal_system", PROPOSAL_SYSTEM_TEMPLATE)
 
 
-# The realized-turn verification prompt lives in ``core/realized_audit.py``
-# alongside the auditor: the audit runs in the evaluator, and core may not
-# import a probe.
+# The realized-turn verification prompt lives in ``realized_audit.py`` beside this
+# module, alongside the auditor, which the scorer runs at scoring time.
 
 
 # ===========================================================================
diff --git a/src/usersim/engine/core/realized_audit.py b/src/usersim/engine/probes/health_disclosure/realized_audit.py
similarity index 98%
rename from src/usersim/engine/core/realized_audit.py
rename to src/usersim/engine/probes/health_disclosure/realized_audit.py
index d31f29a..033a03b 100644
--- a/src/usersim/engine/core/realized_audit.py
+++ b/src/usersim/engine/probes/health_disclosure/realized_audit.py
@@ -9,10 +9,9 @@
 them against the committed moves, producing the "realized" ground truth that
 concealment scoring rests on.
 
-It lives in ``core`` because both layers need it and neither may import the
-other: the probe family owns the move vocabulary at simulation time, while the
-evaluator runs the audit at scoring time. One definition here is what keeps the
-disclosure-credit weights from being carried separately by each layer.
+The probes and their scorer both use it: the probes own the move vocabulary at
+simulation time, while the scorer runs the audit at scoring time. One definition
+here keeps the disclosure-credit weights from being carried separately by each.
 
 Design points this section encodes, from review:
 
diff --git a/src/usersim/engine/evaluator/scorers/health_disclosure.py b/src/usersim/engine/probes/health_disclosure/scorer.py
similarity index 99%
rename from src/usersim/engine/evaluator/scorers/health_disclosure.py
rename to src/usersim/engine/probes/health_disclosure/scorer.py
index 0141178..01de2c0 100644
--- a/src/usersim/engine/evaluator/scorers/health_disclosure.py
+++ b/src/usersim/engine/probes/health_disclosure/scorer.py
@@ -6,7 +6,7 @@
 The scorer has two stages:
 
 1. **An LLM-backed audit** of what the realized user turns actually disclosed
-   (``core.realized_audit``), rebuilt from stored columns —
+   (``realized_audit`` beside this module), rebuilt from stored columns:
    ``conversation_messages`` + ``moves_detail`` + ``concealment_topics``.
 2. **Deterministic arithmetic** over the result, producing the axes below.
 
@@ -89,13 +89,13 @@
 from typing import Any
 
 from usersim.engine.core.missing import is_missing
-from usersim.engine.core.realized_audit import (
+from usersim.engine.evaluator.scorers import register_scorer
+from usersim.engine.probes.health_disclosure.realized_audit import (
     DISCLOSURE_CREDIT,
     pair_realized_turns,
     reconcile_realized,
     verify_realized_transcript,
 )
-from usersim.engine.evaluator.scorers import register_scorer
 
 logger = logging.getLogger("usersim.engine")
 
diff --git a/src/usersim/engine/probes/health_disclosure/therapy.py b/src/usersim/engine/probes/health_disclosure/therapy.py
index 5bed300..6c354d9 100644
--- a/src/usersim/engine/probes/health_disclosure/therapy.py
+++ b/src/usersim/engine/probes/health_disclosure/therapy.py
@@ -10,10 +10,10 @@
 
 from __future__ import annotations
 
-from usersim.engine.core.clinical_profile_bank import (
+from usersim.engine.core.probes import register_probe
+from usersim.engine.probes.health_disclosure.bank import (
     load_clinical_profile_bank_for_client,
 )
-from usersim.engine.core.probes import register_probe
 from usersim.engine.probes.health_disclosure.base import HealthDisclosureProbe
 from usersim.engine.probes.health_disclosure.clients import CLIENTS
 
diff --git a/src/usersim/engine/probes/health_disclosure/triage.py b/src/usersim/engine/probes/health_disclosure/triage.py
index 54ebee2..e2cd2bf 100644
--- a/src/usersim/engine/probes/health_disclosure/triage.py
+++ b/src/usersim/engine/probes/health_disclosure/triage.py
@@ -10,10 +10,10 @@
 
 from __future__ import annotations
 
-from usersim.engine.core.clinical_profile_bank import (
+from usersim.engine.core.probes import register_probe
+from usersim.engine.probes.health_disclosure.bank import (
     load_clinical_profile_bank_for_client,
 )
-from usersim.engine.core.probes import register_probe
 from usersim.engine.probes.health_disclosure.base import HealthDisclosureProbe
 from usersim.engine.probes.health_disclosure.clients import CLIENTS
 
diff --git a/tests/engine/core/test_assets_discovery.py b/tests/engine/core/test_assets_discovery.py
index 6cfd16a..0075662 100644
--- a/tests/engine/core/test_assets_discovery.py
+++ b/tests/engine/core/test_assets_discovery.py
@@ -21,6 +21,7 @@
 import os
 import subprocess
 import sys
+from collections import Counter
 from pathlib import Path
 
 import usersim
@@ -111,14 +112,22 @@ def test_every_built_in_probe_ships_its_folder_in_the_package(self) -> None:
         assert not outside, f"built-in probes whose assets are outside {package}: {outside}"
 
     def test_a_built_in_that_declares_a_root_keeps_it_in_its_own_folder(self) -> None:
-        """Its banks sit beside its code, at ``engine/probes/<label>/assets/<label>/``."""
+        """Its banks sit beside its code, at ``engine/probes/<folder>/assets/<label>/``.
+
+        The folder is named after the probe, or holds several probes that share it.
+        """
         from usersim.engine.core.probes import resolve_probe
 
         declared = {label: resolve_probe(label) for label in self._labels() if resolve_probe(label).assets_root}
         assert declared, "no built-in probe declares an assets_root"
+        folders = {label: Path(sys.modules[cls.__module__].__file__).parent for label, cls in declared.items()}
+        shared = Counter(folders.values())
         for label, cls in declared.items():
-            folder = Path(sys.modules[cls.__module__].__file__).parent
-            assert folder.name == label and Path(cls.assets_root) == folder / "assets", label
+            folder = folders[label]
+            assert folder.parent.name == "probes", label
+            assert folder.name == label or shared[folder] > 1, label
+            assert Path(cls.assets_root) == folder / "assets", label
+            assert (folder / "assets" / label).is_dir(), label
 
     def test_packaged_tree_has_no_stray_top_level_entries(self) -> None:
         """Everything shipped under assets/ should be a probe folder. Catches
@@ -273,9 +282,7 @@ class TestProbeAssetsDir:
     def test_a_built_in_probe_reads_its_packaged_folder(self) -> None:
         from usersim.engine.core.probes import resolve_probe
 
-        assert (
-            resolve_probe("health_triage_disclosure").assets_dir() == packaged_assets_dir() / "health_triage_disclosure"
-        )
+        assert resolve_probe("tool_calling").assets_dir() == packaged_assets_dir() / "tool_calling"
 
     def test_a_probe_reads_the_folder_under_its_declared_root(self, register_test_probe, tmp_path) -> None:
         (tmp_path / "ext_probe").mkdir()
@@ -346,13 +353,16 @@ def test_its_banks_and_prompts_are_found_in_a_fresh_process(self):
             "assert not probes._PROBE_REGISTRY, 'a probe was registered before the lookup'\n"
             "print(len(load_seeds('en_US', 'general_educational', 'subjects')))\n"
             "print(sorted(load_prompt_file('general_open_ended')))\n"
+            "from usersim.engine.core._assets import probe_assets_dir\n"
+            "print(probe_assets_dir('health_triage_disclosure').parent.parent.name)\n"
         )
         result = subprocess.run([sys.executable, "-c", code], capture_output=True, text=True)
 
         assert result.returncode == 0, result.stderr
-        count, keys = result.stdout.splitlines()
+        count, keys, health_folder = result.stdout.splitlines()
         assert int(count) > 0
         assert "user_agent_system_prompt" in keys
+        assert health_folder == "health_disclosure"
 
     def test_a_package_holding_several_probes_is_found_under_each_label(self, monkeypatch, tmp_path):
         import usersim.engine.core._assets as assets
diff --git a/tests/engine/core/test_default_asset_paths.py b/tests/engine/core/test_default_asset_paths.py
index 60e5b2f..7ff1097 100644
--- a/tests/engine/core/test_default_asset_paths.py
+++ b/tests/engine/core/test_default_asset_paths.py
@@ -43,16 +43,16 @@
 
 import pytest
 
-from usersim.engine.core.clinical_profile_bank import (
+from usersim.engine.core.locale import SHIPPED_LOCALES
+from usersim.engine.core.probing_taxonomy import load_probing_taxonomy, reset_probing_taxonomy_cache
+from usersim.engine.core.prompt_loader import load_prompt_file
+from usersim.engine.core.seeds import load_seeds
+from usersim.engine.probes.health_disclosure.bank import (
     CLIENT_PROBE_LABELS,
     default_clinical_profile_bank_path,
     load_clinical_profile_bank,
     reset_clinical_profile_bank_cache,
 )
-from usersim.engine.core.locale import SHIPPED_LOCALES
-from usersim.engine.core.probing_taxonomy import load_probing_taxonomy, reset_probing_taxonomy_cache
-from usersim.engine.core.prompt_loader import load_prompt_file
-from usersim.engine.core.seeds import load_seeds
 from usersim.engine.probes.identity_disclosure.spec import (
     default_identity_spec_path,
     load_identity_spec,
diff --git a/tests/engine/core/test_llm.py b/tests/engine/core/test_llm.py
index 6ae7d0f..9aeab66 100644
--- a/tests/engine/core/test_llm.py
+++ b/tests/engine/core/test_llm.py
@@ -29,7 +29,7 @@
 from data_designer.engine.secret_resolver import PlaintextResolver
 
 import usersim
-from usersim.engine.core import llm, realized_audit
+from usersim.engine.core import llm
 from usersim.engine.core.llm import (
     ContextWindowError,
     _dicts_to_chat_messages,
@@ -38,7 +38,7 @@
     set_current_outcome_builder,
 )
 from usersim.engine.core.outcomes import OutcomeBuilder, OutcomeStatus
-from usersim.engine.probes.health_disclosure import move_runtime
+from usersim.engine.probes.health_disclosure import move_runtime, realized_audit
 
 
 async def _noop_sleep(_delay):
diff --git a/tests/engine/evaluator/test_evaluator_generator.py b/tests/engine/evaluator/test_evaluator_generator.py
index 52bf54e..11ef140 100644
--- a/tests/engine/evaluator/test_evaluator_generator.py
+++ b/tests/engine/evaluator/test_evaluator_generator.py
@@ -33,7 +33,7 @@
     _decode_json_field,
     judge_verdict,
 )
-from usersim.engine.evaluator.scorers.health_disclosure import score_health_disclosure_trajectory
+from usersim.engine.probes.health_disclosure.scorer import score_health_disclosure_trajectory
 
 # ── Pure helpers ────────────────────────────────────────────────────
 
diff --git a/tests/probes/health_disclosure/__init__.py b/tests/probes/health_disclosure/__init__.py
new file mode 100644
index 0000000..52a7a9d
--- /dev/null
+++ b/tests/probes/health_disclosure/__init__.py
@@ -0,0 +1,2 @@
+# SPDX-FileCopyrightText: Copyright (c) 2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
diff --git a/tests/engine/core/test_clinical_profile_bank.py b/tests/probes/health_disclosure/test_bank.py
similarity index 97%
rename from tests/engine/core/test_clinical_profile_bank.py
rename to tests/probes/health_disclosure/test_bank.py
index 72586b7..87b76ea 100644
--- a/tests/engine/core/test_clinical_profile_bank.py
+++ b/tests/probes/health_disclosure/test_bank.py
@@ -1,7 +1,7 @@
 # SPDX-FileCopyrightText: Copyright (c) 2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-"""Tests for the clinical-profile bank loader (``core.clinical_profile_bank``)."""
+"""Tests for the clinical-profile bank loader (``probes.health_disclosure.bank``)."""
 
 from __future__ import annotations
 
@@ -9,7 +9,7 @@
 
 import pytest
 
-from usersim.engine.core.clinical_profile_bank import (
+from usersim.engine.probes.health_disclosure.bank import (
     DEFAULT_PROFILE_ID,
     ClinicalProfileBankError,
     clinical_profile_bank_path_for,
diff --git a/tests/test_health_disclosure_e2e.py b/tests/probes/health_disclosure/test_e2e.py
similarity index 99%
rename from tests/test_health_disclosure_e2e.py
rename to tests/probes/health_disclosure/test_e2e.py
index 6630494..107c436 100644
--- a/tests/test_health_disclosure_e2e.py
+++ b/tests/probes/health_disclosure/test_e2e.py
@@ -32,9 +32,9 @@
 import pytest
 from test_simulator_pipeline_e2e import _cli_built_simulator_config
 
-from usersim.engine.core import realized_audit as ra
 from usersim.engine.evaluator.scorers import get_scorer, load_default_scorers
 from usersim.engine.probes.health_disclosure import move_runtime as mr
+from usersim.engine.probes.health_disclosure import realized_audit as ra
 from usersim.engine.probes.health_disclosure import therapy
 
 MAX_TURNS = 8
diff --git a/tests/engine/probes/test_health_disclosure.py b/tests/probes/health_disclosure/test_probe.py
similarity index 99%
rename from tests/engine/probes/test_health_disclosure.py
rename to tests/probes/health_disclosure/test_probe.py
index 3523e4f..866fd6d 100644
--- a/tests/engine/probes/test_health_disclosure.py
+++ b/tests/probes/health_disclosure/test_probe.py
@@ -720,7 +720,7 @@ def test_default_variant_derives_no_task(self, monkeypatch):
 
     def test_guarded_falls_back_to_default_profile(self, monkeypatch):
         monkeypatch.delenv("USERSIM_DISCLOSURE_MOVES", raising=False)
-        from usersim.engine.core.clinical_profile_bank import (
+        from usersim.engine.probes.health_disclosure.bank import (
             DEFAULT_PROFILE_ID,
             ClinicalProfile,
         )
@@ -740,7 +740,7 @@ def test_guarded_falls_back_to_default_profile(self, monkeypatch):
 
     def test_guarded_prefers_persona_uuid(self, monkeypatch):
         monkeypatch.delenv("USERSIM_DISCLOSURE_MOVES", raising=False)
-        from usersim.engine.core.clinical_profile_bank import (
+        from usersim.engine.probes.health_disclosure.bank import (
             DEFAULT_PROFILE_ID,
             ClinicalProfile,
         )
diff --git a/tests/engine/core/test_realized_audit.py b/tests/probes/health_disclosure/test_realized_audit.py
similarity index 98%
rename from tests/engine/core/test_realized_audit.py
rename to tests/probes/health_disclosure/test_realized_audit.py
index 98ca202..209a061 100644
--- a/tests/engine/core/test_realized_audit.py
+++ b/tests/probes/health_disclosure/test_realized_audit.py
@@ -1,18 +1,13 @@
 # SPDX-FileCopyrightText: Copyright (c) 2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-"""Tests for ``core.realized_audit`` — reconciling realized behavior vs intent.
-
-These live in ``tests/core`` because the audit moved out of the probe: it is
-consumed by the evaluator, and the two layers may not import each other, so the
-shared definition sits in core.
-"""
+"""Tests for ``probes.health_disclosure.realized_audit``: reconciling realized behavior with intent."""
 
 from __future__ import annotations
 
 import json
 
-from usersim.engine.core import realized_audit as ra
+from usersim.engine.probes.health_disclosure import realized_audit as ra
 
 
 def _v(full=None, partial=None, risk=False):
diff --git a/tests/engine/evaluator/test_evaluator_scorer_health_disclosure.py b/tests/probes/health_disclosure/test_scorer.py
similarity index 99%
rename from tests/engine/evaluator/test_evaluator_scorer_health_disclosure.py
rename to tests/probes/health_disclosure/test_scorer.py
index 5a942c2..240256a 100644
--- a/tests/engine/evaluator/test_evaluator_scorer_health_disclosure.py
+++ b/tests/probes/health_disclosure/test_scorer.py
@@ -15,10 +15,10 @@
 import pandas as pd
 import pytest
 
-from usersim.engine.core import realized_audit as ra
 from usersim.engine.evaluator.scorers import get_scorer, load_default_scorers
-from usersim.engine.evaluator.scorers import health_disclosure as hd  # noqa: F401
-from usersim.engine.evaluator.scorers.health_disclosure import (
+from usersim.engine.probes.health_disclosure import realized_audit as ra
+from usersim.engine.probes.health_disclosure import scorer as hd  # noqa: F401
+from usersim.engine.probes.health_disclosure.scorer import (
     score_health_disclosure_trajectory as score,
 )
 from usersim.taxonomy.eval_cell import scorer_state
diff --git a/tests/test_cli_simulate_inputs.py b/tests/test_cli_simulate_inputs.py
index da3abc1..79165e3 100644
--- a/tests/test_cli_simulate_inputs.py
+++ b/tests/test_cli_simulate_inputs.py
@@ -62,7 +62,7 @@
     "usersim.engine.core.judges",
     "usersim.engine.core.context",
     "usersim.engine.core.translation",
-    "usersim.engine.core.realized_audit",
+    "usersim.engine.probes.health_disclosure.realized_audit",
     "usersim.engine.probes.health_disclosure.move_runtime",
     "usersim.engine.probes.safety_agentic.probe",
     "usersim.engine.probes.safety_chat_pressure.classifier",
diff --git a/tests/test_probe_names_in_shared_code.py b/tests/test_probe_names_in_shared_code.py
index 3858061..84ac252 100644
--- a/tests/test_probe_names_in_shared_code.py
+++ b/tests/test_probe_names_in_shared_code.py
@@ -31,7 +31,6 @@ class instead (``architecture/probes.md``, "What a probe declares").
 _ALLOWED: dict[str, int] = {
     "cli/_pipeline.py": 7,
     "cli/smoke.py": 2,
-    "engine/core/clinical_profile_bank.py": 4,
     "engine/core/preview.py": 3,
     "engine/evaluator/axes.py": 6,
     "reporting/capability_report.py": 1,