diff --git a/pkgs/pow-captcha/src/lib.ts b/pkgs/pow-captcha/src/lib.ts
index e947e61..9e6ac51 100644
--- a/pkgs/pow-captcha/src/lib.ts
+++ b/pkgs/pow-captcha/src/lib.ts
@@ -1,3 +1,3 @@
 export * as server from "./server";
-export * as solver from "./solver";
+export * as solver from "./solver/solver";
 export * as wire from "./wire";
diff --git a/pkgs/pow-captcha/src/server.ts b/pkgs/pow-captcha/src/server.ts
index b2f3d41..49935b7 100644
--- a/pkgs/pow-captcha/src/server.ts
+++ b/pkgs/pow-captcha/src/server.ts
@@ -1,5 +1,5 @@
 import * as wire from "./wire";
-import * as solver from "./solver";
+import * as solver from "./solver/solver";
 import { createArray } from "./utils";
 
 export type CreateChallengesOptions = {
diff --git a/pkgs/pow-captcha/src/solver-shared.ts b/pkgs/pow-captcha/src/solver/shared.ts
similarity index 100%
rename from pkgs/pow-captcha/src/solver-shared.ts
rename to pkgs/pow-captcha/src/solver/shared.ts
diff --git a/pkgs/pow-captcha/src/solver.spec.ts b/pkgs/pow-captcha/src/solver/solver.spec.ts
similarity index 100%
rename from pkgs/pow-captcha/src/solver.spec.ts
rename to pkgs/pow-captcha/src/solver/solver.spec.ts
diff --git a/pkgs/pow-captcha/src/solver.ts b/pkgs/pow-captcha/src/solver/solver.ts
similarity index 97%
rename from pkgs/pow-captcha/src/solver.ts
rename to pkgs/pow-captcha/src/solver/solver.ts
index 67bd7a9..60bd529 100644
--- a/pkgs/pow-captcha/src/solver.ts
+++ b/pkgs/pow-captcha/src/solver/solver.ts
@@ -2,8 +2,8 @@ import {
 	WORKER_READY,
 	type WorkerRequest,
 	type WorkerResponse,
-} from "./solver-shared";
-import { arrayStartsWith, chunkArray } from "./utils";
+} from "./shared";
+import { arrayStartsWith, chunkArray } from "../utils";
 
 export async function solveJs(
 	nonce: Uint8Array,
diff --git a/pkgs/pow-captcha/src/solver-worker.ts b/pkgs/pow-captcha/src/solver/worker.ts
similarity index 78%
rename from pkgs/pow-captcha/src/solver-worker.ts
rename to pkgs/pow-captcha/src/solver/worker.ts
index f732060..c47abae 100644
--- a/pkgs/pow-captcha/src/solver-worker.ts
+++ b/pkgs/pow-captcha/src/solver/worker.ts
@@ -1,10 +1,10 @@
-import * as solver from "./solver";
-import * as wasm from "@pow-captcha/solver-wasm";
+import { solveJs } from "./solver";
+import { solve as solveWasm } from "@pow-captcha/solver-wasm";
 import {
 	WORKER_READY,
 	type WorkerRequest,
 	type WorkerResponse,
-} from "./solver-shared";
+} from "./shared";
 
 async function solve(
 	nonce: Uint8Array,
@@ -14,20 +14,20 @@ async function solve(
 ): Promise<Uint8Array> {
 	switch (engine) {
 		case "js":
-			return await solver.solveJs(nonce, target, difficultyBits);
+			return await solveJs(nonce, target, difficultyBits);
 
 		case "wasm":
-			return wasm.solve(nonce, target, difficultyBits);
+			return solveWasm(nonce, target, difficultyBits);
 
 		case undefined:
 			try {
-				return wasm.solve(nonce, target, difficultyBits);
+				return solveWasm(nonce, target, difficultyBits);
 			} catch (err) {
 				console.warn(
 					"pow-captcha: Falling back to js solver. Error: ",
 					err,
 				);
-				return await solver.solveJs(nonce, target, difficultyBits);
+				return await solveJs(nonce, target, difficultyBits);
 			}
 	}
 }