diff --git a/packages/web/src/Screen.svelte b/packages/web/src/Screen.svelte
index 5ba23f30f..65733486c 100644
--- a/packages/web/src/Screen.svelte
+++ b/packages/web/src/Screen.svelte
@@ -13,8 +13,8 @@
     visibleTitleBar,
     visibleToolbar,
   } from './stores';
-  import TabsPanel from './widgets/TabsPanel.svelte';
-  import TabRegister from './TabRegister.svelte';
+  import TabsPanel from './tabpanel/TabsPanel.svelte';
+  import TabRegister from './tabpanel/TabRegister.svelte';
   import CommandPalette from './commands/CommandPalette.svelte';
   import Toolbar from './widgets/Toolbar.svelte';
   import splitterDrag from './utility/splitterDrag';
diff --git a/packages/web/src/appobj/ConnectionAppObject.svelte b/packages/web/src/appobj/ConnectionAppObject.svelte
index 5c6c94dfb..100211744 100644
--- a/packages/web/src/appobj/ConnectionAppObject.svelte
+++ b/packages/web/src/appobj/ConnectionAppObject.svelte
@@ -103,7 +103,7 @@
   import { getLocalStorage } from '../utility/storageCache';
   import { apiCall, removeVolatileMapping } from '../utility/api';
   import ImportDatabaseDumpModal from '../modals/ImportDatabaseDumpModal.svelte';
-  import { closeMultipleTabs } from '../widgets/TabsPanel.svelte';
+  import { closeMultipleTabs } from '../tabpanel/TabsPanel.svelte';
   import AboutModal from '../modals/AboutModal.svelte';
   import { tick } from 'svelte';
 
diff --git a/packages/web/src/appobj/DatabaseAppObject.svelte b/packages/web/src/appobj/DatabaseAppObject.svelte
index d1baed29a..978d8a5db 100644
--- a/packages/web/src/appobj/DatabaseAppObject.svelte
+++ b/packages/web/src/appobj/DatabaseAppObject.svelte
@@ -371,7 +371,7 @@
   import ImportDatabaseDumpModal from '../modals/ImportDatabaseDumpModal.svelte';
   import ExportDatabaseDumpModal from '../modals/ExportDatabaseDumpModal.svelte';
   import ConfirmModal from '../modals/ConfirmModal.svelte';
-  import { closeMultipleTabs } from '../widgets/TabsPanel.svelte';
+  import { closeMultipleTabs } from '../tabpanel/TabsPanel.svelte';
 
   export let data;
   export let passProps;
diff --git a/packages/web/src/TabContent.svelte b/packages/web/src/tabpanel/TabContent.svelte
similarity index 100%
rename from packages/web/src/TabContent.svelte
rename to packages/web/src/tabpanel/TabContent.svelte
diff --git a/packages/web/src/TabRegister.svelte b/packages/web/src/tabpanel/TabRegister.svelte
similarity index 94%
rename from packages/web/src/TabRegister.svelte
rename to packages/web/src/tabpanel/TabRegister.svelte
index 3f3f3966d..7225aba3a 100644
--- a/packages/web/src/TabRegister.svelte
+++ b/packages/web/src/tabpanel/TabRegister.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
   import _ from 'lodash';
-  import { openedTabs } from './stores';
+  import { openedTabs } from '../stores';
   import TabContent from './TabContent.svelte';
-  import tabs from './tabs';
+  import tabs from '../tabs';
 
   let mountedTabs = {};
   $: selectedTab = $openedTabs.find(x => x.selected && x.closedTime == null);
diff --git a/packages/web/src/widgets/TabsPanel.svelte b/packages/web/src/tabpanel/TabsPanel.svelte
similarity index 100%
rename from packages/web/src/widgets/TabsPanel.svelte
rename to packages/web/src/tabpanel/TabsPanel.svelte
diff --git a/packages/web/src/tabs/ConnectionTab.svelte b/packages/web/src/tabs/ConnectionTab.svelte
index 8473f17ad..deff1d03c 100644
--- a/packages/web/src/tabs/ConnectionTab.svelte
+++ b/packages/web/src/tabs/ConnectionTab.svelte
@@ -31,7 +31,6 @@
   import getConnectionLabel from '../utility/getConnectionLabel';
   import { onMount } from 'svelte';
   import { disconnectServerConnection, openConnection } from '../appobj/ConnectionAppObject.svelte';
-  import { closeMultipleTabs } from '../widgets/TabsPanel.svelte';
   import { disconnectDatabaseConnection } from '../appobj/DatabaseAppObject.svelte';
 
   export let connection;
diff --git a/packages/web/src/utility/changeCurrentDbByTab.ts b/packages/web/src/utility/changeCurrentDbByTab.ts
index 2a7603738..86fcc4c88 100644
--- a/packages/web/src/utility/changeCurrentDbByTab.ts
+++ b/packages/web/src/utility/changeCurrentDbByTab.ts
@@ -1,6 +1,6 @@
 import _ from 'lodash';
 import { currentDatabase, getCurrentDatabase, getLockedDatabaseMode, openedTabs } from '../stores';
-import { shouldShowTab } from '../widgets/TabsPanel.svelte';
+import { shouldShowTab } from '../tabpanel/TabsPanel.svelte';
 import { callWhenAppLoaded, getAppLoaded } from './appLoadManager';
 import { getConnectionInfo } from './metadataLoaders';