diff --git a/front/src/effect-components/PageChangeEffect.tsx b/front/src/effect-components/PageChangeEffect.tsx
index 792ef555b..afa5fbba7 100644
--- a/front/src/effect-components/PageChangeEffect.tsx
+++ b/front/src/effect-components/PageChangeEffect.tsx
@@ -7,13 +7,13 @@ import { useOnboardingStatus } from '@/auth/hooks/useOnboardingStatus';
import { OnboardingStatus } from '@/auth/utils/getOnboardingStatus';
import { useCommandMenu } from '@/command-menu/hooks/useCommandMenu';
import { CommandType } from '@/command-menu/types/Command';
+import { TableHotkeyScope } from '@/object-record/record-table/types/TableHotkeyScope';
import { AppBasePath } from '@/types/AppBasePath';
import { AppPath } from '@/types/AppPath';
import { PageHotkeyScope } from '@/types/PageHotkeyScope';
import { SettingsPath } from '@/types/SettingsPath';
import { IconCheckbox } from '@/ui/display/icon';
import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';
-import { TableHotkeyScope } from '@/ui/object/record-table/types/TableHotkeyScope';
import { useSetHotkeyScope } from '@/ui/utilities/hotkey/hooks/useSetHotkeyScope';
import { useGetWorkspaceFromInviteHashLazyQuery } from '~/generated/graphql';
diff --git a/front/src/modules/activities/components/ActivityEditor.tsx b/front/src/modules/activities/components/ActivityEditor.tsx
index 348893e74..023a5b4d9 100644
--- a/front/src/modules/activities/components/ActivityEditor.tsx
+++ b/front/src/modules/activities/components/ActivityEditor.tsx
@@ -11,8 +11,8 @@ import { Comment } from '@/activities/types/Comment';
import { GraphQLActivity } from '@/activities/types/GraphQLActivity';
import { useFieldContext } from '@/object-record/hooks/useFieldContext';
import { useUpdateOneRecord } from '@/object-record/hooks/useUpdateOneRecord';
-import { RecordInlineCell } from '@/ui/object/record-inline-cell/components/RecordInlineCell';
-import { PropertyBox } from '@/ui/object/record-inline-cell/property-box/components/PropertyBox';
+import { RecordInlineCell } from '@/object-record/record-inline-cell/components/RecordInlineCell';
+import { PropertyBox } from '@/object-record/record-inline-cell/property-box/components/PropertyBox';
import { useIsMobile } from '@/ui/utilities/responsive/hooks/useIsMobile';
import { WorkspaceMember } from '@/workspace-member/types/WorkspaceMember';
import { debounce } from '~/utils/debounce';
diff --git a/front/src/modules/activities/files/components/AttachmentRow.tsx b/front/src/modules/activities/files/components/AttachmentRow.tsx
index 15826a696..ee2f73529 100644
--- a/front/src/modules/activities/files/components/AttachmentRow.tsx
+++ b/front/src/modules/activities/files/components/AttachmentRow.tsx
@@ -6,12 +6,12 @@ import { AttachmentDropdown } from '@/activities/files/components/AttachmentDrop
import { AttachmentIcon } from '@/activities/files/components/AttachmentIcon';
import { Attachment } from '@/activities/files/types/Attachment';
import { downloadFile } from '@/activities/files/utils/downloadFile';
-import { useDeleteOneRecord } from '@/object-record/hooks/useDeleteOneRecord';
-import { IconCalendar } from '@/ui/display/icon';
import {
FieldContext,
GenericFieldContextType,
-} from '@/ui/object/field/contexts/FieldContext';
+} from '@/object-record/field/contexts/FieldContext';
+import { useDeleteOneRecord } from '@/object-record/hooks/useDeleteOneRecord';
+import { IconCalendar } from '@/ui/display/icon';
import { formatToHumanReadableDate } from '~/utils';
const StyledRow = styled.div`
diff --git a/front/src/modules/activities/hooks/useOpenCreateActivityDrawerForSelectedRowIds.ts b/front/src/modules/activities/hooks/useOpenCreateActivityDrawerForSelectedRowIds.ts
index 9d90a9861..6ffe64ca5 100644
--- a/front/src/modules/activities/hooks/useOpenCreateActivityDrawerForSelectedRowIds.ts
+++ b/front/src/modules/activities/hooks/useOpenCreateActivityDrawerForSelectedRowIds.ts
@@ -1,7 +1,7 @@
import { useRecoilCallback } from 'recoil';
import { ActivityType } from '@/activities/types/Activity';
-import { selectedRowIdsSelector } from '@/ui/object/record-table/states/selectors/selectedRowIdsSelector';
+import { selectedRowIdsSelector } from '@/object-record/record-table/states/selectors/selectedRowIdsSelector';
import {
ActivityTargetableEntity,
diff --git a/front/src/modules/activities/inline-cell/components/ActivityTargetInlineCellEditMode.tsx b/front/src/modules/activities/inline-cell/components/ActivityTargetInlineCellEditMode.tsx
index db695c443..f915c834e 100644
--- a/front/src/modules/activities/inline-cell/components/ActivityTargetInlineCellEditMode.tsx
+++ b/front/src/modules/activities/inline-cell/components/ActivityTargetInlineCellEditMode.tsx
@@ -6,10 +6,10 @@ import { useHandleCheckableActivityTargetChange } from '@/activities/hooks/useHa
import { ActivityTarget } from '@/activities/types/ActivityTarget';
import { flatMapAndSortEntityForSelectArrayOfArrayByName } from '@/activities/utils/flatMapAndSortEntityForSelectArrayByName';
import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
+import { useInlineCell } from '@/object-record/record-inline-cell/hooks/useInlineCell';
+import { MultipleEntitySelect } from '@/object-record/relation-picker/components/MultipleEntitySelect';
+import { useRelationPicker } from '@/object-record/relation-picker/hooks/useRelationPicker';
import { useFilteredSearchEntityQuery } from '@/search/hooks/useFilteredSearchEntityQuery';
-import { useRelationPicker } from '@/ui/input/components/internal/relation-picker/hooks/useRelationPicker';
-import { MultipleEntitySelect } from '@/ui/input/relation-picker/components/MultipleEntitySelect';
-import { useInlineCell } from '@/ui/object/record-inline-cell/hooks/useInlineCell';
import { assertNotNull } from '~/utils/assert';
type ActivityTargetInlineCellEditModeProps = {
diff --git a/front/src/modules/activities/inline-cell/components/ActivityTargetsInlineCell.tsx b/front/src/modules/activities/inline-cell/components/ActivityTargetsInlineCell.tsx
index 1fa2d066d..7f412dd77 100644
--- a/front/src/modules/activities/inline-cell/components/ActivityTargetsInlineCell.tsx
+++ b/front/src/modules/activities/inline-cell/components/ActivityTargetsInlineCell.tsx
@@ -3,10 +3,10 @@ import { ActivityTargetInlineCellEditMode } from '@/activities/inline-cell/compo
import { ActivityTarget } from '@/activities/types/ActivityTarget';
import { GraphQLActivity } from '@/activities/types/GraphQLActivity';
import { useFindManyRecords } from '@/object-record/hooks/useFindManyRecords';
+import { RecordInlineCellContainer } from '@/object-record/record-inline-cell/components/RecordInlineCellContainer';
+import { FieldRecoilScopeContext } from '@/object-record/record-inline-cell/states/recoil-scope-contexts/FieldRecoilScopeContext';
+import { RelationPickerHotkeyScope } from '@/object-record/relation-picker/types/RelationPickerHotkeyScope';
import { IconArrowUpRight, IconPencil } from '@/ui/display/icon';
-import { RelationPickerHotkeyScope } from '@/ui/input/relation-picker/types/RelationPickerHotkeyScope';
-import { RecordInlineCellContainer } from '@/ui/object/record-inline-cell/components/RecordInlineCellContainer';
-import { FieldRecoilScopeContext } from '@/ui/object/record-inline-cell/states/recoil-scope-contexts/FieldRecoilScopeContext';
import { RecoilScope } from '@/ui/utilities/recoil-scope/components/RecoilScope';
type ActivityTargetsInlineCellProps = {
diff --git a/front/src/modules/activities/notes/components/NoteCard.tsx b/front/src/modules/activities/notes/components/NoteCard.tsx
index fd8916e6a..510282b88 100644
--- a/front/src/modules/activities/notes/components/NoteCard.tsx
+++ b/front/src/modules/activities/notes/components/NoteCard.tsx
@@ -6,11 +6,11 @@ import { useOpenActivityRightDrawer } from '@/activities/hooks/useOpenActivityRi
import { ActivityTargetsInlineCell } from '@/activities/inline-cell/components/ActivityTargetsInlineCell';
import { GraphQLActivity } from '@/activities/types/GraphQLActivity';
import { Note } from '@/activities/types/Note';
-import { IconComment } from '@/ui/display/icon';
import {
FieldContext,
GenericFieldContextType,
-} from '@/ui/object/field/contexts/FieldContext';
+} from '@/object-record/field/contexts/FieldContext';
+import { IconComment } from '@/ui/display/icon';
const StyledCard = styled.div<{ isSingleNote: boolean }>`
align-items: flex-start;
diff --git a/front/src/modules/activities/right-drawer/components/RightDrawerActivity.tsx b/front/src/modules/activities/right-drawer/components/RightDrawerActivity.tsx
index 6e42b8d9f..d21a9ac19 100644
--- a/front/src/modules/activities/right-drawer/components/RightDrawerActivity.tsx
+++ b/front/src/modules/activities/right-drawer/components/RightDrawerActivity.tsx
@@ -4,8 +4,8 @@ import { useRecoilState } from 'recoil';
import { ActivityEditor } from '@/activities/components/ActivityEditor';
import { Activity } from '@/activities/types/Activity';
+import { entityFieldsFamilyState } from '@/object-record/field/states/entityFieldsFamilyState';
import { useFindOneRecord } from '@/object-record/hooks/useFindOneRecord';
-import { entityFieldsFamilyState } from '@/ui/object/field/states/entityFieldsFamilyState';
import '@blocknote/core/style.css';
diff --git a/front/src/modules/activities/tasks/__stories__/TaskGroups.stories.tsx b/front/src/modules/activities/tasks/__stories__/TaskGroups.stories.tsx
index 7ad9c0067..c369e267d 100644
--- a/front/src/modules/activities/tasks/__stories__/TaskGroups.stories.tsx
+++ b/front/src/modules/activities/tasks/__stories__/TaskGroups.stories.tsx
@@ -2,7 +2,7 @@ import { Meta, StoryObj } from '@storybook/react';
import { TasksRecoilScopeContext } from '@/activities/states/recoil-scope-contexts/TasksRecoilScopeContext';
import { TaskGroups } from '@/activities/tasks/components/TaskGroups';
-import { ObjectFilterDropdownScope } from '@/ui/object/object-filter-dropdown/scopes/ObjectFilterDropdownScope';
+import { ObjectFilterDropdownScope } from '@/object-record/object-filter-dropdown/scopes/ObjectFilterDropdownScope';
import { ComponentWithRecoilScopeDecorator } from '~/testing/decorators/ComponentWithRecoilScopeDecorator';
import { ComponentWithRouterDecorator } from '~/testing/decorators/ComponentWithRouterDecorator';
import { SnackBarDecorator } from '~/testing/decorators/SnackBarDecorator';
diff --git a/front/src/modules/activities/tasks/components/EntityTasks.tsx b/front/src/modules/activities/tasks/components/EntityTasks.tsx
index 608b2b6bc..f7ffd434b 100644
--- a/front/src/modules/activities/tasks/components/EntityTasks.tsx
+++ b/front/src/modules/activities/tasks/components/EntityTasks.tsx
@@ -3,7 +3,7 @@ import styled from '@emotion/styled';
import { TasksRecoilScopeContext } from '@/activities/states/recoil-scope-contexts/TasksRecoilScopeContext';
import { TaskGroups } from '@/activities/tasks/components/TaskGroups';
import { ActivityTargetableEntity } from '@/activities/types/ActivityTargetableEntity';
-import { ObjectFilterDropdownScope } from '@/ui/object/object-filter-dropdown/scopes/ObjectFilterDropdownScope';
+import { ObjectFilterDropdownScope } from '@/object-record/object-filter-dropdown/scopes/ObjectFilterDropdownScope';
import { RecoilScope } from '@/ui/utilities/recoil-scope/components/RecoilScope';
const StyledContainer = styled.div`
diff --git a/front/src/modules/activities/tasks/components/PageAddTaskButton.tsx b/front/src/modules/activities/tasks/components/PageAddTaskButton.tsx
index 89b4dfef7..5d3b6af61 100644
--- a/front/src/modules/activities/tasks/components/PageAddTaskButton.tsx
+++ b/front/src/modules/activities/tasks/components/PageAddTaskButton.tsx
@@ -1,8 +1,8 @@
import { isNonEmptyString } from '@sniptt/guards';
import { useOpenCreateActivityDrawer } from '@/activities/hooks/useOpenCreateActivityDrawer';
+import { useFilterDropdown } from '@/object-record/object-filter-dropdown/hooks/useFilterDropdown';
import { PageAddButton } from '@/ui/layout/page/PageAddButton';
-import { useFilterDropdown } from '@/ui/object/object-filter-dropdown/hooks/useFilterDropdown';
type PageAddTaskButtonProps = {
filterDropdownId: string;
diff --git a/front/src/modules/activities/tasks/hooks/useTasks.ts b/front/src/modules/activities/tasks/hooks/useTasks.ts
index 6ae79ebd4..5e168bf3b 100644
--- a/front/src/modules/activities/tasks/hooks/useTasks.ts
+++ b/front/src/modules/activities/tasks/hooks/useTasks.ts
@@ -5,7 +5,7 @@ import { undefined } from 'zod';
import { Activity } from '@/activities/types/Activity';
import { ActivityTargetableEntity } from '@/activities/types/ActivityTargetableEntity';
import { useFindManyRecords } from '@/object-record/hooks/useFindManyRecords';
-import { useFilterDropdown } from '@/ui/object/object-filter-dropdown/hooks/useFilterDropdown';
+import { useFilterDropdown } from '@/object-record/object-filter-dropdown/hooks/useFilterDropdown';
import { parseDate } from '~/utils/date-utils';
import { isDefined } from '~/utils/isDefined';
diff --git a/front/src/modules/activities/types/ActivityTargetableEntityForSelect.ts b/front/src/modules/activities/types/ActivityTargetableEntityForSelect.ts
index aa6ca8f92..9d1b65874 100644
--- a/front/src/modules/activities/types/ActivityTargetableEntityForSelect.ts
+++ b/front/src/modules/activities/types/ActivityTargetableEntityForSelect.ts
@@ -1,4 +1,4 @@
-import { EntityForSelect } from '@/ui/input/relation-picker/types/EntityForSelect';
+import { EntityForSelect } from '@/object-record/relation-picker/types/EntityForSelect';
import { ActivityTargetableEntityType } from './ActivityTargetableEntity';
diff --git a/front/src/modules/activities/utils/flatMapAndSortEntityForSelectArrayByName.ts b/front/src/modules/activities/utils/flatMapAndSortEntityForSelectArrayByName.ts
index 07a0277d8..bd6f5c48a 100644
--- a/front/src/modules/activities/utils/flatMapAndSortEntityForSelectArrayByName.ts
+++ b/front/src/modules/activities/utils/flatMapAndSortEntityForSelectArrayByName.ts
@@ -1,4 +1,4 @@
-import { EntityForSelect } from '@/ui/input/relation-picker/types/EntityForSelect';
+import { EntityForSelect } from '@/object-record/relation-picker/types/EntityForSelect';
export const flatMapAndSortEntityForSelectArrayOfArrayByName = <
T extends EntityForSelect,
diff --git a/front/src/modules/companies/board/components/CompanyBoard.tsx b/front/src/modules/companies/board/components/CompanyBoard.tsx
index a1cd01747..4199612ca 100644
--- a/front/src/modules/companies/board/components/CompanyBoard.tsx
+++ b/front/src/modules/companies/board/components/CompanyBoard.tsx
@@ -4,9 +4,9 @@ import { mapBoardFieldDefinitionsToViewFields } from '@/companies/utils/mapBoard
import {
RecordBoard,
RecordBoardProps,
-} from '@/ui/object/record-board/components/RecordBoard';
-import { RecordBoardEffect } from '@/ui/object/record-board/components/RecordBoardEffect';
-import { RecordBoardOptionsDropdown } from '@/ui/object/record-board/options/components/RecordBoardOptionsDropdown';
+} from '@/object-record/record-board/components/RecordBoard';
+import { RecordBoardEffect } from '@/object-record/record-board/components/RecordBoardEffect';
+import { RecordBoardOptionsDropdown } from '@/object-record/record-board/options/components/RecordBoardOptionsDropdown';
import { ViewBar } from '@/views/components/ViewBar';
import { useViewFields } from '@/views/hooks/internal/useViewFields';
import { opportunitiesBoardOptions } from '~/pages/opportunities/opportunitiesBoardOptions';
diff --git a/front/src/modules/companies/components/AddPersonToCompany.tsx b/front/src/modules/companies/components/AddPersonToCompany.tsx
index c56a4b169..47acd449f 100644
--- a/front/src/modules/companies/components/AddPersonToCompany.tsx
+++ b/front/src/modules/companies/components/AddPersonToCompany.tsx
@@ -6,13 +6,13 @@ import { flip, offset, useFloating } from '@floating-ui/react';
import { v4 } from 'uuid';
import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
+import { DoubleTextInput } from '@/object-record/field/meta-types/input/components/internal/DoubleTextInput';
+import { FieldDoubleText } from '@/object-record/field/types/FieldDoubleText';
+import { RelationPicker } from '@/object-record/relation-picker/components/RelationPicker';
+import { EntityForSelect } from '@/object-record/relation-picker/types/EntityForSelect';
+import { RelationPickerHotkeyScope } from '@/object-record/relation-picker/types/RelationPickerHotkeyScope';
import { IconPlus } from '@/ui/display/icon';
import { LightIconButton } from '@/ui/input/button/components/LightIconButton';
-import { RelationPicker } from '@/ui/input/components/internal/relation-picker/components/RelationPicker';
-import { EntityForSelect } from '@/ui/input/relation-picker/types/EntityForSelect';
-import { RelationPickerHotkeyScope } from '@/ui/input/relation-picker/types/RelationPickerHotkeyScope';
-import { DoubleTextInput } from '@/ui/object/field/meta-types/input/components/internal/DoubleTextInput';
-import { FieldDoubleText } from '@/ui/object/field/types/FieldDoubleText';
import { usePreviousHotkeyScope } from '@/ui/utilities/hotkey/hooks/usePreviousHotkeyScope';
import { RecoilScope } from '@/ui/utilities/recoil-scope/components/RecoilScope';
import { FieldMetadataType } from '~/generated-metadata/graphql';
diff --git a/front/src/modules/companies/components/CompanyBoardCard.tsx b/front/src/modules/companies/components/CompanyBoardCard.tsx
index 72bff6c56..f0377d398 100644
--- a/front/src/modules/companies/components/CompanyBoardCard.tsx
+++ b/front/src/modules/companies/components/CompanyBoardCard.tsx
@@ -2,18 +2,18 @@ import { ReactNode, useContext } from 'react';
import styled from '@emotion/styled';
import { useRecoilState, useRecoilValue } from 'recoil';
+import { FieldContext } from '@/object-record/field/contexts/FieldContext';
import { useUpdateOneRecord } from '@/object-record/hooks/useUpdateOneRecord';
+import { BoardCardIdContext } from '@/object-record/record-board/contexts/BoardCardIdContext';
+import { useCurrentRecordBoardCardSelectedInternal } from '@/object-record/record-board/hooks/internal/useCurrentRecordBoardCardSelectedInternal';
+import { useRecordBoardScopedStates } from '@/object-record/record-board/hooks/internal/useRecordBoardScopedStates';
+import { isRecordBoardCardInCompactViewFamilyState } from '@/object-record/record-board/states/isRecordBoardCardInCompactViewFamilyState';
+import { RecordInlineCell } from '@/object-record/record-inline-cell/components/RecordInlineCell';
+import { InlineCellHotkeyScope } from '@/object-record/record-inline-cell/types/InlineCellHotkeyScope';
import { EntityChipVariant } from '@/ui/display/chip/components/EntityChip';
import { IconEye } from '@/ui/display/icon/index';
import { LightIconButton } from '@/ui/input/button/components/LightIconButton';
import { Checkbox, CheckboxVariant } from '@/ui/input/components/Checkbox';
-import { FieldContext } from '@/ui/object/field/contexts/FieldContext';
-import { BoardCardIdContext } from '@/ui/object/record-board/contexts/BoardCardIdContext';
-import { useCurrentRecordBoardCardSelectedInternal } from '@/ui/object/record-board/hooks/internal/useCurrentRecordBoardCardSelectedInternal';
-import { useRecordBoardScopedStates } from '@/ui/object/record-board/hooks/internal/useRecordBoardScopedStates';
-import { isRecordBoardCardInCompactViewFamilyState } from '@/ui/object/record-board/states/isRecordBoardCardInCompactViewFamilyState';
-import { RecordInlineCell } from '@/ui/object/record-inline-cell/components/RecordInlineCell';
-import { InlineCellHotkeyScope } from '@/ui/object/record-inline-cell/types/InlineCellHotkeyScope';
import { AnimatedEaseInOut } from '@/ui/utilities/animation/components/AnimatedEaseInOut';
import { getLogoUrlFromDomainName } from '~/utils';
diff --git a/front/src/modules/companies/components/HooksCompanyBoardEffect.tsx b/front/src/modules/companies/components/HooksCompanyBoardEffect.tsx
index a8277fd3a..1b71db90a 100644
--- a/front/src/modules/companies/components/HooksCompanyBoardEffect.tsx
+++ b/front/src/modules/companies/components/HooksCompanyBoardEffect.tsx
@@ -3,12 +3,12 @@ import { useRecoilValue } from 'recoil';
import { useColumnDefinitionsFromFieldMetadata } from '@/object-metadata/hooks/useColumnDefinitionsFromFieldMetadata';
import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
+import { useRecordBoardScopedStates } from '@/object-record/record-board/hooks/internal/useRecordBoardScopedStates';
+import { availableRecordBoardCardFieldsScopedState } from '@/object-record/record-board/states/availableRecordBoardCardFieldsScopedState';
+import { recordBoardCardFieldsScopedState } from '@/object-record/record-board/states/recordBoardCardFieldsScopedState';
+import { recordBoardFiltersScopedState } from '@/object-record/record-board/states/recordBoardFiltersScopedState';
+import { recordBoardSortsScopedState } from '@/object-record/record-board/states/recordBoardSortsScopedState';
import { filterAvailableTableColumns } from '@/object-record/utils/filterAvailableTableColumns';
-import { useRecordBoardScopedStates } from '@/ui/object/record-board/hooks/internal/useRecordBoardScopedStates';
-import { availableRecordBoardCardFieldsScopedState } from '@/ui/object/record-board/states/availableRecordBoardCardFieldsScopedState';
-import { recordBoardCardFieldsScopedState } from '@/ui/object/record-board/states/recordBoardCardFieldsScopedState';
-import { recordBoardFiltersScopedState } from '@/ui/object/record-board/states/recordBoardFiltersScopedState';
-import { recordBoardSortsScopedState } from '@/ui/object/record-board/states/recordBoardSortsScopedState';
import { useSetRecoilScopedStateV2 } from '@/ui/utilities/recoil-scope/hooks/useSetRecoilScopedStateV2';
import { useViewScopedStates } from '@/views/hooks/internal/useViewScopedStates';
import { useViewBar } from '@/views/hooks/useViewBar';
diff --git a/front/src/modules/companies/components/NewOpportunityButton.tsx b/front/src/modules/companies/components/NewOpportunityButton.tsx
index a1f54e93e..a0ca37159 100644
--- a/front/src/modules/companies/components/NewOpportunityButton.tsx
+++ b/front/src/modules/companies/components/NewOpportunityButton.tsx
@@ -2,15 +2,15 @@ import { useCallback, useContext, useState } from 'react';
import { useQuery } from '@apollo/client';
import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
+import { NewButton } from '@/object-record/record-board/components/NewButton';
+import { BoardColumnContext } from '@/object-record/record-board/contexts/BoardColumnContext';
+import { useCreateOpportunity } from '@/object-record/record-board/hooks/internal/useCreateOpportunity';
+import { SingleEntitySelect } from '@/object-record/relation-picker/components/SingleEntitySelect';
+import { useRelationPicker } from '@/object-record/relation-picker/hooks/useRelationPicker';
+import { relationPickerSearchFilterScopedState } from '@/object-record/relation-picker/states/relationPickerSearchFilterScopedState';
+import { RelationPickerHotkeyScope } from '@/object-record/relation-picker/types/RelationPickerHotkeyScope';
import { useFilteredSearchEntityQuery } from '@/search/hooks/useFilteredSearchEntityQuery';
import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';
-import { useRelationPicker } from '@/ui/input/components/internal/relation-picker/hooks/useRelationPicker';
-import { SingleEntitySelect } from '@/ui/input/relation-picker/components/SingleEntitySelect';
-import { relationPickerSearchFilterScopedState } from '@/ui/input/relation-picker/states/relationPickerSearchFilterScopedState';
-import { RelationPickerHotkeyScope } from '@/ui/input/relation-picker/types/RelationPickerHotkeyScope';
-import { NewButton } from '@/ui/object/record-board/components/NewButton';
-import { BoardColumnContext } from '@/ui/object/record-board/contexts/BoardColumnContext';
-import { useCreateOpportunity } from '@/ui/object/record-board/hooks/internal/useCreateOpportunity';
import { usePreviousHotkeyScope } from '@/ui/utilities/hotkey/hooks/usePreviousHotkeyScope';
import { useRecoilScopedState } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedState';
diff --git a/front/src/modules/companies/components/OpportunityPicker.tsx b/front/src/modules/companies/components/OpportunityPicker.tsx
index 1950d6c62..a9e697d52 100644
--- a/front/src/modules/companies/components/OpportunityPicker.tsx
+++ b/front/src/modules/companies/components/OpportunityPicker.tsx
@@ -3,13 +3,13 @@ import { useQuery } from '@apollo/client';
import { useRecoilValue } from 'recoil';
import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
+import { SingleEntitySelectBase } from '@/object-record/relation-picker/components/SingleEntitySelectBase';
+import { useEntitySelectSearch } from '@/object-record/relation-picker/hooks/useEntitySelectSearch';
+import { useRelationPicker } from '@/object-record/relation-picker/hooks/useRelationPicker';
+import { EntityForSelect } from '@/object-record/relation-picker/types/EntityForSelect';
import { currentPipelineStepsState } from '@/pipeline/states/currentPipelineStepsState';
import { useFilteredSearchEntityQuery } from '@/search/hooks/useFilteredSearchEntityQuery';
import { IconChevronDown } from '@/ui/display/icon';
-import { useRelationPicker } from '@/ui/input/components/internal/relation-picker/hooks/useRelationPicker';
-import { SingleEntitySelectBase } from '@/ui/input/relation-picker/components/SingleEntitySelectBase';
-import { useEntitySelectSearch } from '@/ui/input/relation-picker/hooks/useEntitySelectSearch';
-import { EntityForSelect } from '@/ui/input/relation-picker/types/EntityForSelect';
import { DropdownMenu } from '@/ui/layout/dropdown/components/DropdownMenu';
import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
diff --git a/front/src/modules/companies/utils/mapBoardFieldDefinitionsToViewFields.ts b/front/src/modules/companies/utils/mapBoardFieldDefinitionsToViewFields.ts
index 75cde9e27..9cd3f4470 100644
--- a/front/src/modules/companies/utils/mapBoardFieldDefinitionsToViewFields.ts
+++ b/front/src/modules/companies/utils/mapBoardFieldDefinitionsToViewFields.ts
@@ -1,5 +1,5 @@
-import { FieldMetadata } from '@/ui/object/field/types/FieldMetadata';
-import { BoardFieldDefinition } from '@/ui/object/record-board/types/BoardFieldDefinition';
+import { FieldMetadata } from '@/object-record/field/types/FieldMetadata';
+import { BoardFieldDefinition } from '@/object-record/record-board/types/BoardFieldDefinition';
import { ViewField } from '@/views/types/ViewField';
export const mapBoardFieldDefinitionsToViewFields = (
diff --git a/front/src/modules/object-metadata/components/ObjectMetadataItemsProvider.tsx b/front/src/modules/object-metadata/components/ObjectMetadataItemsProvider.tsx
index faef40fe2..115914291 100644
--- a/front/src/modules/object-metadata/components/ObjectMetadataItemsProvider.tsx
+++ b/front/src/modules/object-metadata/components/ObjectMetadataItemsProvider.tsx
@@ -5,7 +5,7 @@ import { ObjectMetadataItemsLoadEffect } from '@/object-metadata/components/Obje
import { ObjectMetadataItemsRelationPickerEffect } from '@/object-metadata/components/ObjectMetadataItemsRelationPickerEffect';
import { useFindManyObjectMetadataItems } from '@/object-metadata/hooks/useFindManyObjectMetadataItems';
import { objectMetadataItemsState } from '@/object-metadata/states/objectMetadataItemsState';
-import { RelationPickerScope } from '@/ui/input/components/internal/relation-picker/scopes/RelationPickerScope';
+import { RelationPickerScope } from '@/object-record/relation-picker/scopes/RelationPickerScope';
export const ObjectMetadataItemsProvider = ({
children,
diff --git a/front/src/modules/object-metadata/components/ObjectMetadataItemsRelationPickerEffect.tsx b/front/src/modules/object-metadata/components/ObjectMetadataItemsRelationPickerEffect.tsx
index cf072acd7..f8c4bd401 100644
--- a/front/src/modules/object-metadata/components/ObjectMetadataItemsRelationPickerEffect.tsx
+++ b/front/src/modules/object-metadata/components/ObjectMetadataItemsRelationPickerEffect.tsx
@@ -1,7 +1,7 @@
import { useEffect } from 'react';
-import { useRelationPicker } from '@/ui/input/components/internal/relation-picker/hooks/useRelationPicker';
-import { IdentifiersMapper } from '@/ui/input/components/internal/relation-picker/types/IdentifiersMapper';
+import { useRelationPicker } from '@/object-record/relation-picker/hooks/useRelationPicker';
+import { IdentifiersMapper } from '@/object-record/relation-picker/types/IdentifiersMapper';
import { getLogoUrlFromDomainName } from '~/utils';
export const ObjectMetadataItemsRelationPickerEffect = () => {
diff --git a/front/src/modules/object-metadata/hooks/useColumnDefinitionsFromFieldMetadata.ts b/front/src/modules/object-metadata/hooks/useColumnDefinitionsFromFieldMetadata.ts
index d93b40048..28d0e0ab3 100644
--- a/front/src/modules/object-metadata/hooks/useColumnDefinitionsFromFieldMetadata.ts
+++ b/front/src/modules/object-metadata/hooks/useColumnDefinitionsFromFieldMetadata.ts
@@ -1,8 +1,8 @@
import { useMemo } from 'react';
import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
-import { FieldMetadata } from '@/ui/object/field/types/FieldMetadata';
-import { ColumnDefinition } from '@/ui/object/record-table/types/ColumnDefinition';
+import { FieldMetadata } from '@/object-record/field/types/FieldMetadata';
+import { ColumnDefinition } from '@/object-record/record-table/types/ColumnDefinition';
import { Nullable } from '~/types/Nullable';
import { formatFieldMetadataItemAsColumnDefinition } from '../utils/formatFieldMetadataItemAsColumnDefinition';
diff --git a/front/src/modules/object-metadata/hooks/useCreateOneFieldMetadataItem.ts b/front/src/modules/object-metadata/hooks/useCreateOneFieldMetadataItem.ts
index 003b55b20..406d7c70d 100644
--- a/front/src/modules/object-metadata/hooks/useCreateOneFieldMetadataItem.ts
+++ b/front/src/modules/object-metadata/hooks/useCreateOneFieldMetadataItem.ts
@@ -1,7 +1,7 @@
import { ApolloClient, useMutation } from '@apollo/client';
import { getOperationName } from '@apollo/client/utilities';
-import { FieldType } from '@/ui/object/field/types/FieldType';
+import { FieldType } from '@/object-record/field/types/FieldType';
import { FieldMetadataType } from '~/generated/graphql';
import {
CreateOneFieldMetadataItemMutation,
diff --git a/front/src/modules/object-metadata/hooks/useFieldMetadataItem.ts b/front/src/modules/object-metadata/hooks/useFieldMetadataItem.ts
index e0d87b467..eaa969f45 100644
--- a/front/src/modules/object-metadata/hooks/useFieldMetadataItem.ts
+++ b/front/src/modules/object-metadata/hooks/useFieldMetadataItem.ts
@@ -1,4 +1,4 @@
-import { FieldType } from '@/ui/object/field/types/FieldType';
+import { FieldType } from '@/object-record/field/types/FieldType';
import { Field } from '~/generated/graphql';
import { FieldMetadataType } from '~/generated-metadata/graphql';
diff --git a/front/src/modules/object-metadata/hooks/useMapFieldMetadataToGraphQLQuery.ts b/front/src/modules/object-metadata/hooks/useMapFieldMetadataToGraphQLQuery.ts
index 9de0e8751..a5ce4e2a1 100644
--- a/front/src/modules/object-metadata/hooks/useMapFieldMetadataToGraphQLQuery.ts
+++ b/front/src/modules/object-metadata/hooks/useMapFieldMetadataToGraphQLQuery.ts
@@ -1,7 +1,7 @@
import { useRecoilValue } from 'recoil';
import { objectMetadataItemsState } from '@/object-metadata/states/objectMetadataItemsState';
-import { FieldType } from '@/ui/object/field/types/FieldType';
+import { FieldType } from '@/object-record/field/types/FieldType';
import { FieldMetadataItem } from '../types/FieldMetadataItem';
diff --git a/front/src/modules/object-metadata/utils/formatFieldMetadataItemAsColumnDefinition.ts b/front/src/modules/object-metadata/utils/formatFieldMetadataItemAsColumnDefinition.ts
index 18fd39c6c..655d35617 100644
--- a/front/src/modules/object-metadata/utils/formatFieldMetadataItemAsColumnDefinition.ts
+++ b/front/src/modules/object-metadata/utils/formatFieldMetadataItemAsColumnDefinition.ts
@@ -1,7 +1,7 @@
import { ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
import { parseFieldRelationType } from '@/object-metadata/utils/parseFieldRelationType';
-import { FieldMetadata } from '@/ui/object/field/types/FieldMetadata';
-import { ColumnDefinition } from '@/ui/object/record-table/types/ColumnDefinition';
+import { FieldMetadata } from '@/object-record/field/types/FieldMetadata';
+import { ColumnDefinition } from '@/object-record/record-table/types/ColumnDefinition';
import { FieldMetadataItem } from '../types/FieldMetadataItem';
diff --git a/front/src/modules/object-metadata/utils/formatFieldMetadataItemsAsFilterDefinitions.ts b/front/src/modules/object-metadata/utils/formatFieldMetadataItemsAsFilterDefinitions.ts
index 2911fe623..78d9efbb9 100644
--- a/front/src/modules/object-metadata/utils/formatFieldMetadataItemsAsFilterDefinitions.ts
+++ b/front/src/modules/object-metadata/utils/formatFieldMetadataItemsAsFilterDefinitions.ts
@@ -1,4 +1,4 @@
-import { FilterDefinition } from '@/ui/object/object-filter-dropdown/types/FilterDefinition';
+import { FilterDefinition } from '@/object-record/object-filter-dropdown/types/FilterDefinition';
import { FieldMetadataType } from '~/generated-metadata/graphql';
import { ObjectMetadataItem } from '../types/ObjectMetadataItem';
diff --git a/front/src/modules/object-metadata/utils/formatFieldMetadataItemsAsSortDefinitions.ts b/front/src/modules/object-metadata/utils/formatFieldMetadataItemsAsSortDefinitions.ts
index 7c7c653bf..736b8b512 100644
--- a/front/src/modules/object-metadata/utils/formatFieldMetadataItemsAsSortDefinitions.ts
+++ b/front/src/modules/object-metadata/utils/formatFieldMetadataItemsAsSortDefinitions.ts
@@ -1,4 +1,4 @@
-import { SortDefinition } from '@/ui/object/object-sort-dropdown/types/SortDefinition';
+import { SortDefinition } from '@/object-record/object-sort-dropdown/types/SortDefinition';
import { FieldMetadataType } from '~/generated-metadata/graphql';
import { ObjectMetadataItem } from '../types/ObjectMetadataItem';
diff --git a/front/src/modules/object-metadata/utils/parseFieldRelationType.ts b/front/src/modules/object-metadata/utils/parseFieldRelationType.ts
index 14a526e38..85996df0f 100644
--- a/front/src/modules/object-metadata/utils/parseFieldRelationType.ts
+++ b/front/src/modules/object-metadata/utils/parseFieldRelationType.ts
@@ -1,5 +1,5 @@
import { FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';
-import { FieldDefinitionRelationType } from '@/ui/object/field/types/FieldDefinition';
+import { FieldDefinitionRelationType } from '@/object-record/field/types/FieldDefinition';
import {
FieldMetadataType,
RelationMetadataType,
diff --git a/front/src/modules/object-metadata/utils/parseFieldType.ts b/front/src/modules/object-metadata/utils/parseFieldType.ts
index f4edcf8d4..6cdd79b76 100644
--- a/front/src/modules/object-metadata/utils/parseFieldType.ts
+++ b/front/src/modules/object-metadata/utils/parseFieldType.ts
@@ -1,4 +1,4 @@
-import { FieldType } from '@/ui/object/field/types/FieldType';
+import { FieldType } from '@/object-record/field/types/FieldType';
import { FieldMetadataType } from '~/generated-metadata/graphql';
export const parseFieldType = (fieldType: FieldMetadataType): FieldType => {
diff --git a/front/src/modules/object-record/components/RecordShowPage.tsx b/front/src/modules/object-record/components/RecordShowPage.tsx
index e431d0a30..477017436 100644
--- a/front/src/modules/object-record/components/RecordShowPage.tsx
+++ b/front/src/modules/object-record/components/RecordShowPage.tsx
@@ -5,9 +5,14 @@ import { CompanyTeam } from '@/companies/components/CompanyTeam';
import { useFavorites } from '@/favorites/hooks/useFavorites';
import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
import { formatFieldMetadataItemAsColumnDefinition } from '@/object-metadata/utils/formatFieldMetadataItemAsColumnDefinition';
+import { FieldContext } from '@/object-record/field/contexts/FieldContext';
+import { entityFieldsFamilyState } from '@/object-record/field/states/entityFieldsFamilyState';
+import { RecordInlineCell } from '@/object-record/record-inline-cell/components/RecordInlineCell';
+import { PropertyBox } from '@/object-record/record-inline-cell/property-box/components/PropertyBox';
+import { InlineCellHotkeyScope } from '@/object-record/record-inline-cell/types/InlineCellHotkeyScope';
+import { useRelationPicker } from '@/object-record/relation-picker/hooks/useRelationPicker';
import { filterAvailableFieldMetadataItem } from '@/object-record/utils/filterAvailableFieldMetadataItem';
import { IconBuildingSkyscraper } from '@/ui/display/icon';
-import { useRelationPicker } from '@/ui/input/components/internal/relation-picker/hooks/useRelationPicker';
import { PageBody } from '@/ui/layout/page/PageBody';
import { PageContainer } from '@/ui/layout/page/PageContainer';
import { PageFavoriteButton } from '@/ui/layout/page/PageFavoriteButton';
@@ -18,11 +23,6 @@ import { ShowPageLeftContainer } from '@/ui/layout/show-page/components/ShowPage
import { ShowPageRightContainer } from '@/ui/layout/show-page/components/ShowPageRightContainer';
import { ShowPageSummaryCard } from '@/ui/layout/show-page/components/ShowPageSummaryCard';
import { ShowPageRecoilScopeContext } from '@/ui/layout/states/ShowPageRecoilScopeContext';
-import { FieldContext } from '@/ui/object/field/contexts/FieldContext';
-import { entityFieldsFamilyState } from '@/ui/object/field/states/entityFieldsFamilyState';
-import { RecordInlineCell } from '@/ui/object/record-inline-cell/components/RecordInlineCell';
-import { PropertyBox } from '@/ui/object/record-inline-cell/property-box/components/PropertyBox';
-import { InlineCellHotkeyScope } from '@/ui/object/record-inline-cell/types/InlineCellHotkeyScope';
import { PageTitle } from '@/ui/utilities/page-title/PageTitle';
import { RecoilScope } from '@/ui/utilities/recoil-scope/components/RecoilScope';
import { FileFolder, useUploadImageMutation } from '~/generated/graphql';
diff --git a/front/src/modules/object-record/components/RecordTableContainer.tsx b/front/src/modules/object-record/components/RecordTableContainer.tsx
index cf102f842..982f10820 100644
--- a/front/src/modules/object-record/components/RecordTableContainer.tsx
+++ b/front/src/modules/object-record/components/RecordTableContainer.tsx
@@ -4,10 +4,10 @@ import { useColumnDefinitionsFromFieldMetadata } from '@/object-metadata/hooks/u
import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
import { useObjectNameSingularFromPlural } from '@/object-metadata/hooks/useObjectNameSingularFromPlural';
import { useUpdateOneRecord } from '@/object-record/hooks/useUpdateOneRecord';
-import { RecordTable } from '@/ui/object/record-table/components/RecordTable';
-import { TableOptionsDropdownId } from '@/ui/object/record-table/constants/TableOptionsDropdownId';
-import { useRecordTable } from '@/ui/object/record-table/hooks/useRecordTable';
-import { TableOptionsDropdown } from '@/ui/object/record-table/options/components/TableOptionsDropdown';
+import { RecordTable } from '@/object-record/record-table/components/RecordTable';
+import { TableOptionsDropdownId } from '@/object-record/record-table/constants/TableOptionsDropdownId';
+import { useRecordTable } from '@/object-record/record-table/hooks/useRecordTable';
+import { TableOptionsDropdown } from '@/object-record/record-table/options/components/TableOptionsDropdown';
import { ViewBar } from '@/views/components/ViewBar';
import { mapViewFieldsToColumnDefinitions } from '@/views/utils/mapViewFieldsToColumnDefinitions';
import { mapViewFiltersToFilters } from '@/views/utils/mapViewFiltersToFilters';
diff --git a/front/src/modules/object-record/components/RecordTableEffect.tsx b/front/src/modules/object-record/components/RecordTableEffect.tsx
index 523a92023..235f8b94a 100644
--- a/front/src/modules/object-record/components/RecordTableEffect.tsx
+++ b/front/src/modules/object-record/components/RecordTableEffect.tsx
@@ -4,8 +4,8 @@ import { useColumnDefinitionsFromFieldMetadata } from '@/object-metadata/hooks/u
import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
import { useObjectNameSingularFromPlural } from '@/object-metadata/hooks/useObjectNameSingularFromPlural';
import { useRecordTableContextMenuEntries } from '@/object-record/hooks/useRecordTableContextMenuEntries';
+import { useRecordTable } from '@/object-record/record-table/hooks/useRecordTable';
import { filterAvailableTableColumns } from '@/object-record/utils/filterAvailableTableColumns';
-import { useRecordTable } from '@/ui/object/record-table/hooks/useRecordTable';
import { useViewBar } from '@/views/hooks/useViewBar';
import { ViewType } from '@/views/types/ViewType';
diff --git a/front/src/modules/object-record/components/RecordTablePage.tsx b/front/src/modules/object-record/components/RecordTablePage.tsx
index ab5aeff47..4a8f6db57 100644
--- a/front/src/modules/object-record/components/RecordTablePage.tsx
+++ b/front/src/modules/object-record/components/RecordTablePage.tsx
@@ -8,14 +8,14 @@ import { OnboardingStatus } from '@/auth/utils/getOnboardingStatus';
import { useObjectMetadataItemForSettings } from '@/object-metadata/hooks/useObjectMetadataItemForSettings';
import { useObjectNameSingularFromPlural } from '@/object-metadata/hooks/useObjectNameSingularFromPlural';
import { useCreateOneRecord } from '@/object-record/hooks/useCreateOneRecord';
+import { RecordTableActionBar } from '@/object-record/record-table/action-bar/components/RecordTableActionBar';
+import { RecordTableContextMenu } from '@/object-record/record-table/context-menu/components/RecordTableContextMenu';
import { useLazyLoadIcons } from '@/ui/input/hooks/useLazyLoadIcons';
import { PageAddButton } from '@/ui/layout/page/PageAddButton';
import { PageBody } from '@/ui/layout/page/PageBody';
import { PageContainer } from '@/ui/layout/page/PageContainer';
import { PageHeader } from '@/ui/layout/page/PageHeader';
import { PageHotkeysEffect } from '@/ui/layout/page/PageHotkeysEffect';
-import { RecordTableActionBar } from '@/ui/object/record-table/action-bar/components/RecordTableActionBar';
-import { RecordTableContextMenu } from '@/ui/object/record-table/context-menu/components/RecordTableContextMenu';
import { RecordTableContainer } from './RecordTableContainer';
diff --git a/front/src/modules/ui/object/field/components/FieldDisplay.tsx b/front/src/modules/object-record/field/components/FieldDisplay.tsx
similarity index 100%
rename from front/src/modules/ui/object/field/components/FieldDisplay.tsx
rename to front/src/modules/object-record/field/components/FieldDisplay.tsx
diff --git a/front/src/modules/ui/object/field/components/FieldInput.tsx b/front/src/modules/object-record/field/components/FieldInput.tsx
similarity index 95%
rename from front/src/modules/ui/object/field/components/FieldInput.tsx
rename to front/src/modules/object-record/field/components/FieldInput.tsx
index 242e45a7f..702b9e8b8 100644
--- a/front/src/modules/ui/object/field/components/FieldInput.tsx
+++ b/front/src/modules/object-record/field/components/FieldInput.tsx
@@ -1,7 +1,7 @@
import { useContext } from 'react';
-import { FullNameFieldInput } from '@/ui/object/field/meta-types/input/components/FullNameFieldInput';
-import { isFieldFullName } from '@/ui/object/field/types/guards/isFieldFullName';
+import { FullNameFieldInput } from '@/object-record/field/meta-types/input/components/FullNameFieldInput';
+import { isFieldFullName } from '@/object-record/field/types/guards/isFieldFullName';
import { RecoilScope } from '@/ui/utilities/recoil-scope/components/RecoilScope';
import { FieldContext } from '../contexts/FieldContext';
diff --git a/front/src/modules/ui/object/field/contexts/FieldContext.ts b/front/src/modules/object-record/field/contexts/FieldContext.ts
similarity index 100%
rename from front/src/modules/ui/object/field/contexts/FieldContext.ts
rename to front/src/modules/object-record/field/contexts/FieldContext.ts
diff --git a/front/src/modules/ui/object/field/hooks/useFieldInitialValue.ts b/front/src/modules/object-record/field/hooks/useFieldInitialValue.ts
similarity index 100%
rename from front/src/modules/ui/object/field/hooks/useFieldInitialValue.ts
rename to front/src/modules/object-record/field/hooks/useFieldInitialValue.ts
diff --git a/front/src/modules/ui/object/field/hooks/useGetButtonIcon.ts b/front/src/modules/object-record/field/hooks/useGetButtonIcon.ts
similarity index 91%
rename from front/src/modules/ui/object/field/hooks/useGetButtonIcon.ts
rename to front/src/modules/object-record/field/hooks/useGetButtonIcon.ts
index 3987ee5ea..b0405bb56 100644
--- a/front/src/modules/ui/object/field/hooks/useGetButtonIcon.ts
+++ b/front/src/modules/object-record/field/hooks/useGetButtonIcon.ts
@@ -1,8 +1,8 @@
import { useContext } from 'react';
+import { isFieldRelation } from '@/object-record/field/types/guards/isFieldRelation';
import { IconPencil } from '@/ui/display/icon';
import { IconComponent } from '@/ui/display/icon/types/IconComponent';
-import { isFieldRelation } from '@/ui/object/field/types/guards/isFieldRelation';
import { FieldContext } from '../contexts/FieldContext';
import { isFieldEmail } from '../types/guards/isFieldEmail';
diff --git a/front/src/modules/ui/object/field/hooks/useIsFieldEmpty.ts b/front/src/modules/object-record/field/hooks/useIsFieldEmpty.ts
similarity index 100%
rename from front/src/modules/ui/object/field/hooks/useIsFieldEmpty.ts
rename to front/src/modules/object-record/field/hooks/useIsFieldEmpty.ts
diff --git a/front/src/modules/ui/object/field/hooks/useIsFieldInputOnly.ts b/front/src/modules/object-record/field/hooks/useIsFieldInputOnly.ts
similarity index 100%
rename from front/src/modules/ui/object/field/hooks/useIsFieldInputOnly.ts
rename to front/src/modules/object-record/field/hooks/useIsFieldInputOnly.ts
diff --git a/front/src/modules/ui/object/field/hooks/usePersistField.ts b/front/src/modules/object-record/field/hooks/usePersistField.ts
similarity index 96%
rename from front/src/modules/ui/object/field/hooks/usePersistField.ts
rename to front/src/modules/object-record/field/hooks/usePersistField.ts
index 421abd148..f8ce7adf7 100644
--- a/front/src/modules/ui/object/field/hooks/usePersistField.ts
+++ b/front/src/modules/object-record/field/hooks/usePersistField.ts
@@ -1,8 +1,8 @@
import { useContext } from 'react';
import { useRecoilCallback } from 'recoil';
-import { isFieldFullName } from '@/ui/object/field/types/guards/isFieldFullName';
-import { isFieldFullNameValue } from '@/ui/object/field/types/guards/isFieldFullNameValue';
+import { isFieldFullName } from '@/object-record/field/types/guards/isFieldFullName';
+import { isFieldFullNameValue } from '@/object-record/field/types/guards/isFieldFullNameValue';
import { FieldContext } from '../contexts/FieldContext';
import { entityFieldsFamilySelector } from '../states/selectors/entityFieldsFamilySelector';
diff --git a/front/src/modules/ui/object/field/hooks/useToggleEditOnlyInput.ts b/front/src/modules/object-record/field/hooks/useToggleEditOnlyInput.ts
similarity index 100%
rename from front/src/modules/ui/object/field/hooks/useToggleEditOnlyInput.ts
rename to front/src/modules/object-record/field/hooks/useToggleEditOnlyInput.ts
diff --git a/front/src/modules/ui/object/field/meta-types/__stories__/FieldContextProvider.tsx b/front/src/modules/object-record/field/meta-types/__stories__/FieldContextProvider.tsx
similarity index 92%
rename from front/src/modules/ui/object/field/meta-types/__stories__/FieldContextProvider.tsx
rename to front/src/modules/object-record/field/meta-types/__stories__/FieldContextProvider.tsx
index 726680926..1905fffb4 100644
--- a/front/src/modules/ui/object/field/meta-types/__stories__/FieldContextProvider.tsx
+++ b/front/src/modules/object-record/field/meta-types/__stories__/FieldContextProvider.tsx
@@ -1,7 +1,7 @@
import {
FieldContext,
GenericFieldContextType,
-} from '@/ui/object/field/contexts/FieldContext';
+} from '@/object-record/field/contexts/FieldContext';
type FieldContextProviderProps = {
children: React.ReactNode;
diff --git a/front/src/modules/ui/object/field/meta-types/display/components/ChipFieldDisplay.tsx b/front/src/modules/object-record/field/meta-types/display/components/ChipFieldDisplay.tsx
similarity index 86%
rename from front/src/modules/ui/object/field/meta-types/display/components/ChipFieldDisplay.tsx
rename to front/src/modules/object-record/field/meta-types/display/components/ChipFieldDisplay.tsx
index 91d88b932..6a5f8df35 100644
--- a/front/src/modules/ui/object/field/meta-types/display/components/ChipFieldDisplay.tsx
+++ b/front/src/modules/object-record/field/meta-types/display/components/ChipFieldDisplay.tsx
@@ -1,5 +1,5 @@
+import { useChipField } from '@/object-record/field/meta-types/hooks/useChipField';
import { EntityChip } from '@/ui/display/chip/components/EntityChip';
-import { useChipField } from '@/ui/object/field/meta-types/hooks/useChipField';
export const ChipFieldDisplay = () => {
const {
diff --git a/front/src/modules/ui/object/field/meta-types/display/components/CurrencyFieldDisplay.tsx b/front/src/modules/object-record/field/meta-types/display/components/CurrencyFieldDisplay.tsx
similarity index 100%
rename from front/src/modules/ui/object/field/meta-types/display/components/CurrencyFieldDisplay.tsx
rename to front/src/modules/object-record/field/meta-types/display/components/CurrencyFieldDisplay.tsx
diff --git a/front/src/modules/ui/object/field/meta-types/display/components/DateFieldDisplay.tsx b/front/src/modules/object-record/field/meta-types/display/components/DateFieldDisplay.tsx
similarity index 64%
rename from front/src/modules/ui/object/field/meta-types/display/components/DateFieldDisplay.tsx
rename to front/src/modules/object-record/field/meta-types/display/components/DateFieldDisplay.tsx
index 7ee25d7a4..d715e6800 100644
--- a/front/src/modules/ui/object/field/meta-types/display/components/DateFieldDisplay.tsx
+++ b/front/src/modules/object-record/field/meta-types/display/components/DateFieldDisplay.tsx
@@ -1,4 +1,4 @@
-import { DateDisplay } from '@/ui/object/field/meta-types/display/content-display/components/DateDisplay';
+import { DateDisplay } from '@/object-record/field/meta-types/display/content-display/components/DateDisplay';
import { useDateTimeField } from '../../hooks/useDateTimeField';
diff --git a/front/src/modules/ui/object/field/meta-types/display/components/EmailFieldDisplay.tsx b/front/src/modules/object-record/field/meta-types/display/components/EmailFieldDisplay.tsx
similarity index 100%
rename from front/src/modules/ui/object/field/meta-types/display/components/EmailFieldDisplay.tsx
rename to front/src/modules/object-record/field/meta-types/display/components/EmailFieldDisplay.tsx
diff --git a/front/src/modules/ui/object/field/meta-types/display/components/FullNameFieldDisplay.tsx b/front/src/modules/object-record/field/meta-types/display/components/FullNameFieldDisplay.tsx
similarity index 77%
rename from front/src/modules/ui/object/field/meta-types/display/components/FullNameFieldDisplay.tsx
rename to front/src/modules/object-record/field/meta-types/display/components/FullNameFieldDisplay.tsx
index b6bdc2c81..175473382 100644
--- a/front/src/modules/ui/object/field/meta-types/display/components/FullNameFieldDisplay.tsx
+++ b/front/src/modules/object-record/field/meta-types/display/components/FullNameFieldDisplay.tsx
@@ -1,4 +1,4 @@
-import { useFullNameField } from '@/ui/object/field/meta-types/hooks/useFullNameField';
+import { useFullNameField } from '@/object-record/field/meta-types/hooks/useFullNameField';
import { TextDisplay } from '../content-display/components/TextDisplay';
diff --git a/front/src/modules/ui/object/field/meta-types/display/components/LinkFieldDisplay.tsx b/front/src/modules/object-record/field/meta-types/display/components/LinkFieldDisplay.tsx
similarity index 100%
rename from front/src/modules/ui/object/field/meta-types/display/components/LinkFieldDisplay.tsx
rename to front/src/modules/object-record/field/meta-types/display/components/LinkFieldDisplay.tsx
diff --git a/front/src/modules/ui/object/field/meta-types/display/components/NumberFieldDisplay.tsx b/front/src/modules/object-record/field/meta-types/display/components/NumberFieldDisplay.tsx
similarity index 63%
rename from front/src/modules/ui/object/field/meta-types/display/components/NumberFieldDisplay.tsx
rename to front/src/modules/object-record/field/meta-types/display/components/NumberFieldDisplay.tsx
index d599fe9b7..78dee44b0 100644
--- a/front/src/modules/ui/object/field/meta-types/display/components/NumberFieldDisplay.tsx
+++ b/front/src/modules/object-record/field/meta-types/display/components/NumberFieldDisplay.tsx
@@ -1,4 +1,4 @@
-import { NumberDisplay } from '@/ui/object/field/meta-types/display/content-display/components/NumberDisplay';
+import { NumberDisplay } from '@/object-record/field/meta-types/display/content-display/components/NumberDisplay';
import { useNumberField } from '../../hooks/useNumberField';
diff --git a/front/src/modules/ui/object/field/meta-types/display/components/PhoneFieldDisplay.tsx b/front/src/modules/object-record/field/meta-types/display/components/PhoneFieldDisplay.tsx
similarity index 63%
rename from front/src/modules/ui/object/field/meta-types/display/components/PhoneFieldDisplay.tsx
rename to front/src/modules/object-record/field/meta-types/display/components/PhoneFieldDisplay.tsx
index dd3908274..c0b9394f1 100644
--- a/front/src/modules/ui/object/field/meta-types/display/components/PhoneFieldDisplay.tsx
+++ b/front/src/modules/object-record/field/meta-types/display/components/PhoneFieldDisplay.tsx
@@ -1,4 +1,4 @@
-import { PhoneDisplay } from '@/ui/object/field/meta-types/display/content-display/components/PhoneDisplay';
+import { PhoneDisplay } from '@/object-record/field/meta-types/display/content-display/components/PhoneDisplay';
import { usePhoneField } from '../../hooks/usePhoneField';
diff --git a/front/src/modules/ui/object/field/meta-types/display/components/RelationFieldDisplay.tsx b/front/src/modules/object-record/field/meta-types/display/components/RelationFieldDisplay.tsx
similarity index 87%
rename from front/src/modules/ui/object/field/meta-types/display/components/RelationFieldDisplay.tsx
rename to front/src/modules/object-record/field/meta-types/display/components/RelationFieldDisplay.tsx
index dad9570ca..09a918151 100644
--- a/front/src/modules/ui/object/field/meta-types/display/components/RelationFieldDisplay.tsx
+++ b/front/src/modules/object-record/field/meta-types/display/components/RelationFieldDisplay.tsx
@@ -1,5 +1,5 @@
+import { useRelationPicker } from '@/object-record/relation-picker/hooks/useRelationPicker';
import { EntityChip } from '@/ui/display/chip/components/EntityChip';
-import { useRelationPicker } from '@/ui/input/components/internal/relation-picker/hooks/useRelationPicker';
import { useRelationField } from '../../hooks/useRelationField';
diff --git a/front/src/modules/ui/object/field/meta-types/display/components/SelectFieldDisplay.tsx b/front/src/modules/object-record/field/meta-types/display/components/SelectFieldDisplay.tsx
similarity index 100%
rename from front/src/modules/ui/object/field/meta-types/display/components/SelectFieldDisplay.tsx
rename to front/src/modules/object-record/field/meta-types/display/components/SelectFieldDisplay.tsx
diff --git a/front/src/modules/ui/object/field/meta-types/display/components/TextFieldDisplay.tsx b/front/src/modules/object-record/field/meta-types/display/components/TextFieldDisplay.tsx
similarity index 62%
rename from front/src/modules/ui/object/field/meta-types/display/components/TextFieldDisplay.tsx
rename to front/src/modules/object-record/field/meta-types/display/components/TextFieldDisplay.tsx
index 78c7fccd5..e49d79900 100644
--- a/front/src/modules/ui/object/field/meta-types/display/components/TextFieldDisplay.tsx
+++ b/front/src/modules/object-record/field/meta-types/display/components/TextFieldDisplay.tsx
@@ -1,4 +1,4 @@
-import { TextDisplay } from '@/ui/object/field/meta-types/display/content-display/components/TextDisplay';
+import { TextDisplay } from '@/object-record/field/meta-types/display/content-display/components/TextDisplay';
import { useTextField } from '../../hooks/useTextField';
diff --git a/front/src/modules/object-record/field/meta-types/display/components/UuidFieldDisplay.tsx b/front/src/modules/object-record/field/meta-types/display/components/UuidFieldDisplay.tsx
new file mode 100644
index 000000000..aa1da89b4
--- /dev/null
+++ b/front/src/modules/object-record/field/meta-types/display/components/UuidFieldDisplay.tsx
@@ -0,0 +1,8 @@
+import { TextDisplay } from '@/object-record/field/meta-types/display/content-display/components/TextDisplay';
+import { useUuidField } from '@/object-record/field/meta-types/hooks/useUuidField';
+
+export const UuidFieldDisplay = () => {
+ const { fieldValue } = useUuidField();
+
+ return ;
+};
diff --git a/front/src/modules/ui/object/field/meta-types/display/components/__stories__/DateFieldDisplay.stories.tsx b/front/src/modules/object-record/field/meta-types/display/components/__stories__/DateFieldDisplay.stories.tsx
similarity index 100%
rename from front/src/modules/ui/object/field/meta-types/display/components/__stories__/DateFieldDisplay.stories.tsx
rename to front/src/modules/object-record/field/meta-types/display/components/__stories__/DateFieldDisplay.stories.tsx
diff --git a/front/src/modules/ui/object/field/meta-types/display/components/__stories__/EmailFieldDisplay.stories.tsx b/front/src/modules/object-record/field/meta-types/display/components/__stories__/EmailFieldDisplay.stories.tsx
similarity index 100%
rename from front/src/modules/ui/object/field/meta-types/display/components/__stories__/EmailFieldDisplay.stories.tsx
rename to front/src/modules/object-record/field/meta-types/display/components/__stories__/EmailFieldDisplay.stories.tsx
diff --git a/front/src/modules/ui/object/field/meta-types/display/components/__stories__/NumberFieldDisplay.stories.tsx b/front/src/modules/object-record/field/meta-types/display/components/__stories__/NumberFieldDisplay.stories.tsx
similarity index 100%
rename from front/src/modules/ui/object/field/meta-types/display/components/__stories__/NumberFieldDisplay.stories.tsx
rename to front/src/modules/object-record/field/meta-types/display/components/__stories__/NumberFieldDisplay.stories.tsx
diff --git a/front/src/modules/ui/object/field/meta-types/display/components/__stories__/PhoneFieldDisplay.stories.tsx b/front/src/modules/object-record/field/meta-types/display/components/__stories__/PhoneFieldDisplay.stories.tsx
similarity index 100%
rename from front/src/modules/ui/object/field/meta-types/display/components/__stories__/PhoneFieldDisplay.stories.tsx
rename to front/src/modules/object-record/field/meta-types/display/components/__stories__/PhoneFieldDisplay.stories.tsx
diff --git a/front/src/modules/ui/object/field/meta-types/display/components/__stories__/TextFieldDisplay.stories.tsx b/front/src/modules/object-record/field/meta-types/display/components/__stories__/TextFieldDisplay.stories.tsx
similarity index 100%
rename from front/src/modules/ui/object/field/meta-types/display/components/__stories__/TextFieldDisplay.stories.tsx
rename to front/src/modules/object-record/field/meta-types/display/components/__stories__/TextFieldDisplay.stories.tsx
diff --git a/front/src/modules/ui/object/field/meta-types/display/content-display/components/CurrencyDisplay.tsx b/front/src/modules/object-record/field/meta-types/display/content-display/components/CurrencyDisplay.tsx
similarity index 100%
rename from front/src/modules/ui/object/field/meta-types/display/content-display/components/CurrencyDisplay.tsx
rename to front/src/modules/object-record/field/meta-types/display/content-display/components/CurrencyDisplay.tsx
diff --git a/front/src/modules/ui/object/field/meta-types/display/content-display/components/DateDisplay.tsx b/front/src/modules/object-record/field/meta-types/display/content-display/components/DateDisplay.tsx
similarity index 100%
rename from front/src/modules/ui/object/field/meta-types/display/content-display/components/DateDisplay.tsx
rename to front/src/modules/object-record/field/meta-types/display/content-display/components/DateDisplay.tsx
diff --git a/front/src/modules/ui/object/field/meta-types/display/content-display/components/DoubleTextDisplay.tsx b/front/src/modules/object-record/field/meta-types/display/content-display/components/DoubleTextDisplay.tsx
similarity index 100%
rename from front/src/modules/ui/object/field/meta-types/display/content-display/components/DoubleTextDisplay.tsx
rename to front/src/modules/object-record/field/meta-types/display/content-display/components/DoubleTextDisplay.tsx
diff --git a/front/src/modules/ui/object/field/meta-types/display/content-display/components/EllipsisDisplay.tsx b/front/src/modules/object-record/field/meta-types/display/content-display/components/EllipsisDisplay.tsx
similarity index 100%
rename from front/src/modules/ui/object/field/meta-types/display/content-display/components/EllipsisDisplay.tsx
rename to front/src/modules/object-record/field/meta-types/display/content-display/components/EllipsisDisplay.tsx
diff --git a/front/src/modules/ui/object/field/meta-types/display/content-display/components/EmailDisplay.tsx b/front/src/modules/object-record/field/meta-types/display/content-display/components/EmailDisplay.tsx
similarity index 100%
rename from front/src/modules/ui/object/field/meta-types/display/content-display/components/EmailDisplay.tsx
rename to front/src/modules/object-record/field/meta-types/display/content-display/components/EmailDisplay.tsx
diff --git a/front/src/modules/ui/object/field/meta-types/display/content-display/components/LinkDisplay.tsx b/front/src/modules/object-record/field/meta-types/display/content-display/components/LinkDisplay.tsx
similarity index 95%
rename from front/src/modules/ui/object/field/meta-types/display/content-display/components/LinkDisplay.tsx
rename to front/src/modules/object-record/field/meta-types/display/content-display/components/LinkDisplay.tsx
index c2f1bc7f2..77973a604 100644
--- a/front/src/modules/ui/object/field/meta-types/display/content-display/components/LinkDisplay.tsx
+++ b/front/src/modules/object-record/field/meta-types/display/content-display/components/LinkDisplay.tsx
@@ -1,12 +1,12 @@
import { MouseEvent } from 'react';
import styled from '@emotion/styled';
+import { FieldLinkValue } from '@/object-record/field/types/FieldMetadata';
import { RoundedLink } from '@/ui/navigation/link/components/RoundedLink';
import {
LinkType,
SocialLink,
} from '@/ui/navigation/link/components/SocialLink';
-import { FieldLinkValue } from '@/ui/object/field/types/FieldMetadata';
import { EllipsisDisplay } from './EllipsisDisplay';
diff --git a/front/src/modules/ui/object/field/meta-types/display/content-display/components/MoneyDisplay.tsx b/front/src/modules/object-record/field/meta-types/display/content-display/components/MoneyDisplay.tsx
similarity index 100%
rename from front/src/modules/ui/object/field/meta-types/display/content-display/components/MoneyDisplay.tsx
rename to front/src/modules/object-record/field/meta-types/display/content-display/components/MoneyDisplay.tsx
diff --git a/front/src/modules/ui/object/field/meta-types/display/content-display/components/NumberDisplay.tsx b/front/src/modules/object-record/field/meta-types/display/content-display/components/NumberDisplay.tsx
similarity index 100%
rename from front/src/modules/ui/object/field/meta-types/display/content-display/components/NumberDisplay.tsx
rename to front/src/modules/object-record/field/meta-types/display/content-display/components/NumberDisplay.tsx
diff --git a/front/src/modules/ui/object/field/meta-types/display/content-display/components/PhoneDisplay.tsx b/front/src/modules/object-record/field/meta-types/display/content-display/components/PhoneDisplay.tsx
similarity index 100%
rename from front/src/modules/ui/object/field/meta-types/display/content-display/components/PhoneDisplay.tsx
rename to front/src/modules/object-record/field/meta-types/display/content-display/components/PhoneDisplay.tsx
diff --git a/front/src/modules/ui/object/field/meta-types/display/content-display/components/TextDisplay.tsx b/front/src/modules/object-record/field/meta-types/display/content-display/components/TextDisplay.tsx
similarity index 100%
rename from front/src/modules/ui/object/field/meta-types/display/content-display/components/TextDisplay.tsx
rename to front/src/modules/object-record/field/meta-types/display/content-display/components/TextDisplay.tsx
diff --git a/front/src/modules/ui/object/field/meta-types/display/content-display/components/URLDisplay.tsx b/front/src/modules/object-record/field/meta-types/display/content-display/components/URLDisplay.tsx
similarity index 100%
rename from front/src/modules/ui/object/field/meta-types/display/content-display/components/URLDisplay.tsx
rename to front/src/modules/object-record/field/meta-types/display/content-display/components/URLDisplay.tsx
diff --git a/front/src/modules/ui/object/field/meta-types/display/content-display/components/__stories__/PhoneInputDisplay.stories.tsx b/front/src/modules/object-record/field/meta-types/display/content-display/components/__stories__/PhoneInputDisplay.stories.tsx
similarity index 100%
rename from front/src/modules/ui/object/field/meta-types/display/content-display/components/__stories__/PhoneInputDisplay.stories.tsx
rename to front/src/modules/object-record/field/meta-types/display/content-display/components/__stories__/PhoneInputDisplay.stories.tsx
diff --git a/front/src/modules/ui/object/field/meta-types/hooks/useBooleanField.ts b/front/src/modules/object-record/field/meta-types/hooks/useBooleanField.ts
similarity index 100%
rename from front/src/modules/ui/object/field/meta-types/hooks/useBooleanField.ts
rename to front/src/modules/object-record/field/meta-types/hooks/useBooleanField.ts
diff --git a/front/src/modules/ui/object/field/meta-types/hooks/useChipField.ts b/front/src/modules/object-record/field/meta-types/hooks/useChipField.ts
similarity index 66%
rename from front/src/modules/ui/object/field/meta-types/hooks/useChipField.ts
rename to front/src/modules/object-record/field/meta-types/hooks/useChipField.ts
index b6a3f7de8..3e6b093ff 100644
--- a/front/src/modules/ui/object/field/meta-types/hooks/useChipField.ts
+++ b/front/src/modules/object-record/field/meta-types/hooks/useChipField.ts
@@ -1,10 +1,10 @@
import { useContext } from 'react';
import { useRecoilValue } from 'recoil';
-import { useRelationPicker } from '@/ui/input/components/internal/relation-picker/hooks/useRelationPicker';
-import { entityFieldsFamilyState } from '@/ui/object/field/states/entityFieldsFamilyState';
-import { isFieldFullName } from '@/ui/object/field/types/guards/isFieldFullName';
-import { isFieldText } from '@/ui/object/field/types/guards/isFieldText';
+import { entityFieldsFamilyState } from '@/object-record/field/states/entityFieldsFamilyState';
+import { isFieldFullName } from '@/object-record/field/types/guards/isFieldFullName';
+import { isFieldText } from '@/object-record/field/types/guards/isFieldText';
+import { useRelationPicker } from '@/object-record/relation-picker/hooks/useRelationPicker';
import { FieldContext } from '../../contexts/FieldContext';
diff --git a/front/src/modules/ui/object/field/meta-types/hooks/useCurrencyField.ts b/front/src/modules/object-record/field/meta-types/hooks/useCurrencyField.ts
similarity index 97%
rename from front/src/modules/ui/object/field/meta-types/hooks/useCurrencyField.ts
rename to front/src/modules/object-record/field/meta-types/hooks/useCurrencyField.ts
index dee999ffd..753339e3d 100644
--- a/front/src/modules/ui/object/field/meta-types/hooks/useCurrencyField.ts
+++ b/front/src/modules/object-record/field/meta-types/hooks/useCurrencyField.ts
@@ -1,7 +1,7 @@
import { useContext } from 'react';
import { useRecoilState } from 'recoil';
-import { FieldInitialValue } from '@/ui/object/field/types/FieldInitialValue';
+import { FieldInitialValue } from '@/object-record/field/types/FieldInitialValue';
import { canBeCastAsIntegerOrNull } from '~/utils/cast-as-integer-or-null';
import {
convertCurrencyMicrosToCurrency,
diff --git a/front/src/modules/ui/object/field/meta-types/hooks/useDateTimeField.ts b/front/src/modules/object-record/field/meta-types/hooks/useDateTimeField.ts
similarity index 100%
rename from front/src/modules/ui/object/field/meta-types/hooks/useDateTimeField.ts
rename to front/src/modules/object-record/field/meta-types/hooks/useDateTimeField.ts
diff --git a/front/src/modules/ui/object/field/meta-types/hooks/useEmailField.ts b/front/src/modules/object-record/field/meta-types/hooks/useEmailField.ts
similarity index 100%
rename from front/src/modules/ui/object/field/meta-types/hooks/useEmailField.ts
rename to front/src/modules/object-record/field/meta-types/hooks/useEmailField.ts
diff --git a/front/src/modules/ui/object/field/meta-types/hooks/useFullNameField.ts b/front/src/modules/object-record/field/meta-types/hooks/useFullNameField.ts
similarity index 100%
rename from front/src/modules/ui/object/field/meta-types/hooks/useFullNameField.ts
rename to front/src/modules/object-record/field/meta-types/hooks/useFullNameField.ts
diff --git a/front/src/modules/ui/object/field/meta-types/hooks/useLinkField.ts b/front/src/modules/object-record/field/meta-types/hooks/useLinkField.ts
similarity index 100%
rename from front/src/modules/ui/object/field/meta-types/hooks/useLinkField.ts
rename to front/src/modules/object-record/field/meta-types/hooks/useLinkField.ts
diff --git a/front/src/modules/ui/object/field/meta-types/hooks/useNumberField.ts b/front/src/modules/object-record/field/meta-types/hooks/useNumberField.ts
similarity index 100%
rename from front/src/modules/ui/object/field/meta-types/hooks/useNumberField.ts
rename to front/src/modules/object-record/field/meta-types/hooks/useNumberField.ts
diff --git a/front/src/modules/ui/object/field/meta-types/hooks/usePhoneField.ts b/front/src/modules/object-record/field/meta-types/hooks/usePhoneField.ts
similarity index 100%
rename from front/src/modules/ui/object/field/meta-types/hooks/usePhoneField.ts
rename to front/src/modules/object-record/field/meta-types/hooks/usePhoneField.ts
diff --git a/front/src/modules/ui/object/field/meta-types/hooks/useRatingField.ts b/front/src/modules/object-record/field/meta-types/hooks/useRatingField.ts
similarity index 100%
rename from front/src/modules/ui/object/field/meta-types/hooks/useRatingField.ts
rename to front/src/modules/object-record/field/meta-types/hooks/useRatingField.ts
diff --git a/front/src/modules/ui/object/field/meta-types/hooks/useRelationField.ts b/front/src/modules/object-record/field/meta-types/hooks/useRelationField.ts
similarity index 100%
rename from front/src/modules/ui/object/field/meta-types/hooks/useRelationField.ts
rename to front/src/modules/object-record/field/meta-types/hooks/useRelationField.ts
diff --git a/front/src/modules/ui/object/field/meta-types/hooks/useSelectField.ts b/front/src/modules/object-record/field/meta-types/hooks/useSelectField.ts
similarity index 100%
rename from front/src/modules/ui/object/field/meta-types/hooks/useSelectField.ts
rename to front/src/modules/object-record/field/meta-types/hooks/useSelectField.ts
diff --git a/front/src/modules/ui/object/field/meta-types/hooks/useTextField.ts b/front/src/modules/object-record/field/meta-types/hooks/useTextField.ts
similarity index 100%
rename from front/src/modules/ui/object/field/meta-types/hooks/useTextField.ts
rename to front/src/modules/object-record/field/meta-types/hooks/useTextField.ts
diff --git a/front/src/modules/ui/object/field/meta-types/hooks/useUuidField.ts b/front/src/modules/object-record/field/meta-types/hooks/useUuidField.ts
similarity index 93%
rename from front/src/modules/ui/object/field/meta-types/hooks/useUuidField.ts
rename to front/src/modules/object-record/field/meta-types/hooks/useUuidField.ts
index 913867fec..43b740e52 100644
--- a/front/src/modules/ui/object/field/meta-types/hooks/useUuidField.ts
+++ b/front/src/modules/object-record/field/meta-types/hooks/useUuidField.ts
@@ -1,7 +1,7 @@
import { useContext } from 'react';
import { useRecoilState } from 'recoil';
-import { isFieldUuid } from '@/ui/object/field/types/guards/isFieldUuid';
+import { isFieldUuid } from '@/object-record/field/types/guards/isFieldUuid';
import { FieldContext } from '../../contexts/FieldContext';
import { useFieldInitialValue } from '../../hooks/useFieldInitialValue';
diff --git a/front/src/modules/ui/object/field/meta-types/input/components/BooleanFieldInput.tsx b/front/src/modules/object-record/field/meta-types/input/components/BooleanFieldInput.tsx
similarity index 87%
rename from front/src/modules/ui/object/field/meta-types/input/components/BooleanFieldInput.tsx
rename to front/src/modules/object-record/field/meta-types/input/components/BooleanFieldInput.tsx
index 28a4e8141..2b4fecaad 100644
--- a/front/src/modules/ui/object/field/meta-types/input/components/BooleanFieldInput.tsx
+++ b/front/src/modules/object-record/field/meta-types/input/components/BooleanFieldInput.tsx
@@ -1,4 +1,4 @@
-import { BooleanInput } from '@/ui/object/field/meta-types/input/components/internal/BooleanInput';
+import { BooleanInput } from '@/object-record/field/meta-types/input/components/internal/BooleanInput';
import { usePersistField } from '../../../hooks/usePersistField';
import { useBooleanField } from '../../hooks/useBooleanField';
diff --git a/front/src/modules/ui/object/field/meta-types/input/components/CurrencyFieldInput.tsx b/front/src/modules/object-record/field/meta-types/input/components/CurrencyFieldInput.tsx
similarity index 95%
rename from front/src/modules/ui/object/field/meta-types/input/components/CurrencyFieldInput.tsx
rename to front/src/modules/object-record/field/meta-types/input/components/CurrencyFieldInput.tsx
index 4cd0f4aa0..0603876f9 100644
--- a/front/src/modules/ui/object/field/meta-types/input/components/CurrencyFieldInput.tsx
+++ b/front/src/modules/object-record/field/meta-types/input/components/CurrencyFieldInput.tsx
@@ -1,4 +1,4 @@
-import { TextInput } from '@/ui/object/field/meta-types/input/components/internal/TextInput';
+import { TextInput } from '@/object-record/field/meta-types/input/components/internal/TextInput';
import { useCurrencyField } from '../../hooks/useCurrencyField';
diff --git a/front/src/modules/ui/object/field/meta-types/input/components/DateFieldInput.tsx b/front/src/modules/object-record/field/meta-types/input/components/DateFieldInput.tsx
similarity index 93%
rename from front/src/modules/ui/object/field/meta-types/input/components/DateFieldInput.tsx
rename to front/src/modules/object-record/field/meta-types/input/components/DateFieldInput.tsx
index c10ae8636..b862a3184 100644
--- a/front/src/modules/ui/object/field/meta-types/input/components/DateFieldInput.tsx
+++ b/front/src/modules/object-record/field/meta-types/input/components/DateFieldInput.tsx
@@ -1,4 +1,4 @@
-import { DateInput } from '@/ui/object/field/meta-types/input/components/internal/DateInput';
+import { DateInput } from '@/object-record/field/meta-types/input/components/internal/DateInput';
import { Nullable } from '~/types/Nullable';
import { usePersistField } from '../../../hooks/usePersistField';
diff --git a/front/src/modules/ui/object/field/meta-types/input/components/EmailFieldInput.tsx b/front/src/modules/object-record/field/meta-types/input/components/EmailFieldInput.tsx
similarity index 94%
rename from front/src/modules/ui/object/field/meta-types/input/components/EmailFieldInput.tsx
rename to front/src/modules/object-record/field/meta-types/input/components/EmailFieldInput.tsx
index 52cf296b8..b4b375ec7 100644
--- a/front/src/modules/ui/object/field/meta-types/input/components/EmailFieldInput.tsx
+++ b/front/src/modules/object-record/field/meta-types/input/components/EmailFieldInput.tsx
@@ -1,4 +1,4 @@
-import { TextInput } from '@/ui/object/field/meta-types/input/components/internal/TextInput';
+import { TextInput } from '@/object-record/field/meta-types/input/components/internal/TextInput';
import { usePersistField } from '../../../hooks/usePersistField';
import { useEmailField } from '../../hooks/useEmailField';
diff --git a/front/src/modules/ui/object/field/meta-types/input/components/FullNameFieldInput.tsx b/front/src/modules/object-record/field/meta-types/input/components/FullNameFieldInput.tsx
similarity index 87%
rename from front/src/modules/ui/object/field/meta-types/input/components/FullNameFieldInput.tsx
rename to front/src/modules/object-record/field/meta-types/input/components/FullNameFieldInput.tsx
index 40722f4fc..abadf0c35 100644
--- a/front/src/modules/ui/object/field/meta-types/input/components/FullNameFieldInput.tsx
+++ b/front/src/modules/object-record/field/meta-types/input/components/FullNameFieldInput.tsx
@@ -1,6 +1,6 @@
-import { useFullNameField } from '@/ui/object/field/meta-types/hooks/useFullNameField';
-import { DoubleTextInput } from '@/ui/object/field/meta-types/input/components/internal/DoubleTextInput';
-import { FieldDoubleText } from '@/ui/object/field/types/FieldDoubleText';
+import { useFullNameField } from '@/object-record/field/meta-types/hooks/useFullNameField';
+import { DoubleTextInput } from '@/object-record/field/meta-types/input/components/internal/DoubleTextInput';
+import { FieldDoubleText } from '@/object-record/field/types/FieldDoubleText';
import { usePersistField } from '../../../hooks/usePersistField';
diff --git a/front/src/modules/ui/object/field/meta-types/input/components/LinkFieldInput.tsx b/front/src/modules/object-record/field/meta-types/input/components/LinkFieldInput.tsx
similarity index 94%
rename from front/src/modules/ui/object/field/meta-types/input/components/LinkFieldInput.tsx
rename to front/src/modules/object-record/field/meta-types/input/components/LinkFieldInput.tsx
index d24cf1e54..2e49139ba 100644
--- a/front/src/modules/ui/object/field/meta-types/input/components/LinkFieldInput.tsx
+++ b/front/src/modules/object-record/field/meta-types/input/components/LinkFieldInput.tsx
@@ -1,4 +1,4 @@
-import { TextInput } from '@/ui/object/field/meta-types/input/components/internal/TextInput';
+import { TextInput } from '@/object-record/field/meta-types/input/components/internal/TextInput';
import { useLinkField } from '../../hooks/useLinkField';
diff --git a/front/src/modules/ui/object/field/meta-types/input/components/NumberFieldInput.tsx b/front/src/modules/object-record/field/meta-types/input/components/NumberFieldInput.tsx
similarity index 94%
rename from front/src/modules/ui/object/field/meta-types/input/components/NumberFieldInput.tsx
rename to front/src/modules/object-record/field/meta-types/input/components/NumberFieldInput.tsx
index cd8644f50..8a4b6de26 100644
--- a/front/src/modules/ui/object/field/meta-types/input/components/NumberFieldInput.tsx
+++ b/front/src/modules/object-record/field/meta-types/input/components/NumberFieldInput.tsx
@@ -1,4 +1,4 @@
-import { TextInput } from '@/ui/object/field/meta-types/input/components/internal/TextInput';
+import { TextInput } from '@/object-record/field/meta-types/input/components/internal/TextInput';
import { useNumberField } from '../../hooks/useNumberField';
diff --git a/front/src/modules/ui/object/field/meta-types/input/components/PhoneFieldInput.tsx b/front/src/modules/object-record/field/meta-types/input/components/PhoneFieldInput.tsx
similarity index 94%
rename from front/src/modules/ui/object/field/meta-types/input/components/PhoneFieldInput.tsx
rename to front/src/modules/object-record/field/meta-types/input/components/PhoneFieldInput.tsx
index ff3bded16..d19ed8319 100644
--- a/front/src/modules/ui/object/field/meta-types/input/components/PhoneFieldInput.tsx
+++ b/front/src/modules/object-record/field/meta-types/input/components/PhoneFieldInput.tsx
@@ -1,4 +1,4 @@
-import { PhoneInput } from '@/ui/object/field/meta-types/input/components/internal/PhoneInput';
+import { PhoneInput } from '@/object-record/field/meta-types/input/components/internal/PhoneInput';
import { usePhoneField } from '../../hooks/usePhoneField';
diff --git a/front/src/modules/ui/object/field/meta-types/input/components/RatingFieldInput.tsx b/front/src/modules/object-record/field/meta-types/input/components/RatingFieldInput.tsx
similarity index 86%
rename from front/src/modules/ui/object/field/meta-types/input/components/RatingFieldInput.tsx
rename to front/src/modules/object-record/field/meta-types/input/components/RatingFieldInput.tsx
index a35a36654..ec1d1f4cb 100644
--- a/front/src/modules/ui/object/field/meta-types/input/components/RatingFieldInput.tsx
+++ b/front/src/modules/object-record/field/meta-types/input/components/RatingFieldInput.tsx
@@ -1,4 +1,4 @@
-import { RatingInput } from '@/ui/object/field/meta-types/input/components/internal/RatingInput';
+import { RatingInput } from '@/object-record/field/meta-types/input/components/internal/RatingInput';
import { usePersistField } from '../../../hooks/usePersistField';
import { useRatingField } from '../../hooks/useRatingField';
diff --git a/front/src/modules/ui/object/field/meta-types/input/components/RelationFieldInput.tsx b/front/src/modules/object-record/field/meta-types/input/components/RelationFieldInput.tsx
similarity index 90%
rename from front/src/modules/ui/object/field/meta-types/input/components/RelationFieldInput.tsx
rename to front/src/modules/object-record/field/meta-types/input/components/RelationFieldInput.tsx
index 71294ea40..aa5b448c2 100644
--- a/front/src/modules/ui/object/field/meta-types/input/components/RelationFieldInput.tsx
+++ b/front/src/modules/object-record/field/meta-types/input/components/RelationFieldInput.tsx
@@ -1,8 +1,8 @@
import { useEffect } from 'react';
import styled from '@emotion/styled';
-import { RelationPicker } from '@/ui/input/components/internal/relation-picker/components/RelationPicker';
-import { EntityForSelect } from '@/ui/input/relation-picker/types/EntityForSelect';
+import { RelationPicker } from '@/object-record/relation-picker/components/RelationPicker';
+import { EntityForSelect } from '@/object-record/relation-picker/types/EntityForSelect';
import { usePersistField } from '../../../hooks/usePersistField';
import { useRelationField } from '../../hooks/useRelationField';
diff --git a/front/src/modules/ui/object/field/meta-types/input/components/TextFieldInput.tsx b/front/src/modules/object-record/field/meta-types/input/components/TextFieldInput.tsx
similarity index 94%
rename from front/src/modules/ui/object/field/meta-types/input/components/TextFieldInput.tsx
rename to front/src/modules/object-record/field/meta-types/input/components/TextFieldInput.tsx
index 1f12b1fd6..14bb2a5ae 100644
--- a/front/src/modules/ui/object/field/meta-types/input/components/TextFieldInput.tsx
+++ b/front/src/modules/object-record/field/meta-types/input/components/TextFieldInput.tsx
@@ -1,4 +1,4 @@
-import { TextInput } from '@/ui/object/field/meta-types/input/components/internal/TextInput';
+import { TextInput } from '@/object-record/field/meta-types/input/components/internal/TextInput';
import { usePersistField } from '../../../hooks/usePersistField';
import { useTextField } from '../../hooks/useTextField';
diff --git a/front/src/modules/ui/object/field/meta-types/input/components/__stories__/BooleanFieldInput.stories.tsx b/front/src/modules/object-record/field/meta-types/input/components/__stories__/BooleanFieldInput.stories.tsx
similarity index 100%
rename from front/src/modules/ui/object/field/meta-types/input/components/__stories__/BooleanFieldInput.stories.tsx
rename to front/src/modules/object-record/field/meta-types/input/components/__stories__/BooleanFieldInput.stories.tsx
diff --git a/front/src/modules/ui/object/field/meta-types/input/components/__stories__/DateFieldInput.stories.tsx b/front/src/modules/object-record/field/meta-types/input/components/__stories__/DateFieldInput.stories.tsx
similarity index 100%
rename from front/src/modules/ui/object/field/meta-types/input/components/__stories__/DateFieldInput.stories.tsx
rename to front/src/modules/object-record/field/meta-types/input/components/__stories__/DateFieldInput.stories.tsx
diff --git a/front/src/modules/ui/object/field/meta-types/input/components/__stories__/EmailFieldInput.stories.tsx b/front/src/modules/object-record/field/meta-types/input/components/__stories__/EmailFieldInput.stories.tsx
similarity index 100%
rename from front/src/modules/ui/object/field/meta-types/input/components/__stories__/EmailFieldInput.stories.tsx
rename to front/src/modules/object-record/field/meta-types/input/components/__stories__/EmailFieldInput.stories.tsx
diff --git a/front/src/modules/ui/object/field/meta-types/input/components/__stories__/NumberFieldInput.stories.tsx b/front/src/modules/object-record/field/meta-types/input/components/__stories__/NumberFieldInput.stories.tsx
similarity index 100%
rename from front/src/modules/ui/object/field/meta-types/input/components/__stories__/NumberFieldInput.stories.tsx
rename to front/src/modules/object-record/field/meta-types/input/components/__stories__/NumberFieldInput.stories.tsx
diff --git a/front/src/modules/ui/object/field/meta-types/input/components/__stories__/PhoneFieldInput.stories.tsx b/front/src/modules/object-record/field/meta-types/input/components/__stories__/PhoneFieldInput.stories.tsx
similarity index 100%
rename from front/src/modules/ui/object/field/meta-types/input/components/__stories__/PhoneFieldInput.stories.tsx
rename to front/src/modules/object-record/field/meta-types/input/components/__stories__/PhoneFieldInput.stories.tsx
diff --git a/front/src/modules/ui/object/field/meta-types/input/components/__stories__/RatingFieldInput.stories.tsx b/front/src/modules/object-record/field/meta-types/input/components/__stories__/RatingFieldInput.stories.tsx
similarity index 100%
rename from front/src/modules/ui/object/field/meta-types/input/components/__stories__/RatingFieldInput.stories.tsx
rename to front/src/modules/object-record/field/meta-types/input/components/__stories__/RatingFieldInput.stories.tsx
diff --git a/front/src/modules/ui/object/field/meta-types/input/components/__stories__/RelationFieldInput.stories.tsx b/front/src/modules/object-record/field/meta-types/input/components/__stories__/RelationFieldInput.stories.tsx
similarity index 97%
rename from front/src/modules/ui/object/field/meta-types/input/components/__stories__/RelationFieldInput.stories.tsx
rename to front/src/modules/object-record/field/meta-types/input/components/__stories__/RelationFieldInput.stories.tsx
index 4c8cac269..d15fdbbb2 100644
--- a/front/src/modules/ui/object/field/meta-types/input/components/__stories__/RelationFieldInput.stories.tsx
+++ b/front/src/modules/object-record/field/meta-types/input/components/__stories__/RelationFieldInput.stories.tsx
@@ -3,7 +3,7 @@ import { expect, jest } from '@storybook/jest';
import { Decorator, Meta, StoryObj } from '@storybook/react';
import { userEvent, waitFor, within } from '@storybook/testing-library';
-import { RelationPickerScope } from '@/ui/input/components/internal/relation-picker/scopes/RelationPickerScope';
+import { RelationPickerScope } from '@/object-record/relation-picker/scopes/RelationPickerScope';
import { useSetHotkeyScope } from '@/ui/utilities/hotkey/hooks/useSetHotkeyScope';
import { ComponentWithRecoilScopeDecorator } from '~/testing/decorators/ComponentWithRecoilScopeDecorator';
import { graphqlMocks } from '~/testing/graphqlMocks';
diff --git a/front/src/modules/ui/object/field/meta-types/input/components/__stories__/TextFieldInput.stories.tsx b/front/src/modules/object-record/field/meta-types/input/components/__stories__/TextFieldInput.stories.tsx
similarity index 100%
rename from front/src/modules/ui/object/field/meta-types/input/components/__stories__/TextFieldInput.stories.tsx
rename to front/src/modules/object-record/field/meta-types/input/components/__stories__/TextFieldInput.stories.tsx
diff --git a/front/src/modules/ui/object/field/meta-types/input/components/internal/BooleanInput.tsx b/front/src/modules/object-record/field/meta-types/input/components/internal/BooleanInput.tsx
similarity index 100%
rename from front/src/modules/ui/object/field/meta-types/input/components/internal/BooleanInput.tsx
rename to front/src/modules/object-record/field/meta-types/input/components/internal/BooleanInput.tsx
diff --git a/front/src/modules/ui/object/field/meta-types/input/components/internal/DateInput.tsx b/front/src/modules/object-record/field/meta-types/input/components/internal/DateInput.tsx
similarity index 95%
rename from front/src/modules/ui/object/field/meta-types/input/components/internal/DateInput.tsx
rename to front/src/modules/object-record/field/meta-types/input/components/internal/DateInput.tsx
index 183d46f5c..7bb764d2e 100644
--- a/front/src/modules/ui/object/field/meta-types/input/components/internal/DateInput.tsx
+++ b/front/src/modules/object-record/field/meta-types/input/components/internal/DateInput.tsx
@@ -3,8 +3,8 @@ import { useTheme } from '@emotion/react';
import styled from '@emotion/styled';
import { flip, offset, useFloating } from '@floating-ui/react';
+import { DateDisplay } from '@/object-record/field/meta-types/display/content-display/components/DateDisplay';
import { InternalDatePicker } from '@/ui/input/components/internal/date/components/InternalDatePicker';
-import { DateDisplay } from '@/ui/object/field/meta-types/display/content-display/components/DateDisplay';
import { Nullable } from '~/types/Nullable';
import { useRegisterInputEvents } from '../../hooks/useRegisterInputEvents';
diff --git a/front/src/modules/ui/object/field/meta-types/input/components/internal/DoubleTextInput.tsx b/front/src/modules/object-record/field/meta-types/input/components/internal/DoubleTextInput.tsx
similarity index 98%
rename from front/src/modules/ui/object/field/meta-types/input/components/internal/DoubleTextInput.tsx
rename to front/src/modules/object-record/field/meta-types/input/components/internal/DoubleTextInput.tsx
index 9cc46bd05..2dfed0855 100644
--- a/front/src/modules/ui/object/field/meta-types/input/components/internal/DoubleTextInput.tsx
+++ b/front/src/modules/object-record/field/meta-types/input/components/internal/DoubleTextInput.tsx
@@ -2,7 +2,7 @@ import { ChangeEvent, useEffect, useRef, useState } from 'react';
import styled from '@emotion/styled';
import { Key } from 'ts-key-enum';
-import { FieldDoubleText } from '@/ui/object/field/types/FieldDoubleText';
+import { FieldDoubleText } from '@/object-record/field/types/FieldDoubleText';
import { useScopedHotkeys } from '@/ui/utilities/hotkey/hooks/useScopedHotkeys';
import { useListenClickOutside } from '@/ui/utilities/pointer-event/hooks/useListenClickOutside';
import { isDefined } from '~/utils/isDefined';
diff --git a/front/src/modules/ui/object/field/meta-types/input/components/internal/FieldInputOverlay.tsx b/front/src/modules/object-record/field/meta-types/input/components/internal/FieldInputOverlay.tsx
similarity index 100%
rename from front/src/modules/ui/object/field/meta-types/input/components/internal/FieldInputOverlay.tsx
rename to front/src/modules/object-record/field/meta-types/input/components/internal/FieldInputOverlay.tsx
diff --git a/front/src/modules/ui/object/field/meta-types/input/components/internal/PhoneInput.tsx b/front/src/modules/object-record/field/meta-types/input/components/internal/PhoneInput.tsx
similarity index 100%
rename from front/src/modules/ui/object/field/meta-types/input/components/internal/PhoneInput.tsx
rename to front/src/modules/object-record/field/meta-types/input/components/internal/PhoneInput.tsx
diff --git a/front/src/modules/ui/object/field/meta-types/input/components/internal/RatingInput.tsx b/front/src/modules/object-record/field/meta-types/input/components/internal/RatingInput.tsx
similarity index 100%
rename from front/src/modules/ui/object/field/meta-types/input/components/internal/RatingInput.tsx
rename to front/src/modules/object-record/field/meta-types/input/components/internal/RatingInput.tsx
diff --git a/front/src/modules/ui/object/field/meta-types/input/components/internal/TextInput.tsx b/front/src/modules/object-record/field/meta-types/input/components/internal/TextInput.tsx
similarity index 100%
rename from front/src/modules/ui/object/field/meta-types/input/components/internal/TextInput.tsx
rename to front/src/modules/object-record/field/meta-types/input/components/internal/TextInput.tsx
diff --git a/front/src/modules/ui/object/field/meta-types/input/hooks/useRegisterInputEvents.ts b/front/src/modules/object-record/field/meta-types/input/hooks/useRegisterInputEvents.ts
similarity index 100%
rename from front/src/modules/ui/object/field/meta-types/input/hooks/useRegisterInputEvents.ts
rename to front/src/modules/object-record/field/meta-types/input/hooks/useRegisterInputEvents.ts
diff --git a/front/src/modules/ui/object/field/states/entityFieldInitialValueFamilyState.ts b/front/src/modules/object-record/field/states/entityFieldInitialValueFamilyState.ts
similarity index 100%
rename from front/src/modules/ui/object/field/states/entityFieldInitialValueFamilyState.ts
rename to front/src/modules/object-record/field/states/entityFieldInitialValueFamilyState.ts
diff --git a/front/src/modules/ui/object/field/states/entityFieldsFamilyState.ts b/front/src/modules/object-record/field/states/entityFieldsFamilyState.ts
similarity index 100%
rename from front/src/modules/ui/object/field/states/entityFieldsFamilyState.ts
rename to front/src/modules/object-record/field/states/entityFieldsFamilyState.ts
diff --git a/front/src/modules/ui/object/field/states/isFieldEmptyScopedState.ts b/front/src/modules/object-record/field/states/isFieldEmptyScopedState.ts
similarity index 100%
rename from front/src/modules/ui/object/field/states/isFieldEmptyScopedState.ts
rename to front/src/modules/object-record/field/states/isFieldEmptyScopedState.ts
diff --git a/front/src/modules/ui/object/field/states/selectors/entityFieldsFamilySelector.ts b/front/src/modules/object-record/field/states/selectors/entityFieldsFamilySelector.ts
similarity index 100%
rename from front/src/modules/ui/object/field/states/selectors/entityFieldsFamilySelector.ts
rename to front/src/modules/object-record/field/states/selectors/entityFieldsFamilySelector.ts
diff --git a/front/src/modules/ui/object/field/states/selectors/isEntityFieldEmptyFamilySelector.ts b/front/src/modules/object-record/field/states/selectors/isEntityFieldEmptyFamilySelector.ts
similarity index 92%
rename from front/src/modules/ui/object/field/states/selectors/isEntityFieldEmptyFamilySelector.ts
rename to front/src/modules/object-record/field/states/selectors/isEntityFieldEmptyFamilySelector.ts
index a2015410f..df806a36e 100644
--- a/front/src/modules/ui/object/field/states/selectors/isEntityFieldEmptyFamilySelector.ts
+++ b/front/src/modules/object-record/field/states/selectors/isEntityFieldEmptyFamilySelector.ts
@@ -1,8 +1,8 @@
import { selectorFamily } from 'recoil';
-import { isFieldFullName } from '@/ui/object/field/types/guards/isFieldFullName';
-import { isFieldFullNameValue } from '@/ui/object/field/types/guards/isFieldFullNameValue';
-import { isFieldUuid } from '@/ui/object/field/types/guards/isFieldUuid';
+import { isFieldFullName } from '@/object-record/field/types/guards/isFieldFullName';
+import { isFieldFullNameValue } from '@/object-record/field/types/guards/isFieldFullNameValue';
+import { isFieldUuid } from '@/object-record/field/types/guards/isFieldUuid';
import { assertNotNull } from '~/utils/assert';
import { FieldDefinition } from '../../types/FieldDefinition';
diff --git a/front/src/modules/ui/object/field/types/FieldDefinition.ts b/front/src/modules/object-record/field/types/FieldDefinition.ts
similarity index 100%
rename from front/src/modules/ui/object/field/types/FieldDefinition.ts
rename to front/src/modules/object-record/field/types/FieldDefinition.ts
diff --git a/front/src/modules/ui/object/field/types/FieldDefinitionWithTypeOnly.ts b/front/src/modules/object-record/field/types/FieldDefinitionWithTypeOnly.ts
similarity index 100%
rename from front/src/modules/ui/object/field/types/FieldDefinitionWithTypeOnly.ts
rename to front/src/modules/object-record/field/types/FieldDefinitionWithTypeOnly.ts
diff --git a/front/src/modules/ui/object/field/types/FieldDoubleText.ts b/front/src/modules/object-record/field/types/FieldDoubleText.ts
similarity index 100%
rename from front/src/modules/ui/object/field/types/FieldDoubleText.ts
rename to front/src/modules/object-record/field/types/FieldDoubleText.ts
diff --git a/front/src/modules/ui/object/field/types/FieldInitialValue.ts b/front/src/modules/object-record/field/types/FieldInitialValue.ts
similarity index 100%
rename from front/src/modules/ui/object/field/types/FieldInitialValue.ts
rename to front/src/modules/object-record/field/types/FieldInitialValue.ts
diff --git a/front/src/modules/ui/object/field/types/FieldInputEvent.ts b/front/src/modules/object-record/field/types/FieldInputEvent.ts
similarity index 100%
rename from front/src/modules/ui/object/field/types/FieldInputEvent.ts
rename to front/src/modules/object-record/field/types/FieldInputEvent.ts
diff --git a/front/src/modules/ui/object/field/types/FieldMetadata.ts b/front/src/modules/object-record/field/types/FieldMetadata.ts
similarity index 97%
rename from front/src/modules/ui/object/field/types/FieldMetadata.ts
rename to front/src/modules/object-record/field/types/FieldMetadata.ts
index 7b17f81e9..0d70c3b97 100644
--- a/front/src/modules/ui/object/field/types/FieldMetadata.ts
+++ b/front/src/modules/object-record/field/types/FieldMetadata.ts
@@ -1,4 +1,4 @@
-import { EntityForSelect } from '@/ui/input/relation-picker/types/EntityForSelect';
+import { EntityForSelect } from '@/object-record/relation-picker/types/EntityForSelect';
import { ThemeColor } from '@/ui/theme/constants/colors';
export type FieldUuidMetadata = {
diff --git a/front/src/modules/ui/object/field/types/FieldType.ts b/front/src/modules/object-record/field/types/FieldType.ts
similarity index 100%
rename from front/src/modules/ui/object/field/types/FieldType.ts
rename to front/src/modules/object-record/field/types/FieldType.ts
diff --git a/front/src/modules/ui/object/field/types/guards/assertFieldMetadata.ts b/front/src/modules/object-record/field/types/guards/assertFieldMetadata.ts
similarity index 100%
rename from front/src/modules/ui/object/field/types/guards/assertFieldMetadata.ts
rename to front/src/modules/object-record/field/types/guards/assertFieldMetadata.ts
diff --git a/front/src/modules/ui/object/field/types/guards/isFieldBoolean.ts b/front/src/modules/object-record/field/types/guards/isFieldBoolean.ts
similarity index 100%
rename from front/src/modules/ui/object/field/types/guards/isFieldBoolean.ts
rename to front/src/modules/object-record/field/types/guards/isFieldBoolean.ts
diff --git a/front/src/modules/ui/object/field/types/guards/isFieldBooleanValue.ts b/front/src/modules/object-record/field/types/guards/isFieldBooleanValue.ts
similarity index 100%
rename from front/src/modules/ui/object/field/types/guards/isFieldBooleanValue.ts
rename to front/src/modules/object-record/field/types/guards/isFieldBooleanValue.ts
diff --git a/front/src/modules/ui/object/field/types/guards/isFieldCurrency.ts b/front/src/modules/object-record/field/types/guards/isFieldCurrency.ts
similarity index 100%
rename from front/src/modules/ui/object/field/types/guards/isFieldCurrency.ts
rename to front/src/modules/object-record/field/types/guards/isFieldCurrency.ts
diff --git a/front/src/modules/ui/object/field/types/guards/isFieldCurrencyValue.ts b/front/src/modules/object-record/field/types/guards/isFieldCurrencyValue.ts
similarity index 100%
rename from front/src/modules/ui/object/field/types/guards/isFieldCurrencyValue.ts
rename to front/src/modules/object-record/field/types/guards/isFieldCurrencyValue.ts
diff --git a/front/src/modules/ui/object/field/types/guards/isFieldDateTime.ts b/front/src/modules/object-record/field/types/guards/isFieldDateTime.ts
similarity index 100%
rename from front/src/modules/ui/object/field/types/guards/isFieldDateTime.ts
rename to front/src/modules/object-record/field/types/guards/isFieldDateTime.ts
diff --git a/front/src/modules/ui/object/field/types/guards/isFieldDateTimeValue.ts b/front/src/modules/object-record/field/types/guards/isFieldDateTimeValue.ts
similarity index 100%
rename from front/src/modules/ui/object/field/types/guards/isFieldDateTimeValue.ts
rename to front/src/modules/object-record/field/types/guards/isFieldDateTimeValue.ts
diff --git a/front/src/modules/ui/object/field/types/guards/isFieldEmail.ts b/front/src/modules/object-record/field/types/guards/isFieldEmail.ts
similarity index 100%
rename from front/src/modules/ui/object/field/types/guards/isFieldEmail.ts
rename to front/src/modules/object-record/field/types/guards/isFieldEmail.ts
diff --git a/front/src/modules/ui/object/field/types/guards/isFieldEmailValue.ts b/front/src/modules/object-record/field/types/guards/isFieldEmailValue.ts
similarity index 100%
rename from front/src/modules/ui/object/field/types/guards/isFieldEmailValue.ts
rename to front/src/modules/object-record/field/types/guards/isFieldEmailValue.ts
diff --git a/front/src/modules/ui/object/field/types/guards/isFieldFullName.ts b/front/src/modules/object-record/field/types/guards/isFieldFullName.ts
similarity index 100%
rename from front/src/modules/ui/object/field/types/guards/isFieldFullName.ts
rename to front/src/modules/object-record/field/types/guards/isFieldFullName.ts
diff --git a/front/src/modules/ui/object/field/types/guards/isFieldFullNameValue.ts b/front/src/modules/object-record/field/types/guards/isFieldFullNameValue.ts
similarity index 100%
rename from front/src/modules/ui/object/field/types/guards/isFieldFullNameValue.ts
rename to front/src/modules/object-record/field/types/guards/isFieldFullNameValue.ts
diff --git a/front/src/modules/ui/object/field/types/guards/isFieldLink.ts b/front/src/modules/object-record/field/types/guards/isFieldLink.ts
similarity index 100%
rename from front/src/modules/ui/object/field/types/guards/isFieldLink.ts
rename to front/src/modules/object-record/field/types/guards/isFieldLink.ts
diff --git a/front/src/modules/ui/object/field/types/guards/isFieldLinkValue.ts b/front/src/modules/object-record/field/types/guards/isFieldLinkValue.ts
similarity index 100%
rename from front/src/modules/ui/object/field/types/guards/isFieldLinkValue.ts
rename to front/src/modules/object-record/field/types/guards/isFieldLinkValue.ts
diff --git a/front/src/modules/ui/object/field/types/guards/isFieldNumber.ts b/front/src/modules/object-record/field/types/guards/isFieldNumber.ts
similarity index 100%
rename from front/src/modules/ui/object/field/types/guards/isFieldNumber.ts
rename to front/src/modules/object-record/field/types/guards/isFieldNumber.ts
diff --git a/front/src/modules/ui/object/field/types/guards/isFieldNumberValue.ts b/front/src/modules/object-record/field/types/guards/isFieldNumberValue.ts
similarity index 100%
rename from front/src/modules/ui/object/field/types/guards/isFieldNumberValue.ts
rename to front/src/modules/object-record/field/types/guards/isFieldNumberValue.ts
diff --git a/front/src/modules/ui/object/field/types/guards/isFieldPhone.ts b/front/src/modules/object-record/field/types/guards/isFieldPhone.ts
similarity index 100%
rename from front/src/modules/ui/object/field/types/guards/isFieldPhone.ts
rename to front/src/modules/object-record/field/types/guards/isFieldPhone.ts
diff --git a/front/src/modules/ui/object/field/types/guards/isFieldPhoneValue.ts b/front/src/modules/object-record/field/types/guards/isFieldPhoneValue.ts
similarity index 100%
rename from front/src/modules/ui/object/field/types/guards/isFieldPhoneValue.ts
rename to front/src/modules/object-record/field/types/guards/isFieldPhoneValue.ts
diff --git a/front/src/modules/ui/object/field/types/guards/isFieldRating.ts b/front/src/modules/object-record/field/types/guards/isFieldRating.ts
similarity index 100%
rename from front/src/modules/ui/object/field/types/guards/isFieldRating.ts
rename to front/src/modules/object-record/field/types/guards/isFieldRating.ts
diff --git a/front/src/modules/ui/object/field/types/guards/isFieldRatingValue.ts b/front/src/modules/object-record/field/types/guards/isFieldRatingValue.ts
similarity index 100%
rename from front/src/modules/ui/object/field/types/guards/isFieldRatingValue.ts
rename to front/src/modules/object-record/field/types/guards/isFieldRatingValue.ts
diff --git a/front/src/modules/ui/object/field/types/guards/isFieldRelation.ts b/front/src/modules/object-record/field/types/guards/isFieldRelation.ts
similarity index 100%
rename from front/src/modules/ui/object/field/types/guards/isFieldRelation.ts
rename to front/src/modules/object-record/field/types/guards/isFieldRelation.ts
diff --git a/front/src/modules/ui/object/field/types/guards/isFieldRelationValue.ts b/front/src/modules/object-record/field/types/guards/isFieldRelationValue.ts
similarity index 100%
rename from front/src/modules/ui/object/field/types/guards/isFieldRelationValue.ts
rename to front/src/modules/object-record/field/types/guards/isFieldRelationValue.ts
diff --git a/front/src/modules/ui/object/field/types/guards/isFieldSelect.ts b/front/src/modules/object-record/field/types/guards/isFieldSelect.ts
similarity index 100%
rename from front/src/modules/ui/object/field/types/guards/isFieldSelect.ts
rename to front/src/modules/object-record/field/types/guards/isFieldSelect.ts
diff --git a/front/src/modules/ui/object/field/types/guards/isFieldSelectValue.ts b/front/src/modules/object-record/field/types/guards/isFieldSelectValue.ts
similarity index 100%
rename from front/src/modules/ui/object/field/types/guards/isFieldSelectValue.ts
rename to front/src/modules/object-record/field/types/guards/isFieldSelectValue.ts
diff --git a/front/src/modules/ui/object/field/types/guards/isFieldText.ts b/front/src/modules/object-record/field/types/guards/isFieldText.ts
similarity index 100%
rename from front/src/modules/ui/object/field/types/guards/isFieldText.ts
rename to front/src/modules/object-record/field/types/guards/isFieldText.ts
diff --git a/front/src/modules/ui/object/field/types/guards/isFieldTextValue.ts b/front/src/modules/object-record/field/types/guards/isFieldTextValue.ts
similarity index 100%
rename from front/src/modules/ui/object/field/types/guards/isFieldTextValue.ts
rename to front/src/modules/object-record/field/types/guards/isFieldTextValue.ts
diff --git a/front/src/modules/ui/object/field/types/guards/isFieldUuid.ts b/front/src/modules/object-record/field/types/guards/isFieldUuid.ts
similarity index 100%
rename from front/src/modules/ui/object/field/types/guards/isFieldUuid.ts
rename to front/src/modules/object-record/field/types/guards/isFieldUuid.ts
diff --git a/front/src/modules/ui/object/field/types/resolvers/DoubleTextTypeResolver.ts b/front/src/modules/object-record/field/types/resolvers/DoubleTextTypeResolver.ts
similarity index 100%
rename from front/src/modules/ui/object/field/types/resolvers/DoubleTextTypeResolver.ts
rename to front/src/modules/object-record/field/types/resolvers/DoubleTextTypeResolver.ts
diff --git a/front/src/modules/object-record/hooks/useFieldContext.tsx b/front/src/modules/object-record/hooks/useFieldContext.tsx
index 986cae093..12d6e596f 100644
--- a/front/src/modules/object-record/hooks/useFieldContext.tsx
+++ b/front/src/modules/object-record/hooks/useFieldContext.tsx
@@ -2,9 +2,9 @@ import { ReactNode } from 'react';
import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
import { formatFieldMetadataItemAsColumnDefinition } from '@/object-metadata/utils/formatFieldMetadataItemAsColumnDefinition';
+import { FieldContext } from '@/object-record/field/contexts/FieldContext';
import { useUpdateOneRecord } from '@/object-record/hooks/useUpdateOneRecord';
-import { FieldContext } from '@/ui/object/field/contexts/FieldContext';
-import { InlineCellHotkeyScope } from '@/ui/object/record-inline-cell/types/InlineCellHotkeyScope';
+import { InlineCellHotkeyScope } from '@/object-record/record-inline-cell/types/InlineCellHotkeyScope';
export const useFieldContext = ({
objectNameSingular,
diff --git a/front/src/modules/object-record/hooks/useObjectRecordBoard.1.ts b/front/src/modules/object-record/hooks/useObjectRecordBoard.1.ts
index 07a4558f2..e32d12925 100644
--- a/front/src/modules/object-record/hooks/useObjectRecordBoard.1.ts
+++ b/front/src/modules/object-record/hooks/useObjectRecordBoard.1.ts
@@ -3,12 +3,12 @@ import { useRecoilState, useRecoilValue, useSetRecoilState } from 'recoil';
import { Company } from '@/companies/types/Company';
import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
+import { turnFiltersIntoWhereClause } from '@/object-record/object-filter-dropdown/utils/turnFiltersIntoWhereClause';
+import { turnSortsIntoOrderBy } from '@/object-record/object-sort-dropdown/utils/turnSortsIntoOrderBy';
+import { useRecordBoardScopedStates } from '@/object-record/record-board/hooks/internal/useRecordBoardScopedStates';
import { PaginatedRecordTypeResults } from '@/object-record/types/PaginatedRecordTypeResults';
import { Opportunity } from '@/pipeline/types/Opportunity';
import { PipelineStep } from '@/pipeline/types/PipelineStep';
-import { turnFiltersIntoWhereClause } from '@/ui/object/object-filter-dropdown/utils/turnFiltersIntoWhereClause';
-import { turnSortsIntoOrderBy } from '@/ui/object/object-sort-dropdown/utils/turnSortsIntoOrderBy';
-import { useRecordBoardScopedStates } from '@/ui/object/record-board/hooks/internal/useRecordBoardScopedStates';
import { useFindManyRecords } from './useFindManyRecords';
diff --git a/front/src/modules/object-record/hooks/useObjectRecordBoard.ts b/front/src/modules/object-record/hooks/useObjectRecordBoard.ts
index 7f0b0f3e3..e32d12925 100644
--- a/front/src/modules/object-record/hooks/useObjectRecordBoard.ts
+++ b/front/src/modules/object-record/hooks/useObjectRecordBoard.ts
@@ -3,12 +3,12 @@ import { useRecoilState, useRecoilValue, useSetRecoilState } from 'recoil';
import { Company } from '@/companies/types/Company';
import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
+import { turnFiltersIntoWhereClause } from '@/object-record/object-filter-dropdown/utils/turnFiltersIntoWhereClause';
+import { turnSortsIntoOrderBy } from '@/object-record/object-sort-dropdown/utils/turnSortsIntoOrderBy';
+import { useRecordBoardScopedStates } from '@/object-record/record-board/hooks/internal/useRecordBoardScopedStates';
import { PaginatedRecordTypeResults } from '@/object-record/types/PaginatedRecordTypeResults';
import { Opportunity } from '@/pipeline/types/Opportunity';
import { PipelineStep } from '@/pipeline/types/PipelineStep';
-import { turnFiltersIntoWhereClause } from '@/ui/object/object-filter-dropdown/utils/turnFiltersIntoWhereClause';
-import { turnSortsIntoOrderBy } from '@/ui/object/object-sort-dropdown/utils/turnSortsIntoOrderBy';
-import { useRecordBoardScopedStates } from '@/ui/object/record-board/hooks/internal/useRecordBoardScopedStates';
import { useFindManyRecords } from './useFindManyRecords';
@@ -37,9 +37,7 @@ export const useObjectRecordBoard = () => {
const setSavedCompanies = useSetRecoilState(savedCompaniesState);
- const [savedOpportunities, setSavedOpportunities] = useRecoilState(
- savedOpportunitiesState,
- );
+ const [savedOpportunities] = useRecoilState(savedOpportunitiesState);
const [savedPipelineSteps, setSavedPipelineSteps] = useRecoilState(
savedPipelineStepsState,
diff --git a/front/src/modules/object-record/hooks/useObjectRecordTable.ts b/front/src/modules/object-record/hooks/useObjectRecordTable.ts
index c322df5ec..32eb43d7c 100644
--- a/front/src/modules/object-record/hooks/useObjectRecordTable.ts
+++ b/front/src/modules/object-record/hooks/useObjectRecordTable.ts
@@ -2,10 +2,10 @@ import { useRecoilValue, useSetRecoilState } from 'recoil';
import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
import { useObjectNameSingularFromPlural } from '@/object-metadata/hooks/useObjectNameSingularFromPlural';
-import { turnFiltersIntoWhereClause } from '@/ui/object/object-filter-dropdown/utils/turnFiltersIntoWhereClause';
-import { turnSortsIntoOrderBy } from '@/ui/object/object-sort-dropdown/utils/turnSortsIntoOrderBy';
-import { useRecordTableScopedStates } from '@/ui/object/record-table/hooks/internal/useRecordTableScopedStates';
-import { useRecordTable } from '@/ui/object/record-table/hooks/useRecordTable';
+import { turnFiltersIntoWhereClause } from '@/object-record/object-filter-dropdown/utils/turnFiltersIntoWhereClause';
+import { turnSortsIntoOrderBy } from '@/object-record/object-sort-dropdown/utils/turnSortsIntoOrderBy';
+import { useRecordTableScopedStates } from '@/object-record/record-table/hooks/internal/useRecordTableScopedStates';
+import { useRecordTable } from '@/object-record/record-table/hooks/useRecordTable';
import { useFindManyRecords } from './useFindManyRecords';
diff --git a/front/src/modules/object-record/hooks/useRecordTableContextMenuEntries.tsx b/front/src/modules/object-record/hooks/useRecordTableContextMenuEntries.tsx
index 935b2ec06..e82a3bc0a 100644
--- a/front/src/modules/object-record/hooks/useRecordTableContextMenuEntries.tsx
+++ b/front/src/modules/object-record/hooks/useRecordTableContextMenuEntries.tsx
@@ -5,13 +5,13 @@ import { useRecoilCallback, useRecoilValue, useSetRecoilState } from 'recoil';
import { useFavorites } from '@/favorites/hooks/useFavorites';
import { useObjectNameSingularFromPlural } from '@/object-metadata/hooks/useObjectNameSingularFromPlural';
import { useDeleteOneRecord } from '@/object-record/hooks/useDeleteOneRecord';
+import { useRecordTable } from '@/object-record/record-table/hooks/useRecordTable';
+import { RecordTableScopeInternalContext } from '@/object-record/record-table/scopes/scope-internal-context/RecordTableScopeInternalContext';
+import { selectedRowIdsSelector } from '@/object-record/record-table/states/selectors/selectedRowIdsSelector';
import { IconHeart, IconHeartOff, IconTrash } from '@/ui/display/icon';
import { actionBarEntriesState } from '@/ui/navigation/action-bar/states/actionBarEntriesState';
import { contextMenuEntriesState } from '@/ui/navigation/context-menu/states/contextMenuEntriesState';
import { ContextMenuEntry } from '@/ui/navigation/context-menu/types/ContextMenuEntry';
-import { useRecordTable } from '@/ui/object/record-table/hooks/useRecordTable';
-import { RecordTableScopeInternalContext } from '@/ui/object/record-table/scopes/scope-internal-context/RecordTableScopeInternalContext';
-import { selectedRowIdsSelector } from '@/ui/object/record-table/states/selectors/selectedRowIdsSelector';
import { useAvailableScopeIdOrThrow } from '@/ui/utilities/recoil-scope/scopes-internal/hooks/useAvailableScopeId';
type useRecordTableContextMenuEntriesProps = {
diff --git a/front/src/modules/ui/object/object-filter-dropdown/components/AddObjectFilterFromDetailsButton.tsx b/front/src/modules/object-record/object-filter-dropdown/components/AddObjectFilterFromDetailsButton.tsx
similarity index 89%
rename from front/src/modules/ui/object/object-filter-dropdown/components/AddObjectFilterFromDetailsButton.tsx
rename to front/src/modules/object-record/object-filter-dropdown/components/AddObjectFilterFromDetailsButton.tsx
index d2c8f0976..64570f47c 100644
--- a/front/src/modules/ui/object/object-filter-dropdown/components/AddObjectFilterFromDetailsButton.tsx
+++ b/front/src/modules/object-record/object-filter-dropdown/components/AddObjectFilterFromDetailsButton.tsx
@@ -1,7 +1,7 @@
+import { useFilterDropdown } from '@/object-record/object-filter-dropdown/hooks/useFilterDropdown';
import { IconPlus } from '@/ui/display/icon';
import { LightButton } from '@/ui/input/button/components/LightButton';
import { useDropdown } from '@/ui/layout/dropdown/hooks/useDropdown';
-import { useFilterDropdown } from '@/ui/object/object-filter-dropdown/hooks/useFilterDropdown';
import { ObjectFilterDropdownId } from '../constants/ObjectFilterDropdownId';
diff --git a/front/src/modules/ui/object/object-filter-dropdown/components/GenericEntityFilterChip.tsx b/front/src/modules/object-record/object-filter-dropdown/components/GenericEntityFilterChip.tsx
similarity index 100%
rename from front/src/modules/ui/object/object-filter-dropdown/components/GenericEntityFilterChip.tsx
rename to front/src/modules/object-record/object-filter-dropdown/components/GenericEntityFilterChip.tsx
diff --git a/front/src/modules/ui/object/object-filter-dropdown/components/MultipleFiltersButton.tsx b/front/src/modules/object-record/object-filter-dropdown/components/MultipleFiltersButton.tsx
similarity index 87%
rename from front/src/modules/ui/object/object-filter-dropdown/components/MultipleFiltersButton.tsx
rename to front/src/modules/object-record/object-filter-dropdown/components/MultipleFiltersButton.tsx
index f373df332..84b8494b5 100644
--- a/front/src/modules/ui/object/object-filter-dropdown/components/MultipleFiltersButton.tsx
+++ b/front/src/modules/object-record/object-filter-dropdown/components/MultipleFiltersButton.tsx
@@ -1,6 +1,6 @@
+import { useFilterDropdown } from '@/object-record/object-filter-dropdown/hooks/useFilterDropdown';
import { StyledHeaderDropdownButton } from '@/ui/layout/dropdown/components/StyledHeaderDropdownButton';
import { useDropdown } from '@/ui/layout/dropdown/hooks/useDropdown';
-import { useFilterDropdown } from '@/ui/object/object-filter-dropdown/hooks/useFilterDropdown';
import { ObjectFilterDropdownId } from '../constants/ObjectFilterDropdownId';
diff --git a/front/src/modules/ui/object/object-filter-dropdown/components/MultipleFiltersDropdownButton.tsx b/front/src/modules/object-record/object-filter-dropdown/components/MultipleFiltersDropdownButton.tsx
similarity index 91%
rename from front/src/modules/ui/object/object-filter-dropdown/components/MultipleFiltersDropdownButton.tsx
rename to front/src/modules/object-record/object-filter-dropdown/components/MultipleFiltersDropdownButton.tsx
index 72fef21f3..36ea379dd 100644
--- a/front/src/modules/ui/object/object-filter-dropdown/components/MultipleFiltersDropdownButton.tsx
+++ b/front/src/modules/object-record/object-filter-dropdown/components/MultipleFiltersDropdownButton.tsx
@@ -1,6 +1,6 @@
+import { useFilterDropdown } from '@/object-record/object-filter-dropdown/hooks/useFilterDropdown';
import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
import { DropdownScope } from '@/ui/layout/dropdown/scopes/DropdownScope';
-import { useFilterDropdown } from '@/ui/object/object-filter-dropdown/hooks/useFilterDropdown';
import { HotkeyScope } from '@/ui/utilities/hotkey/types/HotkeyScope';
import { ObjectFilterDropdownId } from '../constants/ObjectFilterDropdownId';
diff --git a/front/src/modules/ui/object/object-filter-dropdown/components/MultipleFiltersDropdownContent.tsx b/front/src/modules/object-record/object-filter-dropdown/components/MultipleFiltersDropdownContent.tsx
similarity index 90%
rename from front/src/modules/ui/object/object-filter-dropdown/components/MultipleFiltersDropdownContent.tsx
rename to front/src/modules/object-record/object-filter-dropdown/components/MultipleFiltersDropdownContent.tsx
index ddd9bd14e..2f68d19c5 100644
--- a/front/src/modules/ui/object/object-filter-dropdown/components/MultipleFiltersDropdownContent.tsx
+++ b/front/src/modules/object-record/object-filter-dropdown/components/MultipleFiltersDropdownContent.tsx
@@ -1,6 +1,6 @@
+import { ObjectFilterDropdownRecordSearchInput } from '@/object-record/object-filter-dropdown/components/ObjectFilterDropdownEntitySearchInput';
+import { useFilterDropdown } from '@/object-record/object-filter-dropdown/hooks/useFilterDropdown';
import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';
-import { ObjectFilterDropdownRecordSearchInput } from '@/ui/object/object-filter-dropdown/components/ObjectFilterDropdownEntitySearchInput';
-import { useFilterDropdown } from '@/ui/object/object-filter-dropdown/hooks/useFilterDropdown';
import { MultipleFiltersDropdownFilterOnFilterChangedEffect } from './MultipleFiltersDropdownFilterOnFilterChangedEffect';
import { ObjectFilterDropdownDateSearchInput } from './ObjectFilterDropdownDateSearchInput';
diff --git a/front/src/modules/ui/object/object-filter-dropdown/components/MultipleFiltersDropdownFilterOnFilterChangedEffect.tsx b/front/src/modules/object-record/object-filter-dropdown/components/MultipleFiltersDropdownFilterOnFilterChangedEffect.tsx
similarity index 100%
rename from front/src/modules/ui/object/object-filter-dropdown/components/MultipleFiltersDropdownFilterOnFilterChangedEffect.tsx
rename to front/src/modules/object-record/object-filter-dropdown/components/MultipleFiltersDropdownFilterOnFilterChangedEffect.tsx
diff --git a/front/src/modules/ui/object/object-filter-dropdown/components/ObjectFilterDropdownButton.tsx b/front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownButton.tsx
similarity index 83%
rename from front/src/modules/ui/object/object-filter-dropdown/components/ObjectFilterDropdownButton.tsx
rename to front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownButton.tsx
index 05ecfeb42..0a4a16e62 100644
--- a/front/src/modules/ui/object/object-filter-dropdown/components/ObjectFilterDropdownButton.tsx
+++ b/front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownButton.tsx
@@ -1,5 +1,5 @@
-import { useFilterDropdown } from '@/ui/object/object-filter-dropdown/hooks/useFilterDropdown';
-import { ObjectFilterDropdownScope } from '@/ui/object/object-filter-dropdown/scopes/ObjectFilterDropdownScope';
+import { useFilterDropdown } from '@/object-record/object-filter-dropdown/hooks/useFilterDropdown';
+import { ObjectFilterDropdownScope } from '@/object-record/object-filter-dropdown/scopes/ObjectFilterDropdownScope';
import { HotkeyScope } from '@/ui/utilities/hotkey/types/HotkeyScope';
import { MultipleFiltersDropdownButton } from './MultipleFiltersDropdownButton';
diff --git a/front/src/modules/ui/object/object-filter-dropdown/components/ObjectFilterDropdownDateSearchInput.tsx b/front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownDateSearchInput.tsx
similarity index 90%
rename from front/src/modules/ui/object/object-filter-dropdown/components/ObjectFilterDropdownDateSearchInput.tsx
rename to front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownDateSearchInput.tsx
index 6031ed374..e9612e630 100644
--- a/front/src/modules/ui/object/object-filter-dropdown/components/ObjectFilterDropdownDateSearchInput.tsx
+++ b/front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownDateSearchInput.tsx
@@ -1,5 +1,5 @@
+import { useFilterDropdown } from '@/object-record/object-filter-dropdown/hooks/useFilterDropdown';
import { InternalDatePicker } from '@/ui/input/components/internal/date/components/InternalDatePicker';
-import { useFilterDropdown } from '@/ui/object/object-filter-dropdown/hooks/useFilterDropdown';
export const ObjectFilterDropdownDateSearchInput = () => {
const {
diff --git a/front/src/modules/ui/object/object-filter-dropdown/components/ObjectFilterDropdownEntitySearchInput.tsx b/front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownEntitySearchInput.tsx
similarity index 88%
rename from front/src/modules/ui/object/object-filter-dropdown/components/ObjectFilterDropdownEntitySearchInput.tsx
rename to front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownEntitySearchInput.tsx
index 82d5f1bf0..19db840d2 100644
--- a/front/src/modules/ui/object/object-filter-dropdown/components/ObjectFilterDropdownEntitySearchInput.tsx
+++ b/front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownEntitySearchInput.tsx
@@ -1,7 +1,7 @@
import { ChangeEvent } from 'react';
+import { useFilterDropdown } from '@/object-record/object-filter-dropdown/hooks/useFilterDropdown';
import { DropdownMenuSearchInput } from '@/ui/layout/dropdown/components/DropdownMenuSearchInput';
-import { useFilterDropdown } from '@/ui/object/object-filter-dropdown/hooks/useFilterDropdown';
export const ObjectFilterDropdownRecordSearchInput = () => {
const {
diff --git a/front/src/modules/ui/object/object-filter-dropdown/components/ObjectFilterDropdownEntitySearchSelect.tsx b/front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownEntitySearchSelect.tsx
similarity index 89%
rename from front/src/modules/ui/object/object-filter-dropdown/components/ObjectFilterDropdownEntitySearchSelect.tsx
rename to front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownEntitySearchSelect.tsx
index cf2c80a74..6b69caa98 100644
--- a/front/src/modules/ui/object/object-filter-dropdown/components/ObjectFilterDropdownEntitySearchSelect.tsx
+++ b/front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownEntitySearchSelect.tsx
@@ -1,10 +1,10 @@
import { useEffect, useState } from 'react';
-import { EntitiesForMultipleEntitySelect } from '@/ui/input/relation-picker/components/MultipleEntitySelect';
-import { SingleEntitySelectBase } from '@/ui/input/relation-picker/components/SingleEntitySelectBase';
-import { EntityForSelect } from '@/ui/input/relation-picker/types/EntityForSelect';
+import { useFilterDropdown } from '@/object-record/object-filter-dropdown/hooks/useFilterDropdown';
+import { EntitiesForMultipleEntitySelect } from '@/object-record/relation-picker/components/MultipleEntitySelect';
+import { SingleEntitySelectBase } from '@/object-record/relation-picker/components/SingleEntitySelectBase';
+import { EntityForSelect } from '@/object-record/relation-picker/types/EntityForSelect';
import { useDropdown } from '@/ui/layout/dropdown/hooks/useDropdown';
-import { useFilterDropdown } from '@/ui/object/object-filter-dropdown/hooks/useFilterDropdown';
import { ViewFilterOperand } from '@/views/types/ViewFilterOperand';
export const ObjectFilterDropdownEntitySearchSelect = ({
diff --git a/front/src/modules/ui/object/object-filter-dropdown/components/ObjectFilterDropdownFilterSelect.tsx b/front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownFilterSelect.tsx
similarity index 89%
rename from front/src/modules/ui/object/object-filter-dropdown/components/ObjectFilterDropdownFilterSelect.tsx
rename to front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownFilterSelect.tsx
index 1e315962d..0b78a42ce 100644
--- a/front/src/modules/ui/object/object-filter-dropdown/components/ObjectFilterDropdownFilterSelect.tsx
+++ b/front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownFilterSelect.tsx
@@ -1,8 +1,8 @@
+import { useFilterDropdown } from '@/object-record/object-filter-dropdown/hooks/useFilterDropdown';
+import { RelationPickerHotkeyScope } from '@/object-record/relation-picker/types/RelationPickerHotkeyScope';
import { useLazyLoadIcons } from '@/ui/input/hooks/useLazyLoadIcons';
-import { RelationPickerHotkeyScope } from '@/ui/input/relation-picker/types/RelationPickerHotkeyScope';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { MenuItem } from '@/ui/navigation/menu-item/components/MenuItem';
-import { useFilterDropdown } from '@/ui/object/object-filter-dropdown/hooks/useFilterDropdown';
import { useSetHotkeyScope } from '@/ui/utilities/hotkey/hooks/useSetHotkeyScope';
import { getOperandsForFilterType } from '../utils/getOperandsForFilterType';
diff --git a/front/src/modules/ui/object/object-filter-dropdown/components/ObjectFilterDropdownNumberSearchInput.tsx b/front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownNumberSearchInput.tsx
similarity index 90%
rename from front/src/modules/ui/object/object-filter-dropdown/components/ObjectFilterDropdownNumberSearchInput.tsx
rename to front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownNumberSearchInput.tsx
index bcd3a44fb..e99411065 100644
--- a/front/src/modules/ui/object/object-filter-dropdown/components/ObjectFilterDropdownNumberSearchInput.tsx
+++ b/front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownNumberSearchInput.tsx
@@ -1,7 +1,7 @@
import { ChangeEvent } from 'react';
+import { useFilterDropdown } from '@/object-record/object-filter-dropdown/hooks/useFilterDropdown';
import { DropdownMenuSearchInput } from '@/ui/layout/dropdown/components/DropdownMenuSearchInput';
-import { useFilterDropdown } from '@/ui/object/object-filter-dropdown/hooks/useFilterDropdown';
export const ObjectFilterDropdownNumberSearchInput = () => {
const {
diff --git a/front/src/modules/ui/object/object-filter-dropdown/components/ObjectFilterDropdownOperandButton.tsx b/front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownOperandButton.tsx
similarity index 88%
rename from front/src/modules/ui/object/object-filter-dropdown/components/ObjectFilterDropdownOperandButton.tsx
rename to front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownOperandButton.tsx
index 85bbddaad..7c5e0b251 100644
--- a/front/src/modules/ui/object/object-filter-dropdown/components/ObjectFilterDropdownOperandButton.tsx
+++ b/front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownOperandButton.tsx
@@ -1,6 +1,6 @@
+import { useFilterDropdown } from '@/object-record/object-filter-dropdown/hooks/useFilterDropdown';
import { IconChevronDown } from '@/ui/display/icon';
import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader';
-import { useFilterDropdown } from '@/ui/object/object-filter-dropdown/hooks/useFilterDropdown';
import { getOperandLabel } from '../utils/getOperandLabel';
diff --git a/front/src/modules/ui/object/object-filter-dropdown/components/ObjectFilterDropdownOperandSelect.tsx b/front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownOperandSelect.tsx
similarity index 94%
rename from front/src/modules/ui/object/object-filter-dropdown/components/ObjectFilterDropdownOperandSelect.tsx
rename to front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownOperandSelect.tsx
index 248a8a67d..c9d604d1d 100644
--- a/front/src/modules/ui/object/object-filter-dropdown/components/ObjectFilterDropdownOperandSelect.tsx
+++ b/front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownOperandSelect.tsx
@@ -1,6 +1,6 @@
+import { useFilterDropdown } from '@/object-record/object-filter-dropdown/hooks/useFilterDropdown';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { MenuItem } from '@/ui/navigation/menu-item/components/MenuItem';
-import { useFilterDropdown } from '@/ui/object/object-filter-dropdown/hooks/useFilterDropdown';
import { ViewFilterOperand } from '@/views/types/ViewFilterOperand';
import { getOperandLabel } from '../utils/getOperandLabel';
diff --git a/front/src/modules/ui/object/object-filter-dropdown/components/ObjectFilterDropdownRecordSelect.tsx b/front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownRecordSelect.tsx
similarity index 96%
rename from front/src/modules/ui/object/object-filter-dropdown/components/ObjectFilterDropdownRecordSelect.tsx
rename to front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownRecordSelect.tsx
index 5c529c8d3..26a77c097 100644
--- a/front/src/modules/ui/object/object-filter-dropdown/components/ObjectFilterDropdownRecordSelect.tsx
+++ b/front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownRecordSelect.tsx
@@ -1,7 +1,7 @@
+import { useFilterDropdown } from '@/object-record/object-filter-dropdown/hooks/useFilterDropdown';
import { MultipleRecordSelectDropdown } from '@/object-record/select/components/MultipleRecordSelectDropdown';
import { useRecordsForSelect } from '@/object-record/select/hooks/useRecordsForSelect';
import { SelectableRecord } from '@/object-record/select/types/SelectableRecord';
-import { useFilterDropdown } from '@/ui/object/object-filter-dropdown/hooks/useFilterDropdown';
export const EMPTY_FILTER_VALUE = '';
export const MAX_RECORDS_TO_DISPLAY = 3;
diff --git a/front/src/modules/ui/object/object-filter-dropdown/components/ObjectFilterDropdownTextSearchInput.tsx b/front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownTextSearchInput.tsx
similarity index 92%
rename from front/src/modules/ui/object/object-filter-dropdown/components/ObjectFilterDropdownTextSearchInput.tsx
rename to front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownTextSearchInput.tsx
index c811d35f2..999fd6403 100644
--- a/front/src/modules/ui/object/object-filter-dropdown/components/ObjectFilterDropdownTextSearchInput.tsx
+++ b/front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownTextSearchInput.tsx
@@ -1,7 +1,7 @@
import { ChangeEvent } from 'react';
+import { useFilterDropdown } from '@/object-record/object-filter-dropdown/hooks/useFilterDropdown';
import { DropdownMenuSearchInput } from '@/ui/layout/dropdown/components/DropdownMenuSearchInput';
-import { useFilterDropdown } from '@/ui/object/object-filter-dropdown/hooks/useFilterDropdown';
export const ObjectFilterDropdownTextSearchInput = () => {
const {
diff --git a/front/src/modules/ui/object/object-filter-dropdown/components/SingleEntityObjectFilterDropdownButton.tsx b/front/src/modules/object-record/object-filter-dropdown/components/SingleEntityObjectFilterDropdownButton.tsx
similarity index 96%
rename from front/src/modules/ui/object/object-filter-dropdown/components/SingleEntityObjectFilterDropdownButton.tsx
rename to front/src/modules/object-record/object-filter-dropdown/components/SingleEntityObjectFilterDropdownButton.tsx
index 15ccfff0a..bbf302975 100644
--- a/front/src/modules/ui/object/object-filter-dropdown/components/SingleEntityObjectFilterDropdownButton.tsx
+++ b/front/src/modules/object-record/object-filter-dropdown/components/SingleEntityObjectFilterDropdownButton.tsx
@@ -1,11 +1,11 @@
import React from 'react';
import { useTheme } from '@emotion/react';
+import { useFilterDropdown } from '@/object-record/object-filter-dropdown/hooks/useFilterDropdown';
import { IconChevronDown } from '@/ui/display/icon/index';
import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
import { StyledHeaderDropdownButton } from '@/ui/layout/dropdown/components/StyledHeaderDropdownButton';
import { DropdownScope } from '@/ui/layout/dropdown/scopes/DropdownScope';
-import { useFilterDropdown } from '@/ui/object/object-filter-dropdown/hooks/useFilterDropdown';
import { HotkeyScope } from '@/ui/utilities/hotkey/types/HotkeyScope';
import { ViewFilterOperand } from '@/views/types/ViewFilterOperand';
diff --git a/front/src/modules/ui/object/object-filter-dropdown/constants/ObjectFilterDropdownId.ts b/front/src/modules/object-record/object-filter-dropdown/constants/ObjectFilterDropdownId.ts
similarity index 100%
rename from front/src/modules/ui/object/object-filter-dropdown/constants/ObjectFilterDropdownId.ts
rename to front/src/modules/object-record/object-filter-dropdown/constants/ObjectFilterDropdownId.ts
diff --git a/front/src/modules/ui/object/object-filter-dropdown/hooks/useFilterDropdown.ts b/front/src/modules/object-record/object-filter-dropdown/hooks/useFilterDropdown.ts
similarity index 96%
rename from front/src/modules/ui/object/object-filter-dropdown/hooks/useFilterDropdown.ts
rename to front/src/modules/object-record/object-filter-dropdown/hooks/useFilterDropdown.ts
index eca5f810f..4dcda8309 100644
--- a/front/src/modules/ui/object/object-filter-dropdown/hooks/useFilterDropdown.ts
+++ b/front/src/modules/object-record/object-filter-dropdown/hooks/useFilterDropdown.ts
@@ -1,6 +1,6 @@
import { useCallback } from 'react';
-import { useFilterDropdownStates } from '@/ui/object/object-filter-dropdown/hooks/useFilterDropdownStates';
+import { useFilterDropdownStates } from '@/object-record/object-filter-dropdown/hooks/useFilterDropdownStates';
import { useAvailableScopeIdOrThrow } from '@/ui/utilities/recoil-scope/scopes-internal/hooks/useAvailableScopeId';
import { ObjectFilterDropdownScopeInternalContext } from '../scopes/scope-internal-context/ObjectFilterDropdownScopeInternalContext';
diff --git a/front/src/modules/ui/object/object-filter-dropdown/hooks/useFilterDropdownStates.ts b/front/src/modules/object-record/object-filter-dropdown/hooks/useFilterDropdownStates.ts
similarity index 94%
rename from front/src/modules/ui/object/object-filter-dropdown/hooks/useFilterDropdownStates.ts
rename to front/src/modules/object-record/object-filter-dropdown/hooks/useFilterDropdownStates.ts
index b9b156890..3e6d25891 100644
--- a/front/src/modules/ui/object/object-filter-dropdown/hooks/useFilterDropdownStates.ts
+++ b/front/src/modules/object-record/object-filter-dropdown/hooks/useFilterDropdownStates.ts
@@ -1,5 +1,5 @@
-import { objectFilterDropdownSelectedRecordIdsScopedState } from '@/ui/object/object-filter-dropdown/states/objectFilterDropdownSelectedRecordIdsScopedState';
-import { onFilterSelectScopedState } from '@/ui/object/object-filter-dropdown/states/onFilterSelectScopedState';
+import { objectFilterDropdownSelectedRecordIdsScopedState } from '@/object-record/object-filter-dropdown/states/objectFilterDropdownSelectedRecordIdsScopedState';
+import { onFilterSelectScopedState } from '@/object-record/object-filter-dropdown/states/onFilterSelectScopedState';
import { useRecoilScopedStateV2 } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedStateV2';
import { availableFilterDefinitionsScopedState } from '../states/availableFilterDefinitionsScopedState';
diff --git a/front/src/modules/ui/object/object-filter-dropdown/scopes/ObjectFilterDropdownScope.tsx b/front/src/modules/object-record/object-filter-dropdown/scopes/ObjectFilterDropdownScope.tsx
similarity index 100%
rename from front/src/modules/ui/object/object-filter-dropdown/scopes/ObjectFilterDropdownScope.tsx
rename to front/src/modules/object-record/object-filter-dropdown/scopes/ObjectFilterDropdownScope.tsx
diff --git a/front/src/modules/ui/object/object-filter-dropdown/scopes/scope-internal-context/ObjectFilterDropdownScopeInternalContext.ts b/front/src/modules/object-record/object-filter-dropdown/scopes/scope-internal-context/ObjectFilterDropdownScopeInternalContext.ts
similarity index 100%
rename from front/src/modules/ui/object/object-filter-dropdown/scopes/scope-internal-context/ObjectFilterDropdownScopeInternalContext.ts
rename to front/src/modules/object-record/object-filter-dropdown/scopes/scope-internal-context/ObjectFilterDropdownScopeInternalContext.ts
diff --git a/front/src/modules/ui/object/object-filter-dropdown/states/availableFilterDefinitionsScopedState.ts b/front/src/modules/object-record/object-filter-dropdown/states/availableFilterDefinitionsScopedState.ts
similarity index 72%
rename from front/src/modules/ui/object/object-filter-dropdown/states/availableFilterDefinitionsScopedState.ts
rename to front/src/modules/object-record/object-filter-dropdown/states/availableFilterDefinitionsScopedState.ts
index 9463e08d0..17d0cd616 100644
--- a/front/src/modules/ui/object/object-filter-dropdown/states/availableFilterDefinitionsScopedState.ts
+++ b/front/src/modules/object-record/object-filter-dropdown/states/availableFilterDefinitionsScopedState.ts
@@ -1,4 +1,4 @@
-import { FilterDefinition } from '@/ui/object/object-filter-dropdown/types/FilterDefinition';
+import { FilterDefinition } from '@/object-record/object-filter-dropdown/types/FilterDefinition';
import { createScopedState } from '@/ui/utilities/recoil-scope/utils/createScopedState';
export const availableFilterDefinitionsScopedState = createScopedState<
diff --git a/front/src/modules/ui/object/object-filter-dropdown/states/filterDefinitionUsedInDropdownScopedState.ts b/front/src/modules/object-record/object-filter-dropdown/states/filterDefinitionUsedInDropdownScopedState.ts
similarity index 100%
rename from front/src/modules/ui/object/object-filter-dropdown/states/filterDefinitionUsedInDropdownScopedState.ts
rename to front/src/modules/object-record/object-filter-dropdown/states/filterDefinitionUsedInDropdownScopedState.ts
diff --git a/front/src/modules/ui/object/object-filter-dropdown/states/isObjectFilterDropdownOperandSelectUnfoldedScopedState.ts b/front/src/modules/object-record/object-filter-dropdown/states/isObjectFilterDropdownOperandSelectUnfoldedScopedState.ts
similarity index 100%
rename from front/src/modules/ui/object/object-filter-dropdown/states/isObjectFilterDropdownOperandSelectUnfoldedScopedState.ts
rename to front/src/modules/object-record/object-filter-dropdown/states/isObjectFilterDropdownOperandSelectUnfoldedScopedState.ts
diff --git a/front/src/modules/ui/object/object-filter-dropdown/states/isObjectFilterDropdownUnfoldedScopedState.ts b/front/src/modules/object-record/object-filter-dropdown/states/isObjectFilterDropdownUnfoldedScopedState.ts
similarity index 100%
rename from front/src/modules/ui/object/object-filter-dropdown/states/isObjectFilterDropdownUnfoldedScopedState.ts
rename to front/src/modules/object-record/object-filter-dropdown/states/isObjectFilterDropdownUnfoldedScopedState.ts
diff --git a/front/src/modules/ui/object/object-filter-dropdown/states/objectFilterDropdownSearchInputScopedState.ts b/front/src/modules/object-record/object-filter-dropdown/states/objectFilterDropdownSearchInputScopedState.ts
similarity index 100%
rename from front/src/modules/ui/object/object-filter-dropdown/states/objectFilterDropdownSearchInputScopedState.ts
rename to front/src/modules/object-record/object-filter-dropdown/states/objectFilterDropdownSearchInputScopedState.ts
diff --git a/front/src/modules/ui/object/object-filter-dropdown/states/objectFilterDropdownSelectedEntityIdScopedState.ts b/front/src/modules/object-record/object-filter-dropdown/states/objectFilterDropdownSelectedEntityIdScopedState.ts
similarity index 100%
rename from front/src/modules/ui/object/object-filter-dropdown/states/objectFilterDropdownSelectedEntityIdScopedState.ts
rename to front/src/modules/object-record/object-filter-dropdown/states/objectFilterDropdownSelectedEntityIdScopedState.ts
diff --git a/front/src/modules/ui/object/object-filter-dropdown/states/objectFilterDropdownSelectedRecordIdsScopedState.ts b/front/src/modules/object-record/object-filter-dropdown/states/objectFilterDropdownSelectedRecordIdsScopedState.ts
similarity index 100%
rename from front/src/modules/ui/object/object-filter-dropdown/states/objectFilterDropdownSelectedRecordIdsScopedState.ts
rename to front/src/modules/object-record/object-filter-dropdown/states/objectFilterDropdownSelectedRecordIdsScopedState.ts
diff --git a/front/src/modules/ui/object/object-filter-dropdown/states/onFilterSelectScopedState.ts b/front/src/modules/object-record/object-filter-dropdown/states/onFilterSelectScopedState.ts
similarity index 100%
rename from front/src/modules/ui/object/object-filter-dropdown/states/onFilterSelectScopedState.ts
rename to front/src/modules/object-record/object-filter-dropdown/states/onFilterSelectScopedState.ts
diff --git a/front/src/modules/ui/object/object-filter-dropdown/states/selectedFilterScopedState.ts b/front/src/modules/object-record/object-filter-dropdown/states/selectedFilterScopedState.ts
similarity index 100%
rename from front/src/modules/ui/object/object-filter-dropdown/states/selectedFilterScopedState.ts
rename to front/src/modules/object-record/object-filter-dropdown/states/selectedFilterScopedState.ts
diff --git a/front/src/modules/ui/object/object-filter-dropdown/states/selectedOperandInDropdownScopedState.ts b/front/src/modules/object-record/object-filter-dropdown/states/selectedOperandInDropdownScopedState.ts
similarity index 100%
rename from front/src/modules/ui/object/object-filter-dropdown/states/selectedOperandInDropdownScopedState.ts
rename to front/src/modules/object-record/object-filter-dropdown/states/selectedOperandInDropdownScopedState.ts
diff --git a/front/src/modules/ui/object/object-filter-dropdown/types/Filter.ts b/front/src/modules/object-record/object-filter-dropdown/types/Filter.ts
similarity index 100%
rename from front/src/modules/ui/object/object-filter-dropdown/types/Filter.ts
rename to front/src/modules/object-record/object-filter-dropdown/types/Filter.ts
diff --git a/front/src/modules/ui/object/object-filter-dropdown/types/FilterDefinition.ts b/front/src/modules/object-record/object-filter-dropdown/types/FilterDefinition.ts
similarity index 100%
rename from front/src/modules/ui/object/object-filter-dropdown/types/FilterDefinition.ts
rename to front/src/modules/object-record/object-filter-dropdown/types/FilterDefinition.ts
diff --git a/front/src/modules/ui/object/object-filter-dropdown/types/FilterDefinitionByEntity.ts b/front/src/modules/object-record/object-filter-dropdown/types/FilterDefinitionByEntity.ts
similarity index 100%
rename from front/src/modules/ui/object/object-filter-dropdown/types/FilterDefinitionByEntity.ts
rename to front/src/modules/object-record/object-filter-dropdown/types/FilterDefinitionByEntity.ts
diff --git a/front/src/modules/ui/object/object-filter-dropdown/types/FilterOperand.ts b/front/src/modules/object-record/object-filter-dropdown/types/FilterOperand.ts
similarity index 100%
rename from front/src/modules/ui/object/object-filter-dropdown/types/FilterOperand.ts
rename to front/src/modules/object-record/object-filter-dropdown/types/FilterOperand.ts
diff --git a/front/src/modules/ui/object/object-filter-dropdown/types/FilterType.ts b/front/src/modules/object-record/object-filter-dropdown/types/FilterType.ts
similarity index 100%
rename from front/src/modules/ui/object/object-filter-dropdown/types/FilterType.ts
rename to front/src/modules/object-record/object-filter-dropdown/types/FilterType.ts
diff --git a/front/src/modules/ui/object/object-filter-dropdown/types/FiltersHotkeyScope.ts b/front/src/modules/object-record/object-filter-dropdown/types/FiltersHotkeyScope.ts
similarity index 100%
rename from front/src/modules/ui/object/object-filter-dropdown/types/FiltersHotkeyScope.ts
rename to front/src/modules/object-record/object-filter-dropdown/types/FiltersHotkeyScope.ts
diff --git a/front/src/modules/ui/object/object-filter-dropdown/utils/getOperandLabel.ts b/front/src/modules/object-record/object-filter-dropdown/utils/getOperandLabel.ts
similarity index 100%
rename from front/src/modules/ui/object/object-filter-dropdown/utils/getOperandLabel.ts
rename to front/src/modules/object-record/object-filter-dropdown/utils/getOperandLabel.ts
diff --git a/front/src/modules/ui/object/object-filter-dropdown/utils/getOperandsForFilterType.ts b/front/src/modules/object-record/object-filter-dropdown/utils/getOperandsForFilterType.ts
similarity index 100%
rename from front/src/modules/ui/object/object-filter-dropdown/utils/getOperandsForFilterType.ts
rename to front/src/modules/object-record/object-filter-dropdown/utils/getOperandsForFilterType.ts
diff --git a/front/src/modules/ui/object/object-filter-dropdown/utils/turnFiltersIntoWhereClause.ts b/front/src/modules/object-record/object-filter-dropdown/utils/turnFiltersIntoWhereClause.ts
similarity index 100%
rename from front/src/modules/ui/object/object-filter-dropdown/utils/turnFiltersIntoWhereClause.ts
rename to front/src/modules/object-record/object-filter-dropdown/utils/turnFiltersIntoWhereClause.ts
diff --git a/front/src/modules/ui/object/object-sort-dropdown/components/ObjectSortDropdownButton.tsx b/front/src/modules/object-record/object-sort-dropdown/components/ObjectSortDropdownButton.tsx
similarity index 95%
rename from front/src/modules/ui/object/object-sort-dropdown/components/ObjectSortDropdownButton.tsx
rename to front/src/modules/object-record/object-sort-dropdown/components/ObjectSortDropdownButton.tsx
index 1bc1a2942..a6c9f962b 100644
--- a/front/src/modules/ui/object/object-sort-dropdown/components/ObjectSortDropdownButton.tsx
+++ b/front/src/modules/object-record/object-sort-dropdown/components/ObjectSortDropdownButton.tsx
@@ -1,5 +1,7 @@
import { useCallback, useState } from 'react';
+import { useSortDropdown } from '@/object-record/object-sort-dropdown/hooks/useSortDropdown';
+import { ObjectSortDropdownScope } from '@/object-record/object-sort-dropdown/scopes/ObjectSortDropdownScope';
import { IconChevronDown } from '@/ui/display/icon';
import { LightButton } from '@/ui/input/button/components/LightButton';
import { useLazyLoadIcons } from '@/ui/input/hooks/useLazyLoadIcons';
@@ -10,8 +12,6 @@ import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownM
import { useDropdown } from '@/ui/layout/dropdown/hooks/useDropdown';
import { DropdownScope } from '@/ui/layout/dropdown/scopes/DropdownScope';
import { MenuItem } from '@/ui/navigation/menu-item/components/MenuItem';
-import { useSortDropdown } from '@/ui/object/object-sort-dropdown/hooks/useSortDropdown';
-import { ObjectSortDropdownScope } from '@/ui/object/object-sort-dropdown/scopes/ObjectSortDropdownScope';
import { HotkeyScope } from '@/ui/utilities/hotkey/types/HotkeyScope';
import { ObjectSortDropdownId } from '../constants/ObjectSortDropdownId';
diff --git a/front/src/modules/ui/object/object-sort-dropdown/constants/ObjectSortDropdownId.ts b/front/src/modules/object-record/object-sort-dropdown/constants/ObjectSortDropdownId.ts
similarity index 100%
rename from front/src/modules/ui/object/object-sort-dropdown/constants/ObjectSortDropdownId.ts
rename to front/src/modules/object-record/object-sort-dropdown/constants/ObjectSortDropdownId.ts
diff --git a/front/src/modules/ui/object/object-sort-dropdown/hooks/useSortDropdown.ts b/front/src/modules/object-record/object-sort-dropdown/hooks/useSortDropdown.ts
similarity index 88%
rename from front/src/modules/ui/object/object-sort-dropdown/hooks/useSortDropdown.ts
rename to front/src/modules/object-record/object-sort-dropdown/hooks/useSortDropdown.ts
index 396afa6b1..696dae8cd 100644
--- a/front/src/modules/ui/object/object-sort-dropdown/hooks/useSortDropdown.ts
+++ b/front/src/modules/object-record/object-sort-dropdown/hooks/useSortDropdown.ts
@@ -1,4 +1,4 @@
-import { useSortDropdownStates } from '@/ui/object/object-sort-dropdown/hooks/useSortDropdownStates';
+import { useSortDropdownStates } from '@/object-record/object-sort-dropdown/hooks/useSortDropdownStates';
import { useAvailableScopeIdOrThrow } from '@/ui/utilities/recoil-scope/scopes-internal/hooks/useAvailableScopeId';
import { ObjectSortDropdownScopeInternalContext } from '../scopes/scope-internal-context/ObjectSortDropdownScopeInternalContext';
diff --git a/front/src/modules/ui/object/object-sort-dropdown/hooks/useSortDropdownStates.ts b/front/src/modules/object-record/object-sort-dropdown/hooks/useSortDropdownStates.ts
similarity index 88%
rename from front/src/modules/ui/object/object-sort-dropdown/hooks/useSortDropdownStates.ts
rename to front/src/modules/object-record/object-sort-dropdown/hooks/useSortDropdownStates.ts
index 3e567a849..9453508fe 100644
--- a/front/src/modules/ui/object/object-sort-dropdown/hooks/useSortDropdownStates.ts
+++ b/front/src/modules/object-record/object-sort-dropdown/hooks/useSortDropdownStates.ts
@@ -1,4 +1,4 @@
-import { onSortSelectScopedState } from '@/ui/object/object-sort-dropdown/states/onSortSelectScopedState';
+import { onSortSelectScopedState } from '@/object-record/object-sort-dropdown/states/onSortSelectScopedState';
import { useRecoilScopedStateV2 } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedStateV2';
import { availableSortDefinitionsScopedState } from '../states/availableSortDefinitionsScopedState';
diff --git a/front/src/modules/ui/object/object-sort-dropdown/scopes/ObjectSortDropdownScope.tsx b/front/src/modules/object-record/object-sort-dropdown/scopes/ObjectSortDropdownScope.tsx
similarity index 100%
rename from front/src/modules/ui/object/object-sort-dropdown/scopes/ObjectSortDropdownScope.tsx
rename to front/src/modules/object-record/object-sort-dropdown/scopes/ObjectSortDropdownScope.tsx
diff --git a/front/src/modules/ui/object/object-sort-dropdown/scopes/scope-internal-context/ObjectSortDropdownScopeInternalContext.ts b/front/src/modules/object-record/object-sort-dropdown/scopes/scope-internal-context/ObjectSortDropdownScopeInternalContext.ts
similarity index 100%
rename from front/src/modules/ui/object/object-sort-dropdown/scopes/scope-internal-context/ObjectSortDropdownScopeInternalContext.ts
rename to front/src/modules/object-record/object-sort-dropdown/scopes/scope-internal-context/ObjectSortDropdownScopeInternalContext.ts
diff --git a/front/src/modules/ui/object/object-sort-dropdown/states/availableSortDefinitionsScopedState.ts b/front/src/modules/object-record/object-sort-dropdown/states/availableSortDefinitionsScopedState.ts
similarity index 100%
rename from front/src/modules/ui/object/object-sort-dropdown/states/availableSortDefinitionsScopedState.ts
rename to front/src/modules/object-record/object-sort-dropdown/states/availableSortDefinitionsScopedState.ts
diff --git a/front/src/modules/ui/object/object-sort-dropdown/states/isSortSelectedScopedState.ts b/front/src/modules/object-record/object-sort-dropdown/states/isSortSelectedScopedState.ts
similarity index 100%
rename from front/src/modules/ui/object/object-sort-dropdown/states/isSortSelectedScopedState.ts
rename to front/src/modules/object-record/object-sort-dropdown/states/isSortSelectedScopedState.ts
diff --git a/front/src/modules/ui/object/object-sort-dropdown/states/onSortSelectScopedState.ts b/front/src/modules/object-record/object-sort-dropdown/states/onSortSelectScopedState.ts
similarity index 100%
rename from front/src/modules/ui/object/object-sort-dropdown/states/onSortSelectScopedState.ts
rename to front/src/modules/object-record/object-sort-dropdown/states/onSortSelectScopedState.ts
diff --git a/front/src/modules/ui/object/object-sort-dropdown/types/Sort.ts b/front/src/modules/object-record/object-sort-dropdown/types/Sort.ts
similarity index 100%
rename from front/src/modules/ui/object/object-sort-dropdown/types/Sort.ts
rename to front/src/modules/object-record/object-sort-dropdown/types/Sort.ts
diff --git a/front/src/modules/ui/object/object-sort-dropdown/types/SortDefinition.ts b/front/src/modules/object-record/object-sort-dropdown/types/SortDefinition.ts
similarity index 100%
rename from front/src/modules/ui/object/object-sort-dropdown/types/SortDefinition.ts
rename to front/src/modules/object-record/object-sort-dropdown/types/SortDefinition.ts
diff --git a/front/src/modules/ui/object/object-sort-dropdown/types/SortDirection.ts b/front/src/modules/object-record/object-sort-dropdown/types/SortDirection.ts
similarity index 100%
rename from front/src/modules/ui/object/object-sort-dropdown/types/SortDirection.ts
rename to front/src/modules/object-record/object-sort-dropdown/types/SortDirection.ts
diff --git a/front/src/modules/ui/object/object-sort-dropdown/utils/turnSortsIntoOrderBy.ts b/front/src/modules/object-record/object-sort-dropdown/utils/turnSortsIntoOrderBy.ts
similarity index 100%
rename from front/src/modules/ui/object/object-sort-dropdown/utils/turnSortsIntoOrderBy.ts
rename to front/src/modules/object-record/object-sort-dropdown/utils/turnSortsIntoOrderBy.ts
diff --git a/front/src/modules/ui/object/record-board/action-bar/components/RecordBoardActionBar.tsx b/front/src/modules/object-record/record-board/action-bar/components/RecordBoardActionBar.tsx
similarity index 77%
rename from front/src/modules/ui/object/record-board/action-bar/components/RecordBoardActionBar.tsx
rename to front/src/modules/object-record/record-board/action-bar/components/RecordBoardActionBar.tsx
index d531f8eea..17fafb17d 100644
--- a/front/src/modules/ui/object/record-board/action-bar/components/RecordBoardActionBar.tsx
+++ b/front/src/modules/object-record/record-board/action-bar/components/RecordBoardActionBar.tsx
@@ -1,8 +1,8 @@
import React from 'react';
import { useRecoilValue } from 'recoil';
+import { useRecordBoardScopedStates } from '@/object-record/record-board/hooks/internal/useRecordBoardScopedStates';
import { ActionBar } from '@/ui/navigation/action-bar/components/ActionBar';
-import { useRecordBoardScopedStates } from '@/ui/object/record-board/hooks/internal/useRecordBoardScopedStates';
export const RecordBoardActionBar = () => {
const { selectedCardIdsSelector } = useRecordBoardScopedStates();
diff --git a/front/src/modules/ui/object/record-board/components/NewButton.tsx b/front/src/modules/object-record/record-board/components/NewButton.tsx
similarity index 100%
rename from front/src/modules/ui/object/record-board/components/NewButton.tsx
rename to front/src/modules/object-record/record-board/components/NewButton.tsx
diff --git a/front/src/modules/ui/object/record-board/components/RecordBoard.tsx b/front/src/modules/object-record/record-board/components/RecordBoard.tsx
similarity index 87%
rename from front/src/modules/ui/object/record-board/components/RecordBoard.tsx
rename to front/src/modules/object-record/record-board/components/RecordBoard.tsx
index 6a7458051..5e68c41e3 100644
--- a/front/src/modules/ui/object/record-board/components/RecordBoard.tsx
+++ b/front/src/modules/object-record/record-board/components/RecordBoard.tsx
@@ -4,14 +4,14 @@ import { DragDropContext, OnDragEndResponder } from '@hello-pangea/dnd'; // Atla
import { useRecoilValue } from 'recoil';
import { useUpdateOneRecord } from '@/object-record/hooks/useUpdateOneRecord';
+import { RecordBoardActionBar } from '@/object-record/record-board/action-bar/components/RecordBoardActionBar';
+import { RecordBoardInternalEffect } from '@/object-record/record-board/components/RecordBoardInternalEffect';
+import { RecordBoardContextMenu } from '@/object-record/record-board/context-menu/components/RecordBoardContextMenu';
+import { useRecordBoardScopedStates } from '@/object-record/record-board/hooks/internal/useRecordBoardScopedStates';
+import { useSetRecordBoardCardSelectedInternal } from '@/object-record/record-board/hooks/internal/useSetRecordBoardCardSelectedInternal';
+import { RecordBoardScope } from '@/object-record/record-board/scopes/RecordBoardScope';
import { Opportunity } from '@/pipeline/types/Opportunity';
import { PageHotkeyScope } from '@/types/PageHotkeyScope';
-import { RecordBoardActionBar } from '@/ui/object/record-board/action-bar/components/RecordBoardActionBar';
-import { RecordBoardInternalEffect } from '@/ui/object/record-board/components/RecordBoardInternalEffect';
-import { RecordBoardContextMenu } from '@/ui/object/record-board/context-menu/components/RecordBoardContextMenu';
-import { useRecordBoardScopedStates } from '@/ui/object/record-board/hooks/internal/useRecordBoardScopedStates';
-import { useSetRecordBoardCardSelectedInternal } from '@/ui/object/record-board/hooks/internal/useSetRecordBoardCardSelectedInternal';
-import { RecordBoardScope } from '@/ui/object/record-board/scopes/RecordBoardScope';
import { DragSelect } from '@/ui/utilities/drag-select/components/DragSelect';
import { useScopedHotkeys } from '@/ui/utilities/hotkey/hooks/useScopedHotkeys';
import { useListenClickOutsideByClassName } from '@/ui/utilities/pointer-event/hooks/useListenClickOutside';
diff --git a/front/src/modules/ui/object/record-board/components/RecordBoardCard.tsx b/front/src/modules/object-record/record-board/components/RecordBoardCard.tsx
similarity index 100%
rename from front/src/modules/ui/object/record-board/components/RecordBoardCard.tsx
rename to front/src/modules/object-record/record-board/components/RecordBoardCard.tsx
diff --git a/front/src/modules/ui/object/record-board/components/RecordBoardColumn.tsx b/front/src/modules/object-record/record-board/components/RecordBoardColumn.tsx
similarity index 91%
rename from front/src/modules/ui/object/record-board/components/RecordBoardColumn.tsx
rename to front/src/modules/object-record/record-board/components/RecordBoardColumn.tsx
index 3460c3bf4..a66c20618 100644
--- a/front/src/modules/ui/object/record-board/components/RecordBoardColumn.tsx
+++ b/front/src/modules/object-record/record-board/components/RecordBoardColumn.tsx
@@ -3,10 +3,10 @@ import styled from '@emotion/styled';
import { Draggable, Droppable, DroppableProvided } from '@hello-pangea/dnd';
import { useRecoilValue } from 'recoil';
-import { RecordBoardCard } from '@/ui/object/record-board/components/RecordBoardCard';
-import { RecordBoardColumnHeader } from '@/ui/object/record-board/components/RecordBoardColumnHeader';
-import { BoardCardIdContext } from '@/ui/object/record-board/contexts/BoardCardIdContext';
-import { BoardColumnDefinition } from '@/ui/object/record-board/types/BoardColumnDefinition';
+import { RecordBoardCard } from '@/object-record/record-board/components/RecordBoardCard';
+import { RecordBoardColumnHeader } from '@/object-record/record-board/components/RecordBoardColumnHeader';
+import { BoardCardIdContext } from '@/object-record/record-board/contexts/BoardCardIdContext';
+import { BoardColumnDefinition } from '@/object-record/record-board/types/BoardColumnDefinition';
import { BoardColumnContext } from '../contexts/BoardColumnContext';
import { recordBoardCardIdsByColumnIdFamilyState } from '../states/recordBoardCardIdsByColumnIdFamilyState';
diff --git a/front/src/modules/ui/object/record-board/components/RecordBoardColumnDropdownMenu.tsx b/front/src/modules/object-record/record-board/components/RecordBoardColumnDropdownMenu.tsx
similarity index 97%
rename from front/src/modules/ui/object/record-board/components/RecordBoardColumnDropdownMenu.tsx
rename to front/src/modules/object-record/record-board/components/RecordBoardColumnDropdownMenu.tsx
index 8411c568b..c8225c23e 100644
--- a/front/src/modules/ui/object/record-board/components/RecordBoardColumnDropdownMenu.tsx
+++ b/front/src/modules/object-record/record-board/components/RecordBoardColumnDropdownMenu.tsx
@@ -2,8 +2,8 @@ import { useCallback, useContext, useRef, useState } from 'react';
import styled from '@emotion/styled';
import { Key } from 'ts-key-enum';
+import { RelationPickerHotkeyScope } from '@/object-record/relation-picker/types/RelationPickerHotkeyScope';
import { IconArrowLeft, IconArrowRight, IconPencil } from '@/ui/display/icon';
-import { RelationPickerHotkeyScope } from '@/ui/input/relation-picker/types/RelationPickerHotkeyScope';
import { DropdownMenu } from '@/ui/layout/dropdown/components/DropdownMenu';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { MenuItem } from '@/ui/navigation/menu-item/components/MenuItem';
diff --git a/front/src/modules/ui/object/record-board/components/RecordBoardColumnEditTitleMenu.tsx b/front/src/modules/object-record/record-board/components/RecordBoardColumnEditTitleMenu.tsx
similarity index 100%
rename from front/src/modules/ui/object/record-board/components/RecordBoardColumnEditTitleMenu.tsx
rename to front/src/modules/object-record/record-board/components/RecordBoardColumnEditTitleMenu.tsx
diff --git a/front/src/modules/ui/object/record-board/components/RecordBoardColumnHeader.tsx b/front/src/modules/object-record/record-board/components/RecordBoardColumnHeader.tsx
similarity index 94%
rename from front/src/modules/ui/object/record-board/components/RecordBoardColumnHeader.tsx
rename to front/src/modules/object-record/record-board/components/RecordBoardColumnHeader.tsx
index 9a8eff923..42121a0fa 100644
--- a/front/src/modules/ui/object/record-board/components/RecordBoardColumnHeader.tsx
+++ b/front/src/modules/object-record/record-board/components/RecordBoardColumnHeader.tsx
@@ -2,11 +2,11 @@ import React, { useState } from 'react';
import styled from '@emotion/styled';
import { useRecoilValue } from 'recoil';
+import { recordBoardColumnTotalsFamilySelector } from '@/object-record/record-board/states/selectors/recordBoardColumnTotalsFamilySelector';
+import { BoardColumnDefinition } from '@/object-record/record-board/types/BoardColumnDefinition';
import { IconDotsVertical } from '@/ui/display/icon';
import { Tag } from '@/ui/display/tag/components/Tag';
import { LightIconButton } from '@/ui/input/button/components/LightIconButton';
-import { recordBoardColumnTotalsFamilySelector } from '@/ui/object/record-board/states/selectors/recordBoardColumnTotalsFamilySelector';
-import { BoardColumnDefinition } from '@/ui/object/record-board/types/BoardColumnDefinition';
import { usePreviousHotkeyScope } from '@/ui/utilities/hotkey/hooks/usePreviousHotkeyScope';
import { recordBoardCardIdsByColumnIdFamilyState } from '../states/recordBoardCardIdsByColumnIdFamilyState';
diff --git a/front/src/modules/ui/object/record-board/components/RecordBoardEffect.tsx b/front/src/modules/object-record/record-board/components/RecordBoardEffect.tsx
similarity index 66%
rename from front/src/modules/ui/object/record-board/components/RecordBoardEffect.tsx
rename to front/src/modules/object-record/record-board/components/RecordBoardEffect.tsx
index 1bc1995b9..716464da6 100644
--- a/front/src/modules/ui/object/record-board/components/RecordBoardEffect.tsx
+++ b/front/src/modules/object-record/record-board/components/RecordBoardEffect.tsx
@@ -1,8 +1,8 @@
import { useEffect } from 'react';
-import { FieldMetadata } from '@/ui/object/field/types/FieldMetadata';
-import { useRecordBoard } from '@/ui/object/record-board/hooks/useRecordBoard';
-import { BoardFieldDefinition } from '@/ui/object/record-board/types/BoardFieldDefinition';
+import { FieldMetadata } from '@/object-record/field/types/FieldMetadata';
+import { useRecordBoard } from '@/object-record/record-board/hooks/useRecordBoard';
+import { BoardFieldDefinition } from '@/object-record/record-board/types/BoardFieldDefinition';
type RecordBoardEffectProps = {
recordBoardId: string;
diff --git a/front/src/modules/ui/object/record-board/components/RecordBoardInternalEffect.tsx b/front/src/modules/object-record/record-board/components/RecordBoardInternalEffect.tsx
similarity index 78%
rename from front/src/modules/ui/object/record-board/components/RecordBoardInternalEffect.tsx
rename to front/src/modules/object-record/record-board/components/RecordBoardInternalEffect.tsx
index 3a2319e23..2699f8b97 100644
--- a/front/src/modules/ui/object/record-board/components/RecordBoardInternalEffect.tsx
+++ b/front/src/modules/object-record/record-board/components/RecordBoardInternalEffect.tsx
@@ -2,10 +2,10 @@ import { useEffect } from 'react';
import { useRecoilState, useRecoilValue } from 'recoil';
import { useObjectRecordBoard } from '@/object-record/hooks/useObjectRecordBoard.1';
-import { useRecordBoardActionBarEntriesInternal } from '@/ui/object/record-board/hooks/internal/useRecordBoardActionBarEntriesInternal';
-import { useRecordBoardContextMenuEntriesInternal } from '@/ui/object/record-board/hooks/internal/useRecordBoardContextMenuEntriesInternal';
-import { useRecordBoardScopedStates } from '@/ui/object/record-board/hooks/internal/useRecordBoardScopedStates';
-import { useUpdateCompanyBoardColumnsInternal } from '@/ui/object/record-board/hooks/internal/useUpdateCompanyBoardColumnsInternal';
+import { useRecordBoardActionBarEntriesInternal } from '@/object-record/record-board/hooks/internal/useRecordBoardActionBarEntriesInternal';
+import { useRecordBoardContextMenuEntriesInternal } from '@/object-record/record-board/hooks/internal/useRecordBoardContextMenuEntriesInternal';
+import { useRecordBoardScopedStates } from '@/object-record/record-board/hooks/internal/useRecordBoardScopedStates';
+import { useUpdateCompanyBoardColumnsInternal } from '@/object-record/record-board/hooks/internal/useUpdateCompanyBoardColumnsInternal';
import { isDefined } from '~/utils/isDefined';
export type RecordBoardInternalEffectProps = {
diff --git a/front/src/modules/ui/object/record-board/components/__stories__/RecordBoardColumnEditTitleMenu.stories.tsx b/front/src/modules/object-record/record-board/components/__stories__/RecordBoardColumnEditTitleMenu.stories.tsx
similarity index 100%
rename from front/src/modules/ui/object/record-board/components/__stories__/RecordBoardColumnEditTitleMenu.stories.tsx
rename to front/src/modules/object-record/record-board/components/__stories__/RecordBoardColumnEditTitleMenu.stories.tsx
diff --git a/front/src/modules/ui/object/record-board/components/constants/BoardOptionsDropdownId.ts b/front/src/modules/object-record/record-board/components/constants/BoardOptionsDropdownId.ts
similarity index 100%
rename from front/src/modules/ui/object/record-board/components/constants/BoardOptionsDropdownId.ts
rename to front/src/modules/object-record/record-board/components/constants/BoardOptionsDropdownId.ts
diff --git a/front/src/modules/ui/object/record-board/context-menu/components/RecordBoardContextMenu.tsx b/front/src/modules/object-record/record-board/context-menu/components/RecordBoardContextMenu.tsx
similarity index 76%
rename from front/src/modules/ui/object/record-board/context-menu/components/RecordBoardContextMenu.tsx
rename to front/src/modules/object-record/record-board/context-menu/components/RecordBoardContextMenu.tsx
index 6388e7013..d99a7adac 100644
--- a/front/src/modules/ui/object/record-board/context-menu/components/RecordBoardContextMenu.tsx
+++ b/front/src/modules/object-record/record-board/context-menu/components/RecordBoardContextMenu.tsx
@@ -1,7 +1,7 @@
import { useRecoilValue } from 'recoil';
+import { useRecordBoardScopedStates } from '@/object-record/record-board/hooks/internal/useRecordBoardScopedStates';
import { ContextMenu } from '@/ui/navigation/context-menu/components/ContextMenu';
-import { useRecordBoardScopedStates } from '@/ui/object/record-board/hooks/internal/useRecordBoardScopedStates';
export const RecordBoardContextMenu = () => {
const { selectedCardIdsSelector } = useRecordBoardScopedStates();
diff --git a/front/src/modules/ui/object/record-board/contexts/BoardCardIdContext.ts b/front/src/modules/object-record/record-board/contexts/BoardCardIdContext.ts
similarity index 100%
rename from front/src/modules/ui/object/record-board/contexts/BoardCardIdContext.ts
rename to front/src/modules/object-record/record-board/contexts/BoardCardIdContext.ts
diff --git a/front/src/modules/ui/object/record-board/contexts/BoardColumnContext.ts b/front/src/modules/object-record/record-board/contexts/BoardColumnContext.ts
similarity index 100%
rename from front/src/modules/ui/object/record-board/contexts/BoardColumnContext.ts
rename to front/src/modules/object-record/record-board/contexts/BoardColumnContext.ts
diff --git a/front/src/modules/ui/object/record-board/hooks/internal/useCreateOpportunity.ts b/front/src/modules/object-record/record-board/hooks/internal/useCreateOpportunity.ts
similarity index 86%
rename from front/src/modules/ui/object/record-board/hooks/internal/useCreateOpportunity.ts
rename to front/src/modules/object-record/record-board/hooks/internal/useCreateOpportunity.ts
index c9f5b2662..1dd0ccd6b 100644
--- a/front/src/modules/ui/object/record-board/hooks/internal/useCreateOpportunity.ts
+++ b/front/src/modules/object-record/record-board/hooks/internal/useCreateOpportunity.ts
@@ -2,8 +2,8 @@ import { useRecoilCallback } from 'recoil';
import { v4 } from 'uuid';
import { useCreateOneRecord } from '@/object-record/hooks/useCreateOneRecord';
+import { recordBoardCardIdsByColumnIdFamilyState } from '@/object-record/record-board/states/recordBoardCardIdsByColumnIdFamilyState';
import { Opportunity } from '@/pipeline/types/Opportunity';
-import { recordBoardCardIdsByColumnIdFamilyState } from '@/ui/object/record-board/states/recordBoardCardIdsByColumnIdFamilyState';
export const useCreateOpportunity = () => {
const { createOneRecord: createOneOpportunity } =
diff --git a/front/src/modules/ui/object/record-board/hooks/internal/useCurrentRecordBoardCardSelectedInternal.ts b/front/src/modules/object-record/record-board/hooks/internal/useCurrentRecordBoardCardSelectedInternal.ts
similarity index 92%
rename from front/src/modules/ui/object/record-board/hooks/internal/useCurrentRecordBoardCardSelectedInternal.ts
rename to front/src/modules/object-record/record-board/hooks/internal/useCurrentRecordBoardCardSelectedInternal.ts
index ed2749288..5e7760e12 100644
--- a/front/src/modules/ui/object/record-board/hooks/internal/useCurrentRecordBoardCardSelectedInternal.ts
+++ b/front/src/modules/object-record/record-board/hooks/internal/useCurrentRecordBoardCardSelectedInternal.ts
@@ -1,8 +1,8 @@
import { useContext } from 'react';
import { useRecoilCallback, useRecoilValue, useSetRecoilState } from 'recoil';
+import { useRecordBoardScopedStates } from '@/object-record/record-board/hooks/internal/useRecordBoardScopedStates';
import { actionBarOpenState } from '@/ui/navigation/action-bar/states/actionBarIsOpenState';
-import { useRecordBoardScopedStates } from '@/ui/object/record-board/hooks/internal/useRecordBoardScopedStates';
import { BoardCardIdContext } from '../../contexts/BoardCardIdContext';
import { isRecordBoardCardSelectedFamilyState } from '../../states/isRecordBoardCardSelectedFamilyState';
diff --git a/front/src/modules/ui/object/record-board/hooks/internal/useDeleteSelectedRecordBoardCardsInternal.ts b/front/src/modules/object-record/record-board/hooks/internal/useDeleteSelectedRecordBoardCardsInternal.ts
similarity index 92%
rename from front/src/modules/ui/object/record-board/hooks/internal/useDeleteSelectedRecordBoardCardsInternal.ts
rename to front/src/modules/object-record/record-board/hooks/internal/useDeleteSelectedRecordBoardCardsInternal.ts
index d62cf1455..05a07114e 100644
--- a/front/src/modules/ui/object/record-board/hooks/internal/useDeleteSelectedRecordBoardCardsInternal.ts
+++ b/front/src/modules/object-record/record-board/hooks/internal/useDeleteSelectedRecordBoardCardsInternal.ts
@@ -2,8 +2,8 @@ import { useApolloClient } from '@apollo/client';
import { useRecoilCallback } from 'recoil';
import { useDeleteOneRecord } from '@/object-record/hooks/useDeleteOneRecord';
+import { useRecordBoardScopedStates } from '@/object-record/record-board/hooks/internal/useRecordBoardScopedStates';
import { Opportunity } from '@/pipeline/types/Opportunity';
-import { useRecordBoardScopedStates } from '@/ui/object/record-board/hooks/internal/useRecordBoardScopedStates';
import { useRemoveRecordBoardCardIdsInternal } from './useRemoveRecordBoardCardIdsInternal';
diff --git a/front/src/modules/ui/object/record-board/hooks/internal/useRecordBoardActionBarEntriesInternal.ts b/front/src/modules/object-record/record-board/hooks/internal/useRecordBoardActionBarEntriesInternal.ts
similarity index 84%
rename from front/src/modules/ui/object/record-board/hooks/internal/useRecordBoardActionBarEntriesInternal.ts
rename to front/src/modules/object-record/record-board/hooks/internal/useRecordBoardActionBarEntriesInternal.ts
index 45d50f560..32db7b977 100644
--- a/front/src/modules/ui/object/record-board/hooks/internal/useRecordBoardActionBarEntriesInternal.ts
+++ b/front/src/modules/object-record/record-board/hooks/internal/useRecordBoardActionBarEntriesInternal.ts
@@ -1,9 +1,9 @@
import { useCallback } from 'react';
import { useSetRecoilState } from 'recoil';
+import { useDeleteSelectedRecordBoardCardsInternal } from '@/object-record/record-board/hooks/internal/useDeleteSelectedRecordBoardCardsInternal';
import { IconTrash } from '@/ui/display/icon';
import { actionBarEntriesState } from '@/ui/navigation/action-bar/states/actionBarEntriesState';
-import { useDeleteSelectedRecordBoardCardsInternal } from '@/ui/object/record-board/hooks/internal/useDeleteSelectedRecordBoardCardsInternal';
export const useRecordBoardActionBarEntriesInternal = () => {
const setActionBarEntriesRecoil = useSetRecoilState(actionBarEntriesState);
diff --git a/front/src/modules/ui/object/record-board/hooks/internal/useRecordBoardCardFieldsInternal.ts b/front/src/modules/object-record/record-board/hooks/internal/useRecordBoardCardFieldsInternal.ts
similarity index 72%
rename from front/src/modules/ui/object/record-board/hooks/internal/useRecordBoardCardFieldsInternal.ts
rename to front/src/modules/object-record/record-board/hooks/internal/useRecordBoardCardFieldsInternal.ts
index d40461434..3a9395738 100644
--- a/front/src/modules/ui/object/record-board/hooks/internal/useRecordBoardCardFieldsInternal.ts
+++ b/front/src/modules/object-record/record-board/hooks/internal/useRecordBoardCardFieldsInternal.ts
@@ -1,13 +1,13 @@
import { useCallback } from 'react';
import { useRecoilCallback, useSetRecoilState } from 'recoil';
-import { FieldMetadata } from '@/ui/object/field/types/FieldMetadata';
-import { RecordBoardScopeInternalContext } from '@/ui/object/record-board/scopes/scope-internal-context/RecordBoardScopeInternalContext';
-import { onFieldsChangeScopedState } from '@/ui/object/record-board/states/onFieldsChangeScopedState';
-import { recordBoardCardFieldsScopedState } from '@/ui/object/record-board/states/recordBoardCardFieldsScopedState';
-import { savedRecordBoardCardFieldsScopedState } from '@/ui/object/record-board/states/savedRecordBoardCardFieldsScopedState';
-import { BoardFieldDefinition } from '@/ui/object/record-board/types/BoardFieldDefinition';
-import { ColumnDefinition } from '@/ui/object/record-table/types/ColumnDefinition';
+import { FieldMetadata } from '@/object-record/field/types/FieldMetadata';
+import { RecordBoardScopeInternalContext } from '@/object-record/record-board/scopes/scope-internal-context/RecordBoardScopeInternalContext';
+import { onFieldsChangeScopedState } from '@/object-record/record-board/states/onFieldsChangeScopedState';
+import { recordBoardCardFieldsScopedState } from '@/object-record/record-board/states/recordBoardCardFieldsScopedState';
+import { savedRecordBoardCardFieldsScopedState } from '@/object-record/record-board/states/savedRecordBoardCardFieldsScopedState';
+import { BoardFieldDefinition } from '@/object-record/record-board/types/BoardFieldDefinition';
+import { ColumnDefinition } from '@/object-record/record-table/types/ColumnDefinition';
import { useAvailableScopeIdOrThrow } from '@/ui/utilities/recoil-scope/scopes-internal/hooks/useAvailableScopeId';
type useRecordBoardCardFieldsInternalProps = {
diff --git a/front/src/modules/ui/object/record-board/hooks/internal/useRecordBoardColumnsInternal.ts b/front/src/modules/object-record/record-board/hooks/internal/useRecordBoardColumnsInternal.ts
similarity index 93%
rename from front/src/modules/ui/object/record-board/hooks/internal/useRecordBoardColumnsInternal.ts
rename to front/src/modules/object-record/record-board/hooks/internal/useRecordBoardColumnsInternal.ts
index 45961e6e5..f924c7572 100644
--- a/front/src/modules/ui/object/record-board/hooks/internal/useRecordBoardColumnsInternal.ts
+++ b/front/src/modules/object-record/record-board/hooks/internal/useRecordBoardColumnsInternal.ts
@@ -1,8 +1,8 @@
import { useRecoilState } from 'recoil';
import { useUpdateOneRecord } from '@/object-record/hooks/useUpdateOneRecord';
+import { useRecordBoardScopedStates } from '@/object-record/record-board/hooks/internal/useRecordBoardScopedStates';
import { PipelineStep } from '@/pipeline/types/PipelineStep';
-import { useRecordBoardScopedStates } from '@/ui/object/record-board/hooks/internal/useRecordBoardScopedStates';
import { useMoveViewColumns } from '@/views/hooks/useMoveViewColumns';
import { BoardColumnDefinition } from '../../types/BoardColumnDefinition';
diff --git a/front/src/modules/ui/object/record-board/hooks/internal/useRecordBoardContextMenuEntriesInternal.ts b/front/src/modules/object-record/record-board/hooks/internal/useRecordBoardContextMenuEntriesInternal.ts
similarity index 84%
rename from front/src/modules/ui/object/record-board/hooks/internal/useRecordBoardContextMenuEntriesInternal.ts
rename to front/src/modules/object-record/record-board/hooks/internal/useRecordBoardContextMenuEntriesInternal.ts
index 2ac5c8341..e820f8840 100644
--- a/front/src/modules/ui/object/record-board/hooks/internal/useRecordBoardContextMenuEntriesInternal.ts
+++ b/front/src/modules/object-record/record-board/hooks/internal/useRecordBoardContextMenuEntriesInternal.ts
@@ -1,9 +1,9 @@
import { useCallback } from 'react';
import { useSetRecoilState } from 'recoil';
+import { useDeleteSelectedRecordBoardCardsInternal } from '@/object-record/record-board/hooks/internal/useDeleteSelectedRecordBoardCardsInternal';
import { IconTrash } from '@/ui/display/icon';
import { contextMenuEntriesState } from '@/ui/navigation/context-menu/states/contextMenuEntriesState';
-import { useDeleteSelectedRecordBoardCardsInternal } from '@/ui/object/record-board/hooks/internal/useDeleteSelectedRecordBoardCardsInternal';
export const useRecordBoardContextMenuEntriesInternal = () => {
const setContextMenuEntriesRecoil = useSetRecoilState(
diff --git a/front/src/modules/ui/object/record-board/hooks/internal/useRecordBoardScopedStates.ts b/front/src/modules/object-record/record-board/hooks/internal/useRecordBoardScopedStates.ts
similarity index 85%
rename from front/src/modules/ui/object/record-board/hooks/internal/useRecordBoardScopedStates.ts
rename to front/src/modules/object-record/record-board/hooks/internal/useRecordBoardScopedStates.ts
index 5939cce41..3f90b4c4f 100644
--- a/front/src/modules/ui/object/record-board/hooks/internal/useRecordBoardScopedStates.ts
+++ b/front/src/modules/object-record/record-board/hooks/internal/useRecordBoardScopedStates.ts
@@ -1,5 +1,5 @@
-import { RecordBoardScopeInternalContext } from '@/ui/object/record-board/scopes/scope-internal-context/RecordBoardScopeInternalContext';
-import { getRecordBoardScopedStates } from '@/ui/object/record-board/utils/getRecordBoardScopedStates';
+import { RecordBoardScopeInternalContext } from '@/object-record/record-board/scopes/scope-internal-context/RecordBoardScopeInternalContext';
+import { getRecordBoardScopedStates } from '@/object-record/record-board/utils/getRecordBoardScopedStates';
import { useAvailableScopeIdOrThrow } from '@/ui/utilities/recoil-scope/scopes-internal/hooks/useAvailableScopeId';
type useRecordBoardScopedStates = {
diff --git a/front/src/modules/ui/object/record-board/hooks/internal/useRemoveRecordBoardCardIdsInternal.ts b/front/src/modules/object-record/record-board/hooks/internal/useRemoveRecordBoardCardIdsInternal.ts
similarity index 90%
rename from front/src/modules/ui/object/record-board/hooks/internal/useRemoveRecordBoardCardIdsInternal.ts
rename to front/src/modules/object-record/record-board/hooks/internal/useRemoveRecordBoardCardIdsInternal.ts
index ac3113d6c..364e7808c 100644
--- a/front/src/modules/ui/object/record-board/hooks/internal/useRemoveRecordBoardCardIdsInternal.ts
+++ b/front/src/modules/object-record/record-board/hooks/internal/useRemoveRecordBoardCardIdsInternal.ts
@@ -1,7 +1,7 @@
// Atlassian dnd does not support StrictMode from RN 18, so we use a fork @hello-pangea/dnd https://github.com/atlassian/react-beautiful-dnd/issues/2350
import { useRecoilCallback } from 'recoil';
-import { useRecordBoardScopedStates } from '@/ui/object/record-board/hooks/internal/useRecordBoardScopedStates';
+import { useRecordBoardScopedStates } from '@/object-record/record-board/hooks/internal/useRecordBoardScopedStates';
import { recordBoardCardIdsByColumnIdFamilyState } from '../../states/recordBoardCardIdsByColumnIdFamilyState';
diff --git a/front/src/modules/ui/object/record-board/hooks/internal/useSetRecordBoardCardSelectedInternal.ts b/front/src/modules/object-record/record-board/hooks/internal/useSetRecordBoardCardSelectedInternal.ts
similarity index 87%
rename from front/src/modules/ui/object/record-board/hooks/internal/useSetRecordBoardCardSelectedInternal.ts
rename to front/src/modules/object-record/record-board/hooks/internal/useSetRecordBoardCardSelectedInternal.ts
index 7224da20c..09a72713f 100644
--- a/front/src/modules/ui/object/record-board/hooks/internal/useSetRecordBoardCardSelectedInternal.ts
+++ b/front/src/modules/object-record/record-board/hooks/internal/useSetRecordBoardCardSelectedInternal.ts
@@ -1,8 +1,8 @@
import { useRecoilCallback } from 'recoil';
+import { useRecordBoardScopedStates } from '@/object-record/record-board/hooks/internal/useRecordBoardScopedStates';
+import { RecordBoardScopeInternalContext } from '@/object-record/record-board/scopes/scope-internal-context/RecordBoardScopeInternalContext';
import { actionBarOpenState } from '@/ui/navigation/action-bar/states/actionBarIsOpenState';
-import { useRecordBoardScopedStates } from '@/ui/object/record-board/hooks/internal/useRecordBoardScopedStates';
-import { RecordBoardScopeInternalContext } from '@/ui/object/record-board/scopes/scope-internal-context/RecordBoardScopeInternalContext';
import { useAvailableScopeIdOrThrow } from '@/ui/utilities/recoil-scope/scopes-internal/hooks/useAvailableScopeId';
import { isRecordBoardCardSelectedFamilyState } from '../../states/isRecordBoardCardSelectedFamilyState';
diff --git a/front/src/modules/ui/object/record-board/hooks/internal/useUpdateCompanyBoardColumnsInternal.ts b/front/src/modules/object-record/record-board/hooks/internal/useUpdateCompanyBoardColumnsInternal.ts
similarity index 88%
rename from front/src/modules/ui/object/record-board/hooks/internal/useUpdateCompanyBoardColumnsInternal.ts
rename to front/src/modules/object-record/record-board/hooks/internal/useUpdateCompanyBoardColumnsInternal.ts
index 0b605b538..c42fa5507 100644
--- a/front/src/modules/ui/object/record-board/hooks/internal/useUpdateCompanyBoardColumnsInternal.ts
+++ b/front/src/modules/object-record/record-board/hooks/internal/useUpdateCompanyBoardColumnsInternal.ts
@@ -1,21 +1,21 @@
import { useRecoilCallback } from 'recoil';
+import { entityFieldsFamilyState } from '@/object-record/field/states/entityFieldsFamilyState';
+import { useRecordBoardScopedStates } from '@/object-record/record-board/hooks/internal/useRecordBoardScopedStates';
+import { recordBoardCardIdsByColumnIdFamilyState } from '@/object-record/record-board/states/recordBoardCardIdsByColumnIdFamilyState';
+import { BoardColumnDefinition } from '@/object-record/record-board/types/BoardColumnDefinition';
import { currentPipelineStepsState } from '@/pipeline/states/currentPipelineStepsState';
import { Opportunity } from '@/pipeline/types/Opportunity';
import { PipelineStep } from '@/pipeline/types/PipelineStep';
-import { entityFieldsFamilyState } from '@/ui/object/field/states/entityFieldsFamilyState';
-import { useRecordBoardScopedStates } from '@/ui/object/record-board/hooks/internal/useRecordBoardScopedStates';
-import { recordBoardCardIdsByColumnIdFamilyState } from '@/ui/object/record-board/states/recordBoardCardIdsByColumnIdFamilyState';
-import { BoardColumnDefinition } from '@/ui/object/record-board/types/BoardColumnDefinition';
import { themeColorSchema } from '@/ui/theme/utils/themeColorSchema';
import { isDeeplyEqual } from '~/utils/isDeeplyEqual';
import { logError } from '~/utils/logError';
-import { companyProgressesFamilyState } from '../../../../../companies/states/companyProgressesFamilyState';
+import { companyProgressesFamilyState } from '../../../../companies/states/companyProgressesFamilyState';
import {
CompanyForBoard,
CompanyProgressDict,
-} from '../../../../../companies/types/CompanyProgress';
+} from '../../../../companies/types/CompanyProgress';
export const useUpdateCompanyBoardColumnsInternal = () => {
const { boardColumnsState, savedBoardColumnsState } =
diff --git a/front/src/modules/ui/object/record-board/hooks/useRecordBoard.ts b/front/src/modules/object-record/record-board/hooks/useRecordBoard.ts
similarity index 71%
rename from front/src/modules/ui/object/record-board/hooks/useRecordBoard.ts
rename to front/src/modules/object-record/record-board/hooks/useRecordBoard.ts
index 3d794cc0c..8e6aed4e4 100644
--- a/front/src/modules/ui/object/record-board/hooks/useRecordBoard.ts
+++ b/front/src/modules/object-record/record-board/hooks/useRecordBoard.ts
@@ -1,8 +1,8 @@
import { useSetRecoilState } from 'recoil';
-import { useCreateOpportunity } from '@/ui/object/record-board/hooks/internal/useCreateOpportunity';
-import { useRecordBoardScopedStates } from '@/ui/object/record-board/hooks/internal/useRecordBoardScopedStates';
-import { RecordBoardScopeInternalContext } from '@/ui/object/record-board/scopes/scope-internal-context/RecordBoardScopeInternalContext';
+import { useCreateOpportunity } from '@/object-record/record-board/hooks/internal/useCreateOpportunity';
+import { useRecordBoardScopedStates } from '@/object-record/record-board/hooks/internal/useRecordBoardScopedStates';
+import { RecordBoardScopeInternalContext } from '@/object-record/record-board/scopes/scope-internal-context/RecordBoardScopeInternalContext';
import { useAvailableScopeIdOrThrow } from '@/ui/utilities/recoil-scope/scopes-internal/hooks/useAvailableScopeId';
type useRecordBoardProps = {
diff --git a/front/src/modules/ui/object/record-board/options/components/RecordBoardOptionsDropdown.tsx b/front/src/modules/object-record/record-board/options/components/RecordBoardOptionsDropdown.tsx
similarity index 88%
rename from front/src/modules/ui/object/record-board/options/components/RecordBoardOptionsDropdown.tsx
rename to front/src/modules/object-record/record-board/options/components/RecordBoardOptionsDropdown.tsx
index 35ff237a2..101061660 100644
--- a/front/src/modules/ui/object/record-board/options/components/RecordBoardOptionsDropdown.tsx
+++ b/front/src/modules/object-record/record-board/options/components/RecordBoardOptionsDropdown.tsx
@@ -1,7 +1,7 @@
import { useViewBar } from '@/views/hooks/useViewBar';
-import { Dropdown } from '../../../../layout/dropdown/components/Dropdown';
-import { DropdownScope } from '../../../../layout/dropdown/scopes/DropdownScope';
+import { Dropdown } from '../../../../ui/layout/dropdown/components/Dropdown';
+import { DropdownScope } from '../../../../ui/layout/dropdown/scopes/DropdownScope';
import { BoardOptionsDropdownId } from '../../components/constants/BoardOptionsDropdownId';
import { BoardOptionsHotkeyScope } from '../../types/BoardOptionsHotkeyScope';
diff --git a/front/src/modules/ui/object/record-board/options/components/RecordBoardOptionsDropdownButton.tsx b/front/src/modules/object-record/record-board/options/components/RecordBoardOptionsDropdownButton.tsx
similarity index 100%
rename from front/src/modules/ui/object/record-board/options/components/RecordBoardOptionsDropdownButton.tsx
rename to front/src/modules/object-record/record-board/options/components/RecordBoardOptionsDropdownButton.tsx
diff --git a/front/src/modules/ui/object/record-board/options/components/RecordBoardOptionsDropdownContent.tsx b/front/src/modules/object-record/record-board/options/components/RecordBoardOptionsDropdownContent.tsx
similarity index 98%
rename from front/src/modules/ui/object/record-board/options/components/RecordBoardOptionsDropdownContent.tsx
rename to front/src/modules/object-record/record-board/options/components/RecordBoardOptionsDropdownContent.tsx
index 02d49c80f..a3b9451f3 100644
--- a/front/src/modules/ui/object/record-board/options/components/RecordBoardOptionsDropdownContent.tsx
+++ b/front/src/modules/object-record/record-board/options/components/RecordBoardOptionsDropdownContent.tsx
@@ -4,6 +4,7 @@ import { useRecoilState, useRecoilValue } from 'recoil';
import { Key } from 'ts-key-enum';
import { v4 } from 'uuid';
+import { useRecordBoardScopedStates } from '@/object-record/record-board/hooks/internal/useRecordBoardScopedStates';
import {
IconBaselineDensitySmall,
IconChevronLeft,
@@ -20,7 +21,6 @@ import { useDropdown } from '@/ui/layout/dropdown/hooks/useDropdown';
import { MenuItem } from '@/ui/navigation/menu-item/components/MenuItem';
import { MenuItemNavigate } from '@/ui/navigation/menu-item/components/MenuItemNavigate';
import { MenuItemToggle } from '@/ui/navigation/menu-item/components/MenuItemToggle';
-import { useRecordBoardScopedStates } from '@/ui/object/record-board/hooks/internal/useRecordBoardScopedStates';
import { ThemeColor } from '@/ui/theme/constants/colors';
import { useScopedHotkeys } from '@/ui/utilities/hotkey/hooks/useScopedHotkeys';
import { ViewFieldsVisibilityDropdownSection } from '@/views/components/ViewFieldsVisibilityDropdownSection';
diff --git a/front/src/modules/ui/object/record-board/scopes/RecordBoardScope.tsx b/front/src/modules/object-record/record-board/scopes/RecordBoardScope.tsx
similarity index 74%
rename from front/src/modules/ui/object/record-board/scopes/RecordBoardScope.tsx
rename to front/src/modules/object-record/record-board/scopes/RecordBoardScope.tsx
index 586433fb3..9efef8c3f 100644
--- a/front/src/modules/ui/object/record-board/scopes/RecordBoardScope.tsx
+++ b/front/src/modules/object-record/record-board/scopes/RecordBoardScope.tsx
@@ -1,6 +1,6 @@
import { ReactNode } from 'react';
-import { RecordBoardScopeInternalContext } from '@/ui/object/record-board/scopes/scope-internal-context/RecordBoardScopeInternalContext';
+import { RecordBoardScopeInternalContext } from '@/object-record/record-board/scopes/scope-internal-context/RecordBoardScopeInternalContext';
type RecordBoardScopeProps = {
children: ReactNode;
diff --git a/front/src/modules/ui/object/record-board/scopes/scope-internal-context/RecordBoardScopeInternalContext.ts b/front/src/modules/object-record/record-board/scopes/scope-internal-context/RecordBoardScopeInternalContext.ts
similarity index 100%
rename from front/src/modules/ui/object/record-board/scopes/scope-internal-context/RecordBoardScopeInternalContext.ts
rename to front/src/modules/object-record/record-board/scopes/scope-internal-context/RecordBoardScopeInternalContext.ts
diff --git a/front/src/modules/ui/object/record-board/states/activeRecordBoardCardIdsScopedState.ts b/front/src/modules/object-record/record-board/states/activeRecordBoardCardIdsScopedState.ts
similarity index 100%
rename from front/src/modules/ui/object/record-board/states/activeRecordBoardCardIdsScopedState.ts
rename to front/src/modules/object-record/record-board/states/activeRecordBoardCardIdsScopedState.ts
diff --git a/front/src/modules/ui/object/record-board/states/availableRecordBoardCardFieldsScopedState.ts b/front/src/modules/object-record/record-board/states/availableRecordBoardCardFieldsScopedState.ts
similarity index 82%
rename from front/src/modules/ui/object/record-board/states/availableRecordBoardCardFieldsScopedState.ts
rename to front/src/modules/object-record/record-board/states/availableRecordBoardCardFieldsScopedState.ts
index e39361146..20450c158 100644
--- a/front/src/modules/ui/object/record-board/states/availableRecordBoardCardFieldsScopedState.ts
+++ b/front/src/modules/object-record/record-board/states/availableRecordBoardCardFieldsScopedState.ts
@@ -1,4 +1,4 @@
-import { FieldMetadata } from '@/ui/object/field/types/FieldMetadata';
+import { FieldMetadata } from '@/object-record/field/types/FieldMetadata';
import { createScopedState } from '@/ui/utilities/recoil-scope/utils/createScopedState';
import { BoardFieldDefinition } from '../types/BoardFieldDefinition';
diff --git a/front/src/modules/ui/object/record-board/states/isCompactViewEnabledScopedState.ts b/front/src/modules/object-record/record-board/states/isCompactViewEnabledScopedState.ts
similarity index 100%
rename from front/src/modules/ui/object/record-board/states/isCompactViewEnabledScopedState.ts
rename to front/src/modules/object-record/record-board/states/isCompactViewEnabledScopedState.ts
diff --git a/front/src/modules/ui/object/record-board/states/isRecordBoardCardInCompactViewFamilyState.ts b/front/src/modules/object-record/record-board/states/isRecordBoardCardInCompactViewFamilyState.ts
similarity index 100%
rename from front/src/modules/ui/object/record-board/states/isRecordBoardCardInCompactViewFamilyState.ts
rename to front/src/modules/object-record/record-board/states/isRecordBoardCardInCompactViewFamilyState.ts
diff --git a/front/src/modules/ui/object/record-board/states/isRecordBoardCardSelectedFamilyState.ts b/front/src/modules/object-record/record-board/states/isRecordBoardCardSelectedFamilyState.ts
similarity index 100%
rename from front/src/modules/ui/object/record-board/states/isRecordBoardCardSelectedFamilyState.ts
rename to front/src/modules/object-record/record-board/states/isRecordBoardCardSelectedFamilyState.ts
diff --git a/front/src/modules/ui/object/record-board/states/isRecordBoardLoadedScopedState.ts b/front/src/modules/object-record/record-board/states/isRecordBoardLoadedScopedState.ts
similarity index 100%
rename from front/src/modules/ui/object/record-board/states/isRecordBoardLoadedScopedState.ts
rename to front/src/modules/object-record/record-board/states/isRecordBoardLoadedScopedState.ts
diff --git a/front/src/modules/ui/object/record-board/states/onFieldsChangeScopedState.ts b/front/src/modules/object-record/record-board/states/onFieldsChangeScopedState.ts
similarity index 61%
rename from front/src/modules/ui/object/record-board/states/onFieldsChangeScopedState.ts
rename to front/src/modules/object-record/record-board/states/onFieldsChangeScopedState.ts
index de02a46d6..33da31631 100644
--- a/front/src/modules/ui/object/record-board/states/onFieldsChangeScopedState.ts
+++ b/front/src/modules/object-record/record-board/states/onFieldsChangeScopedState.ts
@@ -1,5 +1,5 @@
-import { FieldMetadata } from '@/ui/object/field/types/FieldMetadata';
-import { BoardFieldDefinition } from '@/ui/object/record-board/types/BoardFieldDefinition';
+import { FieldMetadata } from '@/object-record/field/types/FieldMetadata';
+import { BoardFieldDefinition } from '@/object-record/record-board/types/BoardFieldDefinition';
import { createScopedState } from '@/ui/utilities/recoil-scope/utils/createScopedState';
export const onFieldsChangeScopedState = createScopedState<
diff --git a/front/src/modules/ui/object/record-board/states/recordBoardCardFieldsScopedState.ts b/front/src/modules/object-record/record-board/states/recordBoardCardFieldsScopedState.ts
similarity index 81%
rename from front/src/modules/ui/object/record-board/states/recordBoardCardFieldsScopedState.ts
rename to front/src/modules/object-record/record-board/states/recordBoardCardFieldsScopedState.ts
index 94ca2d2c6..ee38ec75b 100644
--- a/front/src/modules/ui/object/record-board/states/recordBoardCardFieldsScopedState.ts
+++ b/front/src/modules/object-record/record-board/states/recordBoardCardFieldsScopedState.ts
@@ -1,4 +1,4 @@
-import { FieldMetadata } from '@/ui/object/field/types/FieldMetadata';
+import { FieldMetadata } from '@/object-record/field/types/FieldMetadata';
import { createScopedState } from '@/ui/utilities/recoil-scope/utils/createScopedState';
import { BoardFieldDefinition } from '../types/BoardFieldDefinition';
diff --git a/front/src/modules/ui/object/record-board/states/recordBoardCardIdsByColumnIdFamilyState.ts b/front/src/modules/object-record/record-board/states/recordBoardCardIdsByColumnIdFamilyState.ts
similarity index 100%
rename from front/src/modules/ui/object/record-board/states/recordBoardCardIdsByColumnIdFamilyState.ts
rename to front/src/modules/object-record/record-board/states/recordBoardCardIdsByColumnIdFamilyState.ts
diff --git a/front/src/modules/ui/object/record-board/states/recordBoardColumnsScopedState.ts b/front/src/modules/object-record/record-board/states/recordBoardColumnsScopedState.ts
similarity index 71%
rename from front/src/modules/ui/object/record-board/states/recordBoardColumnsScopedState.ts
rename to front/src/modules/object-record/record-board/states/recordBoardColumnsScopedState.ts
index d191dd9f0..5b4f0c82b 100644
--- a/front/src/modules/ui/object/record-board/states/recordBoardColumnsScopedState.ts
+++ b/front/src/modules/object-record/record-board/states/recordBoardColumnsScopedState.ts
@@ -1,4 +1,4 @@
-import { BoardColumnDefinition } from '@/ui/object/record-board/types/BoardColumnDefinition';
+import { BoardColumnDefinition } from '@/object-record/record-board/types/BoardColumnDefinition';
import { createScopedState } from '@/ui/utilities/recoil-scope/utils/createScopedState';
export const recordBoardColumnsScopedState = createScopedState<
diff --git a/front/src/modules/ui/object/record-board/states/recordBoardFiltersScopedState.ts b/front/src/modules/object-record/record-board/states/recordBoardFiltersScopedState.ts
similarity index 74%
rename from front/src/modules/ui/object/record-board/states/recordBoardFiltersScopedState.ts
rename to front/src/modules/object-record/record-board/states/recordBoardFiltersScopedState.ts
index d87eb4633..3ea2c2a28 100644
--- a/front/src/modules/ui/object/record-board/states/recordBoardFiltersScopedState.ts
+++ b/front/src/modules/object-record/record-board/states/recordBoardFiltersScopedState.ts
@@ -1,4 +1,4 @@
-import { Filter } from '@/ui/object/object-filter-dropdown/types/Filter';
+import { Filter } from '@/object-record/object-filter-dropdown/types/Filter';
import { createScopedState } from '@/ui/utilities/recoil-scope/utils/createScopedState';
export const recordBoardFiltersScopedState = createScopedState({
diff --git a/front/src/modules/ui/object/record-board/states/recordBoardSortsScopedState.ts b/front/src/modules/object-record/record-board/states/recordBoardSortsScopedState.ts
similarity index 100%
rename from front/src/modules/ui/object/record-board/states/recordBoardSortsScopedState.ts
rename to front/src/modules/object-record/record-board/states/recordBoardSortsScopedState.ts
diff --git a/front/src/modules/ui/object/record-board/states/savedOpportunitiesScopedState.ts b/front/src/modules/object-record/record-board/states/savedOpportunitiesScopedState.ts
similarity index 100%
rename from front/src/modules/ui/object/record-board/states/savedOpportunitiesScopedState.ts
rename to front/src/modules/object-record/record-board/states/savedOpportunitiesScopedState.ts
diff --git a/front/src/modules/ui/object/record-board/states/savedPipelineStepsScopedState.ts b/front/src/modules/object-record/record-board/states/savedPipelineStepsScopedState.ts
similarity index 100%
rename from front/src/modules/ui/object/record-board/states/savedPipelineStepsScopedState.ts
rename to front/src/modules/object-record/record-board/states/savedPipelineStepsScopedState.ts
diff --git a/front/src/modules/ui/object/record-board/states/savedRecordBoardCardFieldsScopedState.ts b/front/src/modules/object-record/record-board/states/savedRecordBoardCardFieldsScopedState.ts
similarity index 82%
rename from front/src/modules/ui/object/record-board/states/savedRecordBoardCardFieldsScopedState.ts
rename to front/src/modules/object-record/record-board/states/savedRecordBoardCardFieldsScopedState.ts
index ddbfe7763..80997547e 100644
--- a/front/src/modules/ui/object/record-board/states/savedRecordBoardCardFieldsScopedState.ts
+++ b/front/src/modules/object-record/record-board/states/savedRecordBoardCardFieldsScopedState.ts
@@ -1,4 +1,4 @@
-import { FieldMetadata } from '@/ui/object/field/types/FieldMetadata';
+import { FieldMetadata } from '@/object-record/field/types/FieldMetadata';
import { createScopedState } from '@/ui/utilities/recoil-scope/utils/createScopedState';
import { BoardFieldDefinition } from '../types/BoardFieldDefinition';
diff --git a/front/src/modules/ui/object/record-board/states/savedRecordBoardColumnsScopedState.ts b/front/src/modules/object-record/record-board/states/savedRecordBoardColumnsScopedState.ts
similarity index 100%
rename from front/src/modules/ui/object/record-board/states/savedRecordBoardColumnsScopedState.ts
rename to front/src/modules/object-record/record-board/states/savedRecordBoardColumnsScopedState.ts
diff --git a/front/src/modules/ui/object/record-board/states/savedRecordsScopedState.ts b/front/src/modules/object-record/record-board/states/savedRecordsScopedState.ts
similarity index 100%
rename from front/src/modules/ui/object/record-board/states/savedRecordsScopedState.ts
rename to front/src/modules/object-record/record-board/states/savedRecordsScopedState.ts
diff --git a/front/src/modules/ui/object/record-board/states/selectors/hiddenRecordBoardCardFieldsScopedSelector.ts b/front/src/modules/object-record/record-board/states/selectors/hiddenRecordBoardCardFieldsScopedSelector.ts
similarity index 100%
rename from front/src/modules/ui/object/record-board/states/selectors/hiddenRecordBoardCardFieldsScopedSelector.ts
rename to front/src/modules/object-record/record-board/states/selectors/hiddenRecordBoardCardFieldsScopedSelector.ts
diff --git a/front/src/modules/ui/object/record-board/states/selectors/recordBoardCardFieldsByKeyScopedSelector.ts b/front/src/modules/object-record/record-board/states/selectors/recordBoardCardFieldsByKeyScopedSelector.ts
similarity index 88%
rename from front/src/modules/ui/object/record-board/states/selectors/recordBoardCardFieldsByKeyScopedSelector.ts
rename to front/src/modules/object-record/record-board/states/selectors/recordBoardCardFieldsByKeyScopedSelector.ts
index 74ccbaaad..3d39382e7 100644
--- a/front/src/modules/ui/object/record-board/states/selectors/recordBoardCardFieldsByKeyScopedSelector.ts
+++ b/front/src/modules/object-record/record-board/states/selectors/recordBoardCardFieldsByKeyScopedSelector.ts
@@ -1,6 +1,6 @@
import { selectorFamily } from 'recoil';
-import { FieldMetadata } from '@/ui/object/field/types/FieldMetadata';
+import { FieldMetadata } from '@/object-record/field/types/FieldMetadata';
import { BoardFieldDefinition } from '../../types/BoardFieldDefinition';
import { recordBoardCardFieldsScopedState } from '../recordBoardCardFieldsScopedState';
diff --git a/front/src/modules/ui/object/record-board/states/selectors/recordBoardColumnTotalsFamilySelector.ts b/front/src/modules/object-record/record-board/states/selectors/recordBoardColumnTotalsFamilySelector.ts
similarity index 100%
rename from front/src/modules/ui/object/record-board/states/selectors/recordBoardColumnTotalsFamilySelector.ts
rename to front/src/modules/object-record/record-board/states/selectors/recordBoardColumnTotalsFamilySelector.ts
diff --git a/front/src/modules/ui/object/record-board/states/selectors/selectedRecordBoardCardIdsScopedSelector.ts b/front/src/modules/object-record/record-board/states/selectors/selectedRecordBoardCardIdsScopedSelector.ts
similarity index 100%
rename from front/src/modules/ui/object/record-board/states/selectors/selectedRecordBoardCardIdsScopedSelector.ts
rename to front/src/modules/object-record/record-board/states/selectors/selectedRecordBoardCardIdsScopedSelector.ts
diff --git a/front/src/modules/ui/object/record-board/states/selectors/visibleRecordBoardCardFieldsScopedSelector.ts b/front/src/modules/object-record/record-board/states/selectors/visibleRecordBoardCardFieldsScopedSelector.ts
similarity index 100%
rename from front/src/modules/ui/object/record-board/states/selectors/visibleRecordBoardCardFieldsScopedSelector.ts
rename to front/src/modules/object-record/record-board/states/selectors/visibleRecordBoardCardFieldsScopedSelector.ts
diff --git a/front/src/modules/ui/object/record-board/types/BoardColumnDefinition.ts b/front/src/modules/object-record/record-board/types/BoardColumnDefinition.ts
similarity index 100%
rename from front/src/modules/ui/object/record-board/types/BoardColumnDefinition.ts
rename to front/src/modules/object-record/record-board/types/BoardColumnDefinition.ts
diff --git a/front/src/modules/ui/object/record-board/types/BoardColumnHotkeyScope.ts b/front/src/modules/object-record/record-board/types/BoardColumnHotkeyScope.ts
similarity index 100%
rename from front/src/modules/ui/object/record-board/types/BoardColumnHotkeyScope.ts
rename to front/src/modules/object-record/record-board/types/BoardColumnHotkeyScope.ts
diff --git a/front/src/modules/ui/object/record-board/types/BoardFieldDefinition.ts b/front/src/modules/object-record/record-board/types/BoardFieldDefinition.ts
similarity index 51%
rename from front/src/modules/ui/object/record-board/types/BoardFieldDefinition.ts
rename to front/src/modules/object-record/record-board/types/BoardFieldDefinition.ts
index 543f3b6df..a2132cead 100644
--- a/front/src/modules/ui/object/record-board/types/BoardFieldDefinition.ts
+++ b/front/src/modules/object-record/record-board/types/BoardFieldDefinition.ts
@@ -1,5 +1,5 @@
-import { FieldDefinition } from '@/ui/object/field/types/FieldDefinition';
-import { FieldMetadata } from '@/ui/object/field/types/FieldMetadata';
+import { FieldDefinition } from '@/object-record/field/types/FieldDefinition';
+import { FieldMetadata } from '@/object-record/field/types/FieldMetadata';
export type BoardFieldDefinition =
FieldDefinition & {
diff --git a/front/src/modules/ui/object/record-board/types/BoardOptions.ts b/front/src/modules/object-record/record-board/types/BoardOptions.ts
similarity index 100%
rename from front/src/modules/ui/object/record-board/types/BoardOptions.ts
rename to front/src/modules/object-record/record-board/types/BoardOptions.ts
diff --git a/front/src/modules/ui/object/record-board/types/BoardOptionsHotkeyScope.ts b/front/src/modules/object-record/record-board/types/BoardOptionsHotkeyScope.ts
similarity index 100%
rename from front/src/modules/ui/object/record-board/types/BoardOptionsHotkeyScope.ts
rename to front/src/modules/object-record/record-board/types/BoardOptionsHotkeyScope.ts
diff --git a/front/src/modules/ui/object/record-board/types/ColumnHotkeyScope.ts b/front/src/modules/object-record/record-board/types/ColumnHotkeyScope.ts
similarity index 100%
rename from front/src/modules/ui/object/record-board/types/ColumnHotkeyScope.ts
rename to front/src/modules/object-record/record-board/types/ColumnHotkeyScope.ts
diff --git a/front/src/modules/ui/object/record-board/utils/getRecordBoardScopedStates.ts b/front/src/modules/object-record/record-board/utils/getRecordBoardScopedStates.ts
similarity index 56%
rename from front/src/modules/ui/object/record-board/utils/getRecordBoardScopedStates.ts
rename to front/src/modules/object-record/record-board/utils/getRecordBoardScopedStates.ts
index f5617a8cc..272d36d10 100644
--- a/front/src/modules/ui/object/record-board/utils/getRecordBoardScopedStates.ts
+++ b/front/src/modules/object-record/record-board/utils/getRecordBoardScopedStates.ts
@@ -1,19 +1,19 @@
-import { activeRecordBoardCardIdsScopedState } from '@/ui/object/record-board/states/activeRecordBoardCardIdsScopedState';
-import { availableRecordBoardCardFieldsScopedState } from '@/ui/object/record-board/states/availableRecordBoardCardFieldsScopedState';
-import { isCompactViewEnabledScopedState } from '@/ui/object/record-board/states/isCompactViewEnabledScopedState';
-import { isRecordBoardLoadedScopedState } from '@/ui/object/record-board/states/isRecordBoardLoadedScopedState';
-import { onFieldsChangeScopedState } from '@/ui/object/record-board/states/onFieldsChangeScopedState';
-import { recordBoardColumnsScopedState } from '@/ui/object/record-board/states/recordBoardColumnsScopedState';
-import { recordBoardFiltersScopedState } from '@/ui/object/record-board/states/recordBoardFiltersScopedState';
-import { recordBoardSortsScopedState } from '@/ui/object/record-board/states/recordBoardSortsScopedState';
-import { savedOpportunitiesScopedState } from '@/ui/object/record-board/states/savedOpportunitiesScopedState';
-import { savedPipelineStepsScopedState } from '@/ui/object/record-board/states/savedPipelineStepsScopedState';
-import { savedRecordBoardColumnsScopedState } from '@/ui/object/record-board/states/savedRecordBoardColumnsScopedState';
-import { savedRecordsScopedState } from '@/ui/object/record-board/states/savedRecordsScopedState';
-import { hiddenRecordBoardCardFieldsScopedSelector } from '@/ui/object/record-board/states/selectors/hiddenRecordBoardCardFieldsScopedSelector';
-import { recordBoardCardFieldsByKeyScopedSelector } from '@/ui/object/record-board/states/selectors/recordBoardCardFieldsByKeyScopedSelector';
-import { selectedRecordBoardCardIdsScopedSelector } from '@/ui/object/record-board/states/selectors/selectedRecordBoardCardIdsScopedSelector';
-import { visibleRecordBoardCardFieldsScopedSelector } from '@/ui/object/record-board/states/selectors/visibleRecordBoardCardFieldsScopedSelector';
+import { activeRecordBoardCardIdsScopedState } from '@/object-record/record-board/states/activeRecordBoardCardIdsScopedState';
+import { availableRecordBoardCardFieldsScopedState } from '@/object-record/record-board/states/availableRecordBoardCardFieldsScopedState';
+import { isCompactViewEnabledScopedState } from '@/object-record/record-board/states/isCompactViewEnabledScopedState';
+import { isRecordBoardLoadedScopedState } from '@/object-record/record-board/states/isRecordBoardLoadedScopedState';
+import { onFieldsChangeScopedState } from '@/object-record/record-board/states/onFieldsChangeScopedState';
+import { recordBoardColumnsScopedState } from '@/object-record/record-board/states/recordBoardColumnsScopedState';
+import { recordBoardFiltersScopedState } from '@/object-record/record-board/states/recordBoardFiltersScopedState';
+import { recordBoardSortsScopedState } from '@/object-record/record-board/states/recordBoardSortsScopedState';
+import { savedOpportunitiesScopedState } from '@/object-record/record-board/states/savedOpportunitiesScopedState';
+import { savedPipelineStepsScopedState } from '@/object-record/record-board/states/savedPipelineStepsScopedState';
+import { savedRecordBoardColumnsScopedState } from '@/object-record/record-board/states/savedRecordBoardColumnsScopedState';
+import { savedRecordsScopedState } from '@/object-record/record-board/states/savedRecordsScopedState';
+import { hiddenRecordBoardCardFieldsScopedSelector } from '@/object-record/record-board/states/selectors/hiddenRecordBoardCardFieldsScopedSelector';
+import { recordBoardCardFieldsByKeyScopedSelector } from '@/object-record/record-board/states/selectors/recordBoardCardFieldsByKeyScopedSelector';
+import { selectedRecordBoardCardIdsScopedSelector } from '@/object-record/record-board/states/selectors/selectedRecordBoardCardIdsScopedSelector';
+import { visibleRecordBoardCardFieldsScopedSelector } from '@/object-record/record-board/states/selectors/visibleRecordBoardCardFieldsScopedSelector';
import { getScopedState } from '@/ui/utilities/recoil-scope/utils/getScopedState';
export const getRecordBoardScopedStates = ({
diff --git a/front/src/modules/ui/object/record-inline-cell/components/RecordInlineCell.tsx b/front/src/modules/object-record/record-inline-cell/components/RecordInlineCell.tsx
similarity index 95%
rename from front/src/modules/ui/object/record-inline-cell/components/RecordInlineCell.tsx
rename to front/src/modules/object-record/record-inline-cell/components/RecordInlineCell.tsx
index 8699d595d..396a42311 100644
--- a/front/src/modules/ui/object/record-inline-cell/components/RecordInlineCell.tsx
+++ b/front/src/modules/object-record/record-inline-cell/components/RecordInlineCell.tsx
@@ -1,7 +1,7 @@
import { useContext } from 'react';
+import { RelationPickerHotkeyScope } from '@/object-record/relation-picker/types/RelationPickerHotkeyScope';
import { useLazyLoadIcons } from '@/ui/input/hooks/useLazyLoadIcons';
-import { RelationPickerHotkeyScope } from '@/ui/input/relation-picker/types/RelationPickerHotkeyScope';
import { FieldDisplay } from '../../field/components/FieldDisplay';
import { FieldInput } from '../../field/components/FieldInput';
diff --git a/front/src/modules/ui/object/record-inline-cell/components/RecordInlineCellContainer.tsx b/front/src/modules/object-record/record-inline-cell/components/RecordInlineCellContainer.tsx
similarity index 100%
rename from front/src/modules/ui/object/record-inline-cell/components/RecordInlineCellContainer.tsx
rename to front/src/modules/object-record/record-inline-cell/components/RecordInlineCellContainer.tsx
diff --git a/front/src/modules/ui/object/record-inline-cell/components/RecordInlineCellDisplayMode.tsx b/front/src/modules/object-record/record-inline-cell/components/RecordInlineCellDisplayMode.tsx
similarity index 100%
rename from front/src/modules/ui/object/record-inline-cell/components/RecordInlineCellDisplayMode.tsx
rename to front/src/modules/object-record/record-inline-cell/components/RecordInlineCellDisplayMode.tsx
diff --git a/front/src/modules/ui/object/record-inline-cell/components/RecordInlineCellEditButton.tsx b/front/src/modules/object-record/record-inline-cell/components/RecordInlineCellEditButton.tsx
similarity index 100%
rename from front/src/modules/ui/object/record-inline-cell/components/RecordInlineCellEditButton.tsx
rename to front/src/modules/object-record/record-inline-cell/components/RecordInlineCellEditButton.tsx
diff --git a/front/src/modules/ui/object/record-inline-cell/components/RecordInlineCellEditMode.tsx b/front/src/modules/object-record/record-inline-cell/components/RecordInlineCellEditMode.tsx
similarity index 100%
rename from front/src/modules/ui/object/record-inline-cell/components/RecordInlineCellEditMode.tsx
rename to front/src/modules/object-record/record-inline-cell/components/RecordInlineCellEditMode.tsx
diff --git a/front/src/modules/ui/object/record-inline-cell/contexts/InlineCellMutationContext.ts b/front/src/modules/object-record/record-inline-cell/contexts/InlineCellMutationContext.ts
similarity index 100%
rename from front/src/modules/ui/object/record-inline-cell/contexts/InlineCellMutationContext.ts
rename to front/src/modules/object-record/record-inline-cell/contexts/InlineCellMutationContext.ts
diff --git a/front/src/modules/ui/object/record-inline-cell/hooks/useInlineCell.ts b/front/src/modules/object-record/record-inline-cell/hooks/useInlineCell.ts
similarity index 94%
rename from front/src/modules/ui/object/record-inline-cell/hooks/useInlineCell.ts
rename to front/src/modules/object-record/record-inline-cell/hooks/useInlineCell.ts
index f533f6ce6..c56cd98ba 100644
--- a/front/src/modules/ui/object/record-inline-cell/hooks/useInlineCell.ts
+++ b/front/src/modules/object-record/record-inline-cell/hooks/useInlineCell.ts
@@ -1,7 +1,7 @@
import { useContext } from 'react';
import { useRecoilState } from 'recoil';
-import { FieldContext } from '@/ui/object/field/contexts/FieldContext';
+import { FieldContext } from '@/object-record/field/contexts/FieldContext';
import { usePreviousHotkeyScope } from '@/ui/utilities/hotkey/hooks/usePreviousHotkeyScope';
import { HotkeyScope } from '@/ui/utilities/hotkey/types/HotkeyScope';
diff --git a/front/src/modules/ui/object/record-inline-cell/property-box/components/PropertyBox.tsx b/front/src/modules/object-record/record-inline-cell/property-box/components/PropertyBox.tsx
similarity index 100%
rename from front/src/modules/ui/object/record-inline-cell/property-box/components/PropertyBox.tsx
rename to front/src/modules/object-record/record-inline-cell/property-box/components/PropertyBox.tsx
diff --git a/front/src/modules/ui/object/record-inline-cell/states/customEditHotkeyScopeForFieldScopedState.ts b/front/src/modules/object-record/record-inline-cell/states/customEditHotkeyScopeForFieldScopedState.ts
similarity index 100%
rename from front/src/modules/ui/object/record-inline-cell/states/customEditHotkeyScopeForFieldScopedState.ts
rename to front/src/modules/object-record/record-inline-cell/states/customEditHotkeyScopeForFieldScopedState.ts
diff --git a/front/src/modules/ui/object/record-inline-cell/states/isInlineCellInEditModeScopedState.ts b/front/src/modules/object-record/record-inline-cell/states/isInlineCellInEditModeScopedState.ts
similarity index 100%
rename from front/src/modules/ui/object/record-inline-cell/states/isInlineCellInEditModeScopedState.ts
rename to front/src/modules/object-record/record-inline-cell/states/isInlineCellInEditModeScopedState.ts
diff --git a/front/src/modules/ui/object/record-inline-cell/states/parentHotkeyScopeForFieldScopedState.ts b/front/src/modules/object-record/record-inline-cell/states/parentHotkeyScopeForFieldScopedState.ts
similarity index 100%
rename from front/src/modules/ui/object/record-inline-cell/states/parentHotkeyScopeForFieldScopedState.ts
rename to front/src/modules/object-record/record-inline-cell/states/parentHotkeyScopeForFieldScopedState.ts
diff --git a/front/src/modules/ui/object/record-inline-cell/states/recoil-scope-contexts/FieldRecoilScopeContext.ts b/front/src/modules/object-record/record-inline-cell/states/recoil-scope-contexts/FieldRecoilScopeContext.ts
similarity index 100%
rename from front/src/modules/ui/object/record-inline-cell/states/recoil-scope-contexts/FieldRecoilScopeContext.ts
rename to front/src/modules/object-record/record-inline-cell/states/recoil-scope-contexts/FieldRecoilScopeContext.ts
diff --git a/front/src/modules/ui/object/record-inline-cell/types/InlineCellHotkeyScope.ts b/front/src/modules/object-record/record-inline-cell/types/InlineCellHotkeyScope.ts
similarity index 100%
rename from front/src/modules/ui/object/record-inline-cell/types/InlineCellHotkeyScope.ts
rename to front/src/modules/object-record/record-inline-cell/types/InlineCellHotkeyScope.ts
diff --git a/front/src/modules/ui/object/record-table/action-bar/components/RecordTableActionBar.tsx b/front/src/modules/object-record/record-table/action-bar/components/RecordTableActionBar.tsx
similarity index 100%
rename from front/src/modules/ui/object/record-table/action-bar/components/RecordTableActionBar.tsx
rename to front/src/modules/object-record/record-table/action-bar/components/RecordTableActionBar.tsx
diff --git a/front/src/modules/ui/object/record-table/components/CheckboxCell.tsx b/front/src/modules/object-record/record-table/components/CheckboxCell.tsx
similarity index 100%
rename from front/src/modules/ui/object/record-table/components/CheckboxCell.tsx
rename to front/src/modules/object-record/record-table/components/CheckboxCell.tsx
diff --git a/front/src/modules/ui/object/record-table/components/ColumnHead.tsx b/front/src/modules/object-record/record-table/components/ColumnHead.tsx
similarity index 94%
rename from front/src/modules/ui/object/record-table/components/ColumnHead.tsx
rename to front/src/modules/object-record/record-table/components/ColumnHead.tsx
index 61e113db6..fbe2ac4bd 100644
--- a/front/src/modules/ui/object/record-table/components/ColumnHead.tsx
+++ b/front/src/modules/object-record/record-table/components/ColumnHead.tsx
@@ -1,8 +1,8 @@
import { useTheme } from '@emotion/react';
import styled from '@emotion/styled';
+import { FieldMetadata } from '@/object-record/field/types/FieldMetadata';
import { useLazyLoadIcons } from '@/ui/input/hooks/useLazyLoadIcons';
-import { FieldMetadata } from '@/ui/object/field/types/FieldMetadata';
import { ColumnDefinition } from '../types/ColumnDefinition';
diff --git a/front/src/modules/ui/object/record-table/components/ColumnHeadWithDropdown.tsx b/front/src/modules/object-record/record-table/components/ColumnHeadWithDropdown.tsx
similarity index 100%
rename from front/src/modules/ui/object/record-table/components/ColumnHeadWithDropdown.tsx
rename to front/src/modules/object-record/record-table/components/ColumnHeadWithDropdown.tsx
diff --git a/front/src/modules/ui/object/record-table/components/RecordTable.tsx b/front/src/modules/object-record/record-table/components/RecordTable.tsx
similarity index 88%
rename from front/src/modules/ui/object/record-table/components/RecordTable.tsx
rename to front/src/modules/object-record/record-table/components/RecordTable.tsx
index 10bff5c14..5015e131b 100644
--- a/front/src/modules/ui/object/record-table/components/RecordTable.tsx
+++ b/front/src/modules/object-record/record-table/components/RecordTable.tsx
@@ -2,11 +2,11 @@ import { useRef } from 'react';
import styled from '@emotion/styled';
import { useRecoilCallback } from 'recoil';
-import { RecordTableBodyEffect } from '@/ui/object/record-table/components/RecordTableBodyEffect';
-import { RecordTableHeader } from '@/ui/object/record-table/components/RecordTableHeader';
-import { RecordTableInternalEffect } from '@/ui/object/record-table/components/RecordTableInternalEffect';
-import { useRecordTable } from '@/ui/object/record-table/hooks/useRecordTable';
-import { RecordTableScope } from '@/ui/object/record-table/scopes/RecordTableScope';
+import { RecordTableBodyEffect } from '@/object-record/record-table/components/RecordTableBodyEffect';
+import { RecordTableHeader } from '@/object-record/record-table/components/RecordTableHeader';
+import { RecordTableInternalEffect } from '@/object-record/record-table/components/RecordTableInternalEffect';
+import { useRecordTable } from '@/object-record/record-table/hooks/useRecordTable';
+import { RecordTableScope } from '@/object-record/record-table/scopes/RecordTableScope';
import { DragSelect } from '@/ui/utilities/drag-select/components/DragSelect';
import { ScrollWrapper } from '@/ui/utilities/scroll/components/ScrollWrapper';
import { useViewFields } from '@/views/hooks/internal/useViewFields';
diff --git a/front/src/modules/ui/object/record-table/components/RecordTableBody.tsx b/front/src/modules/object-record/record-table/components/RecordTableBody.tsx
similarity index 53%
rename from front/src/modules/ui/object/record-table/components/RecordTableBody.tsx
rename to front/src/modules/object-record/record-table/components/RecordTableBody.tsx
index 24df0d282..ea0cdc7db 100644
--- a/front/src/modules/ui/object/record-table/components/RecordTableBody.tsx
+++ b/front/src/modules/object-record/record-table/components/RecordTableBody.tsx
@@ -1,11 +1,11 @@
import { useRecoilValue } from 'recoil';
-import { RecordTableBodyFetchMoreLoader } from '@/ui/object/record-table/components/RecordTableBodyFetchMoreLoader';
-import { RecordTableRow } from '@/ui/object/record-table/components/RecordTableRow';
-import { RowIdContext } from '@/ui/object/record-table/contexts/RowIdContext';
-import { RowIndexContext } from '@/ui/object/record-table/contexts/RowIndexContext';
-import { isFetchingRecordTableDataState } from '@/ui/object/record-table/states/isFetchingRecordTableDataState';
-import { tableRowIdsState } from '@/ui/object/record-table/states/tableRowIdsState';
+import { RecordTableBodyFetchMoreLoader } from '@/object-record/record-table/components/RecordTableBodyFetchMoreLoader';
+import { RecordTableRow } from '@/object-record/record-table/components/RecordTableRow';
+import { RowIdContext } from '@/object-record/record-table/contexts/RowIdContext';
+import { RowIndexContext } from '@/object-record/record-table/contexts/RowIndexContext';
+import { isFetchingRecordTableDataState } from '@/object-record/record-table/states/isFetchingRecordTableDataState';
+import { tableRowIdsState } from '@/object-record/record-table/states/tableRowIdsState';
export const RecordTableBody = () => {
const tableRowIds = useRecoilValue(tableRowIdsState);
diff --git a/front/src/modules/ui/object/record-table/components/RecordTableBodyEffect.tsx b/front/src/modules/object-record/record-table/components/RecordTableBodyEffect.tsx
similarity index 90%
rename from front/src/modules/ui/object/record-table/components/RecordTableBodyEffect.tsx
rename to front/src/modules/object-record/record-table/components/RecordTableBodyEffect.tsx
index 764b820e2..06265fdc3 100644
--- a/front/src/modules/ui/object/record-table/components/RecordTableBodyEffect.tsx
+++ b/front/src/modules/object-record/record-table/components/RecordTableBodyEffect.tsx
@@ -2,8 +2,8 @@ import { useEffect } from 'react';
import { useRecoilState, useRecoilValue } from 'recoil';
import { useObjectRecordTable } from '@/object-record/hooks/useObjectRecordTable';
+import { useRecordTableScopedStates } from '@/object-record/record-table/hooks/internal/useRecordTableScopedStates';
import { isFetchingMoreRecordsFamilyState } from '@/object-record/states/isFetchingMoreRecordsFamilyState';
-import { useRecordTableScopedStates } from '@/ui/object/record-table/hooks/internal/useRecordTableScopedStates';
export const RecordTableBodyEffect = () => {
const {
diff --git a/front/src/modules/ui/object/record-table/components/RecordTableBodyFetchMoreLoader.tsx b/front/src/modules/object-record/record-table/components/RecordTableBodyFetchMoreLoader.tsx
similarity index 77%
rename from front/src/modules/ui/object/record-table/components/RecordTableBodyFetchMoreLoader.tsx
rename to front/src/modules/object-record/record-table/components/RecordTableBodyFetchMoreLoader.tsx
index ed821ac93..226d7c941 100644
--- a/front/src/modules/ui/object/record-table/components/RecordTableBodyFetchMoreLoader.tsx
+++ b/front/src/modules/object-record/record-table/components/RecordTableBodyFetchMoreLoader.tsx
@@ -2,11 +2,11 @@ import { useInView } from 'react-intersection-observer';
import { useRecoilCallback, useRecoilValue } from 'recoil';
import { useObjectRecordTable } from '@/object-record/hooks/useObjectRecordTable';
+import { StyledRow } from '@/object-record/record-table/components/RecordTableRow';
+import { useRecordTable } from '@/object-record/record-table/hooks/useRecordTable';
+import { isFetchingRecordTableDataState } from '@/object-record/record-table/states/isFetchingRecordTableDataState';
+import { getRecordTableScopedStates } from '@/object-record/record-table/utils/getRecordTableScopedStates';
import { isFetchingMoreRecordsFamilyState } from '@/object-record/states/isFetchingMoreRecordsFamilyState';
-import { StyledRow } from '@/ui/object/record-table/components/RecordTableRow';
-import { useRecordTable } from '@/ui/object/record-table/hooks/useRecordTable';
-import { isFetchingRecordTableDataState } from '@/ui/object/record-table/states/isFetchingRecordTableDataState';
-import { getRecordTableScopedStates } from '@/ui/object/record-table/utils/getRecordTableScopedStates';
export const RecordTableBodyFetchMoreLoader = () => {
const { queryStateIdentifier } = useObjectRecordTable();
diff --git a/front/src/modules/ui/object/record-table/components/RecordTableCell.tsx b/front/src/modules/object-record/record-table/components/RecordTableCell.tsx
similarity index 93%
rename from front/src/modules/ui/object/record-table/components/RecordTableCell.tsx
rename to front/src/modules/object-record/record-table/components/RecordTableCell.tsx
index 1acdbb528..0f7389453 100644
--- a/front/src/modules/ui/object/record-table/components/RecordTableCell.tsx
+++ b/front/src/modules/object-record/record-table/components/RecordTableCell.tsx
@@ -1,10 +1,10 @@
import { useContext } from 'react';
import { useRecoilValue, useSetRecoilState } from 'recoil';
-import { RelationPickerHotkeyScope } from '@/ui/input/relation-picker/types/RelationPickerHotkeyScope';
+import { useRecordTableScopedStates } from '@/object-record/record-table/hooks/internal/useRecordTableScopedStates';
+import { RelationPickerHotkeyScope } from '@/object-record/relation-picker/types/RelationPickerHotkeyScope';
import { contextMenuIsOpenState } from '@/ui/navigation/context-menu/states/contextMenuIsOpenState';
import { contextMenuPositionState } from '@/ui/navigation/context-menu/states/contextMenuPositionState';
-import { useRecordTableScopedStates } from '@/ui/object/record-table/hooks/internal/useRecordTableScopedStates';
import { RecoilScope } from '@/ui/utilities/recoil-scope/components/RecoilScope';
import { FieldContext } from '../../field/contexts/FieldContext';
diff --git a/front/src/modules/ui/object/record-table/components/RecordTableColumnDropdownMenu.tsx b/front/src/modules/object-record/record-table/components/RecordTableColumnDropdownMenu.tsx
similarity index 96%
rename from front/src/modules/ui/object/record-table/components/RecordTableColumnDropdownMenu.tsx
rename to front/src/modules/object-record/record-table/components/RecordTableColumnDropdownMenu.tsx
index 902b7a01d..1b08faf20 100644
--- a/front/src/modules/ui/object/record-table/components/RecordTableColumnDropdownMenu.tsx
+++ b/front/src/modules/object-record/record-table/components/RecordTableColumnDropdownMenu.tsx
@@ -1,8 +1,8 @@
+import { FieldMetadata } from '@/object-record/field/types/FieldMetadata';
import { IconArrowLeft, IconArrowRight, IconEyeOff } from '@/ui/display/icon';
import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
import { useDropdown } from '@/ui/layout/dropdown/hooks/useDropdown';
import { MenuItem } from '@/ui/navigation/menu-item/components/MenuItem';
-import { FieldMetadata } from '@/ui/object/field/types/FieldMetadata';
import { useTableColumns } from '../hooks/useTableColumns';
import { ColumnDefinition } from '../types/ColumnDefinition';
diff --git a/front/src/modules/ui/object/record-table/components/RecordTableHeader.tsx b/front/src/modules/object-record/record-table/components/RecordTableHeader.tsx
similarity index 96%
rename from front/src/modules/ui/object/record-table/components/RecordTableHeader.tsx
rename to front/src/modules/object-record/record-table/components/RecordTableHeader.tsx
index ceb90df77..5d26421fd 100644
--- a/front/src/modules/ui/object/record-table/components/RecordTableHeader.tsx
+++ b/front/src/modules/object-record/record-table/components/RecordTableHeader.tsx
@@ -2,10 +2,10 @@ import { useTheme } from '@emotion/react';
import styled from '@emotion/styled';
import { useRecoilValue } from 'recoil';
+import { RecordTableHeaderCell } from '@/object-record/record-table/components/RecordTableHeaderCell';
import { IconPlus } from '@/ui/display/icon';
import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
import { DropdownScope } from '@/ui/layout/dropdown/scopes/DropdownScope';
-import { RecordTableHeaderCell } from '@/ui/object/record-table/components/RecordTableHeaderCell';
import { useRecordTableScopedStates } from '../hooks/internal/useRecordTableScopedStates';
diff --git a/front/src/modules/ui/object/record-table/components/RecordTableHeaderCell.tsx b/front/src/modules/object-record/record-table/components/RecordTableHeaderCell.tsx
similarity index 92%
rename from front/src/modules/ui/object/record-table/components/RecordTableHeaderCell.tsx
rename to front/src/modules/object-record/record-table/components/RecordTableHeaderCell.tsx
index 45b45999c..8c6e6933f 100644
--- a/front/src/modules/ui/object/record-table/components/RecordTableHeaderCell.tsx
+++ b/front/src/modules/object-record/record-table/components/RecordTableHeaderCell.tsx
@@ -2,13 +2,13 @@ import { useCallback, useState } from 'react';
import styled from '@emotion/styled';
import { useRecoilCallback, useRecoilState, useRecoilValue } from 'recoil';
+import { FieldMetadata } from '@/object-record/field/types/FieldMetadata';
+import { useRecordTableScopedStates } from '@/object-record/record-table/hooks/internal/useRecordTableScopedStates';
+import { useTableColumns } from '@/object-record/record-table/hooks/useTableColumns';
+import { resizeFieldOffsetState } from '@/object-record/record-table/states/resizeFieldOffsetState';
+import { ColumnDefinition } from '@/object-record/record-table/types/ColumnDefinition';
import { IconPlus } from '@/ui/display/icon';
import { LightIconButton } from '@/ui/input/button/components/LightIconButton';
-import { FieldMetadata } from '@/ui/object/field/types/FieldMetadata';
-import { useRecordTableScopedStates } from '@/ui/object/record-table/hooks/internal/useRecordTableScopedStates';
-import { useTableColumns } from '@/ui/object/record-table/hooks/useTableColumns';
-import { resizeFieldOffsetState } from '@/ui/object/record-table/states/resizeFieldOffsetState';
-import { ColumnDefinition } from '@/ui/object/record-table/types/ColumnDefinition';
import { useTrackPointer } from '@/ui/utilities/pointer-event/hooks/useTrackPointer';
import { ColumnHeadWithDropdown } from './ColumnHeadWithDropdown';
diff --git a/front/src/modules/ui/object/record-table/components/RecordTableHeaderPlusButtonContent.tsx b/front/src/modules/object-record/record-table/components/RecordTableHeaderPlusButtonContent.tsx
similarity index 100%
rename from front/src/modules/ui/object/record-table/components/RecordTableHeaderPlusButtonContent.tsx
rename to front/src/modules/object-record/record-table/components/RecordTableHeaderPlusButtonContent.tsx
diff --git a/front/src/modules/ui/object/record-table/components/RecordTableInternalEffect.tsx b/front/src/modules/object-record/record-table/components/RecordTableInternalEffect.tsx
similarity index 85%
rename from front/src/modules/ui/object/record-table/components/RecordTableInternalEffect.tsx
rename to front/src/modules/object-record/record-table/components/RecordTableInternalEffect.tsx
index 4a212475c..cbb1241e6 100644
--- a/front/src/modules/ui/object/record-table/components/RecordTableInternalEffect.tsx
+++ b/front/src/modules/object-record/record-table/components/RecordTableInternalEffect.tsx
@@ -1,5 +1,5 @@
-import { useRecordTable } from '@/ui/object/record-table/hooks/useRecordTable';
-import { TableHotkeyScope } from '@/ui/object/record-table/types/TableHotkeyScope';
+import { useRecordTable } from '@/object-record/record-table/hooks/useRecordTable';
+import { TableHotkeyScope } from '@/object-record/record-table/types/TableHotkeyScope';
import { useScopedHotkeys } from '@/ui/utilities/hotkey/hooks/useScopedHotkeys';
import {
useListenClickOutside,
diff --git a/front/src/modules/ui/object/record-table/components/RecordTableRow.tsx b/front/src/modules/object-record/record-table/components/RecordTableRow.tsx
similarity index 100%
rename from front/src/modules/ui/object/record-table/components/RecordTableRow.tsx
rename to front/src/modules/object-record/record-table/components/RecordTableRow.tsx
diff --git a/front/src/modules/ui/object/record-table/components/SelectAllCheckbox.tsx b/front/src/modules/object-record/record-table/components/SelectAllCheckbox.tsx
similarity index 100%
rename from front/src/modules/ui/object/record-table/components/SelectAllCheckbox.tsx
rename to front/src/modules/object-record/record-table/components/SelectAllCheckbox.tsx
diff --git a/front/src/modules/ui/object/record-table/constants/ColumnHeadDropdownId.ts b/front/src/modules/object-record/record-table/constants/ColumnHeadDropdownId.ts
similarity index 100%
rename from front/src/modules/ui/object/record-table/constants/ColumnHeadDropdownId.ts
rename to front/src/modules/object-record/record-table/constants/ColumnHeadDropdownId.ts
diff --git a/front/src/modules/ui/object/record-table/constants/TableOptionsDropdownId.ts b/front/src/modules/object-record/record-table/constants/TableOptionsDropdownId.ts
similarity index 100%
rename from front/src/modules/ui/object/record-table/constants/TableOptionsDropdownId.ts
rename to front/src/modules/object-record/record-table/constants/TableOptionsDropdownId.ts
diff --git a/front/src/modules/ui/object/record-table/context-menu/components/RecordTableContextMenu.tsx b/front/src/modules/object-record/record-table/context-menu/components/RecordTableContextMenu.tsx
similarity index 100%
rename from front/src/modules/ui/object/record-table/context-menu/components/RecordTableContextMenu.tsx
rename to front/src/modules/object-record/record-table/context-menu/components/RecordTableContextMenu.tsx
diff --git a/front/src/modules/ui/object/record-table/contexts/CellHotkeyScopeContext.ts b/front/src/modules/object-record/record-table/contexts/CellHotkeyScopeContext.ts
similarity index 100%
rename from front/src/modules/ui/object/record-table/contexts/CellHotkeyScopeContext.ts
rename to front/src/modules/object-record/record-table/contexts/CellHotkeyScopeContext.ts
diff --git a/front/src/modules/ui/object/record-table/contexts/ColumnContext.ts b/front/src/modules/object-record/record-table/contexts/ColumnContext.ts
similarity index 72%
rename from front/src/modules/ui/object/record-table/contexts/ColumnContext.ts
rename to front/src/modules/object-record/record-table/contexts/ColumnContext.ts
index 494c09a7f..30fbaa2bc 100644
--- a/front/src/modules/ui/object/record-table/contexts/ColumnContext.ts
+++ b/front/src/modules/object-record/record-table/contexts/ColumnContext.ts
@@ -1,6 +1,6 @@
import { createContext } from 'react';
-import { FieldMetadata } from '@/ui/object/field/types/FieldMetadata';
+import { FieldMetadata } from '@/object-record/field/types/FieldMetadata';
import { ColumnDefinition } from '../types/ColumnDefinition';
diff --git a/front/src/modules/ui/object/record-table/contexts/ColumnIndexContext.ts b/front/src/modules/object-record/record-table/contexts/ColumnIndexContext.ts
similarity index 100%
rename from front/src/modules/ui/object/record-table/contexts/ColumnIndexContext.ts
rename to front/src/modules/object-record/record-table/contexts/ColumnIndexContext.ts
diff --git a/front/src/modules/ui/object/record-table/contexts/EntityUpdateMutationHookContext.ts b/front/src/modules/object-record/record-table/contexts/EntityUpdateMutationHookContext.ts
similarity index 100%
rename from front/src/modules/ui/object/record-table/contexts/EntityUpdateMutationHookContext.ts
rename to front/src/modules/object-record/record-table/contexts/EntityUpdateMutationHookContext.ts
diff --git a/front/src/modules/ui/object/record-table/contexts/RowIdContext.ts b/front/src/modules/object-record/record-table/contexts/RowIdContext.ts
similarity index 100%
rename from front/src/modules/ui/object/record-table/contexts/RowIdContext.ts
rename to front/src/modules/object-record/record-table/contexts/RowIdContext.ts
diff --git a/front/src/modules/ui/object/record-table/contexts/RowIndexContext.ts b/front/src/modules/object-record/record-table/contexts/RowIndexContext.ts
similarity index 100%
rename from front/src/modules/ui/object/record-table/contexts/RowIndexContext.ts
rename to front/src/modules/object-record/record-table/contexts/RowIndexContext.ts
diff --git a/front/src/modules/ui/object/record-table/hooks/internal/useCloseCurrentTableCellInEditMode.ts b/front/src/modules/object-record/record-table/hooks/internal/useCloseCurrentTableCellInEditMode.ts
similarity index 100%
rename from front/src/modules/ui/object/record-table/hooks/internal/useCloseCurrentTableCellInEditMode.ts
rename to front/src/modules/object-record/record-table/hooks/internal/useCloseCurrentTableCellInEditMode.ts
diff --git a/front/src/modules/ui/object/record-table/hooks/internal/useDisableSoftFocus.ts b/front/src/modules/object-record/record-table/hooks/internal/useDisableSoftFocus.ts
similarity index 100%
rename from front/src/modules/ui/object/record-table/hooks/internal/useDisableSoftFocus.ts
rename to front/src/modules/object-record/record-table/hooks/internal/useDisableSoftFocus.ts
diff --git a/front/src/modules/ui/object/record-table/hooks/internal/useGetIsSomeCellInEditMode.ts b/front/src/modules/object-record/record-table/hooks/internal/useGetIsSomeCellInEditMode.ts
similarity index 100%
rename from front/src/modules/ui/object/record-table/hooks/internal/useGetIsSomeCellInEditMode.ts
rename to front/src/modules/object-record/record-table/hooks/internal/useGetIsSomeCellInEditMode.ts
diff --git a/front/src/modules/ui/object/record-table/hooks/internal/useLeaveTableFocus.ts b/front/src/modules/object-record/record-table/hooks/internal/useLeaveTableFocus.ts
similarity index 100%
rename from front/src/modules/ui/object/record-table/hooks/internal/useLeaveTableFocus.ts
rename to front/src/modules/object-record/record-table/hooks/internal/useLeaveTableFocus.ts
diff --git a/front/src/modules/ui/object/record-table/hooks/internal/useMoveEditModeToCellPosition.ts b/front/src/modules/object-record/record-table/hooks/internal/useMoveEditModeToCellPosition.ts
similarity index 100%
rename from front/src/modules/ui/object/record-table/hooks/internal/useMoveEditModeToCellPosition.ts
rename to front/src/modules/object-record/record-table/hooks/internal/useMoveEditModeToCellPosition.ts
diff --git a/front/src/modules/ui/object/record-table/hooks/internal/useRecordTableScopedStates.ts b/front/src/modules/object-record/record-table/hooks/internal/useRecordTableScopedStates.ts
similarity index 89%
rename from front/src/modules/ui/object/record-table/hooks/internal/useRecordTableScopedStates.ts
rename to front/src/modules/object-record/record-table/hooks/internal/useRecordTableScopedStates.ts
index 7321e1f2d..3f786b12d 100644
--- a/front/src/modules/ui/object/record-table/hooks/internal/useRecordTableScopedStates.ts
+++ b/front/src/modules/object-record/record-table/hooks/internal/useRecordTableScopedStates.ts
@@ -1,4 +1,4 @@
-import { RecordTableScopeInternalContext } from '@/ui/object/record-table/scopes/scope-internal-context/RecordTableScopeInternalContext';
+import { RecordTableScopeInternalContext } from '@/object-record/record-table/scopes/scope-internal-context/RecordTableScopeInternalContext';
import { useAvailableScopeIdOrThrow } from '@/ui/utilities/recoil-scope/scopes-internal/hooks/useAvailableScopeId';
import { getRecordTableScopedStates } from '../../utils/getRecordTableScopedStates';
diff --git a/front/src/modules/ui/object/record-table/hooks/internal/useResetTableRowSelection.ts b/front/src/modules/object-record/record-table/hooks/internal/useResetTableRowSelection.ts
similarity index 100%
rename from front/src/modules/ui/object/record-table/hooks/internal/useResetTableRowSelection.ts
rename to front/src/modules/object-record/record-table/hooks/internal/useResetTableRowSelection.ts
diff --git a/front/src/modules/ui/object/record-table/hooks/internal/useSelectAllRows.ts b/front/src/modules/object-record/record-table/hooks/internal/useSelectAllRows.ts
similarity index 100%
rename from front/src/modules/ui/object/record-table/hooks/internal/useSelectAllRows.ts
rename to front/src/modules/object-record/record-table/hooks/internal/useSelectAllRows.ts
diff --git a/front/src/modules/ui/object/record-table/hooks/internal/useSetRecordTableData.ts b/front/src/modules/object-record/record-table/hooks/internal/useSetRecordTableData.ts
similarity index 94%
rename from front/src/modules/ui/object/record-table/hooks/internal/useSetRecordTableData.ts
rename to front/src/modules/object-record/record-table/hooks/internal/useSetRecordTableData.ts
index 7c8a4cbb8..d1a17d293 100644
--- a/front/src/modules/ui/object/record-table/hooks/internal/useSetRecordTableData.ts
+++ b/front/src/modules/object-record/record-table/hooks/internal/useSetRecordTableData.ts
@@ -1,6 +1,6 @@
import { useRecoilCallback } from 'recoil';
-import { entityFieldsFamilyState } from '@/ui/object/field/states/entityFieldsFamilyState';
+import { entityFieldsFamilyState } from '@/object-record/field/states/entityFieldsFamilyState';
import { isDeeplyEqual } from '~/utils/isDeeplyEqual';
import { isFetchingRecordTableDataState } from '../../states/isFetchingRecordTableDataState';
diff --git a/front/src/modules/ui/object/record-table/hooks/internal/useSetRowSelectedState.ts b/front/src/modules/object-record/record-table/hooks/internal/useSetRowSelectedState.ts
similarity index 100%
rename from front/src/modules/ui/object/record-table/hooks/internal/useSetRowSelectedState.ts
rename to front/src/modules/object-record/record-table/hooks/internal/useSetRowSelectedState.ts
diff --git a/front/src/modules/ui/object/record-table/hooks/internal/useSetSoftFocusPosition.ts b/front/src/modules/object-record/record-table/hooks/internal/useSetSoftFocusPosition.ts
similarity index 100%
rename from front/src/modules/ui/object/record-table/hooks/internal/useSetSoftFocusPosition.ts
rename to front/src/modules/object-record/record-table/hooks/internal/useSetSoftFocusPosition.ts
diff --git a/front/src/modules/ui/object/record-table/hooks/internal/useUpsertRecordTableItem.ts b/front/src/modules/object-record/record-table/hooks/internal/useUpsertRecordTableItem.ts
similarity index 84%
rename from front/src/modules/ui/object/record-table/hooks/internal/useUpsertRecordTableItem.ts
rename to front/src/modules/object-record/record-table/hooks/internal/useUpsertRecordTableItem.ts
index 4b9fbb1d7..bacbb1ae9 100644
--- a/front/src/modules/ui/object/record-table/hooks/internal/useUpsertRecordTableItem.ts
+++ b/front/src/modules/object-record/record-table/hooks/internal/useUpsertRecordTableItem.ts
@@ -1,6 +1,6 @@
import { useRecoilCallback } from 'recoil';
-import { entityFieldsFamilyState } from '@/ui/object/field/states/entityFieldsFamilyState';
+import { entityFieldsFamilyState } from '@/object-record/field/states/entityFieldsFamilyState';
import { isDeeplyEqual } from '~/utils/isDeeplyEqual';
export const useUpsertRecordTableItem = () =>
diff --git a/front/src/modules/ui/object/record-table/hooks/useRecordTable.ts b/front/src/modules/object-record/record-table/hooks/useRecordTable.ts
similarity index 97%
rename from front/src/modules/ui/object/record-table/hooks/useRecordTable.ts
rename to front/src/modules/object-record/record-table/hooks/useRecordTable.ts
index 00cf99206..07ee5b0c6 100644
--- a/front/src/modules/ui/object/record-table/hooks/useRecordTable.ts
+++ b/front/src/modules/object-record/record-table/hooks/useRecordTable.ts
@@ -1,8 +1,8 @@
import { useRecoilCallback, useSetRecoilState } from 'recoil';
import { Key } from 'ts-key-enum';
-import { RecordTableScopeInternalContext } from '@/ui/object/record-table/scopes/scope-internal-context/RecordTableScopeInternalContext';
-import { onColumnsChangeScopedState } from '@/ui/object/record-table/states/onColumnsChangeScopedState';
+import { RecordTableScopeInternalContext } from '@/object-record/record-table/scopes/scope-internal-context/RecordTableScopeInternalContext';
+import { onColumnsChangeScopedState } from '@/object-record/record-table/states/onColumnsChangeScopedState';
import { useScopedHotkeys } from '@/ui/utilities/hotkey/hooks/useScopedHotkeys';
import { useSetHotkeyScope } from '@/ui/utilities/hotkey/hooks/useSetHotkeyScope';
import { useAvailableScopeIdOrThrow } from '@/ui/utilities/recoil-scope/scopes-internal/hooks/useAvailableScopeId';
diff --git a/front/src/modules/ui/object/record-table/hooks/useTableColumns.ts b/front/src/modules/object-record/record-table/hooks/useTableColumns.ts
similarity index 92%
rename from front/src/modules/ui/object/record-table/hooks/useTableColumns.ts
rename to front/src/modules/object-record/record-table/hooks/useTableColumns.ts
index 0eedb80b8..b80e8450d 100644
--- a/front/src/modules/ui/object/record-table/hooks/useTableColumns.ts
+++ b/front/src/modules/object-record/record-table/hooks/useTableColumns.ts
@@ -1,9 +1,9 @@
import { useCallback } from 'react';
import { useRecoilValue } from 'recoil';
-import { FieldMetadata } from '@/ui/object/field/types/FieldMetadata';
-import { useRecordTable } from '@/ui/object/record-table/hooks/useRecordTable';
-import { RecordTableScopeInternalContext } from '@/ui/object/record-table/scopes/scope-internal-context/RecordTableScopeInternalContext';
+import { FieldMetadata } from '@/object-record/field/types/FieldMetadata';
+import { useRecordTable } from '@/object-record/record-table/hooks/useRecordTable';
+import { RecordTableScopeInternalContext } from '@/object-record/record-table/scopes/scope-internal-context/RecordTableScopeInternalContext';
import { useAvailableScopeIdOrThrow } from '@/ui/utilities/recoil-scope/scopes-internal/hooks/useAvailableScopeId';
import { useMoveViewColumns } from '@/views/hooks/useMoveViewColumns';
diff --git a/front/src/modules/ui/object/record-table/options/components/TableOptionsDropdown.tsx b/front/src/modules/object-record/record-table/options/components/TableOptionsDropdown.tsx
similarity index 100%
rename from front/src/modules/ui/object/record-table/options/components/TableOptionsDropdown.tsx
rename to front/src/modules/object-record/record-table/options/components/TableOptionsDropdown.tsx
diff --git a/front/src/modules/ui/object/record-table/options/components/TableOptionsDropdownButton.tsx b/front/src/modules/object-record/record-table/options/components/TableOptionsDropdownButton.tsx
similarity index 82%
rename from front/src/modules/ui/object/record-table/options/components/TableOptionsDropdownButton.tsx
rename to front/src/modules/object-record/record-table/options/components/TableOptionsDropdownButton.tsx
index 187f88cff..842d6b698 100644
--- a/front/src/modules/ui/object/record-table/options/components/TableOptionsDropdownButton.tsx
+++ b/front/src/modules/object-record/record-table/options/components/TableOptionsDropdownButton.tsx
@@ -1,6 +1,6 @@
+import { TableOptionsDropdownId } from '@/object-record/record-table/constants/TableOptionsDropdownId';
import { StyledHeaderDropdownButton } from '@/ui/layout/dropdown/components/StyledHeaderDropdownButton';
import { useDropdown } from '@/ui/layout/dropdown/hooks/useDropdown';
-import { TableOptionsDropdownId } from '@/ui/object/record-table/constants/TableOptionsDropdownId';
export const TableOptionsDropdownButton = () => {
const { isDropdownOpen, toggleDropdown } = useDropdown({
diff --git a/front/src/modules/ui/object/record-table/options/components/TableOptionsDropdownContent.tsx b/front/src/modules/object-record/record-table/options/components/TableOptionsDropdownContent.tsx
similarity index 100%
rename from front/src/modules/ui/object/record-table/options/components/TableOptionsDropdownContent.tsx
rename to front/src/modules/object-record/record-table/options/components/TableOptionsDropdownContent.tsx
diff --git a/front/src/modules/ui/object/record-table/record-table-cell/components/RecordTableCell.tsx b/front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCell.tsx
similarity index 87%
rename from front/src/modules/ui/object/record-table/record-table-cell/components/RecordTableCell.tsx
rename to front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCell.tsx
index c6ad66b08..e4945a2e4 100644
--- a/front/src/modules/ui/object/record-table/record-table-cell/components/RecordTableCell.tsx
+++ b/front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCell.tsx
@@ -1,6 +1,6 @@
-import { FieldDisplay } from '@/ui/object/field/components/FieldDisplay';
-import { FieldInput } from '@/ui/object/field/components/FieldInput';
-import { FieldInputEvent } from '@/ui/object/field/types/FieldInputEvent';
+import { FieldDisplay } from '@/object-record/field/components/FieldDisplay';
+import { FieldInput } from '@/object-record/field/components/FieldInput';
+import { FieldInputEvent } from '@/object-record/field/types/FieldInputEvent';
import { HotkeyScope } from '@/ui/utilities/hotkey/types/HotkeyScope';
import { useRecordTable } from '../../hooks/useRecordTable';
diff --git a/front/src/modules/ui/object/record-table/record-table-cell/components/RecordTableCellButton.tsx b/front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellButton.tsx
similarity index 100%
rename from front/src/modules/ui/object/record-table/record-table-cell/components/RecordTableCellButton.tsx
rename to front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellButton.tsx
diff --git a/front/src/modules/ui/object/record-table/record-table-cell/components/RecordTableCellContainer.tsx b/front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellContainer.tsx
similarity index 92%
rename from front/src/modules/ui/object/record-table/record-table-cell/components/RecordTableCellContainer.tsx
rename to front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellContainer.tsx
index 540c19875..31cb5279d 100644
--- a/front/src/modules/ui/object/record-table/record-table-cell/components/RecordTableCellContainer.tsx
+++ b/front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellContainer.tsx
@@ -1,11 +1,11 @@
import { ReactElement, useContext, useState } from 'react';
import styled from '@emotion/styled';
+import { useGetButtonIcon } from '@/object-record/field/hooks/useGetButtonIcon';
+import { useIsFieldEmpty } from '@/object-record/field/hooks/useIsFieldEmpty';
+import { useIsFieldInputOnly } from '@/object-record/field/hooks/useIsFieldInputOnly';
+import { useGetIsSomeCellInEditMode } from '@/object-record/record-table/hooks/internal/useGetIsSomeCellInEditMode';
import { IconArrowUpRight } from '@/ui/display/icon';
-import { useGetButtonIcon } from '@/ui/object/field/hooks/useGetButtonIcon';
-import { useIsFieldEmpty } from '@/ui/object/field/hooks/useIsFieldEmpty';
-import { useIsFieldInputOnly } from '@/ui/object/field/hooks/useIsFieldInputOnly';
-import { useGetIsSomeCellInEditMode } from '@/ui/object/record-table/hooks/internal/useGetIsSomeCellInEditMode';
import { HotkeyScope } from '@/ui/utilities/hotkey/types/HotkeyScope';
import { CellHotkeyScopeContext } from '../../contexts/CellHotkeyScopeContext';
diff --git a/front/src/modules/ui/object/record-table/record-table-cell/components/RecordTableCellDisplayContainer.tsx b/front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellDisplayContainer.tsx
similarity index 100%
rename from front/src/modules/ui/object/record-table/record-table-cell/components/RecordTableCellDisplayContainer.tsx
rename to front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellDisplayContainer.tsx
diff --git a/front/src/modules/ui/object/record-table/record-table-cell/components/RecordTableCellDisplayMode.tsx b/front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellDisplayMode.tsx
similarity index 89%
rename from front/src/modules/ui/object/record-table/record-table-cell/components/RecordTableCellDisplayMode.tsx
rename to front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellDisplayMode.tsx
index 6e43fd755..ebd98aa02 100644
--- a/front/src/modules/ui/object/record-table/record-table-cell/components/RecordTableCellDisplayMode.tsx
+++ b/front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellDisplayMode.tsx
@@ -1,4 +1,4 @@
-import { useIsFieldInputOnly } from '@/ui/object/field/hooks/useIsFieldInputOnly';
+import { useIsFieldInputOnly } from '@/object-record/field/hooks/useIsFieldInputOnly';
import { useSetSoftFocusOnCurrentTableCell } from '../hooks/useSetSoftFocusOnCurrentTableCell';
import { useTableCell } from '../hooks/useTableCell';
diff --git a/front/src/modules/ui/object/record-table/record-table-cell/components/RecordTableCellEditButton.tsx b/front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellEditButton.tsx
similarity index 100%
rename from front/src/modules/ui/object/record-table/record-table-cell/components/RecordTableCellEditButton.tsx
rename to front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellEditButton.tsx
diff --git a/front/src/modules/ui/object/record-table/record-table-cell/components/RecordTableCellEditMode.tsx b/front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellEditMode.tsx
similarity index 100%
rename from front/src/modules/ui/object/record-table/record-table-cell/components/RecordTableCellEditMode.tsx
rename to front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellEditMode.tsx
diff --git a/front/src/modules/ui/object/record-table/record-table-cell/components/RecordTableCellSoftFocusMode.tsx b/front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellSoftFocusMode.tsx
similarity index 93%
rename from front/src/modules/ui/object/record-table/record-table-cell/components/RecordTableCellSoftFocusMode.tsx
rename to front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellSoftFocusMode.tsx
index bb5e6dbf4..8ab297580 100644
--- a/front/src/modules/ui/object/record-table/record-table-cell/components/RecordTableCellSoftFocusMode.tsx
+++ b/front/src/modules/object-record/record-table/record-table-cell/components/RecordTableCellSoftFocusMode.tsx
@@ -1,8 +1,8 @@
import { PropsWithChildren, useEffect, useRef } from 'react';
import { Key } from 'ts-key-enum';
-import { useIsFieldInputOnly } from '@/ui/object/field/hooks/useIsFieldInputOnly';
-import { useToggleEditOnlyInput } from '@/ui/object/field/hooks/useToggleEditOnlyInput';
+import { useIsFieldInputOnly } from '@/object-record/field/hooks/useIsFieldInputOnly';
+import { useToggleEditOnlyInput } from '@/object-record/field/hooks/useToggleEditOnlyInput';
import { useScopedHotkeys } from '@/ui/utilities/hotkey/hooks/useScopedHotkeys';
import { isNonTextWritingKey } from '@/ui/utilities/hotkey/utils/isNonTextWritingKey';
diff --git a/front/src/modules/ui/object/record-table/record-table-cell/hooks/useCurrentCellPosition.ts b/front/src/modules/object-record/record-table/record-table-cell/hooks/useCurrentCellPosition.ts
similarity index 100%
rename from front/src/modules/ui/object/record-table/record-table-cell/hooks/useCurrentCellPosition.ts
rename to front/src/modules/object-record/record-table/record-table-cell/hooks/useCurrentCellPosition.ts
diff --git a/front/src/modules/ui/object/record-table/record-table-cell/hooks/useCurrentTableCellEditMode.ts b/front/src/modules/object-record/record-table/record-table-cell/hooks/useCurrentTableCellEditMode.ts
similarity index 100%
rename from front/src/modules/ui/object/record-table/record-table-cell/hooks/useCurrentTableCellEditMode.ts
rename to front/src/modules/object-record/record-table/record-table-cell/hooks/useCurrentTableCellEditMode.ts
diff --git a/front/src/modules/ui/object/record-table/record-table-cell/hooks/useIsSoftFocusOnCurrentTableCell.ts b/front/src/modules/object-record/record-table/record-table-cell/hooks/useIsSoftFocusOnCurrentTableCell.ts
similarity index 100%
rename from front/src/modules/ui/object/record-table/record-table-cell/hooks/useIsSoftFocusOnCurrentTableCell.ts
rename to front/src/modules/object-record/record-table/record-table-cell/hooks/useIsSoftFocusOnCurrentTableCell.ts
diff --git a/front/src/modules/ui/object/record-table/record-table-cell/hooks/useMoveSoftFocusToCurrentCellOnHover.ts b/front/src/modules/object-record/record-table/record-table-cell/hooks/useMoveSoftFocusToCurrentCellOnHover.ts
similarity index 100%
rename from front/src/modules/ui/object/record-table/record-table-cell/hooks/useMoveSoftFocusToCurrentCellOnHover.ts
rename to front/src/modules/object-record/record-table/record-table-cell/hooks/useMoveSoftFocusToCurrentCellOnHover.ts
diff --git a/front/src/modules/ui/object/record-table/record-table-cell/hooks/useSetSoftFocusOnCurrentTableCell.ts b/front/src/modules/object-record/record-table/record-table-cell/hooks/useSetSoftFocusOnCurrentTableCell.ts
similarity index 100%
rename from front/src/modules/ui/object/record-table/record-table-cell/hooks/useSetSoftFocusOnCurrentTableCell.ts
rename to front/src/modules/object-record/record-table/record-table-cell/hooks/useSetSoftFocusOnCurrentTableCell.ts
diff --git a/front/src/modules/ui/object/record-table/record-table-cell/hooks/useTableCell.ts b/front/src/modules/object-record/record-table/record-table-cell/hooks/useTableCell.ts
similarity index 85%
rename from front/src/modules/ui/object/record-table/record-table-cell/hooks/useTableCell.ts
rename to front/src/modules/object-record/record-table/record-table-cell/hooks/useTableCell.ts
index a8202104a..166440af6 100644
--- a/front/src/modules/ui/object/record-table/record-table-cell/hooks/useTableCell.ts
+++ b/front/src/modules/object-record/record-table/record-table-cell/hooks/useTableCell.ts
@@ -2,11 +2,11 @@ import { useContext } from 'react';
import { useNavigate } from 'react-router-dom';
import { useRecoilState, useRecoilValue } from 'recoil';
-import { FieldContext } from '@/ui/object/field/contexts/FieldContext';
-import { useIsFieldEmpty } from '@/ui/object/field/hooks/useIsFieldEmpty';
-import { entityFieldInitialValueFamilyState } from '@/ui/object/field/states/entityFieldInitialValueFamilyState';
-import { FieldInitialValue } from '@/ui/object/field/types/FieldInitialValue';
-import { useRecordTableScopedStates } from '@/ui/object/record-table/hooks/internal/useRecordTableScopedStates';
+import { FieldContext } from '@/object-record/field/contexts/FieldContext';
+import { useIsFieldEmpty } from '@/object-record/field/hooks/useIsFieldEmpty';
+import { entityFieldInitialValueFamilyState } from '@/object-record/field/states/entityFieldInitialValueFamilyState';
+import { FieldInitialValue } from '@/object-record/field/types/FieldInitialValue';
+import { useRecordTableScopedStates } from '@/object-record/record-table/hooks/internal/useRecordTableScopedStates';
import { useDragSelect } from '@/ui/utilities/drag-select/hooks/useDragSelect';
import { useSetHotkeyScope } from '@/ui/utilities/hotkey/hooks/useSetHotkeyScope';
import { HotkeyScope } from '@/ui/utilities/hotkey/types/HotkeyScope';
diff --git a/front/src/modules/ui/object/record-table/record-table-cell/states/isCreateModeScopedState.ts b/front/src/modules/object-record/record-table/record-table-cell/states/isCreateModeScopedState.ts
similarity index 100%
rename from front/src/modules/ui/object/record-table/record-table-cell/states/isCreateModeScopedState.ts
rename to front/src/modules/object-record/record-table/record-table-cell/states/isCreateModeScopedState.ts
diff --git a/front/src/modules/ui/object/record-table/record-table-row/hooks/useCurrentRowSelected.ts b/front/src/modules/object-record/record-table/record-table-row/hooks/useCurrentRowSelected.ts
similarity index 100%
rename from front/src/modules/ui/object/record-table/record-table-row/hooks/useCurrentRowSelected.ts
rename to front/src/modules/object-record/record-table/record-table-row/hooks/useCurrentRowSelected.ts
diff --git a/front/src/modules/ui/object/record-table/record-table-row/states/isRowSelectedFamilyState.ts b/front/src/modules/object-record/record-table/record-table-row/states/isRowSelectedFamilyState.ts
similarity index 100%
rename from front/src/modules/ui/object/record-table/record-table-row/states/isRowSelectedFamilyState.ts
rename to front/src/modules/object-record/record-table/record-table-row/states/isRowSelectedFamilyState.ts
diff --git a/front/src/modules/ui/object/record-table/scopes/RecordTableScope.tsx b/front/src/modules/object-record/record-table/scopes/RecordTableScope.tsx
similarity index 100%
rename from front/src/modules/ui/object/record-table/scopes/RecordTableScope.tsx
rename to front/src/modules/object-record/record-table/scopes/RecordTableScope.tsx
diff --git a/front/src/modules/ui/object/record-table/scopes/RecordTableScopeInitEffect.tsx b/front/src/modules/object-record/record-table/scopes/RecordTableScopeInitEffect.tsx
similarity index 100%
rename from front/src/modules/ui/object/record-table/scopes/RecordTableScopeInitEffect.tsx
rename to front/src/modules/object-record/record-table/scopes/RecordTableScopeInitEffect.tsx
diff --git a/front/src/modules/ui/object/record-table/scopes/scope-internal-context/RecordTableScopeInternalContext.ts b/front/src/modules/object-record/record-table/scopes/scope-internal-context/RecordTableScopeInternalContext.ts
similarity index 87%
rename from front/src/modules/ui/object/record-table/scopes/scope-internal-context/RecordTableScopeInternalContext.ts
rename to front/src/modules/object-record/record-table/scopes/scope-internal-context/RecordTableScopeInternalContext.ts
index 98aa2501d..b63b07132 100644
--- a/front/src/modules/ui/object/record-table/scopes/scope-internal-context/RecordTableScopeInternalContext.ts
+++ b/front/src/modules/object-record/record-table/scopes/scope-internal-context/RecordTableScopeInternalContext.ts
@@ -1,4 +1,4 @@
-import { FieldMetadata } from '@/ui/object/field/types/FieldMetadata';
+import { FieldMetadata } from '@/object-record/field/types/FieldMetadata';
import { ScopedStateKey } from '@/ui/utilities/recoil-scope/scopes-internal/types/ScopedStateKey';
import { createScopeInternalContext } from '@/ui/utilities/recoil-scope/scopes-internal/utils/createScopeInternalContext';
diff --git a/front/src/modules/ui/object/record-table/states/availableTableColumnsScopedState.ts b/front/src/modules/object-record/record-table/states/availableTableColumnsScopedState.ts
similarity index 81%
rename from front/src/modules/ui/object/record-table/states/availableTableColumnsScopedState.ts
rename to front/src/modules/object-record/record-table/states/availableTableColumnsScopedState.ts
index c3a06e985..9b3cf7c7c 100644
--- a/front/src/modules/ui/object/record-table/states/availableTableColumnsScopedState.ts
+++ b/front/src/modules/object-record/record-table/states/availableTableColumnsScopedState.ts
@@ -1,4 +1,4 @@
-import { FieldMetadata } from '@/ui/object/field/types/FieldMetadata';
+import { FieldMetadata } from '@/object-record/field/types/FieldMetadata';
import { createScopedState } from '@/ui/utilities/recoil-scope/utils/createScopedState';
import { ColumnDefinition } from '../types/ColumnDefinition';
diff --git a/front/src/modules/ui/object/record-table/states/currentTableCellInEditModePositionState.ts b/front/src/modules/object-record/record-table/states/currentTableCellInEditModePositionState.ts
similarity index 100%
rename from front/src/modules/ui/object/record-table/states/currentTableCellInEditModePositionState.ts
rename to front/src/modules/object-record/record-table/states/currentTableCellInEditModePositionState.ts
diff --git a/front/src/modules/ui/object/record-table/states/isFetchingRecordTableDataState.ts b/front/src/modules/object-record/record-table/states/isFetchingRecordTableDataState.ts
similarity index 100%
rename from front/src/modules/ui/object/record-table/states/isFetchingRecordTableDataState.ts
rename to front/src/modules/object-record/record-table/states/isFetchingRecordTableDataState.ts
diff --git a/front/src/modules/ui/object/record-table/states/isSoftFocusActiveState.ts b/front/src/modules/object-record/record-table/states/isSoftFocusActiveState.ts
similarity index 100%
rename from front/src/modules/ui/object/record-table/states/isSoftFocusActiveState.ts
rename to front/src/modules/object-record/record-table/states/isSoftFocusActiveState.ts
diff --git a/front/src/modules/ui/object/record-table/states/isSoftFocusOnTableCellFamilyState.ts b/front/src/modules/object-record/record-table/states/isSoftFocusOnTableCellFamilyState.ts
similarity index 100%
rename from front/src/modules/ui/object/record-table/states/isSoftFocusOnTableCellFamilyState.ts
rename to front/src/modules/object-record/record-table/states/isSoftFocusOnTableCellFamilyState.ts
diff --git a/front/src/modules/ui/object/record-table/states/isTableCellInEditModeFamilyState.ts b/front/src/modules/object-record/record-table/states/isTableCellInEditModeFamilyState.ts
similarity index 100%
rename from front/src/modules/ui/object/record-table/states/isTableCellInEditModeFamilyState.ts
rename to front/src/modules/object-record/record-table/states/isTableCellInEditModeFamilyState.ts
diff --git a/front/src/modules/ui/object/record-table/states/numberOfTableRowsState.ts b/front/src/modules/object-record/record-table/states/numberOfTableRowsState.ts
similarity index 100%
rename from front/src/modules/ui/object/record-table/states/numberOfTableRowsState.ts
rename to front/src/modules/object-record/record-table/states/numberOfTableRowsState.ts
diff --git a/front/src/modules/ui/object/record-table/states/objectMetadataConfigScopedState.ts b/front/src/modules/object-record/record-table/states/objectMetadataConfigScopedState.ts
similarity index 73%
rename from front/src/modules/ui/object/record-table/states/objectMetadataConfigScopedState.ts
rename to front/src/modules/object-record/record-table/states/objectMetadataConfigScopedState.ts
index 35817a352..ed3ef2fa4 100644
--- a/front/src/modules/ui/object/record-table/states/objectMetadataConfigScopedState.ts
+++ b/front/src/modules/object-record/record-table/states/objectMetadataConfigScopedState.ts
@@ -1,4 +1,4 @@
-import { ObjectMetadataConfig } from '@/ui/object/record-table/types/ObjectMetadataConfig';
+import { ObjectMetadataConfig } from '@/object-record/record-table/types/ObjectMetadataConfig';
import { createScopedState } from '@/ui/utilities/recoil-scope/utils/createScopedState';
export const objectMetadataConfigScopedState =
diff --git a/front/src/modules/ui/object/record-table/states/onColumnsChangeScopedState.ts b/front/src/modules/object-record/record-table/states/onColumnsChangeScopedState.ts
similarity index 100%
rename from front/src/modules/ui/object/record-table/states/onColumnsChangeScopedState.ts
rename to front/src/modules/object-record/record-table/states/onColumnsChangeScopedState.ts
diff --git a/front/src/modules/ui/object/record-table/states/onEntityCountChange.ts b/front/src/modules/object-record/record-table/states/onEntityCountChange.ts
similarity index 100%
rename from front/src/modules/ui/object/record-table/states/onEntityCountChange.ts
rename to front/src/modules/object-record/record-table/states/onEntityCountChange.ts
diff --git a/front/src/modules/ui/object/record-table/states/resizeFieldOffsetState.ts b/front/src/modules/object-record/record-table/states/resizeFieldOffsetState.ts
similarity index 100%
rename from front/src/modules/ui/object/record-table/states/resizeFieldOffsetState.ts
rename to front/src/modules/object-record/record-table/states/resizeFieldOffsetState.ts
diff --git a/front/src/modules/ui/object/record-table/states/selectors/allRowsSelectedStatusSelector.ts b/front/src/modules/object-record/record-table/states/selectors/allRowsSelectedStatusSelector.ts
similarity index 100%
rename from front/src/modules/ui/object/record-table/states/selectors/allRowsSelectedStatusSelector.ts
rename to front/src/modules/object-record/record-table/states/selectors/allRowsSelectedStatusSelector.ts
diff --git a/front/src/modules/ui/object/record-table/states/selectors/hiddenTableColumnsScopedSelector.ts b/front/src/modules/object-record/record-table/states/selectors/hiddenTableColumnsScopedSelector.ts
similarity index 100%
rename from front/src/modules/ui/object/record-table/states/selectors/hiddenTableColumnsScopedSelector.ts
rename to front/src/modules/object-record/record-table/states/selectors/hiddenTableColumnsScopedSelector.ts
diff --git a/front/src/modules/ui/object/record-table/states/selectors/numberOfTableColumnsScopedSelector.ts b/front/src/modules/object-record/record-table/states/selectors/numberOfTableColumnsScopedSelector.ts
similarity index 100%
rename from front/src/modules/ui/object/record-table/states/selectors/numberOfTableColumnsScopedSelector.ts
rename to front/src/modules/object-record/record-table/states/selectors/numberOfTableColumnsScopedSelector.ts
diff --git a/front/src/modules/ui/object/record-table/states/selectors/selectedRowIdsSelector.ts b/front/src/modules/object-record/record-table/states/selectors/selectedRowIdsSelector.ts
similarity index 100%
rename from front/src/modules/ui/object/record-table/states/selectors/selectedRowIdsSelector.ts
rename to front/src/modules/object-record/record-table/states/selectors/selectedRowIdsSelector.ts
diff --git a/front/src/modules/ui/object/record-table/states/selectors/tableColumnsByKeyScopedSelector.ts b/front/src/modules/object-record/record-table/states/selectors/tableColumnsByKeyScopedSelector.ts
similarity index 88%
rename from front/src/modules/ui/object/record-table/states/selectors/tableColumnsByKeyScopedSelector.ts
rename to front/src/modules/object-record/record-table/states/selectors/tableColumnsByKeyScopedSelector.ts
index 7e4ab5826..d9c47702e 100644
--- a/front/src/modules/ui/object/record-table/states/selectors/tableColumnsByKeyScopedSelector.ts
+++ b/front/src/modules/object-record/record-table/states/selectors/tableColumnsByKeyScopedSelector.ts
@@ -1,6 +1,6 @@
import { selectorFamily } from 'recoil';
-import { FieldMetadata } from '@/ui/object/field/types/FieldMetadata';
+import { FieldMetadata } from '@/object-record/field/types/FieldMetadata';
import { ColumnDefinition } from '../../types/ColumnDefinition';
import { tableColumnsScopedState } from '../tableColumnsScopedState';
diff --git a/front/src/modules/ui/object/record-table/states/selectors/visibleTableColumnsScopedSelector.ts b/front/src/modules/object-record/record-table/states/selectors/visibleTableColumnsScopedSelector.ts
similarity index 100%
rename from front/src/modules/ui/object/record-table/states/selectors/visibleTableColumnsScopedSelector.ts
rename to front/src/modules/object-record/record-table/states/selectors/visibleTableColumnsScopedSelector.ts
diff --git a/front/src/modules/ui/object/record-table/states/softFocusPositionState.ts b/front/src/modules/object-record/record-table/states/softFocusPositionState.ts
similarity index 100%
rename from front/src/modules/ui/object/record-table/states/softFocusPositionState.ts
rename to front/src/modules/object-record/record-table/states/softFocusPositionState.ts
diff --git a/front/src/modules/ui/object/record-table/states/tableColumnsScopedState.ts b/front/src/modules/object-record/record-table/states/tableColumnsScopedState.ts
similarity index 80%
rename from front/src/modules/ui/object/record-table/states/tableColumnsScopedState.ts
rename to front/src/modules/object-record/record-table/states/tableColumnsScopedState.ts
index 412c9417d..45489b2cc 100644
--- a/front/src/modules/ui/object/record-table/states/tableColumnsScopedState.ts
+++ b/front/src/modules/object-record/record-table/states/tableColumnsScopedState.ts
@@ -1,4 +1,4 @@
-import { FieldMetadata } from '@/ui/object/field/types/FieldMetadata';
+import { FieldMetadata } from '@/object-record/field/types/FieldMetadata';
import { createScopedState } from '@/ui/utilities/recoil-scope/utils/createScopedState';
import { ColumnDefinition } from '../types/ColumnDefinition';
diff --git a/front/src/modules/ui/object/record-table/states/tableFiltersScopedState.ts b/front/src/modules/object-record/record-table/states/tableFiltersScopedState.ts
similarity index 100%
rename from front/src/modules/ui/object/record-table/states/tableFiltersScopedState.ts
rename to front/src/modules/object-record/record-table/states/tableFiltersScopedState.ts
diff --git a/front/src/modules/ui/object/record-table/states/tableLastRowVisibleScopedState.ts b/front/src/modules/object-record/record-table/states/tableLastRowVisibleScopedState.ts
similarity index 100%
rename from front/src/modules/ui/object/record-table/states/tableLastRowVisibleScopedState.ts
rename to front/src/modules/object-record/record-table/states/tableLastRowVisibleScopedState.ts
diff --git a/front/src/modules/ui/object/record-table/states/tableRowIdsState.ts b/front/src/modules/object-record/record-table/states/tableRowIdsState.ts
similarity index 100%
rename from front/src/modules/ui/object/record-table/states/tableRowIdsState.ts
rename to front/src/modules/object-record/record-table/states/tableRowIdsState.ts
diff --git a/front/src/modules/ui/object/record-table/states/tableSortsScopedState.ts b/front/src/modules/object-record/record-table/states/tableSortsScopedState.ts
similarity index 100%
rename from front/src/modules/ui/object/record-table/states/tableSortsScopedState.ts
rename to front/src/modules/object-record/record-table/states/tableSortsScopedState.ts
diff --git a/front/src/modules/ui/object/record-table/types/AllRowSelectedStatus.ts b/front/src/modules/object-record/record-table/types/AllRowSelectedStatus.ts
similarity index 100%
rename from front/src/modules/ui/object/record-table/types/AllRowSelectedStatus.ts
rename to front/src/modules/object-record/record-table/types/AllRowSelectedStatus.ts
diff --git a/front/src/modules/ui/object/record-table/types/ColumnDefinition.ts b/front/src/modules/object-record/record-table/types/ColumnDefinition.ts
similarity index 51%
rename from front/src/modules/ui/object/record-table/types/ColumnDefinition.ts
rename to front/src/modules/object-record/record-table/types/ColumnDefinition.ts
index 5b8a64042..077a5c4c9 100644
--- a/front/src/modules/ui/object/record-table/types/ColumnDefinition.ts
+++ b/front/src/modules/object-record/record-table/types/ColumnDefinition.ts
@@ -1,5 +1,5 @@
-import { FieldDefinition } from '@/ui/object/field/types/FieldDefinition';
-import { FieldMetadata } from '@/ui/object/field/types/FieldMetadata';
+import { FieldDefinition } from '@/object-record/field/types/FieldDefinition';
+import { FieldMetadata } from '@/object-record/field/types/FieldMetadata';
export type ColumnDefinition = FieldDefinition & {
size: number;
diff --git a/front/src/modules/ui/object/record-table/types/ObjectMetadataConfig.ts b/front/src/modules/object-record/record-table/types/ObjectMetadataConfig.ts
similarity index 100%
rename from front/src/modules/ui/object/record-table/types/ObjectMetadataConfig.ts
rename to front/src/modules/object-record/record-table/types/ObjectMetadataConfig.ts
diff --git a/front/src/modules/ui/object/record-table/types/TableCellPosition.ts b/front/src/modules/object-record/record-table/types/TableCellPosition.ts
similarity index 100%
rename from front/src/modules/ui/object/record-table/types/TableCellPosition.ts
rename to front/src/modules/object-record/record-table/types/TableCellPosition.ts
diff --git a/front/src/modules/ui/object/record-table/types/TableDimensions.ts b/front/src/modules/object-record/record-table/types/TableDimensions.ts
similarity index 100%
rename from front/src/modules/ui/object/record-table/types/TableDimensions.ts
rename to front/src/modules/object-record/record-table/types/TableDimensions.ts
diff --git a/front/src/modules/ui/object/record-table/types/TableHotkeyScope.ts b/front/src/modules/object-record/record-table/types/TableHotkeyScope.ts
similarity index 100%
rename from front/src/modules/ui/object/record-table/types/TableHotkeyScope.ts
rename to front/src/modules/object-record/record-table/types/TableHotkeyScope.ts
diff --git a/front/src/modules/ui/object/record-table/types/TableOptionsHotkeyScope.ts b/front/src/modules/object-record/record-table/types/TableOptionsHotkeyScope.ts
similarity index 100%
rename from front/src/modules/ui/object/record-table/types/TableOptionsHotkeyScope.ts
rename to front/src/modules/object-record/record-table/types/TableOptionsHotkeyScope.ts
diff --git a/front/src/modules/ui/object/record-table/utils/getRecordTableScopedStates.ts b/front/src/modules/object-record/record-table/utils/getRecordTableScopedStates.ts
similarity index 88%
rename from front/src/modules/ui/object/record-table/utils/getRecordTableScopedStates.ts
rename to front/src/modules/object-record/record-table/utils/getRecordTableScopedStates.ts
index aa1851437..6697b7d21 100644
--- a/front/src/modules/ui/object/record-table/utils/getRecordTableScopedStates.ts
+++ b/front/src/modules/object-record/record-table/utils/getRecordTableScopedStates.ts
@@ -1,9 +1,10 @@
-import { objectMetadataConfigScopedState } from '@/ui/object/record-table/states/objectMetadataConfigScopedState';
-import { tableLastRowVisibleScopedState } from '@/ui/object/record-table/states/tableLastRowVisibleScopedState';
+import { objectMetadataConfigScopedState } from '@/object-record/record-table/states/objectMetadataConfigScopedState';
+import { tableLastRowVisibleScopedState } from '@/object-record/record-table/states/tableLastRowVisibleScopedState';
import { getScopedState } from '@/ui/utilities/recoil-scope/utils/getScopedState';
import { availableTableColumnsScopedState } from '../states/availableTableColumnsScopedState';
import { onColumnsChangeScopedState } from '../states/onColumnsChangeScopedState';
+import { onEntityCountChangeScopedState } from '../states/onEntityCountChange';
import { hiddenTableColumnsScopedSelector } from '../states/selectors/hiddenTableColumnsScopedSelector';
import { tableColumnsByKeyScopedSelector } from '../states/selectors/tableColumnsByKeyScopedSelector';
import { visibleTableColumnsScopedSelector } from '../states/selectors/visibleTableColumnsScopedSelector';
@@ -11,8 +12,6 @@ import { tableColumnsScopedState } from '../states/tableColumnsScopedState';
import { tableFiltersScopedState } from '../states/tableFiltersScopedState';
import { tableSortsScopedState } from '../states/tableSortsScopedState';
-import { onEntityCountChangeScopedState } from './../states/onEntityCountChange';
-
export const getRecordTableScopedStates = ({
recordTableScopeId,
}: {
diff --git a/front/src/modules/ui/input/relation-picker/components/MultipleEntitySelect.tsx b/front/src/modules/object-record/relation-picker/components/MultipleEntitySelect.tsx
similarity index 100%
rename from front/src/modules/ui/input/relation-picker/components/MultipleEntitySelect.tsx
rename to front/src/modules/object-record/relation-picker/components/MultipleEntitySelect.tsx
diff --git a/front/src/modules/ui/input/components/internal/relation-picker/components/RelationPicker.tsx b/front/src/modules/object-record/relation-picker/components/RelationPicker.tsx
similarity index 83%
rename from front/src/modules/ui/input/components/internal/relation-picker/components/RelationPicker.tsx
rename to front/src/modules/object-record/relation-picker/components/RelationPicker.tsx
index 976309ba7..e0366f9d9 100644
--- a/front/src/modules/ui/input/components/internal/relation-picker/components/RelationPicker.tsx
+++ b/front/src/modules/object-record/relation-picker/components/RelationPicker.tsx
@@ -3,14 +3,14 @@ import { useQuery } from '@apollo/client';
import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
import { useObjectNameSingularFromPlural } from '@/object-metadata/hooks/useObjectNameSingularFromPlural';
+import { FieldDefinition } from '@/object-record/field/types/FieldDefinition';
+import { FieldRelationMetadata } from '@/object-record/field/types/FieldMetadata';
+import { SingleEntitySelect } from '@/object-record/relation-picker/components/SingleEntitySelect';
+import { useRelationPicker } from '@/object-record/relation-picker/hooks/useRelationPicker';
+import { relationPickerSearchFilterScopedState } from '@/object-record/relation-picker/states/relationPickerSearchFilterScopedState';
+import { EntityForSelect } from '@/object-record/relation-picker/types/EntityForSelect';
import { useFilteredSearchEntityQuery } from '@/search/hooks/useFilteredSearchEntityQuery';
import { IconForbid } from '@/ui/display/icon';
-import { useRelationPicker } from '@/ui/input/components/internal/relation-picker/hooks/useRelationPicker';
-import { SingleEntitySelect } from '@/ui/input/relation-picker/components/SingleEntitySelect';
-import { relationPickerSearchFilterScopedState } from '@/ui/input/relation-picker/states/relationPickerSearchFilterScopedState';
-import { EntityForSelect } from '@/ui/input/relation-picker/types/EntityForSelect';
-import { FieldDefinition } from '@/ui/object/field/types/FieldDefinition';
-import { FieldRelationMetadata } from '@/ui/object/field/types/FieldMetadata';
import { useRecoilScopedState } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedState';
export type RelationPickerProps = {
diff --git a/front/src/modules/ui/input/relation-picker/components/SingleEntitySelect.tsx b/front/src/modules/object-record/relation-picker/components/SingleEntitySelect.tsx
similarity index 100%
rename from front/src/modules/ui/input/relation-picker/components/SingleEntitySelect.tsx
rename to front/src/modules/object-record/relation-picker/components/SingleEntitySelect.tsx
diff --git a/front/src/modules/ui/input/relation-picker/components/SingleEntitySelectBase.tsx b/front/src/modules/object-record/relation-picker/components/SingleEntitySelectBase.tsx
similarity index 96%
rename from front/src/modules/ui/input/relation-picker/components/SingleEntitySelectBase.tsx
rename to front/src/modules/object-record/relation-picker/components/SingleEntitySelectBase.tsx
index a4310090b..2026735ca 100644
--- a/front/src/modules/ui/input/relation-picker/components/SingleEntitySelectBase.tsx
+++ b/front/src/modules/object-record/relation-picker/components/SingleEntitySelectBase.tsx
@@ -13,14 +13,13 @@ import { useScopedHotkeys } from '@/ui/utilities/hotkey/hooks/useScopedHotkeys';
import { Avatar } from '@/users/components/Avatar';
import { assertNotNull } from '~/utils/assert';
+import { CreateNewButton } from '../../../ui/input/relation-picker/components/CreateNewButton';
+import { DropdownMenuSkeletonItem } from '../../../ui/input/relation-picker/components/skeletons/DropdownMenuSkeletonItem';
import { CreateButtonId, EmptyButtonId } from '../constants';
import { useEntitySelectScroll } from '../hooks/useEntitySelectScroll';
import { EntityForSelect } from '../types/EntityForSelect';
import { RelationPickerHotkeyScope } from '../types/RelationPickerHotkeyScope';
-import { DropdownMenuSkeletonItem } from './skeletons/DropdownMenuSkeletonItem';
-import { CreateNewButton } from './CreateNewButton';
-
export type SingleEntitySelectBaseProps<
CustomEntityForSelect extends EntityForSelect,
> = {
diff --git a/front/src/modules/ui/input/relation-picker/components/__stories__/SingleEntitySelect.stories.tsx b/front/src/modules/object-record/relation-picker/components/__stories__/SingleEntitySelect.stories.tsx
similarity index 100%
rename from front/src/modules/ui/input/relation-picker/components/__stories__/SingleEntitySelect.stories.tsx
rename to front/src/modules/object-record/relation-picker/components/__stories__/SingleEntitySelect.stories.tsx
diff --git a/front/src/modules/ui/input/relation-picker/constants/index.ts b/front/src/modules/object-record/relation-picker/constants/index.ts
similarity index 100%
rename from front/src/modules/ui/input/relation-picker/constants/index.ts
rename to front/src/modules/object-record/relation-picker/constants/index.ts
diff --git a/front/src/modules/ui/input/components/internal/relation-picker/hooks/internal/useRelationPickerScopedStates.ts b/front/src/modules/object-record/relation-picker/hooks/internal/useRelationPickerScopedStates.ts
similarity index 71%
rename from front/src/modules/ui/input/components/internal/relation-picker/hooks/internal/useRelationPickerScopedStates.ts
rename to front/src/modules/object-record/relation-picker/hooks/internal/useRelationPickerScopedStates.ts
index ba3212444..95ef12f73 100644
--- a/front/src/modules/ui/input/components/internal/relation-picker/hooks/internal/useRelationPickerScopedStates.ts
+++ b/front/src/modules/object-record/relation-picker/hooks/internal/useRelationPickerScopedStates.ts
@@ -1,5 +1,5 @@
-import { getRelationPickerScopedStates } from '@/ui/input/components/internal/relation-picker/utils/getRelationPickerScopedStates';
-import { RecordTableScopeInternalContext } from '@/ui/object/record-table/scopes/scope-internal-context/RecordTableScopeInternalContext';
+import { RecordTableScopeInternalContext } from '@/object-record/record-table/scopes/scope-internal-context/RecordTableScopeInternalContext';
+import { getRelationPickerScopedStates } from '@/object-record/relation-picker/utils/getRelationPickerScopedStates';
import { useAvailableScopeIdOrThrow } from '@/ui/utilities/recoil-scope/scopes-internal/hooks/useAvailableScopeId';
export const useRelationPickerScopedStates = (args?: {
diff --git a/front/src/modules/ui/input/relation-picker/hooks/useEntitySelectScroll.ts b/front/src/modules/object-record/relation-picker/hooks/useEntitySelectScroll.ts
similarity index 100%
rename from front/src/modules/ui/input/relation-picker/hooks/useEntitySelectScroll.ts
rename to front/src/modules/object-record/relation-picker/hooks/useEntitySelectScroll.ts
diff --git a/front/src/modules/ui/input/relation-picker/hooks/useEntitySelectSearch.ts b/front/src/modules/object-record/relation-picker/hooks/useEntitySelectSearch.ts
similarity index 69%
rename from front/src/modules/ui/input/relation-picker/hooks/useEntitySelectSearch.ts
rename to front/src/modules/object-record/relation-picker/hooks/useEntitySelectSearch.ts
index 134423996..58e377d8c 100644
--- a/front/src/modules/ui/input/relation-picker/hooks/useEntitySelectSearch.ts
+++ b/front/src/modules/object-record/relation-picker/hooks/useEntitySelectSearch.ts
@@ -1,11 +1,10 @@
import debounce from 'lodash.debounce';
+import { RelationPickerRecoilScopeContext } from '@/object-record/relation-picker/states/recoil-scope-contexts/RelationPickerRecoilScopeContext';
+import { relationPickerPreselectedIdScopedState } from '@/object-record/relation-picker/states/relationPickerPreselectedIdScopedState';
+import { relationPickerSearchFilterScopedState } from '@/object-record/relation-picker/states/relationPickerSearchFilterScopedState';
import { useRecoilScopedState } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedState';
-import { RelationPickerRecoilScopeContext } from '../states/recoil-scope-contexts/RelationPickerRecoilScopeContext';
-import { relationPickerPreselectedIdScopedState } from '../states/relationPickerPreselectedIdScopedState';
-import { relationPickerSearchFilterScopedState } from '../states/relationPickerSearchFilterScopedState';
-
export const useEntitySelectSearch = () => {
const [, setRelationPickerPreselectedId] = useRecoilScopedState(
relationPickerPreselectedIdScopedState,
diff --git a/front/src/modules/ui/input/components/internal/relation-picker/hooks/useRelationPicker.ts b/front/src/modules/object-record/relation-picker/hooks/useRelationPicker.ts
similarity index 73%
rename from front/src/modules/ui/input/components/internal/relation-picker/hooks/useRelationPicker.ts
rename to front/src/modules/object-record/relation-picker/hooks/useRelationPicker.ts
index 6308f61f4..fce29cb6c 100644
--- a/front/src/modules/ui/input/components/internal/relation-picker/hooks/useRelationPicker.ts
+++ b/front/src/modules/object-record/relation-picker/hooks/useRelationPicker.ts
@@ -1,7 +1,7 @@
import { useRecoilState } from 'recoil';
-import { useRelationPickerScopedStates } from '@/ui/input/components/internal/relation-picker/hooks/internal/useRelationPickerScopedStates';
-import { RelationPickerScopeInternalContext } from '@/ui/input/components/internal/relation-picker/scopes/scope-internal-context/RelationPickerScopeInternalContext';
+import { useRelationPickerScopedStates } from '@/object-record/relation-picker/hooks/internal/useRelationPickerScopedStates';
+import { RelationPickerScopeInternalContext } from '@/object-record/relation-picker/scopes/scope-internal-context/RelationPickerScopeInternalContext';
import { useAvailableScopeIdOrThrow } from '@/ui/utilities/recoil-scope/scopes-internal/hooks/useAvailableScopeId';
type useRelationPickeProps = {
diff --git a/front/src/modules/ui/input/components/internal/relation-picker/scopes/RelationPickerScope.tsx b/front/src/modules/object-record/relation-picker/scopes/RelationPickerScope.tsx
similarity index 72%
rename from front/src/modules/ui/input/components/internal/relation-picker/scopes/RelationPickerScope.tsx
rename to front/src/modules/object-record/relation-picker/scopes/RelationPickerScope.tsx
index 6a3e4b7ca..be06e2796 100644
--- a/front/src/modules/ui/input/components/internal/relation-picker/scopes/RelationPickerScope.tsx
+++ b/front/src/modules/object-record/relation-picker/scopes/RelationPickerScope.tsx
@@ -1,6 +1,6 @@
import { ReactNode } from 'react';
-import { RelationPickerScopeInternalContext } from '@/ui/input/components/internal/relation-picker/scopes/scope-internal-context/RelationPickerScopeInternalContext';
+import { RelationPickerScopeInternalContext } from '@/object-record/relation-picker/scopes/scope-internal-context/RelationPickerScopeInternalContext';
type RelationPickerScopeProps = {
children: ReactNode;
diff --git a/front/src/modules/ui/input/components/internal/relation-picker/scopes/scope-internal-context/RelationPickerScopeInternalContext.ts b/front/src/modules/object-record/relation-picker/scopes/scope-internal-context/RelationPickerScopeInternalContext.ts
similarity index 100%
rename from front/src/modules/ui/input/components/internal/relation-picker/scopes/scope-internal-context/RelationPickerScopeInternalContext.ts
rename to front/src/modules/object-record/relation-picker/scopes/scope-internal-context/RelationPickerScopeInternalContext.ts
diff --git a/front/src/modules/ui/input/components/internal/relation-picker/states/identifiersMapperScopedState.ts b/front/src/modules/object-record/relation-picker/states/identifiersMapperScopedState.ts
similarity index 70%
rename from front/src/modules/ui/input/components/internal/relation-picker/states/identifiersMapperScopedState.ts
rename to front/src/modules/object-record/relation-picker/states/identifiersMapperScopedState.ts
index c01353ff7..0153df80c 100644
--- a/front/src/modules/ui/input/components/internal/relation-picker/states/identifiersMapperScopedState.ts
+++ b/front/src/modules/object-record/relation-picker/states/identifiersMapperScopedState.ts
@@ -1,4 +1,4 @@
-import { IdentifiersMapper } from '@/ui/input/components/internal/relation-picker/types/IdentifiersMapper';
+import { IdentifiersMapper } from '@/object-record/relation-picker/types/IdentifiersMapper';
import { createScopedState } from '@/ui/utilities/recoil-scope/utils/createScopedState';
export const identifiersMapperScopedState =
diff --git a/front/src/modules/ui/input/relation-picker/states/recoil-scope-contexts/RelationPickerRecoilScopeContext.ts b/front/src/modules/object-record/relation-picker/states/recoil-scope-contexts/RelationPickerRecoilScopeContext.ts
similarity index 100%
rename from front/src/modules/ui/input/relation-picker/states/recoil-scope-contexts/RelationPickerRecoilScopeContext.ts
rename to front/src/modules/object-record/relation-picker/states/recoil-scope-contexts/RelationPickerRecoilScopeContext.ts
diff --git a/front/src/modules/ui/input/relation-picker/states/relationPickerPreselectedIdScopedState.ts b/front/src/modules/object-record/relation-picker/states/relationPickerPreselectedIdScopedState.ts
similarity index 100%
rename from front/src/modules/ui/input/relation-picker/states/relationPickerPreselectedIdScopedState.ts
rename to front/src/modules/object-record/relation-picker/states/relationPickerPreselectedIdScopedState.ts
diff --git a/front/src/modules/ui/input/relation-picker/states/relationPickerSearchFilterScopedState.ts b/front/src/modules/object-record/relation-picker/states/relationPickerSearchFilterScopedState.ts
similarity index 100%
rename from front/src/modules/ui/input/relation-picker/states/relationPickerSearchFilterScopedState.ts
rename to front/src/modules/object-record/relation-picker/states/relationPickerSearchFilterScopedState.ts
diff --git a/front/src/modules/ui/input/components/internal/relation-picker/states/searchQueryScopedState.ts b/front/src/modules/object-record/relation-picker/states/searchQueryScopedState.ts
similarity index 70%
rename from front/src/modules/ui/input/components/internal/relation-picker/states/searchQueryScopedState.ts
rename to front/src/modules/object-record/relation-picker/states/searchQueryScopedState.ts
index 54982f92d..f9dd1a64f 100644
--- a/front/src/modules/ui/input/components/internal/relation-picker/states/searchQueryScopedState.ts
+++ b/front/src/modules/object-record/relation-picker/states/searchQueryScopedState.ts
@@ -1,4 +1,4 @@
-import { SearchQuery } from '@/ui/input/components/internal/relation-picker/types/SearchQuery';
+import { SearchQuery } from '@/object-record/relation-picker/types/SearchQuery';
import { createScopedState } from '@/ui/utilities/recoil-scope/utils/createScopedState';
export const searchQueryScopedState = createScopedState({
diff --git a/front/src/modules/ui/input/relation-picker/types/EntityForSelect.ts b/front/src/modules/object-record/relation-picker/types/EntityForSelect.ts
similarity index 100%
rename from front/src/modules/ui/input/relation-picker/types/EntityForSelect.ts
rename to front/src/modules/object-record/relation-picker/types/EntityForSelect.ts
diff --git a/front/src/modules/ui/input/components/internal/relation-picker/types/IdentifiersMapper.tsx b/front/src/modules/object-record/relation-picker/types/IdentifiersMapper.tsx
similarity index 100%
rename from front/src/modules/ui/input/components/internal/relation-picker/types/IdentifiersMapper.tsx
rename to front/src/modules/object-record/relation-picker/types/IdentifiersMapper.tsx
diff --git a/front/src/modules/ui/input/relation-picker/types/RelationPickerHotkeyScope.ts b/front/src/modules/object-record/relation-picker/types/RelationPickerHotkeyScope.ts
similarity index 100%
rename from front/src/modules/ui/input/relation-picker/types/RelationPickerHotkeyScope.ts
rename to front/src/modules/object-record/relation-picker/types/RelationPickerHotkeyScope.ts
diff --git a/front/src/modules/ui/input/components/internal/relation-picker/types/SearchQuery.tsx b/front/src/modules/object-record/relation-picker/types/SearchQuery.tsx
similarity index 100%
rename from front/src/modules/ui/input/components/internal/relation-picker/types/SearchQuery.tsx
rename to front/src/modules/object-record/relation-picker/types/SearchQuery.tsx
diff --git a/front/src/modules/ui/input/relation-picker/utils/getPreselectedIdIndex.ts b/front/src/modules/object-record/relation-picker/utils/getPreselectedIdIndex.ts
similarity index 100%
rename from front/src/modules/ui/input/relation-picker/utils/getPreselectedIdIndex.ts
rename to front/src/modules/object-record/relation-picker/utils/getPreselectedIdIndex.ts
diff --git a/front/src/modules/ui/input/components/internal/relation-picker/utils/getRelationPickerScopedStates.ts b/front/src/modules/object-record/relation-picker/utils/getRelationPickerScopedStates.ts
similarity index 66%
rename from front/src/modules/ui/input/components/internal/relation-picker/utils/getRelationPickerScopedStates.ts
rename to front/src/modules/object-record/relation-picker/utils/getRelationPickerScopedStates.ts
index 228f4c2a6..ba9381d79 100644
--- a/front/src/modules/ui/input/components/internal/relation-picker/utils/getRelationPickerScopedStates.ts
+++ b/front/src/modules/object-record/relation-picker/utils/getRelationPickerScopedStates.ts
@@ -1,5 +1,5 @@
-import { identifiersMapperScopedState } from '@/ui/input/components/internal/relation-picker/states/identifiersMapperScopedState';
-import { searchQueryScopedState } from '@/ui/input/components/internal/relation-picker/states/searchQueryScopedState';
+import { identifiersMapperScopedState } from '@/object-record/relation-picker/states/identifiersMapperScopedState';
+import { searchQueryScopedState } from '@/object-record/relation-picker/states/searchQueryScopedState';
import { getScopedState } from '@/ui/utilities/recoil-scope/utils/getScopedState';
export const getRelationPickerScopedStates = ({
diff --git a/front/src/modules/object-record/utils/filterAvailableTableColumns.ts b/front/src/modules/object-record/utils/filterAvailableTableColumns.ts
index 16ed62771..c5797d118 100644
--- a/front/src/modules/object-record/utils/filterAvailableTableColumns.ts
+++ b/front/src/modules/object-record/utils/filterAvailableTableColumns.ts
@@ -1,6 +1,6 @@
-import { FieldMetadata } from '@/ui/object/field/types/FieldMetadata';
-import { isFieldRelation } from '@/ui/object/field/types/guards/isFieldRelation';
-import { ColumnDefinition } from '@/ui/object/record-table/types/ColumnDefinition';
+import { FieldMetadata } from '@/object-record/field/types/FieldMetadata';
+import { isFieldRelation } from '@/object-record/field/types/guards/isFieldRelation';
+import { ColumnDefinition } from '@/object-record/record-table/types/ColumnDefinition';
export const filterAvailableTableColumns = (
columnDefinition: ColumnDefinition,
diff --git a/front/src/modules/pipeline/components/PipelineAddButton.tsx b/front/src/modules/pipeline/components/PipelineAddButton.tsx
index 10ce43797..8f84ad199 100644
--- a/front/src/modules/pipeline/components/PipelineAddButton.tsx
+++ b/front/src/modules/pipeline/components/PipelineAddButton.tsx
@@ -1,14 +1,14 @@
import { OpportunityPicker } from '@/companies/components/OpportunityPicker';
+import { useCreateOpportunity } from '@/object-record/record-board/hooks/internal/useCreateOpportunity';
+import { EntityForSelect } from '@/object-record/relation-picker/types/EntityForSelect';
+import { RelationPickerHotkeyScope } from '@/object-record/relation-picker/types/RelationPickerHotkeyScope';
import { PageHotkeyScope } from '@/types/PageHotkeyScope';
import { IconPlus } from '@/ui/display/icon/index';
import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';
import { IconButton } from '@/ui/input/button/components/IconButton';
-import { EntityForSelect } from '@/ui/input/relation-picker/types/EntityForSelect';
-import { RelationPickerHotkeyScope } from '@/ui/input/relation-picker/types/RelationPickerHotkeyScope';
import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
import { useDropdown } from '@/ui/layout/dropdown/hooks/useDropdown';
import { DropdownScope } from '@/ui/layout/dropdown/scopes/DropdownScope';
-import { useCreateOpportunity } from '@/ui/object/record-board/hooks/internal/useCreateOpportunity';
import { logError } from '~/utils/logError';
export const PipelineAddButton = () => {
diff --git a/front/src/modules/pipeline/hooks/usePipelineSteps.ts b/front/src/modules/pipeline/hooks/usePipelineSteps.ts
index 24d4a3fc6..0d7ccc523 100644
--- a/front/src/modules/pipeline/hooks/usePipelineSteps.ts
+++ b/front/src/modules/pipeline/hooks/usePipelineSteps.ts
@@ -2,9 +2,9 @@ import { useRecoilCallback } from 'recoil';
import { useCreateOneRecord } from '@/object-record/hooks/useCreateOneRecord';
import { useDeleteOneRecord } from '@/object-record/hooks/useDeleteOneRecord';
+import { BoardColumnDefinition } from '@/object-record/record-board/types/BoardColumnDefinition';
import { currentPipelineState } from '@/pipeline/states/currentPipelineState';
import { PipelineStep } from '@/pipeline/types/PipelineStep';
-import { BoardColumnDefinition } from '@/ui/object/record-board/types/BoardColumnDefinition';
export const usePipelineSteps = () => {
const { createOneRecord: createOnePipelineStep } =
diff --git a/front/src/modules/search/hooks/useFilteredSearchEntityQuery.ts b/front/src/modules/search/hooks/useFilteredSearchEntityQuery.ts
index a79a034d5..c54864f90 100644
--- a/front/src/modules/search/hooks/useFilteredSearchEntityQuery.ts
+++ b/front/src/modules/search/hooks/useFilteredSearchEntityQuery.ts
@@ -2,9 +2,9 @@ import { QueryHookOptions, QueryResult } from '@apollo/client';
import { isNonEmptyString } from '@sniptt/guards';
import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
+import { EntitiesForMultipleEntitySelect } from '@/object-record/relation-picker/components/MultipleEntitySelect';
+import { EntityForSelect } from '@/object-record/relation-picker/types/EntityForSelect';
import { mapPaginatedRecordsToRecords } from '@/object-record/utils/mapPaginatedRecordsToRecords';
-import { EntitiesForMultipleEntitySelect } from '@/ui/input/relation-picker/components/MultipleEntitySelect';
-import { EntityForSelect } from '@/ui/input/relation-picker/types/EntityForSelect';
import { assertNotNull } from '~/utils/assert';
import { isDefined } from '~/utils/isDefined';
diff --git a/front/src/modules/settings/data-model/components/SettingsObjectFieldPreview.tsx b/front/src/modules/settings/data-model/components/SettingsObjectFieldPreview.tsx
index b4d095f66..be3cc1867 100644
--- a/front/src/modules/settings/data-model/components/SettingsObjectFieldPreview.tsx
+++ b/front/src/modules/settings/data-model/components/SettingsObjectFieldPreview.tsx
@@ -2,11 +2,11 @@ import { useTheme } from '@emotion/react';
import styled from '@emotion/styled';
import { parseFieldType } from '@/object-metadata/utils/parseFieldType';
+import { FieldDisplay } from '@/object-record/field/components/FieldDisplay';
+import { FieldContext } from '@/object-record/field/contexts/FieldContext';
+import { BooleanFieldInput } from '@/object-record/field/meta-types/input/components/BooleanFieldInput';
+import { RatingFieldInput } from '@/object-record/field/meta-types/input/components/RatingFieldInput';
import { Tag } from '@/ui/display/tag/components/Tag';
-import { FieldDisplay } from '@/ui/object/field/components/FieldDisplay';
-import { FieldContext } from '@/ui/object/field/contexts/FieldContext';
-import { BooleanFieldInput } from '@/ui/object/field/meta-types/input/components/BooleanFieldInput';
-import { RatingFieldInput } from '@/ui/object/field/meta-types/input/components/RatingFieldInput';
import { Field } from '~/generated/graphql';
import { FieldMetadataType } from '~/generated-metadata/graphql';
diff --git a/front/src/modules/settings/data-model/components/SettingsObjectFieldPreviewValueEffect.tsx b/front/src/modules/settings/data-model/components/SettingsObjectFieldPreviewValueEffect.tsx
index 96b008e16..25990f644 100644
--- a/front/src/modules/settings/data-model/components/SettingsObjectFieldPreviewValueEffect.tsx
+++ b/front/src/modules/settings/data-model/components/SettingsObjectFieldPreviewValueEffect.tsx
@@ -1,7 +1,7 @@
import { useEffect } from 'react';
import { useRecoilState } from 'recoil';
-import { entityFieldsFamilySelector } from '@/ui/object/field/states/selectors/entityFieldsFamilySelector';
+import { entityFieldsFamilySelector } from '@/object-record/field/states/selectors/entityFieldsFamilySelector';
type SettingsObjectFieldPreviewValueEffectProps = {
entityId: string;
diff --git a/front/src/modules/sign-in-background-mock/components/SignInBackgroundMockContainer.tsx b/front/src/modules/sign-in-background-mock/components/SignInBackgroundMockContainer.tsx
index 3bad2ac6a..85c2472bd 100644
--- a/front/src/modules/sign-in-background-mock/components/SignInBackgroundMockContainer.tsx
+++ b/front/src/modules/sign-in-background-mock/components/SignInBackgroundMockContainer.tsx
@@ -1,9 +1,9 @@
import styled from '@emotion/styled';
+import { RecordTable } from '@/object-record/record-table/components/RecordTable';
+import { TableOptionsDropdownId } from '@/object-record/record-table/constants/TableOptionsDropdownId';
+import { TableOptionsDropdown } from '@/object-record/record-table/options/components/TableOptionsDropdown';
import { SignInBackgroundMockContainerEffect } from '@/sign-in-background-mock/components/SignInBackgroundMockContainerEffect';
-import { RecordTable } from '@/ui/object/record-table/components/RecordTable';
-import { TableOptionsDropdownId } from '@/ui/object/record-table/constants/TableOptionsDropdownId';
-import { TableOptionsDropdown } from '@/ui/object/record-table/options/components/TableOptionsDropdown';
import { ViewBar } from '@/views/components/ViewBar';
const StyledContainer = styled.div`
diff --git a/front/src/modules/sign-in-background-mock/components/SignInBackgroundMockContainerEffect.tsx b/front/src/modules/sign-in-background-mock/components/SignInBackgroundMockContainerEffect.tsx
index 32938bde5..f56a4067f 100644
--- a/front/src/modules/sign-in-background-mock/components/SignInBackgroundMockContainerEffect.tsx
+++ b/front/src/modules/sign-in-background-mock/components/SignInBackgroundMockContainerEffect.tsx
@@ -3,6 +3,7 @@ import { useEffect } from 'react';
import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
import { useObjectNameSingularFromPlural } from '@/object-metadata/hooks/useObjectNameSingularFromPlural';
import { useRecordTableContextMenuEntries } from '@/object-record/hooks/useRecordTableContextMenuEntries';
+import { useRecordTable } from '@/object-record/record-table/hooks/useRecordTable';
import { filterAvailableTableColumns } from '@/object-record/utils/filterAvailableTableColumns';
import { signInBackgroundMockCompanies } from '@/sign-in-background-mock/constants/signInBackgroundMockCompanies';
import {
@@ -11,7 +12,6 @@ import {
signInBackgroundMockSortDefinitions,
} from '@/sign-in-background-mock/constants/signInBackgroundMockDefinitions';
import { signInBackgroundMockViewFields } from '@/sign-in-background-mock/constants/signInBackgroundMockViewFields';
-import { useRecordTable } from '@/ui/object/record-table/hooks/useRecordTable';
import { useViewBar } from '@/views/hooks/useViewBar';
import { ViewType } from '@/views/types/ViewType';
import { mapViewFieldsToColumnDefinitions } from '@/views/utils/mapViewFieldsToColumnDefinitions';
diff --git a/front/src/modules/sign-in-background-mock/components/SignInBackgroundMockPage.tsx b/front/src/modules/sign-in-background-mock/components/SignInBackgroundMockPage.tsx
index a5c29a4bf..ec4ee3ed7 100644
--- a/front/src/modules/sign-in-background-mock/components/SignInBackgroundMockPage.tsx
+++ b/front/src/modules/sign-in-background-mock/components/SignInBackgroundMockPage.tsx
@@ -1,5 +1,7 @@
import styled from '@emotion/styled';
+import { RecordTableActionBar } from '@/object-record/record-table/action-bar/components/RecordTableActionBar';
+import { RecordTableContextMenu } from '@/object-record/record-table/context-menu/components/RecordTableContextMenu';
import { SignInBackgroundMockContainer } from '@/sign-in-background-mock/components/SignInBackgroundMockContainer';
import { IconBuildingSkyscraper } from '@/ui/display/icon';
import { PageAddButton } from '@/ui/layout/page/PageAddButton';
@@ -7,8 +9,6 @@ import { PageBody } from '@/ui/layout/page/PageBody';
import { PageContainer } from '@/ui/layout/page/PageContainer';
import { PageHeader } from '@/ui/layout/page/PageHeader';
import { PageHotkeysEffect } from '@/ui/layout/page/PageHotkeysEffect';
-import { RecordTableActionBar } from '@/ui/object/record-table/action-bar/components/RecordTableActionBar';
-import { RecordTableContextMenu } from '@/ui/object/record-table/context-menu/components/RecordTableContextMenu';
const StyledTableContainer = styled.div`
display: flex;
diff --git a/front/src/modules/sign-in-background-mock/constants/signInBackgroundMockDefinitions.ts b/front/src/modules/sign-in-background-mock/constants/signInBackgroundMockDefinitions.ts
index 586ab4ba9..d8d3868bc 100644
--- a/front/src/modules/sign-in-background-mock/constants/signInBackgroundMockDefinitions.ts
+++ b/front/src/modules/sign-in-background-mock/constants/signInBackgroundMockDefinitions.ts
@@ -1,6 +1,6 @@
-import { FilterDefinition } from '@/ui/object/object-filter-dropdown/types/FilterDefinition';
-import { SortDefinition } from '@/ui/object/object-sort-dropdown/types/SortDefinition';
-import { ColumnDefinition } from '@/ui/object/record-table/types/ColumnDefinition';
+import { FilterDefinition } from '@/object-record/object-filter-dropdown/types/FilterDefinition';
+import { SortDefinition } from '@/object-record/object-sort-dropdown/types/SortDefinition';
+import { ColumnDefinition } from '@/object-record/record-table/types/ColumnDefinition';
export const signInBackgroundMockColumnDefinitions = [
{
diff --git a/front/src/modules/ui/input/components/EntityTitleDoubleTextInput.tsx b/front/src/modules/ui/input/components/EntityTitleDoubleTextInput.tsx
index 6987021d7..82804896c 100644
--- a/front/src/modules/ui/input/components/EntityTitleDoubleTextInput.tsx
+++ b/front/src/modules/ui/input/components/EntityTitleDoubleTextInput.tsx
@@ -1,7 +1,7 @@
import { ChangeEvent } from 'react';
import styled from '@emotion/styled';
-import { StyledInput } from '@/ui/object/field/meta-types/input/components/internal/TextInput';
+import { StyledInput } from '@/object-record/field/meta-types/input/components/internal/TextInput';
import { ComputeNodeDimensions } from '@/ui/utilities/dimensions/components/ComputeNodeDimensions';
import { usePreviousHotkeyScope } from '@/ui/utilities/hotkey/hooks/usePreviousHotkeyScope';
diff --git a/front/src/modules/ui/layout/page/PageHotkeysEffect.tsx b/front/src/modules/ui/layout/page/PageHotkeysEffect.tsx
index 9bd4ad91a..6800209d1 100644
--- a/front/src/modules/ui/layout/page/PageHotkeysEffect.tsx
+++ b/front/src/modules/ui/layout/page/PageHotkeysEffect.tsx
@@ -1,4 +1,4 @@
-import { TableHotkeyScope } from '@/ui/object/record-table/types/TableHotkeyScope';
+import { TableHotkeyScope } from '@/object-record/record-table/types/TableHotkeyScope';
import { useScopedHotkeys } from '@/ui/utilities/hotkey/hooks/useScopedHotkeys';
type PageHotkeysEffectProps = {
diff --git a/front/src/modules/ui/navigation/action-bar/components/__stories__/ActionBar.stories.tsx b/front/src/modules/ui/navigation/action-bar/components/__stories__/ActionBar.stories.tsx
index 772c03395..7e75d381a 100644
--- a/front/src/modules/ui/navigation/action-bar/components/__stories__/ActionBar.stories.tsx
+++ b/front/src/modules/ui/navigation/action-bar/components/__stories__/ActionBar.stories.tsx
@@ -2,7 +2,7 @@ import { MemoryRouter } from 'react-router-dom';
import { Meta, StoryObj } from '@storybook/react';
import { useSetRecoilState } from 'recoil';
-import { RecordTableScope } from '@/ui/object/record-table/scopes/RecordTableScope';
+import { RecordTableScope } from '@/object-record/record-table/scopes/RecordTableScope';
import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
import { actionBarOpenState } from '../../states/actionBarIsOpenState';
diff --git a/front/src/modules/ui/navigation/context-menu/components/__stories__/ContextMenu.stories.tsx b/front/src/modules/ui/navigation/context-menu/components/__stories__/ContextMenu.stories.tsx
index 38d6b8cb2..a1cd3b02f 100644
--- a/front/src/modules/ui/navigation/context-menu/components/__stories__/ContextMenu.stories.tsx
+++ b/front/src/modules/ui/navigation/context-menu/components/__stories__/ContextMenu.stories.tsx
@@ -2,7 +2,7 @@ import { MemoryRouter } from 'react-router-dom';
import { Meta, StoryObj } from '@storybook/react';
import { useSetRecoilState } from 'recoil';
-import { RecordTableScope } from '@/ui/object/record-table/scopes/RecordTableScope';
+import { RecordTableScope } from '@/object-record/record-table/scopes/RecordTableScope';
import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
import { contextMenuIsOpenState } from '../../states/contextMenuIsOpenState';
diff --git a/front/src/modules/ui/object/field/meta-types/display/components/UuidFieldDisplay.tsx b/front/src/modules/ui/object/field/meta-types/display/components/UuidFieldDisplay.tsx
deleted file mode 100644
index 6d7784be8..000000000
--- a/front/src/modules/ui/object/field/meta-types/display/components/UuidFieldDisplay.tsx
+++ /dev/null
@@ -1,8 +0,0 @@
-import { TextDisplay } from '@/ui/object/field/meta-types/display/content-display/components/TextDisplay';
-import { useUuidField } from '@/ui/object/field/meta-types/hooks/useUuidField';
-
-export const UuidFieldDisplay = () => {
- const { fieldValue } = useUuidField();
-
- return ;
-};
diff --git a/front/src/modules/views/components/ViewBar.tsx b/front/src/modules/views/components/ViewBar.tsx
index 3c38a557d..ae58a8a0f 100644
--- a/front/src/modules/views/components/ViewBar.tsx
+++ b/front/src/modules/views/components/ViewBar.tsx
@@ -1,10 +1,10 @@
import { ReactNode } from 'react';
+import { ObjectFilterDropdownButton } from '@/object-record/object-filter-dropdown/components/ObjectFilterDropdownButton';
+import { FiltersHotkeyScope } from '@/object-record/object-filter-dropdown/types/FiltersHotkeyScope';
+import { ObjectSortDropdownButton } from '@/object-record/object-sort-dropdown/components/ObjectSortDropdownButton';
import { useDropdown } from '@/ui/layout/dropdown/hooks/useDropdown';
import { TopBar } from '@/ui/layout/top-bar/TopBar';
-import { ObjectFilterDropdownButton } from '@/ui/object/object-filter-dropdown/components/ObjectFilterDropdownButton';
-import { FiltersHotkeyScope } from '@/ui/object/object-filter-dropdown/types/FiltersHotkeyScope';
-import { ObjectSortDropdownButton } from '@/ui/object/object-sort-dropdown/components/ObjectSortDropdownButton';
import { ViewBarFilterEffect } from '@/views/components/ViewBarFilterEffect';
import { ViewBarSortEffect } from '@/views/components/ViewBarSortEffect';
import { useViewBar } from '@/views/hooks/useViewBar';
diff --git a/front/src/modules/views/components/ViewBarDetails.tsx b/front/src/modules/views/components/ViewBarDetails.tsx
index 22508a6f7..41936a36b 100644
--- a/front/src/modules/views/components/ViewBarDetails.tsx
+++ b/front/src/modules/views/components/ViewBarDetails.tsx
@@ -2,10 +2,10 @@ import { ReactNode } from 'react';
import styled from '@emotion/styled';
import { useRecoilValue } from 'recoil';
+import { AddObjectFilterFromDetailsButton } from '@/object-record/object-filter-dropdown/components/AddObjectFilterFromDetailsButton';
+import { getOperandLabelShort } from '@/object-record/object-filter-dropdown/utils/getOperandLabel';
import { IconArrowDown, IconArrowUp } from '@/ui/display/icon/index';
import { useLazyLoadIcons } from '@/ui/input/hooks/useLazyLoadIcons';
-import { AddObjectFilterFromDetailsButton } from '@/ui/object/object-filter-dropdown/components/AddObjectFilterFromDetailsButton';
-import { getOperandLabelShort } from '@/ui/object/object-filter-dropdown/utils/getOperandLabel';
import { useViewBar } from '@/views/hooks/useViewBar';
import { useViewScopedStates } from '../hooks/internal/useViewScopedStates';
diff --git a/front/src/modules/views/components/ViewBarFilterEffect.tsx b/front/src/modules/views/components/ViewBarFilterEffect.tsx
index 8b1424586..5733d33e4 100644
--- a/front/src/modules/views/components/ViewBarFilterEffect.tsx
+++ b/front/src/modules/views/components/ViewBarFilterEffect.tsx
@@ -1,8 +1,8 @@
import { useEffect } from 'react';
import { useRecoilValue } from 'recoil';
-import { useFilterDropdown } from '@/ui/object/object-filter-dropdown/hooks/useFilterDropdown';
-import { Filter } from '@/ui/object/object-filter-dropdown/types/Filter';
+import { useFilterDropdown } from '@/object-record/object-filter-dropdown/hooks/useFilterDropdown';
+import { Filter } from '@/object-record/object-filter-dropdown/types/Filter';
import { useViewScopedStates } from '@/views/hooks/internal/useViewScopedStates';
type ViewBarFilterEffectProps = {
diff --git a/front/src/modules/views/components/ViewBarSortEffect.tsx b/front/src/modules/views/components/ViewBarSortEffect.tsx
index 0a10bf89b..c8428f389 100644
--- a/front/src/modules/views/components/ViewBarSortEffect.tsx
+++ b/front/src/modules/views/components/ViewBarSortEffect.tsx
@@ -1,8 +1,8 @@
import { useEffect } from 'react';
import { useRecoilValue } from 'recoil';
-import { useSortDropdown } from '@/ui/object/object-sort-dropdown/hooks/useSortDropdown';
-import { Sort } from '@/ui/object/object-sort-dropdown/types/Sort';
+import { useSortDropdown } from '@/object-record/object-sort-dropdown/hooks/useSortDropdown';
+import { Sort } from '@/object-record/object-sort-dropdown/types/Sort';
import { useViewScopedStates } from '@/views/hooks/internal/useViewScopedStates';
type ViewBarSortEffectProps = {
diff --git a/front/src/modules/views/components/ViewFieldsVisibilityDropdownSection.tsx b/front/src/modules/views/components/ViewFieldsVisibilityDropdownSection.tsx
index b1c9a439a..b920a1f71 100644
--- a/front/src/modules/views/components/ViewFieldsVisibilityDropdownSection.tsx
+++ b/front/src/modules/views/components/ViewFieldsVisibilityDropdownSection.tsx
@@ -6,6 +6,8 @@ import {
ResponderProvided,
} from '@hello-pangea/dnd';
+import { FieldMetadata } from '@/object-record/field/types/FieldMetadata';
+import { ColumnDefinition } from '@/object-record/record-table/types/ColumnDefinition';
import { IconMinus, IconPlus } from '@/ui/display/icon';
import { AppTooltip } from '@/ui/display/tooltip/AppTooltip';
import { IconInfoCircle } from '@/ui/input/constants/icons';
@@ -16,8 +18,6 @@ import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/Drop
import { StyledDropdownMenuSubheader } from '@/ui/layout/dropdown/components/StyledDropdownMenuSubheader';
import { MenuItem } from '@/ui/navigation/menu-item/components/MenuItem';
import { MenuItemDraggable } from '@/ui/navigation/menu-item/components/MenuItemDraggable';
-import { FieldMetadata } from '@/ui/object/field/types/FieldMetadata';
-import { ColumnDefinition } from '@/ui/object/record-table/types/ColumnDefinition';
import { useListenClickOutside } from '@/ui/utilities/pointer-event/hooks/useListenClickOutside';
import { isDefined } from '~/utils/isDefined';
diff --git a/front/src/modules/views/hooks/internal/useViewFilters.ts b/front/src/modules/views/hooks/internal/useViewFilters.ts
index e7178047a..2d3d00899 100644
--- a/front/src/modules/views/hooks/internal/useViewFilters.ts
+++ b/front/src/modules/views/hooks/internal/useViewFilters.ts
@@ -3,7 +3,7 @@ import { produce } from 'immer';
import { useRecoilCallback } from 'recoil';
import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
-import { Filter } from '@/ui/object/object-filter-dropdown/types/Filter';
+import { Filter } from '@/object-record/object-filter-dropdown/types/Filter';
import { savedViewFiltersScopedFamilyState } from '@/views/states/savedViewFiltersScopedFamilyState';
import { ViewFilter } from '@/views/types/ViewFilter';
import { getViewScopedStateValuesFromSnapshot } from '@/views/utils/getViewScopedStateValuesFromSnapshot';
diff --git a/front/src/modules/views/hooks/internal/useViewSorts.ts b/front/src/modules/views/hooks/internal/useViewSorts.ts
index 16b2974c1..eb03952dd 100644
--- a/front/src/modules/views/hooks/internal/useViewSorts.ts
+++ b/front/src/modules/views/hooks/internal/useViewSorts.ts
@@ -3,7 +3,7 @@ import { produce } from 'immer';
import { useRecoilCallback } from 'recoil';
import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
-import { Sort } from '@/ui/object/object-sort-dropdown/types/Sort';
+import { Sort } from '@/object-record/object-sort-dropdown/types/Sort';
import { savedViewSortsScopedFamilyState } from '@/views/states/savedViewSortsScopedFamilyState';
import { ViewSort } from '@/views/types/ViewSort';
import { getViewScopedStateValuesFromSnapshot } from '@/views/utils/getViewScopedStateValuesFromSnapshot';
diff --git a/front/src/modules/views/states/availableFieldDefinitionsScopedState.ts b/front/src/modules/views/states/availableFieldDefinitionsScopedState.ts
index d11fb24e3..d488fdbbe 100644
--- a/front/src/modules/views/states/availableFieldDefinitionsScopedState.ts
+++ b/front/src/modules/views/states/availableFieldDefinitionsScopedState.ts
@@ -1,5 +1,5 @@
-import { FieldMetadata } from '@/ui/object/field/types/FieldMetadata';
-import { ColumnDefinition } from '@/ui/object/record-table/types/ColumnDefinition';
+import { FieldMetadata } from '@/object-record/field/types/FieldMetadata';
+import { ColumnDefinition } from '@/object-record/record-table/types/ColumnDefinition';
import { createScopedState } from '@/ui/utilities/recoil-scope/utils/createScopedState';
export const availableFieldDefinitionsScopedState = createScopedState<
diff --git a/front/src/modules/views/states/availableFilterDefinitionsScopedState.ts b/front/src/modules/views/states/availableFilterDefinitionsScopedState.ts
index 9463e08d0..17d0cd616 100644
--- a/front/src/modules/views/states/availableFilterDefinitionsScopedState.ts
+++ b/front/src/modules/views/states/availableFilterDefinitionsScopedState.ts
@@ -1,4 +1,4 @@
-import { FilterDefinition } from '@/ui/object/object-filter-dropdown/types/FilterDefinition';
+import { FilterDefinition } from '@/object-record/object-filter-dropdown/types/FilterDefinition';
import { createScopedState } from '@/ui/utilities/recoil-scope/utils/createScopedState';
export const availableFilterDefinitionsScopedState = createScopedState<
diff --git a/front/src/modules/views/states/availableSortDefinitionsScopedState.ts b/front/src/modules/views/states/availableSortDefinitionsScopedState.ts
index 28aa81140..f61eda447 100644
--- a/front/src/modules/views/states/availableSortDefinitionsScopedState.ts
+++ b/front/src/modules/views/states/availableSortDefinitionsScopedState.ts
@@ -1,4 +1,4 @@
-import { SortDefinition } from '@/ui/object/object-sort-dropdown/types/SortDefinition';
+import { SortDefinition } from '@/object-record/object-sort-dropdown/types/SortDefinition';
import { createScopedState } from '@/ui/utilities/recoil-scope/utils/createScopedState';
export const availableSortDefinitionsScopedState = createScopedState<
diff --git a/front/src/modules/views/types/ViewField.ts b/front/src/modules/views/types/ViewField.ts
index f13bb804f..fbfd5c074 100644
--- a/front/src/modules/views/types/ViewField.ts
+++ b/front/src/modules/views/types/ViewField.ts
@@ -1,6 +1,6 @@
-import { FieldMetadata } from '@/ui/object/field/types/FieldMetadata';
-import { BoardFieldDefinition } from '@/ui/object/record-board/types/BoardFieldDefinition';
-import { ColumnDefinition } from '@/ui/object/record-table/types/ColumnDefinition';
+import { FieldMetadata } from '@/object-record/field/types/FieldMetadata';
+import { BoardFieldDefinition } from '@/object-record/record-board/types/BoardFieldDefinition';
+import { ColumnDefinition } from '@/object-record/record-table/types/ColumnDefinition';
export type ViewField = {
id: string;
diff --git a/front/src/modules/views/types/ViewFilter.ts b/front/src/modules/views/types/ViewFilter.ts
index 75216c673..793357ce7 100644
--- a/front/src/modules/views/types/ViewFilter.ts
+++ b/front/src/modules/views/types/ViewFilter.ts
@@ -1,4 +1,4 @@
-import { FilterDefinition } from '@/ui/object/object-filter-dropdown/types/FilterDefinition';
+import { FilterDefinition } from '@/object-record/object-filter-dropdown/types/FilterDefinition';
import { ViewFilterOperand } from './ViewFilterOperand';
diff --git a/front/src/modules/views/types/ViewSort.ts b/front/src/modules/views/types/ViewSort.ts
index 58df58d45..c88aaa13a 100644
--- a/front/src/modules/views/types/ViewSort.ts
+++ b/front/src/modules/views/types/ViewSort.ts
@@ -1,5 +1,5 @@
-import { SortDefinition } from '@/ui/object/object-sort-dropdown/types/SortDefinition';
-import { SortDirection } from '@/ui/object/object-sort-dropdown/types/SortDirection';
+import { SortDefinition } from '@/object-record/object-sort-dropdown/types/SortDefinition';
+import { SortDirection } from '@/object-record/object-sort-dropdown/types/SortDirection';
export type ViewSort = {
id: string;
diff --git a/front/src/modules/views/utils/mapColumnDefinitionToViewField.ts b/front/src/modules/views/utils/mapColumnDefinitionToViewField.ts
index 470bd42f3..515a374f1 100644
--- a/front/src/modules/views/utils/mapColumnDefinitionToViewField.ts
+++ b/front/src/modules/views/utils/mapColumnDefinitionToViewField.ts
@@ -1,5 +1,5 @@
-import { FieldMetadata } from '@/ui/object/field/types/FieldMetadata';
-import { ColumnDefinition } from '@/ui/object/record-table/types/ColumnDefinition';
+import { FieldMetadata } from '@/object-record/field/types/FieldMetadata';
+import { ColumnDefinition } from '@/object-record/record-table/types/ColumnDefinition';
import { ViewField } from '../types/ViewField';
diff --git a/front/src/modules/views/utils/mapViewFieldsToBoardFieldDefinitions.ts b/front/src/modules/views/utils/mapViewFieldsToBoardFieldDefinitions.ts
index 83f7aa0fd..de5b02376 100644
--- a/front/src/modules/views/utils/mapViewFieldsToBoardFieldDefinitions.ts
+++ b/front/src/modules/views/utils/mapViewFieldsToBoardFieldDefinitions.ts
@@ -1,5 +1,5 @@
-import { FieldMetadata } from '@/ui/object/field/types/FieldMetadata';
-import { BoardFieldDefinition } from '@/ui/object/record-board/types/BoardFieldDefinition';
+import { FieldMetadata } from '@/object-record/field/types/FieldMetadata';
+import { BoardFieldDefinition } from '@/object-record/record-board/types/BoardFieldDefinition';
import { assertNotNull } from '~/utils/assert';
import { ViewField } from '../types/ViewField';
diff --git a/front/src/modules/views/utils/mapViewFieldsToColumnDefinitions.ts b/front/src/modules/views/utils/mapViewFieldsToColumnDefinitions.ts
index 7372c427b..86d4585ba 100644
--- a/front/src/modules/views/utils/mapViewFieldsToColumnDefinitions.ts
+++ b/front/src/modules/views/utils/mapViewFieldsToColumnDefinitions.ts
@@ -1,5 +1,5 @@
-import { FieldMetadata } from '@/ui/object/field/types/FieldMetadata';
-import { ColumnDefinition } from '@/ui/object/record-table/types/ColumnDefinition';
+import { FieldMetadata } from '@/object-record/field/types/FieldMetadata';
+import { ColumnDefinition } from '@/object-record/record-table/types/ColumnDefinition';
import { assertNotNull } from '~/utils/assert';
import { ViewField } from '../types/ViewField';
diff --git a/front/src/modules/views/utils/mapViewFiltersToFilters.ts b/front/src/modules/views/utils/mapViewFiltersToFilters.ts
index 00ae87913..8cca29540 100644
--- a/front/src/modules/views/utils/mapViewFiltersToFilters.ts
+++ b/front/src/modules/views/utils/mapViewFiltersToFilters.ts
@@ -1,4 +1,4 @@
-import { Filter } from '@/ui/object/object-filter-dropdown/types/Filter';
+import { Filter } from '@/object-record/object-filter-dropdown/types/Filter';
import { ViewFilter } from '../types/ViewFilter';
diff --git a/front/src/modules/views/utils/mapViewSortsToSorts.ts b/front/src/modules/views/utils/mapViewSortsToSorts.ts
index d49250054..7ceec1a62 100644
--- a/front/src/modules/views/utils/mapViewSortsToSorts.ts
+++ b/front/src/modules/views/utils/mapViewSortsToSorts.ts
@@ -1,4 +1,4 @@
-import { Sort } from '@/ui/object/object-sort-dropdown/types/Sort';
+import { Sort } from '@/object-record/object-sort-dropdown/types/Sort';
import { ViewSort } from '../types/ViewSort';
diff --git a/front/src/pages/opportunities/constants/opportunityBoardFilterDefinitions.tsx b/front/src/pages/opportunities/constants/opportunityBoardFilterDefinitions.tsx
index 76c885cf2..2f81d1d12 100644
--- a/front/src/pages/opportunities/constants/opportunityBoardFilterDefinitions.tsx
+++ b/front/src/pages/opportunities/constants/opportunityBoardFilterDefinitions.tsx
@@ -1,5 +1,5 @@
+import { FilterDefinitionByEntity } from '@/object-record/object-filter-dropdown/types/FilterDefinitionByEntity';
import { Opportunity } from '@/pipeline/types/Opportunity';
-import { FilterDefinitionByEntity } from '@/ui/object/object-filter-dropdown/types/FilterDefinitionByEntity';
export const opportunityBoardFilterDefinitions: FilterDefinitionByEntity[] =
[
diff --git a/front/src/pages/opportunities/constants/opportunityBoardSortDefinitions.tsx b/front/src/pages/opportunities/constants/opportunityBoardSortDefinitions.tsx
index 3c844b49b..d099da721 100644
--- a/front/src/pages/opportunities/constants/opportunityBoardSortDefinitions.tsx
+++ b/front/src/pages/opportunities/constants/opportunityBoardSortDefinitions.tsx
@@ -1,4 +1,4 @@
-import { SortDefinition } from '@/ui/object/object-sort-dropdown/types/SortDefinition';
+import { SortDefinition } from '@/object-record/object-sort-dropdown/types/SortDefinition';
export const opportunityBoardSortDefinitions: SortDefinition[] = [
{
diff --git a/front/src/pages/opportunities/opportunitiesBoardOptions.tsx b/front/src/pages/opportunities/opportunitiesBoardOptions.tsx
index 759175b11..6728a3234 100644
--- a/front/src/pages/opportunities/opportunitiesBoardOptions.tsx
+++ b/front/src/pages/opportunities/opportunitiesBoardOptions.tsx
@@ -1,6 +1,6 @@
import { CompanyBoardCard } from '@/companies/components/CompanyBoardCard';
import { NewOpportunityButton } from '@/companies/components/NewOpportunityButton';
-import { BoardOptions } from '@/ui/object/record-board/types/BoardOptions';
+import { BoardOptions } from '@/object-record/record-board/types/BoardOptions';
import { RecoilScope } from '@/ui/utilities/recoil-scope/components/RecoilScope';
export const opportunitiesBoardOptions: BoardOptions = {
diff --git a/front/src/pages/tasks/Tasks.tsx b/front/src/pages/tasks/Tasks.tsx
index 34bc3c2b2..ebb6a9a29 100644
--- a/front/src/pages/tasks/Tasks.tsx
+++ b/front/src/pages/tasks/Tasks.tsx
@@ -3,14 +3,14 @@ import styled from '@emotion/styled';
import { TasksRecoilScopeContext } from '@/activities/states/recoil-scope-contexts/TasksRecoilScopeContext';
import { PageAddTaskButton } from '@/activities/tasks/components/PageAddTaskButton';
import { TaskGroups } from '@/activities/tasks/components/TaskGroups';
+import { ObjectFilterDropdownButton } from '@/object-record/object-filter-dropdown/components/ObjectFilterDropdownButton';
+import { RelationPickerHotkeyScope } from '@/object-record/relation-picker/types/RelationPickerHotkeyScope';
import { IconArchive, IconCheck, IconCheckbox } from '@/ui/display/icon/index';
-import { RelationPickerHotkeyScope } from '@/ui/input/relation-picker/types/RelationPickerHotkeyScope';
import { PageBody } from '@/ui/layout/page/PageBody';
import { PageContainer } from '@/ui/layout/page/PageContainer';
import { PageHeader } from '@/ui/layout/page/PageHeader';
import { TabList } from '@/ui/layout/tab/components/TabList';
import { TopBar } from '@/ui/layout/top-bar/TopBar';
-import { ObjectFilterDropdownButton } from '@/ui/object/object-filter-dropdown/components/ObjectFilterDropdownButton';
import { RecoilScope } from '@/ui/utilities/recoil-scope/components/RecoilScope';
import { TasksEffect } from './TasksEffect';
diff --git a/front/src/pages/tasks/TasksEffect.tsx b/front/src/pages/tasks/TasksEffect.tsx
index 17fc211a6..24554d935 100644
--- a/front/src/pages/tasks/TasksEffect.tsx
+++ b/front/src/pages/tasks/TasksEffect.tsx
@@ -2,7 +2,7 @@ import { useEffect } from 'react';
import { useRecoilValue } from 'recoil';
import { currentWorkspaceMemberState } from '@/auth/states/currentWorkspaceMemberState';
-import { useFilterDropdown } from '@/ui/object/object-filter-dropdown/hooks/useFilterDropdown';
+import { useFilterDropdown } from '@/object-record/object-filter-dropdown/hooks/useFilterDropdown';
import { ViewFilterOperand } from '@/views/types/ViewFilterOperand';
import { tasksFilterDefinitions } from './tasks-filter-definitions';
diff --git a/front/src/pages/tasks/tasks-filter-definitions.tsx b/front/src/pages/tasks/tasks-filter-definitions.tsx
index c399460dd..73356c26e 100644
--- a/front/src/pages/tasks/tasks-filter-definitions.tsx
+++ b/front/src/pages/tasks/tasks-filter-definitions.tsx
@@ -1,6 +1,6 @@
import { Activity } from '@/activities/types/Activity';
+import { FilterDefinitionByEntity } from '@/object-record/object-filter-dropdown/types/FilterDefinitionByEntity';
import { IconUserCircle } from '@/ui/display/icon';
-import { FilterDefinitionByEntity } from '@/ui/object/object-filter-dropdown/types/FilterDefinitionByEntity';
export const tasksFilterDefinitions: FilterDefinitionByEntity[] = [
{
diff --git a/front/src/testing/decorators/PageDecorator.tsx b/front/src/testing/decorators/PageDecorator.tsx
index c3b56d637..b96a224ea 100644
--- a/front/src/testing/decorators/PageDecorator.tsx
+++ b/front/src/testing/decorators/PageDecorator.tsx
@@ -3,8 +3,8 @@ import { MemoryRouter, Route, Routes } from 'react-router-dom';
import { Decorator } from '@storybook/react';
import { RecoilRoot } from 'recoil';
+import { RelationPickerScope } from '@/object-record/relation-picker/scopes/RelationPickerScope';
import { SnackBarProviderScope } from '@/ui/feedback/snack-bar-manager/scopes/SnackBarProviderScope';
-import { RelationPickerScope } from '@/ui/input/components/internal/relation-picker/scopes/RelationPickerScope';
import { ClientConfigProvider } from '~/modules/client-config/components/ClientConfigProvider';
import { DefaultLayout } from '~/modules/ui/layout/page/DefaultLayout';
import { UserProvider } from '~/modules/users/components/UserProvider';
diff --git a/front/src/testing/decorators/RelationPickerDecorator.tsx b/front/src/testing/decorators/RelationPickerDecorator.tsx
index 8c9a019bc..cff85cae8 100644
--- a/front/src/testing/decorators/RelationPickerDecorator.tsx
+++ b/front/src/testing/decorators/RelationPickerDecorator.tsx
@@ -1,6 +1,6 @@
import { Decorator } from '@storybook/react';
-import { RelationPickerScope } from '@/ui/input/components/internal/relation-picker/scopes/RelationPickerScope';
+import { RelationPickerScope } from '@/object-record/relation-picker/scopes/RelationPickerScope';
export const RelationPickerDecorator: Decorator = (Story) => (