diff --git a/webapp/packages/core-blocks/src/FormControls/InputField/InputAutocompletionMenu.module.css b/webapp/packages/core-blocks/src/FormControls/InputAutocompletionMenu.module.css
similarity index 100%
rename from webapp/packages/core-blocks/src/FormControls/InputField/InputAutocompletionMenu.module.css
rename to webapp/packages/core-blocks/src/FormControls/InputAutocompletionMenu.module.css
diff --git a/webapp/packages/core-blocks/src/FormControls/InputField/InputAutocompletionMenu.tsx b/webapp/packages/core-blocks/src/FormControls/InputAutocompletionMenu.tsx
similarity index 91%
rename from webapp/packages/core-blocks/src/FormControls/InputField/InputAutocompletionMenu.tsx
rename to webapp/packages/core-blocks/src/FormControls/InputAutocompletionMenu.tsx
index 50ffcb5641..7ff702bfbb 100644
--- a/webapp/packages/core-blocks/src/FormControls/InputField/InputAutocompletionMenu.tsx
+++ b/webapp/packages/core-blocks/src/FormControls/InputAutocompletionMenu.tsx
@@ -9,12 +9,12 @@ import { observer } from 'mobx-react-lite';
 import { useEffect, useRef } from 'react';
 import { MenuItem } from 'reakit';
 
-import { IconOrImage } from '../../IconOrImage.js';
-import { Menu } from '../../Menu/Menu.js';
-import type { IMenuState } from '../../Menu/MenuStateContext.js';
-import { s } from '../../s.js';
-import { Text } from '../../Text.js';
-import { useS } from '../../useS.js';
+import { IconOrImage } from '../IconOrImage.js';
+import { Menu } from '../Menu/Menu.js';
+import type { IMenuState } from '../Menu/MenuStateContext.js';
+import { s } from '../s.js';
+import { Text } from '../Text.js';
+import { useS } from '../useS.js';
 import style from './InputAutocompletionMenu.module.css';
 import { type InputAutocompleteProposal, type InputAutocompleteStrategy, useInputAutocomplete } from './useInputAutocomplete.js';
 
diff --git a/webapp/packages/core-blocks/src/FormControls/InputField/useInputAutocomplete.ts b/webapp/packages/core-blocks/src/FormControls/useInputAutocomplete.ts
similarity index 98%
rename from webapp/packages/core-blocks/src/FormControls/InputField/useInputAutocomplete.ts
rename to webapp/packages/core-blocks/src/FormControls/useInputAutocomplete.ts
index 474497e7c9..bb381d0aa5 100644
--- a/webapp/packages/core-blocks/src/FormControls/InputField/useInputAutocomplete.ts
+++ b/webapp/packages/core-blocks/src/FormControls/useInputAutocomplete.ts
@@ -10,7 +10,7 @@ import { type RefObject, useEffect } from 'react';
 
 import { debounce, isFuzzySearchable, isNotNullDefined } from '@cloudbeaver/core-utils';
 
-import { useObservableRef } from '../../useObservableRef.js';
+import { useObservableRef } from '../useObservableRef.js';
 
 export type InputAutocompleteStrategy = 'startsWith' | 'contains' | 'fuzzy';
 
diff --git a/webapp/packages/core-blocks/src/index.ts b/webapp/packages/core-blocks/src/index.ts
index 3e5b44c6bf..f498bc78cf 100644
--- a/webapp/packages/core-blocks/src/index.ts
+++ b/webapp/packages/core-blocks/src/index.ts
@@ -253,5 +253,5 @@ export * from './importLazyComponent.js';
 export * from './ClickableLoader.js';
 export * from './FormControls/TagsComboboxLoader.js';
 export * from './Flex/Flex.js';
-export * from './FormControls/InputField/useInputAutocomplete.js';
-export * from './FormControls/InputField/InputAutocompletionMenu.js';
+export * from './FormControls/useInputAutocomplete.js';
+export * from './FormControls/InputAutocompletionMenu.js';
diff --git a/webapp/packages/plugin-data-viewer/src/TableViewer/TableHeader/useWhereFilter.ts b/webapp/packages/plugin-data-viewer/src/TableViewer/TableHeader/useWhereFilter.ts
index 979de96072..1bc6da2c6f 100644
--- a/webapp/packages/plugin-data-viewer/src/TableViewer/TableHeader/useWhereFilter.ts
+++ b/webapp/packages/plugin-data-viewer/src/TableViewer/TableHeader/useWhereFilter.ts
@@ -15,7 +15,7 @@ import { ResultSetViewAction } from '../../DatabaseDataModel/Actions/ResultSet/R
 import type { IDatabaseDataModel } from '../../DatabaseDataModel/IDatabaseDataModel.js';
 import type { IDatabaseDataOptions } from '../../DatabaseDataModel/IDatabaseDataOptions.js';
 import { isResultSetDataModel } from '../../ResultSet/isResultSetDataModel.js';
-import { isResultSetDataSource, ResultSetDataSource } from '../../ResultSet/ResultSetDataSource.js';
+import { isResultSetDataSource } from '../../ResultSet/ResultSetDataSource.js';
 
 interface IState {
   model: IDatabaseDataModel;