diff --git a/src/main/kotlin/alfred/web/core/build/LogFile.kt b/src/main/kotlin/alfred/web/core/build/LogFile.kt
index 65ac81d..97e55b9 100644
--- a/src/main/kotlin/alfred/web/core/build/LogFile.kt
+++ b/src/main/kotlin/alfred/web/core/build/LogFile.kt
@@ -3,7 +3,6 @@ package alfred.web.core.build
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 import java.io.File
-import java.nio.file.Path
 import java.time.ZonedDateTime
 import kotlin.collections.joinToString
 import kotlin.io.appendText
diff --git a/src/main/kotlin/alfred/web/core/process/Git.kt b/src/main/kotlin/alfred/web/core/process/Git.kt
index 19e5b37..6d27835 100644
--- a/src/main/kotlin/alfred/web/core/process/Git.kt
+++ b/src/main/kotlin/alfred/web/core/process/Git.kt
@@ -5,6 +5,7 @@ import alfred.web.core.Handles
 import alfred.web.core.build.BuildContext
 import alfred.web.core.build.BuildId
 import alfred.web.core.build.Workspace
+import alfred.web.system.Processes
 import org.springframework.stereotype.Service
 import java.util.concurrent.TimeUnit
 
diff --git a/src/main/kotlin/alfred/web/core/process/Script.kt b/src/main/kotlin/alfred/web/core/process/Script.kt
index 3ec9497..2768e42 100644
--- a/src/main/kotlin/alfred/web/core/process/Script.kt
+++ b/src/main/kotlin/alfred/web/core/process/Script.kt
@@ -4,6 +4,7 @@ import alfred.web.core.Handle
 import alfred.web.core.Handles
 import alfred.web.core.build.BuildContext
 import alfred.web.core.build.Workspace
+import alfred.web.system.Processes
 import org.springframework.stereotype.Service
 import java.io.File
 
diff --git a/src/main/kotlin/alfred/web/core/runner/GitRunner.kt b/src/main/kotlin/alfred/web/core/runner/GitRunner.kt
index 70ed901..4401a5a 100644
--- a/src/main/kotlin/alfred/web/core/runner/GitRunner.kt
+++ b/src/main/kotlin/alfred/web/core/runner/GitRunner.kt
@@ -8,8 +8,8 @@ import alfred.web.core.build.Workspace
 import alfred.web.core.build.Workspaces
 import alfred.web.core.event.BuildFinished
 import alfred.web.core.process.Git
-import alfred.web.core.process.Processes
 import alfred.web.core.process.Script
+import alfred.web.system.Processes
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 import org.springframework.context.ApplicationEventPublisher
diff --git a/src/main/kotlin/alfred/web/core/process/ProcessEnvironment.kt b/src/main/kotlin/alfred/web/system/ProcessEnvironment.kt
similarity index 78%
rename from src/main/kotlin/alfred/web/core/process/ProcessEnvironment.kt
rename to src/main/kotlin/alfred/web/system/ProcessEnvironment.kt
index 6c1436e..c0dce26 100644
--- a/src/main/kotlin/alfred/web/core/process/ProcessEnvironment.kt
+++ b/src/main/kotlin/alfred/web/system/ProcessEnvironment.kt
@@ -1,8 +1,13 @@
-package alfred.web.core.process
+package alfred.web.system
 
 import alfred.web.core.build.BuildConfig
 import alfred.web.core.build.LogFile
 import org.springframework.stereotype.Service
+import kotlin.collections.filter
+import kotlin.collections.forEach
+import kotlin.collections.set
+import kotlin.let
+import kotlin.text.contains
 
 @Service
 class ProcessEnvironment {
diff --git a/src/main/kotlin/alfred/web/core/process/Processes.kt b/src/main/kotlin/alfred/web/system/Processes.kt
similarity index 82%
rename from src/main/kotlin/alfred/web/core/process/Processes.kt
rename to src/main/kotlin/alfred/web/system/Processes.kt
index 6963c4a..e38d97a 100644
--- a/src/main/kotlin/alfred/web/core/process/Processes.kt
+++ b/src/main/kotlin/alfred/web/system/Processes.kt
@@ -1,7 +1,6 @@
-package alfred.web.core.process
+package alfred.web.system
 
 import alfred.web.core.build.BuildConfig
-import alfred.web.core.build.BuildContext
 import alfred.web.core.build.LogFile
 import org.springframework.stereotype.Service
 import kotlin.apply
@@ -20,9 +19,6 @@ class Processes(
                 environment().putAll(env.forBuild(config, logFile, rev))
             }
 
-    fun builder(ctx: BuildContext) =
-        builder(ctx.config, ctx.logFile, ctx.rev)
-
     fun startThread(block: () -> Unit) {
         Thread {
             block()
diff --git a/src/test/kotlin/alfred/web/core/runner/GitRunnerTest.kt b/src/test/kotlin/alfred/web/core/runner/GitRunnerTest.kt
index 2ce3c3a..b3cc455 100644
--- a/src/test/kotlin/alfred/web/core/runner/GitRunnerTest.kt
+++ b/src/test/kotlin/alfred/web/core/runner/GitRunnerTest.kt
@@ -6,9 +6,9 @@ import alfred.web.core.build.Workspaces
 import alfred.web.core.event.BuildFinished
 import alfred.web.core.eventPublisher
 import alfred.web.core.process.Git
-import alfred.web.core.process.ProcessEnvironment
 import alfred.web.core.process.Processes
 import alfred.web.core.process.Script
+import alfred.web.system.ProcessEnvironment
 import io.mockk.every
 import io.mockk.justRun
 import io.mockk.mockk
diff --git a/src/test/kotlin/alfred/web/core/process/ProcessEnvironmentTest.kt b/src/test/kotlin/alfred/web/system/ProcessEnvironmentTest.kt
similarity index 93%
rename from src/test/kotlin/alfred/web/core/process/ProcessEnvironmentTest.kt
rename to src/test/kotlin/alfred/web/system/ProcessEnvironmentTest.kt
index 1c6232e..bce3548 100644
--- a/src/test/kotlin/alfred/web/core/process/ProcessEnvironmentTest.kt
+++ b/src/test/kotlin/alfred/web/system/ProcessEnvironmentTest.kt
@@ -1,7 +1,8 @@
-package alfred.web.core.process
+package alfred.web.system
 
 import alfred.web.core.build.BuildConfig
 import alfred.web.core.build.LogFile
+import alfred.web.system.ProcessEnvironment
 import org.junit.jupiter.api.Test
 import java.nio.file.Files
 import kotlin.test.assertEquals