@@ -253,7 +253,7 @@ must refuse its `-rpath "$XLINGS_SUBOS_LIB"`, because that variable names the
 different physical glibc payload. mcpp emits the farm entry it derived from the
 binding it actually selected.
 
-## 3. The link model (`src/toolchain/linkmodel.cppm`)
+## 3. The link model (`modules/toolchain-model/src/linkmodel.cppm`)
 
 `ToolchainLinkModel` answers exactly one question — *how does mcpp compile and
 link against this toolchain's C library* — and every consumer derives its
@@ -550,7 +550,7 @@ One prediction was wrong, and the correction is the load-bearing part of the
 design. The C library does **not** live inside the toolchain payload, so this
 is not `CLibMode::Sysroot` with a different sysroot. picolibc is a separate
 payload named by the target's own table row
-(`sysroot = xim:picolibc-riscv@1.8.12` in `src/toolchain/triple.cppm`), on the
+(`sysroot = xim:picolibc-riscv@1.8.12` in `modules/toolchain-model/src/triple.cppm`), on the
 same footing as that row's compiler `pin`. Resolving it from the target rather
 than from the toolchain is what keeps a bare-metal *package* from having to
 name a libc, exactly as a hosted package never names glibc.
@@ -636,11 +636,11 @@ answer them.
 |---|---|
 | spec → xim package, frontends | `src/toolchain/registry.cppm` |
 | detect/probe (triple, sysroot, payloads) | `src/toolchain/detect.cppm`, `probe.cppm` |
-| link model + loader resolution | `src/toolchain/linkmodel.cppm` |
+| link model + loader resolution | `modules/toolchain-model/src/linkmodel.cppm` |
 | unified fixup pipeline (patchelf/specs/cfg, marker) | `src/toolchain/post_install.cppm` |
 | install/lifecycle entry | `src/toolchain/lifecycle.cppm`; auto-install entries in `src/build/prepare.cppm` |
 | root runtime selection/binding | `src/xlings/runtime_selection.cppm`, `src/runtime/binding.cppm`, `src/xlings/subos_info.cppm` |
-| generic runtime contract + LinkIntent | `src/manifest/types.cppm`, `src/build/plan.cppm`, `src/build/flags.cppm` |
+| generic runtime contract + LinkIntent | `modules/manifest/src/types.cppm`, `src/build/plan.cppm`, `src/build/flags.cppm` |
 | stored resolution explanation | `src/build/prepare.cppm`, `src/build/runtime_validation.cppm`, `src/doctor.cppm` |
 | flag assembly (main build) | `src/build/flags.cppm` |
 | `import std;` precompile | `src/toolchain/stdmod.cppm` |
 
@@ -11,7 +11,7 @@ of those commit messages contains a misdiagnosis that is corrected in §5.
 | Site | Group | Moves when |
 |---|---|---|
 | `mcpp.toml` `[package].version` | **being built** | work starts on a new version |
-| `src/version.cppm` `MCPP_VERSION` | **being built** | same commit as above (compiled-in copy) |
+| `modules/versioning/src/version.cppm` `MCPP_VERSION` | **being built** | same commit as above (compiled-in copy) |
 | `.xlings.json` `[workspace].mcpp` | **bootstrapped from** | separately, *after* a release is installable |
 | `ci-fresh-install.yml` `MCPP_PIN` | **version under test** | **nothing — it is derived at run time** (§5) |
 
 
@@ -13,7 +13,7 @@ covers the hosted link model this chapter departs from.
 ## Overview
 
 A freestanding target is a target whose `os` field is `none`. The target table
-at `src/toolchain/triple.cppm` carries four of them:
+at `modules/toolchain-model/src/triple.cppm` carries four of them:
 
 | Triple | Tier | C library |
 |---|---|---|
 
@@ -206,7 +206,7 @@ mcpp 还会给它启动的每个进程声明 `XLINGS_SUBOS_LD_PATHS=0` ——
 (`<mcpp home>/registry`),两者通常指向由**不同物理 glibc 载荷**支撑的不同 farm。
 mcpp 发的是自己从已选 binding 推导出来的那一条。
 
-## 3. 链接模型(`src/toolchain/linkmodel.cppm`)
+## 3. 链接模型(`modules/toolchain-model/src/linkmodel.cppm`)
 
 `ToolchainLinkModel` 只回答一个问题——*如何对该工具链的 C 库编译与链接*——
 全部消费方从它派生 flags:
@@ -447,7 +447,7 @@ loader;`/bin/sh` 有事:它的 `PT_INTERP` 指向**宿主** loader,而且任何
 
 有一条预测是错的,而这条更正正是整个设计的承重部分。C 库**不在**工具链载荷内,
 因此这并不是换了一个 sysroot 的 `CLibMode::Sysroot`。picolibc 是一份独立载荷,
-由目标自己的表行指名(`src/toolchain/triple.cppm` 中的
+由目标自己的表行指名(`modules/toolchain-model/src/triple.cppm` 中的
 `sysroot = xim:picolibc-riscv@1.8.12`),与该行的编译器 `pin` 处于同一地位。
 从目标而非从工具链解析它,正是裸机**包**不必指名一份 libc 的原因,如同 hosted
 包从不指名 glibc。
@@ -496,11 +496,11 @@ mcpp 把运行时 DLL 部署到产物 exe 旁,这正是该平台对 §3–§4
 |---|---|
 | spec → xim 包、前端 | `src/toolchain/registry.cppm` |
 | detect/probe(triple、sysroot、payload)| `src/toolchain/detect.cppm`、`probe.cppm` |
-| 链接模型 + loader 解析 | `src/toolchain/linkmodel.cppm` |
+| 链接模型 + loader 解析 | `modules/toolchain-model/src/linkmodel.cppm` |
 | 统一 fixup 管线(patchelf/specs/cfg、marker)| `src/toolchain/post_install.cppm` |
 | install/lifecycle 入口 | `src/toolchain/lifecycle.cppm`;auto-install 入口在 `src/build/prepare.cppm` |
 | root runtime 选择/binding | `src/xlings/runtime_selection.cppm`、`src/runtime/binding.cppm`、`src/xlings/subos_info.cppm` |
-| 通用 runtime contract + LinkIntent | `src/manifest/types.cppm`、`src/build/plan.cppm`、`src/build/flags.cppm` |
+| 通用 runtime contract + LinkIntent | `modules/manifest/src/types.cppm`、`src/build/plan.cppm`、`src/build/flags.cppm` |
 | 存储 resolution 解释 | `src/build/prepare.cppm`、`src/build/runtime_validation.cppm`、`src/doctor.cppm` |
 | flag 组装(主构建)| `src/build/flags.cppm` |
 | `import std;` 预编译 | `src/toolchain/stdmod.cppm` |
 
@@ -11,7 +11,7 @@
 | 位置 | 组 | 何时变 |
 |---|---|---|
 | `mcpp.toml` `[package].version` | **正在构建的** | 开始做新版本时 |
-| `src/version.cppm` `MCPP_VERSION` | **正在构建的** | 与上一行同一个 commit（编译进二进制的副本） |
+| `modules/versioning/src/version.cppm` `MCPP_VERSION` | **正在构建的** | 与上一行同一个 commit（编译进二进制的副本） |
 | `.xlings.json` `[workspace].mcpp` | **自举起点** | 单独地、在某个版本**已可安装之后** |
 | `ci-fresh-install.yml` `MCPP_PIN` | **被测版本** | **不变 —— 运行时推导**（§5） |
 
 
@@ -10,7 +10,7 @@
 
 ## 概述
 
-freestanding 目标是 `os` 字段为 `none` 的目标。`src/toolchain/triple.cppm`
+freestanding 目标是 `os` 字段为 `none` 的目标。`modules/toolchain-model/src/triple.cppm`
 的目标表中有四个:
 
 | Triple | 档位 | C 库 |