microsoft · crutkas · May 23, 2026 · May 23, 2026
diff --git a/.pipelines/OneBranch.SignAndPackage.yml b/.pipelines/OneBranch.SignAndPackage.yml
@@ -50,9 +50,9 @@ extends:
                 inputs:
                   SourceFolder: $(Build.SourcesDirectory)
                   Contents: |
-                    src/Windows Dev Config/**
+                    src/windows-dev-config/**
                     src/Workloads/**
-                    src/Wsl Comfort/**
+                    src/wsl-comfort/**
                     src/manifest.yml
                     README.md
                     LICENSE

diff --git a/README.md b/README.md
@@ -26,14 +26,14 @@ Windows Dev Config is a single DSC configuration that turns a fresh Windows 11 m
 **Run it:**
 
 ```powershell
-winget configure -f ".\Windows Dev Config\dev-config.winget" `
+winget configure -f .\windows-dev-config\dev-config.winget `
     --accept-configuration-agreements `
     --disable-interactivity
 ```
 
 The flow is idempotent and safe to re-run on an existing machine to apply updates or correct drift.
 
-Full details: [`Windows Dev Config/README.md`](./Windows%20Dev%20Config/README.md)
+Full details: [`windows-dev-config/README.md`](./windows-dev-config/README.md)
 
 ## WSL Comfort (Comfort Shell)
 
@@ -52,14 +52,14 @@ WSL Comfort is a two-part installer for a Windows + WSL shell environment. The W
 **Run it:**
 
 ```powershell
-& ".\Wsl Comfort\install.ps1"
+.\wsl-comfort\install.ps1
 ```
 
 Interactive by default. Use `-NonInteractive` for unattended runs; the bootstrap also accepts `--minimal` for a smaller setup.
 
 The Linux half remains standalone: you can copy `comfort-shell-bootstrap.sh` onto any Ubuntu host and run it independently.
 
-Full details: [`Wsl Comfort/readme.md`](./Wsl%20Comfort/readme.md)
+Full details: [`wsl-comfort/readme.md`](./wsl-comfort/readme.md)
 
 ## Single-language workloads
 
@@ -96,7 +96,7 @@ See [`src/future/cmdpal/README.md`](./src/future/cmdpal/README.md) for build and
 - **"Unrecognized command: configure"** - run `winget configure --enable`. If `winget configure` is still unavailable, see [`Workloads/_common/assert-winget-configure.ps1`](./Workloads/_common/assert-winget-configure.ps1).
 - **A workload says it succeeded but `python` / `node` / similar commands are not on PATH in this window.** Open a new terminal, or use the matching `install.ps1` shim to refresh PATH in the current session.
 - **Windows Dev Config rebooted the machine and appears to have stopped.** It registers a `RunOnce` entry so `winget configure` resumes after you sign back in.
-- **WSL is missing when you tried to run the Comfort Shell bootstrap directly.** Use `& ".\Wsl Comfort\install.ps1"` on Windows so the flow can install WSL first.
+- **WSL is missing when you tried to run the Comfort Shell bootstrap directly.** Use `.\wsl-comfort\install.ps1` on Windows so the flow can install WSL first.
 
 ## License
 

diff --git a/src/docs/development.md b/src/docs/development.md
@@ -46,8 +46,8 @@ extension.
 | Python            | ✅ automated   | `Python.Python.3.13`, `astral-sh.uv`                                                    |
 | WinForms          | 🙋 manual     | `Microsoft.DotNet.SDK.10` + the .NET desktop workload (multi-GB; manual to spare CI minutes) |
 | WinUI 3           | 🙋 manual     | `Microsoft.DotNet.SDK.10`, `Microsoft.VisualStudio.Community`, `Microsoft.WinAppCLI` + WinUI/Universal/ManagedDesktop VS workloads |
-| Calm OS           | 🙋 manual     | A full distraction-free workstation: apps + ~24 registry tweaks + WSL + Ubuntu (see [`Windows Dev Config/README.md`](../Windows%20Dev%20Config/README.md)) |
-| Comfort Shell     | 🙋 manual     | WSL distro + zsh/bash + starship + modern CLI bundle + JetBrainsMono Nerd Font + themed Windows Terminal profile (see [`Wsl Comfort/readme.md`](../Wsl%20Comfort/readme.md)) |
+| Calm OS           | 🙋 manual     | A full distraction-free workstation: apps + ~24 registry tweaks + WSL + Ubuntu (see [`windows-dev-config/README.md`](../windows-dev-config/README.md)) |
+| Comfort Shell     | 🙋 manual     | WSL distro + zsh/bash + starship + modern CLI bundle + JetBrainsMono Nerd Font + themed Windows Terminal profile (see [`wsl-comfort/readme.md`](../wsl-comfort/readme.md)) |
 
 See [`manifest.yml`](../manifest.yml) for the canonical declarative
 list (paths, build/run commands, onboarding URLs).
@@ -78,8 +78,8 @@ Workloads/
   rust/            # configuration.winget (core) + install.ps1 (thin shim)
   winforms/        # configuration.winget (core) + install.ps1 (thin shim)
   winui/           # configuration.winget (core) + install.ps1 (thin shim)
-Windows Dev Config/    # Calm OS — dev-config.winget (single-file DSC) + install.ps1 + README.md
-Wsl Comfort/           # Comfort Shell — install.ps1 (Windows side) + comfort-shell-bootstrap.sh (Linux side, self-contained) + readme.md
+windows-dev-config/    # Calm OS — dev-config.winget (single-file DSC) + install.ps1 + README.md
+wsl-comfort/           # Comfort Shell — install.ps1 (Windows side) + comfort-shell-bootstrap.sh (Linux side, self-contained) + readme.md
 tests/
   _harness/          # build-run-diff harness used by CI:
                      #   run-flow.ps1   - all flows (build + run + diff stdout)

diff --git a/src/manifest.yml b/src/manifest.yml
@@ -234,7 +234,7 @@ flows:
     manual_test: true
     os: [windows]
     windows:
-      install: "Wsl Comfort/install.ps1"
+      install: wsl-comfort/install.ps1
       build: ""
       run: wsl -- bash src/tests/comfort-shell/hello.sh
       expected: src/tests/comfort-shell/expected.txt
@@ -255,8 +255,8 @@ flows:
     manual_test: true
     os: [windows]
     windows:
-      install: "Windows Dev Config/install.ps1"
-      configuration: "Windows Dev Config/dev-config.winget"
+      install: windows-dev-config/install.ps1
+      configuration: windows-dev-config/dev-config.winget
       build: ""
       run: pwsh -NoProfile -File src/tests/calm-os/probe.ps1
       expected: src/tests/calm-os/expected.txt

diff --git a/Windows Dev Config/README.md → src/windows-dev-config/README.md b/Windows Dev Config/README.md → src/windows-dev-config/README.md
diff --git a/Windows Dev Config/dev-config.winget → src/windows-dev-config/dev-config.winget b/Windows Dev Config/dev-config.winget → src/windows-dev-config/dev-config.winget
diff --git a/src/Windows Dev Config/install.ps1 → src/windows-dev-config/install.ps1 b/src/Windows Dev Config/install.ps1 → src/windows-dev-config/install.ps1
diff --git a/Wsl Comfort/comfort-shell-bootstrap.sh → src/wsl-comfort/comfort-shell-bootstrap.sh b/Wsl Comfort/comfort-shell-bootstrap.sh → src/wsl-comfort/comfort-shell-bootstrap.sh
diff --git a/src/Wsl Comfort/install.ps1 → src/wsl-comfort/install.ps1 b/src/Wsl Comfort/install.ps1 → src/wsl-comfort/install.ps1
diff --git a/Wsl Comfort/readme.md → src/wsl-comfort/readme.md b/Wsl Comfort/readme.md → src/wsl-comfort/readme.md
diff --git a/src/Windows Dev Config/README.md → windows-dev-config/README.md b/src/Windows Dev Config/README.md → windows-dev-config/README.md
diff --git a/src/Windows Dev Config/dev-config.winget → windows-dev-config/dev-config.winget b/src/Windows Dev Config/dev-config.winget → windows-dev-config/dev-config.winget
diff --git a/Windows Dev Config/install.ps1 → windows-dev-config/install.ps1 b/Windows Dev Config/install.ps1 → windows-dev-config/install.ps1
diff --git a/src/Wsl Comfort/comfort-shell-bootstrap.sh → wsl-comfort/comfort-shell-bootstrap.sh b/src/Wsl Comfort/comfort-shell-bootstrap.sh → wsl-comfort/comfort-shell-bootstrap.sh
diff --git a/Wsl Comfort/install.ps1 → wsl-comfort/install.ps1 b/Wsl Comfort/install.ps1 → wsl-comfort/install.ps1
diff --git a/src/Wsl Comfort/readme.md → wsl-comfort/readme.md b/src/Wsl Comfort/readme.md → wsl-comfort/readme.md