diff --git a/scripts/build.ts b/scripts/build.ts
index 588327c9..6c64bd51 100644
--- a/scripts/build.ts
+++ b/scripts/build.ts
@@ -1,9 +1,10 @@
-import {$} from "bun";
+import { $ } from "bun";
+import { buildClientPackages } from "./devtools/client-packages";
 
-import "./pre-build";
+await buildClientPackages();
 
 await Promise.all([
   $`bun run --filter="@superstreamer/app" build`,
   $`bun run --filter="@superstreamer/artisan" build`,
   $`bun run --filter="@superstreamer/stitcher" build`,
-])
\ No newline at end of file
+])
diff --git a/scripts/clean-s3.ts b/scripts/devtools/clear-all.ts
similarity index 80%
rename from scripts/clean-s3.ts
rename to scripts/devtools/clear-all.ts
index b8f8031b..ea19d033 100644
--- a/scripts/clean-s3.ts
+++ b/scripts/devtools/clear-all.ts
@@ -3,7 +3,7 @@ import {
   ListObjectsCommand,
   S3,
 } from "@aws-sdk/client-s3";
-import { env } from "../packages/api/src/env";
+import { env } from "../../packages/api/src/env";
 
 const client = new S3({
   endpoint: env.S3_ENDPOINT,
@@ -14,7 +14,7 @@ const client = new S3({
   },
 });
 
-for (const prefix of ["transcode", "package"]) {
+async function clearFolder(prefix: string) {
   const response = await client.send(
     new ListObjectsCommand({
       Bucket: env.S3_BUCKET,
@@ -33,3 +33,6 @@ for (const prefix of ["transcode", "package"]) {
     }),
   );
 }
+
+await clearFolder("transcode");
+await clearFolder("package");
diff --git a/scripts/devtools/client-packages.ts b/scripts/devtools/client-packages.ts
new file mode 100644
index 00000000..f3b67bc5
--- /dev/null
+++ b/scripts/devtools/client-packages.ts
@@ -0,0 +1,10 @@
+import { $ } from "bun";
+
+export async function buildClientPackages() {
+  await Promise.all([
+    // Build api for the api client.
+    $`bun run --filter="@superstreamer/api" build`,
+    // Build player for app.
+    $`bun run --filter="@superstreamer/player" build`,
+  ]);
+}
diff --git a/scripts/lint.ts b/scripts/lint.ts
index d65deccd..6f7a32d5 100644
--- a/scripts/lint.ts
+++ b/scripts/lint.ts
@@ -1,5 +1,6 @@
-import {$} from "bun";
+import { $ } from "bun";
+import { buildClientPackages } from "./devtools/client-packages";
 
-import "./pre-build";
+await buildClientPackages();
 
-await $`bun run --filter="*" lint`;
\ No newline at end of file
+await $`bun run --filter="*" lint`;
diff --git a/scripts/pre-build.ts b/scripts/pre-build.ts
deleted file mode 100644
index bda3bda0..00000000
--- a/scripts/pre-build.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import {$} from "bun";
-
-await Promise.all([
-  // Build api for the api client.
-  $`bun run --filter="@superstreamer/api" build`,
-  // Build player for app.
-  $`bun run --filter="@superstreamer/player" build`,
-])
diff --git a/scripts/test.ts b/scripts/test.ts
index df751253..f7540704 100644
--- a/scripts/test.ts
+++ b/scripts/test.ts
@@ -1,5 +1,6 @@
-import {$} from "bun";
+import { $ } from "bun";
+import { buildClientPackages } from "./devtools/client-packages";
 
-import "./pre-build";
+await buildClientPackages();
 
-await $`bun run --filter="*" test`;
\ No newline at end of file
+await $`bun run --filter="*" test`;