diff --git a/.eslintrc b/.eslintrc
index befef9708..f93683740 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -7,8 +7,7 @@
     },
     "project": [
       "./tsconfig.json",
-      "./test/unit/tsconfig.json",
-      "./test/integration/tsconfig.json"
+      "./test/tsconfig.json",
     ]
   },
   "extends": ["oceanprotocol", "plugin:prettier/recommended"],
diff --git a/package.json b/package.json
index 9b01ef14e..f0d82991f 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,7 @@
     "require": "./dist/lib.js",
     "default": "./dist/lib.modern.js"
   },
-  "types": "./dist/src/index.d.ts",
+  "types": "./dist/types/index.d.ts",
   "scripts": {
     "start": "npm run clean && npm run build:metadata && tsc -w",
     "build": "npm run clean && npm run build:metadata && microbundle build --format modern,esm,cjs,umd --compress --tsconfig tsconfig.json",
diff --git a/tsconfig.json b/tsconfig.json
index b113c025a..ad48dc015 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -11,9 +11,9 @@
     "removeComments": false,
     "experimentalDecorators": true,
     "preserveConstEnums": true,
-    "outDir": "./dist/",
+    "outDir": "./dist",
     "sourceMap": true,
-    "declarationDir": "./dist/"
   },
-  "include": ["src/**/*", "test/**/*"]
+  "include": ["src/**/*"],
+  "exclude": ["node_modules", "test"]
 }