diff --git a/Makefile b/Makefile
index eab873b..4b1ff79 100644
--- a/Makefile
+++ b/Makefile
@@ -4,4 +4,6 @@
 .PHONY: build
 build:
 	npx tsc --resolveJsonModule -p ./tsconfig.json --outDir ./dist --emitDeclarationOnly --declaration
-	node esbuild.mjs
+
+	npx esbuild ./src/index.ts --bundle --format=esm --outfile=dist/index.js --packages=external --target=es2022 --sourcemap=true --minify=true
+	npx esbuild ./src/core/index.ts --bundle --format=esm --outfile=dist/core/index.js --packages=external --target=es2022 --sourcemap=true --minify=true
\ No newline at end of file
diff --git a/esbuild.mjs b/esbuild.mjs
deleted file mode 100644
index 0345157..0000000
--- a/esbuild.mjs
+++ /dev/null
@@ -1,15 +0,0 @@
-import * as esbuild from "esbuild";
-
-(async () => {
-  await esbuild.build({
-    entryPoints: ["src/index.ts"], // Specify your entry point(s) here
-    outfile: "dist/index.js", // Specify the output file here
-    bundle: true,
-    packages: "external",
-    target: "es2022",
-    format: "esm",
-    sourcemap: true,
-    minify: true,
-    plugins: [],
-  });
-})();
diff --git a/package.json b/package.json
index 3d45388..7889450 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "rocky7",
-  "version": "0.3.16",
+  "version": "0.3.17",
   "author": "Abhishiv Saxena<abhishiv@gmail.com>",
   "license": "MIT",
   "description": "Fine-grained reactive library with no compiler, no magic, and no virtual DOM",