diff --git a/.gitignore b/.gitignore
index 41e9674..c479dda 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
 dist
 node_modules
 documentation
-.env
+.env
\ No newline at end of file
diff --git a/package.json b/package.json
index 907b37d..97f31f6 100644
--- a/package.json
+++ b/package.json
@@ -13,16 +13,20 @@
   "exports": {
     ".": {
       "require": "./dist/index.js",
-      "import": "./dist/index.mjs",
+      "import": "./src/index.mjs",
       "types": "./dist/index.d.ts"
     }
   },
+  "files": [
+    "dist",
+    "src"
+  ],
   "engines": {
     "node": ">=16.0.0",
     "npm": ">=8.0.0"
   },
   "scripts": {
-    "build": "tsup src/index.js --format cjs,esm --dts --clean",
+    "build": "tsup src/index.js --format cjs --dts --clean",
     "test": "node --test",
     "doc": "jsdoc -c jsdoc.json"
   },
diff --git a/src/package.json b/src/package.json
new file mode 100644
index 0000000..aead43d
--- /dev/null
+++ b/src/package.json
@@ -0,0 +1,3 @@
+{
+  "type": "module"
+}
\ No newline at end of file
diff --git a/test/bucketManager.spec.js b/test/bucketManager.spec.js
index 87e00cc..54a84a0 100644
--- a/test/bucketManager.spec.js
+++ b/test/bucketManager.spec.js
@@ -1,10 +1,10 @@
 import test from "node:test";
 import assert from "node:assert/strict";
-import { BucketManager } from "../dist/index.mjs";
+import { BucketManager } from "../src/index.js";
 
 const TEST_PREFIX = Date.now();
 
-test("create bucket", async (t) => {
+test("create bucket", async () => {
   // Initialize BucketManager
   const bucketManager = new BucketManager(
     process.env.TEST_S3_KEY || process.env.TEST_KEY,
@@ -51,7 +51,7 @@ test("list buckets", async () => {
   );
 });
 
-test("delete bucket", async (t) => {
+test("delete bucket", async () => {
   // Initialize BucketManager
   const bucketManager = new BucketManager(
     process.env.TEST_S3_KEY || process.env.TEST_KEY,
@@ -82,7 +82,7 @@ test("delete bucket", async (t) => {
   assert.equal(typeof deletedBucket, "undefined");
 });
 
-test("set bucket privacy to public", async (t) => {
+test("set bucket privacy to public", async () => {
   // Initialize BucketManager
   const bucketManager = new BucketManager(
     process.env.TEST_S3_KEY || process.env.TEST_KEY,
diff --git a/test/gatewayManager.spec.js b/test/gatewayManager.spec.js
index 62f4398..364bb9c 100644
--- a/test/gatewayManager.spec.js
+++ b/test/gatewayManager.spec.js
@@ -1,6 +1,6 @@
 import { test } from "node:test";
 import assert from "node:assert/strict";
-import { GatewayManager } from "../dist/index.mjs";
+import { GatewayManager } from "../src/index.js";
 
 const TEST_PREFIX = Date.now();
 
diff --git a/test/nameManager.spec.js b/test/nameManager.spec.js
index 42d24d8..c48fe2c 100644
--- a/test/nameManager.spec.js
+++ b/test/nameManager.spec.js
@@ -1,6 +1,6 @@
 import { test } from "node:test";
 import assert from "node:assert/strict";
-import { NameManager } from "../dist/index.mjs";
+import { NameManager } from "../src/index.js";
 
 const TEST_CID = process.env.TEST_NAME_CID,
   TEST_PRIVATE_KEY = process.env.TEST_NAME_PRIVATE_KEY,
diff --git a/test/objectManager.spec.js b/test/objectManager.spec.js
index 6968bd3..6c2bb22 100644
--- a/test/objectManager.spec.js
+++ b/test/objectManager.spec.js
@@ -1,6 +1,6 @@
 import { test } from "node:test";
 import assert from "node:assert/strict";
-import { ObjectManager, BucketManager } from "../dist/index.mjs";
+import { ObjectManager, BucketManager } from "../src/index.js";
 import * as Path from "node:path";
 import { writeFile } from "node:fs/promises";
 import { v4 as uuidv4 } from "uuid";
diff --git a/test/package.json b/test/package.json
new file mode 100644
index 0000000..aead43d
--- /dev/null
+++ b/test/package.json
@@ -0,0 +1,3 @@
+{
+  "type": "module"
+}
\ No newline at end of file
diff --git a/test/pinManager.spec.js b/test/pinManager.spec.js
index 4b48fee..f42c2bb 100644
--- a/test/pinManager.spec.js
+++ b/test/pinManager.spec.js
@@ -5,7 +5,7 @@ import { v4 as uuidv4 } from "uuid";
 import Path from "node:path";
 import os from "node:os";
 import { writeFile } from "node:fs/promises";
-import { BucketManager } from "../dist/index.mjs";
+import { BucketManager } from "../src/index.js";
 
 const TEST_CID_1 = "QmSEu6zGwKgkQA3ZKaDnvkrwre1kkQa7eRFCbQi7waNwTT",
   TEST_CID_2 = "QmNXcMdXadLRTxLpHJMsGnaeKz26d2F6NgUDVWScp54EfC",
diff --git a/tsup.config.js b/tsup.config.js
index 2aa3a3b..0352edd 100644
--- a/tsup.config.js
+++ b/tsup.config.js
@@ -6,6 +6,6 @@ export default defineConfig({
   sourcemap: false,
   noExternal: ['@ipld/car', '@helia/car', '@helia/unixfs', 'blockstore-fs'],
   dts: true,
-  format: ['cjs', 'esm'],
+  format: ['cjs'],
   clean: true,
 })