diff --git a/.bach/src/run.bach/run/Greeter.java b/.bach/src/run.bach/run/Greeter.java
index 42f444e51..2a9293707 100644
--- a/.bach/src/run.bach/run/Greeter.java
+++ b/.bach/src/run.bach/run/Greeter.java
@@ -3,10 +3,10 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.spi.ToolProvider;
-import run.bach.Bach;
 import run.bach.Tool;
 import run.bach.ToolInstaller;
 import run.bach.ToolProgram;
+import run.bach.workflow.Folders;
 
 public record Greeter(String version) implements ToolInstaller {
   public static void main(String... args) throws Exception {
@@ -14,7 +14,7 @@ public static void main(String... args) throws Exception {
     System.out.println("[1]");
     greeter.install().run(); // "run.bach/greeter@99"
 
-    var folders = Bach.Folders.ofTemporaryDirectory();
+    var folders = Folders.ofTemporaryDirectory();
     System.out.println("\n[2]");
     Tool.of("greeter/eager", greeter.install(folders.tool("greeter/eager"))).run();
     System.out.println("\n[3]");
diff --git a/.bach/src/run.bach/run/Project.java b/.bach/src/run.bach/run/Project.java
index c83b6c825..b03395b72 100644
--- a/.bach/src/run.bach/run/Project.java
+++ b/.bach/src/run.bach/run/Project.java
@@ -2,11 +2,11 @@
 
 import java.nio.file.Files;
 import java.util.Optional;
-import run.bach.Bach;
 import run.bach.ToolCall;
 import run.bach.ToolRunner;
 import run.bach.workflow.Builder;
 import run.bach.workflow.ClassesCompiler;
+import run.bach.workflow.Folders;
 import run.bach.workflow.ImageCompiler;
 import run.bach.workflow.Starter;
 import run.bach.workflow.Structure;
@@ -18,7 +18,7 @@
 public record Project(boolean verbose, Workflow workflow) implements Builder, Starter {
   static Project ofCurrentWorkingDirectory() {
     var verbose = Boolean.getBoolean("-Debug".substring(2));
-    var folders = Bach.Folders.ofCurrentWorkingDirectory();
+    var folders = Folders.ofCurrentWorkingDirectory();
     var basics = new Basics("Bach", "2024-ea");
     var main =
         new Space("main")
diff --git a/.bach/src/run.bach/run/bach b/.bach/src/run.bach/run/bach
index ee8a40207..223cb38f5 160000
--- a/.bach/src/run.bach/run/bach
+++ b/.bach/src/run.bach/run/bach
@@ -1 +1 @@
-Subproject commit ee8a40207b1a7ac8e42fd24b19ad795a9707da8a
+Subproject commit 223cb38f57b33291c4d7f4fadddd6df56b1e5310