diff --git a/paperforge/config.py b/paperforge/config.py
index df7974c2..37016ffc 100644
--- a/paperforge/config.py
+++ b/paperforge/config.py
@@ -48,11 +48,11 @@ def load_simple_env(env_path: Path) -> None:
 
 DEFAULT_CONFIG: dict[str, str] = {
     "schema_version": "2",
-    "system_dir": "99_System",
-    "resources_dir": "03_Resources",
+    "system_dir": "System",
+    "resources_dir": "Resources",
     "literature_dir": "Literature",
     "control_dir": "LiteratureControl",
-    "base_dir": "05_Bases",
+    "base_dir": "Bases",
     "skill_dir": ".opencode/skills",
     "command_dir": ".opencode/command",
 }
@@ -62,7 +62,7 @@ ENV_KEYS: dict[str, str] = {
     "vault": "PAPERFORGE_VAULT",
     "system_dir": "PAPERFORGE_SYSTEM_DIR",
     "resources_dir": "PAPERFORGE_RESOURCES_DIR",
-    "literature_dir": "paperforgeRATURE_DIR",
+    "literature_dir": "PAPERFORGE_LITERATURE_DIR",
     "control_dir": "PAPERFORGE_CONTROL_DIR",
     "base_dir": "PAPERFORGE_BASE_DIR",
     "skill_dir": "PAPERFORGE_SKILL_DIR",
@@ -328,7 +328,7 @@ def paperforge_paths(
         "resources": resources,
         "literature": literature,
         "control": control,
-        "library_records": control,
+        "library_records": control / "library-records",
         "bases": bases,
         "worker_script": worker_script,
         "skill_dir": skill_path,
@@ -361,6 +361,8 @@ CONFIG_PATH_KEYS: tuple[str, ...] = (
     "literature_dir",
     "control_dir",
     "base_dir",
+    "skill_dir",
+    "command_dir",
 )
 
 
diff --git a/tests/test_config.py b/tests/test_config.py
index 1f193457..ec7facd5 100644
--- a/tests/test_config.py
+++ b/tests/test_config.py
@@ -115,18 +115,18 @@ def env_dict() -> dict[str, str]:
 # ---------------------------------------------------------------------------
 
 
-def test_default_system_dir_is_99_System():
-    """Built-in default for system_dir must be '99_System'."""
+def test_default_system_dir_is_System():
+    """Built-in default for system_dir must be 'System'."""
     from paperforge.config import DEFAULT_CONFIG
 
-    assert DEFAULT_CONFIG["system_dir"] == "99_System"
+    assert DEFAULT_CONFIG["system_dir"] == "System"
 
 
-def test_default_resources_dir_is_03_Resources():
-    """Built-in default for resources_dir must be '03_Resources'."""
+def test_default_resources_dir_is_Resources():
+    """Built-in default for resources_dir must be 'Resources'."""
     from paperforge.config import DEFAULT_CONFIG
 
-    assert DEFAULT_CONFIG["resources_dir"] == "03_Resources"
+    assert DEFAULT_CONFIG["resources_dir"] == "Resources"
 
 
 def test_default_literature_dir():
@@ -144,7 +144,7 @@ def test_default_control_dir():
 def test_default_base_dir():
     from paperforge.config import DEFAULT_CONFIG
 
-    assert DEFAULT_CONFIG["base_dir"] == "05_Bases"
+    assert DEFAULT_CONFIG["base_dir"] == "Bases"
 
 
 def test_default_skill_dir():
@@ -172,7 +172,7 @@ def test_env_keys_has_all_required_overrides():
         "PAPERFORGE_VAULT",
         "PAPERFORGE_SYSTEM_DIR",
         "PAPERFORGE_RESOURCES_DIR",
-        "paperforgeRATURE_DIR",
+        "PAPERFORGE_LITERATURE_DIR",
         "PAPERFORGE_CONTROL_DIR",
         "PAPERFORGE_BASE_DIR",
         "PAPERFORGE_SKILL_DIR",
@@ -277,8 +277,8 @@ def test_defaults_used_when_no_json(tmp_path: Path):
     vault.mkdir()
 
     cfg = load_vault_config(vault)
-    assert cfg["system_dir"] == "99_System"
-    assert cfg["resources_dir"] == "03_Resources"
+    assert cfg["system_dir"] == "System"
+    assert cfg["resources_dir"] == "Resources"
 
 
 # ---------------------------------------------------------------------------