diff --git a/packages/d3tooltip/.eslintignore b/packages/d3tooltip/.eslintignore
index 1521c8b7..a65b4177 100644
--- a/packages/d3tooltip/.eslintignore
+++ b/packages/d3tooltip/.eslintignore
@@ -1 +1 @@
-dist
+lib
diff --git a/packages/d3tooltip/babel.config.esm.json b/packages/d3tooltip/babel.config.esm.json
new file mode 100644
index 00000000..1c02687e
--- /dev/null
+++ b/packages/d3tooltip/babel.config.esm.json
@@ -0,0 +1,7 @@
+{
+  "presets": [
+    ["@babel/preset-env", { "targets": "defaults", "modules": false }],
+    "@babel/preset-typescript"
+  ],
+  "plugins": ["@babel/plugin-transform-runtime"]
+}
diff --git a/packages/d3tooltip/.babelrc b/packages/d3tooltip/babel.config.json
similarity index 100%
rename from packages/d3tooltip/.babelrc
rename to packages/d3tooltip/babel.config.json
diff --git a/packages/d3tooltip/package.json b/packages/d3tooltip/package.json
index 5d351523..afef4f3c 100644
--- a/packages/d3tooltip/package.json
+++ b/packages/d3tooltip/package.json
@@ -13,20 +13,25 @@
   "license": "MIT",
   "author": "romseguy",
   "files": [
-    "dist",
+    "lib",
     "src"
   ],
-  "main": "dist/d3tooltip.cjs.js",
-  "module": "dist/d3tooltip.esm.js",
-  "types": "dist/index.d.ts",
-  "unpkg": "dist/d3tooltip.umd.js",
+  "main": "lib/cjs/index.js",
+  "module": "lib/esm/index.js",
+  "types": "lib/types/index.d.ts",
+  "unpkg": "lib/umd/d3tooltip.umd.js",
+  "sideEffects": false,
   "repository": {
     "type": "git",
     "url": "https://github.com/reduxjs/redux-devtools.git"
   },
   "scripts": {
-    "build": "rollup -c",
-    "clean": "rimraf dist",
+    "build": "yarn build:cjs && yarn build:esm && yarn build:types && yarn build:umd",
+    "build:cjs": "babel src --extensions \".ts\" --out-dir lib/cjs",
+    "build:esm": "babel src --config-file ./babel.config.esm.json --extensions \".ts\" --out-dir lib/esm",
+    "build:types": "tsc --emitDeclarationOnly",
+    "build:umd": "rollup -c",
+    "clean": "rimraf lib",
     "lint": "eslint . --ext .ts",
     "type-check": "tsc --noEmit",
     "prepack": "yarn run clean && yarn run build",
@@ -37,6 +42,7 @@
     "ramda": "^0.28.0"
   },
   "devDependencies": {
+    "@babel/cli": "^7.16.8",
     "@babel/core": "^7.16.12",
     "@babel/eslint-parser": "^7.16.5",
     "@babel/plugin-transform-runtime": "^7.16.10",
diff --git a/packages/d3tooltip/rollup.config.js b/packages/d3tooltip/rollup.config.js
index ed4d229b..6a442f22 100644
--- a/packages/d3tooltip/rollup.config.js
+++ b/packages/d3tooltip/rollup.config.js
@@ -9,11 +9,13 @@ const config = [
     input: 'src/index.ts',
     output: {
       name: 'd3tooltip',
-      file: 'dist/d3tooltip.umd.js',
+      file: 'lib/umd/d3tooltip.js',
       format: 'umd',
     },
     plugins: [
-      typescript(),
+      typescript({
+        tsconfigOverride: { compilerOptions: { declaration: false } },
+      }),
       resolve(),
       commonjs(),
       babel({
@@ -27,11 +29,13 @@ const config = [
     input: 'src/index.ts',
     output: {
       name: 'd3tooltip',
-      file: 'dist/d3tooltip.umd.min.js',
+      file: 'lib/umd/d3tooltip.min.js',
       format: 'umd',
     },
     plugins: [
-      typescript(),
+      typescript({
+        tsconfigOverride: { compilerOptions: { declaration: false } },
+      }),
       resolve(),
       commonjs(),
       babel({
@@ -42,22 +46,6 @@ const config = [
       terser(),
     ],
   },
-  {
-    input: 'src/index.ts',
-    output: [
-      { file: 'dist/d3tooltip.cjs.js', format: 'cjs' },
-      { file: 'dist/d3tooltip.esm.js', format: 'esm' },
-    ],
-    plugins: [
-      typescript(),
-      babel({
-        babelHelpers: 'runtime',
-        extensions: ['.ts'],
-        plugins: ['@babel/plugin-transform-runtime'],
-      }),
-    ],
-    external: [/@babel\/runtime/, 'ramda'],
-  },
 ];
 
 export default config;
diff --git a/packages/d3tooltip/tsconfig.json b/packages/d3tooltip/tsconfig.json
index 7b7d1492..0aade49a 100644
--- a/packages/d3tooltip/tsconfig.json
+++ b/packages/d3tooltip/tsconfig.json
@@ -1,7 +1,7 @@
 {
   "extends": "../../tsconfig.react.base.json",
   "compilerOptions": {
-    "outDir": "lib"
+    "outDir": "lib/types"
   },
   "include": ["src"]
 }
diff --git a/yarn.lock b/yarn.lock
index a9cf79f4..96631e47 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -12589,6 +12589,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "d3tooltip@workspace:packages/d3tooltip"
   dependencies:
+    "@babel/cli": ^7.16.8
     "@babel/core": ^7.16.12
     "@babel/eslint-parser": ^7.16.5
     "@babel/plugin-transform-runtime": ^7.16.10