diff --git a/packages/d3-state-visualizer/package.json b/packages/d3-state-visualizer/package.json
index 17808c62..675c7cd8 100644
--- a/packages/d3-state-visualizer/package.json
+++ b/packages/d3-state-visualizer/package.json
@@ -17,7 +17,6 @@
   "author": "romseguy",
   "files": [
     "dist",
-    "lib",
     "src"
   ],
   "main": "dist/d3-state-visualizer.cjs.js",
@@ -30,7 +29,7 @@
   },
   "scripts": {
     "build": "rollup -c",
-    "clean": "rimraf lib dist",
+    "clean": "rimraf dist",
     "lint": "eslint . --ext .ts",
     "type-check": "tsc --noEmit",
     "prepack": "yarn run clean && yarn run build",
diff --git a/packages/d3-state-visualizer/rollup.config.js b/packages/d3-state-visualizer/rollup.config.js
index 13bbcff5..f2f518bb 100644
--- a/packages/d3-state-visualizer/rollup.config.js
+++ b/packages/d3-state-visualizer/rollup.config.js
@@ -17,7 +17,6 @@ const config = [
       resolve(),
       commonjs(),
       babel({
-        exclude: 'node_modules/**',
         babelHelpers: 'runtime',
         extensions: ['.ts'],
         plugins: ['@babel/plugin-transform-runtime'],
@@ -36,7 +35,6 @@ const config = [
       resolve(),
       commonjs(),
       babel({
-        exclude: 'node_modules/**',
         babelHelpers: 'runtime',
         extensions: ['.ts'],
         plugins: ['@babel/plugin-transform-runtime'],
@@ -53,7 +51,6 @@ const config = [
     plugins: [
       typescript(),
       babel({
-        exclude: 'node_modules/**',
         babelHelpers: 'runtime',
         extensions: ['.ts'],
         plugins: ['@babel/plugin-transform-runtime'],
diff --git a/packages/d3tooltip/README.md b/packages/d3tooltip/README.md
index 08bbd0b6..7a22d1c5 100644
--- a/packages/d3tooltip/README.md
+++ b/packages/d3tooltip/README.md
@@ -11,7 +11,7 @@ It was created by [@romseguy](https://github.com/romseguy) and merged from [`rom
 
 ```javascript
 import d3 from 'd3';
-import d3tooltip from 'd3tooltip';
+import { tooltip } from 'd3tooltip';
 
 const DOMNode = document.getElementById('chart');
 const root = d3.select(DOMNode);
diff --git a/packages/d3tooltip/package.json b/packages/d3tooltip/package.json
index 69e9e23e..85315d5d 100644
--- a/packages/d3tooltip/package.json
+++ b/packages/d3tooltip/package.json
@@ -13,7 +13,6 @@
   "license": "MIT",
   "author": "romseguy",
   "files": [
-    "lib",
     "dist",
     "src"
   ],
@@ -27,7 +26,7 @@
   },
   "scripts": {
     "build": "rollup -c",
-    "clean": "rimraf lib dist",
+    "clean": "rimraf dist",
     "lint": "eslint . --ext .ts",
     "type-check": "tsc --noEmit",
     "prepack": "yarn run clean && yarn run build",
diff --git a/packages/d3tooltip/rollup.config.js b/packages/d3tooltip/rollup.config.js
index 0fb181cc..ed4d229b 100644
--- a/packages/d3tooltip/rollup.config.js
+++ b/packages/d3tooltip/rollup.config.js
@@ -17,7 +17,6 @@ const config = [
       resolve(),
       commonjs(),
       babel({
-        exclude: 'node_modules/**',
         babelHelpers: 'runtime',
         extensions: ['.ts'],
         plugins: ['@babel/plugin-transform-runtime'],
@@ -36,7 +35,6 @@ const config = [
       resolve(),
       commonjs(),
       babel({
-        exclude: 'node_modules/**',
         babelHelpers: 'runtime',
         extensions: ['.ts'],
         plugins: ['@babel/plugin-transform-runtime'],
@@ -53,7 +51,6 @@ const config = [
     plugins: [
       typescript(),
       babel({
-        exclude: 'node_modules/**',
         babelHelpers: 'runtime',
         extensions: ['.ts'],
         plugins: ['@babel/plugin-transform-runtime'],
diff --git a/packages/map2tree/package.json b/packages/map2tree/package.json
index d6f867ce..ab7fa5e1 100755
--- a/packages/map2tree/package.json
+++ b/packages/map2tree/package.json
@@ -16,7 +16,6 @@
   "license": "MIT",
   "author": "romseguy",
   "files": [
-    "lib",
     "dist",
     "src"
   ],
@@ -30,7 +29,7 @@
   },
   "scripts": {
     "build": "rollup -c",
-    "clean": "rimraf lib dist",
+    "clean": "rimraf dist",
     "test": "jest",
     "lint": "eslint . --ext .ts",
     "type-check": "tsc --noEmit",
diff --git a/packages/map2tree/rollup.config.js b/packages/map2tree/rollup.config.js
index 92d940c6..db24ba2e 100644
--- a/packages/map2tree/rollup.config.js
+++ b/packages/map2tree/rollup.config.js
@@ -17,7 +17,6 @@ const config = [
       resolve(),
       commonjs(),
       babel({
-        exclude: 'node_modules/**',
         babelHelpers: 'runtime',
         extensions: ['.ts'],
         plugins: ['@babel/plugin-transform-runtime'],
@@ -36,7 +35,6 @@ const config = [
       resolve(),
       commonjs(),
       babel({
-        exclude: 'node_modules/**',
         babelHelpers: 'runtime',
         extensions: ['.ts'],
         plugins: ['@babel/plugin-transform-runtime'],
@@ -53,7 +51,6 @@ const config = [
     plugins: [
       typescript(),
       babel({
-        exclude: 'node_modules/**',
         babelHelpers: 'runtime',
         extensions: ['.ts'],
         plugins: ['@babel/plugin-transform-runtime'],
diff --git a/packages/react-base16-styling/package.json b/packages/react-base16-styling/package.json
index 9cb03984..3b9128d4 100644
--- a/packages/react-base16-styling/package.json
+++ b/packages/react-base16-styling/package.json
@@ -15,7 +15,7 @@
   "license": "MIT",
   "author": "Alexander <alexkuz@gmail.com> (http://kuzya.org/)",
   "files": [
-    "lib",
+    "dist",
     "src"
   ],
   "main": "dist/react-base16-styling.cjs.js",
@@ -27,7 +27,7 @@
   },
   "scripts": {
     "build": "rollup -c",
-    "clean": "rimraf lib",
+    "clean": "rimraf dist",
     "test": "jest",
     "lint": "eslint . --ext .ts",
     "type-check": "tsc --noEmit",
diff --git a/packages/react-base16-styling/rollup.config.js b/packages/react-base16-styling/rollup.config.js
index be7b052a..0002d276 100644
--- a/packages/react-base16-styling/rollup.config.js
+++ b/packages/react-base16-styling/rollup.config.js
@@ -11,7 +11,6 @@ const config = [
     plugins: [
       typescript(),
       babel({
-        exclude: 'node_modules/**',
         babelHelpers: 'runtime',
         extensions: ['.ts'],
         plugins: ['@babel/plugin-transform-runtime'],
diff --git a/packages/react-dock/package.json b/packages/react-dock/package.json
index 451b55e3..af813608 100644
--- a/packages/react-dock/package.json
+++ b/packages/react-dock/package.json
@@ -15,7 +15,7 @@
   "license": "MIT",
   "author": "Alexander <alexkuz@gmail.com> (http://kuzya.org/)",
   "files": [
-    "lib",
+    "dist",
     "src"
   ],
   "main": "dist/react-dock.cjs.js",
@@ -27,7 +27,7 @@
   },
   "scripts": {
     "build": "rollup -c",
-    "clean": "rimraf lib",
+    "clean": "rimraf dist",
     "test": "jest",
     "lint": "eslint . --ext .ts,.tsx",
     "type-check": "tsc --noEmit",
diff --git a/packages/react-dock/rollup.config.js b/packages/react-dock/rollup.config.js
index 65bf79a1..ebd47612 100644
--- a/packages/react-dock/rollup.config.js
+++ b/packages/react-dock/rollup.config.js
@@ -11,9 +11,8 @@ const config = [
     plugins: [
       typescript(),
       babel({
-        exclude: 'node_modules/**',
         babelHelpers: 'runtime',
-        extensions: ['.ts'],
+        extensions: ['.ts', '.tsx'],
         plugins: ['@babel/plugin-transform-runtime'],
       }),
     ],
diff --git a/packages/react-json-tree/.babelrc b/packages/react-json-tree/.babelrc
index 202d425a..47246cb3 100644
--- a/packages/react-json-tree/.babelrc
+++ b/packages/react-json-tree/.babelrc
@@ -1,6 +1,6 @@
 {
   "presets": [
-    "@babel/preset-env",
+    ["@babel/preset-env", { "targets": "defaults" }],
     "@babel/preset-react",
     "@babel/preset-typescript"
   ]
diff --git a/packages/react-json-tree/.eslintignore b/packages/react-json-tree/.eslintignore
index ed3bf25e..4d6880d3 100644
--- a/packages/react-json-tree/.eslintignore
+++ b/packages/react-json-tree/.eslintignore
@@ -1,3 +1,2 @@
+dist
 examples
-lib
-umd
diff --git a/packages/react-json-tree/.eslintrc.js b/packages/react-json-tree/.eslintrc.js
index aa185dd1..3bfcb789 100644
--- a/packages/react-json-tree/.eslintrc.js
+++ b/packages/react-json-tree/.eslintrc.js
@@ -1,10 +1,14 @@
 module.exports = {
-  extends: '../../eslintrc.ts.react.base.json',
-  parserOptions: {
-    tsconfigRootDir: __dirname,
-    project: ['./tsconfig.json'],
-  },
+  extends: '../../eslintrc.js.base.json',
   overrides: [
+    {
+      files: ['*.ts', '*.tsx'],
+      extends: '../../eslintrc.ts.react.base.json',
+      parserOptions: {
+        tsconfigRootDir: __dirname,
+        project: ['./tsconfig.json'],
+      },
+    },
     {
       files: ['test/**/*.ts', 'test/**/*.tsx'],
       extends: '../../eslintrc.ts.react.jest.base.json',
diff --git a/packages/react-json-tree/README.md b/packages/react-json-tree/README.md
index b4b13e7c..f1e96518 100644
--- a/packages/react-json-tree/README.md
+++ b/packages/react-json-tree/README.md
@@ -7,7 +7,7 @@ React JSON Viewer Component, Extracted from [redux-devtools](https://github.com/
 ### Usage
 
 ```jsx
-import JSONTree from 'react-json-tree';
+import { JSONTree } from 'react-json-tree';
 // If you're using Immutable.js: `npm i --save immutable`
 import { Map } from 'immutable';
 
diff --git a/packages/react-json-tree/examples/src/App.tsx b/packages/react-json-tree/examples/src/App.tsx
index 83ad4d07..75678a01 100644
--- a/packages/react-json-tree/examples/src/App.tsx
+++ b/packages/react-json-tree/examples/src/App.tsx
@@ -1,6 +1,6 @@
 import React from 'react';
 import { Map } from 'immutable';
-import JSONTree, { StylingValue } from 'react-json-tree';
+import { JSONTree, StylingValue } from 'react-json-tree';
 
 const getLabelStyle: StylingValue = ({ style }, nodeType, expanded) => ({
   style: {
diff --git a/packages/react-json-tree/package.json b/packages/react-json-tree/package.json
index 475b2b47..93168661 100644
--- a/packages/react-json-tree/package.json
+++ b/packages/react-json-tree/package.json
@@ -19,23 +19,20 @@
     "Mihail Diordiev <zalmoxisus@gmail.com> (https://github.com/zalmoxisus)"
   ],
   "files": [
-    "lib",
-    "src",
-    "umd"
+    "dist",
+    "src"
   ],
-  "main": "lib/index.js",
-  "types": "lib/index.d.ts",
+  "main": "dist/react-json-tree.cjs.js",
+  "module": "dist/react-json-tree.esm.js",
+  "types": "dist/index.d.ts",
+  "unpkg": "dist/react-json-tree.umd.js",
   "repository": {
     "type": "git",
     "url": "https://github.com/reduxjs/redux-devtools.git"
   },
   "scripts": {
-    "build": "yarn run build:types && yarn run build:js && yarn run build:umd && npm run build:umd:min",
-    "build:types": "tsc --emitDeclarationOnly",
-    "build:js": "babel src --out-dir lib --extensions \".ts,.tsx\" --source-maps inline",
-    "build:umd": "rimraf ./umd && webpack --progress --config webpack.config.umd.ts",
-    "build:umd:min": "webpack --env production --progress --config webpack.config.umd.ts",
-    "clean": "rimraf lib umd",
+    "build": "rollup -c",
+    "clean": "rimraf umd",
     "test": "jest",
     "lint": "eslint . --ext .ts,.tsx",
     "type-check": "tsc --noEmit",
@@ -43,23 +40,26 @@
     "prepublish": "yarn run type-check && yarn run lint && yarn run test"
   },
   "dependencies": {
+    "@babel/runtime": "^7.16.7",
     "@types/prop-types": "^15.7.4",
     "prop-types": "^15.8.0",
     "react-base16-styling": "^0.8.2"
   },
   "devDependencies": {
-    "@babel/cli": "^7.16.7",
     "@babel/core": "^7.16.7",
+    "@babel/eslint-parser": "^7.16.5",
+    "@babel/plugin-transform-runtime": "^7.16.7",
     "@babel/preset-env": "^7.16.7",
     "@babel/preset-react": "^7.16.7",
     "@babel/preset-typescript": "^7.16.7",
+    "@rollup/plugin-babel": "^5.3.0",
+    "@rollup/plugin-commonjs": "^21.0.1",
+    "@rollup/plugin-node-resolve": "^13.1.3",
     "@types/jest": "^27.4.0",
-    "@types/node": "^16.11.17",
     "@types/react": "^17.0.38",
     "@types/react-test-renderer": "^17.0.1",
     "@typescript-eslint/eslint-plugin": "^5.8.1",
     "@typescript-eslint/parser": "^5.8.1",
-    "babel-loader": "^8.2.3",
     "eslint": "^8.6.0",
     "eslint-config-prettier": "^8.3.0",
     "eslint-plugin-jest": "^25.3.4",
@@ -69,11 +69,12 @@
     "react": "^17.0.2",
     "react-test-renderer": "^17.0.2",
     "rimraf": "^3.0.2",
+    "rollup": "^2.63.0",
+    "rollup-plugin-terser": "^7.0.2",
+    "rollup-plugin-typescript2": "^0.31.1",
     "ts-jest": "^27.1.2",
-    "ts-node": "^10.4.0",
-    "typescript": "~4.5.4",
-    "webpack": "^5.65.0",
-    "webpack-cli": "^4.9.1"
+    "tslib": "^2.3.1",
+    "typescript": "~4.5.4"
   },
   "peerDependencies": {
     "@types/react": "^16.3.0 || ^17.0.0",
diff --git a/packages/react-json-tree/rollup.config.js b/packages/react-json-tree/rollup.config.js
new file mode 100644
index 00000000..839926ef
--- /dev/null
+++ b/packages/react-json-tree/rollup.config.js
@@ -0,0 +1,76 @@
+import typescript from 'rollup-plugin-typescript2';
+import resolve from '@rollup/plugin-node-resolve';
+import commonjs from '@rollup/plugin-commonjs';
+import babel from '@rollup/plugin-babel';
+import { terser } from 'rollup-plugin-terser';
+
+const config = [
+  {
+    input: 'src/index.tsx',
+    output: {
+      name: 'ReactJsonTree',
+      file: 'dist/react-json-tree.umd.js',
+      format: 'umd',
+      globals: {
+        react: 'React',
+      },
+    },
+    plugins: [
+      typescript(),
+      resolve(),
+      commonjs(),
+      babel({
+        babelHelpers: 'runtime',
+        extensions: ['.ts', '.tsx'],
+        plugins: ['@babel/plugin-transform-runtime'],
+      }),
+    ],
+    external: ['react'],
+  },
+  {
+    input: 'src/index.tsx',
+    output: {
+      name: 'ReactJsonTree',
+      file: 'dist/react-json-tree.umd.min.js',
+      format: 'umd',
+      globals: {
+        react: 'React',
+      },
+    },
+    plugins: [
+      typescript(),
+      resolve(),
+      commonjs(),
+      babel({
+        babelHelpers: 'runtime',
+        extensions: ['.ts', '.tsx'],
+        plugins: ['@babel/plugin-transform-runtime'],
+      }),
+      terser(),
+    ],
+    external: ['react'],
+  },
+  {
+    input: 'src/index.tsx',
+    output: [
+      { file: 'dist/react-json-tree.cjs.js', format: 'cjs' },
+      { file: 'dist/react-json-tree.esm.js', format: 'esm' },
+    ],
+    plugins: [
+      typescript(),
+      babel({
+        babelHelpers: 'runtime',
+        extensions: ['.ts', '.tsx'],
+        plugins: ['@babel/plugin-transform-runtime'],
+      }),
+    ],
+    external: [
+      /@babel\/runtime/,
+      'react',
+      'prop-types',
+      'react-base16-styling',
+    ],
+  },
+];
+
+export default config;
diff --git a/packages/react-json-tree/src/index.tsx b/packages/react-json-tree/src/index.tsx
index 8b66feae..c422b9ce 100644
--- a/packages/react-json-tree/src/index.tsx
+++ b/packages/react-json-tree/src/index.tsx
@@ -102,7 +102,7 @@ function getStateFromProps(props: Props) {
   };
 }
 
-export default class JSONTree extends React.Component<Props, State> {
+export class JSONTree extends React.Component<Props, State> {
   static propTypes = {
     data: PropTypes.any,
     hideRoot: PropTypes.bool,
diff --git a/packages/react-json-tree/tsconfig.webpack.json b/packages/react-json-tree/tsconfig.webpack.json
deleted file mode 100644
index 655c4644..00000000
--- a/packages/react-json-tree/tsconfig.webpack.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "extends": "../../tsconfig.base.json",
-  "include": ["webpack.config.umd.ts"]
-}
diff --git a/packages/react-json-tree/webpack.config.umd.ts b/packages/react-json-tree/webpack.config.umd.ts
deleted file mode 100644
index 6e2fae59..00000000
--- a/packages/react-json-tree/webpack.config.umd.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-import * as path from 'path';
-import * as webpack from 'webpack';
-
-export default (env: { production?: boolean } = {}): webpack.Configuration => ({
-  mode: env.production ? 'production' : 'development',
-  entry: {
-    app: ['./src/index'],
-  },
-  output: {
-    library: 'ReactJsonTree',
-    libraryExport: 'default',
-    libraryTarget: 'umd',
-    path: path.resolve(__dirname, 'umd'),
-    filename: env.production ? 'react-json-tree.min.js' : 'react-json-tree.js',
-  },
-  module: {
-    rules: [
-      {
-        test: /\.(js|ts)x?$/,
-        loader: 'babel-loader',
-        exclude: /node_modules/,
-      },
-    ],
-  },
-  resolve: {
-    extensions: ['.js', '.jsx', '.ts', '.tsx'],
-  },
-  externals: {
-    react: {
-      root: 'React',
-      commonjs2: 'react',
-      commonjs: 'react',
-      amd: 'react',
-    },
-  },
-});
diff --git a/yarn.lock b/yarn.lock
index 68b0d28e..359896bf 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -24252,19 +24252,22 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "react-json-tree@workspace:packages/react-json-tree"
   dependencies:
-    "@babel/cli": ^7.16.7
     "@babel/core": ^7.16.7
+    "@babel/eslint-parser": ^7.16.5
+    "@babel/plugin-transform-runtime": ^7.16.7
     "@babel/preset-env": ^7.16.7
     "@babel/preset-react": ^7.16.7
     "@babel/preset-typescript": ^7.16.7
+    "@babel/runtime": ^7.16.7
+    "@rollup/plugin-babel": ^5.3.0
+    "@rollup/plugin-commonjs": ^21.0.1
+    "@rollup/plugin-node-resolve": ^13.1.3
     "@types/jest": ^27.4.0
-    "@types/node": ^16.11.17
     "@types/prop-types": ^15.7.4
     "@types/react": ^17.0.38
     "@types/react-test-renderer": ^17.0.1
     "@typescript-eslint/eslint-plugin": ^5.8.1
     "@typescript-eslint/parser": ^5.8.1
-    babel-loader: ^8.2.3
     eslint: ^8.6.0
     eslint-config-prettier: ^8.3.0
     eslint-plugin-jest: ^25.3.4
@@ -24276,11 +24279,12 @@ __metadata:
     react-base16-styling: ^0.8.2
     react-test-renderer: ^17.0.2
     rimraf: ^3.0.2
+    rollup: ^2.63.0
+    rollup-plugin-terser: ^7.0.2
+    rollup-plugin-typescript2: ^0.31.1
     ts-jest: ^27.1.2
-    ts-node: ^10.4.0
+    tslib: ^2.3.1
     typescript: ~4.5.4
-    webpack: ^5.65.0
-    webpack-cli: ^4.9.1
   peerDependencies:
     "@types/react": ^16.3.0 || ^17.0.0
     react: ^16.3.0 || ^17.0.0