diff --git a/package.json b/package.json
index 1ad8be2c..cf079cd4 100644
--- a/package.json
+++ b/package.json
@@ -9,8 +9,7 @@
     "start:api": "yarn workspace dbgate-api start",
     "start:api:portal": "yarn workspace dbgate-api start:portal",
     "start:api:covid": "yarn workspace dbgate-api start:covid",
-    "start:web": "yarn workspace dbgate-web start",
-    "start:web2": "yarn workspace dbgate-web-svelte dev",
+    "start:web": "yarn workspace dbgate-web-svelte dev",
      "start:sqltree": "yarn workspace dbgate-sqltree start",
     "start:tools": "yarn workspace dbgate-tools start",
     "start:datalib": "yarn workspace dbgate-datalib start",
diff --git a/packages/web-svelte/README.md b/packages/web/README.md
similarity index 100%
rename from packages/web-svelte/README.md
rename to packages/web/README.md
diff --git a/packages/web-svelte/package.json b/packages/web/package.json
similarity index 96%
rename from packages/web-svelte/package.json
rename to packages/web/package.json
index b8f15630..68cc3355 100644
--- a/packages/web-svelte/package.json
+++ b/packages/web/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "dbgate-web-svelte",
+  "name": "dbgate-web",
   "version": "1.0.0",
   "scripts": {
     "build": "rollup -c",
diff --git a/packages/web-svelte/public/dimensions.css b/packages/web/public/dimensions.css
similarity index 100%
rename from packages/web-svelte/public/dimensions.css
rename to packages/web/public/dimensions.css
diff --git a/packages/web-svelte/public/favicon.png b/packages/web/public/favicon.png
similarity index 100%
rename from packages/web-svelte/public/favicon.png
rename to packages/web/public/favicon.png
diff --git a/packages/web-svelte/public/global.css b/packages/web/public/global.css
similarity index 100%
rename from packages/web-svelte/public/global.css
rename to packages/web/public/global.css
diff --git a/packages/web-svelte/public/index.html b/packages/web/public/index.html
similarity index 100%
rename from packages/web-svelte/public/index.html
rename to packages/web/public/index.html
diff --git a/packages/web-svelte/public/theme-dark.css b/packages/web/public/theme-dark.css
similarity index 100%
rename from packages/web-svelte/public/theme-dark.css
rename to packages/web/public/theme-dark.css
diff --git a/packages/web-svelte/public/theme-light.css b/packages/web/public/theme-light.css
similarity index 100%
rename from packages/web-svelte/public/theme-light.css
rename to packages/web/public/theme-light.css
diff --git a/packages/web-svelte/rollup.config.js b/packages/web/rollup.config.js
similarity index 100%
rename from packages/web-svelte/rollup.config.js
rename to packages/web/rollup.config.js
diff --git a/packages/web-svelte/src/App.svelte b/packages/web/src/App.svelte
similarity index 100%
rename from packages/web-svelte/src/App.svelte
rename to packages/web/src/App.svelte
diff --git a/packages/web-svelte/src/Screen.svelte b/packages/web/src/Screen.svelte
similarity index 100%
rename from packages/web-svelte/src/Screen.svelte
rename to packages/web/src/Screen.svelte
diff --git a/packages/web-svelte/src/appobj/AppObjectCore.svelte b/packages/web/src/appobj/AppObjectCore.svelte
similarity index 100%
rename from packages/web-svelte/src/appobj/AppObjectCore.svelte
rename to packages/web/src/appobj/AppObjectCore.svelte
diff --git a/packages/web-svelte/src/appobj/AppObjectList.svelte b/packages/web/src/appobj/AppObjectList.svelte
similarity index 100%
rename from packages/web-svelte/src/appobj/AppObjectList.svelte
rename to packages/web/src/appobj/AppObjectList.svelte
diff --git a/packages/web-svelte/src/appobj/AppObjectListItem.svelte b/packages/web/src/appobj/AppObjectListItem.svelte
similarity index 100%
rename from packages/web-svelte/src/appobj/AppObjectListItem.svelte
rename to packages/web/src/appobj/AppObjectListItem.svelte
diff --git a/packages/web-svelte/src/appobj/ConnectionAppObject.svelte b/packages/web/src/appobj/ConnectionAppObject.svelte
similarity index 100%
rename from packages/web-svelte/src/appobj/ConnectionAppObject.svelte
rename to packages/web/src/appobj/ConnectionAppObject.svelte
diff --git a/packages/web-svelte/src/icons/FontIcon.svelte b/packages/web/src/icons/FontIcon.svelte
similarity index 100%
rename from packages/web-svelte/src/icons/FontIcon.svelte
rename to packages/web/src/icons/FontIcon.svelte
diff --git a/packages/web-svelte/src/main.ts b/packages/web/src/main.ts
similarity index 100%
rename from packages/web-svelte/src/main.ts
rename to packages/web/src/main.ts
diff --git a/packages/web-svelte/src/stores.ts b/packages/web/src/stores.ts
similarity index 100%
rename from packages/web-svelte/src/stores.ts
rename to packages/web/src/stores.ts
diff --git a/packages/web-svelte/src/utility/axios.js b/packages/web/src/utility/axios.js
similarity index 100%
rename from packages/web-svelte/src/utility/axios.js
rename to packages/web/src/utility/axios.js
diff --git a/packages/web-svelte/src/utility/cache.ts b/packages/web/src/utility/cache.ts
similarity index 100%
rename from packages/web-svelte/src/utility/cache.ts
rename to packages/web/src/utility/cache.ts
diff --git a/packages/web-svelte/src/utility/getAsArray.ts b/packages/web/src/utility/getAsArray.ts
similarity index 100%
rename from packages/web-svelte/src/utility/getAsArray.ts
rename to packages/web/src/utility/getAsArray.ts
diff --git a/packages/web-svelte/src/utility/getElectron.ts b/packages/web/src/utility/getElectron.ts
similarity index 100%
rename from packages/web-svelte/src/utility/getElectron.ts
rename to packages/web/src/utility/getElectron.ts
diff --git a/packages/web-svelte/src/utility/metadataLoaders.ts b/packages/web/src/utility/metadataLoaders.ts
similarity index 100%
rename from packages/web-svelte/src/utility/metadataLoaders.ts
rename to packages/web/src/utility/metadataLoaders.ts
diff --git a/packages/web-svelte/src/utility/resolveApi.ts b/packages/web/src/utility/resolveApi.ts
similarity index 100%
rename from packages/web-svelte/src/utility/resolveApi.ts
rename to packages/web/src/utility/resolveApi.ts
diff --git a/packages/web-svelte/src/utility/socket.js b/packages/web/src/utility/socket.js
similarity index 100%
rename from packages/web-svelte/src/utility/socket.js
rename to packages/web/src/utility/socket.js
diff --git a/packages/web-svelte/src/widgets/ConnectionList.svelte b/packages/web/src/widgets/ConnectionList.svelte
similarity index 100%
rename from packages/web-svelte/src/widgets/ConnectionList.svelte
rename to packages/web/src/widgets/ConnectionList.svelte
diff --git a/packages/web-svelte/src/widgets/DatabaseWidget.svelte b/packages/web/src/widgets/DatabaseWidget.svelte
similarity index 100%
rename from packages/web-svelte/src/widgets/DatabaseWidget.svelte
rename to packages/web/src/widgets/DatabaseWidget.svelte
diff --git a/packages/web-svelte/src/widgets/InlineButton.svelte b/packages/web/src/widgets/InlineButton.svelte
similarity index 100%
rename from packages/web-svelte/src/widgets/InlineButton.svelte
rename to packages/web/src/widgets/InlineButton.svelte
diff --git a/packages/web-svelte/src/widgets/SearchBoxWrapper.svelte b/packages/web/src/widgets/SearchBoxWrapper.svelte
similarity index 100%
rename from packages/web-svelte/src/widgets/SearchBoxWrapper.svelte
rename to packages/web/src/widgets/SearchBoxWrapper.svelte
diff --git a/packages/web-svelte/src/widgets/SearchInput.svelte b/packages/web/src/widgets/SearchInput.svelte
similarity index 100%
rename from packages/web-svelte/src/widgets/SearchInput.svelte
rename to packages/web/src/widgets/SearchInput.svelte
diff --git a/packages/web-svelte/src/widgets/SqlObjectList.svelte b/packages/web/src/widgets/SqlObjectList.svelte
similarity index 100%
rename from packages/web-svelte/src/widgets/SqlObjectList.svelte
rename to packages/web/src/widgets/SqlObjectList.svelte
diff --git a/packages/web-svelte/src/widgets/WidgetColumnBar.svelte b/packages/web/src/widgets/WidgetColumnBar.svelte
similarity index 100%
rename from packages/web-svelte/src/widgets/WidgetColumnBar.svelte
rename to packages/web/src/widgets/WidgetColumnBar.svelte
diff --git a/packages/web-svelte/src/widgets/WidgetColumnBarItem.svelte b/packages/web/src/widgets/WidgetColumnBarItem.svelte
similarity index 100%
rename from packages/web-svelte/src/widgets/WidgetColumnBarItem.svelte
rename to packages/web/src/widgets/WidgetColumnBarItem.svelte
diff --git a/packages/web-svelte/src/widgets/WidgetContainer.svelte b/packages/web/src/widgets/WidgetContainer.svelte
similarity index 100%
rename from packages/web-svelte/src/widgets/WidgetContainer.svelte
rename to packages/web/src/widgets/WidgetContainer.svelte
diff --git a/packages/web-svelte/src/widgets/WidgetIconPanel.svelte b/packages/web/src/widgets/WidgetIconPanel.svelte
similarity index 100%
rename from packages/web-svelte/src/widgets/WidgetIconPanel.svelte
rename to packages/web/src/widgets/WidgetIconPanel.svelte
diff --git a/packages/web-svelte/src/widgets/WidgetsInnerContainer.svelte b/packages/web/src/widgets/WidgetsInnerContainer.svelte
similarity index 100%
rename from packages/web-svelte/src/widgets/WidgetsInnerContainer.svelte
rename to packages/web/src/widgets/WidgetsInnerContainer.svelte
diff --git a/packages/web-svelte/tsconfig.json b/packages/web/tsconfig.json
similarity index 100%
rename from packages/web-svelte/tsconfig.json
rename to packages/web/tsconfig.json