diff --git a/packages/web/src/datagrid/ColumnHeaderControl.svelte b/packages/web/src/datagrid/ColumnHeaderControl.svelte
index 7e118a68f..e9813884e 100644
--- a/packages/web/src/datagrid/ColumnHeaderControl.svelte
+++ b/packages/web/src/datagrid/ColumnHeaderControl.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import FontIcon from '../icons/FontIcon.svelte';
-  import DropDownButton from '../widgets/DropDownButton.svelte';
+  import DropDownButton from '../elements/DropDownButton.svelte';
 
   import ColumnLabel from './ColumnLabel.svelte';
 
diff --git a/packages/web/src/datagrid/DataFilterControl.svelte b/packages/web/src/datagrid/DataFilterControl.svelte
index bc94d73c6..0e4e78461 100644
--- a/packages/web/src/datagrid/DataFilterControl.svelte
+++ b/packages/web/src/datagrid/DataFilterControl.svelte
@@ -10,7 +10,7 @@ import { createMultiLineFilter } from 'dbgate-filterparser';
   import SetFilterModal from '../modals/SetFilterModal.svelte';
   import keycodes from '../utility/keycodes';
 
-  import DropDownButton from '../widgets/DropDownButton.svelte';
+  import DropDownButton from '../elements/DropDownButton.svelte';
 
   export let isReadOnly = false;
   export let filterType;
diff --git a/packages/web/src/datagrid/DataGridCore.svelte b/packages/web/src/datagrid/DataGridCore.svelte
index 3cfb4d172..74ae094c3 100644
--- a/packages/web/src/datagrid/DataGridCore.svelte
+++ b/packages/web/src/datagrid/DataGridCore.svelte
@@ -56,8 +56,8 @@
   import HorizontalScrollBar from './HorizontalScrollBar.svelte';
   import { cellFromEvent, emptyCellArray, getCellRange, isRegularCell, nullCell, topLeftCell } from './selection';
   import VerticalScrollBar from './VerticalScrollBar.svelte';
-  import LoadingInfo from '../widgets/LoadingInfo.svelte';
-  import InlineButton from '../widgets/InlineButton.svelte';
+  import LoadingInfo from '../elements/LoadingInfo.svelte';
+  import InlineButton from '../elements/InlineButton.svelte';
   import FontIcon from '../icons/FontIcon.svelte';
   import DataFilterControl from './DataFilterControl.svelte';
 
diff --git a/packages/web/src/widgets/DropDownButton.svelte b/packages/web/src/elements/DropDownButton.svelte
similarity index 100%
rename from packages/web/src/widgets/DropDownButton.svelte
rename to packages/web/src/elements/DropDownButton.svelte
diff --git a/packages/web/src/widgets/ErrorInfo.svelte b/packages/web/src/elements/ErrorInfo.svelte
similarity index 100%
rename from packages/web/src/widgets/ErrorInfo.svelte
rename to packages/web/src/elements/ErrorInfo.svelte
diff --git a/packages/web/src/widgets/FormStyledButton.svelte b/packages/web/src/elements/FormStyledButton.svelte
similarity index 100%
rename from packages/web/src/widgets/FormStyledButton.svelte
rename to packages/web/src/elements/FormStyledButton.svelte
diff --git a/packages/web/src/widgets/InlineButton.svelte b/packages/web/src/elements/InlineButton.svelte
similarity index 100%
rename from packages/web/src/widgets/InlineButton.svelte
rename to packages/web/src/elements/InlineButton.svelte
diff --git a/packages/web/src/widgets/LoadingInfo.svelte b/packages/web/src/elements/LoadingInfo.svelte
similarity index 100%
rename from packages/web/src/widgets/LoadingInfo.svelte
rename to packages/web/src/elements/LoadingInfo.svelte
diff --git a/packages/web/src/widgets/SearchBoxWrapper.svelte b/packages/web/src/elements/SearchBoxWrapper.svelte
similarity index 100%
rename from packages/web/src/widgets/SearchBoxWrapper.svelte
rename to packages/web/src/elements/SearchBoxWrapper.svelte
diff --git a/packages/web/src/widgets/SearchInput.svelte b/packages/web/src/elements/SearchInput.svelte
similarity index 100%
rename from packages/web/src/widgets/SearchInput.svelte
rename to packages/web/src/elements/SearchInput.svelte
diff --git a/packages/web/src/widgets/TabControl.svelte b/packages/web/src/elements/TabControl.svelte
similarity index 100%
rename from packages/web/src/widgets/TabControl.svelte
rename to packages/web/src/elements/TabControl.svelte
diff --git a/packages/web/src/forms/FormButton.svelte b/packages/web/src/forms/FormButton.svelte
index fe4ec3f60..22ddf3495 100644
--- a/packages/web/src/forms/FormButton.svelte
+++ b/packages/web/src/forms/FormButton.svelte
@@ -1,5 +1,5 @@
 <script>
-  import FormStyledButton from '../widgets/FormStyledButton.svelte';
+  import FormStyledButton from '../elements/FormStyledButton.svelte';
   import { getFormContext } from './FormProviderCore.svelte';
   import { createEventDispatcher } from 'svelte';
 
diff --git a/packages/web/src/forms/FormElectronFileSelectorRaw.svelte b/packages/web/src/forms/FormElectronFileSelectorRaw.svelte
index fb2b0eb83..e3993ca5a 100644
--- a/packages/web/src/forms/FormElectronFileSelectorRaw.svelte
+++ b/packages/web/src/forms/FormElectronFileSelectorRaw.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import getElectron from '../utility/getElectron';
 
-  import InlineButton from '../widgets/InlineButton.svelte';
+  import InlineButton from '../elements/InlineButton.svelte';
 
   import { getFormContext } from './FormProviderCore.svelte';
   import TextField from './TextField.svelte';
diff --git a/packages/web/src/forms/FormPasswordFieldRaw.svelte b/packages/web/src/forms/FormPasswordFieldRaw.svelte
index d0eca95f6..9b0b6f14a 100644
--- a/packages/web/src/forms/FormPasswordFieldRaw.svelte
+++ b/packages/web/src/forms/FormPasswordFieldRaw.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import FontIcon from '../icons/FontIcon.svelte';
 
-  import InlineButton from '../widgets/InlineButton.svelte';
+  import InlineButton from '../elements/InlineButton.svelte';
 
   import { getFormContext } from './FormProviderCore.svelte';
   import TextField from './TextField.svelte';
diff --git a/packages/web/src/forms/FormSubmit.svelte b/packages/web/src/forms/FormSubmit.svelte
index 8265dce48..c76003073 100644
--- a/packages/web/src/forms/FormSubmit.svelte
+++ b/packages/web/src/forms/FormSubmit.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import FormStyledButton from '../widgets/FormStyledButton.svelte';
+  import FormStyledButton from '../elements/FormStyledButton.svelte';
   import { getFormContext } from './FormProviderCore.svelte';
   import { createEventDispatcher } from 'svelte';
 
diff --git a/packages/web/src/modals/ConnectionModal.svelte b/packages/web/src/modals/ConnectionModal.svelte
index 54d9a4a7b..d898ac64b 100644
--- a/packages/web/src/modals/ConnectionModal.svelte
+++ b/packages/web/src/modals/ConnectionModal.svelte
@@ -5,7 +5,7 @@
   import FormSubmit from '../forms/FormSubmit.svelte';
   import FontIcon from '../icons/FontIcon.svelte';
   import axios from '../utility/axios';
-  import TabControl from '../widgets/TabControl.svelte';
+  import TabControl from '../elements/TabControl.svelte';
   import ConnectionModalDriverFields from './ConnectionModalDriverFields.svelte';
   import ConnectionModalSshTunnelFields from './ConnectionModalSshTunnelFields.svelte';
   import ConnectionModalSslFields from './ConnectionModalSslFields.svelte';
diff --git a/packages/web/src/modals/FilterMultipleValuesModal.svelte b/packages/web/src/modals/FilterMultipleValuesModal.svelte
index fee97a102..769031248 100644
--- a/packages/web/src/modals/FilterMultipleValuesModal.svelte
+++ b/packages/web/src/modals/FilterMultipleValuesModal.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import TextAreaField from '../forms/TextAreaField.svelte';
-  import FormStyledButton from '../widgets/FormStyledButton.svelte';
+  import FormStyledButton from '../elements/FormStyledButton.svelte';
   import ModalBase from './ModalBase.svelte';
   import { closeCurrentModal } from './modalTools';
 
diff --git a/packages/web/src/widgets/ConnectionList.svelte b/packages/web/src/widgets/ConnectionList.svelte
index e0b94df68..1ceb998d5 100644
--- a/packages/web/src/widgets/ConnectionList.svelte
+++ b/packages/web/src/widgets/ConnectionList.svelte
@@ -1,10 +1,10 @@
 <script lang="ts">
   import _ from 'lodash';
-  import InlineButton from './InlineButton.svelte';
-  import SearchInput from './SearchInput.svelte';
+  import InlineButton from '../elements/InlineButton.svelte';
+  import SearchInput from '../elements/SearchInput.svelte';
   import WidgetsInnerContainer from './WidgetsInnerContainer.svelte';
   import { useConnectionList, useServerStatus } from '../utility/metadataLoaders';
-  import SearchBoxWrapper from './SearchBoxWrapper.svelte';
+  import SearchBoxWrapper from '../elements/SearchBoxWrapper.svelte';
   import AppObjectList from '../appobj/AppObjectList.svelte';
   import * as connectionAppObject from '../appobj/ConnectionAppObject.svelte';
   import SubDatabaseList from '../appobj/SubDatabaseList.svelte';
diff --git a/packages/web/src/widgets/SqlObjectList.svelte b/packages/web/src/widgets/SqlObjectList.svelte
index b9659b388..7d689032e 100644
--- a/packages/web/src/widgets/SqlObjectList.svelte
+++ b/packages/web/src/widgets/SqlObjectList.svelte
@@ -1,17 +1,17 @@
 <script lang="ts">
-  import InlineButton from './InlineButton.svelte';
-  import SearchInput from './SearchInput.svelte';
+  import InlineButton from '../elements/InlineButton.svelte';
+  import SearchInput from '../elements/SearchInput.svelte';
   import WidgetsInnerContainer from './WidgetsInnerContainer.svelte';
   import { useDatabaseInfo, useDatabaseStatus } from '../utility/metadataLoaders';
-  import SearchBoxWrapper from './SearchBoxWrapper.svelte';
+  import SearchBoxWrapper from '../elements/SearchBoxWrapper.svelte';
   import AppObjectList from '../appobj/AppObjectList.svelte';
   import _ from 'lodash';
   import * as databaseObjectAppObject from '../appobj/DatabaseObjectAppObject.svelte';
   import SubColumnParamList from '../appobj/SubColumnParamList.svelte';
   import { chevronExpandIcon } from '../icons/expandIcons';
-  import ErrorInfo from './ErrorInfo.svelte';
+  import ErrorInfo from '../elements/ErrorInfo.svelte';
   import axios from '../utility/axios';
-  import LoadingInfo from './LoadingInfo.svelte';
+  import LoadingInfo from '../elements/LoadingInfo.svelte';
 
   export let conid;
   export let database;
diff --git a/packages/web/src/widgets/SqlObjectListWrapper.svelte b/packages/web/src/widgets/SqlObjectListWrapper.svelte
index 5d9349580..ffcf4e115 100644
--- a/packages/web/src/widgets/SqlObjectListWrapper.svelte
+++ b/packages/web/src/widgets/SqlObjectListWrapper.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import _ from 'lodash';
   import { currentDatabase } from '../stores';
-import ErrorInfo from './ErrorInfo.svelte';
+import ErrorInfo from '../elements/ErrorInfo.svelte';
   import SqlObjectList from './SqlObjectList.svelte';
   import WidgetsInnerContainer from './WidgetsInnerContainer.svelte';