diff --git a/packages/react-dock/.eslintignore b/packages/react-dock/.eslintignore
index 5df41e2c..d3c23dcb 100644
--- a/packages/react-dock/.eslintignore
+++ b/packages/react-dock/.eslintignore
@@ -1,2 +1,2 @@
 demo
-dist
+lib
diff --git a/packages/react-dock/babel.config.esm.json b/packages/react-dock/babel.config.esm.json
new file mode 100644
index 00000000..d616aff2
--- /dev/null
+++ b/packages/react-dock/babel.config.esm.json
@@ -0,0 +1,8 @@
+{
+  "presets": [
+    ["@babel/preset-env", { "targets": "defaults", "modules": false }],
+    "@babel/preset-react",
+    "@babel/preset-typescript"
+  ],
+  "plugins": ["@babel/plugin-transform-runtime"]
+}
diff --git a/packages/react-dock/.babelrc b/packages/react-dock/babel.config.json
similarity index 100%
rename from packages/react-dock/.babelrc
rename to packages/react-dock/babel.config.json
diff --git a/packages/react-dock/package.json b/packages/react-dock/package.json
index 8ef825da..b9f5c8dd 100644
--- a/packages/react-dock/package.json
+++ b/packages/react-dock/package.json
@@ -15,19 +15,23 @@
   "license": "MIT",
   "author": "Alexander <alexkuz@gmail.com> (http://kuzya.org/)",
   "files": [
-    "dist",
+    "lib",
     "src"
   ],
-  "main": "dist/react-dock.cjs.js",
-  "module": "dist/react-dock.esm.js",
-  "types": "dist/index.d.ts",
+  "main": "lib/cjs/index.js",
+  "module": "lib/esm/index.js",
+  "types": "lib/types/index.d.ts",
+  "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",
+    "build:cjs": "babel src --extensions \".ts,.tsx\" --out-dir lib/cjs",
+    "build:esm": "babel src --config-file ./babel.config.esm.json --extensions \".ts,.tsx\" --out-dir lib/esm",
+    "build:types": "tsc --emitDeclarationOnly",
+    "clean": "rimraf lib",
     "test": "jest",
     "lint": "eslint . --ext .ts,.tsx",
     "type-check": "tsc --noEmit",
@@ -42,13 +46,13 @@
     "prop-types": "^15.8.1"
   },
   "devDependencies": {
+    "@babel/cli": "^7.16.8",
     "@babel/core": "^7.16.12",
     "@babel/eslint-parser": "^7.16.5",
     "@babel/plugin-transform-runtime": "^7.16.10",
     "@babel/preset-env": "^7.16.11",
     "@babel/preset-react": "^7.16.7",
     "@babel/preset-typescript": "^7.16.7",
-    "@rollup/plugin-babel": "^5.3.0",
     "@types/jest": "^27.4.0",
     "@types/lodash.debounce": "^4.0.6",
     "@types/react": "^17.0.38",
@@ -64,10 +68,7 @@
     "react": "^17.0.2",
     "react-test-renderer": "^17.0.2",
     "rimraf": "^3.0.2",
-    "rollup": "^2.66.0",
-    "rollup-plugin-typescript2": "^0.31.1",
     "ts-jest": "^27.1.3",
-    "tslib": "^2.3.1",
     "typescript": "~4.5.5"
   },
   "peerDependencies": {
diff --git a/packages/react-dock/rollup.config.js b/packages/react-dock/rollup.config.js
deleted file mode 100644
index ebd47612..00000000
--- a/packages/react-dock/rollup.config.js
+++ /dev/null
@@ -1,23 +0,0 @@
-import typescript from 'rollup-plugin-typescript2';
-import babel from '@rollup/plugin-babel';
-
-const config = [
-  {
-    input: 'src/index.ts',
-    output: [
-      { file: 'dist/react-dock.cjs.js', format: 'cjs' },
-      { file: 'dist/react-dock.esm.js', format: 'esm' },
-    ],
-    plugins: [
-      typescript(),
-      babel({
-        babelHelpers: 'runtime',
-        extensions: ['.ts', '.tsx'],
-        plugins: ['@babel/plugin-transform-runtime'],
-      }),
-    ],
-    external: [/@babel\/runtime/, 'react', 'prop-types', 'lodash.debounce'],
-  },
-];
-
-export default config;
diff --git a/packages/react-dock/tsconfig.json b/packages/react-dock/tsconfig.json
index 7b7d1492..0aade49a 100644
--- a/packages/react-dock/tsconfig.json
+++ b/packages/react-dock/tsconfig.json
@@ -1,7 +1,7 @@
 {
   "extends": "../../tsconfig.react.base.json",
   "compilerOptions": {
-    "outDir": "lib"
+    "outDir": "lib/types"
   },
   "include": ["src"]
 }
diff --git a/packages/react-json-tree/.eslintignore b/packages/react-json-tree/.eslintignore
index 4d6880d3..be897dba 100644
--- a/packages/react-json-tree/.eslintignore
+++ b/packages/react-json-tree/.eslintignore
@@ -1,2 +1,2 @@
-dist
 examples
+lib
diff --git a/packages/react-json-tree/babel.config.esm.json b/packages/react-json-tree/babel.config.esm.json
new file mode 100644
index 00000000..d616aff2
--- /dev/null
+++ b/packages/react-json-tree/babel.config.esm.json
@@ -0,0 +1,8 @@
+{
+  "presets": [
+    ["@babel/preset-env", { "targets": "defaults", "modules": false }],
+    "@babel/preset-react",
+    "@babel/preset-typescript"
+  ],
+  "plugins": ["@babel/plugin-transform-runtime"]
+}
diff --git a/packages/react-json-tree/.babelrc b/packages/react-json-tree/babel.config.json
similarity index 100%
rename from packages/react-json-tree/.babelrc
rename to packages/react-json-tree/babel.config.json
diff --git a/packages/react-json-tree/package.json b/packages/react-json-tree/package.json
index d9cd338a..8017e5ef 100644
--- a/packages/react-json-tree/package.json
+++ b/packages/react-json-tree/package.json
@@ -19,20 +19,25 @@
     "Mihail Diordiev <zalmoxisus@gmail.com> (https://github.com/zalmoxisus)"
   ],
   "files": [
-    "dist",
+    "lib",
     "src"
   ],
-  "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",
+  "main": "lib/cjs/index.js",
+  "module": "lib/esm/index.js",
+  "types": "lib/types/index.d.ts",
+  "unpkg": "lib/umd/react-json-tree.umd.js",
+  "sideEffects": false,
   "repository": {
     "type": "git",
     "url": "https://github.com/reduxjs/redux-devtools.git"
   },
   "scripts": {
-    "build": "rollup -c",
-    "clean": "rimraf umd",
+    "build": "yarn build:cjs && yarn build:esm && yarn build:types && yarn build:umd",
+    "build:cjs": "babel src --extensions \".ts,.tsx\" --out-dir lib/cjs",
+    "build:esm": "babel src --config-file ./babel.config.esm.json --extensions \".ts,.tsx\" --out-dir lib/esm",
+    "build:types": "tsc --emitDeclarationOnly",
+    "build:umd": "rollup -c",
+    "clean": "rimraf lib",
     "test": "jest",
     "lint": "eslint . --ext .ts,.tsx",
     "type-check": "tsc --noEmit",
@@ -46,6 +51,7 @@
     "react-base16-styling": "^0.9.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/react-json-tree/rollup.config.js b/packages/react-json-tree/rollup.config.js
index 839926ef..8d2e2555 100644
--- a/packages/react-json-tree/rollup.config.js
+++ b/packages/react-json-tree/rollup.config.js
@@ -9,14 +9,16 @@ const config = [
     input: 'src/index.tsx',
     output: {
       name: 'ReactJsonTree',
-      file: 'dist/react-json-tree.umd.js',
+      file: 'lib/umd/react-json-tree.js',
       format: 'umd',
       globals: {
         react: 'React',
       },
     },
     plugins: [
-      typescript(),
+      typescript({
+        tsconfigOverride: { compilerOptions: { declaration: false } },
+      }),
       resolve(),
       commonjs(),
       babel({
@@ -31,14 +33,16 @@ const config = [
     input: 'src/index.tsx',
     output: {
       name: 'ReactJsonTree',
-      file: 'dist/react-json-tree.umd.min.js',
+      file: 'lib/umd/react-json-tree.min.js',
       format: 'umd',
       globals: {
         react: 'React',
       },
     },
     plugins: [
-      typescript(),
+      typescript({
+        tsconfigOverride: { compilerOptions: { declaration: false } },
+      }),
       resolve(),
       commonjs(),
       babel({
@@ -50,27 +54,6 @@ const config = [
     ],
     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/tsconfig.json b/packages/react-json-tree/tsconfig.json
index 7b7d1492..0aade49a 100644
--- a/packages/react-json-tree/tsconfig.json
+++ b/packages/react-json-tree/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 adf859a2..47c776d3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -24012,6 +24012,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "react-dock@workspace:packages/react-dock"
   dependencies:
+    "@babel/cli": ^7.16.8
     "@babel/core": ^7.16.12
     "@babel/eslint-parser": ^7.16.5
     "@babel/plugin-transform-runtime": ^7.16.10
@@ -24019,7 +24020,6 @@ __metadata:
     "@babel/preset-react": ^7.16.7
     "@babel/preset-typescript": ^7.16.7
     "@babel/runtime": ^7.16.7
-    "@rollup/plugin-babel": ^5.3.0
     "@types/jest": ^27.4.0
     "@types/lodash": ^4.14.178
     "@types/lodash.debounce": ^4.0.6
@@ -24039,10 +24039,7 @@ __metadata:
     react: ^17.0.2
     react-test-renderer: ^17.0.2
     rimraf: ^3.0.2
-    rollup: ^2.66.0
-    rollup-plugin-typescript2: ^0.31.1
     ts-jest: ^27.1.3
-    tslib: ^2.3.1
     typescript: ~4.5.5
   peerDependencies:
     "@types/react": ^16.3.0 || ^17.0.0
@@ -24213,6 +24210,7 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "react-json-tree@workspace:packages/react-json-tree"
   dependencies:
+    "@babel/cli": ^7.16.8
     "@babel/core": ^7.16.12
     "@babel/eslint-parser": ^7.16.5
     "@babel/plugin-transform-runtime": ^7.16.10