diff --git a/webapp/package.json b/webapp/package.json
index 96e895b061..9644998acd 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -16,6 +16,7 @@
     "build": "lerna run build --stream",
     "serve": "lerna run serve --stream",
     "serve-plugin": "lerna run serve-plugin --stream --parallel",
+    "builder-help": "builder help",
     "clean-dist": "lerna run clean-dist --stream",
     "test": "echo \"Error: no test specified\" && exit 1"
   },
diff --git a/webapp/packages/_plugin-template/tsconfig.build.json b/webapp/packages/_plugin-template/tsconfig.build.json
deleted file mode 100644
index dd700023ea..0000000000
--- a/webapp/packages/_plugin-template/tsconfig.build.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "extends": "../../tsconfig.base.json",
-  "compilerOptions": {
-    "declarationDir": "dist/types",
-    "declaration": true,
-    "noEmit": false,
-    "outDir": "dist/js"
-  },
-  "exclude": [
-    "node_modules",
-    "@dbeaver/**"
-  ],
-  "include": ["src/**/*"]
-}
diff --git a/webapp/packages/_plugin-template/tsconfig.json b/webapp/packages/_plugin-template/tsconfig.json
index 6b4c45f333..e1afdcc3c5 100644
--- a/webapp/packages/_plugin-template/tsconfig.json
+++ b/webapp/packages/_plugin-template/tsconfig.json
@@ -1,5 +1,9 @@
 {
   "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "declarationDir": "dist/types",
+    "outDir": "dist/js"
+  },
   "include": [
     "src"
   ],
diff --git a/webapp/packages/administration/tsconfig.build.json b/webapp/packages/administration/tsconfig.build.json
deleted file mode 100644
index dd700023ea..0000000000
--- a/webapp/packages/administration/tsconfig.build.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "extends": "../../tsconfig.base.json",
-  "compilerOptions": {
-    "declarationDir": "dist/types",
-    "declaration": true,
-    "noEmit": false,
-    "outDir": "dist/js"
-  },
-  "exclude": [
-    "node_modules",
-    "@dbeaver/**"
-  ],
-  "include": ["src/**/*"]
-}
diff --git a/webapp/packages/administration/tsconfig.json b/webapp/packages/administration/tsconfig.json
index cf0afdc7c0..206277ba09 100644
--- a/webapp/packages/administration/tsconfig.json
+++ b/webapp/packages/administration/tsconfig.json
@@ -1,5 +1,9 @@
 {
   "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "declarationDir": "dist/types",
+    "outDir": "dist/js"
+  },
   "include": [
     "src/**/*"
   ],
diff --git a/webapp/packages/ag-grid-plugin/tsconfig.build.json b/webapp/packages/ag-grid-plugin/tsconfig.build.json
deleted file mode 100644
index fbd011158d..0000000000
--- a/webapp/packages/ag-grid-plugin/tsconfig.build.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "extends": "../../tsconfig.base.json",
-  "compilerOptions": {
-    "declarationDir": "dist/types",
-    "declaration": true,
-    "noEmit": false,
-    "outDir": "dist/js"
-  },
-  "exclude": [
-    "node_modules",
-    "@dbeaver/core/**"
-  ],
-  "include": ["src/**/*"]
-}
diff --git a/webapp/packages/ag-grid-plugin/tsconfig.json b/webapp/packages/ag-grid-plugin/tsconfig.json
index 6b4c45f333..e1afdcc3c5 100644
--- a/webapp/packages/ag-grid-plugin/tsconfig.json
+++ b/webapp/packages/ag-grid-plugin/tsconfig.json
@@ -1,5 +1,9 @@
 {
   "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "declarationDir": "dist/types",
+    "outDir": "dist/js"
+  },
   "include": [
     "src"
   ],
diff --git a/webapp/packages/authentication/tsconfig.build.json b/webapp/packages/authentication/tsconfig.build.json
deleted file mode 100644
index dd700023ea..0000000000
--- a/webapp/packages/authentication/tsconfig.build.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "extends": "../../tsconfig.base.json",
-  "compilerOptions": {
-    "declarationDir": "dist/types",
-    "declaration": true,
-    "noEmit": false,
-    "outDir": "dist/js"
-  },
-  "exclude": [
-    "node_modules",
-    "@dbeaver/**"
-  ],
-  "include": ["src/**/*"]
-}
diff --git a/webapp/packages/authentication/tsconfig.json b/webapp/packages/authentication/tsconfig.json
index cf0afdc7c0..206277ba09 100644
--- a/webapp/packages/authentication/tsconfig.json
+++ b/webapp/packages/authentication/tsconfig.json
@@ -1,5 +1,9 @@
 {
   "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "declarationDir": "dist/types",
+    "outDir": "dist/js"
+  },
   "include": [
     "src/**/*"
   ],
diff --git a/webapp/packages/basic-connection-plugin/tsconfig.build.json b/webapp/packages/basic-connection-plugin/tsconfig.build.json
deleted file mode 100644
index dd700023ea..0000000000
--- a/webapp/packages/basic-connection-plugin/tsconfig.build.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "extends": "../../tsconfig.base.json",
-  "compilerOptions": {
-    "declarationDir": "dist/types",
-    "declaration": true,
-    "noEmit": false,
-    "outDir": "dist/js"
-  },
-  "exclude": [
-    "node_modules",
-    "@dbeaver/**"
-  ],
-  "include": ["src/**/*"]
-}
diff --git a/webapp/packages/basic-connection-plugin/tsconfig.json b/webapp/packages/basic-connection-plugin/tsconfig.json
index cf0afdc7c0..206277ba09 100644
--- a/webapp/packages/basic-connection-plugin/tsconfig.json
+++ b/webapp/packages/basic-connection-plugin/tsconfig.json
@@ -1,5 +1,9 @@
 {
   "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "declarationDir": "dist/types",
+    "outDir": "dist/js"
+  },
   "include": [
     "src/**/*"
   ],
diff --git a/webapp/packages/builder/configs/rollup.config.js b/webapp/packages/builder/configs/rollup.config.js
index 88642c47c3..0c05d134ae 100644
--- a/webapp/packages/builder/configs/rollup.config.js
+++ b/webapp/packages/builder/configs/rollup.config.js
@@ -48,7 +48,7 @@ function configBuilder(options = defaultBuilderOptions) {
         sourceMap: false,
       }),
       typescriptPlugin({
-        tsconfig: 'tsconfig.build.json',
+        tsconfig: 'tsconfig.json',
         useTsconfigDeclarationDir: true,
       }),
       babelPlugin({
diff --git a/webapp/packages/builder/configs/webpack-serve-config.js b/webapp/packages/builder/configs/webpack-serve-config.js
index a068f77c0b..3389462f19 100644
--- a/webapp/packages/builder/configs/webpack-serve-config.js
+++ b/webapp/packages/builder/configs/webpack-serve-config.js
@@ -15,7 +15,7 @@ module.exports = (env, argv) => merge(commonConfig(env, argv), {
     hot: false, // enable HMR on the server
     proxy: {
       '/dbeaver': {
-        target: argv.server || 'localhost:3100'
+        target: argv.server || 'localhost:8978'
       }
     }
   },
diff --git a/webapp/packages/builder/tsconfig.json b/webapp/packages/builder/tsconfig.json
deleted file mode 100644
index ed0c3a5736..0000000000
--- a/webapp/packages/builder/tsconfig.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "extends": "../../tsconfig.base.json",
-  "exclude": ["node_modules"],
-  "include": [
-    "src/**/*",
-    "../**/*.d.ts"
-  ]
-}
diff --git a/webapp/packages/core/modules.js b/webapp/packages/core/modules.js
index 2f5e275164..2182a036ac 100644
--- a/webapp/packages/core/modules.js
+++ b/webapp/packages/core/modules.js
@@ -7,8 +7,8 @@ module.exports = [
   // The order of modules is important.
   // The module must be built before it is used in another module
   'extensions',
-  'di',
   'utils',
+  'di',
   'eventsLog',
 
   'settings',
diff --git a/webapp/packages/core/tsconfig.build.json b/webapp/packages/core/tsconfig.build.json
deleted file mode 100644
index 0ae3f077c2..0000000000
--- a/webapp/packages/core/tsconfig.build.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "extends": "../../tsconfig.base.json",
-  "compilerOptions": {
-    "declarationDir": "dist/types",
-    "declaration": true,
-    "noEmit": false,
-    "outDir": "dist/js"
-  },
-  "exclude": [
-    "node_modules"
-  ],
-  "include": ["src/**/*"]
-}
diff --git a/webapp/packages/core/tsconfig.json b/webapp/packages/core/tsconfig.json
index 892d9beb6b..638b1b0be3 100644
--- a/webapp/packages/core/tsconfig.json
+++ b/webapp/packages/core/tsconfig.json
@@ -1,5 +1,12 @@
 {
   "extends": "../../tsconfig.json",
-  "exclude": ["node_modules"],
+  "compilerOptions": {
+    "declarationDir": "dist/types",
+    "outDir": "dist/js"
+  },
+  "exclude": [
+    "node_modules",
+    "@dbeaver/**"
+  ],
   "include": ["src/**/*"]
 }
diff --git a/webapp/packages/custom-connection-plugin/tsconfig.build.json b/webapp/packages/custom-connection-plugin/tsconfig.build.json
deleted file mode 100644
index dd700023ea..0000000000
--- a/webapp/packages/custom-connection-plugin/tsconfig.build.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "extends": "../../tsconfig.base.json",
-  "compilerOptions": {
-    "declarationDir": "dist/types",
-    "declaration": true,
-    "noEmit": false,
-    "outDir": "dist/js"
-  },
-  "exclude": [
-    "node_modules",
-    "@dbeaver/**"
-  ],
-  "include": ["src/**/*"]
-}
diff --git a/webapp/packages/custom-connection-plugin/tsconfig.json b/webapp/packages/custom-connection-plugin/tsconfig.json
index cf0afdc7c0..206277ba09 100644
--- a/webapp/packages/custom-connection-plugin/tsconfig.json
+++ b/webapp/packages/custom-connection-plugin/tsconfig.json
@@ -1,5 +1,9 @@
 {
   "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "declarationDir": "dist/types",
+    "outDir": "dist/js"
+  },
   "include": [
     "src/**/*"
   ],
diff --git a/webapp/packages/data-export-plugin/tsconfig.build.json b/webapp/packages/data-export-plugin/tsconfig.build.json
deleted file mode 100644
index dd700023ea..0000000000
--- a/webapp/packages/data-export-plugin/tsconfig.build.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "extends": "../../tsconfig.base.json",
-  "compilerOptions": {
-    "declarationDir": "dist/types",
-    "declaration": true,
-    "noEmit": false,
-    "outDir": "dist/js"
-  },
-  "exclude": [
-    "node_modules",
-    "@dbeaver/**"
-  ],
-  "include": ["src/**/*"]
-}
diff --git a/webapp/packages/data-export-plugin/tsconfig.json b/webapp/packages/data-export-plugin/tsconfig.json
index cf0afdc7c0..206277ba09 100644
--- a/webapp/packages/data-export-plugin/tsconfig.json
+++ b/webapp/packages/data-export-plugin/tsconfig.json
@@ -1,5 +1,9 @@
 {
   "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "declarationDir": "dist/types",
+    "outDir": "dist/js"
+  },
   "include": [
     "src/**/*"
   ],
diff --git a/webapp/packages/data-viewer-plugin/tsconfig.build.json b/webapp/packages/data-viewer-plugin/tsconfig.build.json
deleted file mode 100644
index dd700023ea..0000000000
--- a/webapp/packages/data-viewer-plugin/tsconfig.build.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "extends": "../../tsconfig.base.json",
-  "compilerOptions": {
-    "declarationDir": "dist/types",
-    "declaration": true,
-    "noEmit": false,
-    "outDir": "dist/js"
-  },
-  "exclude": [
-    "node_modules",
-    "@dbeaver/**"
-  ],
-  "include": ["src/**/*"]
-}
diff --git a/webapp/packages/data-viewer-plugin/tsconfig.json b/webapp/packages/data-viewer-plugin/tsconfig.json
index cf0afdc7c0..206277ba09 100644
--- a/webapp/packages/data-viewer-plugin/tsconfig.json
+++ b/webapp/packages/data-viewer-plugin/tsconfig.json
@@ -1,5 +1,9 @@
 {
   "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "declarationDir": "dist/types",
+    "outDir": "dist/js"
+  },
   "include": [
     "src/**/*"
   ],
diff --git a/webapp/packages/ddl-viewer-plugin/tsconfig.build.json b/webapp/packages/ddl-viewer-plugin/tsconfig.build.json
deleted file mode 100644
index dd700023ea..0000000000
--- a/webapp/packages/ddl-viewer-plugin/tsconfig.build.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "extends": "../../tsconfig.base.json",
-  "compilerOptions": {
-    "declarationDir": "dist/types",
-    "declaration": true,
-    "noEmit": false,
-    "outDir": "dist/js"
-  },
-  "exclude": [
-    "node_modules",
-    "@dbeaver/**"
-  ],
-  "include": ["src/**/*"]
-}
diff --git a/webapp/packages/ddl-viewer-plugin/tsconfig.json b/webapp/packages/ddl-viewer-plugin/tsconfig.json
index 6b4c45f333..e1afdcc3c5 100644
--- a/webapp/packages/ddl-viewer-plugin/tsconfig.json
+++ b/webapp/packages/ddl-viewer-plugin/tsconfig.json
@@ -1,5 +1,9 @@
 {
   "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "declarationDir": "dist/types",
+    "outDir": "dist/js"
+  },
   "include": [
     "src"
   ],
diff --git a/webapp/packages/object-viewer-plugin/tsconfig.build.json b/webapp/packages/object-viewer-plugin/tsconfig.build.json
deleted file mode 100644
index dd700023ea..0000000000
--- a/webapp/packages/object-viewer-plugin/tsconfig.build.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "extends": "../../tsconfig.base.json",
-  "compilerOptions": {
-    "declarationDir": "dist/types",
-    "declaration": true,
-    "noEmit": false,
-    "outDir": "dist/js"
-  },
-  "exclude": [
-    "node_modules",
-    "@dbeaver/**"
-  ],
-  "include": ["src/**/*"]
-}
diff --git a/webapp/packages/object-viewer-plugin/tsconfig.json b/webapp/packages/object-viewer-plugin/tsconfig.json
index 6b4c45f333..e1afdcc3c5 100644
--- a/webapp/packages/object-viewer-plugin/tsconfig.json
+++ b/webapp/packages/object-viewer-plugin/tsconfig.json
@@ -1,5 +1,9 @@
 {
   "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "declarationDir": "dist/types",
+    "outDir": "dist/js"
+  },
   "include": [
     "src"
   ],
diff --git a/webapp/packages/sql-editor/tsconfig.build.json b/webapp/packages/sql-editor/tsconfig.build.json
deleted file mode 100644
index dd700023ea..0000000000
--- a/webapp/packages/sql-editor/tsconfig.build.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "extends": "../../tsconfig.base.json",
-  "compilerOptions": {
-    "declarationDir": "dist/types",
-    "declaration": true,
-    "noEmit": false,
-    "outDir": "dist/js"
-  },
-  "exclude": [
-    "node_modules",
-    "@dbeaver/**"
-  ],
-  "include": ["src/**/*"]
-}
diff --git a/webapp/packages/sql-editor/tsconfig.json b/webapp/packages/sql-editor/tsconfig.json
index 6b4c45f333..e1afdcc3c5 100644
--- a/webapp/packages/sql-editor/tsconfig.json
+++ b/webapp/packages/sql-editor/tsconfig.json
@@ -1,5 +1,9 @@
 {
   "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "declarationDir": "dist/types",
+    "outDir": "dist/js"
+  },
   "include": [
     "src"
   ],
diff --git a/webapp/tsconfig.base.json b/webapp/tsconfig.base.json
deleted file mode 100644
index c8a747fb46..0000000000
--- a/webapp/tsconfig.base.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  "files": ["typings.d.ts"],
-  "compilerOptions": {
-    "moduleResolution": "node",
-    "target": "es2017",
-    "lib": ["dom", "dom.iterable", "esnext"],
-    "allowJs": false,
-    "skipLibCheck": true,
-    "strict": true,
-    "forceConsistentCasingInFileNames": true,
-    "downlevelIteration": true,
-    "noEmit": true,
-    "esModuleInterop": true,
-    "module": "esnext",
-    "sourceMap": true,
-    "resolveJsonModule": true,
-    "jsx": "preserve",
-    "isolatedModules": true,
-    "types": ["reflect-metadata", "node"],
-    "experimentalDecorators": true,
-    "emitDecoratorMetadata": true,
-    "baseUrl": "."
-  }
-}
diff --git a/webapp/tsconfig.json b/webapp/tsconfig.json
index 1882fdb842..a515195b72 100644
--- a/webapp/tsconfig.json
+++ b/webapp/tsconfig.json
@@ -1,26 +1,25 @@
 {
-  "extends": "./tsconfig.base.json",
+  "files": ["typings.d.ts"],
   "compilerOptions": {
-    "paths": {
-      "@dbeaver/*": ["packages/*/src"],
-
-      "@dbeaver/core/assets": ["packages/core/assets"],
-
-      "@dbeaver/core/app": ["packages/core/src/app"],
-      "@dbeaver/core/blocks": ["packages/core/src/blocks"],
-      "@dbeaver/core/di": ["packages/core/src/di"],
-      "@dbeaver/core/dialogs": ["packages/core/src/dialogs"],
-      "@dbeaver/core/eventsLog": ["packages/core/src/eventsLog"],
-      "@dbeaver/core/localization": ["packages/core/src/localization"],
-      "@dbeaver/core/root": ["packages/core/src/root"],
-      "@dbeaver/core/sdk": ["packages/core/src/sdk"],
-      "@dbeaver/core/settings": ["packages/core/src/settings"],
-      "@dbeaver/core/theming": ["packages/core/src/theming"],
-      "@dbeaver/core/utils": ["packages/core/src/utils"],
-      "@dbeaver/core/extensions": ["packages/core/src/extensions"],
-      "@dbeaver/core/plugin": ["packages/core/src/plugin"],
-      "@dbeaver/core/product": ["packages/core/src/product"],
-      "@dbeaver/core/placeholder": ["packages/core/src/placeholder"]
-    }
+    "declaration": true,
+    "noEmit": false,
+    "moduleResolution": "node",
+    "target": "es2017",
+    "lib": ["dom", "dom.iterable", "esnext"],
+    "allowJs": false,
+    "skipLibCheck": true,
+    "strict": true,
+    "forceConsistentCasingInFileNames": true,
+    "downlevelIteration": true,
+    "esModuleInterop": true,
+    "module": "esnext",
+    "sourceMap": true,
+    "resolveJsonModule": true,
+    "jsx": "preserve",
+    "isolatedModules": true,
+    "types": ["reflect-metadata", "node"],
+    "experimentalDecorators": true,
+    "emitDecoratorMetadata": true,
+    "baseUrl": "."
   }
 }