diff --git a/index.ts b/index.ts
index de8c474..e899e21 100644
--- a/index.ts
+++ b/index.ts
@@ -3,8 +3,8 @@ import { tmpdir } from "node:os";
 import path from "node:path";
 import { cwd, exit } from "node:process";
 import { Alpine } from "./alpine.js";
-import { setupForgejo } from "./forgejo/index.js";
-import { generateForgejoSecretsFile } from "./forgejo/secrets.js";
+import { setupForgejo } from "./services/forgejo/index.js";
+import { generateForgejoSecretsFile } from "./services/forgejo/secrets.js";
 import { execFile } from "./helpers/better-api.js";
 import { sudoChownToRunningUser } from "./helpers/sudo.js";
 import { setupKernel } from "./kernel.js";
diff --git a/forgejo/build.ts b/services/forgejo/build.ts
similarity index 96%
rename from forgejo/build.ts
rename to services/forgejo/build.ts
index c8c08e3..7857a44 100644
--- a/forgejo/build.ts
+++ b/services/forgejo/build.ts
@@ -1,6 +1,6 @@
 import { chmod, mkdir, readFile, writeFile } from "node:fs/promises";
 import { join } from "node:path";
-import { reproRun } from "../helpers/repro-run.js";
+import { reproRun } from "../../helpers/repro-run.js";
 
 const FORGEJO_VERSION = "v1.18.3-0";
 
diff --git a/forgejo/index.ts b/services/forgejo/index.ts
similarity index 95%
rename from forgejo/index.ts
rename to services/forgejo/index.ts
index 09f2404..4f72434 100644
--- a/forgejo/index.ts
+++ b/services/forgejo/index.ts
@@ -1,10 +1,10 @@
 import { buildForgejo } from "./build.js";
-import { Alpine } from "../alpine.js";
-import { Runit } from "../runit/index.js";
-import { constants, writeFile } from "node:fs/promises";
+import { Alpine } from "../../alpine.js";
+import { Runit } from "../../runit/index.js";
+import { writeFile } from "node:fs/promises";
 import { join } from "node:path";
 import { loadForgejoSecretsFile } from "./secrets.js";
-import { sudoChmod, sudoChown, sudoCopy } from "../helpers/sudo.js";
+import { sudoChown, sudoCopy } from "../../helpers/sudo.js";
 
 export async function setupForgejo(alpine: Alpine, runit: Runit) {
   const bin = await buildForgejo();
diff --git a/forgejo/secrets.test.ts b/services/forgejo/secrets.test.ts
similarity index 100%
rename from forgejo/secrets.test.ts
rename to services/forgejo/secrets.test.ts
diff --git a/forgejo/secrets.ts b/services/forgejo/secrets.ts
similarity index 89%
rename from forgejo/secrets.ts
rename to services/forgejo/secrets.ts
index f55b9dc..8250229 100644
--- a/forgejo/secrets.ts
+++ b/services/forgejo/secrets.ts
@@ -1,5 +1,5 @@
-import { execFile } from "../helpers/better-api.js";
-import { generateSecretsFile, loadSecretsFile } from "../helpers/secrets.js";
+import { execFile } from "../../helpers/better-api.js";
+import { generateSecretsFile, loadSecretsFile } from "../../helpers/secrets.js";
 import { buildForgejo } from "./build.js";
 
 export interface ForgejoSecrets {