From 56056b46149d3d891852010a082d9e84f3b5983a Mon Sep 17 00:00:00 2001
From: Yev Meyer <ymeyer@nvidia.com>
Date: Tue, 3 Nov 2026 14:32:25 -0500
Subject: [PATCH 1/3] feat(extension): export the model helpers an asset domain
 uses

usersim.extension exports to_model_configs, to_data_designer_kwargs and require_aliases, which turn the models an asset domain's generate and evaluate receive into Data Designer model configs and provider arguments, and check that the models declare the aliases the domain needs. The reference lists them, importing them leaves Data Designer and the conversation loop unloaded, and the financial_services generator imports them from usersim.extension.

Signed-off-by: Yev Meyer <ymeyer@nvidia.com>
---
 docs/extension_api.md                                |  3 +++
 src/usersim/asset_gen/financial_services/evaluate.py |  4 ++--
 src/usersim/asset_gen/financial_services/pipeline.py | 10 +++++-----
 src/usersim/extension.py                             |  5 +++++
 tests/test_extension_api.py                          |  1 +
 5 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/docs/extension_api.md b/docs/extension_api.md
index 385407ea..9bee91f8 100644
--- a/docs/extension_api.md
+++ b/docs/extension_api.md
@@ -121,6 +121,9 @@ does not load the conversation loop.
 | `CapabilityDefinition` | A row of the capability report and the evidence it is scored from |
 | `EvidenceSource` | One probe, scorer and set of axes a capability reads |
 | `AssetDomain` | A domain `usersim gen-assets` can build banks for |
+| `to_model_configs` | The Data Designer model configs for the models an asset domain receives |
+| `to_data_designer_kwargs` | The `DataDesigner` keyword arguments for those models' providers |
+| `require_aliases` | Raises a configuration error naming the aliases a domain needs that the models lack |
 | `ExecutionBackend` | Somewhere a run can be submitted, for `--backend` |
 | `JobSpec` | What to run, independent of where |
 | `JobHandle` | A backend's reference to work it accepted |
diff --git a/src/usersim/asset_gen/financial_services/evaluate.py b/src/usersim/asset_gen/financial_services/evaluate.py
index ba0a4785..f577ed52 100644
--- a/src/usersim/asset_gen/financial_services/evaluate.py
+++ b/src/usersim/asset_gen/financial_services/evaluate.py
@@ -257,7 +257,7 @@ def _num(v: Any) -> float | None:
 
 
 def validate_eval_models(models: Any) -> None:
-    from usersim.cli._models import require_aliases
+    from usersim.extension import require_aliases
 
     require_aliases(models, required=(EVAL_JUDGE_MODEL_ALIAS,), context="evaluate-assets --domain financial_services")
 
@@ -309,7 +309,7 @@ def evaluate_bank(
     import data_designer.config as dd
 
     from usersim.asset_gen.financial_services.pipeline import _make_engine
-    from usersim.cli._models import to_model_configs
+    from usersim.extension import to_model_configs
 
     seed = build_eval_seed(bank_dir, region_spec)
     if seed.empty:
diff --git a/src/usersim/asset_gen/financial_services/pipeline.py b/src/usersim/asset_gen/financial_services/pipeline.py
index c9e73b16..efcea108 100644
--- a/src/usersim/asset_gen/financial_services/pipeline.py
+++ b/src/usersim/asset_gen/financial_services/pipeline.py
@@ -669,7 +669,7 @@ def build_brief_config(models: Any, inst_seed) -> Any:
     """Assemble the Phase-1 (engine, builder). One place, explicit add_column."""
     import data_designer.config as dd
 
-    from usersim.cli._models import to_model_configs
+    from usersim.extension import to_model_configs
 
     engine = _make_engine(models)
     builder = dd.DataDesignerConfigBuilder(model_configs=to_model_configs(models))
@@ -873,7 +873,7 @@ def build_docset_config(models: Any, cluster_seed) -> Any:
     """Assemble the Phase-2 (engine, builder). One place, explicit add_column."""
     import data_designer.config as dd
 
-    from usersim.cli._models import to_model_configs
+    from usersim.extension import to_model_configs
 
     engine = _make_engine(models)
     builder = dd.DataDesignerConfigBuilder(model_configs=to_model_configs(models))
@@ -1122,7 +1122,7 @@ def serialize_bank(
 
 def validate_generation_models(models: Any) -> None:
     """Fail fast if the doc-gen / judge / embedding aliases aren't configured."""
-    from usersim.cli._models import require_aliases
+    from usersim.extension import require_aliases
 
     require_aliases(
         models,
@@ -1136,7 +1136,7 @@ def _make_engine(models: Any) -> Any:
     import data_designer.config as dd
     from data_designer.interface import DataDesigner
 
-    from usersim.cli._models import to_data_designer_kwargs
+    from usersim.extension import to_data_designer_kwargs
 
     engine = DataDesigner(**to_data_designer_kwargs(models))
     engine.set_run_config(dd.RunConfig(jinja_rendering_engine=dd.JinjaRenderingEngine.NATIVE))
@@ -1514,7 +1514,7 @@ def _embed_documents(
         return
     edf = pd.DataFrame(rows)
 
-    from usersim.cli._models import to_model_configs
+    from usersim.extension import to_model_configs
 
     result = None
     for attempt in range(1, max_attempts + 1):
diff --git a/src/usersim/extension.py b/src/usersim/extension.py
index d823c318..38c0812a 100644
--- a/src/usersim/extension.py
+++ b/src/usersim/extension.py
@@ -23,6 +23,7 @@
 
 if TYPE_CHECKING:
     from usersim.asset_gen.registry import AssetDomain
+    from usersim.cli._models import require_aliases, to_data_designer_kwargs, to_model_configs
     from usersim.engine.config import MODEL_ASSISTANT, MODEL_JUDGE, MODEL_USER, ConversationSimulatorConfig
     from usersim.engine.core.backends import ExecutionBackend, JobHandle, JobSpec, JobStatus
     from usersim.engine.core.behavioral import (
@@ -146,11 +147,15 @@
     "JobHandle",
     "JobSpec",
     "JobStatus",
+    "require_aliases",
+    "to_data_designer_kwargs",
+    "to_model_configs",
 ]
 
 #: The module each public name is defined in, by module.
 _EXPORTS: dict[str, tuple[str, ...]] = {
     "usersim.asset_gen.registry": ("AssetDomain",),
+    "usersim.cli._models": ("require_aliases", "to_data_designer_kwargs", "to_model_configs"),
     "usersim.engine.config": ("MODEL_ASSISTANT", "MODEL_JUDGE", "MODEL_USER", "ConversationSimulatorConfig"),
     "usersim.engine.core.backends": ("ExecutionBackend", "JobHandle", "JobSpec", "JobStatus"),
     "usersim.engine.core.behavioral": (
diff --git a/tests/test_extension_api.py b/tests/test_extension_api.py
index 077ede88..c67404fb 100644
--- a/tests/test_extension_api.py
+++ b/tests/test_extension_api.py
@@ -127,6 +127,7 @@ def test_an_asset_domain_or_backend_import_leaves_the_conversation_loop_unloaded
     code = (
         "import sys\n"
         "from usersim.extension import AssetDomain, CapabilityDefinition, ExecutionBackend, JobSpec\n"
+        "from usersim.extension import require_aliases, to_data_designer_kwargs, to_model_configs\n"
         "print(sorted(m for m in ('usersim.engine.core.simulation', 'data_designer') if m in sys.modules))\n"
     )
     result = subprocess.run([sys.executable, "-c", code], capture_output=True, text=True)

From 880bc150863a4316827018eac2ec916e91f13d56 Mon Sep 17 00:00:00 2001
From: Yev Meyer <ymeyer@nvidia.com>
Date: Tue, 3 Nov 2026 14:32:40 -0500
Subject: [PATCH 2/3] refactor(engine): keep financial_services in one folder

The probe module is probes/financial_services/probe.py, beside its bank loader bank.py, its task builder tasks.py, its query embedder embeddings.py, its scorer scorer.py and its banks in assets/financial_services/, the folder the class names as its assets_root. Its tests are in tests/probes/financial_services/. The label, the scorer name, the banks, the stored columns and the caches are unchanged.

gen-assets, validate-assets and evaluate-assets default to the shipped bank of the domain's probe, so they write and read the probe's own folder, and the package-data exclusions and ignore rules for generated embeddings and scorecards follow the banks. DEFAULT_SCORER_MODULES, the capability source references, the docs and the asset notebook name the new modules and paths, the authoring guide lists the probe among those kept in one folder, the architecture overview describes the engine folders as they are, and the shared-code label allowances list neither the bank loader nor the scorer.

Signed-off-by: Yev Meyer <ymeyer@nvidia.com>
---
 .gitignore                                    |  6 +-
 architecture/overview.md                      |  9 +--
 docs/engine/AUTHORING_A_PROBE.md              |  9 +--
 docs/engine/README.md                         |  7 +-
 pyproject.toml                                |  6 +-
 .../asset_gen/financial_services/pipeline.py  |  6 +-
 .../asset_gen/financial_services/validate.py  |  6 +-
 .../asset_gen/notebooks/finance_assets.ipynb  |  8 +--
 src/usersim/cli/evaluate_assets.py            |  4 +-
 src/usersim/cli/gen_assets.py                 |  4 +-
 src/usersim/cli/validate_assets.py            |  4 +-
 src/usersim/engine/core/probes.py             |  2 +-
 .../engine/evaluator/scorers/__init__.py      |  2 +-
 .../probes/financial_services/README.md       | 12 ++--
 .../assets/financial_services/SCHEMA.md       |  4 +-
 .../de_DE/_generation_report.json             |  0
 .../bank/bausparkasse_heimstatt/corpus.yaml   |  0
 .../institution_meta.yaml                     |  0
 .../bank/bausparkasse_heimstatt/tasks.yaml    |  0
 .../bank/bausparkasse_heimstatt/tools.yaml    |  0
 .../bank/sparkasse_lindenhain/corpus.yaml     |  0
 .../institution_meta.yaml                     |  0
 .../bank/sparkasse_lindenhain/tasks.yaml      |  0
 .../bank/sparkasse_lindenhain/tools.yaml      |  0
 .../brokerage/kranich_invest/corpus.yaml      |  0
 .../kranich_invest/institution_meta.yaml      |  0
 .../de_DE/brokerage/kranich_invest/tasks.yaml |  0
 .../de_DE/brokerage/kranich_invest/tools.yaml |  0
 .../financial_services/de_DE/dynamic.yaml     |  0
 .../hanseatica_versicherung/corpus.yaml       |  0
 .../institution_meta.yaml                     |  0
 .../hanseatica_versicherung/tasks.yaml        |  0
 .../hanseatica_versicherung/tools.yaml        |  0
 .../neobank/kompass_direktbank/corpus.yaml    |  0
 .../kompass_direktbank/institution_meta.yaml  |  0
 .../neobank/kompass_direktbank/tasks.yaml     |  0
 .../neobank/kompass_direktbank/tools.yaml     |  0
 .../financial_services/de_DE/region_meta.yaml |  0
 .../en_GB/_generation_report.json             |  0
 .../fernbridge_building_society/corpus.yaml   |  0
 .../institution_meta.yaml                     |  0
 .../fernbridge_building_society/tasks.yaml    |  0
 .../fernbridge_building_society/tools.yaml    |  0
 .../en_GB/bank/wrenfield_bank/corpus.yaml     |  0
 .../bank/wrenfield_bank/institution_meta.yaml |  0
 .../en_GB/bank/wrenfield_bank/tasks.yaml      |  0
 .../en_GB/bank/wrenfield_bank/tools.yaml      |  0
 .../brokerage/copperleaf_invest/corpus.yaml   |  0
 .../copperleaf_invest/institution_meta.yaml   |  0
 .../brokerage/copperleaf_invest/tasks.yaml    |  0
 .../brokerage/copperleaf_invest/tools.yaml    |  0
 .../financial_services/en_GB/dynamic.yaml     |  0
 .../insurer/kingsmere_insurance/corpus.yaml   |  0
 .../kingsmere_insurance/institution_meta.yaml |  0
 .../insurer/kingsmere_insurance/tasks.yaml    |  0
 .../insurer/kingsmere_insurance/tools.yaml    |  0
 .../en_GB/neobank/quill/corpus.yaml           |  0
 .../en_GB/neobank/quill/institution_meta.yaml |  0
 .../en_GB/neobank/quill/tasks.yaml            |  0
 .../en_GB/neobank/quill/tools.yaml            |  0
 .../financial_services/en_GB/region_meta.yaml |  0
 .../oakhaven_pensions/corpus.yaml             |  0
 .../oakhaven_pensions/institution_meta.yaml   |  0
 .../oakhaven_pensions/tasks.yaml              |  0
 .../oakhaven_pensions/tools.yaml              |  0
 .../en_IN/_generation_report.json             |  0
 .../en_IN/bank/chandrika_bank/corpus.yaml     |  0
 .../bank/chandrika_bank/institution_meta.yaml |  0
 .../en_IN/bank/chandrika_bank/tasks.yaml      |  0
 .../en_IN/bank/chandrika_bank/tools.yaml      |  0
 .../en_IN/brokerage/tarang_invest/corpus.yaml |  0
 .../tarang_invest/institution_meta.yaml       |  0
 .../en_IN/brokerage/tarang_invest/tasks.yaml  |  0
 .../en_IN/brokerage/tarang_invest/tools.yaml  |  0
 .../financial_services/en_IN/dynamic.yaml     |  0
 .../insurer/abhaya_insurance/corpus.yaml      |  0
 .../abhaya_insurance/institution_meta.yaml    |  0
 .../en_IN/insurer/abhaya_insurance/tasks.yaml |  0
 .../en_IN/insurer/abhaya_insurance/tools.yaml |  0
 .../en_IN/nbfc/kalash_finserv/corpus.yaml     |  0
 .../nbfc/kalash_finserv/institution_meta.yaml |  0
 .../en_IN/nbfc/kalash_finserv/tasks.yaml      |  0
 .../en_IN/nbfc/kalash_finserv/tools.yaml      |  0
 .../en_IN/neobank/paysetu/corpus.yaml         |  0
 .../neobank/paysetu/institution_meta.yaml     |  0
 .../en_IN/neobank/paysetu/tasks.yaml          |  0
 .../en_IN/neobank/paysetu/tools.yaml          |  0
 .../financial_services/en_IN/region_meta.yaml |  0
 .../en_US/_generation_report.json             |  0
 .../en_US/bank/northwind_bank/corpus.yaml     |  0
 .../bank/northwind_bank/institution_meta.yaml |  0
 .../en_US/bank/northwind_bank/tasks.yaml      |  0
 .../en_US/bank/northwind_bank/tools.yaml      |  0
 .../brokerage/solstice_invest/corpus.yaml     |  0
 .../solstice_invest/institution_meta.yaml     |  0
 .../brokerage/solstice_invest/tasks.yaml      |  0
 .../brokerage/solstice_invest/tools.yaml      |  0
 .../financial_services/en_US/dynamic.yaml     |  0
 .../financial_services/en_US/region_meta.yaml |  0
 .../evergreen_retirement/corpus.yaml          |  0
 .../institution_meta.yaml                     |  0
 .../evergreen_retirement/tasks.yaml           |  0
 .../evergreen_retirement/tools.yaml           |  0
 .../meridian_wealth/corpus.yaml               |  0
 .../meridian_wealth/institution_meta.yaml     |  0
 .../wealth_manager/meridian_wealth/tasks.yaml |  0
 .../wealth_manager/meridian_wealth/tools.yaml |  0
 .../fr_FR/_generation_report.json             |  0
 .../fr_FR/bank/credit_mirabelle/corpus.yaml   |  0
 .../credit_mirabelle/institution_meta.yaml    |  0
 .../fr_FR/bank/credit_mirabelle/tasks.yaml    |  0
 .../fr_FR/bank/credit_mirabelle/tools.yaml    |  0
 .../brokerage/valbreuil_bourse/corpus.yaml    |  0
 .../valbreuil_bourse/institution_meta.yaml    |  0
 .../brokerage/valbreuil_bourse/tasks.yaml     |  0
 .../brokerage/valbreuil_bourse/tools.yaml     |  0
 .../financial_services/fr_FR/dynamic.yaml     |  0
 .../insurer/egide_assurances/corpus.yaml      |  0
 .../egide_assurances/institution_meta.yaml    |  0
 .../fr_FR/insurer/egide_assurances/tasks.yaml |  0
 .../fr_FR/insurer/egide_assurances/tools.yaml |  0
 .../fr_FR/nbfc/ondine_credit/corpus.yaml      |  0
 .../nbfc/ondine_credit/institution_meta.yaml  |  0
 .../fr_FR/nbfc/ondine_credit/tasks.yaml       |  0
 .../fr_FR/nbfc/ondine_credit/tools.yaml       |  0
 .../fr_FR/neobank/kiosque/corpus.yaml         |  0
 .../neobank/kiosque/institution_meta.yaml     |  0
 .../fr_FR/neobank/kiosque/tasks.yaml          |  0
 .../fr_FR/neobank/kiosque/tools.yaml          |  0
 .../financial_services/fr_FR/region_meta.yaml |  0
 .../hi_Deva_IN/_generation_report.json        |  0
 .../bank/chandrika_bank/corpus.yaml           |  0
 .../bank/chandrika_bank/institution_meta.yaml |  0
 .../hi_Deva_IN/bank/chandrika_bank/tools.yaml |  0
 .../brokerage/tarang_invest/corpus.yaml       |  0
 .../tarang_invest/institution_meta.yaml       |  0
 .../brokerage/tarang_invest/tools.yaml        |  0
 .../insurer/abhaya_insurance/corpus.yaml      |  0
 .../abhaya_insurance/institution_meta.yaml    |  0
 .../insurer/abhaya_insurance/tools.yaml       |  0
 .../nbfc/kalash_finserv/corpus.yaml           |  0
 .../nbfc/kalash_finserv/institution_meta.yaml |  0
 .../hi_Deva_IN/nbfc/kalash_finserv/tools.yaml |  0
 .../hi_Deva_IN/neobank/paysetu/corpus.yaml    |  0
 .../neobank/paysetu/institution_meta.yaml     |  0
 .../hi_Deva_IN/neobank/paysetu/tools.yaml     |  0
 .../hi_Deva_IN/region_meta.yaml               |  0
 .../ja_JP/_generation_report.json             |  0
 .../ja_JP/bank/asanagi_bank/corpus.yaml       |  0
 .../bank/asanagi_bank/institution_meta.yaml   |  0
 .../ja_JP/bank/asanagi_bank/tasks.yaml        |  0
 .../ja_JP/bank/asanagi_bank/tools.yaml        |  0
 .../brokerage/hoshimi_securities/corpus.yaml  |  0
 .../hoshimi_securities/institution_meta.yaml  |  0
 .../brokerage/hoshimi_securities/tasks.yaml   |  0
 .../brokerage/hoshimi_securities/tools.yaml   |  0
 .../financial_services/ja_JP/dynamic.yaml     |  0
 .../ja_JP/insurer/komorebi_life/corpus.yaml   |  0
 .../komorebi_life/institution_meta.yaml       |  0
 .../ja_JP/insurer/komorebi_life/tasks.yaml    |  0
 .../ja_JP/insurer/komorebi_life/tools.yaml    |  0
 .../ja_JP/nbfc/tsumugi_card/corpus.yaml       |  0
 .../nbfc/tsumugi_card/institution_meta.yaml   |  0
 .../ja_JP/nbfc/tsumugi_card/tasks.yaml        |  0
 .../ja_JP/nbfc/tsumugi_card/tools.yaml        |  0
 .../ja_JP/neobank/sorairo_bank/corpus.yaml    |  0
 .../sorairo_bank/institution_meta.yaml        |  0
 .../ja_JP/neobank/sorairo_bank/tasks.yaml     |  0
 .../ja_JP/neobank/sorairo_bank/tools.yaml     |  0
 .../financial_services/ja_JP/region_meta.yaml |  0
 .../ko_KR/_generation_report.json             |  0
 .../ko_KR/bank/yunseul_bank/corpus.yaml       |  0
 .../bank/yunseul_bank/institution_meta.yaml   |  0
 .../ko_KR/bank/yunseul_bank/tasks.yaml        |  0
 .../ko_KR/bank/yunseul_bank/tools.yaml        |  0
 .../brokerage/garam_securities/corpus.yaml    |  0
 .../garam_securities/institution_meta.yaml    |  0
 .../brokerage/garam_securities/tasks.yaml     |  0
 .../brokerage/garam_securities/tools.yaml     |  0
 .../financial_services/ko_KR/dynamic.yaml     |  0
 .../ko_KR/insurer/dodam_life/corpus.yaml      |  0
 .../insurer/dodam_life/institution_meta.yaml  |  0
 .../ko_KR/insurer/dodam_life/tasks.yaml       |  0
 .../ko_KR/insurer/dodam_life/tools.yaml       |  0
 .../ko_KR/nbfc/yeoul_card/corpus.yaml         |  0
 .../nbfc/yeoul_card/institution_meta.yaml     |  0
 .../ko_KR/nbfc/yeoul_card/tasks.yaml          |  0
 .../ko_KR/nbfc/yeoul_card/tools.yaml          |  0
 .../ko_KR/neobank/mirinae_bank/corpus.yaml    |  0
 .../mirinae_bank/institution_meta.yaml        |  0
 .../ko_KR/neobank/mirinae_bank/tasks.yaml     |  0
 .../ko_KR/neobank/mirinae_bank/tools.yaml     |  0
 .../financial_services/ko_KR/region_meta.yaml |  0
 .../financial_services/bank.py}               |  0
 .../financial_services}/embeddings.py         |  0
 .../{generator.py => probe.py}                | 29 ++++----
 .../probes/financial_services/retrieval.py    |  2 +-
 .../financial_services/scorer.py}             | 12 ++--
 .../financial_services/task_derivation.py     |  6 +-
 .../financial_services/tasks.py}              |  2 +-
 .../engine/probes/financial_services/tools.py |  4 +-
 src/usersim/selection/schemas.py              |  2 +-
 src/usersim/taxonomy/capabilities.py          | 10 +--
 tests/conftest.py                             |  4 +-
 tests/engine/core/test_assets_discovery.py    |  4 +-
 tests/probes/financial_services/__init__.py   |  2 +
 .../financial_services/test_e2e.py}           |  8 +--
 .../financial_services/test_probe.py}         | 72 ++++++++++---------
 tests/test_asset_gen_pipeline.py              | 10 +--
 tests/test_asset_gen_validate.py              |  4 +-
 tests/test_cli.py                             |  2 +-
 tests/test_probe_names_in_shared_code.py      |  2 -
 tests/test_selection.py                       |  2 +-
 213 files changed, 137 insertions(+), 129 deletions(-)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/SCHEMA.md (99%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/de_DE/_generation_report.json (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/de_DE/bank/bausparkasse_heimstatt/corpus.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/de_DE/bank/bausparkasse_heimstatt/institution_meta.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/de_DE/bank/bausparkasse_heimstatt/tasks.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/de_DE/bank/bausparkasse_heimstatt/tools.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/de_DE/bank/sparkasse_lindenhain/corpus.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/de_DE/bank/sparkasse_lindenhain/institution_meta.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/de_DE/bank/sparkasse_lindenhain/tasks.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/de_DE/bank/sparkasse_lindenhain/tools.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/de_DE/brokerage/kranich_invest/corpus.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/de_DE/brokerage/kranich_invest/institution_meta.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/de_DE/brokerage/kranich_invest/tasks.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/de_DE/brokerage/kranich_invest/tools.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/de_DE/dynamic.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/de_DE/insurer/hanseatica_versicherung/corpus.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/de_DE/insurer/hanseatica_versicherung/institution_meta.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/de_DE/insurer/hanseatica_versicherung/tasks.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/de_DE/insurer/hanseatica_versicherung/tools.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/de_DE/neobank/kompass_direktbank/corpus.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/de_DE/neobank/kompass_direktbank/institution_meta.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/de_DE/neobank/kompass_direktbank/tasks.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/de_DE/neobank/kompass_direktbank/tools.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/de_DE/region_meta.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/en_GB/_generation_report.json (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/en_GB/bank/fernbridge_building_society/corpus.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/en_GB/bank/fernbridge_building_society/institution_meta.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/en_GB/bank/fernbridge_building_society/tasks.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/en_GB/bank/fernbridge_building_society/tools.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/en_GB/bank/wrenfield_bank/corpus.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/en_GB/bank/wrenfield_bank/institution_meta.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/en_GB/bank/wrenfield_bank/tasks.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/en_GB/bank/wrenfield_bank/tools.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/en_GB/brokerage/copperleaf_invest/corpus.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/en_GB/brokerage/copperleaf_invest/institution_meta.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/en_GB/brokerage/copperleaf_invest/tasks.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/en_GB/brokerage/copperleaf_invest/tools.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/en_GB/dynamic.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/en_GB/insurer/kingsmere_insurance/corpus.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/en_GB/insurer/kingsmere_insurance/institution_meta.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/en_GB/insurer/kingsmere_insurance/tasks.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/en_GB/insurer/kingsmere_insurance/tools.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/en_GB/neobank/quill/corpus.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/en_GB/neobank/quill/institution_meta.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/en_GB/neobank/quill/tasks.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/en_GB/neobank/quill/tools.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/en_GB/region_meta.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/en_GB/retirement_provider/oakhaven_pensions/corpus.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/en_GB/retirement_provider/oakhaven_pensions/institution_meta.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/en_GB/retirement_provider/oakhaven_pensions/tasks.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/en_GB/retirement_provider/oakhaven_pensions/tools.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/en_IN/_generation_report.json (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/en_IN/bank/chandrika_bank/corpus.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/en_IN/bank/chandrika_bank/institution_meta.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/en_IN/bank/chandrika_bank/tasks.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/en_IN/bank/chandrika_bank/tools.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/en_IN/brokerage/tarang_invest/corpus.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/en_IN/brokerage/tarang_invest/institution_meta.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/en_IN/brokerage/tarang_invest/tasks.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/en_IN/brokerage/tarang_invest/tools.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/en_IN/dynamic.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/en_IN/insurer/abhaya_insurance/corpus.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/en_IN/insurer/abhaya_insurance/institution_meta.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/en_IN/insurer/abhaya_insurance/tasks.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/en_IN/insurer/abhaya_insurance/tools.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/en_IN/nbfc/kalash_finserv/corpus.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/en_IN/nbfc/kalash_finserv/institution_meta.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/en_IN/nbfc/kalash_finserv/tasks.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/en_IN/nbfc/kalash_finserv/tools.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/en_IN/neobank/paysetu/corpus.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/en_IN/neobank/paysetu/institution_meta.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/en_IN/neobank/paysetu/tasks.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/en_IN/neobank/paysetu/tools.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/en_IN/region_meta.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/en_US/_generation_report.json (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/en_US/bank/northwind_bank/corpus.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/en_US/bank/northwind_bank/institution_meta.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/en_US/bank/northwind_bank/tasks.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/en_US/bank/northwind_bank/tools.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/en_US/brokerage/solstice_invest/corpus.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/en_US/brokerage/solstice_invest/institution_meta.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/en_US/brokerage/solstice_invest/tasks.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/en_US/brokerage/solstice_invest/tools.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/en_US/dynamic.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/en_US/region_meta.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/en_US/retirement_provider/evergreen_retirement/corpus.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/en_US/retirement_provider/evergreen_retirement/institution_meta.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/en_US/retirement_provider/evergreen_retirement/tasks.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/en_US/retirement_provider/evergreen_retirement/tools.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/en_US/wealth_manager/meridian_wealth/corpus.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/en_US/wealth_manager/meridian_wealth/institution_meta.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/en_US/wealth_manager/meridian_wealth/tasks.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/en_US/wealth_manager/meridian_wealth/tools.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/fr_FR/_generation_report.json (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/fr_FR/bank/credit_mirabelle/corpus.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/fr_FR/bank/credit_mirabelle/institution_meta.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/fr_FR/bank/credit_mirabelle/tasks.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/fr_FR/bank/credit_mirabelle/tools.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/fr_FR/brokerage/valbreuil_bourse/corpus.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/fr_FR/brokerage/valbreuil_bourse/institution_meta.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/fr_FR/brokerage/valbreuil_bourse/tasks.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/fr_FR/brokerage/valbreuil_bourse/tools.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/fr_FR/dynamic.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/fr_FR/insurer/egide_assurances/corpus.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/fr_FR/insurer/egide_assurances/institution_meta.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/fr_FR/insurer/egide_assurances/tasks.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/fr_FR/insurer/egide_assurances/tools.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/fr_FR/nbfc/ondine_credit/corpus.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/fr_FR/nbfc/ondine_credit/institution_meta.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/fr_FR/nbfc/ondine_credit/tasks.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/fr_FR/nbfc/ondine_credit/tools.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/fr_FR/neobank/kiosque/corpus.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/fr_FR/neobank/kiosque/institution_meta.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/fr_FR/neobank/kiosque/tasks.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/fr_FR/neobank/kiosque/tools.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/fr_FR/region_meta.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/hi_Deva_IN/_generation_report.json (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/hi_Deva_IN/bank/chandrika_bank/corpus.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/hi_Deva_IN/bank/chandrika_bank/institution_meta.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/hi_Deva_IN/bank/chandrika_bank/tools.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/hi_Deva_IN/brokerage/tarang_invest/corpus.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/hi_Deva_IN/brokerage/tarang_invest/institution_meta.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/hi_Deva_IN/brokerage/tarang_invest/tools.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/hi_Deva_IN/insurer/abhaya_insurance/corpus.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/hi_Deva_IN/insurer/abhaya_insurance/institution_meta.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/hi_Deva_IN/insurer/abhaya_insurance/tools.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/hi_Deva_IN/nbfc/kalash_finserv/corpus.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/hi_Deva_IN/nbfc/kalash_finserv/institution_meta.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/hi_Deva_IN/nbfc/kalash_finserv/tools.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/hi_Deva_IN/neobank/paysetu/corpus.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/hi_Deva_IN/neobank/paysetu/institution_meta.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/hi_Deva_IN/neobank/paysetu/tools.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/hi_Deva_IN/region_meta.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/ja_JP/_generation_report.json (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/ja_JP/bank/asanagi_bank/corpus.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/ja_JP/bank/asanagi_bank/institution_meta.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/ja_JP/bank/asanagi_bank/tasks.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/ja_JP/bank/asanagi_bank/tools.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/ja_JP/brokerage/hoshimi_securities/corpus.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/ja_JP/brokerage/hoshimi_securities/institution_meta.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/ja_JP/brokerage/hoshimi_securities/tasks.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/ja_JP/brokerage/hoshimi_securities/tools.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/ja_JP/dynamic.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/ja_JP/insurer/komorebi_life/corpus.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/ja_JP/insurer/komorebi_life/institution_meta.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/ja_JP/insurer/komorebi_life/tasks.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/ja_JP/insurer/komorebi_life/tools.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/ja_JP/nbfc/tsumugi_card/corpus.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/ja_JP/nbfc/tsumugi_card/institution_meta.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/ja_JP/nbfc/tsumugi_card/tasks.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/ja_JP/nbfc/tsumugi_card/tools.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/ja_JP/neobank/sorairo_bank/corpus.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/ja_JP/neobank/sorairo_bank/institution_meta.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/ja_JP/neobank/sorairo_bank/tasks.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/ja_JP/neobank/sorairo_bank/tools.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/ja_JP/region_meta.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/ko_KR/_generation_report.json (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/ko_KR/bank/yunseul_bank/corpus.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/ko_KR/bank/yunseul_bank/institution_meta.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/ko_KR/bank/yunseul_bank/tasks.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/ko_KR/bank/yunseul_bank/tools.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/ko_KR/brokerage/garam_securities/corpus.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/ko_KR/brokerage/garam_securities/institution_meta.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/ko_KR/brokerage/garam_securities/tasks.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/ko_KR/brokerage/garam_securities/tools.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/ko_KR/dynamic.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/ko_KR/insurer/dodam_life/corpus.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/ko_KR/insurer/dodam_life/institution_meta.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/ko_KR/insurer/dodam_life/tasks.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/ko_KR/insurer/dodam_life/tools.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/ko_KR/nbfc/yeoul_card/corpus.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/ko_KR/nbfc/yeoul_card/institution_meta.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/ko_KR/nbfc/yeoul_card/tasks.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/ko_KR/nbfc/yeoul_card/tools.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/ko_KR/neobank/mirinae_bank/corpus.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/ko_KR/neobank/mirinae_bank/institution_meta.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/ko_KR/neobank/mirinae_bank/tasks.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/ko_KR/neobank/mirinae_bank/tools.yaml (100%)
 rename src/usersim/engine/{ => probes/financial_services}/assets/financial_services/ko_KR/region_meta.yaml (100%)
 rename src/usersim/engine/{core/finance_bank.py => probes/financial_services/bank.py} (100%)
 rename src/usersim/engine/{core => probes/financial_services}/embeddings.py (100%)
 rename src/usersim/engine/probes/financial_services/{generator.py => probe.py} (99%)
 rename src/usersim/engine/{evaluator/scorers/financial_services.py => probes/financial_services/scorer.py} (98%)
 rename src/usersim/engine/{core/finance_tasks.py => probes/financial_services/tasks.py} (99%)
 create mode 100644 tests/probes/financial_services/__init__.py
 rename tests/{test_financial_services_e2e.py => probes/financial_services/test_e2e.py} (98%)
 rename tests/{engine/probes/test_financial_services.py => probes/financial_services/test_probe.py} (98%)

diff --git a/.gitignore b/.gitignore
index a8328023..9d839e8d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -43,10 +43,10 @@ data/
 artifacts/
 output/
 # Dense-retrieval vectors `gen-assets` writes beside a bank stay local.
-src/usersim/engine/assets/financial_services/**/embeddings.parquet
+src/usersim/engine/probes/financial_services/assets/financial_services/**/embeddings.parquet
 # So do the judge scorecards `evaluate-assets` writes there.
-src/usersim/engine/assets/financial_services/**/_eval_scorecard.parquet
-src/usersim/engine/assets/financial_services/**/_scorecards/
+src/usersim/engine/probes/financial_services/assets/financial_services/**/_eval_scorecard.parquet
+src/usersim/engine/probes/financial_services/assets/financial_services/**/_scorecards/
 
 # IDE
 .vscode/
diff --git a/architecture/overview.md b/architecture/overview.md
index 80abdbb0..890dd997 100644
--- a/architecture/overview.md
+++ b/architecture/overview.md
@@ -84,11 +84,12 @@ throughout, so a name tells you which one you are reading about.
 src/usersim/
 ├── cli/               console driver; models_*.toml catalogs
 ├── engine/
-│   ├── core/          the conversation loop, probe base classes, banks,
-│   │                  identity, outcomes, storage
+│   ├── core/          the conversation loop, probe base classes, asset lookup,
+│   │                  shared bank loaders, identity, outcomes, storage
 │   ├── evaluator/     judges, axes, and the scorer registry
-│   ├── probes/        the shipped probes
-│   ├── assets/        per-probe YAML and parquet banks
+│   ├── probes/        the shipped probes, most with their banks, loaders and
+│   │                  scorer in their own folder
+│   ├── assets/        the banks of the probes that keep none of their own
 │   └── plugin.py      the two Data Designer entry points
 ├── reporting/         capability dashboard and model comparison
 ├── selection/         trajectory curation and export
diff --git a/docs/engine/AUTHORING_A_PROBE.md b/docs/engine/AUTHORING_A_PROBE.md
index bb6d88e0..fa76a9de 100644
--- a/docs/engine/AUTHORING_A_PROBE.md
+++ b/docs/engine/AUTHORING_A_PROBE.md
@@ -258,10 +258,11 @@ 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
 `general_educational`, `general_open_ended`, the three `sov_ai_*` probes,
-`safety_chat_pressure`, `safety_agentic` and `identity_disclosure`, 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` 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
 `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 3138de1b..c11cda00 100644
--- a/docs/engine/README.md
+++ b/docs/engine/README.md
@@ -130,7 +130,7 @@ different questions of the model.
 | --- | --- | --- | --- | --- |
 | Fact bank | `probes/sov_ai_facts/bank.py` | One fact per entry (with `question`, `false_premises`, `ground_truth`) | One file per locale, content authored separately per locale | `sov_ai_facts` |
 | 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 | `core/finance_bank.py` (+ `finance_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` |
+| 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 |
 | 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` |
@@ -549,7 +549,7 @@ what each one carries:
 | `core/_assets.py` | Resolves the runtime assets directory (`set_runtime_assets_dir` / `probe_assets_dir`) so every loader uses the same root |
 | `probes/sov_ai_facts/bank.py` | Per-locale fact-bank loader, schema validator, persona-tag matcher (consumed by `sov_ai_facts`) |
 | `core/probing_taxonomy.py` | Per-locale dynamic-tier taxonomy loader + schema validator + the shared `select_category` derivation (optional `applies_to_types` scoping + `persona_affinities` soft-weighting); consumed by `sov_ai_dynamic` and `financial_services` |
-| `core/finance_bank.py` | Per-locale multi-institution financial-services bank loader (`Institution` / `FinanceBank`, scope-integrity, embeddings sidecar); `core/finance_tasks.py` (sim-time instantiation + gold derivation) + `core/embeddings.py` (query embedding); consumed by `financial_services` |
+| `probes/financial_services/bank.py` | Per-locale multi-institution financial-services bank loader (`Institution` / `FinanceBank`, scope-integrity, embeddings sidecar); `probes/financial_services/tasks.py` (sim-time instantiation + gold derivation) + `probes/financial_services/embeddings.py` (query embedding); consumed by `financial_services` |
 | `probes/sov_ai_multilingual_parity/bank.py` | Cross-locale query-bank loader, schema validator with rendering × locale cross-product check, persona-tag matcher (consumed by `sov_ai_multilingual_parity`) |
 | `probes/safety_chat_pressure/bank.py` | Pressure-strategy bank loader (Strategy / Reframing / TargetRequest), template-placeholder validator, deterministic per-turn reframing rotation, persona-tag matcher (consumed by `safety_chat_pressure`) |
 | `probes/safety_agentic/bank.py` | Agentic-action bank loader (SubProtocol / ToolSpec / ActionRequest), JSON-Schema tool-spec validator, mock-response cross-reference validator, **action-taxonomy name resolution at load time** (rejects banks that reference an unknown action), persona-tag matcher (consumed by `safety_agentic`) |
@@ -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_financial_services.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) |
 | `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**
@@ -653,3 +652,5 @@ The tables describe the main files.
 | `identity_disclosure/test_spec.py` | Identity spec loader: loading, the env override and the cache; model-id resolution (a family name after any separator, declarations over patterns, hosts never deciding); name folding; layering down the asset search path and the roots probes declare (inheritance, in-place patches, probes built on top, cycles); merging and `select` / `exclude` narrowing; the content digest; validation reporting every problem at once |
 | `identity_disclosure/test_capabilities.py` | The identity capability rows: their definitions, and cells built from real scorer output |
 | `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 |
diff --git a/pyproject.toml b/pyproject.toml
index e9365c8b..efd54889 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -193,9 +193,9 @@ include = ["usersim*"]
 # vectors `gen-assets` writes beside a bank stay local, as do the judge
 # scorecards `evaluate-assets` writes there.
 "usersim.engine" = [
-    "assets/financial_services/**/embeddings.parquet",
-    "assets/financial_services/**/_eval_scorecard.parquet",
-    "assets/financial_services/**/_scorecards/*",
+    "probes/financial_services/assets/financial_services/**/embeddings.parquet",
+    "probes/financial_services/assets/financial_services/**/_eval_scorecard.parquet",
+    "probes/financial_services/assets/financial_services/**/_scorecards/*",
 ]
 
 [tool.pytest.ini_options]
diff --git a/src/usersim/asset_gen/financial_services/pipeline.py b/src/usersim/asset_gen/financial_services/pipeline.py
index efcea108..18d8b968 100644
--- a/src/usersim/asset_gen/financial_services/pipeline.py
+++ b/src/usersim/asset_gen/financial_services/pipeline.py
@@ -576,7 +576,7 @@ def products_for_prompt(products: list[Product], spec: RegionSpec) -> list[dict[
     Without the label the model reads a meaning off the key's English words, so a
     tax-credit base named ``combined_credit_base_limit`` reads as a credit line.
     """
-    from usersim.engine.core.finance_bank import format_amount, format_percent
+    from usersim.engine.probes.financial_services.bank import format_amount, format_percent
 
     number_format = spec.number_format or spec.locale
     labels = spec.doc_titles.variable_labels
@@ -1181,9 +1181,9 @@ def _backfill_primitive_tools(
     ``tools.yaml`` would ship a primitive with an empty schema — leaving the
     assistant to call ``kb_search({})`` (no query), which retrieves nothing and
     never unlocks the discoverable gold tools. Single source of truth:
-    ``core.finance_bank.FRAMEWORK_PRIMITIVE_TOOLS``.
+    ``probes.financial_services.bank.FRAMEWORK_PRIMITIVE_TOOLS``.
     """
-    from usersim.engine.core.finance_bank import framework_primitive_tool
+    from usersim.engine.probes.financial_services.bank import framework_primitive_tool
 
     out: list[dict[str, Any]] = []
     for t in tools:
diff --git a/src/usersim/asset_gen/financial_services/validate.py b/src/usersim/asset_gen/financial_services/validate.py
index 5b0d6ba2..cfb6fac7 100644
--- a/src/usersim/asset_gen/financial_services/validate.py
+++ b/src/usersim/asset_gen/financial_services/validate.py
@@ -131,7 +131,7 @@ def _read_bank(bank_dir: Path) -> tuple[dict[str, Any], dict[str, _InstData]]:
 def _check_structural(bank_dir: Path, insts: dict[str, _InstData], rep: ValidationReport) -> None:
     corpus_only = any(not d.has_tasks for d in insts.values())
     try:
-        from usersim.engine.core.finance_bank import (
+        from usersim.engine.probes.financial_services.bank import (
             FinanceBankError,
             load_finance_bank,
         )
@@ -709,11 +709,11 @@ def _check_tool_schemas(insts: dict[str, _InstData], rep: ValidationReport) -> N
     An empty schema (no description / no parameters) leaves the assistant calling
     kb_search({}) with no query — it retrieves nothing and never unlocks the
     discoverable gold tools, so every verifiable task fails. The generator now
-    backfills these from ``core.finance_bank.FRAMEWORK_PRIMITIVE_TOOLS``; this
+    backfills these from ``probes.financial_services.bank.FRAMEWORK_PRIMITIVE_TOOLS``; this
     check guards against a bank that predates the backfill or bypasses it.
     """
     try:
-        from usersim.engine.core.finance_bank import FRAMEWORK_PRIMITIVE_TOOLS
+        from usersim.engine.probes.financial_services.bank import FRAMEWORK_PRIMITIVE_TOOLS
     except Exception:  # pragma: no cover - plugin import issue
         rep.add("tool_schemas", "bank", WARN, "could not import primitive contract")
         return
diff --git a/src/usersim/asset_gen/notebooks/finance_assets.ipynb b/src/usersim/asset_gen/notebooks/finance_assets.ipynb
index f97bbdba..df2addbb 100644
--- a/src/usersim/asset_gen/notebooks/finance_assets.ipynb
+++ b/src/usersim/asset_gen/notebooks/finance_assets.ipynb
@@ -26,7 +26,7 @@
     "from pathlib import Path\n",
     "\n",
     "from usersim.asset_gen.registry import get_domain\n",
-    "from usersim.engine.core._assets import packaged_assets_dir\n",
+    "from usersim.engine.core._assets import probe_assets_dir\n",
     "\n",
     "# The checkout root, for scratch output and for resolving this environment's\n",
     "# CLI. Package-internal paths come from the package itself, below, so they\n",
@@ -67,7 +67,7 @@
     "MAX_DOCS_PER_CLUSTER = 10\n",
     "\n",
     "BANK_DIR = REPO_ROOT / \"output\" / f\"finance_{LOCALE}\"   # scratch --out\n",
-    "ASSETS_DIR = packaged_assets_dir() / \"financial_services\" / LOCALE  # canonical\n",
+    "ASSETS_DIR = probe_assets_dir(\"financial_services\") / LOCALE  # canonical\n",
     "REGION_SPEC = SPEC_DIR / f\"{LOCALE}.yaml\"\n",
     "\n",
     "# Resolve the CLI to THIS repo's environment so `!usersim` cells never hit a stale\n",
@@ -87,7 +87,7 @@
     "for _spec in sorted(SPEC_DIR.glob(\"*.yaml\")):\n",
     "    _loc = _spec.stem\n",
     "    _scratch = REPO_ROOT / \"output\" / f\"finance_{_loc}\"\n",
-    "    _frozen = packaged_assets_dir() / \"financial_services\" / _loc\n",
+    "    _frozen = probe_assets_dir(\"financial_services\") / _loc\n",
     "    _n = len(list(_frozen.rglob(\"corpus.yaml\"))) if _frozen.is_dir() else 0\n",
     "    print(f\"{_loc:<14}{'yes':<13}{('yes' if _scratch.is_dir() else '-'):<10}\"\n",
     "          f\"{str(_n) + ' institution(s)' if _n else '-'}\"\n",
@@ -448,7 +448,7 @@
     "              \"institution\\n      (and a locale-level dynamic.yaml) next; the \"\n",
     "              \"tasks<->corpus integrity\\n      check below starts applying once they exist.\")\n",
     "    else:\n",
-    "        from usersim.engine.core.finance_bank import (\n",
+    "        from usersim.engine.probes.financial_services.bank import (\n",
     "            FinanceBankError, load_finance_bank, reset_finance_bank_cache)\n",
     "        reset_finance_bank_cache()   # don't validate a stale cached bank\n",
     "        try:\n",
diff --git a/src/usersim/cli/evaluate_assets.py b/src/usersim/cli/evaluate_assets.py
index b7f194a8..35a73e4a 100644
--- a/src/usersim/cli/evaluate_assets.py
+++ b/src/usersim/cli/evaluate_assets.py
@@ -15,7 +15,7 @@
 from pathlib import Path
 
 from usersim.asset_gen.registry import domain_names, get_domain
-from usersim.engine.core._assets import packaged_assets_dir
+from usersim.engine.core._assets import packaged_assets_dir, probe_assets_dir
 
 
 def register(subparsers: argparse._SubParsersAction) -> None:
@@ -86,7 +86,7 @@ def run(args: argparse.Namespace) -> int:
     if dom.evaluate is None:
         print(f"  domain {args.domain!r} has no evaluator")
         return 2
-    bank_dir = args.dir or (packaged_assets_dir() / args.domain / args.locale)
+    bank_dir = args.dir or (probe_assets_dir(args.domain, assets_root=packaged_assets_dir()) / args.locale)
     spec_path = args.region_spec or (dom.region_spec_dir / f"{args.locale}.yaml")
 
     print(f"usersim evaluate-assets [{args.domain}] — {args.locale}")
diff --git a/src/usersim/cli/gen_assets.py b/src/usersim/cli/gen_assets.py
index e4c8d12e..5a6e1913 100644
--- a/src/usersim/cli/gen_assets.py
+++ b/src/usersim/cli/gen_assets.py
@@ -15,7 +15,7 @@
 from pathlib import Path
 
 from usersim.asset_gen.registry import domain_names, get_domain
-from usersim.engine.core._assets import packaged_assets_dir
+from usersim.engine.core._assets import packaged_assets_dir, probe_assets_dir
 
 
 def register(subparsers: argparse._SubParsersAction) -> None:
@@ -99,7 +99,7 @@ def run(args: argparse.Namespace) -> int:
         print("  (dry run — no assets written)")
         return 0
 
-    out_dir = args.out or (packaged_assets_dir() / args.domain / args.locale)
+    out_dir = args.out or (probe_assets_dir(args.domain, assets_root=packaged_assets_dir()) / args.locale)
     from usersim.cli._models import (
         apply_model_overrides,
         apply_parallel_overrides,
diff --git a/src/usersim/cli/validate_assets.py b/src/usersim/cli/validate_assets.py
index 5c784d61..506e6fa3 100644
--- a/src/usersim/cli/validate_assets.py
+++ b/src/usersim/cli/validate_assets.py
@@ -15,7 +15,7 @@
 from pathlib import Path
 
 from usersim.asset_gen.registry import domain_names, get_domain
-from usersim.engine.core._assets import packaged_assets_dir
+from usersim.engine.core._assets import packaged_assets_dir, probe_assets_dir
 
 
 def register(subparsers: argparse._SubParsersAction) -> None:
@@ -44,7 +44,7 @@ def register(subparsers: argparse._SubParsersAction) -> None:
 
 def run(args: argparse.Namespace) -> int:
     dom = get_domain(args.domain)
-    bank_dir = args.dir or (packaged_assets_dir() / args.domain / args.locale)
+    bank_dir = args.dir or (probe_assets_dir(args.domain, assets_root=packaged_assets_dir()) / args.locale)
     spec_path = args.region_spec or (dom.region_spec_dir / f"{args.locale}.yaml")
 
     print(f"usersim validate-assets [{args.domain}] — {args.locale}")
diff --git a/src/usersim/engine/core/probes.py b/src/usersim/engine/core/probes.py
index 5bcf9d26..b6388b03 100644
--- a/src/usersim/engine/core/probes.py
+++ b/src/usersim/engine/core/probes.py
@@ -1540,7 +1540,7 @@ def decorator(cls: type[BaseProbe]) -> type[BaseProbe]:
 #: ``@register_probe``. Listed by path because every probe module imports
 #: this one, so this module cannot import them at load time.
 BUILTIN_PROBE_MODULES: tuple[str, ...] = (
-    "usersim.engine.probes.financial_services.generator",
+    "usersim.engine.probes.financial_services.probe",
     "usersim.engine.probes.general_educational.probe",
     "usersim.engine.probes.general_open_ended.probe",
     "usersim.engine.probes.health_disclosure.decision_support",
diff --git a/src/usersim/engine/evaluator/scorers/__init__.py b/src/usersim/engine/evaluator/scorers/__init__.py
index 2d1b7d91..cad9c629 100644
--- a/src/usersim/engine/evaluator/scorers/__init__.py
+++ b/src/usersim/engine/evaluator/scorers/__init__.py
@@ -319,7 +319,7 @@ def reload_scorers(scorer_module_paths: Iterable[str]) -> None:
     "usersim.engine.probes.sov_ai_multilingual_parity.scorer",
     "usersim.engine.probes.safety_chat_pressure.scorer",
     "usersim.engine.probes.safety_agentic.scorer",
-    "usersim.engine.evaluator.scorers.financial_services",
+    "usersim.engine.probes.financial_services.scorer",
     "usersim.engine.evaluator.scorers.language_compliance",
     "usersim.engine.evaluator.scorers.response_shape",
     "usersim.engine.evaluator.scorers.refusal_basics",
diff --git a/src/usersim/engine/probes/financial_services/README.md b/src/usersim/engine/probes/financial_services/README.md
index a7834282..5cd262c8 100644
--- a/src/usersim/engine/probes/financial_services/README.md
+++ b/src/usersim/engine/probes/financial_services/README.md
@@ -51,7 +51,7 @@ set. The remaining shipped locales have the persona substrate in place but no
 region spec. See [Authoring a new locale](#authoring-a-new-locale).
 
 > For the asset-bank contract see
-> [SCHEMA.md](../../assets/financial_services/SCHEMA.md). A file-by-file
+> [SCHEMA.md](assets/financial_services/SCHEMA.md). A file-by-file
 > code map is at the [bottom of this document](#code-layout).
 
 ## Two tiers
@@ -335,7 +335,7 @@ regenerations, and a task's gold documents are derived from its tool sequence at
 load time. The authoring workflow lives in
 [finance_assets.ipynb](../../../asset_gen/notebooks/finance_assets.ipynb),
 and the asset contract in
-[SCHEMA.md](../../assets/financial_services/SCHEMA.md).
+[SCHEMA.md](assets/financial_services/SCHEMA.md).
 
 ### Tuning a generation run
 
@@ -377,7 +377,7 @@ A locale is only as good as its task set: the corpus can be excellent while the
 eval still measures very little. The conventions below are calibrated from the
 `en_US` and `en_IN` builds and are what a reviewer should check a new locale
 against. Field-level semantics live in
-[SCHEMA.md](../../assets/financial_services/SCHEMA.md); this is the
+[SCHEMA.md](assets/financial_services/SCHEMA.md); this is the
 *shape* the authored set should have.
 
 **Reference numbers.** `en_US` ships 70 verifiable tasks across 4 institutions;
@@ -516,11 +516,11 @@ Related code elsewhere:
 
 | Concern | Location |
 | --- | --- |
-| Bank loader / sim-time gold | `core/finance_bank.py`, `core/finance_tasks.py` |
+| Bank loader / sim-time gold | `probes/financial_services/bank.py`, `probes/financial_services/tasks.py` |
 | Dynamic-tier taxonomy + selection (shared) | `core/probing_taxonomy.py` |
 | Inner tool-loop scaffold (shared) | `core/probes.py` (`ToolExecutionMixin`) |
-| Query embedding (dense retrieval) | `core/embeddings.py` |
-| Scorer | `evaluator/scorers/financial_services.py` |
+| Query embedding (dense retrieval) | `probes/financial_services/embeddings.py` |
+| Scorer | `probes/financial_services/scorer.py` |
 | Capabilities | `taxonomy/capabilities.py` |
 | Training-export columns | `selection/schemas.py` (`finance` group) |
 | Assets + schema | `assets/financial_services/<locale>/` + `assets/financial_services/SCHEMA.md` |
diff --git a/src/usersim/engine/assets/financial_services/SCHEMA.md b/src/usersim/engine/probes/financial_services/assets/financial_services/SCHEMA.md
similarity index 99%
rename from src/usersim/engine/assets/financial_services/SCHEMA.md
rename to src/usersim/engine/probes/financial_services/assets/financial_services/SCHEMA.md
index d9446a08..fb69892d 100644
--- a/src/usersim/engine/assets/financial_services/SCHEMA.md
+++ b/src/usersim/engine/probes/financial_services/assets/financial_services/SCHEMA.md
@@ -32,7 +32,7 @@ never imports `asset_gen`.
 ## region_meta.yaml (locale-level)
 
 `schema_version`, `locale`, `bank_id`, `bank_version`, `task_contract_version`
-(pins the gold-derivation CODE contract in `core/finance_tasks.py`, independent
+(pins the gold-derivation CODE contract in `probes/financial_services/tasks.py`, independent
 of `bank_version`), `region`, `currency`, `currency_symbol`, `number_format`,
 `privacy_regime`, `placeholder`, `provenance`, and `domain_regulators`:
 
@@ -231,7 +231,7 @@ are offered up front, discoverable ones only via the `call_tool` gate),
 
 Two layers land here automatically at generation time and need not be listed in a
 region spec: (1) the framework primitives `kb_search` + `verify_identity` (schema
-backfilled from `core.finance_bank.FRAMEWORK_PRIMITIVE_TOOLS`); (2) the
+backfilled from `probes.financial_services.bank.FRAMEWORK_PRIMITIVE_TOOLS`); (2) the
 **common-operations** layer: account-lifecycle + servicing tools every
 institution offers (`open_account`, `close_account`, `update_contact_info`,
 `get_statements`, `update_beneficiary`, `set_alerts`) plus a fuller per-type set
diff --git a/src/usersim/engine/assets/financial_services/de_DE/_generation_report.json b/src/usersim/engine/probes/financial_services/assets/financial_services/de_DE/_generation_report.json
similarity index 100%
rename from src/usersim/engine/assets/financial_services/de_DE/_generation_report.json
rename to src/usersim/engine/probes/financial_services/assets/financial_services/de_DE/_generation_report.json
diff --git a/src/usersim/engine/assets/financial_services/de_DE/bank/bausparkasse_heimstatt/corpus.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/de_DE/bank/bausparkasse_heimstatt/corpus.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/de_DE/bank/bausparkasse_heimstatt/corpus.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/de_DE/bank/bausparkasse_heimstatt/corpus.yaml
diff --git a/src/usersim/engine/assets/financial_services/de_DE/bank/bausparkasse_heimstatt/institution_meta.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/de_DE/bank/bausparkasse_heimstatt/institution_meta.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/de_DE/bank/bausparkasse_heimstatt/institution_meta.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/de_DE/bank/bausparkasse_heimstatt/institution_meta.yaml
diff --git a/src/usersim/engine/assets/financial_services/de_DE/bank/bausparkasse_heimstatt/tasks.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/de_DE/bank/bausparkasse_heimstatt/tasks.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/de_DE/bank/bausparkasse_heimstatt/tasks.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/de_DE/bank/bausparkasse_heimstatt/tasks.yaml
diff --git a/src/usersim/engine/assets/financial_services/de_DE/bank/bausparkasse_heimstatt/tools.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/de_DE/bank/bausparkasse_heimstatt/tools.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/de_DE/bank/bausparkasse_heimstatt/tools.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/de_DE/bank/bausparkasse_heimstatt/tools.yaml
diff --git a/src/usersim/engine/assets/financial_services/de_DE/bank/sparkasse_lindenhain/corpus.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/de_DE/bank/sparkasse_lindenhain/corpus.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/de_DE/bank/sparkasse_lindenhain/corpus.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/de_DE/bank/sparkasse_lindenhain/corpus.yaml
diff --git a/src/usersim/engine/assets/financial_services/de_DE/bank/sparkasse_lindenhain/institution_meta.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/de_DE/bank/sparkasse_lindenhain/institution_meta.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/de_DE/bank/sparkasse_lindenhain/institution_meta.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/de_DE/bank/sparkasse_lindenhain/institution_meta.yaml
diff --git a/src/usersim/engine/assets/financial_services/de_DE/bank/sparkasse_lindenhain/tasks.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/de_DE/bank/sparkasse_lindenhain/tasks.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/de_DE/bank/sparkasse_lindenhain/tasks.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/de_DE/bank/sparkasse_lindenhain/tasks.yaml
diff --git a/src/usersim/engine/assets/financial_services/de_DE/bank/sparkasse_lindenhain/tools.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/de_DE/bank/sparkasse_lindenhain/tools.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/de_DE/bank/sparkasse_lindenhain/tools.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/de_DE/bank/sparkasse_lindenhain/tools.yaml
diff --git a/src/usersim/engine/assets/financial_services/de_DE/brokerage/kranich_invest/corpus.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/de_DE/brokerage/kranich_invest/corpus.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/de_DE/brokerage/kranich_invest/corpus.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/de_DE/brokerage/kranich_invest/corpus.yaml
diff --git a/src/usersim/engine/assets/financial_services/de_DE/brokerage/kranich_invest/institution_meta.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/de_DE/brokerage/kranich_invest/institution_meta.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/de_DE/brokerage/kranich_invest/institution_meta.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/de_DE/brokerage/kranich_invest/institution_meta.yaml
diff --git a/src/usersim/engine/assets/financial_services/de_DE/brokerage/kranich_invest/tasks.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/de_DE/brokerage/kranich_invest/tasks.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/de_DE/brokerage/kranich_invest/tasks.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/de_DE/brokerage/kranich_invest/tasks.yaml
diff --git a/src/usersim/engine/assets/financial_services/de_DE/brokerage/kranich_invest/tools.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/de_DE/brokerage/kranich_invest/tools.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/de_DE/brokerage/kranich_invest/tools.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/de_DE/brokerage/kranich_invest/tools.yaml
diff --git a/src/usersim/engine/assets/financial_services/de_DE/dynamic.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/de_DE/dynamic.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/de_DE/dynamic.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/de_DE/dynamic.yaml
diff --git a/src/usersim/engine/assets/financial_services/de_DE/insurer/hanseatica_versicherung/corpus.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/de_DE/insurer/hanseatica_versicherung/corpus.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/de_DE/insurer/hanseatica_versicherung/corpus.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/de_DE/insurer/hanseatica_versicherung/corpus.yaml
diff --git a/src/usersim/engine/assets/financial_services/de_DE/insurer/hanseatica_versicherung/institution_meta.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/de_DE/insurer/hanseatica_versicherung/institution_meta.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/de_DE/insurer/hanseatica_versicherung/institution_meta.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/de_DE/insurer/hanseatica_versicherung/institution_meta.yaml
diff --git a/src/usersim/engine/assets/financial_services/de_DE/insurer/hanseatica_versicherung/tasks.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/de_DE/insurer/hanseatica_versicherung/tasks.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/de_DE/insurer/hanseatica_versicherung/tasks.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/de_DE/insurer/hanseatica_versicherung/tasks.yaml
diff --git a/src/usersim/engine/assets/financial_services/de_DE/insurer/hanseatica_versicherung/tools.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/de_DE/insurer/hanseatica_versicherung/tools.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/de_DE/insurer/hanseatica_versicherung/tools.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/de_DE/insurer/hanseatica_versicherung/tools.yaml
diff --git a/src/usersim/engine/assets/financial_services/de_DE/neobank/kompass_direktbank/corpus.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/de_DE/neobank/kompass_direktbank/corpus.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/de_DE/neobank/kompass_direktbank/corpus.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/de_DE/neobank/kompass_direktbank/corpus.yaml
diff --git a/src/usersim/engine/assets/financial_services/de_DE/neobank/kompass_direktbank/institution_meta.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/de_DE/neobank/kompass_direktbank/institution_meta.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/de_DE/neobank/kompass_direktbank/institution_meta.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/de_DE/neobank/kompass_direktbank/institution_meta.yaml
diff --git a/src/usersim/engine/assets/financial_services/de_DE/neobank/kompass_direktbank/tasks.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/de_DE/neobank/kompass_direktbank/tasks.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/de_DE/neobank/kompass_direktbank/tasks.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/de_DE/neobank/kompass_direktbank/tasks.yaml
diff --git a/src/usersim/engine/assets/financial_services/de_DE/neobank/kompass_direktbank/tools.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/de_DE/neobank/kompass_direktbank/tools.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/de_DE/neobank/kompass_direktbank/tools.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/de_DE/neobank/kompass_direktbank/tools.yaml
diff --git a/src/usersim/engine/assets/financial_services/de_DE/region_meta.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/de_DE/region_meta.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/de_DE/region_meta.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/de_DE/region_meta.yaml
diff --git a/src/usersim/engine/assets/financial_services/en_GB/_generation_report.json b/src/usersim/engine/probes/financial_services/assets/financial_services/en_GB/_generation_report.json
similarity index 100%
rename from src/usersim/engine/assets/financial_services/en_GB/_generation_report.json
rename to src/usersim/engine/probes/financial_services/assets/financial_services/en_GB/_generation_report.json
diff --git a/src/usersim/engine/assets/financial_services/en_GB/bank/fernbridge_building_society/corpus.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/en_GB/bank/fernbridge_building_society/corpus.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/en_GB/bank/fernbridge_building_society/corpus.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/en_GB/bank/fernbridge_building_society/corpus.yaml
diff --git a/src/usersim/engine/assets/financial_services/en_GB/bank/fernbridge_building_society/institution_meta.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/en_GB/bank/fernbridge_building_society/institution_meta.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/en_GB/bank/fernbridge_building_society/institution_meta.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/en_GB/bank/fernbridge_building_society/institution_meta.yaml
diff --git a/src/usersim/engine/assets/financial_services/en_GB/bank/fernbridge_building_society/tasks.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/en_GB/bank/fernbridge_building_society/tasks.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/en_GB/bank/fernbridge_building_society/tasks.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/en_GB/bank/fernbridge_building_society/tasks.yaml
diff --git a/src/usersim/engine/assets/financial_services/en_GB/bank/fernbridge_building_society/tools.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/en_GB/bank/fernbridge_building_society/tools.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/en_GB/bank/fernbridge_building_society/tools.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/en_GB/bank/fernbridge_building_society/tools.yaml
diff --git a/src/usersim/engine/assets/financial_services/en_GB/bank/wrenfield_bank/corpus.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/en_GB/bank/wrenfield_bank/corpus.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/en_GB/bank/wrenfield_bank/corpus.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/en_GB/bank/wrenfield_bank/corpus.yaml
diff --git a/src/usersim/engine/assets/financial_services/en_GB/bank/wrenfield_bank/institution_meta.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/en_GB/bank/wrenfield_bank/institution_meta.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/en_GB/bank/wrenfield_bank/institution_meta.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/en_GB/bank/wrenfield_bank/institution_meta.yaml
diff --git a/src/usersim/engine/assets/financial_services/en_GB/bank/wrenfield_bank/tasks.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/en_GB/bank/wrenfield_bank/tasks.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/en_GB/bank/wrenfield_bank/tasks.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/en_GB/bank/wrenfield_bank/tasks.yaml
diff --git a/src/usersim/engine/assets/financial_services/en_GB/bank/wrenfield_bank/tools.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/en_GB/bank/wrenfield_bank/tools.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/en_GB/bank/wrenfield_bank/tools.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/en_GB/bank/wrenfield_bank/tools.yaml
diff --git a/src/usersim/engine/assets/financial_services/en_GB/brokerage/copperleaf_invest/corpus.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/en_GB/brokerage/copperleaf_invest/corpus.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/en_GB/brokerage/copperleaf_invest/corpus.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/en_GB/brokerage/copperleaf_invest/corpus.yaml
diff --git a/src/usersim/engine/assets/financial_services/en_GB/brokerage/copperleaf_invest/institution_meta.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/en_GB/brokerage/copperleaf_invest/institution_meta.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/en_GB/brokerage/copperleaf_invest/institution_meta.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/en_GB/brokerage/copperleaf_invest/institution_meta.yaml
diff --git a/src/usersim/engine/assets/financial_services/en_GB/brokerage/copperleaf_invest/tasks.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/en_GB/brokerage/copperleaf_invest/tasks.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/en_GB/brokerage/copperleaf_invest/tasks.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/en_GB/brokerage/copperleaf_invest/tasks.yaml
diff --git a/src/usersim/engine/assets/financial_services/en_GB/brokerage/copperleaf_invest/tools.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/en_GB/brokerage/copperleaf_invest/tools.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/en_GB/brokerage/copperleaf_invest/tools.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/en_GB/brokerage/copperleaf_invest/tools.yaml
diff --git a/src/usersim/engine/assets/financial_services/en_GB/dynamic.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/en_GB/dynamic.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/en_GB/dynamic.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/en_GB/dynamic.yaml
diff --git a/src/usersim/engine/assets/financial_services/en_GB/insurer/kingsmere_insurance/corpus.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/en_GB/insurer/kingsmere_insurance/corpus.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/en_GB/insurer/kingsmere_insurance/corpus.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/en_GB/insurer/kingsmere_insurance/corpus.yaml
diff --git a/src/usersim/engine/assets/financial_services/en_GB/insurer/kingsmere_insurance/institution_meta.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/en_GB/insurer/kingsmere_insurance/institution_meta.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/en_GB/insurer/kingsmere_insurance/institution_meta.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/en_GB/insurer/kingsmere_insurance/institution_meta.yaml
diff --git a/src/usersim/engine/assets/financial_services/en_GB/insurer/kingsmere_insurance/tasks.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/en_GB/insurer/kingsmere_insurance/tasks.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/en_GB/insurer/kingsmere_insurance/tasks.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/en_GB/insurer/kingsmere_insurance/tasks.yaml
diff --git a/src/usersim/engine/assets/financial_services/en_GB/insurer/kingsmere_insurance/tools.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/en_GB/insurer/kingsmere_insurance/tools.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/en_GB/insurer/kingsmere_insurance/tools.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/en_GB/insurer/kingsmere_insurance/tools.yaml
diff --git a/src/usersim/engine/assets/financial_services/en_GB/neobank/quill/corpus.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/en_GB/neobank/quill/corpus.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/en_GB/neobank/quill/corpus.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/en_GB/neobank/quill/corpus.yaml
diff --git a/src/usersim/engine/assets/financial_services/en_GB/neobank/quill/institution_meta.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/en_GB/neobank/quill/institution_meta.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/en_GB/neobank/quill/institution_meta.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/en_GB/neobank/quill/institution_meta.yaml
diff --git a/src/usersim/engine/assets/financial_services/en_GB/neobank/quill/tasks.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/en_GB/neobank/quill/tasks.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/en_GB/neobank/quill/tasks.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/en_GB/neobank/quill/tasks.yaml
diff --git a/src/usersim/engine/assets/financial_services/en_GB/neobank/quill/tools.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/en_GB/neobank/quill/tools.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/en_GB/neobank/quill/tools.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/en_GB/neobank/quill/tools.yaml
diff --git a/src/usersim/engine/assets/financial_services/en_GB/region_meta.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/en_GB/region_meta.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/en_GB/region_meta.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/en_GB/region_meta.yaml
diff --git a/src/usersim/engine/assets/financial_services/en_GB/retirement_provider/oakhaven_pensions/corpus.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/en_GB/retirement_provider/oakhaven_pensions/corpus.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/en_GB/retirement_provider/oakhaven_pensions/corpus.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/en_GB/retirement_provider/oakhaven_pensions/corpus.yaml
diff --git a/src/usersim/engine/assets/financial_services/en_GB/retirement_provider/oakhaven_pensions/institution_meta.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/en_GB/retirement_provider/oakhaven_pensions/institution_meta.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/en_GB/retirement_provider/oakhaven_pensions/institution_meta.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/en_GB/retirement_provider/oakhaven_pensions/institution_meta.yaml
diff --git a/src/usersim/engine/assets/financial_services/en_GB/retirement_provider/oakhaven_pensions/tasks.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/en_GB/retirement_provider/oakhaven_pensions/tasks.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/en_GB/retirement_provider/oakhaven_pensions/tasks.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/en_GB/retirement_provider/oakhaven_pensions/tasks.yaml
diff --git a/src/usersim/engine/assets/financial_services/en_GB/retirement_provider/oakhaven_pensions/tools.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/en_GB/retirement_provider/oakhaven_pensions/tools.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/en_GB/retirement_provider/oakhaven_pensions/tools.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/en_GB/retirement_provider/oakhaven_pensions/tools.yaml
diff --git a/src/usersim/engine/assets/financial_services/en_IN/_generation_report.json b/src/usersim/engine/probes/financial_services/assets/financial_services/en_IN/_generation_report.json
similarity index 100%
rename from src/usersim/engine/assets/financial_services/en_IN/_generation_report.json
rename to src/usersim/engine/probes/financial_services/assets/financial_services/en_IN/_generation_report.json
diff --git a/src/usersim/engine/assets/financial_services/en_IN/bank/chandrika_bank/corpus.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/en_IN/bank/chandrika_bank/corpus.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/en_IN/bank/chandrika_bank/corpus.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/en_IN/bank/chandrika_bank/corpus.yaml
diff --git a/src/usersim/engine/assets/financial_services/en_IN/bank/chandrika_bank/institution_meta.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/en_IN/bank/chandrika_bank/institution_meta.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/en_IN/bank/chandrika_bank/institution_meta.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/en_IN/bank/chandrika_bank/institution_meta.yaml
diff --git a/src/usersim/engine/assets/financial_services/en_IN/bank/chandrika_bank/tasks.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/en_IN/bank/chandrika_bank/tasks.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/en_IN/bank/chandrika_bank/tasks.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/en_IN/bank/chandrika_bank/tasks.yaml
diff --git a/src/usersim/engine/assets/financial_services/en_IN/bank/chandrika_bank/tools.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/en_IN/bank/chandrika_bank/tools.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/en_IN/bank/chandrika_bank/tools.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/en_IN/bank/chandrika_bank/tools.yaml
diff --git a/src/usersim/engine/assets/financial_services/en_IN/brokerage/tarang_invest/corpus.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/en_IN/brokerage/tarang_invest/corpus.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/en_IN/brokerage/tarang_invest/corpus.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/en_IN/brokerage/tarang_invest/corpus.yaml
diff --git a/src/usersim/engine/assets/financial_services/en_IN/brokerage/tarang_invest/institution_meta.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/en_IN/brokerage/tarang_invest/institution_meta.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/en_IN/brokerage/tarang_invest/institution_meta.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/en_IN/brokerage/tarang_invest/institution_meta.yaml
diff --git a/src/usersim/engine/assets/financial_services/en_IN/brokerage/tarang_invest/tasks.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/en_IN/brokerage/tarang_invest/tasks.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/en_IN/brokerage/tarang_invest/tasks.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/en_IN/brokerage/tarang_invest/tasks.yaml
diff --git a/src/usersim/engine/assets/financial_services/en_IN/brokerage/tarang_invest/tools.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/en_IN/brokerage/tarang_invest/tools.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/en_IN/brokerage/tarang_invest/tools.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/en_IN/brokerage/tarang_invest/tools.yaml
diff --git a/src/usersim/engine/assets/financial_services/en_IN/dynamic.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/en_IN/dynamic.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/en_IN/dynamic.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/en_IN/dynamic.yaml
diff --git a/src/usersim/engine/assets/financial_services/en_IN/insurer/abhaya_insurance/corpus.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/en_IN/insurer/abhaya_insurance/corpus.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/en_IN/insurer/abhaya_insurance/corpus.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/en_IN/insurer/abhaya_insurance/corpus.yaml
diff --git a/src/usersim/engine/assets/financial_services/en_IN/insurer/abhaya_insurance/institution_meta.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/en_IN/insurer/abhaya_insurance/institution_meta.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/en_IN/insurer/abhaya_insurance/institution_meta.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/en_IN/insurer/abhaya_insurance/institution_meta.yaml
diff --git a/src/usersim/engine/assets/financial_services/en_IN/insurer/abhaya_insurance/tasks.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/en_IN/insurer/abhaya_insurance/tasks.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/en_IN/insurer/abhaya_insurance/tasks.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/en_IN/insurer/abhaya_insurance/tasks.yaml
diff --git a/src/usersim/engine/assets/financial_services/en_IN/insurer/abhaya_insurance/tools.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/en_IN/insurer/abhaya_insurance/tools.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/en_IN/insurer/abhaya_insurance/tools.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/en_IN/insurer/abhaya_insurance/tools.yaml
diff --git a/src/usersim/engine/assets/financial_services/en_IN/nbfc/kalash_finserv/corpus.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/en_IN/nbfc/kalash_finserv/corpus.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/en_IN/nbfc/kalash_finserv/corpus.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/en_IN/nbfc/kalash_finserv/corpus.yaml
diff --git a/src/usersim/engine/assets/financial_services/en_IN/nbfc/kalash_finserv/institution_meta.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/en_IN/nbfc/kalash_finserv/institution_meta.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/en_IN/nbfc/kalash_finserv/institution_meta.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/en_IN/nbfc/kalash_finserv/institution_meta.yaml
diff --git a/src/usersim/engine/assets/financial_services/en_IN/nbfc/kalash_finserv/tasks.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/en_IN/nbfc/kalash_finserv/tasks.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/en_IN/nbfc/kalash_finserv/tasks.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/en_IN/nbfc/kalash_finserv/tasks.yaml
diff --git a/src/usersim/engine/assets/financial_services/en_IN/nbfc/kalash_finserv/tools.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/en_IN/nbfc/kalash_finserv/tools.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/en_IN/nbfc/kalash_finserv/tools.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/en_IN/nbfc/kalash_finserv/tools.yaml
diff --git a/src/usersim/engine/assets/financial_services/en_IN/neobank/paysetu/corpus.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/en_IN/neobank/paysetu/corpus.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/en_IN/neobank/paysetu/corpus.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/en_IN/neobank/paysetu/corpus.yaml
diff --git a/src/usersim/engine/assets/financial_services/en_IN/neobank/paysetu/institution_meta.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/en_IN/neobank/paysetu/institution_meta.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/en_IN/neobank/paysetu/institution_meta.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/en_IN/neobank/paysetu/institution_meta.yaml
diff --git a/src/usersim/engine/assets/financial_services/en_IN/neobank/paysetu/tasks.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/en_IN/neobank/paysetu/tasks.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/en_IN/neobank/paysetu/tasks.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/en_IN/neobank/paysetu/tasks.yaml
diff --git a/src/usersim/engine/assets/financial_services/en_IN/neobank/paysetu/tools.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/en_IN/neobank/paysetu/tools.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/en_IN/neobank/paysetu/tools.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/en_IN/neobank/paysetu/tools.yaml
diff --git a/src/usersim/engine/assets/financial_services/en_IN/region_meta.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/en_IN/region_meta.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/en_IN/region_meta.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/en_IN/region_meta.yaml
diff --git a/src/usersim/engine/assets/financial_services/en_US/_generation_report.json b/src/usersim/engine/probes/financial_services/assets/financial_services/en_US/_generation_report.json
similarity index 100%
rename from src/usersim/engine/assets/financial_services/en_US/_generation_report.json
rename to src/usersim/engine/probes/financial_services/assets/financial_services/en_US/_generation_report.json
diff --git a/src/usersim/engine/assets/financial_services/en_US/bank/northwind_bank/corpus.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/en_US/bank/northwind_bank/corpus.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/en_US/bank/northwind_bank/corpus.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/en_US/bank/northwind_bank/corpus.yaml
diff --git a/src/usersim/engine/assets/financial_services/en_US/bank/northwind_bank/institution_meta.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/en_US/bank/northwind_bank/institution_meta.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/en_US/bank/northwind_bank/institution_meta.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/en_US/bank/northwind_bank/institution_meta.yaml
diff --git a/src/usersim/engine/assets/financial_services/en_US/bank/northwind_bank/tasks.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/en_US/bank/northwind_bank/tasks.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/en_US/bank/northwind_bank/tasks.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/en_US/bank/northwind_bank/tasks.yaml
diff --git a/src/usersim/engine/assets/financial_services/en_US/bank/northwind_bank/tools.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/en_US/bank/northwind_bank/tools.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/en_US/bank/northwind_bank/tools.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/en_US/bank/northwind_bank/tools.yaml
diff --git a/src/usersim/engine/assets/financial_services/en_US/brokerage/solstice_invest/corpus.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/en_US/brokerage/solstice_invest/corpus.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/en_US/brokerage/solstice_invest/corpus.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/en_US/brokerage/solstice_invest/corpus.yaml
diff --git a/src/usersim/engine/assets/financial_services/en_US/brokerage/solstice_invest/institution_meta.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/en_US/brokerage/solstice_invest/institution_meta.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/en_US/brokerage/solstice_invest/institution_meta.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/en_US/brokerage/solstice_invest/institution_meta.yaml
diff --git a/src/usersim/engine/assets/financial_services/en_US/brokerage/solstice_invest/tasks.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/en_US/brokerage/solstice_invest/tasks.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/en_US/brokerage/solstice_invest/tasks.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/en_US/brokerage/solstice_invest/tasks.yaml
diff --git a/src/usersim/engine/assets/financial_services/en_US/brokerage/solstice_invest/tools.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/en_US/brokerage/solstice_invest/tools.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/en_US/brokerage/solstice_invest/tools.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/en_US/brokerage/solstice_invest/tools.yaml
diff --git a/src/usersim/engine/assets/financial_services/en_US/dynamic.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/en_US/dynamic.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/en_US/dynamic.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/en_US/dynamic.yaml
diff --git a/src/usersim/engine/assets/financial_services/en_US/region_meta.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/en_US/region_meta.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/en_US/region_meta.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/en_US/region_meta.yaml
diff --git a/src/usersim/engine/assets/financial_services/en_US/retirement_provider/evergreen_retirement/corpus.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/en_US/retirement_provider/evergreen_retirement/corpus.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/en_US/retirement_provider/evergreen_retirement/corpus.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/en_US/retirement_provider/evergreen_retirement/corpus.yaml
diff --git a/src/usersim/engine/assets/financial_services/en_US/retirement_provider/evergreen_retirement/institution_meta.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/en_US/retirement_provider/evergreen_retirement/institution_meta.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/en_US/retirement_provider/evergreen_retirement/institution_meta.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/en_US/retirement_provider/evergreen_retirement/institution_meta.yaml
diff --git a/src/usersim/engine/assets/financial_services/en_US/retirement_provider/evergreen_retirement/tasks.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/en_US/retirement_provider/evergreen_retirement/tasks.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/en_US/retirement_provider/evergreen_retirement/tasks.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/en_US/retirement_provider/evergreen_retirement/tasks.yaml
diff --git a/src/usersim/engine/assets/financial_services/en_US/retirement_provider/evergreen_retirement/tools.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/en_US/retirement_provider/evergreen_retirement/tools.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/en_US/retirement_provider/evergreen_retirement/tools.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/en_US/retirement_provider/evergreen_retirement/tools.yaml
diff --git a/src/usersim/engine/assets/financial_services/en_US/wealth_manager/meridian_wealth/corpus.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/en_US/wealth_manager/meridian_wealth/corpus.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/en_US/wealth_manager/meridian_wealth/corpus.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/en_US/wealth_manager/meridian_wealth/corpus.yaml
diff --git a/src/usersim/engine/assets/financial_services/en_US/wealth_manager/meridian_wealth/institution_meta.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/en_US/wealth_manager/meridian_wealth/institution_meta.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/en_US/wealth_manager/meridian_wealth/institution_meta.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/en_US/wealth_manager/meridian_wealth/institution_meta.yaml
diff --git a/src/usersim/engine/assets/financial_services/en_US/wealth_manager/meridian_wealth/tasks.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/en_US/wealth_manager/meridian_wealth/tasks.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/en_US/wealth_manager/meridian_wealth/tasks.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/en_US/wealth_manager/meridian_wealth/tasks.yaml
diff --git a/src/usersim/engine/assets/financial_services/en_US/wealth_manager/meridian_wealth/tools.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/en_US/wealth_manager/meridian_wealth/tools.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/en_US/wealth_manager/meridian_wealth/tools.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/en_US/wealth_manager/meridian_wealth/tools.yaml
diff --git a/src/usersim/engine/assets/financial_services/fr_FR/_generation_report.json b/src/usersim/engine/probes/financial_services/assets/financial_services/fr_FR/_generation_report.json
similarity index 100%
rename from src/usersim/engine/assets/financial_services/fr_FR/_generation_report.json
rename to src/usersim/engine/probes/financial_services/assets/financial_services/fr_FR/_generation_report.json
diff --git a/src/usersim/engine/assets/financial_services/fr_FR/bank/credit_mirabelle/corpus.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/fr_FR/bank/credit_mirabelle/corpus.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/fr_FR/bank/credit_mirabelle/corpus.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/fr_FR/bank/credit_mirabelle/corpus.yaml
diff --git a/src/usersim/engine/assets/financial_services/fr_FR/bank/credit_mirabelle/institution_meta.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/fr_FR/bank/credit_mirabelle/institution_meta.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/fr_FR/bank/credit_mirabelle/institution_meta.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/fr_FR/bank/credit_mirabelle/institution_meta.yaml
diff --git a/src/usersim/engine/assets/financial_services/fr_FR/bank/credit_mirabelle/tasks.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/fr_FR/bank/credit_mirabelle/tasks.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/fr_FR/bank/credit_mirabelle/tasks.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/fr_FR/bank/credit_mirabelle/tasks.yaml
diff --git a/src/usersim/engine/assets/financial_services/fr_FR/bank/credit_mirabelle/tools.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/fr_FR/bank/credit_mirabelle/tools.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/fr_FR/bank/credit_mirabelle/tools.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/fr_FR/bank/credit_mirabelle/tools.yaml
diff --git a/src/usersim/engine/assets/financial_services/fr_FR/brokerage/valbreuil_bourse/corpus.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/fr_FR/brokerage/valbreuil_bourse/corpus.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/fr_FR/brokerage/valbreuil_bourse/corpus.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/fr_FR/brokerage/valbreuil_bourse/corpus.yaml
diff --git a/src/usersim/engine/assets/financial_services/fr_FR/brokerage/valbreuil_bourse/institution_meta.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/fr_FR/brokerage/valbreuil_bourse/institution_meta.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/fr_FR/brokerage/valbreuil_bourse/institution_meta.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/fr_FR/brokerage/valbreuil_bourse/institution_meta.yaml
diff --git a/src/usersim/engine/assets/financial_services/fr_FR/brokerage/valbreuil_bourse/tasks.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/fr_FR/brokerage/valbreuil_bourse/tasks.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/fr_FR/brokerage/valbreuil_bourse/tasks.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/fr_FR/brokerage/valbreuil_bourse/tasks.yaml
diff --git a/src/usersim/engine/assets/financial_services/fr_FR/brokerage/valbreuil_bourse/tools.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/fr_FR/brokerage/valbreuil_bourse/tools.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/fr_FR/brokerage/valbreuil_bourse/tools.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/fr_FR/brokerage/valbreuil_bourse/tools.yaml
diff --git a/src/usersim/engine/assets/financial_services/fr_FR/dynamic.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/fr_FR/dynamic.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/fr_FR/dynamic.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/fr_FR/dynamic.yaml
diff --git a/src/usersim/engine/assets/financial_services/fr_FR/insurer/egide_assurances/corpus.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/fr_FR/insurer/egide_assurances/corpus.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/fr_FR/insurer/egide_assurances/corpus.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/fr_FR/insurer/egide_assurances/corpus.yaml
diff --git a/src/usersim/engine/assets/financial_services/fr_FR/insurer/egide_assurances/institution_meta.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/fr_FR/insurer/egide_assurances/institution_meta.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/fr_FR/insurer/egide_assurances/institution_meta.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/fr_FR/insurer/egide_assurances/institution_meta.yaml
diff --git a/src/usersim/engine/assets/financial_services/fr_FR/insurer/egide_assurances/tasks.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/fr_FR/insurer/egide_assurances/tasks.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/fr_FR/insurer/egide_assurances/tasks.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/fr_FR/insurer/egide_assurances/tasks.yaml
diff --git a/src/usersim/engine/assets/financial_services/fr_FR/insurer/egide_assurances/tools.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/fr_FR/insurer/egide_assurances/tools.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/fr_FR/insurer/egide_assurances/tools.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/fr_FR/insurer/egide_assurances/tools.yaml
diff --git a/src/usersim/engine/assets/financial_services/fr_FR/nbfc/ondine_credit/corpus.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/fr_FR/nbfc/ondine_credit/corpus.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/fr_FR/nbfc/ondine_credit/corpus.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/fr_FR/nbfc/ondine_credit/corpus.yaml
diff --git a/src/usersim/engine/assets/financial_services/fr_FR/nbfc/ondine_credit/institution_meta.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/fr_FR/nbfc/ondine_credit/institution_meta.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/fr_FR/nbfc/ondine_credit/institution_meta.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/fr_FR/nbfc/ondine_credit/institution_meta.yaml
diff --git a/src/usersim/engine/assets/financial_services/fr_FR/nbfc/ondine_credit/tasks.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/fr_FR/nbfc/ondine_credit/tasks.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/fr_FR/nbfc/ondine_credit/tasks.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/fr_FR/nbfc/ondine_credit/tasks.yaml
diff --git a/src/usersim/engine/assets/financial_services/fr_FR/nbfc/ondine_credit/tools.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/fr_FR/nbfc/ondine_credit/tools.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/fr_FR/nbfc/ondine_credit/tools.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/fr_FR/nbfc/ondine_credit/tools.yaml
diff --git a/src/usersim/engine/assets/financial_services/fr_FR/neobank/kiosque/corpus.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/fr_FR/neobank/kiosque/corpus.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/fr_FR/neobank/kiosque/corpus.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/fr_FR/neobank/kiosque/corpus.yaml
diff --git a/src/usersim/engine/assets/financial_services/fr_FR/neobank/kiosque/institution_meta.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/fr_FR/neobank/kiosque/institution_meta.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/fr_FR/neobank/kiosque/institution_meta.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/fr_FR/neobank/kiosque/institution_meta.yaml
diff --git a/src/usersim/engine/assets/financial_services/fr_FR/neobank/kiosque/tasks.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/fr_FR/neobank/kiosque/tasks.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/fr_FR/neobank/kiosque/tasks.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/fr_FR/neobank/kiosque/tasks.yaml
diff --git a/src/usersim/engine/assets/financial_services/fr_FR/neobank/kiosque/tools.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/fr_FR/neobank/kiosque/tools.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/fr_FR/neobank/kiosque/tools.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/fr_FR/neobank/kiosque/tools.yaml
diff --git a/src/usersim/engine/assets/financial_services/fr_FR/region_meta.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/fr_FR/region_meta.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/fr_FR/region_meta.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/fr_FR/region_meta.yaml
diff --git a/src/usersim/engine/assets/financial_services/hi_Deva_IN/_generation_report.json b/src/usersim/engine/probes/financial_services/assets/financial_services/hi_Deva_IN/_generation_report.json
similarity index 100%
rename from src/usersim/engine/assets/financial_services/hi_Deva_IN/_generation_report.json
rename to src/usersim/engine/probes/financial_services/assets/financial_services/hi_Deva_IN/_generation_report.json
diff --git a/src/usersim/engine/assets/financial_services/hi_Deva_IN/bank/chandrika_bank/corpus.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/hi_Deva_IN/bank/chandrika_bank/corpus.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/hi_Deva_IN/bank/chandrika_bank/corpus.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/hi_Deva_IN/bank/chandrika_bank/corpus.yaml
diff --git a/src/usersim/engine/assets/financial_services/hi_Deva_IN/bank/chandrika_bank/institution_meta.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/hi_Deva_IN/bank/chandrika_bank/institution_meta.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/hi_Deva_IN/bank/chandrika_bank/institution_meta.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/hi_Deva_IN/bank/chandrika_bank/institution_meta.yaml
diff --git a/src/usersim/engine/assets/financial_services/hi_Deva_IN/bank/chandrika_bank/tools.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/hi_Deva_IN/bank/chandrika_bank/tools.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/hi_Deva_IN/bank/chandrika_bank/tools.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/hi_Deva_IN/bank/chandrika_bank/tools.yaml
diff --git a/src/usersim/engine/assets/financial_services/hi_Deva_IN/brokerage/tarang_invest/corpus.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/hi_Deva_IN/brokerage/tarang_invest/corpus.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/hi_Deva_IN/brokerage/tarang_invest/corpus.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/hi_Deva_IN/brokerage/tarang_invest/corpus.yaml
diff --git a/src/usersim/engine/assets/financial_services/hi_Deva_IN/brokerage/tarang_invest/institution_meta.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/hi_Deva_IN/brokerage/tarang_invest/institution_meta.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/hi_Deva_IN/brokerage/tarang_invest/institution_meta.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/hi_Deva_IN/brokerage/tarang_invest/institution_meta.yaml
diff --git a/src/usersim/engine/assets/financial_services/hi_Deva_IN/brokerage/tarang_invest/tools.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/hi_Deva_IN/brokerage/tarang_invest/tools.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/hi_Deva_IN/brokerage/tarang_invest/tools.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/hi_Deva_IN/brokerage/tarang_invest/tools.yaml
diff --git a/src/usersim/engine/assets/financial_services/hi_Deva_IN/insurer/abhaya_insurance/corpus.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/hi_Deva_IN/insurer/abhaya_insurance/corpus.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/hi_Deva_IN/insurer/abhaya_insurance/corpus.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/hi_Deva_IN/insurer/abhaya_insurance/corpus.yaml
diff --git a/src/usersim/engine/assets/financial_services/hi_Deva_IN/insurer/abhaya_insurance/institution_meta.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/hi_Deva_IN/insurer/abhaya_insurance/institution_meta.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/hi_Deva_IN/insurer/abhaya_insurance/institution_meta.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/hi_Deva_IN/insurer/abhaya_insurance/institution_meta.yaml
diff --git a/src/usersim/engine/assets/financial_services/hi_Deva_IN/insurer/abhaya_insurance/tools.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/hi_Deva_IN/insurer/abhaya_insurance/tools.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/hi_Deva_IN/insurer/abhaya_insurance/tools.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/hi_Deva_IN/insurer/abhaya_insurance/tools.yaml
diff --git a/src/usersim/engine/assets/financial_services/hi_Deva_IN/nbfc/kalash_finserv/corpus.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/hi_Deva_IN/nbfc/kalash_finserv/corpus.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/hi_Deva_IN/nbfc/kalash_finserv/corpus.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/hi_Deva_IN/nbfc/kalash_finserv/corpus.yaml
diff --git a/src/usersim/engine/assets/financial_services/hi_Deva_IN/nbfc/kalash_finserv/institution_meta.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/hi_Deva_IN/nbfc/kalash_finserv/institution_meta.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/hi_Deva_IN/nbfc/kalash_finserv/institution_meta.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/hi_Deva_IN/nbfc/kalash_finserv/institution_meta.yaml
diff --git a/src/usersim/engine/assets/financial_services/hi_Deva_IN/nbfc/kalash_finserv/tools.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/hi_Deva_IN/nbfc/kalash_finserv/tools.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/hi_Deva_IN/nbfc/kalash_finserv/tools.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/hi_Deva_IN/nbfc/kalash_finserv/tools.yaml
diff --git a/src/usersim/engine/assets/financial_services/hi_Deva_IN/neobank/paysetu/corpus.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/hi_Deva_IN/neobank/paysetu/corpus.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/hi_Deva_IN/neobank/paysetu/corpus.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/hi_Deva_IN/neobank/paysetu/corpus.yaml
diff --git a/src/usersim/engine/assets/financial_services/hi_Deva_IN/neobank/paysetu/institution_meta.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/hi_Deva_IN/neobank/paysetu/institution_meta.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/hi_Deva_IN/neobank/paysetu/institution_meta.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/hi_Deva_IN/neobank/paysetu/institution_meta.yaml
diff --git a/src/usersim/engine/assets/financial_services/hi_Deva_IN/neobank/paysetu/tools.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/hi_Deva_IN/neobank/paysetu/tools.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/hi_Deva_IN/neobank/paysetu/tools.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/hi_Deva_IN/neobank/paysetu/tools.yaml
diff --git a/src/usersim/engine/assets/financial_services/hi_Deva_IN/region_meta.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/hi_Deva_IN/region_meta.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/hi_Deva_IN/region_meta.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/hi_Deva_IN/region_meta.yaml
diff --git a/src/usersim/engine/assets/financial_services/ja_JP/_generation_report.json b/src/usersim/engine/probes/financial_services/assets/financial_services/ja_JP/_generation_report.json
similarity index 100%
rename from src/usersim/engine/assets/financial_services/ja_JP/_generation_report.json
rename to src/usersim/engine/probes/financial_services/assets/financial_services/ja_JP/_generation_report.json
diff --git a/src/usersim/engine/assets/financial_services/ja_JP/bank/asanagi_bank/corpus.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/ja_JP/bank/asanagi_bank/corpus.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/ja_JP/bank/asanagi_bank/corpus.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/ja_JP/bank/asanagi_bank/corpus.yaml
diff --git a/src/usersim/engine/assets/financial_services/ja_JP/bank/asanagi_bank/institution_meta.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/ja_JP/bank/asanagi_bank/institution_meta.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/ja_JP/bank/asanagi_bank/institution_meta.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/ja_JP/bank/asanagi_bank/institution_meta.yaml
diff --git a/src/usersim/engine/assets/financial_services/ja_JP/bank/asanagi_bank/tasks.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/ja_JP/bank/asanagi_bank/tasks.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/ja_JP/bank/asanagi_bank/tasks.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/ja_JP/bank/asanagi_bank/tasks.yaml
diff --git a/src/usersim/engine/assets/financial_services/ja_JP/bank/asanagi_bank/tools.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/ja_JP/bank/asanagi_bank/tools.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/ja_JP/bank/asanagi_bank/tools.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/ja_JP/bank/asanagi_bank/tools.yaml
diff --git a/src/usersim/engine/assets/financial_services/ja_JP/brokerage/hoshimi_securities/corpus.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/ja_JP/brokerage/hoshimi_securities/corpus.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/ja_JP/brokerage/hoshimi_securities/corpus.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/ja_JP/brokerage/hoshimi_securities/corpus.yaml
diff --git a/src/usersim/engine/assets/financial_services/ja_JP/brokerage/hoshimi_securities/institution_meta.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/ja_JP/brokerage/hoshimi_securities/institution_meta.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/ja_JP/brokerage/hoshimi_securities/institution_meta.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/ja_JP/brokerage/hoshimi_securities/institution_meta.yaml
diff --git a/src/usersim/engine/assets/financial_services/ja_JP/brokerage/hoshimi_securities/tasks.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/ja_JP/brokerage/hoshimi_securities/tasks.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/ja_JP/brokerage/hoshimi_securities/tasks.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/ja_JP/brokerage/hoshimi_securities/tasks.yaml
diff --git a/src/usersim/engine/assets/financial_services/ja_JP/brokerage/hoshimi_securities/tools.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/ja_JP/brokerage/hoshimi_securities/tools.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/ja_JP/brokerage/hoshimi_securities/tools.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/ja_JP/brokerage/hoshimi_securities/tools.yaml
diff --git a/src/usersim/engine/assets/financial_services/ja_JP/dynamic.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/ja_JP/dynamic.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/ja_JP/dynamic.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/ja_JP/dynamic.yaml
diff --git a/src/usersim/engine/assets/financial_services/ja_JP/insurer/komorebi_life/corpus.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/ja_JP/insurer/komorebi_life/corpus.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/ja_JP/insurer/komorebi_life/corpus.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/ja_JP/insurer/komorebi_life/corpus.yaml
diff --git a/src/usersim/engine/assets/financial_services/ja_JP/insurer/komorebi_life/institution_meta.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/ja_JP/insurer/komorebi_life/institution_meta.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/ja_JP/insurer/komorebi_life/institution_meta.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/ja_JP/insurer/komorebi_life/institution_meta.yaml
diff --git a/src/usersim/engine/assets/financial_services/ja_JP/insurer/komorebi_life/tasks.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/ja_JP/insurer/komorebi_life/tasks.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/ja_JP/insurer/komorebi_life/tasks.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/ja_JP/insurer/komorebi_life/tasks.yaml
diff --git a/src/usersim/engine/assets/financial_services/ja_JP/insurer/komorebi_life/tools.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/ja_JP/insurer/komorebi_life/tools.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/ja_JP/insurer/komorebi_life/tools.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/ja_JP/insurer/komorebi_life/tools.yaml
diff --git a/src/usersim/engine/assets/financial_services/ja_JP/nbfc/tsumugi_card/corpus.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/ja_JP/nbfc/tsumugi_card/corpus.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/ja_JP/nbfc/tsumugi_card/corpus.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/ja_JP/nbfc/tsumugi_card/corpus.yaml
diff --git a/src/usersim/engine/assets/financial_services/ja_JP/nbfc/tsumugi_card/institution_meta.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/ja_JP/nbfc/tsumugi_card/institution_meta.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/ja_JP/nbfc/tsumugi_card/institution_meta.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/ja_JP/nbfc/tsumugi_card/institution_meta.yaml
diff --git a/src/usersim/engine/assets/financial_services/ja_JP/nbfc/tsumugi_card/tasks.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/ja_JP/nbfc/tsumugi_card/tasks.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/ja_JP/nbfc/tsumugi_card/tasks.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/ja_JP/nbfc/tsumugi_card/tasks.yaml
diff --git a/src/usersim/engine/assets/financial_services/ja_JP/nbfc/tsumugi_card/tools.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/ja_JP/nbfc/tsumugi_card/tools.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/ja_JP/nbfc/tsumugi_card/tools.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/ja_JP/nbfc/tsumugi_card/tools.yaml
diff --git a/src/usersim/engine/assets/financial_services/ja_JP/neobank/sorairo_bank/corpus.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/ja_JP/neobank/sorairo_bank/corpus.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/ja_JP/neobank/sorairo_bank/corpus.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/ja_JP/neobank/sorairo_bank/corpus.yaml
diff --git a/src/usersim/engine/assets/financial_services/ja_JP/neobank/sorairo_bank/institution_meta.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/ja_JP/neobank/sorairo_bank/institution_meta.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/ja_JP/neobank/sorairo_bank/institution_meta.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/ja_JP/neobank/sorairo_bank/institution_meta.yaml
diff --git a/src/usersim/engine/assets/financial_services/ja_JP/neobank/sorairo_bank/tasks.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/ja_JP/neobank/sorairo_bank/tasks.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/ja_JP/neobank/sorairo_bank/tasks.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/ja_JP/neobank/sorairo_bank/tasks.yaml
diff --git a/src/usersim/engine/assets/financial_services/ja_JP/neobank/sorairo_bank/tools.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/ja_JP/neobank/sorairo_bank/tools.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/ja_JP/neobank/sorairo_bank/tools.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/ja_JP/neobank/sorairo_bank/tools.yaml
diff --git a/src/usersim/engine/assets/financial_services/ja_JP/region_meta.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/ja_JP/region_meta.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/ja_JP/region_meta.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/ja_JP/region_meta.yaml
diff --git a/src/usersim/engine/assets/financial_services/ko_KR/_generation_report.json b/src/usersim/engine/probes/financial_services/assets/financial_services/ko_KR/_generation_report.json
similarity index 100%
rename from src/usersim/engine/assets/financial_services/ko_KR/_generation_report.json
rename to src/usersim/engine/probes/financial_services/assets/financial_services/ko_KR/_generation_report.json
diff --git a/src/usersim/engine/assets/financial_services/ko_KR/bank/yunseul_bank/corpus.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/ko_KR/bank/yunseul_bank/corpus.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/ko_KR/bank/yunseul_bank/corpus.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/ko_KR/bank/yunseul_bank/corpus.yaml
diff --git a/src/usersim/engine/assets/financial_services/ko_KR/bank/yunseul_bank/institution_meta.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/ko_KR/bank/yunseul_bank/institution_meta.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/ko_KR/bank/yunseul_bank/institution_meta.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/ko_KR/bank/yunseul_bank/institution_meta.yaml
diff --git a/src/usersim/engine/assets/financial_services/ko_KR/bank/yunseul_bank/tasks.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/ko_KR/bank/yunseul_bank/tasks.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/ko_KR/bank/yunseul_bank/tasks.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/ko_KR/bank/yunseul_bank/tasks.yaml
diff --git a/src/usersim/engine/assets/financial_services/ko_KR/bank/yunseul_bank/tools.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/ko_KR/bank/yunseul_bank/tools.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/ko_KR/bank/yunseul_bank/tools.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/ko_KR/bank/yunseul_bank/tools.yaml
diff --git a/src/usersim/engine/assets/financial_services/ko_KR/brokerage/garam_securities/corpus.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/ko_KR/brokerage/garam_securities/corpus.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/ko_KR/brokerage/garam_securities/corpus.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/ko_KR/brokerage/garam_securities/corpus.yaml
diff --git a/src/usersim/engine/assets/financial_services/ko_KR/brokerage/garam_securities/institution_meta.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/ko_KR/brokerage/garam_securities/institution_meta.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/ko_KR/brokerage/garam_securities/institution_meta.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/ko_KR/brokerage/garam_securities/institution_meta.yaml
diff --git a/src/usersim/engine/assets/financial_services/ko_KR/brokerage/garam_securities/tasks.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/ko_KR/brokerage/garam_securities/tasks.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/ko_KR/brokerage/garam_securities/tasks.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/ko_KR/brokerage/garam_securities/tasks.yaml
diff --git a/src/usersim/engine/assets/financial_services/ko_KR/brokerage/garam_securities/tools.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/ko_KR/brokerage/garam_securities/tools.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/ko_KR/brokerage/garam_securities/tools.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/ko_KR/brokerage/garam_securities/tools.yaml
diff --git a/src/usersim/engine/assets/financial_services/ko_KR/dynamic.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/ko_KR/dynamic.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/ko_KR/dynamic.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/ko_KR/dynamic.yaml
diff --git a/src/usersim/engine/assets/financial_services/ko_KR/insurer/dodam_life/corpus.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/ko_KR/insurer/dodam_life/corpus.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/ko_KR/insurer/dodam_life/corpus.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/ko_KR/insurer/dodam_life/corpus.yaml
diff --git a/src/usersim/engine/assets/financial_services/ko_KR/insurer/dodam_life/institution_meta.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/ko_KR/insurer/dodam_life/institution_meta.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/ko_KR/insurer/dodam_life/institution_meta.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/ko_KR/insurer/dodam_life/institution_meta.yaml
diff --git a/src/usersim/engine/assets/financial_services/ko_KR/insurer/dodam_life/tasks.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/ko_KR/insurer/dodam_life/tasks.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/ko_KR/insurer/dodam_life/tasks.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/ko_KR/insurer/dodam_life/tasks.yaml
diff --git a/src/usersim/engine/assets/financial_services/ko_KR/insurer/dodam_life/tools.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/ko_KR/insurer/dodam_life/tools.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/ko_KR/insurer/dodam_life/tools.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/ko_KR/insurer/dodam_life/tools.yaml
diff --git a/src/usersim/engine/assets/financial_services/ko_KR/nbfc/yeoul_card/corpus.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/ko_KR/nbfc/yeoul_card/corpus.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/ko_KR/nbfc/yeoul_card/corpus.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/ko_KR/nbfc/yeoul_card/corpus.yaml
diff --git a/src/usersim/engine/assets/financial_services/ko_KR/nbfc/yeoul_card/institution_meta.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/ko_KR/nbfc/yeoul_card/institution_meta.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/ko_KR/nbfc/yeoul_card/institution_meta.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/ko_KR/nbfc/yeoul_card/institution_meta.yaml
diff --git a/src/usersim/engine/assets/financial_services/ko_KR/nbfc/yeoul_card/tasks.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/ko_KR/nbfc/yeoul_card/tasks.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/ko_KR/nbfc/yeoul_card/tasks.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/ko_KR/nbfc/yeoul_card/tasks.yaml
diff --git a/src/usersim/engine/assets/financial_services/ko_KR/nbfc/yeoul_card/tools.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/ko_KR/nbfc/yeoul_card/tools.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/ko_KR/nbfc/yeoul_card/tools.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/ko_KR/nbfc/yeoul_card/tools.yaml
diff --git a/src/usersim/engine/assets/financial_services/ko_KR/neobank/mirinae_bank/corpus.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/ko_KR/neobank/mirinae_bank/corpus.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/ko_KR/neobank/mirinae_bank/corpus.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/ko_KR/neobank/mirinae_bank/corpus.yaml
diff --git a/src/usersim/engine/assets/financial_services/ko_KR/neobank/mirinae_bank/institution_meta.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/ko_KR/neobank/mirinae_bank/institution_meta.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/ko_KR/neobank/mirinae_bank/institution_meta.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/ko_KR/neobank/mirinae_bank/institution_meta.yaml
diff --git a/src/usersim/engine/assets/financial_services/ko_KR/neobank/mirinae_bank/tasks.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/ko_KR/neobank/mirinae_bank/tasks.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/ko_KR/neobank/mirinae_bank/tasks.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/ko_KR/neobank/mirinae_bank/tasks.yaml
diff --git a/src/usersim/engine/assets/financial_services/ko_KR/neobank/mirinae_bank/tools.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/ko_KR/neobank/mirinae_bank/tools.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/ko_KR/neobank/mirinae_bank/tools.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/ko_KR/neobank/mirinae_bank/tools.yaml
diff --git a/src/usersim/engine/assets/financial_services/ko_KR/region_meta.yaml b/src/usersim/engine/probes/financial_services/assets/financial_services/ko_KR/region_meta.yaml
similarity index 100%
rename from src/usersim/engine/assets/financial_services/ko_KR/region_meta.yaml
rename to src/usersim/engine/probes/financial_services/assets/financial_services/ko_KR/region_meta.yaml
diff --git a/src/usersim/engine/core/finance_bank.py b/src/usersim/engine/probes/financial_services/bank.py
similarity index 100%
rename from src/usersim/engine/core/finance_bank.py
rename to src/usersim/engine/probes/financial_services/bank.py
diff --git a/src/usersim/engine/core/embeddings.py b/src/usersim/engine/probes/financial_services/embeddings.py
similarity index 100%
rename from src/usersim/engine/core/embeddings.py
rename to src/usersim/engine/probes/financial_services/embeddings.py
diff --git a/src/usersim/engine/probes/financial_services/generator.py b/src/usersim/engine/probes/financial_services/probe.py
similarity index 99%
rename from src/usersim/engine/probes/financial_services/generator.py
rename to src/usersim/engine/probes/financial_services/probe.py
index 0da1a5ff..945e00fb 100644
--- a/src/usersim/engine/probes/financial_services/generator.py
+++ b/src/usersim/engine/probes/financial_services/probe.py
@@ -22,7 +22,7 @@
   at least one domain tool call before "user satisfied" can end the run).
 
 Gold metadata (gold docs / gold tool sequence / expected state deltas) is
-derived deterministically at sim time by ``core/finance_tasks.py`` and
+derived deterministically at sim time by ``probes/financial_services/tasks.py`` and
 persisted on the trajectory as side channels + top-level columns, so the
 deterministic scorer is self-contained (no re-derivation).
 """
@@ -42,18 +42,6 @@
     format_disclosure_instructions,
     format_interaction_style_instructions,
 )
-from usersim.engine.core.finance_bank import (
-    DEFAULT_DOMAIN_ACCOUNT_LABELS,
-    DEFAULT_IDENTITY_REQUIRED_FIELDS,
-    FinanceBank,
-    finance_bank_dir_for,
-    finance_bank_locale,
-    has_finance_tasks,
-    load_finance_bank,
-    load_finance_bank_for_locale,
-    reset_finance_bank_cache,
-)
-from usersim.engine.core.finance_tasks import FinanceInstance
 from usersim.engine.core.identity import persona_uuid as compute_persona_uuid
 from usersim.engine.core.locale import (
     expected_language_display,
@@ -87,6 +75,17 @@
 )
 from usersim.engine.probes.financial_services import retrieval as _retrieval
 from usersim.engine.probes.financial_services import tools as _tools
+from usersim.engine.probes.financial_services.bank import (
+    DEFAULT_DOMAIN_ACCOUNT_LABELS,
+    DEFAULT_IDENTITY_REQUIRED_FIELDS,
+    FinanceBank,
+    finance_bank_dir_for,
+    finance_bank_locale,
+    has_finance_tasks,
+    load_finance_bank,
+    load_finance_bank_for_locale,
+    reset_finance_bank_cache,
+)
 from usersim.engine.probes.financial_services.prompts import (
     DYNAMIC_FOLLOWUP_INSTRUCTION,
     DYNAMIC_USER_SYSTEM_PROMPT,
@@ -97,6 +96,7 @@
     derive_financial_literacy,
     derive_instance,
 )
+from usersim.engine.probes.financial_services.tasks import FinanceInstance
 
 logger = logging.getLogger("usersim.engine")
 
@@ -320,6 +320,7 @@ class _PickedTask:
 )
 class FinancialServicesProbe(ToolExecutionMixin, BankBackedProbe):
     label = "financial_services"
+    assets_root = Path(__file__).parent / "assets"
     description = (
         "Tests financial customer-support / advisory grounded in a per-institution "
         "knowledge base, across two tiers: verifiable (param-locked tasks scored by a "
@@ -830,7 +831,7 @@ async def execute_tool_call(
             # A query vector is only compared with the bank's document vectors;
             # without them it would be an embedding call whose result goes unused.
             if self._retrieval_mode in ("hybrid", "dense") and getattr(self._institution, "embeddings", None):
-                from usersim.engine.core.embeddings import aembed_query
+                from usersim.engine.probes.financial_services.embeddings import aembed_query
 
                 query_embedding = await aembed_query(
                     models,
diff --git a/src/usersim/engine/probes/financial_services/retrieval.py b/src/usersim/engine/probes/financial_services/retrieval.py
index 4219e86d..2b3371f4 100644
--- a/src/usersim/engine/probes/financial_services/retrieval.py
+++ b/src/usersim/engine/probes/financial_services/retrieval.py
@@ -72,8 +72,8 @@
 import unicodedata
 from typing import Sequence
 
-from usersim.engine.core.finance_bank import Document, Institution
 from usersim.engine.core.locale import HAN_RANGES, HANGUL_RANGES, HIRAGANA_RANGES, KATAKANA_RANGES
+from usersim.engine.probes.financial_services.bank import Document, Institution
 
 #: Han, kana and Hangul, plus the iteration mark 々, which repeats the Han
 #: character before it and so belongs to the same run.
diff --git a/src/usersim/engine/evaluator/scorers/financial_services.py b/src/usersim/engine/probes/financial_services/scorer.py
similarity index 98%
rename from src/usersim/engine/evaluator/scorers/financial_services.py
rename to src/usersim/engine/probes/financial_services/scorer.py
index ee795c1c..70ed67a8 100644
--- a/src/usersim/engine/evaluator/scorers/financial_services.py
+++ b/src/usersim/engine/probes/financial_services/scorer.py
@@ -76,7 +76,7 @@ def _bank_locale(locale: str) -> str:
     language variant or a Hindi locale without tasks of its own is scored
     against the ``en_IN`` bank its conversation used.
     """
-    from usersim.engine.core.finance_bank import finance_bank_locale
+    from usersim.engine.probes.financial_services.bank import finance_bank_locale
 
     return finance_bank_locale(locale)
 
@@ -90,7 +90,7 @@ def _ordered_subsequence(needles: list[str], haystack: list[str]) -> bool:
 def _side_effect_by_tool(locale: str, institution_id: str) -> dict[str, str]:
     """Map tool name -> side_effect_class, SCOPED to the row's institution."""
     try:
-        from usersim.engine.core.finance_bank import (
+        from usersim.engine.probes.financial_services.bank import (
             load_finance_bank_for_locale,
         )
 
@@ -122,7 +122,7 @@ def _document_types_by_id(locale: str, institution_id: str) -> dict[str, str]:
     parallel column has to be emitted and kept in sync with the id list.
     """
     try:
-        from usersim.engine.core.finance_bank import (
+        from usersim.engine.probes.financial_services.bank import (
             load_finance_bank_for_locale,
         )
 
@@ -171,7 +171,7 @@ def _allowed_tools_for_task(locale: str, institution_id: str, task_id: str) -> s
     if not institution_id or not task_id:
         return set()
     try:
-        from usersim.engine.core.finance_bank import (
+        from usersim.engine.probes.financial_services.bank import (
             load_finance_bank_for_locale,
         )
 
@@ -192,7 +192,7 @@ def _task_ordering_required(locale: str, institution_id: str, task_id: str) -> b
     if not institution_id or not task_id:
         return False
     try:
-        from usersim.engine.core.finance_bank import (
+        from usersim.engine.probes.financial_services.bank import (
             load_finance_bank_for_locale,
         )
 
@@ -453,7 +453,7 @@ def _dynamic_reference(
     bank-load failure yields empty reference so the judge still runs.
     """
     try:
-        from usersim.engine.core.finance_bank import (
+        from usersim.engine.probes.financial_services.bank import (
             load_finance_bank_for_locale,
         )
 
diff --git a/src/usersim/engine/probes/financial_services/task_derivation.py b/src/usersim/engine/probes/financial_services/task_derivation.py
index 3e471650..57b7dc83 100644
--- a/src/usersim/engine/probes/financial_services/task_derivation.py
+++ b/src/usersim/engine/probes/financial_services/task_derivation.py
@@ -14,8 +14,9 @@
 import random
 from typing import Any, Sequence
 
-from usersim.engine.core.finance_bank import FinanceBank
-from usersim.engine.core.finance_tasks import (
+from usersim.engine.core.probing_taxonomy import select_category
+from usersim.engine.probes.financial_services.bank import FinanceBank
+from usersim.engine.probes.financial_services.tasks import (
     FinanceInstance,
     _instance_seed,
     build_dynamic_instance,
@@ -23,7 +24,6 @@
     select_institution,
     select_institution_and_template,
 )
-from usersim.engine.core.probing_taxonomy import select_category
 
 
 def _age_bin(age: Any) -> str | None:
diff --git a/src/usersim/engine/core/finance_tasks.py b/src/usersim/engine/probes/financial_services/tasks.py
similarity index 99%
rename from src/usersim/engine/core/finance_tasks.py
rename to src/usersim/engine/probes/financial_services/tasks.py
index 55163198..79cc3150 100644
--- a/src/usersim/engine/core/finance_tasks.py
+++ b/src/usersim/engine/probes/financial_services/tasks.py
@@ -27,7 +27,7 @@
 from dataclasses import dataclass, field
 from typing import Any
 
-from usersim.engine.core.finance_bank import (
+from usersim.engine.probes.financial_services.bank import (
     FinanceBank,
     Institution,
     TaskTemplate,
diff --git a/src/usersim/engine/probes/financial_services/tools.py b/src/usersim/engine/probes/financial_services/tools.py
index 88557690..127f23f3 100644
--- a/src/usersim/engine/probes/financial_services/tools.py
+++ b/src/usersim/engine/probes/financial_services/tools.py
@@ -16,7 +16,7 @@
 import json
 from typing import Any, Sequence
 
-from usersim.engine.core.finance_bank import (
+from usersim.engine.probes.financial_services.bank import (
     Institution,
     framework_primitive_tool,
     verify_identity_schema,
@@ -35,7 +35,7 @@ def build_offered_tools(
     Permanent (non-discoverable) tools are offered by name; discoverable tools
     are reached only through the ``call_tool`` gate. Framework primitives
     (``kb_search`` / ``verify_identity``) use the canonical schema from
-    ``core.finance_bank`` so the assistant always sees their real parameters
+    ``probes.financial_services.bank`` so the assistant always sees their real parameters
     even if a bank asset ships them empty.
 
     ``identity_required_fields`` specializes ``verify_identity`` to the region's
diff --git a/src/usersim/selection/schemas.py b/src/usersim/selection/schemas.py
index 9907ac07..7039634c 100644
--- a/src/usersim/selection/schemas.py
+++ b/src/usersim/selection/schemas.py
@@ -71,7 +71,7 @@
     # tier -> verifier-labeled tool trajectories (gold_tool_sequence +
     # expected_state_deltas), the dynamic tier -> grounded SFT / preference
     # pairs (dynamic.* judge). All optional -> skipped for non-finance rows.
-    # SINGLE SOURCE OF TRUTH: financial_services.generator.FINANCE_TRAJECTORY_COLUMNS
+    # SINGLE SOURCE OF TRUTH: financial_services.probe.FINANCE_TRAJECTORY_COLUMNS
     # (kept decoupled here to avoid a plugin import in generic selection code; a
     # schema-parity test in tests/test_selection.py binds the two).
     "finance": (
diff --git a/src/usersim/taxonomy/capabilities.py b/src/usersim/taxonomy/capabilities.py
index 02613aae..754185b9 100644
--- a/src/usersim/taxonomy/capabilities.py
+++ b/src/usersim/taxonomy/capabilities.py
@@ -996,7 +996,7 @@ def _identity_pressure_by_strategy() -> tuple[CapabilityDefinition, ...]:
     "sov_ai_multilingual_parity": "src/usersim/engine/probes/sov_ai_multilingual_parity/probe.py",
     "safety_chat_pressure": "src/usersim/engine/probes/safety_chat_pressure/probe.py",
     "safety_agentic": "src/usersim/engine/probes/safety_agentic/probe.py",
-    "financial_services": "src/usersim/engine/probes/financial_services/generator.py",
+    "financial_services": "src/usersim/engine/probes/financial_services/probe.py",
 }
 
 _SCORER_IMPL_REFS = {
@@ -1009,7 +1009,7 @@ def _identity_pressure_by_strategy() -> tuple[CapabilityDefinition, ...]:
     "sov_ai_multilingual_parity": "src/usersim/engine/probes/sov_ai_multilingual_parity/scorer.py",
     "safety_chat_pressure": "src/usersim/engine/probes/safety_chat_pressure/scorer.py",
     "safety_agentic": "src/usersim/engine/probes/safety_agentic/scorer.py",
-    "financial_services": "src/usersim/engine/evaluator/scorers/financial_services.py",
+    "financial_services": "src/usersim/engine/probes/financial_services/scorer.py",
     "identity_disclosure": "src/usersim/engine/probes/identity_disclosure/scorer.py",
 }
 
@@ -1021,9 +1021,9 @@ def _identity_pressure_by_strategy() -> tuple[CapabilityDefinition, ...]:
     "response_conciseness": "src/usersim/engine/evaluator/axes.py",
     "safety": "src/usersim/engine/evaluator/axes.py",
     # financial_services verifier + dynamic.* judge axes both live in its scorer.
-    "finance.tool_selection_rate": ("src/usersim/engine/evaluator/scorers/financial_services.py"),
-    "dynamic.numeric_faithfulness": ("src/usersim/engine/evaluator/scorers/financial_services.py"),
-    "dynamic.no_fabrication": ("src/usersim/engine/evaluator/scorers/financial_services.py"),
+    "finance.tool_selection_rate": ("src/usersim/engine/probes/financial_services/scorer.py"),
+    "dynamic.numeric_faithfulness": ("src/usersim/engine/probes/financial_services/scorer.py"),
+    "dynamic.no_fabrication": ("src/usersim/engine/probes/financial_services/scorer.py"),
 }
 
 #: What each axis measures, in a reviewer's terms. Deterministic scorers compute a
diff --git a/tests/conftest.py b/tests/conftest.py
index 28e2073b..e6d668e5 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -35,9 +35,9 @@ def finance_assets_without_fr_tasks(tmp_path: Path) -> Path:
     """
     import shutil
 
-    from usersim.engine.core._assets import packaged_assets_dir
+    from usersim.engine.core._assets import probe_assets_dir
 
-    source = packaged_assets_dir() / "financial_services" / "en_US"
+    source = probe_assets_dir("financial_services") / "en_US"
     root = tmp_path / "assets"
     for locale in ("en_US", "fr_FR"):
         dest = root / "financial_services" / locale
diff --git a/tests/engine/core/test_assets_discovery.py b/tests/engine/core/test_assets_discovery.py
index ab72e7a7..7616953c 100644
--- a/tests/engine/core/test_assets_discovery.py
+++ b/tests/engine/core/test_assets_discovery.py
@@ -273,7 +273,9 @@ 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("financial_services").assets_dir() == packaged_assets_dir() / "financial_services"
+        assert (
+            resolve_probe("health_triage_disclosure").assets_dir() == packaged_assets_dir() / "health_triage_disclosure"
+        )
 
     def test_a_probe_reads_the_folder_under_its_declared_root(self, register_test_probe, tmp_path) -> None:
         (tmp_path / "ext_probe").mkdir()
diff --git a/tests/probes/financial_services/__init__.py b/tests/probes/financial_services/__init__.py
new file mode 100644
index 00000000..52a7a9da
--- /dev/null
+++ b/tests/probes/financial_services/__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/test_financial_services_e2e.py b/tests/probes/financial_services/test_e2e.py
similarity index 98%
rename from tests/test_financial_services_e2e.py
rename to tests/probes/financial_services/test_e2e.py
index d9e15df2..9c4ce49e 100644
--- a/tests/test_financial_services_e2e.py
+++ b/tests/probes/financial_services/test_e2e.py
@@ -25,13 +25,13 @@
 
 import pytest
 
-from usersim.engine.core.finance_bank import (
+from usersim.engine.evaluator.scorers import get_scorer, load_default_scorers
+from usersim.engine.probes.financial_services import scorer as FS
+from usersim.engine.probes.financial_services.bank import (
     load_finance_bank_for_locale,
     reset_finance_bank_cache,
 )
-from usersim.engine.evaluator.scorers import financial_services as FS
-from usersim.engine.evaluator.scorers import get_scorer, load_default_scorers
-from usersim.engine.probes.financial_services.generator import (
+from usersim.engine.probes.financial_services.probe import (
     FINANCE_TRAJECTORY_COLUMNS,
 )
 from usersim.reporting.capability_report import build_capability_report
diff --git a/tests/engine/probes/test_financial_services.py b/tests/probes/financial_services/test_probe.py
similarity index 98%
rename from tests/engine/probes/test_financial_services.py
rename to tests/probes/financial_services/test_probe.py
index 6406ac34..efd590e9 100644
--- a/tests/engine/probes/test_financial_services.py
+++ b/tests/probes/financial_services/test_probe.py
@@ -26,15 +26,7 @@
 
 import pytest
 
-from usersim.engine.core._assets import packaged_assets_dir
-from usersim.engine.core.finance_bank import (
-    FinanceBankError,
-    finance_bank_locale,
-    has_finance_tasks,
-    load_finance_bank,
-    load_finance_bank_for_locale,
-)
-from usersim.engine.core.finance_tasks import build_instance
+from usersim.engine.core._assets import probe_assets_dir
 from usersim.engine.core.outcomes import (
     OutcomeBuilder,
     Provenance,
@@ -46,14 +38,22 @@
     load_probing_taxonomy_for,
     reset_probing_taxonomy_cache,
 )
-from usersim.engine.evaluator.scorers import financial_services as FS
 from usersim.engine.evaluator.scorers import get_scorer, load_default_scorers
-from usersim.engine.probes.financial_services import generator as G
+from usersim.engine.probes.financial_services import probe as G
 from usersim.engine.probes.financial_services import retrieval as R
+from usersim.engine.probes.financial_services import scorer as FS
 from usersim.engine.probes.financial_services import tools as T
+from usersim.engine.probes.financial_services.bank import (
+    FinanceBankError,
+    finance_bank_locale,
+    has_finance_tasks,
+    load_finance_bank,
+    load_finance_bank_for_locale,
+)
 from usersim.engine.probes.financial_services.task_derivation import (
     derive_instance,
 )
+from usersim.engine.probes.financial_services.tasks import build_instance
 
 _PERSONA = {
     "first_name": "Yumi",
@@ -158,7 +158,7 @@ def _partition_committed_banks() -> tuple[list[Path], list[Path]]:
     Presence of ``region_meta.yaml`` alone is not enough: it marks a committed
     bank, not a bank with scenarios to run.
     """
-    banks_root = packaged_assets_dir() / "financial_services"
+    banks_root = probe_assets_dir("financial_services")
     locales = [p for p in sorted(banks_root.iterdir()) if (p / "region_meta.yaml").exists()]
     assert locales, f"no committed banks under {banks_root}"
     runnable = [p for p in locales if any(p.glob("*/*/tasks.yaml"))]
@@ -337,7 +337,7 @@ def test_retrieval_never_crosses_institutions():
 def test_dense_retrieval_ranks_by_cosine():
     """dense mode ranks the institution's precomputed vectors against the query
     vector by cosine; the doc whose vector points the same way ranks first."""
-    from usersim.engine.core.finance_bank import Document, Institution
+    from usersim.engine.probes.financial_services.bank import Document, Institution
 
     docs = (
         Document(
@@ -377,7 +377,7 @@ def test_dense_retrieval_ranks_by_cosine():
 def test_dense_retrieval_falls_back_to_lexical_without_query_vector():
     """No query embedding (offline / no endpoint) -> deterministic lexical rank,
     so dense mode never hard-fails a run."""
-    from usersim.engine.core.finance_bank import Document, Institution
+    from usersim.engine.probes.financial_services.bank import Document, Institution
 
     docs = (
         Document(
@@ -426,7 +426,7 @@ class TestHybridRetrieval:
 
     @staticmethod
     def _inst(embeddings):
-        from usersim.engine.core.finance_bank import Document, Institution
+        from usersim.engine.probes.financial_services.bank import Document, Institution
 
         docs = (
             # Short, and its body repeats the account-action vocabulary that shows
@@ -598,7 +598,7 @@ def share_for(mode):
 
 
 async def test_embed_query_soft_fails_to_none():
-    from usersim.engine.core.embeddings import aembed_query
+    from usersim.engine.probes.financial_services.embeddings import aembed_query
 
     class _Facade:
         async def agenerate_text_embeddings(self, texts):
@@ -629,7 +629,7 @@ def test_shipped_banks_carry_no_vectors_and_still_load():
     own via ``gen-assets``. The loader treats an absent sidecar as an empty map
     and retrieval stays on the lexical path.
     """
-    assets = packaged_assets_dir() / "financial_services"
+    assets = probe_assets_dir("financial_services")
     assert not list(assets.rglob("embeddings.parquet"))
 
     bank = load_finance_bank_for_locale("en_US")
@@ -1087,7 +1087,7 @@ def test_verify_identity_requires_name_and_dob():
     assert ok is False
 
     # the advertised schema marks both as required so the agent knows to collect them
-    from usersim.engine.core.finance_bank import framework_primitive_tool
+    from usersim.engine.probes.financial_services.bank import framework_primitive_tool
 
     req = framework_primitive_tool("verify_identity")["parameters"].get("required")
     assert req == ["full_name", "date_of_birth"]
@@ -1290,7 +1290,7 @@ def _dynamic_instance(institution_id="northwind_bank"):
     bank = load_finance_bank_for_locale("en_US")
     tax = _load_finance_taxonomy()
     inst = bank.institution(institution_id)
-    from usersim.engine.core.finance_tasks import build_dynamic_instance
+    from usersim.engine.probes.financial_services.tasks import build_dynamic_instance
 
     cat = tax.categories_for_type(inst.type)[0]
     return build_dynamic_instance(
@@ -1443,7 +1443,7 @@ async def test_allowed_tools_not_flagged_unauthorized():
 def test_tasks_ship_multiple_openings_varied_per_persona():
     """Verifiable tasks carry several opening phrasings; build_instance picks one
     deterministically per persona but varies across personas (generalizability)."""
-    from usersim.engine.core.finance_tasks import build_instance
+    from usersim.engine.probes.financial_services.tasks import build_instance
 
     bank = load_finance_bank_for_locale("en_US")
     inst = bank.institution("northwind_bank")
@@ -1882,7 +1882,9 @@ class TestQueryEmbedding:
     async def _search(probe):
         state = G.ConversationState(messages=[], metadata={})
         probe.seed_state_metadata(state)
-        with patch("usersim.engine.core.embeddings.aembed_query", return_value=[0.1, 0.2]) as embed:
+        with patch(
+            "usersim.engine.probes.financial_services.embeddings.aembed_query", return_value=[0.1, 0.2]
+        ) as embed:
             await probe.execute_tool_call(
                 "kb_search", {"query": "dispute a card charge"}, {}, state, {}, turn_idx=0, call_idx=0
             )
@@ -1979,7 +1981,7 @@ async def test_the_translated_query_is_what_retrieval_actually_ranks_on(self):
                 return_value=[],
             ) as retrieve,
             patch(
-                "usersim.engine.core.embeddings.aembed_query",
+                "usersim.engine.probes.financial_services.embeddings.aembed_query",
                 return_value=[0.1, 0.2],
             ) as embed,
         ):
@@ -2120,7 +2122,7 @@ def test_native_script_words_tokenize_whole(self):
         assert R._tokens(self.HINDI) == {"बचत", "खाते", "पर", "शुल्क"}
 
     def test_a_native_script_query_ranks_the_same_whatever_it_asks(self):
-        from usersim.engine.core.finance_bank import load_finance_bank_for_locale
+        from usersim.engine.probes.financial_services.bank import load_finance_bank_for_locale
 
         inst = load_finance_bank_for_locale("en_IN").institution("chandrika_bank")
         corpus = set().union(*(R._tokens(f"{d.title} {d.body}") for d in inst.documents))
@@ -2137,7 +2139,7 @@ def test_a_native_script_query_ranks_the_same_whatever_it_asks(self):
 
 def _institution_with(*docs):
     """An institution holding only the given ``(id, title, body)`` documents."""
-    from usersim.engine.core.finance_bank import Document, Institution
+    from usersim.engine.probes.financial_services.bank import Document, Institution
 
     return Institution(
         institution_id="acme",
@@ -2349,7 +2351,7 @@ def test_required_set_is_advertised_in_the_schema(self):
         An agent never told a PAN is required cannot collect one, so the region's
         required set has to show up in the offered tool schema too.
         """
-        from usersim.engine.core.finance_bank import verify_identity_schema
+        from usersim.engine.probes.financial_services.bank import verify_identity_schema
 
         schema = verify_identity_schema(("full_name", "date_of_birth", "pan"))
         assert schema["parameters"]["required"] == [
@@ -2427,7 +2429,7 @@ def test_money_follows_the_region(self):
         assert us.format_money("n/a") == "$n/a"
 
     def test_percentages_and_whole_amounts_follow_the_region(self):
-        from usersim.engine.core.finance_bank import format_amount, format_percent
+        from usersim.engine.probes.financial_services.bank import format_amount, format_percent
 
         assert format_percent(15.9, number_format="fr_FR") == "15,9 %"
         assert format_percent(1.70, number_format="de_DE") == "1,7 %"
@@ -2437,7 +2439,7 @@ def test_percentages_and_whole_amounts_follow_the_region(self):
         assert format_amount(7.9, currency_symbol="£", number_format="en_GB") == "£7.90"
 
     def test_yen_and_won_are_whole_amounts_with_the_unit_after(self):
-        from usersim.engine.core.finance_bank import format_percent
+        from usersim.engine.probes.financial_services.bank import format_percent
 
         japan = load_finance_bank_for_locale("ja_JP")
         korea = load_finance_bank_for_locale("ko_KR")
@@ -2526,7 +2528,7 @@ def test_opening_an_account_records_no_brand_name(self):
         assert state == {"opened_account_id": "acct_new_0001"}
 
     def test_the_kb_search_example_names_no_country_specific_product(self):
-        from usersim.engine.core.finance_bank import FRAMEWORK_PRIMITIVE_TOOLS
+        from usersim.engine.probes.financial_services.bank import FRAMEWORK_PRIMITIVE_TOOLS
 
         description = FRAMEWORK_PRIMITIVE_TOOLS["kb_search"]["parameters"]["properties"]["query"]["description"]
         assert "401(k)" not in description and "IRA" not in description
@@ -2788,7 +2790,7 @@ def test_task_persona_tags_are_reachable(self, locale):
     def test_dynamic_persona_affinities_are_reachable(self, locale):
         import yaml
 
-        path = packaged_assets_dir() / "financial_services" / locale / "dynamic.yaml"
+        path = probe_assets_dir("financial_services") / locale / "dynamic.yaml"
         categories = yaml.safe_load(path.read_text(encoding="utf-8"))["categories"]
         dead = {
             (cat["id"], tag)
@@ -2875,7 +2877,7 @@ def test_zero_searches_is_distinguishable_from_never_seeded(self):
         assert json.loads(extras["kb_search_queries"]) == []
 
     def test_columns_are_declared_in_the_contract(self):
-        from usersim.engine.probes.financial_services.generator import (
+        from usersim.engine.probes.financial_services.probe import (
             FINANCE_TRAJECTORY_COLUMNS,
         )
         from usersim.selection.schemas import LOGICAL_GROUPS
@@ -2897,7 +2899,7 @@ class TestSubstantiveRetrievalRate:
 
     @staticmethod
     def _rate(ids, locale="en_IN", inst="chandrika_bank"):
-        from usersim.engine.evaluator.scorers.financial_services import (
+        from usersim.engine.probes.financial_services.scorer import (
             _substantive_retrieval_rate,
         )
 
@@ -2997,7 +2999,7 @@ def test_no_locale_reports_checking_outside_its_own_region(self):
 
     def test_unauthored_domain_falls_back_to_a_region_neutral_label(self):
         """A locale that never authored the block must be generic, not US-flavoured."""
-        from usersim.engine.core.finance_bank import (
+        from usersim.engine.probes.financial_services.bank import (
             DEFAULT_DOMAIN_ACCOUNT_LABELS,
         )
 
@@ -3012,7 +3014,7 @@ def test_unauthored_domain_falls_back_to_a_region_neutral_label(self):
     def test_engine_default_and_asset_gen_default_agree(self):
         """Two copies of the same table drift; pin them to each other."""
         from usersim.asset_gen.financial_services.spec import DEFAULT_DOMAIN_ACCOUNT_LABELS as A
-        from usersim.engine.core.finance_bank import (
+        from usersim.engine.probes.financial_services.bank import (
             DEFAULT_DOMAIN_ACCOUNT_LABELS as B,
         )
 
@@ -3020,7 +3022,7 @@ def test_engine_default_and_asset_gen_default_agree(self):
 
     def test_authored_account_type_still_wins(self):
         """A task that names its own account type must not be overridden."""
-        from usersim.engine.probes.financial_services.generator import (
+        from usersim.engine.probes.financial_services.probe import (
             _resolve_accounts,
         )
 
@@ -3056,7 +3058,7 @@ def _all_task_param_spaces():
     """(locale, template_id, slot, values) for every authored param slot."""
     import yaml
 
-    root = packaged_assets_dir() / "financial_services"
+    root = probe_assets_dir("financial_services")
     for path in sorted(root.glob("*/*/*/tasks.yaml")):
         for tpl in yaml.safe_load(path.read_text())["templates"]:
             for slot, values in (tpl.get("param_space") or {}).items():
diff --git a/tests/test_asset_gen_pipeline.py b/tests/test_asset_gen_pipeline.py
index bbf33b38..9d1a116e 100644
--- a/tests/test_asset_gen_pipeline.py
+++ b/tests/test_asset_gen_pipeline.py
@@ -27,7 +27,7 @@
     serialize_bank,
 )
 from usersim.asset_gen.financial_services.spec import load_region_spec
-from usersim.engine.core._assets import packaged_assets_dir
+from usersim.engine.core._assets import probe_assets_dir
 
 
 def _asset_gen_dir() -> Path:
@@ -719,7 +719,7 @@ def test_shipped_english_titles_are_unchanged(self, locale: str):
         import yaml
 
         planned = self._plan_titles(locale)
-        root = packaged_assets_dir() / "financial_services" / locale
+        root = probe_assets_dir("financial_services") / locale
         titles = [
             d["title"] for corpus in root.rglob("corpus.yaml") for d in yaml.safe_load(corpus.read_text())["documents"]
         ]
@@ -735,7 +735,7 @@ def test_uk_corpus_follows_its_language_conventions(self):
 
         spec = load_region_spec(self._SPEC_DIR / "en_GB.yaml")
         assert spec.language_conventions.respell
-        report = validate_bank(packaged_assets_dir() / "financial_services" / "en_GB", spec)
+        report = validate_bank(probe_assets_dir("financial_services") / "en_GB", spec)
         results = [r for r in report.results if r.check == "language_conventions"]
         assert len(results) == len(spec.institutions)
         assert [r.detail for r in results if r.status == FAIL] == []
@@ -964,7 +964,7 @@ def test_explode_docset_uses_plan_uuid_for_id():
 
 
 def test_serialize_bank_round_trips_through_loader(tmp_path: Path):
-    from usersim.engine.core.finance_bank import load_finance_bank
+    from usersim.engine.probes.financial_services.bank import load_finance_bank
 
     region_meta = {
         "locale": "en_TT",
@@ -1034,7 +1034,7 @@ def test_serialize_bank_round_trips_through_loader(tmp_path: Path):
 def test_serialize_bank_writes_embedding_sidecar(tmp_path: Path):
     import pandas as pd
 
-    from usersim.engine.core.finance_bank import _load_embeddings
+    from usersim.engine.probes.financial_services.bank import _load_embeddings
 
     region_meta = {"locale": "en_TT", "domain_regulators": {}}
     inst = InstitutionBank(
diff --git a/tests/test_asset_gen_validate.py b/tests/test_asset_gen_validate.py
index c39277e8..295024cd 100644
--- a/tests/test_asset_gen_validate.py
+++ b/tests/test_asset_gen_validate.py
@@ -737,9 +737,9 @@ def test_symbols_and_dollar_amounts_are_plain_text(tmp_path: Path):
 
 
 def test_every_committed_bank_is_plain_text():
-    from usersim.engine.core._assets import packaged_assets_dir
+    from usersim.engine.core._assets import probe_assets_dir
 
-    banks = sorted(p.parent for p in (packaged_assets_dir() / "financial_services").glob("*/region_meta.yaml"))
+    banks = sorted(p.parent for p in probe_assets_dir("financial_services").glob("*/region_meta.yaml"))
     assert banks, "no committed banks found"
     for bank in banks:
         results = [r for r in validate_bank(bank, None).results if r.check == "plain_text"]
diff --git a/tests/test_cli.py b/tests/test_cli.py
index da977614..2fea32ab 100644
--- a/tests/test_cli.py
+++ b/tests/test_cli.py
@@ -838,7 +838,7 @@ def test_default_asset_dir_exists(self, command):
             "evaluate-assets": evaluate_assets,
             "gen-assets": gen_assets,
         }[command]
-        default = module.packaged_assets_dir() / "financial_services" / "en_US"
+        default = module.probe_assets_dir("financial_services", assets_root=module.packaged_assets_dir()) / "en_US"
         assert default.is_dir(), f"{command} default resolves to a missing dir: {default}"
         assert (default / "region_meta.yaml").exists() or any(default.iterdir())
 
diff --git a/tests/test_probe_names_in_shared_code.py b/tests/test_probe_names_in_shared_code.py
index ae91e36e..630ad7a5 100644
--- a/tests/test_probe_names_in_shared_code.py
+++ b/tests/test_probe_names_in_shared_code.py
@@ -33,10 +33,8 @@ class instead (``architecture/probes.md``, "What a probe declares").
     "cli/_pipeline.py": 7,
     "cli/smoke.py": 2,
     "engine/core/clinical_profile_bank.py": 4,
-    "engine/core/finance_bank.py": 1,
     "engine/core/preview.py": 3,
     "engine/evaluator/axes.py": 6,
-    "engine/evaluator/scorers/financial_services.py": 4,
     "reporting/capability_report.py": 1,
     "reporting/identity.py": 1,
     "taxonomy/capabilities.py": 41,
diff --git a/tests/test_selection.py b/tests/test_selection.py
index 5031798d..a146cf5b 100644
--- a/tests/test_selection.py
+++ b/tests/test_selection.py
@@ -623,7 +623,7 @@ def test_finance_group_matches_probe_contract(self):
         # Schema-parity guard across the package boundary: the selection
         # `finance` group must match the probe's canonical column contract, so
         # a rename/add on either side can't silently drop export columns.
-        from usersim.engine.probes.financial_services.generator import (
+        from usersim.engine.probes.financial_services.probe import (
             FINANCE_TRAJECTORY_COLUMNS,
         )
         from usersim.selection.schemas import LOGICAL_GROUPS

From b2563fcd72be8fed6e9aeaba68b1ce161c0af6b3 Mon Sep 17 00:00:00 2001
From: Yev Meyer <ymeyer@nvidia.com>
Date: Tue, 3 Nov 2026 14:32:54 -0500
Subject: [PATCH 3/3] refactor(asset_gen): keep the finance generator beside
 its probe

The financial_services generator, its region specs and its asset notebook are in probes/financial_services/asset_gen/, and asset_domain.py beside them builds the domain the asset commands dispatch to without importing the generator. usersim.asset_gen keeps the generic part: AssetDomain and the registry, whose BUILTIN_DOMAINS names each built-in domain's factory. The region specs ship through the engine package's YAML rule, the generator's tests are in tests/probes/financial_services/, and the shared-code label allowances drop the registry, which names no probe.

The domain's name, flags and region specs, and what the asset commands write, are unchanged. The pipeline logs under usersim.engine.probes.financial_services.asset_gen.pipeline.

Signed-off-by: Yev Meyer <ymeyer@nvidia.com>
---
 architecture/assets.md                        |   8 +-
 architecture/overview.md                      |   4 +-
 docs/notebooks.md                             |   2 +-
 notebooks/01_simulate.ipynb                   |   2 +-
 pyproject.toml                                |   8 +-
 src/usersim/asset_gen/__init__.py             |  23 +--
 src/usersim/asset_gen/registry.py             | 136 +++---------------
 .../probes/financial_services/README.md       |   4 +-
 .../probes/financial_services/asset_domain.py | 118 +++++++++++++++
 .../financial_services/asset_gen}/__init__.py |   2 +-
 .../financial_services/asset_gen}/evaluate.py |   8 +-
 .../asset_gen/notebooks/finance_assets.ipynb  |   6 +-
 .../financial_services/asset_gen}/pipeline.py |   8 +-
 .../financial_services/asset_gen}/prompts.py  |   0
 .../asset_gen}/region_spec/de_DE.yaml         |   2 +-
 .../asset_gen}/region_spec/en_GB.yaml         |   2 +-
 .../asset_gen}/region_spec/en_IN.yaml         |   2 +-
 .../asset_gen}/region_spec/en_US.yaml         |   4 +-
 .../asset_gen}/region_spec/fr_FR.yaml         |   2 +-
 .../asset_gen}/region_spec/hi_Deva_IN.yaml    |   0
 .../asset_gen}/region_spec/ja_JP.yaml         |   2 +-
 .../asset_gen}/region_spec/ko_KR.yaml         |   2 +-
 .../financial_services/asset_gen}/spec.py     |   0
 .../financial_services/asset_gen}/validate.py |   2 +-
 .../assets/financial_services/SCHEMA.md       |   2 +-
 .../engine/probes/financial_services/bank.py  |   4 +-
 .../test_asset_gen_evaluate.py                |  14 +-
 .../test_asset_gen_pipeline.py                |  80 +++++------
 .../test_asset_gen_region_spec.py             |  87 +++++------
 .../test_asset_gen_validate.py                |  26 ++--
 tests/probes/financial_services/test_probe.py |   6 +-
 tests/test_probe_names_in_shared_code.py      |   1 -
 32 files changed, 292 insertions(+), 275 deletions(-)
 create mode 100644 src/usersim/engine/probes/financial_services/asset_domain.py
 rename src/usersim/{asset_gen/financial_services => engine/probes/financial_services/asset_gen}/__init__.py (89%)
 rename src/usersim/{asset_gen/financial_services => engine/probes/financial_services/asset_gen}/evaluate.py (97%)
 rename src/usersim/{ => engine/probes/financial_services}/asset_gen/notebooks/finance_assets.ipynb (98%)
 rename src/usersim/{asset_gen/financial_services => engine/probes/financial_services/asset_gen}/pipeline.py (99%)
 rename src/usersim/{asset_gen/financial_services => engine/probes/financial_services/asset_gen}/prompts.py (100%)
 rename src/usersim/{asset_gen/financial_services => engine/probes/financial_services/asset_gen}/region_spec/de_DE.yaml (99%)
 rename src/usersim/{asset_gen/financial_services => engine/probes/financial_services/asset_gen}/region_spec/en_GB.yaml (99%)
 rename src/usersim/{asset_gen/financial_services => engine/probes/financial_services/asset_gen}/region_spec/en_IN.yaml (99%)
 rename src/usersim/{asset_gen/financial_services => engine/probes/financial_services/asset_gen}/region_spec/en_US.yaml (98%)
 rename src/usersim/{asset_gen/financial_services => engine/probes/financial_services/asset_gen}/region_spec/fr_FR.yaml (99%)
 rename src/usersim/{asset_gen/financial_services => engine/probes/financial_services/asset_gen}/region_spec/hi_Deva_IN.yaml (100%)
 rename src/usersim/{asset_gen/financial_services => engine/probes/financial_services/asset_gen}/region_spec/ja_JP.yaml (99%)
 rename src/usersim/{asset_gen/financial_services => engine/probes/financial_services/asset_gen}/region_spec/ko_KR.yaml (99%)
 rename src/usersim/{asset_gen/financial_services => engine/probes/financial_services/asset_gen}/spec.py (100%)
 rename src/usersim/{asset_gen/financial_services => engine/probes/financial_services/asset_gen}/validate.py (99%)
 rename tests/{ => probes/financial_services}/test_asset_gen_evaluate.py (93%)
 rename tests/{ => probes/financial_services}/test_asset_gen_pipeline.py (93%)
 rename tests/{ => probes/financial_services}/test_asset_gen_region_spec.py (93%)
 rename tests/{ => probes/financial_services}/test_asset_gen_validate.py (96%)

diff --git a/architecture/assets.md b/architecture/assets.md
index 6587c443..79dbada0 100644
--- a/architecture/assets.md
+++ b/architecture/assets.md
@@ -92,9 +92,11 @@ Each domain's region specs (`<locale>.yaml`, one per locale it can generate)
 ship as package data, so all three commands find them from an installed
 package without `--region-spec`.
 
-Domains are discovered through the `usersim.asset_domains` entry point, so a
-new domain does not require modifying this project. See
-[plugins.md](plugins.md).
+A built-in domain's generator lives beside the probe whose banks it builds:
+`financial_services` keeps its generator, region specs and asset notebook in
+its folder's `asset_gen/`. Other domains are discovered through the
+`usersim.asset_domains` entry point, so a new domain does not require
+modifying this project. See [plugins.md](plugins.md).
 
 ## Every entry declares its provenance
 
diff --git a/architecture/overview.md b/architecture/overview.md
index 890dd997..d0f929f0 100644
--- a/architecture/overview.md
+++ b/architecture/overview.md
@@ -52,7 +52,7 @@ the arrow pointing one direction, and a test enforces it.
 | `usersim.reporting` | Turning parquets into a capability dashboard | [reporting.md](reporting.md) |
 | `usersim.selection` | Curating trajectories into exportable datasets | [selection.md](selection.md) |
 | `usersim.taxonomy` | The shared vocabulary of capabilities and evidence | above |
-| `usersim.asset_gen` | Generating new asset banks for a domain | [assets.md](assets.md) |
+| `usersim.asset_gen` | Dispatching asset-bank generation to a domain's generator | [assets.md](assets.md) |
 | `usersim.testing` | Conformance checks and the test harness for extensions you write | [plugins.md](plugins.md) |
 
 Probes get their own page: [probes.md](probes.md) for the substrate,
@@ -94,7 +94,7 @@ src/usersim/
 ├── reporting/         capability dashboard and model comparison
 ├── selection/         trajectory curation and export
 ├── taxonomy/          capability definitions, evaluation-cell decoding
-├── asset_gen/         asset-bank generation
+├── asset_gen/         the asset-domain registry the asset commands dispatch through
 └── testing/           conformance suites for extension authors
 
 architecture/          this directory
diff --git a/docs/notebooks.md b/docs/notebooks.md
index 5dee2caf..ea9d756d 100644
--- a/docs/notebooks.md
+++ b/docs/notebooks.md
@@ -45,7 +45,7 @@ to shape training records. `tests/test_extraction_example.py` pins the schema co
 pairwise shapes, confirming the trajectory and evaluation columns are
 sufficient to drive them.
 
-**[`finance_assets.ipynb`](../src/usersim/asset_gen/notebooks/finance_assets.ipynb)**
+**[`finance_assets.ipynb`](../src/usersim/engine/probes/financial_services/asset_gen/notebooks/finance_assets.ipynb)**
 generates and vets a `financial_services` asset bank: it drives
 `usersim gen-assets`, `validate-assets` and `evaluate-assets`, then previews
 the result. Its generate and evaluate cells make live, billable model calls;
diff --git a/notebooks/01_simulate.ipynb b/notebooks/01_simulate.ipynb
index fe69a091..987d8fbd 100644
--- a/notebooks/01_simulate.ipynb
+++ b/notebooks/01_simulate.ipynb
@@ -418,7 +418,7 @@
     "its own, task set included, before you add it to `LOCALES` (see\n",
     "[Authoring a new locale](../src/usersim/engine/probes/financial_services/README.md#authoring-a-new-locale)).\n",
     "The banks are produced offline (see\n",
-    "[`src/usersim/asset_gen/notebooks/finance_assets.ipynb`](../src/usersim/asset_gen/notebooks/finance_assets.ipynb))\n",
+    "[`src/usersim/engine/probes/financial_services/asset_gen/notebooks/finance_assets.ipynb`](../src/usersim/engine/probes/financial_services/asset_gen/notebooks/finance_assets.ipynb))\n",
     "and managed with three CLI commands:\n",
     "\n",
     "```bash\n",
diff --git a/pyproject.toml b/pyproject.toml
index efd54889..a7c65677 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -178,14 +178,10 @@ include = ["usersim*"]
     "probes/*/assets/**/*.json",
     "probes/*/assets/**/*.parquet",
     "probes/*/assets/**/*.md",
+    # Every other YAML, the region specs an asset domain beside its probe reads
+    # among them: without those an installed package reports no locales to generate.
     "**/*.yaml",
 ]
-"usersim.asset_gen" = [
-    # The region specs gen-assets, validate-assets and evaluate-assets read
-    # when no --region-spec is given. Without them an installed package
-    # reports no locales to generate.
-    "*/region_spec/*.yaml",
-]
 
 [tool.setuptools.exclude-package-data]
 # Retrieval embeds each query with the model that produced the corpus vectors,
diff --git a/src/usersim/asset_gen/__init__.py b/src/usersim/asset_gen/__init__.py
index 6034b2ec..d02c1a18 100644
--- a/src/usersim/asset_gen/__init__.py
+++ b/src/usersim/asset_gen/__init__.py
@@ -1,22 +1,11 @@
 # SPDX-FileCopyrightText: Copyright (c) 2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-"""asset_gen — offline Data Designer generation of financial_services assets.
+"""asset_gen: the generic dispatch for building asset banks offline.
 
-Repo-root package (parallels ``reporting/`` and ``selection/``) that authors the
-committed ``assets/financial_services/<locale>/`` banks the runtime probe/scorer
-consume. It imports the plugin (for the shared gold-derivation resolver + bank
-schema) but the plugin never imports it — the dependency arrow is one-way.
-
-Layout:
-
-- ``asset_gen/financial_services/spec.py`` — the region_spec contract as Pydantic
-  models (the shared vocabulary + validation).
-- ``asset_gen/financial_services/pipeline.py`` — the whole Data Designer flow:
-  schemas -> prompt -> seed plan -> column DAG -> explode -> serialize.
-- ``asset_gen/financial_services/region_spec/*.yaml`` — the committed structured
-  seed per region (the generation input; data, not code).
-
-See the probe design doc:
-``src/usersim/engine/probes/financial_services/README.md``.
+``registry.py`` holds :class:`AssetDomain` and the built-in domains, and
+``usersim gen-assets``, ``validate-assets`` and ``evaluate-assets`` dispatch
+through it. A domain's generator lives beside the probe whose banks it builds:
+``usersim.engine.probes.financial_services.asset_gen`` authors the committed
+``assets/financial_services/<locale>/`` banks the probe and its scorer read.
 """
diff --git a/src/usersim/asset_gen/registry.py b/src/usersim/asset_gen/registry.py
index 5baddc2b..84b17894 100644
--- a/src/usersim/asset_gen/registry.py
+++ b/src/usersim/asset_gen/registry.py
@@ -10,8 +10,9 @@
 flags. The heavy domain modules are imported lazily inside the callables so
 ``usersim --help`` stays fast; ``add_gen_args`` is pure argparse (no import).
 
-Adding a new domain (e.g. healthcare) = a new ``asset_gen/<domain>/`` package + one
-factory here; no new CLI subcommands. There is deliberately NO generic
+A built-in domain lives beside the probe whose banks it builds and is named in
+``BUILTIN_DOMAINS``; an extension's domain registers under ``usersim.asset_domains``.
+Neither adds a CLI subcommand. There is deliberately NO generic
 ``asset_gen/core/`` engine -- generation internals are domain-specific; only this
 thin dispatch is shared.
 """
@@ -19,12 +20,11 @@
 from __future__ import annotations
 
 import argparse
+import importlib
 from dataclasses import dataclass
 from pathlib import Path
 from typing import Any, Callable
 
-_ROOT = Path(__file__).resolve().parent  # asset_gen/
-
 
 @dataclass(frozen=True)
 class AssetDomain:
@@ -45,107 +45,21 @@ class AssetDomain:
     evaluate: Callable[..., Any] | None = None
 
 
-# ── financial_services domain ───────────────────────────────────────────
-
-
-def _financial_services() -> AssetDomain:
-    def add_gen_args(p: argparse.ArgumentParser) -> None:
-        # Defaults are None so the single source of truth stays the pipeline
-        # constants (DEFAULT_DOCS_PER_PRODUCT / DEFAULT_MAX_DOCS_PER_CLUSTER),
-        # resolved in describe_plan / generate. Keeps add_gen_args import-free
-        # (fast --help) while avoiding a drifting duplicate default.
-        p.add_argument(
-            "--docs-per-product",
-            type=int,
-            default=None,
-            help="[financial_services] target docs per product cluster (default: pipeline DEFAULT_DOCS_PER_PRODUCT).",
-        )
-        p.add_argument(
-            "--max-docs-per-cluster",
-            type=int,
-            default=None,
-            help="[financial_services] per-call cap; larger targets fan into "
-            "batches (default: pipeline DEFAULT_MAX_DOCS_PER_CLUSTER).",
-        )
-
-    def load_spec(path: Any) -> Any:
-        from usersim.asset_gen.financial_services.spec import load_region_spec
-
-        return load_region_spec(path)
-
-    def describe_plan(spec: Any, args: argparse.Namespace) -> None:
-        from collections import Counter
-
-        from usersim.asset_gen.financial_services.pipeline import (
-            DEFAULT_DOCS_PER_PRODUCT,
-            DEFAULT_MAX_DOCS_PER_CLUSTER,
-            _batches,
-            build_product_doc_plan,
-            build_shared_doc_plan,
-        )
-
-        dpp = args.docs_per_product if args.docs_per_product is not None else DEFAULT_DOCS_PER_PRODUCT
-        cap = args.max_docs_per_cluster if args.max_docs_per_cluster is not None else DEFAULT_MAX_DOCS_PER_CLUSTER
-        by_type: Counter = Counter()
-        total_docs = total_clusters = 0
-        print(f"  docs_per_product={dpp}  max_docs_per_cluster={cap}")
-        print(f"  institutions: {len(spec.institutions)} ({', '.join(i.id for i in spec.institutions)})")
-        for inst in spec.institutions:
-            clusters = []
-            for product in inst.products:
-                for batch in _batches(build_product_doc_plan(product, dpp), cap):
-                    clusters.append(len(batch))
-                    by_type.update(d["document_type"] for d in batch)
-            for batch in _batches(build_shared_doc_plan(inst), cap):
-                clusters.append(len(batch))
-                by_type.update(d["document_type"] for d in batch)
-            inst_docs = sum(clusters)
-            total_docs += inst_docs
-            total_clusters += len(clusters)
-            print(
-                f"    - {inst.id}: 1 brief + {len(clusters)} cluster call(s) "
-                f"({len(inst.products)} product + shared) -> {inst_docs} docs"
-            )
-        print(f"  total: {total_clusters} cluster calls -> {total_docs} documents")
-        print(f"  by document_type: {dict(by_type)}")
-
-    def generate(spec: Any, models: Any, out_dir: Any, args: argparse.Namespace) -> Any:
-        from usersim.asset_gen.financial_services.pipeline import (
-            DEFAULT_DOCS_PER_PRODUCT,
-            DEFAULT_MAX_DOCS_PER_CLUSTER,
-            generate_corpus,
-        )
-
-        return generate_corpus(
-            spec,
-            models,
-            out_dir,
-            docs_per_product=(args.docs_per_product if args.docs_per_product is not None else DEFAULT_DOCS_PER_PRODUCT),
-            max_docs_per_cluster=(
-                args.max_docs_per_cluster if args.max_docs_per_cluster is not None else DEFAULT_MAX_DOCS_PER_CLUSTER
-            ),
-        )
-
-    def validate(bank_dir: Any, spec: Any | None) -> Any:
-        from usersim.asset_gen.financial_services.validate import validate_bank
-
-        return validate_bank(bank_dir, spec)
-
-    def evaluate(bank_dir: Any, spec: Any | None, models: Any) -> Any:
-        from usersim.asset_gen.financial_services.evaluate import evaluate_bank
-
-        return evaluate_bank(bank_dir, spec, models)
-
-    return AssetDomain(
-        name="financial_services",
-        region_spec_dir=_ROOT / "financial_services" / "region_spec",
-        add_gen_args=add_gen_args,
-        load_spec=load_spec,
-        describe_plan=describe_plan,
-        generate=generate,
-        validate=validate,
-        evaluate=evaluate,
-    )
+# ── built-in domains ─────────────────────────────────────────────────────
+
+#: The built-in domains, each a ``module:function`` naming a zero-argument factory
+#: that returns the domain. A built-in domain lives beside the probe whose banks
+#: it builds, in a module that imports none of its generator.
+BUILTIN_DOMAINS: tuple[str, ...] = ("usersim.engine.probes.financial_services.asset_domain:asset_domain",)
+
+
+def _builtin_domains() -> dict[str, AssetDomain]:
+    domains = {}
+    for target in BUILTIN_DOMAINS:
+        module, _, factory = target.partition(":")
+        domain = getattr(importlib.import_module(module), factory)()
+        domains[domain.name] = domain
+    return domains
 
 
 # ── registry access ──────────────────────────────────────────────────────
@@ -157,19 +71,15 @@ def _domains() -> dict[str, AssetDomain]:
     """Built-in domains merged with any advertised under ``usersim.asset_domains``.
 
     An entry point may resolve to an ``AssetDomain`` or to a zero-argument
-    factory returning one, matching how the built-ins are constructed lazily
-    here — building a domain eagerly at import time would drag its pipeline
-    dependencies into every ``--help``.
+    factory returning one, as each built-in is a factory. A domain imports its
+    pipeline inside its callables; building one eagerly at import time would drag
+    those dependencies into every ``--help``.
     """
     global _DOMAINS
     if _DOMAINS is None:
         from usersim.engine.core._extensions import ASSET_DOMAINS, merge_extensions
 
-        merged = merge_extensions(
-            ASSET_DOMAINS,
-            {"financial_services": _financial_services()},
-            what="asset domain",
-        )
+        merged = merge_extensions(ASSET_DOMAINS, _builtin_domains(), what="asset domain")
         _DOMAINS = {name: obj if isinstance(obj, AssetDomain) else obj() for name, obj in merged.items()}
     return _DOMAINS
 
diff --git a/src/usersim/engine/probes/financial_services/README.md b/src/usersim/engine/probes/financial_services/README.md
index 5cd262c8..07e2fe26 100644
--- a/src/usersim/engine/probes/financial_services/README.md
+++ b/src/usersim/engine/probes/financial_services/README.md
@@ -333,7 +333,7 @@ faithfulness, language/script, plain text, near-duplicates, coverage, scope) and
 `evaluate-assets` runs an LLM-judge scorecard. Document ids are stable across
 regenerations, and a task's gold documents are derived from its tool sequence at
 load time. The authoring workflow lives in
-[finance_assets.ipynb](../../../asset_gen/notebooks/finance_assets.ipynb),
+[finance_assets.ipynb](asset_gen/notebooks/finance_assets.ipynb),
 and the asset contract in
 [SCHEMA.md](assets/financial_services/SCHEMA.md).
 
@@ -524,4 +524,4 @@ Related code elsewhere:
 | Capabilities | `taxonomy/capabilities.py` |
 | Training-export columns | `selection/schemas.py` (`finance` group) |
 | Assets + schema | `assets/financial_services/<locale>/` + `assets/financial_services/SCHEMA.md` |
-| Offline generation | `asset_gen/financial_services/` + `asset_gen/notebooks/finance_assets.ipynb` |
+| Offline generation | `asset_gen/` + `asset_gen/notebooks/finance_assets.ipynb` |
diff --git a/src/usersim/engine/probes/financial_services/asset_domain.py b/src/usersim/engine/probes/financial_services/asset_domain.py
new file mode 100644
index 00000000..24c3bc1f
--- /dev/null
+++ b/src/usersim/engine/probes/financial_services/asset_domain.py
@@ -0,0 +1,118 @@
+# SPDX-FileCopyrightText: Copyright (c) 2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+"""The ``financial_services`` asset domain: how ``usersim gen-assets`` builds its banks.
+
+:func:`asset_domain` returns the :class:`AssetDomain` the asset commands dispatch
+to. The generator, the validation gate and the judge scorecard live in
+``asset_gen/`` beside this module and are imported inside the callables, so
+listing the domains, as ``usersim --help`` does, imports none of them.
+"""
+
+from __future__ import annotations
+
+import argparse
+from pathlib import Path
+from typing import Any
+
+from usersim.extension import AssetDomain
+
+
+def asset_domain() -> AssetDomain:
+    def add_gen_args(p: argparse.ArgumentParser) -> None:
+        # Defaults are None so the single source of truth stays the pipeline
+        # constants (DEFAULT_DOCS_PER_PRODUCT / DEFAULT_MAX_DOCS_PER_CLUSTER),
+        # resolved in describe_plan / generate. Keeps add_gen_args import-free
+        # (fast --help) while avoiding a drifting duplicate default.
+        p.add_argument(
+            "--docs-per-product",
+            type=int,
+            default=None,
+            help="[financial_services] target docs per product cluster (default: pipeline DEFAULT_DOCS_PER_PRODUCT).",
+        )
+        p.add_argument(
+            "--max-docs-per-cluster",
+            type=int,
+            default=None,
+            help="[financial_services] per-call cap; larger targets fan into "
+            "batches (default: pipeline DEFAULT_MAX_DOCS_PER_CLUSTER).",
+        )
+
+    def load_spec(path: Any) -> Any:
+        from usersim.engine.probes.financial_services.asset_gen.spec import load_region_spec
+
+        return load_region_spec(path)
+
+    def describe_plan(spec: Any, args: argparse.Namespace) -> None:
+        from collections import Counter
+
+        from usersim.engine.probes.financial_services.asset_gen.pipeline import (
+            DEFAULT_DOCS_PER_PRODUCT,
+            DEFAULT_MAX_DOCS_PER_CLUSTER,
+            _batches,
+            build_product_doc_plan,
+            build_shared_doc_plan,
+        )
+
+        dpp = args.docs_per_product if args.docs_per_product is not None else DEFAULT_DOCS_PER_PRODUCT
+        cap = args.max_docs_per_cluster if args.max_docs_per_cluster is not None else DEFAULT_MAX_DOCS_PER_CLUSTER
+        by_type: Counter = Counter()
+        total_docs = total_clusters = 0
+        print(f"  docs_per_product={dpp}  max_docs_per_cluster={cap}")
+        print(f"  institutions: {len(spec.institutions)} ({', '.join(i.id for i in spec.institutions)})")
+        for inst in spec.institutions:
+            clusters = []
+            for product in inst.products:
+                for batch in _batches(build_product_doc_plan(product, dpp), cap):
+                    clusters.append(len(batch))
+                    by_type.update(d["document_type"] for d in batch)
+            for batch in _batches(build_shared_doc_plan(inst), cap):
+                clusters.append(len(batch))
+                by_type.update(d["document_type"] for d in batch)
+            inst_docs = sum(clusters)
+            total_docs += inst_docs
+            total_clusters += len(clusters)
+            print(
+                f"    - {inst.id}: 1 brief + {len(clusters)} cluster call(s) "
+                f"({len(inst.products)} product + shared) -> {inst_docs} docs"
+            )
+        print(f"  total: {total_clusters} cluster calls -> {total_docs} documents")
+        print(f"  by document_type: {dict(by_type)}")
+
+    def generate(spec: Any, models: Any, out_dir: Any, args: argparse.Namespace) -> Any:
+        from usersim.engine.probes.financial_services.asset_gen.pipeline import (
+            DEFAULT_DOCS_PER_PRODUCT,
+            DEFAULT_MAX_DOCS_PER_CLUSTER,
+            generate_corpus,
+        )
+
+        return generate_corpus(
+            spec,
+            models,
+            out_dir,
+            docs_per_product=(args.docs_per_product if args.docs_per_product is not None else DEFAULT_DOCS_PER_PRODUCT),
+            max_docs_per_cluster=(
+                args.max_docs_per_cluster if args.max_docs_per_cluster is not None else DEFAULT_MAX_DOCS_PER_CLUSTER
+            ),
+        )
+
+    def validate(bank_dir: Any, spec: Any | None) -> Any:
+        from usersim.engine.probes.financial_services.asset_gen.validate import validate_bank
+
+        return validate_bank(bank_dir, spec)
+
+    def evaluate(bank_dir: Any, spec: Any | None, models: Any) -> Any:
+        from usersim.engine.probes.financial_services.asset_gen.evaluate import evaluate_bank
+
+        return evaluate_bank(bank_dir, spec, models)
+
+    return AssetDomain(
+        name="financial_services",
+        region_spec_dir=Path(__file__).resolve().parent / "asset_gen" / "region_spec",
+        add_gen_args=add_gen_args,
+        load_spec=load_spec,
+        describe_plan=describe_plan,
+        generate=generate,
+        validate=validate,
+        evaluate=evaluate,
+    )
diff --git a/src/usersim/asset_gen/financial_services/__init__.py b/src/usersim/engine/probes/financial_services/asset_gen/__init__.py
similarity index 89%
rename from src/usersim/asset_gen/financial_services/__init__.py
rename to src/usersim/engine/probes/financial_services/asset_gen/__init__.py
index 2e348aba..e4663aa8 100644
--- a/src/usersim/asset_gen/financial_services/__init__.py
+++ b/src/usersim/engine/probes/financial_services/asset_gen/__init__.py
@@ -7,7 +7,7 @@
 validates them and ``pipeline.py`` expands them into a per-institution asset bank.
 """
 
-from usersim.asset_gen.financial_services.spec import (
+from usersim.engine.probes.financial_services.asset_gen.spec import (
     RegionSpec,
     RegionSpecError,
     load_region_spec,
diff --git a/src/usersim/asset_gen/financial_services/evaluate.py b/src/usersim/engine/probes/financial_services/asset_gen/evaluate.py
similarity index 97%
rename from src/usersim/asset_gen/financial_services/evaluate.py
rename to src/usersim/engine/probes/financial_services/asset_gen/evaluate.py
index f577ed52..bc55bc6e 100644
--- a/src/usersim/asset_gen/financial_services/evaluate.py
+++ b/src/usersim/engine/probes/financial_services/asset_gen/evaluate.py
@@ -24,8 +24,8 @@
 from pathlib import Path
 from typing import Any
 
-from usersim.asset_gen.financial_services.prompts import EVAL_PROMPT
-from usersim.asset_gen.financial_services.spec import RegionSpec
+from usersim.engine.probes.financial_services.asset_gen.prompts import EVAL_PROMPT
+from usersim.engine.probes.financial_services.asset_gen.spec import RegionSpec
 
 #: judge model alias (distinct from the doc-gen model to avoid self-preference).
 EVAL_JUDGE_MODEL_ALIAS = "asset_judge_model"
@@ -147,7 +147,7 @@ def build_eval_seed(bank_dir: str | Path, region_spec: RegionSpec | None):
     """
     import pandas as pd
 
-    from usersim.asset_gen.financial_services.validate import _read_bank
+    from usersim.engine.probes.financial_services.asset_gen.validate import _read_bank
 
     bank_dir = Path(bank_dir)
     region_meta, insts = _read_bank(bank_dir)
@@ -308,7 +308,7 @@ def evaluate_bank(
 
     import data_designer.config as dd
 
-    from usersim.asset_gen.financial_services.pipeline import _make_engine
+    from usersim.engine.probes.financial_services.asset_gen.pipeline import _make_engine
     from usersim.extension import to_model_configs
 
     seed = build_eval_seed(bank_dir, region_spec)
diff --git a/src/usersim/asset_gen/notebooks/finance_assets.ipynb b/src/usersim/engine/probes/financial_services/asset_gen/notebooks/finance_assets.ipynb
similarity index 98%
rename from src/usersim/asset_gen/notebooks/finance_assets.ipynb
rename to src/usersim/engine/probes/financial_services/asset_gen/notebooks/finance_assets.ipynb
index df2addbb..2c81bb54 100644
--- a/src/usersim/asset_gen/notebooks/finance_assets.ipynb
+++ b/src/usersim/engine/probes/financial_services/asset_gen/notebooks/finance_assets.ipynb
@@ -256,7 +256,7 @@
    "outputs": [],
    "source": [
     "import json, yaml\n",
-    "from usersim.asset_gen.financial_services.spec import load_region_spec\n",
+    "from usersim.engine.probes.financial_services.asset_gen.spec import load_region_spec\n",
     "\n",
     "# Defined here and reused by the quality cell below.\n",
     "spec = load_region_spec(REGION_SPEC) if REGION_SPEC.exists() else None\n",
@@ -319,11 +319,11 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from usersim.asset_gen.financial_services.validate import validate_bank\n",
+    "from usersim.engine.probes.financial_services.asset_gen.validate import validate_bank\n",
     "\n",
     "# Re-derive if this cell is run without the preview cell above.\n",
     "if \"spec\" not in dir():\n",
-    "    from usersim.asset_gen.financial_services.spec import load_region_spec\n",
+    "    from usersim.engine.probes.financial_services.asset_gen.spec import load_region_spec\n",
     "    spec = load_region_spec(REGION_SPEC) if REGION_SPEC.exists() else None\n",
     "if \"gr\" not in dir():\n",
     "    import json as _json\n",
diff --git a/src/usersim/asset_gen/financial_services/pipeline.py b/src/usersim/engine/probes/financial_services/asset_gen/pipeline.py
similarity index 99%
rename from src/usersim/asset_gen/financial_services/pipeline.py
rename to src/usersim/engine/probes/financial_services/asset_gen/pipeline.py
index 18d8b968..2b6d8104 100644
--- a/src/usersim/asset_gen/financial_services/pipeline.py
+++ b/src/usersim/engine/probes/financial_services/asset_gen/pipeline.py
@@ -39,23 +39,23 @@
 
 from pydantic import BaseModel, Field
 
-from usersim.asset_gen.financial_services.prompts import (
+from usersim.engine.probes.financial_services.asset_gen.prompts import (
     BRIEF_PROMPT,
     DOCSET_PROMPT,
     DOCSET_QC_PROMPT,
     concept_guidance_for,
     language_guidance_for,
 )
-from usersim.asset_gen.financial_services.spec import (
+from usersim.engine.probes.financial_services.asset_gen.spec import (
     DocTitleVocabulary,
     Institution,
     Product,
     RegionSpec,
     Tool,
 )
-from usersim.asset_gen.financial_services.validate import plain_symbols
+from usersim.engine.probes.financial_services.asset_gen.validate import plain_symbols
 
-logger = logging.getLogger("usersim.asset_gen.financial_services.pipeline")
+logger = logging.getLogger("usersim.engine.probes.financial_services.asset_gen.pipeline")
 
 # Model aliases (resolved from cli/models_default.toml at generation time).
 DOC_GEN_MODEL_ALIAS = "doc_gen_model"
diff --git a/src/usersim/asset_gen/financial_services/prompts.py b/src/usersim/engine/probes/financial_services/asset_gen/prompts.py
similarity index 100%
rename from src/usersim/asset_gen/financial_services/prompts.py
rename to src/usersim/engine/probes/financial_services/asset_gen/prompts.py
diff --git a/src/usersim/asset_gen/financial_services/region_spec/de_DE.yaml b/src/usersim/engine/probes/financial_services/asset_gen/region_spec/de_DE.yaml
similarity index 99%
rename from src/usersim/asset_gen/financial_services/region_spec/de_DE.yaml
rename to src/usersim/engine/probes/financial_services/asset_gen/region_spec/de_DE.yaml
index 2a016714..a99b8739 100644
--- a/src/usersim/asset_gen/financial_services/region_spec/de_DE.yaml
+++ b/src/usersim/engine/probes/financial_services/asset_gen/region_spec/de_DE.yaml
@@ -1,5 +1,5 @@
 # Structured region_spec for de_DE, the generation INPUT (data, not code).
-# Validated against asset_gen/financial_services/spec.py. The DD pipeline expands
+# Validated against asset_gen/spec.py. The DD pipeline expands
 # this into the committed per-institution assets/financial_services/de_DE/ bank.
 #
 # The institution set follows the German retail market: a public savings bank
diff --git a/src/usersim/asset_gen/financial_services/region_spec/en_GB.yaml b/src/usersim/engine/probes/financial_services/asset_gen/region_spec/en_GB.yaml
similarity index 99%
rename from src/usersim/asset_gen/financial_services/region_spec/en_GB.yaml
rename to src/usersim/engine/probes/financial_services/asset_gen/region_spec/en_GB.yaml
index faaadee5..4a418742 100644
--- a/src/usersim/asset_gen/financial_services/region_spec/en_GB.yaml
+++ b/src/usersim/engine/probes/financial_services/asset_gen/region_spec/en_GB.yaml
@@ -1,5 +1,5 @@
 # Structured region_spec for en_GB, the generation INPUT (data, not code).
-# Validated against asset_gen/financial_services/spec.py. The DD pipeline expands
+# Validated against asset_gen/spec.py. The DD pipeline expands
 # this into the committed per-institution assets/financial_services/en_GB/ bank.
 #
 # The institution set follows the UK retail market: a high-street bank, a
diff --git a/src/usersim/asset_gen/financial_services/region_spec/en_IN.yaml b/src/usersim/engine/probes/financial_services/asset_gen/region_spec/en_IN.yaml
similarity index 99%
rename from src/usersim/asset_gen/financial_services/region_spec/en_IN.yaml
rename to src/usersim/engine/probes/financial_services/asset_gen/region_spec/en_IN.yaml
index dbeef681..dd3e03ff 100644
--- a/src/usersim/asset_gen/financial_services/region_spec/en_IN.yaml
+++ b/src/usersim/engine/probes/financial_services/asset_gen/region_spec/en_IN.yaml
@@ -1,6 +1,6 @@
 # Structured region_spec for en_IN — the INDIA REGION MODEL and the source of
 # truth every Indian language surface inherits (generation INPUT: data, not code).
-# Validated against asset_gen/financial_services/spec.py.
+# Validated against asset_gen/spec.py.
 #
 # A region_spec is keyed by LOCALE, but institutions, products, tools and
 # regulators are properties of the REGION — identical whether the conversation is
diff --git a/src/usersim/asset_gen/financial_services/region_spec/en_US.yaml b/src/usersim/engine/probes/financial_services/asset_gen/region_spec/en_US.yaml
similarity index 98%
rename from src/usersim/asset_gen/financial_services/region_spec/en_US.yaml
rename to src/usersim/engine/probes/financial_services/asset_gen/region_spec/en_US.yaml
index 8d5c753b..c739d311 100644
--- a/src/usersim/asset_gen/financial_services/region_spec/en_US.yaml
+++ b/src/usersim/engine/probes/financial_services/asset_gen/region_spec/en_US.yaml
@@ -1,5 +1,5 @@
 # Structured region_spec for en_US — the generation INPUT (data, not code).
-# Validated against asset_gen/financial_services/spec.py. The DD pipeline expands
+# Validated against asset_gen/spec.py. The DD pipeline expands
 # this into the committed per-institution assets/financial_services/en_US/ bank.
 # A locale is a SET of institutions; each spans one or more domains. Brands are
 # fictional.
@@ -170,7 +170,7 @@ institutions:
   - {name: freeze_card, discoverable: true, side_effect_class: state_changing}
   # open/close account, update_contact_info, get_statements (+ per-type
   # transfer_funds, order_replacement_card) are injected by the common-operations
-  # layer (asset_gen/financial_services/spec.py); no need to list them here.
+  # layer (asset_gen/spec.py); no need to list them here.
   task_templates:
   - {id: TPL-NB-DISPUTE-001, tier: verifiable, task_type: transactional, persona_tags: [region:any, age:any], gold_tool_sequence: [file_transaction_dispute]}
   - {id: TPL-NB-FEES-001, tier: dynamic, task_type: advisory_qa, persona_tags: [region:any]}
diff --git a/src/usersim/asset_gen/financial_services/region_spec/fr_FR.yaml b/src/usersim/engine/probes/financial_services/asset_gen/region_spec/fr_FR.yaml
similarity index 99%
rename from src/usersim/asset_gen/financial_services/region_spec/fr_FR.yaml
rename to src/usersim/engine/probes/financial_services/asset_gen/region_spec/fr_FR.yaml
index c63f6519..999c5487 100644
--- a/src/usersim/asset_gen/financial_services/region_spec/fr_FR.yaml
+++ b/src/usersim/engine/probes/financial_services/asset_gen/region_spec/fr_FR.yaml
@@ -1,5 +1,5 @@
 # Structured region_spec for fr_FR, the generation INPUT (data, not code).
-# Validated against asset_gen/financial_services/spec.py. The DD pipeline expands
+# Validated against asset_gen/spec.py. The DD pipeline expands
 # this into the committed per-institution assets/financial_services/fr_FR/ bank.
 #
 # The institution set follows the French retail market: a cooperative regional
diff --git a/src/usersim/asset_gen/financial_services/region_spec/hi_Deva_IN.yaml b/src/usersim/engine/probes/financial_services/asset_gen/region_spec/hi_Deva_IN.yaml
similarity index 100%
rename from src/usersim/asset_gen/financial_services/region_spec/hi_Deva_IN.yaml
rename to src/usersim/engine/probes/financial_services/asset_gen/region_spec/hi_Deva_IN.yaml
diff --git a/src/usersim/asset_gen/financial_services/region_spec/ja_JP.yaml b/src/usersim/engine/probes/financial_services/asset_gen/region_spec/ja_JP.yaml
similarity index 99%
rename from src/usersim/asset_gen/financial_services/region_spec/ja_JP.yaml
rename to src/usersim/engine/probes/financial_services/asset_gen/region_spec/ja_JP.yaml
index 5092a739..5adc61cc 100644
--- a/src/usersim/asset_gen/financial_services/region_spec/ja_JP.yaml
+++ b/src/usersim/engine/probes/financial_services/asset_gen/region_spec/ja_JP.yaml
@@ -1,5 +1,5 @@
 # Structured region_spec for ja_JP, the generation INPUT (data, not code).
-# Validated against asset_gen/financial_services/spec.py. gen-assets expands this
+# Validated against asset_gen/spec.py. gen-assets expands this
 # into the committed per-institution assets/financial_services/ja_JP/ bank.
 #
 # The institution set follows the Japanese retail market: a regional bank, an
diff --git a/src/usersim/asset_gen/financial_services/region_spec/ko_KR.yaml b/src/usersim/engine/probes/financial_services/asset_gen/region_spec/ko_KR.yaml
similarity index 99%
rename from src/usersim/asset_gen/financial_services/region_spec/ko_KR.yaml
rename to src/usersim/engine/probes/financial_services/asset_gen/region_spec/ko_KR.yaml
index 4dfa54a4..2cf8e2df 100644
--- a/src/usersim/asset_gen/financial_services/region_spec/ko_KR.yaml
+++ b/src/usersim/engine/probes/financial_services/asset_gen/region_spec/ko_KR.yaml
@@ -1,5 +1,5 @@
 # Structured region_spec for ko_KR, the generation INPUT (data, not code).
-# Validated against asset_gen/financial_services/spec.py. gen-assets expands this
+# Validated against asset_gen/spec.py. gen-assets expands this
 # into the committed per-institution assets/financial_services/ko_KR/ bank.
 #
 # The institution set follows the Korean retail market: a commercial bank, an
diff --git a/src/usersim/asset_gen/financial_services/spec.py b/src/usersim/engine/probes/financial_services/asset_gen/spec.py
similarity index 100%
rename from src/usersim/asset_gen/financial_services/spec.py
rename to src/usersim/engine/probes/financial_services/asset_gen/spec.py
diff --git a/src/usersim/asset_gen/financial_services/validate.py b/src/usersim/engine/probes/financial_services/asset_gen/validate.py
similarity index 99%
rename from src/usersim/asset_gen/financial_services/validate.py
rename to src/usersim/engine/probes/financial_services/asset_gen/validate.py
index cfb6fac7..a46ed86b 100644
--- a/src/usersim/asset_gen/financial_services/validate.py
+++ b/src/usersim/engine/probes/financial_services/asset_gen/validate.py
@@ -27,7 +27,7 @@
 from pathlib import Path
 from typing import Any
 
-from usersim.asset_gen.financial_services.spec import RegionSpec
+from usersim.engine.probes.financial_services.asset_gen.spec import RegionSpec
 
 #: cosine >= this within an institution flags a near-duplicate pair.
 NEAR_DUP_THRESHOLD = 0.97
diff --git a/src/usersim/engine/probes/financial_services/assets/financial_services/SCHEMA.md b/src/usersim/engine/probes/financial_services/assets/financial_services/SCHEMA.md
index fb69892d..ac0add3f 100644
--- a/src/usersim/engine/probes/financial_services/assets/financial_services/SCHEMA.md
+++ b/src/usersim/engine/probes/financial_services/assets/financial_services/SCHEMA.md
@@ -241,7 +241,7 @@ institution offers (`open_account`, `close_account`, `update_contact_info`,
 `deposit_funds`, `withdraw_funds`; retirement: `request_withdrawal`,
 `update_investment_election`, `plan_loan`; wealth: `fund_account`,
 `generate_financial_plan`; insurer: `file_claim`, `get_claim_status`,
-`update_policy`), injected by `asset_gen/financial_services/spec.py`. Most are
+`update_policy`), injected by `asset_gen/spec.py`. Most are
 never gold: they are realistic, gold-ADJACENT tool docs that make retrieval
 (and the discoverable-tool gate) non-trivial, and they stay consistent across
 locales. An institution that does not offer one of them lists it in its region
diff --git a/src/usersim/engine/probes/financial_services/bank.py b/src/usersim/engine/probes/financial_services/bank.py
index b18b3de6..99758594 100644
--- a/src/usersim/engine/probes/financial_services/bank.py
+++ b/src/usersim/engine/probes/financial_services/bank.py
@@ -113,14 +113,14 @@ def to_openai_tool(self) -> dict[str, Any]:
 # ---------------------------------------------------------------------------
 #: Universal identity requirement, used when a bank's ``region_meta`` carries no
 #: ``identity_verification`` block (every bank generated before the field
-#: existed). Mirrors ``asset_gen.financial_services.spec``'s default.
+#: existed). Mirrors ``asset_gen.spec``'s default.
 DEFAULT_IDENTITY_REQUIRED_FIELDS: tuple[str, ...] = ("full_name", "date_of_birth")
 
 #: Region-NEUTRAL account labels, used when a bank's ``region_meta`` carries no
 #: ``account_labels`` block. Generic on purpose: a retail deposit product is named
 #: differently in every market, so the fallback must be true everywhere rather
 #: than quietly exporting US vocabulary. Mirrors
-#: ``asset_gen.financial_services.spec.DEFAULT_DOMAIN_ACCOUNT_LABELS``.
+#: ``asset_gen.spec.DEFAULT_DOMAIN_ACCOUNT_LABELS``.
 DEFAULT_DOMAIN_ACCOUNT_LABELS: dict[str, str] = {
     "retail_banking": "deposit account",
     "payments": "payment account",
diff --git a/tests/test_asset_gen_evaluate.py b/tests/probes/financial_services/test_asset_gen_evaluate.py
similarity index 93%
rename from tests/test_asset_gen_evaluate.py
rename to tests/probes/financial_services/test_asset_gen_evaluate.py
index 7d0ad85f..0b374d28 100644
--- a/tests/test_asset_gen_evaluate.py
+++ b/tests/probes/financial_services/test_asset_gen_evaluate.py
@@ -1,7 +1,7 @@
 # SPDX-FileCopyrightText: Copyright (c) 2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
-"""Offline tests for the DD-judge asset evaluation (asset_gen/financial_services/evaluate.py).
+"""Offline tests for the DD-judge asset evaluation (asset_gen/evaluate.py).
 
 The live judge path is network-gated; these exercise the pure pieces:
 build_eval_seed (reads a bank), build_eval_columns (config assembly),
@@ -16,15 +16,15 @@
 
 import pytest
 
-from usersim.asset_gen.financial_services.evaluate import (
+from usersim.engine.probes.financial_services.asset_gen.evaluate import (
     build_eval_columns,
     build_eval_seed,
     evaluate_scores,
     shape_scorecard,
     validate_eval_models,
 )
-from usersim.asset_gen.financial_services.pipeline import InstitutionBank, serialize_bank
-from usersim.asset_gen.financial_services.spec import RegionSpec
+from usersim.engine.probes.financial_services.asset_gen.pipeline import InstitutionBank, serialize_bank
+from usersim.engine.probes.financial_services.asset_gen.spec import RegionSpec
 
 _SPEC_DICT: dict[str, Any] = {
     "locale": "en_US",
@@ -178,7 +178,7 @@ def test_previous_scorecard_is_archived_rather_than_overwritten(tmp_path):
     """
     import pandas as pd
 
-    from usersim.asset_gen.financial_services.evaluate import (
+    from usersim.engine.probes.financial_services.asset_gen.evaluate import (
         SCORECARD_HISTORY_DIR,
         _archive_previous_scorecard,
     )
@@ -206,7 +206,7 @@ def test_evaluate_bank_actually_calls_the_archiver():
     """
     import inspect
 
-    from usersim.asset_gen.financial_services import evaluate as E
+    from usersim.engine.probes.financial_services.asset_gen import evaluate as E
 
     src = inspect.getsource(E.evaluate_bank)
     assert "_archive_previous_scorecard(" in src
@@ -218,7 +218,7 @@ def test_two_runs_leave_two_history_files(tmp_path):
 
     import pandas as pd
 
-    from usersim.asset_gen.financial_services.evaluate import (
+    from usersim.engine.probes.financial_services.asset_gen.evaluate import (
         SCORECARD_HISTORY_DIR,
         _archive_previous_scorecard,
     )
diff --git a/tests/test_asset_gen_pipeline.py b/tests/probes/financial_services/test_asset_gen_pipeline.py
similarity index 93%
rename from tests/test_asset_gen_pipeline.py
rename to tests/probes/financial_services/test_asset_gen_pipeline.py
index 9d1a116e..1b7ed8b0 100644
--- a/tests/test_asset_gen_pipeline.py
+++ b/tests/probes/financial_services/test_asset_gen_pipeline.py
@@ -9,7 +9,9 @@
 
 import pytest
 
-from usersim.asset_gen.financial_services.pipeline import (
+from usersim.asset_gen.registry import get_domain
+from usersim.engine.core._assets import probe_assets_dir
+from usersim.engine.probes.financial_services.asset_gen.pipeline import (
     DOC_GEN_MODEL_ALIAS,
     EMBEDDING_MODEL_ALIAS,
     DocSet,
@@ -26,18 +28,15 @@
     explode_to_cluster_rows,
     serialize_bank,
 )
-from usersim.asset_gen.financial_services.spec import load_region_spec
-from usersim.engine.core._assets import probe_assets_dir
+from usersim.engine.probes.financial_services.asset_gen.spec import load_region_spec
 
 
-def _asset_gen_dir() -> Path:
-    """Directory the ``asset_gen`` package lives in, wherever that ends up."""
-    import usersim.asset_gen
+def _region_spec_dir() -> Path:
+    """The finance domain's committed region specs, where the domain reads them."""
+    return get_domain("financial_services").region_spec_dir
 
-    return Path(usersim.asset_gen.__file__).resolve().parent
 
-
-_REGION_SPEC = _asset_gen_dir() / "financial_services" / "region_spec" / "en_US.yaml"
+_REGION_SPEC = _region_spec_dir() / "en_US.yaml"
 
 #: Region specs that author their own title vocabulary.
 _LABELLED_SPECS = sorted(
@@ -90,8 +89,8 @@ def test_prompt_values_carry_the_locale_notation():
 
     import yaml
 
-    from usersim.asset_gen.financial_services.pipeline import products_for_prompt
-    from usersim.asset_gen.financial_services.spec import validate_region_spec
+    from usersim.engine.probes.financial_services.asset_gen.pipeline import products_for_prompt
+    from usersim.engine.probes.financial_services.asset_gen.spec import validate_region_spec
 
     raw = yaml.safe_load(_REGION_SPEC.read_text(encoding="utf-8"))
     product = raw["institutions"][0]["products"][0]
@@ -124,8 +123,8 @@ def test_common_operations_the_simulator_reads_arguments_from_are_described():
 
     import pandas as pd
 
-    from usersim.asset_gen.financial_services.pipeline import _tool_dict, explode_to_cluster_rows
-    from usersim.asset_gen.financial_services.spec import (
+    from usersim.engine.probes.financial_services.asset_gen.pipeline import _tool_dict, explode_to_cluster_rows
+    from usersim.engine.probes.financial_services.asset_gen.spec import (
         COMMON_OPERATION_DESCRIPTIONS,
         COMMON_TYPE_OPERATIONS,
         COMMON_UNIVERSAL_OPERATIONS,
@@ -154,9 +153,9 @@ def test_prompt_values_carry_the_spec_label():
     each value the region spec labels carries its label into the prompt."""
     import yaml
 
-    from usersim.asset_gen.financial_services.pipeline import products_for_prompt
-    from usersim.asset_gen.financial_services.prompts import DOCSET_PROMPT
-    from usersim.asset_gen.financial_services.spec import validate_region_spec
+    from usersim.engine.probes.financial_services.asset_gen.pipeline import products_for_prompt
+    from usersim.engine.probes.financial_services.asset_gen.prompts import DOCSET_PROMPT
+    from usersim.engine.probes.financial_services.asset_gen.spec import validate_region_spec
 
     raw = yaml.safe_load(_REGION_SPEC.read_text(encoding="utf-8"))
     raw["institutions"][0]["products"][0]["variables"] = {
@@ -181,8 +180,8 @@ def test_a_discoverable_tool_description_steers_its_doc_but_stays_out_of_tools_y
     import pandas as pd
     import yaml
 
-    from usersim.asset_gen.financial_services.pipeline import _tool_dict
-    from usersim.asset_gen.financial_services.spec import validate_region_spec
+    from usersim.engine.probes.financial_services.asset_gen.pipeline import _tool_dict
+    from usersim.engine.probes.financial_services.asset_gen.spec import validate_region_spec
 
     raw = yaml.safe_load(_REGION_SPEC.read_text(encoding="utf-8"))
     bank = raw["institutions"][0]
@@ -269,7 +268,7 @@ def _fake_docset_engine(monkeypatch, *, drop_by_attempt, bad_by_attempt=None, sc
     entirely on attempt i; ``bad_by_attempt[i]`` are the ones that come BACK but
     with an unusable payload (the truncated-response shape); ``score_by_attempt[i]``
     maps a cluster_id to the faithfulness score the judge gives it (default 4)."""
-    from usersim.asset_gen.financial_services import pipeline as P
+    from usersim.engine.probes.financial_services.asset_gen import pipeline as P
 
     calls: list = []
     bad_by_attempt = bad_by_attempt or {}
@@ -327,7 +326,7 @@ def _seed(*cluster_ids):
 def test_generate_docsets_with_backfill_regenerates_dropped_clusters(monkeypatch):
     """A cluster the hub drops on the first attempt is regenerated on its own on the
     next attempt (matched by cluster_id), so the final frame is complete."""
-    from usersim.asset_gen.financial_services import pipeline as P
+    from usersim.engine.probes.financial_services.asset_gen import pipeline as P
 
     calls = _fake_docset_engine(monkeypatch, drop_by_attempt={0: {"c2"}})
     result = P._generate_docsets_with_backfill(models=None, cluster_seed=_seed("c1", "c2", "c3"))
@@ -348,7 +347,7 @@ def test_generate_docsets_with_backfill_retries_an_unusable_payload(monkeypatch)
     back to regeneration. Truncation is not hypothetical: a cluster is ten long
     documents in one response, and ``max_docs_per_cluster`` is a tunable knob.
     """
-    from usersim.asset_gen.financial_services import pipeline as P
+    from usersim.engine.probes.financial_services.asset_gen import pipeline as P
 
     calls = _fake_docset_engine(monkeypatch, drop_by_attempt={}, bad_by_attempt={0: {"c2"}})
     result = P._generate_docsets_with_backfill(models=None, cluster_seed=_seed("c1", "c2", "c3"))
@@ -366,7 +365,7 @@ def test_generate_docsets_with_backfill_drops_a_persistently_unusable_cluster(mo
     Attempts are bounded, and the cluster then surfaces in the 'backfill
     exhausted' warning rather than being silently dropped later at collect time.
     """
-    from usersim.asset_gen.financial_services import pipeline as P
+    from usersim.engine.probes.financial_services.asset_gen import pipeline as P
 
     bad = {i: {"c2"} for i in range(P.DOCSET_MAX_ATTEMPTS)}
     calls = _fake_docset_engine(monkeypatch, drop_by_attempt={}, bad_by_attempt=bad)
@@ -379,7 +378,7 @@ def test_generate_docsets_with_backfill_drops_a_persistently_unusable_cluster(mo
 def test_generate_docsets_with_backfill_regenerates_a_cluster_below_the_faithfulness_floor(monkeypatch):
     """A cluster the judge scores below the floor is regenerated, and a better attempt
     replaces it."""
-    from usersim.asset_gen.financial_services import pipeline as P
+    from usersim.engine.probes.financial_services.asset_gen import pipeline as P
 
     calls = _fake_docset_engine(monkeypatch, drop_by_attempt={}, score_by_attempt={0: {"c2": 1.0}, 1: {"c2": 4.0}})
     result = P._generate_docsets_with_backfill(models=None, cluster_seed=_seed("c1", "c2", "c3"))
@@ -392,7 +391,7 @@ def test_generate_docsets_with_backfill_regenerates_a_cluster_below_the_faithful
 def test_generate_docsets_with_backfill_keeps_the_best_attempt_below_the_floor(monkeypatch):
     """When no attempt reaches the floor, the cluster is still written, flagged, from
     its best-scoring attempt: dropping it would leave gaps in the corpus."""
-    from usersim.asset_gen.financial_services import pipeline as P
+    from usersim.engine.probes.financial_services.asset_gen import pipeline as P
 
     scores = {0: {"c2": 1.0}, 1: {"c2": 2.0}, 2: {"c2": 1.0}}
     calls = _fake_docset_engine(monkeypatch, drop_by_attempt={}, score_by_attempt=scores)
@@ -409,7 +408,7 @@ def test_usable_docset_rows_keeps_low_faithfulness_clusters():
     the retry predicate must not filter them out."""
     import pandas as pd
 
-    from usersim.asset_gen.financial_services import pipeline as P
+    from usersim.engine.probes.financial_services.asset_gen import pipeline as P
 
     df = pd.DataFrame(
         [
@@ -424,7 +423,7 @@ def test_usable_docset_rows_falls_back_when_the_column_is_absent():
     """A frame with no doc_set column at all must not be emptied out."""
     import pandas as pd
 
-    from usersim.asset_gen.financial_services import pipeline as P
+    from usersim.engine.probes.financial_services.asset_gen import pipeline as P
 
     df = pd.DataFrame([{"cluster_id": "c1"}, {"cluster_id": "c2"}])
     assert set(P._usable_docset_rows(df)["cluster_id"]) == {"c1", "c2"}
@@ -568,7 +567,7 @@ def test_as_docset_normalizes_numpy_documents():
     # numpy arrays; _as_docset must yield a plain list so truth-tests don't blow up.
     import numpy as np
 
-    from usersim.asset_gen.financial_services.pipeline import _as_docset
+    from usersim.engine.probes.financial_services.asset_gen.pipeline import _as_docset
 
     raw = {"documents": np.array([{"doc_key": "a", "title": "A", "document_type": "faq", "body": "x"}], dtype=object)}
     out = _as_docset(raw)
@@ -639,10 +638,10 @@ class TestPlanOwnedTitles:
     handed over an English title AND demanded it be reproduced exactly.
     """
 
-    _SPEC_DIR = _asset_gen_dir() / "financial_services" / "region_spec"
+    _SPEC_DIR = _region_spec_dir()
 
     def _plan_titles(self, locale: str) -> set:
-        from usersim.asset_gen.financial_services.pipeline import build_shared_doc_plan
+        from usersim.engine.probes.financial_services.asset_gen.pipeline import build_shared_doc_plan
 
         spec = load_region_spec(self._SPEC_DIR / f"{locale}.yaml")
         out = set()
@@ -731,7 +730,7 @@ def test_uk_titles_use_uk_terms_and_spelling(self):
         assert [t for t in titles if any(us in t for us in ("APY", "unauthorized", "recognizing"))] == []
 
     def test_uk_corpus_follows_its_language_conventions(self):
-        from usersim.asset_gen.financial_services.validate import FAIL, validate_bank
+        from usersim.engine.probes.financial_services.asset_gen.validate import FAIL, validate_bank
 
         spec = load_region_spec(self._SPEC_DIR / "en_GB.yaml")
         assert spec.language_conventions.respell
@@ -775,10 +774,10 @@ def test_localized_labels_cover_every_variable_and_domain(self, locale: str):
         assert domains - set(spec.doc_titles.domain_labels) == set()
 
     def test_omitted_vocabulary_falls_back_to_the_english_defaults(self):
-        from usersim.asset_gen.financial_services.pipeline import (
+        from usersim.engine.probes.financial_services.asset_gen.pipeline import (
             _FAQ_INTENTS,
         )
-        from usersim.asset_gen.financial_services.pipeline import (
+        from usersim.engine.probes.financial_services.asset_gen.pipeline import (
             build_product_doc_plan as plan,
         )
 
@@ -800,7 +799,7 @@ def test_template_missing_its_placeholder_is_rejected(self, field, value):
         title, which then de-duplicates down to a single document."""
         from pydantic import ValidationError
 
-        from usersim.asset_gen.financial_services.spec import DocTitleVocabulary
+        from usersim.engine.probes.financial_services.asset_gen.spec import DocTitleVocabulary
 
         with pytest.raises(ValidationError):
             DocTitleVocabulary(**{field: value})
@@ -915,8 +914,8 @@ def test_references_are_a_prompt_sink_and_never_reach_the_corpus():
 def test_the_prompt_still_offers_the_slug_sink():
     """The corpus stays free of raw doc_keys only while the prompt gives the model an
     alternative home for them, so the sink and the by-title rule travel together."""
-    from usersim.asset_gen.financial_services.pipeline import GeneratedDoc
-    from usersim.asset_gen.financial_services.prompts import DOCSET_PROMPT
+    from usersim.engine.probes.financial_services.asset_gen.pipeline import GeneratedDoc
+    from usersim.engine.probes.financial_services.asset_gen.prompts import DOCSET_PROMPT
 
     assert "references" in GeneratedDoc.model_fields
     assert "`references`" in DOCSET_PROMPT
@@ -925,7 +924,7 @@ def test_the_prompt_still_offers_the_slug_sink():
 def test_doc_uuid_is_deterministic_and_scoped():
     import uuid as _uuid
 
-    from usersim.asset_gen.financial_services.pipeline import doc_uuid
+    from usersim.engine.probes.financial_services.asset_gen.pipeline import doc_uuid
 
     a = doc_uuid("en_US", "northwind_bank", "acct_sheet")
     assert a == doc_uuid("en_US", "northwind_bank", "acct_sheet")  # stable across calls
@@ -937,7 +936,7 @@ def test_doc_uuid_is_deterministic_and_scoped():
 
 
 def test_explode_docset_uses_plan_uuid_for_id():
-    from usersim.asset_gen.financial_services.pipeline import doc_uuid
+    from usersim.engine.probes.financial_services.asset_gen.pipeline import doc_uuid
 
     uid = doc_uuid("en_US", "northwind_bank", "acct_sheet")
     docset = DocSet(
@@ -1092,8 +1091,8 @@ def test_cli_gen_assets_dry_run():
 
 def test_generate_corpus_validates_endpoints_before_network():
     """generate_corpus fails fast (offline) if the gen model aliases are absent."""
-    from usersim.asset_gen.financial_services.pipeline import generate_corpus
     from usersim.cli._models import ConfigError, ModelsConfig, ModelSpec
+    from usersim.engine.probes.financial_services.asset_gen.pipeline import generate_corpus
 
     cfg = ModelsConfig(
         providers=(),
@@ -1110,11 +1109,10 @@ def test_default_models_config_declares_gen_aliases():
     All three aliases resolve against a built-in provider, so the only
     credential needed is the one the default config already requires.
     """
-    from usersim.asset_gen.financial_services.pipeline import validate_generation_models
-
     # bundled_models_path, not default_models_path: this asserts what ships,
     # and default_models_path honours a developer's models.local.toml.
     from usersim.cli._models import bundled_models_path, load_models_config
+    from usersim.engine.probes.financial_services.asset_gen.pipeline import validate_generation_models
 
     cfg = load_models_config(bundled_models_path())
     validate_generation_models(cfg)  # must not raise
@@ -1142,7 +1140,7 @@ def test_off_plan_doc_key_is_reported_not_silent(caplog):
     """
     import logging
 
-    from usersim.asset_gen.financial_services.pipeline import explode_docset
+    from usersim.engine.probes.financial_services.asset_gen.pipeline import explode_docset
 
     plan = {"savings_product_sheet": {"uuid": "u1", "domain": "retail_banking", "product_category": "savings_regular"}}
 
diff --git a/tests/test_asset_gen_region_spec.py b/tests/probes/financial_services/test_asset_gen_region_spec.py
similarity index 93%
rename from tests/test_asset_gen_region_spec.py
rename to tests/probes/financial_services/test_asset_gen_region_spec.py
index d8e65d2a..4c274b26 100644
--- a/tests/test_asset_gen_region_spec.py
+++ b/tests/probes/financial_services/test_asset_gen_region_spec.py
@@ -10,7 +10,8 @@
 import pytest
 import yaml
 
-from usersim.asset_gen.financial_services.spec import (
+from usersim.asset_gen.registry import get_domain
+from usersim.engine.probes.financial_services.asset_gen.spec import (
     DOMAINS,
     INSTITUTION_TYPES,
     RegionSpecError,
@@ -20,14 +21,12 @@
 )
 
 
-def _asset_gen_dir() -> Path:
-    """Directory the ``asset_gen`` package lives in, wherever that ends up."""
-    import usersim.asset_gen
+def _region_spec_dir() -> Path:
+    """The finance domain's committed region specs, where the domain reads them."""
+    return get_domain("financial_services").region_spec_dir
 
-    return Path(usersim.asset_gen.__file__).resolve().parent
 
-
-_REGION_SPEC_DIR = _asset_gen_dir() / "financial_services" / "region_spec"
+_REGION_SPEC_DIR = _region_spec_dir()
 _EN_US = _REGION_SPEC_DIR / "en_US.yaml"
 
 
@@ -99,7 +98,7 @@ def test_common_operations_injected_into_every_institution():
 
 def test_common_operations_do_not_override_explicit_tools():
     """An explicitly-declared tool of a common-ops name keeps its own schema."""
-    from usersim.asset_gen.financial_services.spec import Institution
+    from usersim.engine.probes.financial_services.asset_gen.spec import Institution
 
     inst = Institution.model_validate(
         {
@@ -206,7 +205,7 @@ def test_nbfc_is_a_deposit_less_lender_in_the_ontology():
     a dominant retail-credit channel with no equivalent in the US institution
     set. It must be able to lend, and must NOT offer retail banking.
     """
-    from usersim.asset_gen.financial_services.spec import (
+    from usersim.engine.probes.financial_services.asset_gen.spec import (
         COMMON_TYPE_OPERATIONS,
         INSTITUTION_DOMAINS,
         common_operations_for_type,
@@ -256,7 +255,7 @@ def test_identity_verification_rejects_unknown_field():
 def test_identity_verification_is_serialized_into_region_meta():
     """The sim reads the KYC contract off region_meta, so it must be emitted
     even at the default (otherwise the probe silently hardcodes name + DOB)."""
-    from usersim.asset_gen.financial_services.pipeline import _region_meta_from_spec
+    from usersim.engine.probes.financial_services.asset_gen.pipeline import _region_meta_from_spec
 
     raw = _raw(_EN_US)
     raw["identity_verification"] = {
@@ -283,7 +282,7 @@ def test_concept_guidance_defaults_are_region_neutral():
     live in the US region_spec as data. Hardcoding them in BRIEF_PROMPT's
     per-type branches would make every non-US locale inherit them.
     """
-    from usersim.asset_gen.financial_services.prompts import (
+    from usersim.engine.probes.financial_services.asset_gen.prompts import (
         BRIEF_PROMPT,
         DEFAULT_TYPE_CONCEPT_GUIDANCE,
         DOCSET_PROMPT,
@@ -309,7 +308,7 @@ def test_concept_guidance_defaults_are_region_neutral():
 
 
 def test_concept_guidance_override_beats_the_default():
-    from usersim.asset_gen.financial_services.prompts import concept_guidance_for
+    from usersim.engine.probes.financial_services.asset_gen.prompts import concept_guidance_for
 
     spec = load_region_spec(_EN_US)
     # en_US supplies its own US framing...
@@ -330,7 +329,7 @@ def test_concept_guidance_rejects_unknown_institution_type():
 
 
 def test_institution_seed_carries_resolved_concept_guidance():
-    from usersim.asset_gen.financial_services.pipeline import build_institution_seed
+    from usersim.engine.probes.financial_services.asset_gen.pipeline import build_institution_seed
 
     spec = load_region_spec(_EN_US)
     seed = build_institution_seed(spec)
@@ -538,7 +537,7 @@ def test_overlay_merges_any_id_keyed_list_and_replaces_the_rest():
     task_templates carries ids too, so it must patch by id like institutions and
     products; string lists and tool_taxonomy (keyed by `name`) replace wholesale.
     """
-    from usersim.asset_gen.financial_services.spec import _is_id_keyed, _merge_overlay
+    from usersim.engine.probes.financial_services.asset_gen.spec import _is_id_keyed, _merge_overlay
 
     assert _is_id_keyed([{"id": "a"}]) is True
     assert _is_id_keyed(["faq", "product_sheet"]) is False
@@ -559,7 +558,7 @@ def test_overlay_merges_any_id_keyed_list_and_replaces_the_rest():
 
 
 def test_overlay_onto_an_id_keyed_list_must_carry_ids():
-    from usersim.asset_gen.financial_services.spec import _merge_overlay
+    from usersim.engine.probes.financial_services.asset_gen.spec import _merge_overlay
 
     with pytest.raises(RegionSpecError):
         _merge_overlay([{"id": "a"}], [{"display_name": "no id here"}], path="institutions")
@@ -609,7 +608,7 @@ def test_declared_document_types_match_what_the_plan_emits(path):
     genres while its committed corpus contained 15, which misleads anyone reading
     the spec to learn what a locale's corpus holds. Bind the two.
     """
-    from usersim.asset_gen.financial_services.pipeline import (
+    from usersim.engine.probes.financial_services.asset_gen.pipeline import (
         build_product_doc_plan,
         build_shared_doc_plan,
     )
@@ -636,7 +635,7 @@ def test_every_product_gets_every_servicing_angle(path, target):
     In en_US exactly the 7 products with 2 variables got them and the other 11 did
     not — at any depth. A single-product assertion would have passed throughout.
     """
-    from usersim.asset_gen.financial_services.pipeline import build_product_doc_plan
+    from usersim.engine.probes.financial_services.asset_gen.pipeline import build_product_doc_plan
 
     for inst_id, product in _all_products(path):
         angles = {s["angle"] for s in build_product_doc_plan(product, target)}
@@ -657,7 +656,7 @@ def test_no_product_plan_ever_repeats_an_angle(path, target):
     as angle lists grow, where a fixed ceiling would go stale on the next addition.
     Past the supply the plan is expected to return FEWER slots than requested.
     """
-    from usersim.asset_gen.financial_services.pipeline import build_product_doc_plan
+    from usersim.engine.probes.financial_services.asset_gen.pipeline import build_product_doc_plan
 
     for inst_id, product in _all_products(path):
         slots = build_product_doc_plan(product, target)
@@ -671,7 +670,7 @@ def test_no_product_plan_ever_repeats_an_angle(path, target):
 
 def test_plan_under_delivers_rather_than_padding_past_the_angle_supply():
     """Supply is ``40 + 3 * n_variables``; asking for more must shrink, not repeat."""
-    from usersim.asset_gen.financial_services.pipeline import build_product_doc_plan
+    from usersim.engine.probes.financial_services.asset_gen.pipeline import build_product_doc_plan
 
     _, product = _all_products(_EN_IN)[0]
     supply = 40 + 3 * len(product.variables)
@@ -685,7 +684,7 @@ def test_intent_first_and_variable_first_generators_differ_as_intended():
     """``how_to_guide`` / ``troubleshooting`` lead with intents (the customer-journey
     docs); ``faq`` leads with per-variable explainers (the value-bearing docs that
     back numeric faithfulness). Getting these backwards is the original bug."""
-    from usersim.asset_gen.financial_services.pipeline import build_product_doc_plan
+    from usersim.engine.probes.financial_services.asset_gen.pipeline import build_product_doc_plan
 
     _, product = next((i, p) for i, p in _all_products(_EN_IN) if len(p.variables) >= 4)
     slots = build_product_doc_plan(product, 40)
@@ -711,11 +710,11 @@ def test_genre_conventions_are_scoped_to_the_cluster(cluster_kind):
 
     from jinja2 import Template
 
-    from usersim.asset_gen.financial_services.pipeline import (
+    from usersim.engine.probes.financial_services.asset_gen.pipeline import (
         build_product_doc_plan,
         build_shared_doc_plan,
     )
-    from usersim.asset_gen.financial_services.prompts import DOCSET_PROMPT
+    from usersim.engine.probes.financial_services.asset_gen.prompts import DOCSET_PROMPT
 
     spec = load_region_spec(_EN_IN)
     inst = spec.institutions[0]
@@ -770,7 +769,7 @@ def test_action_genres_require_the_agent_to_act_in_conversation(genre):
     """
     import re
 
-    from usersim.asset_gen.financial_services.prompts import DOCSET_PROMPT
+    from usersim.engine.probes.financial_services.asset_gen.prompts import DOCSET_PROMPT
 
     block = re.search(rf"^    {genre}:(.*?)(?=^    \w+:|^-|\Z)", DOCSET_PROMPT, re.M | re.S)
     assert block, f"no convention for {genre}"
@@ -795,7 +794,7 @@ def test_how_to_guide_may_not_make_reaching_us_a_step():
     """
     import re
 
-    from usersim.asset_gen.financial_services.prompts import DOCSET_PROMPT
+    from usersim.engine.probes.financial_services.asset_gen.prompts import DOCSET_PROMPT
 
     block = re.search(r"^    how_to_guide:(.*?)(?=^    \w+:|^-|\Z)", DOCSET_PROMPT, re.M | re.S)
     assert block, "no convention for how_to_guide"
@@ -811,7 +810,7 @@ def test_only_the_how_to_convention_bans_a_contact_step():
     A blanket ban would spend prompt budget on genres that never had the problem."""
     import re
 
-    from usersim.asset_gen.financial_services.prompts import DOCSET_PROMPT
+    from usersim.engine.probes.financial_services.asset_gen.prompts import DOCSET_PROMPT
 
     for genre in ("troubleshooting", "policy_procedure"):
         block = re.search(rf"^    {genre}:(.*?)(?=^    \w+:|^-|\Z)", DOCSET_PROMPT, re.M | re.S)
@@ -823,7 +822,7 @@ def test_the_constraint_is_region_neutral():
     """It ships in the shared prompt, so it must not assume one market's channels --
     and it must still allow steps that really are physical (presenting an original
     document, having collateral valued), which India's KYC and gold loans require."""
-    from usersim.asset_gen.financial_services.prompts import DOCSET_PROMPT
+    from usersim.engine.probes.financial_services.asset_gen.prompts import DOCSET_PROMPT
 
     # No market-specific institutions or instruments in the constraint text.
     for us_ism in ("FDIC", "IRS", "401(k)", "Regulation E", "RBI", "IRDAI", "UPI"):
@@ -841,7 +840,7 @@ def test_customer_facing_genres_are_told_not_to_name_tools():
 
     from jinja2 import Template
 
-    from usersim.asset_gen.financial_services.prompts import DOCSET_PROMPT
+    from usersim.engine.probes.financial_services.asset_gen.prompts import DOCSET_PROMPT
 
     base = dict(
         display_name="X",
@@ -870,7 +869,7 @@ def test_cross_references_must_use_titles_not_doc_keys():
     defer their own substance (self-containment 2.38 vs 2.78 for clean docs)."""
     import re
 
-    from usersim.asset_gen.financial_services.prompts import DOCSET_PROMPT
+    from usersim.engine.probes.financial_services.asset_gen.prompts import DOCSET_PROMPT
 
     text = re.sub(r"\s+", " ", DOCSET_PROMPT).lower()
     assert "doc_key` is an internal slug" in text or "internal slug" in text
@@ -889,7 +888,7 @@ def test_tool_docs_must_not_invent_unobtainable_arguments():
 
     from jinja2 import Template
 
-    from usersim.asset_gen.financial_services.prompts import DOCSET_PROMPT
+    from usersim.engine.probes.financial_services.asset_gen.prompts import DOCSET_PROMPT
 
     base = dict(
         display_name="X",
@@ -932,7 +931,7 @@ def test_documents_are_asked_for_plain_text_symbols():
 
     from jinja2 import Template
 
-    from usersim.asset_gen.financial_services.prompts import DOCSET_PROMPT
+    from usersim.engine.probes.financial_services.asset_gen.prompts import DOCSET_PROMPT
 
     base = dict(
         display_name="X",
@@ -964,7 +963,7 @@ def test_documents_are_asked_for_plain_text_symbols():
 
 
 def test_identity_fields_are_the_regions_verify_identity_fields():
-    from usersim.asset_gen.financial_services.pipeline import identity_fields_for
+    from usersim.engine.probes.financial_services.asset_gen.pipeline import identity_fields_for
 
     assert identity_fields_for(load_region_spec(_EN_US)) == "full name and date of birth"
     assert identity_fields_for(load_region_spec(_REGION_SPEC_DIR / "en_IN.yaml")) == "full name, date of birth and pan"
@@ -973,7 +972,10 @@ def test_identity_fields_are_the_regions_verify_identity_fields():
 def test_identity_fields_reach_the_brief_and_every_cluster_row():
     import pandas as pd
 
-    from usersim.asset_gen.financial_services.pipeline import build_institution_seed, explode_to_cluster_rows
+    from usersim.engine.probes.financial_services.asset_gen.pipeline import (
+        build_institution_seed,
+        explode_to_cluster_rows,
+    )
 
     spec = load_region_spec(_REGION_SPEC_DIR / "en_IN.yaml")
     assert set(build_institution_seed(spec)["identity_fields"]) == {"full name, date of birth and pan"}
@@ -994,7 +996,7 @@ def test_documents_verify_identity_once_and_add_no_other_step():
 
     from jinja2 import Template
 
-    from usersim.asset_gen.financial_services.prompts import BRIEF_PROMPT, DOCSET_PROMPT
+    from usersim.engine.probes.financial_services.asset_gen.prompts import BRIEF_PROMPT, DOCSET_PROMPT
 
     seed = dict(
         display_name="X",
@@ -1045,7 +1047,7 @@ def _with_conventions(guidance: str, respell: dict[str, str]):
 
 
 def test_language_guidance_pairs_each_form_with_its_replacement():
-    from usersim.asset_gen.financial_services.prompts import language_guidance_for
+    from usersim.engine.probes.financial_services.asset_gen.prompts import language_guidance_for
 
     assert language_guidance_for("", {}) == ""
     assert language_guidance_for(" Write British English. ", {}) == "Write British English."
@@ -1091,7 +1093,7 @@ def test_language_guidance_adds_exactly_one_line_to_each_prompt(prompt_name):
     with them, the only difference is the spelling-and-usage line."""
     from jinja2 import Template
 
-    from usersim.asset_gen.financial_services import prompts
+    from usersim.engine.probes.financial_services.asset_gen import prompts
 
     seed = {
         "display_name": "X",
@@ -1121,7 +1123,10 @@ def test_language_guidance_adds_exactly_one_line_to_each_prompt(prompt_name):
 def test_language_conventions_reach_the_brief_and_every_cluster_row():
     import pandas as pd
 
-    from usersim.asset_gen.financial_services.pipeline import build_institution_seed, explode_to_cluster_rows
+    from usersim.engine.probes.financial_services.asset_gen.pipeline import (
+        build_institution_seed,
+        explode_to_cluster_rows,
+    )
 
     spec = _with_conventions("Write British English.", {"toward": "towards"})
     expected = 'Write British English. Write "towards" for "toward".'
@@ -1143,8 +1148,8 @@ def test_each_cluster_gets_the_institutions_rules_and_the_types_guidance():
 
     import pandas as pd
 
-    from usersim.asset_gen.financial_services.pipeline import explode_to_cluster_rows
-    from usersim.asset_gen.financial_services.prompts import concept_guidance_for
+    from usersim.engine.probes.financial_services.asset_gen.pipeline import explode_to_cluster_rows
+    from usersim.engine.probes.financial_services.asset_gen.prompts import concept_guidance_for
 
     spec = load_region_spec(_EN_US)
     spec_by_id = {i.id: i for i in spec.institutions}
@@ -1163,7 +1168,7 @@ def test_document_prompt_puts_the_rules_above_the_brief():
 
     from jinja2 import Template
 
-    from usersim.asset_gen.financial_services.prompts import DOCSET_PROMPT
+    from usersim.engine.probes.financial_services.asset_gen.prompts import DOCSET_PROMPT
 
     seed = dict(
         display_name="X",
@@ -1194,7 +1199,7 @@ def test_generation_respells_bodies_and_leaves_plan_titles_alone():
 
     import pandas as pd
 
-    from usersim.asset_gen.financial_services.pipeline import collect_institutions
+    from usersim.engine.probes.financial_services.asset_gen.pipeline import collect_institutions
 
     spec = _with_conventions("", {"toward": "towards"})
     inst = spec.institutions[0]
@@ -1224,7 +1229,7 @@ def test_generation_writes_latex_symbols_as_characters():
 
     import pandas as pd
 
-    from usersim.asset_gen.financial_services.pipeline import collect_institutions
+    from usersim.engine.probes.financial_services.asset_gen.pipeline import collect_institutions
 
     spec = load_region_spec(_EN_US)
     inst = spec.institutions[0]
diff --git a/tests/test_asset_gen_validate.py b/tests/probes/financial_services/test_asset_gen_validate.py
similarity index 96%
rename from tests/test_asset_gen_validate.py
rename to tests/probes/financial_services/test_asset_gen_validate.py
index 295024cd..43c673dd 100644
--- a/tests/test_asset_gen_validate.py
+++ b/tests/probes/financial_services/test_asset_gen_validate.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 generate+vet gate (asset_gen/financial_services/validate.py), offline."""
+"""Tests for the generate+vet gate (asset_gen/validate.py), offline."""
 
 from __future__ import annotations
 
@@ -11,9 +11,9 @@
 import pytest
 import yaml
 
-from usersim.asset_gen.financial_services.pipeline import InstitutionBank, serialize_bank
-from usersim.asset_gen.financial_services.spec import RegionSpec
-from usersim.asset_gen.financial_services.validate import FAIL, PASS, WARN, plain_symbols, validate_bank
+from usersim.engine.probes.financial_services.asset_gen.pipeline import InstitutionBank, serialize_bank
+from usersim.engine.probes.financial_services.asset_gen.spec import RegionSpec
+from usersim.engine.probes.financial_services.asset_gen.validate import FAIL, PASS, WARN, plain_symbols, validate_bank
 
 _SPEC_DICT: dict[str, Any] = {
     "locale": "en_US",
@@ -224,7 +224,7 @@ def test_numeric_faithfulness_accepts_indian_digit_grouping():
     this the validator would report every INR value as "absent from prose" and
     fail an otherwise perfect Hindi corpus.
     """
-    from usersim.asset_gen.financial_services.validate import _indian_grouped, _value_present
+    from usersim.engine.probes.financial_services.asset_gen.validate import _indian_grouped, _value_present
 
     assert _indian_grouped(250_000) == "2,50,000"
     assert _indian_grouped(1_500_000) == "15,00,000"
@@ -239,7 +239,7 @@ def test_numeric_faithfulness_accepts_indian_digit_grouping():
 
 
 def test_numeric_faithfulness_accepts_lakh_and_crore_phrasing():
-    from usersim.asset_gen.financial_services.validate import _value_present
+    from usersim.engine.probes.financial_services.asset_gen.validate import _value_present
 
     assert _value_present(250_000, "a ceiling of Rs 2.5 lakh per year")
     assert _value_present(150_000, "the 1.5 lakh limit under the tax section")
@@ -248,7 +248,7 @@ def test_numeric_faithfulness_accepts_lakh_and_crore_phrasing():
 
 def test_numeric_faithfulness_accepts_japanese_and_korean_units_of_ten_thousand():
     """``1,000万円`` and ``1억 원`` state the value without its digit string."""
-    from usersim.asset_gen.financial_services.validate import _value_present
+    from usersim.engine.probes.financial_services.asset_gen.validate import _value_present
 
     assert _value_present(10_000_000, "預金保険で1,000万円まで保護されます", "ja_JP")
     assert _value_present(18_000_000, "非課税保有限度額は1,800万円です", "ja_JP")
@@ -261,7 +261,7 @@ def test_numeric_faithfulness_accepts_japanese_and_korean_units_of_ten_thousand(
 
 def test_numeric_faithfulness_still_rejects_a_wrong_number():
     """Tolerating locale formats must not tolerate a DIFFERENT value."""
-    from usersim.asset_gen.financial_services.validate import _value_present
+    from usersim.engine.probes.financial_services.asset_gen.validate import _value_present
 
     assert not _value_present(250_000, "minimum balance of Rs 2,60,000 applies")
     assert not _value_present(250_000, "a ceiling of Rs 3 lakh per year")
@@ -274,7 +274,7 @@ def test_numeric_faithfulness_still_rejects_a_wrong_number():
 def test_numeric_faithfulness_matches_whole_numbers_only():
     """A rendering inside a longer number states a different value: 5,000,000,000원
     doesn't state a 5,000,000원 limit."""
-    from usersim.asset_gen.financial_services.validate import _value_present
+    from usersim.engine.probes.financial_services.asset_gen.validate import _value_present
 
     assert not _value_present(5_000_000, "현금서비스 이용한도 최고액은 5,000,000,000원입니다", "ko_KR")
     assert not _value_present(5_000_000, "a limit of $15,000,000")
@@ -286,7 +286,7 @@ def test_numeric_faithfulness_matches_whole_numbers_only():
 
 def test_numeric_faithfulness_accepts_french_and_german_number_formats():
     """A French or German bank writes values in its own format, and they are faithful."""
-    from usersim.asset_gen.financial_services.validate import _value_present
+    from usersim.engine.probes.financial_services.asset_gen.validate import _value_present
 
     for space in (" ", "\u00a0", "\u202f"):
         assert _value_present(1234, f"des frais de 1{space}234 € par an", "fr_FR")
@@ -300,7 +300,7 @@ def test_numeric_faithfulness_accepts_french_and_german_number_formats():
 
 def test_a_decimal_comma_format_does_not_read_an_english_rendering_as_the_value():
     """There ``1,234`` reads as a decimal, so it is no evidence of 1234."""
-    from usersim.asset_gen.financial_services.validate import _value_present
+    from usersim.engine.probes.financial_services.asset_gen.validate import _value_present
 
     assert not _value_present(1234, "eine Gebühr von 1,234 €", "de_DE")
     assert not _value_present(1234, "des frais de 1,234 €", "fr_FR")
@@ -308,7 +308,7 @@ def test_a_decimal_comma_format_does_not_read_an_english_rendering_as_the_value(
 
 
 def test_english_formats_are_unchanged():
-    from usersim.asset_gen.financial_services.validate import _value_present
+    from usersim.engine.probes.financial_services.asset_gen.validate import _value_present
 
     for number_format in (None, "en_US", "en_IN", "en_GB"):
         assert _value_present(1234, "a fee of $1,234 a year", number_format)
@@ -534,7 +534,7 @@ def test_freeze_promotes_the_generation_report():
     """
     import json as _json
 
-    from usersim import asset_gen
+    from usersim.engine.probes.financial_services import asset_gen
 
     # Derived from the package, not the working directory: a relative path
     # here turns a real regression into a skip that nobody reads.
diff --git a/tests/probes/financial_services/test_probe.py b/tests/probes/financial_services/test_probe.py
index efd590e9..414fdd26 100644
--- a/tests/probes/financial_services/test_probe.py
+++ b/tests/probes/financial_services/test_probe.py
@@ -2694,8 +2694,8 @@ def test_user_prompt_names_the_institution_as_its_corpus_does(self):
 
     def test_generated_asset_round_trips_the_local_name(self):
         """It must survive serialization, or the runtime can never see it."""
-        from usersim.asset_gen.financial_services.pipeline import _institution_meta
-        from usersim.asset_gen.financial_services.spec import Institution as SpecInstitution
+        from usersim.engine.probes.financial_services.asset_gen.pipeline import _institution_meta
+        from usersim.engine.probes.financial_services.asset_gen.spec import Institution as SpecInstitution
 
         spec_inst = SpecInstitution(
             id="x_bank",
@@ -3013,7 +3013,7 @@ def test_unauthored_domain_falls_back_to_a_region_neutral_label(self):
 
     def test_engine_default_and_asset_gen_default_agree(self):
         """Two copies of the same table drift; pin them to each other."""
-        from usersim.asset_gen.financial_services.spec import DEFAULT_DOMAIN_ACCOUNT_LABELS as A
+        from usersim.engine.probes.financial_services.asset_gen.spec import DEFAULT_DOMAIN_ACCOUNT_LABELS as A
         from usersim.engine.probes.financial_services.bank import (
             DEFAULT_DOMAIN_ACCOUNT_LABELS as B,
         )
diff --git a/tests/test_probe_names_in_shared_code.py b/tests/test_probe_names_in_shared_code.py
index 630ad7a5..3858061d 100644
--- a/tests/test_probe_names_in_shared_code.py
+++ b/tests/test_probe_names_in_shared_code.py
@@ -29,7 +29,6 @@ class instead (``architecture/probes.md``, "What a probe declares").
 #: How many built-in probe labels each file outside ``engine/probes/`` may
 #: write as strings, by path under ``src/usersim/``.
 _ALLOWED: dict[str, int] = {
-    "asset_gen/registry.py": 3,
     "cli/_pipeline.py": 7,
     "cli/smoke.py": 2,
     "engine/core/clinical_profile_bank.py": 4,