diff --git a/front/src/App.tsx b/front/src/App.tsx
index a93b77b53..e4dee8600 100644
--- a/front/src/App.tsx
+++ b/front/src/App.tsx
@@ -1,6 +1,6 @@
 import { Navigate, Route, Routes, useLocation } from 'react-router-dom';
 
-import { ObjectShowPage } from '@/metadata/components/ObjectShowPage';
+import { ObjectShowPage } from '@/metadata/components/RecordShowPage';
 import { AppPath } from '@/types/AppPath';
 import { SettingsPath } from '@/types/SettingsPath';
 import { DefaultLayout } from '@/ui/layout/page/DefaultLayout';
@@ -32,7 +32,7 @@ import { SettingsWorkspaceMembers } from '~/pages/settings/SettingsWorkspaceMemb
 import { Tasks } from '~/pages/tasks/Tasks';
 import { getPageTitleFromPath } from '~/utils/title-utils';
 
-import { ObjectTablePage } from './modules/metadata/components/ObjectTablePage';
+import { RecordTablePage } from './modules/metadata/components/RecordTablePage';
 import { SettingsObjectFieldEdit } from './pages/settings/data-model/SettingsObjectFieldEdit';
 import { SettingsObjectNewFieldStep1 } from './pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldStep1';
 import { SettingsObjectNewFieldStep2 } from './pages/settings/data-model/SettingsObjectNewField/SettingsObjectNewFieldStep2';
@@ -63,7 +63,7 @@ export const App = () => {
           <Route path={AppPath.Impersonate} element={<ImpersonateEffect />} />
 
           <Route path={AppPath.OpportunitiesPage} element={<Opportunities />} />
-          <Route path={AppPath.ObjectTablePage} element={<ObjectTablePage />} />
+          <Route path={AppPath.RecordTablePage} element={<RecordTablePage />} />
           <Route path={AppPath.ObjectShowPage} element={<ObjectShowPage />} />
 
           <Route
diff --git a/front/src/effect-components/PageChangeEffect.tsx b/front/src/effect-components/PageChangeEffect.tsx
index fb50693c3..7e5176576 100644
--- a/front/src/effect-components/PageChangeEffect.tsx
+++ b/front/src/effect-components/PageChangeEffect.tsx
@@ -12,9 +12,9 @@ import { AppBasePath } from '@/types/AppBasePath';
 import { AppPath } from '@/types/AppPath';
 import { PageHotkeyScope } from '@/types/PageHotkeyScope';
 import { SettingsPath } from '@/types/SettingsPath';
-import { TableHotkeyScope } from '@/ui/data/data-table/types/TableHotkeyScope';
 import { IconCheckbox, IconNotes } from '@/ui/display/icon';
 import { useSnackBar } from '@/ui/feedback/snack-bar/hooks/useSnackBar';
+import { TableHotkeyScope } from '@/ui/object/record-table/types/TableHotkeyScope';
 import { useSetHotkeyScope } from '@/ui/utilities/hotkey/hooks/useSetHotkeyScope';
 import {
   ActivityType,
diff --git a/front/src/modules/activities/components/ActivityEditor.tsx b/front/src/modules/activities/components/ActivityEditor.tsx
index a07f757fb..dae99495d 100644
--- a/front/src/modules/activities/components/ActivityEditor.tsx
+++ b/front/src/modules/activities/components/ActivityEditor.tsx
@@ -7,7 +7,7 @@ import { ActivityBodyEditor } from '@/activities/components/ActivityBodyEditor';
 import { ActivityComments } from '@/activities/components/ActivityComments';
 import { ActivityTypeDropdown } from '@/activities/components/ActivityTypeDropdown';
 import { GET_ACTIVITIES } from '@/activities/graphql/queries/getActivities';
-import { PropertyBox } from '@/ui/data/inline-cell/property-box/components/PropertyBox';
+import { PropertyBox } from '@/ui/object/record-inline-cell/property-box/components/PropertyBox';
 import { RecoilScope } from '@/ui/utilities/recoil-scope/components/RecoilScope';
 import { useIsMobile } from '@/ui/utilities/responsive/hooks/useIsMobile';
 import {
diff --git a/front/src/modules/activities/editable-fields/components/ActivityAssigneeEditableField.tsx b/front/src/modules/activities/editable-fields/components/ActivityAssigneeEditableField.tsx
index f060fadd5..f0aa470f5 100644
--- a/front/src/modules/activities/editable-fields/components/ActivityAssigneeEditableField.tsx
+++ b/front/src/modules/activities/editable-fields/components/ActivityAssigneeEditableField.tsx
@@ -1,12 +1,12 @@
 import React, { useMemo } from 'react';
 
-import { FieldContext } from '@/ui/data/field/contexts/FieldContext';
-import { FieldDefinition } from '@/ui/data/field/types/FieldDefinition';
-import { FieldRelationMetadata } from '@/ui/data/field/types/FieldMetadata';
-import { InlineCell } from '@/ui/data/inline-cell/components/InlineCell';
-import { InlineCellHotkeyScope } from '@/ui/data/inline-cell/types/InlineCellHotkeyScope';
 import { IconUserCircle } from '@/ui/display/icon';
 import { Entity } from '@/ui/input/relation-picker/types/EntityTypeForSelect';
+import { FieldContext } from '@/ui/object/field/contexts/FieldContext';
+import { FieldDefinition } from '@/ui/object/field/types/FieldDefinition';
+import { FieldRelationMetadata } from '@/ui/object/field/types/FieldMetadata';
+import { InlineCell } from '@/ui/object/record-inline-cell/components/InlineCell';
+import { InlineCellHotkeyScope } from '@/ui/object/record-inline-cell/types/InlineCellHotkeyScope';
 import { Company, User, useUpdateActivityMutation } from '~/generated/graphql';
 
 type ActivityAssigneeEditableFieldProps = {
diff --git a/front/src/modules/activities/editable-fields/components/ActivityAssigneeEditableFieldEditMode.tsx b/front/src/modules/activities/editable-fields/components/ActivityAssigneeEditableFieldEditMode.tsx
index 19912aabe..82fdef58d 100644
--- a/front/src/modules/activities/editable-fields/components/ActivityAssigneeEditableFieldEditMode.tsx
+++ b/front/src/modules/activities/editable-fields/components/ActivityAssigneeEditableFieldEditMode.tsx
@@ -1,7 +1,7 @@
 import styled from '@emotion/styled';
 
 import { ActivityAssigneePicker } from '@/activities/components/ActivityAssigneePicker';
-import { useInlineCell } from '@/ui/data/inline-cell/hooks/useInlineCell';
+import { useInlineCell } from '@/ui/object/record-inline-cell/hooks/useInlineCell';
 import { Activity, User } from '~/generated/graphql';
 
 const StyledContainer = styled.div`
diff --git a/front/src/modules/activities/editable-fields/components/ActivityEditorDateField.tsx b/front/src/modules/activities/editable-fields/components/ActivityEditorDateField.tsx
index 95b25cc98..8b5193431 100644
--- a/front/src/modules/activities/editable-fields/components/ActivityEditorDateField.tsx
+++ b/front/src/modules/activities/editable-fields/components/ActivityEditorDateField.tsx
@@ -1,9 +1,9 @@
-import { FieldContext } from '@/ui/data/field/contexts/FieldContext';
-import { FieldDefinition } from '@/ui/data/field/types/FieldDefinition';
-import { FieldDateMetadata } from '@/ui/data/field/types/FieldMetadata';
-import { InlineCell } from '@/ui/data/inline-cell/components/InlineCell';
-import { InlineCellHotkeyScope } from '@/ui/data/inline-cell/types/InlineCellHotkeyScope';
 import { IconCalendar } from '@/ui/display/icon/index';
+import { FieldContext } from '@/ui/object/field/contexts/FieldContext';
+import { FieldDefinition } from '@/ui/object/field/types/FieldDefinition';
+import { FieldDateMetadata } from '@/ui/object/field/types/FieldMetadata';
+import { InlineCell } from '@/ui/object/record-inline-cell/components/InlineCell';
+import { InlineCellHotkeyScope } from '@/ui/object/record-inline-cell/types/InlineCellHotkeyScope';
 import { RecoilScope } from '@/ui/utilities/recoil-scope/components/RecoilScope';
 import { useUpdateActivityMutation } from '~/generated/graphql';
 
diff --git a/front/src/modules/activities/editable-fields/components/ActivityRelationEditableField.tsx b/front/src/modules/activities/editable-fields/components/ActivityRelationEditableField.tsx
index 818f8b102..be6268713 100644
--- a/front/src/modules/activities/editable-fields/components/ActivityRelationEditableField.tsx
+++ b/front/src/modules/activities/editable-fields/components/ActivityRelationEditableField.tsx
@@ -1,8 +1,8 @@
 import { ActivityTargetChips } from '@/activities/components/ActivityTargetChips';
-import { InlineCellContainer } from '@/ui/data/inline-cell/components/InlineCellContainer';
-import { FieldRecoilScopeContext } from '@/ui/data/inline-cell/states/recoil-scope-contexts/FieldRecoilScopeContext';
 import { IconArrowUpRight, IconPencil } from '@/ui/display/icon';
 import { RelationPickerHotkeyScope } from '@/ui/input/relation-picker/types/RelationPickerHotkeyScope';
+import { InlineCellContainer } from '@/ui/object/record-inline-cell/components/InlineCellContainer';
+import { FieldRecoilScopeContext } from '@/ui/object/record-inline-cell/states/recoil-scope-contexts/FieldRecoilScopeContext';
 import { RecoilScope } from '@/ui/utilities/recoil-scope/components/RecoilScope';
 import { Activity, ActivityTarget, Company, Person } from '~/generated/graphql';
 
diff --git a/front/src/modules/activities/editable-fields/components/ActivityRelationEditableFieldEditMode.tsx b/front/src/modules/activities/editable-fields/components/ActivityRelationEditableFieldEditMode.tsx
index e17cd9bfe..058435367 100644
--- a/front/src/modules/activities/editable-fields/components/ActivityRelationEditableFieldEditMode.tsx
+++ b/front/src/modules/activities/editable-fields/components/ActivityRelationEditableFieldEditMode.tsx
@@ -5,8 +5,8 @@ import { useHandleCheckableActivityTargetChange } from '@/activities/hooks/useHa
 import { flatMapAndSortEntityForSelectArrayOfArrayByName } from '@/activities/utils/flatMapAndSortEntityForSelectArrayByName';
 import { useFilteredSearchCompanyQuery } from '@/companies/hooks/useFilteredSearchCompanyQuery';
 import { useFilteredSearchPeopleQuery } from '@/people/hooks/useFilteredSearchPeopleQuery';
-import { useInlineCell } from '@/ui/data/inline-cell/hooks/useInlineCell';
 import { MultipleEntitySelect } from '@/ui/input/relation-picker/components/MultipleEntitySelect';
+import { useInlineCell } from '@/ui/object/record-inline-cell/hooks/useInlineCell';
 import { Activity, ActivityTarget } from '~/generated/graphql';
 import { assertNotNull } from '~/utils/assert';
 
diff --git a/front/src/modules/activities/hooks/useOpenCreateActivityDrawerForSelectedRowIds.ts b/front/src/modules/activities/hooks/useOpenCreateActivityDrawerForSelectedRowIds.ts
index 40a4a03b3..c088070ae 100644
--- a/front/src/modules/activities/hooks/useOpenCreateActivityDrawerForSelectedRowIds.ts
+++ b/front/src/modules/activities/hooks/useOpenCreateActivityDrawerForSelectedRowIds.ts
@@ -1,6 +1,6 @@
 import { useRecoilCallback } from 'recoil';
 
-import { selectedRowIdsSelector } from '@/ui/data/data-table/states/selectors/selectedRowIdsSelector';
+import { selectedRowIdsSelector } from '@/ui/object/record-table/states/selectors/selectedRowIdsSelector';
 import { ActivityType } from '~/generated/graphql';
 
 import {
diff --git a/front/src/modules/activities/notes/components/NoteCard.tsx b/front/src/modules/activities/notes/components/NoteCard.tsx
index 9089713c2..d2638d965 100644
--- a/front/src/modules/activities/notes/components/NoteCard.tsx
+++ b/front/src/modules/activities/notes/components/NoteCard.tsx
@@ -4,11 +4,11 @@ import styled from '@emotion/styled';
 
 import { ActivityRelationEditableField } from '@/activities/editable-fields/components/ActivityRelationEditableField';
 import { useOpenActivityRightDrawer } from '@/activities/hooks/useOpenActivityRightDrawer';
+import { IconComment } from '@/ui/display/icon';
 import {
   FieldContext,
   GenericFieldContextType,
-} from '@/ui/data/field/contexts/FieldContext';
-import { IconComment } from '@/ui/display/icon';
+} from '@/ui/object/field/contexts/FieldContext';
 import { Activity, ActivityTarget, Comment } from '~/generated/graphql';
 
 const StyledCard = styled.div`
diff --git a/front/src/modules/activities/right-drawer/components/RightDrawerActivity.tsx b/front/src/modules/activities/right-drawer/components/RightDrawerActivity.tsx
index 1902fe4f9..453f86ce2 100644
--- a/front/src/modules/activities/right-drawer/components/RightDrawerActivity.tsx
+++ b/front/src/modules/activities/right-drawer/components/RightDrawerActivity.tsx
@@ -3,7 +3,7 @@ import styled from '@emotion/styled';
 import { useRecoilState } from 'recoil';
 
 import { ActivityEditor } from '@/activities/components/ActivityEditor';
-import { entityFieldsFamilyState } from '@/ui/data/field/states/entityFieldsFamilyState';
+import { entityFieldsFamilyState } from '@/ui/object/field/states/entityFieldsFamilyState';
 import { useGetActivityQuery } from '~/generated/graphql';
 
 import '@blocknote/core/style.css';
diff --git a/front/src/modules/activities/tasks/components/PageAddTaskButton.tsx b/front/src/modules/activities/tasks/components/PageAddTaskButton.tsx
index aca576922..1e1dd0b1c 100644
--- a/front/src/modules/activities/tasks/components/PageAddTaskButton.tsx
+++ b/front/src/modules/activities/tasks/components/PageAddTaskButton.tsx
@@ -1,6 +1,6 @@
 import { useOpenCreateActivityDrawer } from '@/activities/hooks/useOpenCreateActivityDrawer';
-import { useFilter } from '@/ui/data/filter/hooks/useFilter';
 import { PageAddButton } from '@/ui/layout/page/PageAddButton';
+import { useFilter } from '@/ui/object/filter/hooks/useFilter';
 import { ActivityType } from '~/generated/graphql';
 
 export const PageAddTaskButton = () => {
diff --git a/front/src/modules/activities/tasks/hooks/useCurrentUserDueTaskCount.ts b/front/src/modules/activities/tasks/hooks/useCurrentUserDueTaskCount.ts
index d08a52f3d..a5b37b86e 100644
--- a/front/src/modules/activities/tasks/hooks/useCurrentUserDueTaskCount.ts
+++ b/front/src/modules/activities/tasks/hooks/useCurrentUserDueTaskCount.ts
@@ -2,7 +2,7 @@ import { DateTime } from 'luxon';
 import { useRecoilState } from 'recoil';
 
 import { currentUserState } from '@/auth/states/currentUserState';
-import { turnFilterIntoWhereClause } from '@/ui/data/filter/utils/turnFilterIntoWhereClause';
+import { turnFilterIntoWhereClause } from '@/ui/object/filter/utils/turnFilterIntoWhereClause';
 import { ViewFilterOperand } from '@/views/types/ViewFilterOperand';
 import { ActivityType, useGetActivitiesQuery } from '~/generated/graphql';
 import { parseDate } from '~/utils/date-utils';
diff --git a/front/src/modules/activities/tasks/hooks/useTasks.ts b/front/src/modules/activities/tasks/hooks/useTasks.ts
index 0d690c2f7..4f5b4b20e 100644
--- a/front/src/modules/activities/tasks/hooks/useTasks.ts
+++ b/front/src/modules/activities/tasks/hooks/useTasks.ts
@@ -1,8 +1,8 @@
 import { DateTime } from 'luxon';
 
 import { ActivityTargetableEntity } from '@/activities/types/ActivityTargetableEntity';
-import { useFilter } from '@/ui/data/filter/hooks/useFilter';
-import { turnFilterIntoWhereClause } from '@/ui/data/filter/utils/turnFilterIntoWhereClause';
+import { useFilter } from '@/ui/object/filter/hooks/useFilter';
+import { turnFilterIntoWhereClause } from '@/ui/object/filter/utils/turnFilterIntoWhereClause';
 import { ActivityType, useGetActivitiesQuery } from '~/generated/graphql';
 import { parseDate } from '~/utils/date-utils';
 
diff --git a/front/src/modules/companies/components/AddPersonToCompany.tsx b/front/src/modules/companies/components/AddPersonToCompany.tsx
index 086468cfd..3a72de199 100644
--- a/front/src/modules/companies/components/AddPersonToCompany.tsx
+++ b/front/src/modules/companies/components/AddPersonToCompany.tsx
@@ -9,11 +9,11 @@ import {
   PersonForSelect,
 } from '@/people/components/PeoplePicker';
 import { GET_PEOPLE } from '@/people/graphql/queries/getPeople';
-import { DoubleTextInput } from '@/ui/data/field/meta-types/input/components/internal/DoubleTextInput';
-import { FieldDoubleText } from '@/ui/data/field/types/FieldDoubleText';
 import { IconPlus } from '@/ui/display/icon';
 import { LightIconButton } from '@/ui/input/button/components/LightIconButton';
 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 {
diff --git a/front/src/modules/companies/components/CompanyBoardCard.tsx b/front/src/modules/companies/components/CompanyBoardCard.tsx
index 1025c7ac7..e8e924612 100644
--- a/front/src/modules/companies/components/CompanyBoardCard.tsx
+++ b/front/src/modules/companies/components/CompanyBoardCard.tsx
@@ -2,9 +2,6 @@ import { ReactNode, useContext } from 'react';
 import styled from '@emotion/styled';
 import { useRecoilState } from 'recoil';
 
-import { FieldContext } from '@/ui/data/field/contexts/FieldContext';
-import { InlineCell } from '@/ui/data/inline-cell/components/InlineCell';
-import { InlineCellHotkeyScope } from '@/ui/data/inline-cell/types/InlineCellHotkeyScope';
 import { EntityChipVariant } from '@/ui/display/chip/components/EntityChip';
 import { IconEye } from '@/ui/display/icon/index';
 import { Checkbox, CheckboxVariant } from '@/ui/input/components/Checkbox';
@@ -14,6 +11,9 @@ import { useCurrentCardSelected } from '@/ui/layout/board/hooks/useCurrentCardSe
 import { isCardInCompactViewState } from '@/ui/layout/board/states/isCardInCompactViewState';
 import { isCompactViewEnabledState } from '@/ui/layout/board/states/isCompactViewEnabledState';
 import { visibleBoardCardFieldsScopedSelector } from '@/ui/layout/board/states/selectors/visibleBoardCardFieldsScopedSelector';
+import { FieldContext } from '@/ui/object/field/contexts/FieldContext';
+import { InlineCell } from '@/ui/object/record-inline-cell/components/InlineCell';
+import { InlineCellHotkeyScope } from '@/ui/object/record-inline-cell/types/InlineCellHotkeyScope';
 import { AnimatedEaseInOut } from '@/ui/utilities/animation/components/AnimatedEaseInOut';
 import { useRecoilScopedValue } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedValue';
 import { useUpdateOnePipelineProgressMutation } from '~/generated/graphql';
diff --git a/front/src/modules/companies/components/FilterDropdownCompanySearchSelect.tsx b/front/src/modules/companies/components/FilterDropdownCompanySearchSelect.tsx
index 8964c8383..1bc799b4a 100644
--- a/front/src/modules/companies/components/FilterDropdownCompanySearchSelect.tsx
+++ b/front/src/modules/companies/components/FilterDropdownCompanySearchSelect.tsx
@@ -1,5 +1,5 @@
-import { FilterDropdownEntitySearchSelect } from '@/ui/data/filter/components/FilterDropdownEntitySearchSelect';
-import { useFilter } from '@/ui/data/filter/hooks/useFilter';
+import { FilterDropdownEntitySearchSelect } from '@/ui/object/filter/components/FilterDropdownEntitySearchSelect';
+import { useFilter } from '@/ui/object/filter/hooks/useFilter';
 
 import { useFilteredSearchCompanyQuery } from '../hooks/useFilteredSearchCompanyQuery';
 
diff --git a/front/src/modules/companies/components/HooksCompanyBoardEffect.tsx b/front/src/modules/companies/components/HooksCompanyBoardEffect.tsx
index 80f9c9b82..0399645da 100644
--- a/front/src/modules/companies/components/HooksCompanyBoardEffect.tsx
+++ b/front/src/modules/companies/components/HooksCompanyBoardEffect.tsx
@@ -3,13 +3,13 @@ import { useSearchParams } from 'react-router-dom';
 import { useRecoilState } from 'recoil';
 
 import { pipelineAvailableFieldDefinitions } from '@/pipeline/constants/pipelineAvailableFieldDefinitions';
-import { turnFilterIntoWhereClause } from '@/ui/data/filter/utils/turnFilterIntoWhereClause';
 import { useBoardActionBarEntries } from '@/ui/layout/board/hooks/useBoardActionBarEntries';
 import { useBoardContext } from '@/ui/layout/board/hooks/useBoardContext';
 import { useBoardContextMenuEntries } from '@/ui/layout/board/hooks/useBoardContextMenuEntries';
 import { availableBoardCardFieldsScopedState } from '@/ui/layout/board/states/availableBoardCardFieldsScopedState';
 import { boardCardFieldsScopedState } from '@/ui/layout/board/states/boardCardFieldsScopedState';
 import { isBoardLoadedState } from '@/ui/layout/board/states/isBoardLoadedState';
+import { turnFilterIntoWhereClause } from '@/ui/object/filter/utils/turnFilterIntoWhereClause';
 import { useRecoilScopedState } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedState';
 import { useView } from '@/views/hooks/useView';
 import { useViewGetStates } from '@/views/hooks/useViewGetStates';
diff --git a/front/src/modules/companies/constants/companiesAvailableFieldDefinitions.tsx b/front/src/modules/companies/constants/companiesAvailableFieldDefinitions.tsx
index 06427cf68..acac7df1f 100644
--- a/front/src/modules/companies/constants/companiesAvailableFieldDefinitions.tsx
+++ b/front/src/modules/companies/constants/companiesAvailableFieldDefinitions.tsx
@@ -1,15 +1,3 @@
-import { ColumnDefinition } from '@/ui/data/data-table/types/ColumnDefinition';
-import {
-  FieldBooleanMetadata,
-  FieldChipMetadata,
-  FieldDateMetadata,
-  FieldMetadata,
-  FieldMoneyMetadata,
-  FieldNumberMetadata,
-  FieldRelationMetadata,
-  FieldTextMetadata,
-  FieldURLMetadata,
-} from '@/ui/data/field/types/FieldMetadata';
 import {
   IconBrandLinkedin,
   IconBrandX,
@@ -23,6 +11,18 @@ import {
   IconUsers,
 } from '@/ui/display/icon/index';
 import { Entity } from '@/ui/input/relation-picker/types/EntityTypeForSelect';
+import {
+  FieldBooleanMetadata,
+  FieldChipMetadata,
+  FieldDateMetadata,
+  FieldMetadata,
+  FieldMoneyMetadata,
+  FieldNumberMetadata,
+  FieldRelationMetadata,
+  FieldTextMetadata,
+  FieldURLMetadata,
+} from '@/ui/object/field/types/FieldMetadata';
+import { ColumnDefinition } from '@/ui/object/record-table/types/ColumnDefinition';
 import { User } from '~/generated/graphql';
 
 export const companiesAvailableFieldDefinitions: ColumnDefinition<FieldMetadata>[] =
diff --git a/front/src/modules/companies/editable-field/components/CompanyNameEditableField.tsx b/front/src/modules/companies/editable-field/components/CompanyNameEditableField.tsx
index 0a117ad16..c153d0233 100644
--- a/front/src/modules/companies/editable-field/components/CompanyNameEditableField.tsx
+++ b/front/src/modules/companies/editable-field/components/CompanyNameEditableField.tsx
@@ -1,7 +1,7 @@
 import { useEffect, useState } from 'react';
 import styled from '@emotion/styled';
 
-import { FieldRecoilScopeContext } from '@/ui/data/inline-cell/states/recoil-scope-contexts/FieldRecoilScopeContext';
+import { FieldRecoilScopeContext } from '@/ui/object/record-inline-cell/states/recoil-scope-contexts/FieldRecoilScopeContext';
 import { usePreviousHotkeyScope } from '@/ui/utilities/hotkey/hooks/usePreviousHotkeyScope';
 import { RecoilScope } from '@/ui/utilities/recoil-scope/components/RecoilScope';
 import { Company, useUpdateOneCompanyMutation } from '~/generated/graphql';
diff --git a/front/src/modules/companies/hooks/useCompanyQuery.ts b/front/src/modules/companies/hooks/useCompanyQuery.ts
index 5565fca76..55fd95265 100644
--- a/front/src/modules/companies/hooks/useCompanyQuery.ts
+++ b/front/src/modules/companies/hooks/useCompanyQuery.ts
@@ -1,6 +1,6 @@
 import { useSetRecoilState } from 'recoil';
 
-import { entityFieldsFamilyState } from '@/ui/data/field/states/entityFieldsFamilyState';
+import { entityFieldsFamilyState } from '@/ui/object/field/states/entityFieldsFamilyState';
 import { useGetCompanyQuery } from '~/generated/graphql';
 
 export const useCompanyQuery = (id: string) => {
diff --git a/front/src/modules/companies/hooks/useCompanyTableContextMenuEntries.tsx b/front/src/modules/companies/hooks/useCompanyTableContextMenuEntries.tsx
index 7d0d7f3bd..a70b8d366 100644
--- a/front/src/modules/companies/hooks/useCompanyTableContextMenuEntries.tsx
+++ b/front/src/modules/companies/hooks/useCompanyTableContextMenuEntries.tsx
@@ -2,9 +2,6 @@ import { getOperationName } from '@apollo/client/utilities';
 import { useRecoilCallback, useSetRecoilState } from 'recoil';
 
 import { useFavorites } from '@/favorites/hooks/useFavorites';
-import { useResetTableRowSelection } from '@/ui/data/data-table/hooks/useResetTableRowSelection';
-import { selectedRowIdsSelector } from '@/ui/data/data-table/states/selectors/selectedRowIdsSelector';
-import { tableRowIdsState } from '@/ui/data/data-table/states/tableRowIdsState';
 import {
   IconCheckbox,
   IconHeart,
@@ -14,6 +11,9 @@ import {
 } from '@/ui/display/icon';
 import { actionBarEntriesState } from '@/ui/navigation/action-bar/states/actionBarEntriesState';
 import { contextMenuEntriesState } from '@/ui/navigation/context-menu/states/contextMenuEntriesState';
+import { useResetTableRowSelection } from '@/ui/object/record-table/hooks/useResetTableRowSelection';
+import { selectedRowIdsSelector } from '@/ui/object/record-table/states/selectors/selectedRowIdsSelector';
+import { tableRowIdsState } from '@/ui/object/record-table/states/tableRowIdsState';
 import {
   ActivityType,
   useDeleteManyCompaniesMutation,
diff --git a/front/src/modules/companies/hooks/useDeleteCompanies.ts b/front/src/modules/companies/hooks/useDeleteCompanies.ts
index afd95a51d..f94216e9b 100644
--- a/front/src/modules/companies/hooks/useDeleteCompanies.ts
+++ b/front/src/modules/companies/hooks/useDeleteCompanies.ts
@@ -3,9 +3,9 @@ import { useRecoilState, useRecoilValue } from 'recoil';
 
 import { useOptimisticEvict } from '@/apollo/optimistic-effect/hooks/useOptimisticEvict';
 import { GET_PIPELINES } from '@/pipeline/graphql/queries/getPipelines';
-import { useResetTableRowSelection } from '@/ui/data/data-table/hooks/useResetTableRowSelection';
-import { selectedRowIdsSelector } from '@/ui/data/data-table/states/selectors/selectedRowIdsSelector';
-import { tableRowIdsState } from '@/ui/data/data-table/states/tableRowIdsState';
+import { useResetTableRowSelection } from '@/ui/object/record-table/hooks/useResetTableRowSelection';
+import { selectedRowIdsSelector } from '@/ui/object/record-table/states/selectors/selectedRowIdsSelector';
+import { tableRowIdsState } from '@/ui/object/record-table/states/tableRowIdsState';
 import { useDeleteManyCompaniesMutation } from '~/generated/graphql';
 
 export const useDeleteSelectedComapnies = () => {
diff --git a/front/src/modules/companies/hooks/useUpdateCompanyBoardColumns.ts b/front/src/modules/companies/hooks/useUpdateCompanyBoardColumns.ts
index 50fff9caa..7c7a957fe 100644
--- a/front/src/modules/companies/hooks/useUpdateCompanyBoardColumns.ts
+++ b/front/src/modules/companies/hooks/useUpdateCompanyBoardColumns.ts
@@ -1,11 +1,11 @@
 import { useRecoilCallback } from 'recoil';
 
 import { currentPipelineState } from '@/pipeline/states/currentPipelineState';
-import { entityFieldsFamilyState } from '@/ui/data/field/states/entityFieldsFamilyState';
 import { boardCardIdsByColumnIdFamilyState } from '@/ui/layout/board/states/boardCardIdsByColumnIdFamilyState';
 import { boardColumnsState } from '@/ui/layout/board/states/boardColumnsState';
 import { savedBoardColumnsState } from '@/ui/layout/board/states/savedBoardColumnsState';
 import { BoardColumnDefinition } from '@/ui/layout/board/types/BoardColumnDefinition';
+import { entityFieldsFamilyState } from '@/ui/object/field/states/entityFieldsFamilyState';
 import { isThemeColor } from '@/ui/theme/utils/castStringAsThemeColor';
 import { Pipeline } from '~/generated/graphql';
 import { isDeeplyEqual } from '~/utils/isDeeplyEqual';
diff --git a/front/src/modules/companies/table/components/CompanyTable.tsx b/front/src/modules/companies/table/components/CompanyTable.tsx
index 8414def3a..f4674b176 100644
--- a/front/src/modules/companies/table/components/CompanyTable.tsx
+++ b/front/src/modules/companies/table/components/CompanyTable.tsx
@@ -5,15 +5,15 @@ import { companiesAvailableFieldDefinitions } from '@/companies/constants/compan
 import { getCompaniesOptimisticEffectDefinition } from '@/companies/graphql/optimistic-effect-definitions/getCompaniesOptimisticEffectDefinition';
 import { useCompanyTableContextMenuEntries } from '@/companies/hooks/useCompanyTableContextMenuEntries';
 import { useSpreadsheetCompanyImport } from '@/companies/hooks/useSpreadsheetCompanyImport';
-import { DataTable } from '@/ui/data/data-table/components/DataTable';
-import { DataTableEffect } from '@/ui/data/data-table/components/DataTableEffect';
-import { TableOptionsDropdownId } from '@/ui/data/data-table/constants/TableOptionsDropdownId';
-import { TableContext } from '@/ui/data/data-table/contexts/TableContext';
-import { useUpsertDataTableItem } from '@/ui/data/data-table/hooks/useUpsertDataTableItem';
-import { TableOptionsDropdown } from '@/ui/data/data-table/options/components/TableOptionsDropdown';
-import { tableColumnsScopedState } from '@/ui/data/data-table/states/tableColumnsScopedState';
-import { tableFiltersScopedState } from '@/ui/data/data-table/states/tableFiltersScopedState';
-import { tableSortsScopedState } from '@/ui/data/data-table/states/tableSortsScopedState';
+import { RecordTable } from '@/ui/object/record-table/components/RecordTable';
+import { RecordTableEffect } from '@/ui/object/record-table/components/RecordTableEffect';
+import { TableOptionsDropdownId } from '@/ui/object/record-table/constants/TableOptionsDropdownId';
+import { TableContext } from '@/ui/object/record-table/contexts/TableContext';
+import { useUpsertRecordTableItem } from '@/ui/object/record-table/hooks/useUpsertRecordTableItem';
+import { TableOptionsDropdown } from '@/ui/object/record-table/options/components/TableOptionsDropdown';
+import { tableColumnsScopedState } from '@/ui/object/record-table/states/tableColumnsScopedState';
+import { tableFiltersScopedState } from '@/ui/object/record-table/states/tableFiltersScopedState';
+import { tableSortsScopedState } from '@/ui/object/record-table/states/tableSortsScopedState';
 import { ViewBar } from '@/views/components/ViewBar';
 import { useViewFields } from '@/views/hooks/internal/useViewFields';
 import { useView } from '@/views/hooks/useView';
@@ -54,7 +54,7 @@ export const CompanyTable = () => {
   const setTableSorts = useSetRecoilState(tableSortsScopedState(tableScopeId));
 
   const [updateEntityMutation] = useUpdateOneCompanyMutation();
-  const upsertDataTableItem = useUpsertDataTableItem();
+  const upsertRecordTableItem = useUpsertRecordTableItem();
 
   const [getWorkspaceMember] = useGetWorkspaceMembersLazyQuery();
   const { persistViewFields } = useViewFields(viewScopeId);
@@ -89,7 +89,7 @@ export const CompanyTable = () => {
         if (!data.updateOneCompany) {
           return;
         }
-        upsertDataTableItem(data.updateOneCompany);
+        upsertRecordTableItem(data.updateOneCompany);
       },
     });
   };
@@ -129,7 +129,7 @@ export const CompanyTable = () => {
             optionsDropdownScopeId={TableOptionsDropdownId}
           />
           <CompanyTableEffect />
-          <DataTableEffect
+          <RecordTableEffect
             getRequestResultKey="companies"
             useGetRequest={useGetCompaniesQuery}
             getRequestOptimisticEffectDefinition={
@@ -140,7 +140,7 @@ export const CompanyTable = () => {
             setContextMenuEntries={setContextMenuEntries}
             setActionBarEntries={setActionBarEntries}
           />
-          <DataTable
+          <RecordTable
             updateEntityMutation={({
               variables,
             }: {
diff --git a/front/src/modules/companies/table/components/CompanyTableEffect.tsx b/front/src/modules/companies/table/components/CompanyTableEffect.tsx
index 99c126106..f88b8d90e 100644
--- a/front/src/modules/companies/table/components/CompanyTableEffect.tsx
+++ b/front/src/modules/companies/table/components/CompanyTableEffect.tsx
@@ -1,8 +1,8 @@
 import { useEffect } from 'react';
 
 import { companiesAvailableFieldDefinitions } from '@/companies/constants/companiesAvailableFieldDefinitions';
-import { availableTableColumnsScopedState } from '@/ui/data/data-table/states/availableTableColumnsScopedState';
-import { TableRecoilScopeContext } from '@/ui/data/data-table/states/recoil-scope-contexts/TableRecoilScopeContext';
+import { availableTableColumnsScopedState } from '@/ui/object/record-table/states/availableTableColumnsScopedState';
+import { TableRecoilScopeContext } from '@/ui/object/record-table/states/recoil-scope-contexts/TableRecoilScopeContext';
 import { useRecoilScopedState } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedState';
 import { useView } from '@/views/hooks/useView';
 import { ViewType } from '@/views/types/ViewType';
diff --git a/front/src/modules/companies/table/components/CompanyTableMockDataEffect.tsx b/front/src/modules/companies/table/components/CompanyTableMockDataEffect.tsx
index 85ddb6464..e75201d2d 100644
--- a/front/src/modules/companies/table/components/CompanyTableMockDataEffect.tsx
+++ b/front/src/modules/companies/table/components/CompanyTableMockDataEffect.tsx
@@ -1,9 +1,9 @@
 import { useEffect } from 'react';
 
 import { companiesAvailableFieldDefinitions } from '@/companies/constants/companiesAvailableFieldDefinitions';
-import { useSetDataTableData } from '@/ui/data/data-table/hooks/useSetDataTableData';
-import { TableRecoilScopeContext } from '@/ui/data/data-table/states/recoil-scope-contexts/TableRecoilScopeContext';
-import { tableColumnsScopedState } from '@/ui/data/data-table/states/tableColumnsScopedState';
+import { useSetRecordTableData } from '@/ui/object/record-table/hooks/useSetRecordTableData';
+import { TableRecoilScopeContext } from '@/ui/object/record-table/states/recoil-scope-contexts/TableRecoilScopeContext';
+import { tableColumnsScopedState } from '@/ui/object/record-table/states/tableColumnsScopedState';
 import { useRecoilScopedState } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedState';
 
 import { mockedCompaniesData } from './companies-mock-data';
@@ -13,12 +13,12 @@ export const CompanyTableMockDataEffect = () => {
     tableColumnsScopedState,
     TableRecoilScopeContext,
   );
-  const setDataTableData = useSetDataTableData();
+  const setRecordTableData = useSetRecordTableData();
 
   useEffect(() => {
-    setDataTableData(mockedCompaniesData);
+    setRecordTableData(mockedCompaniesData);
     setTableColumns(companiesAvailableFieldDefinitions);
-  }, [setDataTableData, setTableColumns]);
+  }, [setRecordTableData, setTableColumns]);
 
   return <></>;
 };
diff --git a/front/src/modules/companies/table/components/CompanyTableMockMode.tsx b/front/src/modules/companies/table/components/CompanyTableMockMode.tsx
index ca6a89d02..28ae7fad6 100644
--- a/front/src/modules/companies/table/components/CompanyTableMockMode.tsx
+++ b/front/src/modules/companies/table/components/CompanyTableMockMode.tsx
@@ -1,8 +1,8 @@
 import styled from '@emotion/styled';
 
-import { DataTable } from '@/ui/data/data-table/components/DataTable';
-import { TableOptionsDropdownId } from '@/ui/data/data-table/constants/TableOptionsDropdownId';
-import { TableOptionsDropdown } from '@/ui/data/data-table/options/components/TableOptionsDropdown';
+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';
 import { ViewScope } from '@/views/scopes/ViewScope';
 import { useUpdateOneCompanyMutation } from '~/generated/graphql';
@@ -28,7 +28,7 @@ export const CompanyTableMockMode = () => {
           optionsDropdownScopeId={TableOptionsDropdownId}
         />
 
-        <DataTable updateEntityMutation={useUpdateOneCompanyMutation} />
+        <RecordTable updateEntityMutation={useUpdateOneCompanyMutation} />
       </ViewScope>
     </StyledContainer>
   );
diff --git a/front/src/modules/metadata/components/ObjectTableEffect.tsx b/front/src/modules/metadata/components/ObjectTableEffect.tsx
index df5fad1d4..3bdda9e61 100644
--- a/front/src/modules/metadata/components/ObjectTableEffect.tsx
+++ b/front/src/modules/metadata/components/ObjectTableEffect.tsx
@@ -1,7 +1,7 @@
 import { useEffect } from 'react';
 import { useSetRecoilState } from 'recoil';
 
-import { availableTableColumnsScopedState } from '@/ui/data/data-table/states/availableTableColumnsScopedState';
+import { availableTableColumnsScopedState } from '@/ui/object/record-table/states/availableTableColumnsScopedState';
 import { useView } from '@/views/hooks/useView';
 import { ViewType } from '@/views/types/ViewType';
 
diff --git a/front/src/modules/metadata/components/ObjectShowPage.tsx b/front/src/modules/metadata/components/RecordShowPage.tsx
similarity index 92%
rename from front/src/modules/metadata/components/ObjectShowPage.tsx
rename to front/src/modules/metadata/components/RecordShowPage.tsx
index 3f7de1e52..8333354f9 100644
--- a/front/src/modules/metadata/components/ObjectShowPage.tsx
+++ b/front/src/modules/metadata/components/RecordShowPage.tsx
@@ -3,11 +3,6 @@ import { DateTime } from 'luxon';
 import { useRecoilState } from 'recoil';
 
 import { ActivityTargetableEntityType } from '@/activities/types/ActivityTargetableEntity';
-import { FieldContext } from '@/ui/data/field/contexts/FieldContext';
-import { entityFieldsFamilyState } from '@/ui/data/field/states/entityFieldsFamilyState';
-import { InlineCell } from '@/ui/data/inline-cell/components/InlineCell';
-import { PropertyBox } from '@/ui/data/inline-cell/property-box/components/PropertyBox';
-import { InlineCellHotkeyScope } from '@/ui/data/inline-cell/types/InlineCellHotkeyScope';
 import { IconBuildingSkyscraper } from '@/ui/display/icon';
 import { useLazyLoadIcons } from '@/ui/input/hooks/useLazyLoadIcons';
 import { PageBody } from '@/ui/layout/page/PageBody';
@@ -20,6 +15,11 @@ 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 { InlineCell } from '@/ui/object/record-inline-cell/components/InlineCell';
+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';
 
diff --git a/front/src/modules/metadata/components/ObjectTable.tsx b/front/src/modules/metadata/components/RecordTable.tsx
similarity index 78%
rename from front/src/modules/metadata/components/ObjectTable.tsx
rename to front/src/modules/metadata/components/RecordTable.tsx
index 6fc9a8f17..b37494baf 100644
--- a/front/src/modules/metadata/components/ObjectTable.tsx
+++ b/front/src/modules/metadata/components/RecordTable.tsx
@@ -1,13 +1,13 @@
 import styled from '@emotion/styled';
 import { useRecoilCallback, useSetRecoilState } from 'recoil';
 
-import { DataTable } from '@/ui/data/data-table/components/DataTable';
-import { TableOptionsDropdownId } from '@/ui/data/data-table/constants/TableOptionsDropdownId';
-import { TableContext } from '@/ui/data/data-table/contexts/TableContext';
-import { TableOptionsDropdown } from '@/ui/data/data-table/options/components/TableOptionsDropdown';
-import { tableColumnsScopedState } from '@/ui/data/data-table/states/tableColumnsScopedState';
-import { tableFiltersScopedState } from '@/ui/data/data-table/states/tableFiltersScopedState';
-import { tableSortsScopedState } from '@/ui/data/data-table/states/tableSortsScopedState';
+import { RecordTable } from '@/ui/object/record-table/components/RecordTable';
+import { TableOptionsDropdownId } from '@/ui/object/record-table/constants/TableOptionsDropdownId';
+import { TableContext } from '@/ui/object/record-table/contexts/TableContext';
+import { TableOptionsDropdown } from '@/ui/object/record-table/options/components/TableOptionsDropdown';
+import { tableColumnsScopedState } from '@/ui/object/record-table/states/tableColumnsScopedState';
+import { tableFiltersScopedState } from '@/ui/object/record-table/states/tableFiltersScopedState';
+import { tableSortsScopedState } from '@/ui/object/record-table/states/tableSortsScopedState';
 import { ViewBar } from '@/views/components/ViewBar';
 import { useViewFields } from '@/views/hooks/internal/useViewFields';
 import { useView } from '@/views/hooks/useView';
@@ -21,8 +21,8 @@ import { useMetadataObjectInContext } from '../hooks/useMetadataObjectInContext'
 import { useUpdateOneObject } from '../hooks/useUpdateOneObject';
 import { MetadataObjectIdentifier } from '../types/MetadataObjectIdentifier';
 
-import { ObjectDataTableEffect } from './ObjectDataTableEffect';
 import { ObjectTableEffect } from './ObjectTableEffect';
+import { ObjectRecordTableEffect } from './RecordTableEffect';
 
 const StyledContainer = styled.div`
   display: flex;
@@ -105,8 +105,8 @@ export const ObjectTable = ({ objectNamePlural }: ObjectTableProps) => {
             optionsDropdownScopeId={TableOptionsDropdownId}
           />
           <ObjectTableEffect />
-          <ObjectDataTableEffect objectNamePlural={objectNamePlural} />
-          <DataTable updateEntityMutation={updateEntity} />
+          <ObjectRecordTableEffect objectNamePlural={objectNamePlural} />
+          <RecordTable updateEntityMutation={updateEntity} />
         </TableContext.Provider>
       </StyledContainer>
     </ViewScope>
diff --git a/front/src/modules/metadata/components/ObjectDataTableEffect.tsx b/front/src/modules/metadata/components/RecordTableEffect.tsx
similarity index 55%
rename from front/src/modules/metadata/components/ObjectDataTableEffect.tsx
rename to front/src/modules/metadata/components/RecordTableEffect.tsx
index c29e33d8d..8c5e19495 100644
--- a/front/src/modules/metadata/components/ObjectDataTableEffect.tsx
+++ b/front/src/modules/metadata/components/RecordTableEffect.tsx
@@ -1,27 +1,27 @@
 import { useEffect } from 'react';
 
-import { TableRecoilScopeContext } from '@/ui/data/data-table/states/recoil-scope-contexts/TableRecoilScopeContext';
-import { tableFiltersScopedState } from '@/ui/data/data-table/states/tableFiltersScopedState';
-import { tableSortsScopedState } from '@/ui/data/data-table/states/tableSortsScopedState';
-import { turnFiltersIntoWhereClauseV2 } from '@/ui/data/filter/utils/turnFiltersIntoWhereClauseV2';
-import { turnSortsIntoOrderByV2 } from '@/ui/data/sort/utils/turnSortsIntoOrderByV2';
+import { turnFiltersIntoWhereClauseV2 } from '@/ui/object/filter/utils/turnFiltersIntoWhereClauseV2';
+import { useSetRecordTableData } from '@/ui/object/record-table/hooks/useSetRecordTableData';
+import { TableRecoilScopeContext } from '@/ui/object/record-table/states/recoil-scope-contexts/TableRecoilScopeContext';
+import { tableFiltersScopedState } from '@/ui/object/record-table/states/tableFiltersScopedState';
+import { tableSortsScopedState } from '@/ui/object/record-table/states/tableSortsScopedState';
+import { turnSortsIntoOrderByV2 } from '@/ui/object/sort/utils/turnSortsIntoOrderByV2';
 import { useRecoilScopedValue } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedValue';
 
 import { useFindManyObjects } from '../hooks/useFindManyObjects';
 import { useMetadataObjectInContext } from '../hooks/useMetadataObjectInContext';
-import { useSetObjectDataTableData } from '../hooks/useSetDataTableData';
 import { MetadataObjectIdentifier } from '../types/MetadataObjectIdentifier';
 
-export type ObjectDataTableEffectProps = Pick<
+export type ObjectRecordTableEffectProps = Pick<
   MetadataObjectIdentifier,
   'objectNamePlural'
 >;
 
-// This should be migrated to DataTable at some point
-export const ObjectDataTableEffect = ({
+// This should be migrated to RecordTable at some point
+export const ObjectRecordTableEffect = ({
   objectNamePlural,
-}: ObjectDataTableEffectProps) => {
-  const setDataTableData = useSetObjectDataTableData();
+}: ObjectRecordTableEffectProps) => {
+  const setRecordTableData = useSetRecordTableData();
   const { foundMetadataObject } = useMetadataObjectInContext();
 
   const tableFilters = useRecoilScopedValue(
@@ -50,9 +50,9 @@ export const ObjectDataTableEffect = ({
     if (!loading) {
       const entities = objects ?? [];
 
-      setDataTableData(entities);
+      setRecordTableData(entities);
     }
-  }, [objects, setDataTableData, loading]);
+  }, [objects, setRecordTableData, loading]);
 
   return <></>;
 };
diff --git a/front/src/modules/metadata/components/ObjectTablePage.tsx b/front/src/modules/metadata/components/RecordTablePage.tsx
similarity index 79%
rename from front/src/modules/metadata/components/ObjectTablePage.tsx
rename to front/src/modules/metadata/components/RecordTablePage.tsx
index 74e57e938..6590f7529 100644
--- a/front/src/modules/metadata/components/ObjectTablePage.tsx
+++ b/front/src/modules/metadata/components/RecordTablePage.tsx
@@ -2,17 +2,17 @@ import { useEffect } from 'react';
 import { useNavigate, useParams } from 'react-router-dom';
 import styled from '@emotion/styled';
 
-import { ObjectTable } from '@/metadata/components/ObjectTable';
+import { ObjectTable } from '@/metadata/components/RecordTable';
 import { MetadataObjectIdentifier } from '@/metadata/types/MetadataObjectIdentifier';
-import { DataTableActionBar } from '@/ui/data/data-table/action-bar/components/DataTableActionBar';
-import { DataTableContextMenu } from '@/ui/data/data-table/context-menu/components/DataTableContextMenu';
-import { TableRecoilScopeContext } from '@/ui/data/data-table/states/recoil-scope-contexts/TableRecoilScopeContext';
 import { IconBuildingSkyscraper } from '@/ui/display/icon';
 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 { TableRecoilScopeContext } from '@/ui/object/record-table/states/recoil-scope-contexts/TableRecoilScopeContext';
 import { RecoilScope } from '@/ui/utilities/recoil-scope/components/RecoilScope';
 
 import { useCreateOneObject } from '../hooks/useCreateOneObject';
@@ -24,12 +24,12 @@ const StyledTableContainer = styled.div`
   width: 100%;
 `;
 
-export type ObjectTablePageProps = Pick<
+export type RecordTablePageProps = Pick<
   MetadataObjectIdentifier,
   'objectNamePlural'
 >;
 
-export const ObjectTablePage = () => {
+export const RecordTablePage = () => {
   const objectNamePlural = useParams().objectNamePlural ?? '';
 
   const { objectNotFoundInMetadata, loading } = useFindOneMetadataObject({
@@ -68,8 +68,8 @@ export const ObjectTablePage = () => {
               <ObjectTable objectNamePlural={objectNamePlural} />
             </MetadataObjectScope>
           </StyledTableContainer>
-          <DataTableActionBar />
-          <DataTableContextMenu />
+          <RecordTableActionBar />
+          <RecordTableContextMenu />
         </RecoilScope>
       </PageBody>
     </PageContainer>
diff --git a/front/src/modules/metadata/hooks/useCreateOneMetadataField.ts b/front/src/modules/metadata/hooks/useCreateOneMetadataField.ts
index ac956c153..99b61b435 100644
--- a/front/src/modules/metadata/hooks/useCreateOneMetadataField.ts
+++ b/front/src/modules/metadata/hooks/useCreateOneMetadataField.ts
@@ -1,7 +1,7 @@
 import { ApolloClient, useMutation } from '@apollo/client';
 import { getOperationName } from '@apollo/client/utilities';
 
-import { FieldType } from '@/ui/data/field/types/FieldType';
+import { FieldType } from '@/ui/object/field/types/FieldType';
 import {
   CreateOneMetadataFieldMutation,
   CreateOneMetadataFieldMutationVariables,
diff --git a/front/src/modules/metadata/hooks/useFindOneMetadataObject.ts b/front/src/modules/metadata/hooks/useFindOneMetadataObject.ts
index 824a87f94..3ff79159b 100644
--- a/front/src/modules/metadata/hooks/useFindOneMetadataObject.ts
+++ b/front/src/modules/metadata/hooks/useFindOneMetadataObject.ts
@@ -1,10 +1,10 @@
 import { gql } from '@apollo/client';
 
-import { ColumnDefinition } from '@/ui/data/data-table/types/ColumnDefinition';
-import { FieldMetadata } from '@/ui/data/field/types/FieldMetadata';
-import { FilterDefinition } from '@/ui/data/filter/types/FilterDefinition';
-import { SortDefinition } from '@/ui/data/sort/types/SortDefinition';
 import { useLazyLoadIcons } from '@/ui/input/hooks/useLazyLoadIcons';
+import { FieldMetadata } from '@/ui/object/field/types/FieldMetadata';
+import { FilterDefinition } from '@/ui/object/filter/types/FilterDefinition';
+import { ColumnDefinition } from '@/ui/object/record-table/types/ColumnDefinition';
+import { SortDefinition } from '@/ui/object/sort/types/SortDefinition';
 
 import { MetadataObjectIdentifier } from '../types/MetadataObjectIdentifier';
 import { formatMetadataFieldAsColumnDefinition } from '../utils/formatMetadataFieldAsColumnDefinition';
diff --git a/front/src/modules/metadata/hooks/useSetDataTableData.ts b/front/src/modules/metadata/hooks/useSetDataTableData.ts
index 2b6250474..41a03b9b2 100644
--- a/front/src/modules/metadata/hooks/useSetDataTableData.ts
+++ b/front/src/modules/metadata/hooks/useSetDataTableData.ts
@@ -1,13 +1,13 @@
 import { useRecoilCallback } from 'recoil';
 
-import { useResetTableRowSelection } from '@/ui/data/data-table/hooks/useResetTableRowSelection';
-import { isFetchingDataTableDataState } from '@/ui/data/data-table/states/isFetchingDataTableDataState';
-import { numberOfTableRowsState } from '@/ui/data/data-table/states/numberOfTableRowsState';
-import { tableRowIdsState } from '@/ui/data/data-table/states/tableRowIdsState';
-import { entityFieldsFamilyState } from '@/ui/data/field/states/entityFieldsFamilyState';
+import { entityFieldsFamilyState } from '@/ui/object/field/states/entityFieldsFamilyState';
+import { useResetTableRowSelection } from '@/ui/object/record-table/hooks/useResetTableRowSelection';
+import { isFetchingRecordTableDataState } from '@/ui/object/record-table/states/isFetchingRecordTableDataState';
+import { numberOfTableRowsState } from '@/ui/object/record-table/states/numberOfTableRowsState';
+import { tableRowIdsState } from '@/ui/object/record-table/states/tableRowIdsState';
 import { useView } from '@/views/hooks/useView';
 
-export const useSetObjectDataTableData = () => {
+export const useSetObjectRecordTableData = () => {
   const resetTableRowSelection = useResetTableRowSelection();
   const { setEntityCountInCurrentView } = useView();
 
@@ -39,7 +39,7 @@ export const useSetObjectDataTableData = () => {
         set(numberOfTableRowsState, entityIds.length);
         setEntityCountInCurrentView(entityIds.length);
 
-        set(isFetchingDataTableDataState, false);
+        set(isFetchingRecordTableDataState, false);
       },
     [resetTableRowSelection, setEntityCountInCurrentView],
   );
diff --git a/front/src/modules/metadata/utils/formatMetadataFieldAsColumnDefinition.ts b/front/src/modules/metadata/utils/formatMetadataFieldAsColumnDefinition.ts
index 27bdab800..262f50fbd 100644
--- a/front/src/modules/metadata/utils/formatMetadataFieldAsColumnDefinition.ts
+++ b/front/src/modules/metadata/utils/formatMetadataFieldAsColumnDefinition.ts
@@ -1,5 +1,5 @@
-import { ColumnDefinition } from '@/ui/data/data-table/types/ColumnDefinition';
-import { FieldMetadata } from '@/ui/data/field/types/FieldMetadata';
+import { FieldMetadata } from '@/ui/object/field/types/FieldMetadata';
+import { ColumnDefinition } from '@/ui/object/record-table/types/ColumnDefinition';
 
 import { MetadataObject } from '../types/MetadataObject';
 
diff --git a/front/src/modules/metadata/utils/formatMetadataFieldAsFilterDefinition.ts b/front/src/modules/metadata/utils/formatMetadataFieldAsFilterDefinition.ts
index 9872c8eec..6faa8b170 100644
--- a/front/src/modules/metadata/utils/formatMetadataFieldAsFilterDefinition.ts
+++ b/front/src/modules/metadata/utils/formatMetadataFieldAsFilterDefinition.ts
@@ -1,4 +1,4 @@
-import { FilterDefinition } from '@/ui/data/filter/types/FilterDefinition';
+import { FilterDefinition } from '@/ui/object/filter/types/FilterDefinition';
 
 import { MetadataObject } from '../types/MetadataObject';
 
diff --git a/front/src/modules/metadata/utils/formatMetadataFieldAsSortDefinition.ts b/front/src/modules/metadata/utils/formatMetadataFieldAsSortDefinition.ts
index 3ad900a6e..ea879681b 100644
--- a/front/src/modules/metadata/utils/formatMetadataFieldAsSortDefinition.ts
+++ b/front/src/modules/metadata/utils/formatMetadataFieldAsSortDefinition.ts
@@ -1,4 +1,4 @@
-import { SortDefinition } from '@/ui/data/sort/types/SortDefinition';
+import { SortDefinition } from '@/ui/object/sort/types/SortDefinition';
 
 import { MetadataObject } from '../types/MetadataObject';
 
diff --git a/front/src/modules/metadata/utils/mapFieldMetadataToGraphQLQuery.ts b/front/src/modules/metadata/utils/mapFieldMetadataToGraphQLQuery.ts
index a98cee200..b2566a112 100644
--- a/front/src/modules/metadata/utils/mapFieldMetadataToGraphQLQuery.ts
+++ b/front/src/modules/metadata/utils/mapFieldMetadataToGraphQLQuery.ts
@@ -1,4 +1,4 @@
-import { FieldType } from '@/ui/data/field/types/FieldType';
+import { FieldType } from '@/ui/object/field/types/FieldType';
 import { Field } from '~/generated/graphql';
 
 export const mapFieldMetadataToGraphQLQuery = (field: Field) => {
diff --git a/front/src/modules/metadata/utils/parseFieldType.ts b/front/src/modules/metadata/utils/parseFieldType.ts
index 9ccb9cdd9..82f0cad82 100644
--- a/front/src/modules/metadata/utils/parseFieldType.ts
+++ b/front/src/modules/metadata/utils/parseFieldType.ts
@@ -1,4 +1,4 @@
-import { FieldType } from '@/ui/data/field/types/FieldType';
+import { FieldType } from '@/ui/object/field/types/FieldType';
 
 export const parseFieldType = (fieldType: string): FieldType => {
   if (fieldType === 'url') {
diff --git a/front/src/modules/people/components/FilterDropdownPeopleSearchSelect.tsx b/front/src/modules/people/components/FilterDropdownPeopleSearchSelect.tsx
index 82175496a..fc7622ceb 100644
--- a/front/src/modules/people/components/FilterDropdownPeopleSearchSelect.tsx
+++ b/front/src/modules/people/components/FilterDropdownPeopleSearchSelect.tsx
@@ -1,6 +1,6 @@
 import { useFilteredSearchPeopleQuery } from '@/people/hooks/useFilteredSearchPeopleQuery';
-import { FilterDropdownEntitySearchSelect } from '@/ui/data/filter/components/FilterDropdownEntitySearchSelect';
-import { useFilter } from '@/ui/data/filter/hooks/useFilter';
+import { FilterDropdownEntitySearchSelect } from '@/ui/object/filter/components/FilterDropdownEntitySearchSelect';
+import { useFilter } from '@/ui/object/filter/hooks/useFilter';
 
 export const FilterDropdownPeopleSearchSelect = () => {
   const { filterDropdownSearchInput, filterDropdownSelectedEntityId } =
diff --git a/front/src/modules/people/components/PeopleDataTableDataEffect.tsx b/front/src/modules/people/components/PeopleRecordTableDataEffect.tsx
similarity index 67%
rename from front/src/modules/people/components/PeopleDataTableDataEffect.tsx
rename to front/src/modules/people/components/PeopleRecordTableDataEffect.tsx
index 3b3b860d9..71e48499a 100644
--- a/front/src/modules/people/components/PeopleDataTableDataEffect.tsx
+++ b/front/src/modules/people/components/PeopleRecordTableDataEffect.tsx
@@ -4,9 +4,9 @@ import {
   useGetPeopleQuery,
 } from '~/generated/graphql';
 
-import { useSetPeopleDataTable } from '../hooks/useSetPeopleDataTable';
+import { useSetPeopleRecordTable } from '../hooks/useSetPeopleRecordTable';
 
-export const PeopleDataTableDataEffect = ({
+export const PeopleRecordTableDataEffect = ({
   orderBy = [
     {
       createdAt: SortOrder.Desc,
@@ -17,14 +17,14 @@ export const PeopleDataTableDataEffect = ({
   orderBy?: PersonOrderByWithRelationInput[];
   whereFilters?: any;
 }) => {
-  const setPeopleDataTable = useSetPeopleDataTable();
+  const setPeopleRecordTable = useSetPeopleRecordTable();
 
   useGetPeopleQuery({
     variables: { orderBy, where: whereFilters },
     onCompleted: (data) => {
       const people = data.people ?? [];
 
-      setPeopleDataTable(people);
+      setPeopleRecordTable(people);
     },
   });
 
diff --git a/front/src/modules/people/constants/peopleAvailableFieldDefinitions.tsx b/front/src/modules/people/constants/peopleAvailableFieldDefinitions.tsx
index 915583822..f62155ca8 100644
--- a/front/src/modules/people/constants/peopleAvailableFieldDefinitions.tsx
+++ b/front/src/modules/people/constants/peopleAvailableFieldDefinitions.tsx
@@ -1,14 +1,3 @@
-import { ColumnDefinition } from '@/ui/data/data-table/types/ColumnDefinition';
-import {
-  FieldDateMetadata,
-  FieldDoubleTextChipMetadata,
-  FieldEmailMetadata,
-  FieldMetadata,
-  FieldPhoneMetadata,
-  FieldRelationMetadata,
-  FieldTextMetadata,
-  FieldURLMetadata,
-} from '@/ui/data/field/types/FieldMetadata';
 import {
   IconBrandLinkedin,
   IconBrandX,
@@ -21,6 +10,17 @@ import {
   IconUser,
 } from '@/ui/display/icon/index';
 import { Entity } from '@/ui/input/relation-picker/types/EntityTypeForSelect';
+import {
+  FieldDateMetadata,
+  FieldDoubleTextChipMetadata,
+  FieldEmailMetadata,
+  FieldMetadata,
+  FieldPhoneMetadata,
+  FieldRelationMetadata,
+  FieldTextMetadata,
+  FieldURLMetadata,
+} from '@/ui/object/field/types/FieldMetadata';
+import { ColumnDefinition } from '@/ui/object/record-table/types/ColumnDefinition';
 import { Company } from '~/generated/graphql';
 import { getLogoUrlFromDomainName } from '~/utils';
 
diff --git a/front/src/modules/people/editable-field/components/PeopleFullNameEditableField.tsx b/front/src/modules/people/editable-field/components/PeopleFullNameEditableField.tsx
index 1d7bb629f..bc935cd06 100644
--- a/front/src/modules/people/editable-field/components/PeopleFullNameEditableField.tsx
+++ b/front/src/modules/people/editable-field/components/PeopleFullNameEditableField.tsx
@@ -1,7 +1,7 @@
 import { useState } from 'react';
 
-import { FieldRecoilScopeContext } from '@/ui/data/inline-cell/states/recoil-scope-contexts/FieldRecoilScopeContext';
 import { EntityTitleDoubleTextInput } from '@/ui/input/components/EntityTitleDoubleTextInput';
+import { FieldRecoilScopeContext } from '@/ui/object/record-inline-cell/states/recoil-scope-contexts/FieldRecoilScopeContext';
 import { RecoilScope } from '@/ui/utilities/recoil-scope/components/RecoilScope';
 import { Person, useUpdateOnePersonMutation } from '~/generated/graphql';
 
diff --git a/front/src/modules/people/hooks/useCreateActivityForPeople.ts b/front/src/modules/people/hooks/useCreateActivityForPeople.ts
index 02c5261f9..5d09e8ab9 100644
--- a/front/src/modules/people/hooks/useCreateActivityForPeople.ts
+++ b/front/src/modules/people/hooks/useCreateActivityForPeople.ts
@@ -5,8 +5,8 @@ import {
   ActivityTargetableEntity,
   ActivityTargetableEntityType,
 } from '@/activities/types/ActivityTargetableEntity';
-import { selectedRowIdsSelector } from '@/ui/data/data-table/states/selectors/selectedRowIdsSelector';
-import { entityFieldsFamilyState } from '@/ui/data/field/states/entityFieldsFamilyState';
+import { entityFieldsFamilyState } from '@/ui/object/field/states/entityFieldsFamilyState';
+import { selectedRowIdsSelector } from '@/ui/object/record-table/states/selectors/selectedRowIdsSelector';
 import { ActivityType, Person } from '~/generated/graphql';
 
 export const useCreateActivityForPeople = () => {
diff --git a/front/src/modules/people/hooks/usePersonQuery.ts b/front/src/modules/people/hooks/usePersonQuery.ts
index ab20e18a0..eadf7ff08 100644
--- a/front/src/modules/people/hooks/usePersonQuery.ts
+++ b/front/src/modules/people/hooks/usePersonQuery.ts
@@ -1,6 +1,6 @@
 import { useSetRecoilState } from 'recoil';
 
-import { entityFieldsFamilyState } from '@/ui/data/field/states/entityFieldsFamilyState';
+import { entityFieldsFamilyState } from '@/ui/object/field/states/entityFieldsFamilyState';
 import { useGetPersonQuery } from '~/generated/graphql';
 
 export const usePersonQuery = (id: string) => {
diff --git a/front/src/modules/people/hooks/usePersonTableContextMenuEntries.tsx b/front/src/modules/people/hooks/usePersonTableContextMenuEntries.tsx
index 654e94c30..adeed2128 100644
--- a/front/src/modules/people/hooks/usePersonTableContextMenuEntries.tsx
+++ b/front/src/modules/people/hooks/usePersonTableContextMenuEntries.tsx
@@ -2,9 +2,6 @@ import { getOperationName } from '@apollo/client/utilities';
 import { useRecoilCallback, useSetRecoilState } from 'recoil';
 
 import { useFavorites } from '@/favorites/hooks/useFavorites';
-import { useResetTableRowSelection } from '@/ui/data/data-table/hooks/useResetTableRowSelection';
-import { selectedRowIdsSelector } from '@/ui/data/data-table/states/selectors/selectedRowIdsSelector';
-import { tableRowIdsState } from '@/ui/data/data-table/states/tableRowIdsState';
 import {
   IconCheckbox,
   IconHeart,
@@ -14,6 +11,9 @@ import {
 } from '@/ui/display/icon';
 import { actionBarEntriesState } from '@/ui/navigation/action-bar/states/actionBarEntriesState';
 import { contextMenuEntriesState } from '@/ui/navigation/context-menu/states/contextMenuEntriesState';
+import { useResetTableRowSelection } from '@/ui/object/record-table/hooks/useResetTableRowSelection';
+import { selectedRowIdsSelector } from '@/ui/object/record-table/states/selectors/selectedRowIdsSelector';
+import { tableRowIdsState } from '@/ui/object/record-table/states/tableRowIdsState';
 import {
   ActivityType,
   useDeleteManyPersonMutation,
diff --git a/front/src/modules/people/hooks/useSetPeopleDataTable.ts b/front/src/modules/people/hooks/useSetPeopleRecordTable.ts
similarity index 89%
rename from front/src/modules/people/hooks/useSetPeopleDataTable.ts
rename to front/src/modules/people/hooks/useSetPeopleRecordTable.ts
index 365d9d1a3..c63692422 100644
--- a/front/src/modules/people/hooks/useSetPeopleDataTable.ts
+++ b/front/src/modules/people/hooks/useSetPeopleRecordTable.ts
@@ -1,10 +1,10 @@
 import { useLocation } from 'react-router-dom';
 import { useRecoilCallback } from 'recoil';
 
-import { useResetTableRowSelection } from '@/ui/data/data-table/hooks/useResetTableRowSelection';
-import { isFetchingDataTableDataState } from '@/ui/data/data-table/states/isFetchingDataTableDataState';
-import { numberOfTableRowsState } from '@/ui/data/data-table/states/numberOfTableRowsState';
-import { tableRowIdsState } from '@/ui/data/data-table/states/tableRowIdsState';
+import { useResetTableRowSelection } from '@/ui/object/record-table/hooks/useResetTableRowSelection';
+import { isFetchingRecordTableDataState } from '@/ui/object/record-table/states/isFetchingRecordTableDataState';
+import { numberOfTableRowsState } from '@/ui/object/record-table/states/numberOfTableRowsState';
+import { tableRowIdsState } from '@/ui/object/record-table/states/tableRowIdsState';
 import { currentPageLocationState } from '@/ui/utilities/loading-state/states/currentPageLocationState';
 import { GetPeopleQuery } from '~/generated/graphql';
 
@@ -17,7 +17,7 @@ import { peopleLinkedinUrlFamilyState } from '../states/peopleLinkedinUrlFamilyS
 import { peopleNameCellFamilyState } from '../states/peopleNamesFamilyState';
 import { peoplePhoneFamilyState } from '../states/peoplePhoneFamilyState';
 
-export const useSetPeopleDataTable = () => {
+export const useSetPeopleRecordTable = () => {
   const resetTableRowSelection = useResetTableRowSelection();
 
   const currentLocation = useLocation().pathname;
@@ -122,7 +122,7 @@ export const useSetPeopleDataTable = () => {
 
         set(currentPageLocationState, currentLocation);
 
-        set(isFetchingDataTableDataState, false);
+        set(isFetchingRecordTableDataState, false);
       },
     [currentLocation, resetTableRowSelection],
   );
diff --git a/front/src/modules/people/table/components/PersonTable.tsx b/front/src/modules/people/table/components/PersonTable.tsx
index da832ab84..7b4c6a7c5 100644
--- a/front/src/modules/people/table/components/PersonTable.tsx
+++ b/front/src/modules/people/table/components/PersonTable.tsx
@@ -5,14 +5,14 @@ import { peopleAvailableFieldDefinitions } from '@/people/constants/peopleAvaila
 import { getPeopleOptimisticEffectDefinition } from '@/people/graphql/optimistic-effect-definitions/getPeopleOptimisticEffectDefinition';
 import { usePersonTableContextMenuEntries } from '@/people/hooks/usePersonTableContextMenuEntries';
 import { useSpreadsheetPersonImport } from '@/people/hooks/useSpreadsheetPersonImport';
-import { DataTable } from '@/ui/data/data-table/components/DataTable';
-import { DataTableEffect } from '@/ui/data/data-table/components/DataTableEffect';
-import { TableContext } from '@/ui/data/data-table/contexts/TableContext';
-import { useUpsertDataTableItem } from '@/ui/data/data-table/hooks/useUpsertDataTableItem';
-import { TableOptionsDropdown } from '@/ui/data/data-table/options/components/TableOptionsDropdown';
-import { tableColumnsScopedState } from '@/ui/data/data-table/states/tableColumnsScopedState';
-import { tableFiltersScopedState } from '@/ui/data/data-table/states/tableFiltersScopedState';
-import { tableSortsScopedState } from '@/ui/data/data-table/states/tableSortsScopedState';
+import { RecordTable } from '@/ui/object/record-table/components/RecordTable';
+import { RecordTableEffect } from '@/ui/object/record-table/components/RecordTableEffect';
+import { TableContext } from '@/ui/object/record-table/contexts/TableContext';
+import { useUpsertRecordTableItem } from '@/ui/object/record-table/hooks/useUpsertRecordTableItem';
+import { TableOptionsDropdown } from '@/ui/object/record-table/options/components/TableOptionsDropdown';
+import { tableColumnsScopedState } from '@/ui/object/record-table/states/tableColumnsScopedState';
+import { tableFiltersScopedState } from '@/ui/object/record-table/states/tableFiltersScopedState';
+import { tableSortsScopedState } from '@/ui/object/record-table/states/tableSortsScopedState';
 import { ViewBar } from '@/views/components/ViewBar';
 import { useViewFields } from '@/views/hooks/internal/useViewFields';
 import { useView } from '@/views/hooks/useView';
@@ -45,7 +45,7 @@ export const PersonTable = () => {
   const setTableSorts = useSetRecoilState(tableSortsScopedState(tableScopeId));
 
   const [updateEntityMutation] = useUpdateOnePersonMutation();
-  const upsertDataTableItem = useUpsertDataTableItem();
+  const upsertRecordTableItem = useUpsertRecordTableItem();
 
   const { persistViewFields } = useViewFields(viewScopeId);
   const { setCurrentViewFields } = useView({
@@ -62,7 +62,7 @@ export const PersonTable = () => {
         if (!data.updateOnePerson) {
           return;
         }
-        upsertDataTableItem(data.updateOnePerson);
+        upsertRecordTableItem(data.updateOnePerson);
       },
     });
   };
@@ -108,7 +108,7 @@ export const PersonTable = () => {
             optionsDropdownScopeId="table-dropdown-option"
           />
           <PersonTableEffect />
-          <DataTableEffect
+          <RecordTableEffect
             getRequestResultKey="people"
             useGetRequest={useGetPeopleQuery}
             getRequestOptimisticEffectDefinition={
@@ -119,7 +119,7 @@ export const PersonTable = () => {
             setContextMenuEntries={setContextMenuEntries}
             setActionBarEntries={setActionBarEntries}
           />
-          <DataTable
+          <RecordTable
             updateEntityMutation={({
               variables,
             }: {
diff --git a/front/src/modules/people/table/components/PersonTableEffect.tsx b/front/src/modules/people/table/components/PersonTableEffect.tsx
index b7a87f6ff..ad7b69d3d 100644
--- a/front/src/modules/people/table/components/PersonTableEffect.tsx
+++ b/front/src/modules/people/table/components/PersonTableEffect.tsx
@@ -1,9 +1,9 @@
 import { useEffect } from 'react';
 
 import { peopleAvailableFieldDefinitions } from '@/people/constants/peopleAvailableFieldDefinitions';
-import { availableTableColumnsScopedState } from '@/ui/data/data-table/states/availableTableColumnsScopedState';
-import { TableRecoilScopeContext } from '@/ui/data/data-table/states/recoil-scope-contexts/TableRecoilScopeContext';
-import { tableColumnsScopedState } from '@/ui/data/data-table/states/tableColumnsScopedState';
+import { availableTableColumnsScopedState } from '@/ui/object/record-table/states/availableTableColumnsScopedState';
+import { TableRecoilScopeContext } from '@/ui/object/record-table/states/recoil-scope-contexts/TableRecoilScopeContext';
+import { tableColumnsScopedState } from '@/ui/object/record-table/states/tableColumnsScopedState';
 import { useRecoilScopedState } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedState';
 import { useView } from '@/views/hooks/useView';
 import { ViewType } from '@/views/types/ViewType';
diff --git a/front/src/modules/pipeline/constants/pipelineAvailableFieldDefinitions.tsx b/front/src/modules/pipeline/constants/pipelineAvailableFieldDefinitions.tsx
index 1cf9fdad7..b0d4806e4 100644
--- a/front/src/modules/pipeline/constants/pipelineAvailableFieldDefinitions.tsx
+++ b/front/src/modules/pipeline/constants/pipelineAvailableFieldDefinitions.tsx
@@ -1,11 +1,3 @@
-import { ColumnDefinition } from '@/ui/data/data-table/types/ColumnDefinition';
-import {
-  FieldDateMetadata,
-  FieldMetadata,
-  FieldNumberMetadata,
-  FieldProbabilityMetadata,
-  FieldRelationMetadata,
-} from '@/ui/data/field/types/FieldMetadata';
 import {
   IconCalendarEvent,
   IconCurrencyDollar,
@@ -13,6 +5,14 @@ import {
   IconUser,
 } from '@/ui/display/icon';
 import { Entity } from '@/ui/input/relation-picker/types/EntityTypeForSelect';
+import {
+  FieldDateMetadata,
+  FieldMetadata,
+  FieldNumberMetadata,
+  FieldProbabilityMetadata,
+  FieldRelationMetadata,
+} from '@/ui/object/field/types/FieldMetadata';
+import { ColumnDefinition } from '@/ui/object/record-table/types/ColumnDefinition';
 import { Person } from '~/generated/graphql';
 
 export const pipelineAvailableFieldDefinitions: ColumnDefinition<FieldMetadata>[] =
diff --git a/front/src/modules/types/AppPath.ts b/front/src/modules/types/AppPath.ts
index 0b8e0acb6..5700551fe 100644
--- a/front/src/modules/types/AppPath.ts
+++ b/front/src/modules/types/AppPath.ts
@@ -17,7 +17,7 @@ export enum AppPath {
   PersonShowPage = '/person/:personId',
   TasksPage = '/tasks',
   OpportunitiesPage = '/opportunities',
-  ObjectTablePage = '/objects/:objectNamePlural',
+  RecordTablePage = '/objects/:objectNamePlural',
 
   ObjectShowPage = '/object/:objectNameSingular/:objectId',
 
diff --git a/front/src/modules/ui/data/data-table/components/DataTableRow.tsx b/front/src/modules/ui/data/data-table/components/DataTableRow.tsx
deleted file mode 100644
index a79d1d071..000000000
--- a/front/src/modules/ui/data/data-table/components/DataTableRow.tsx
+++ /dev/null
@@ -1,54 +0,0 @@
-import { forwardRef } from 'react';
-import styled from '@emotion/styled';
-
-import { useRecoilScopedValue } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedValue';
-
-import { ColumnContext } from '../contexts/ColumnContext';
-import { useCurrentRowSelected } from '../hooks/useCurrentRowSelected';
-import { TableRecoilScopeContext } from '../states/recoil-scope-contexts/TableRecoilScopeContext';
-import { visibleTableColumnsScopedSelector } from '../states/selectors/visibleTableColumnsScopedSelector';
-
-import { CheckboxCell } from './CheckboxCell';
-import { DataTableCell } from './DataTableCell';
-
-const StyledRow = styled.tr<{ selected: boolean }>`
-  background: ${(props) =>
-    props.selected ? props.theme.accent.quaternary : 'none'};
-`;
-
-type DataTableRowProps = {
-  rowId: string;
-};
-
-export const DataTableRow = forwardRef<HTMLTableRowElement, DataTableRowProps>(
-  ({ rowId }, ref) => {
-    const visibleTableColumns = useRecoilScopedValue(
-      visibleTableColumnsScopedSelector,
-      TableRecoilScopeContext,
-    );
-    const { currentRowSelected } = useCurrentRowSelected();
-
-    return (
-      <StyledRow
-        ref={ref}
-        data-testid={`row-id-${rowId}`}
-        selected={currentRowSelected}
-        data-selectable-id={rowId}
-      >
-        <td>
-          <CheckboxCell />
-        </td>
-        {[...visibleTableColumns]
-          .sort((columnA, columnB) => columnA.position - columnB.position)
-          .map((column, columnIndex) => {
-            return (
-              <ColumnContext.Provider value={column} key={column.fieldId}>
-                <DataTableCell cellIndex={columnIndex} />
-              </ColumnContext.Provider>
-            );
-          })}
-        <td></td>
-      </StyledRow>
-    );
-  },
-);
diff --git a/front/src/modules/ui/data/data-table/states/isFetchingDataTableDataState.ts b/front/src/modules/ui/data/data-table/states/isFetchingDataTableDataState.ts
deleted file mode 100644
index 0a0fe94ab..000000000
--- a/front/src/modules/ui/data/data-table/states/isFetchingDataTableDataState.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { atom } from 'recoil';
-
-export const isFetchingDataTableDataState = atom<boolean>({
-  key: 'isFetchingDataTableDataState',
-  default: true,
-});
diff --git a/front/src/modules/ui/input/components/EntityTitleDoubleTextInput.tsx b/front/src/modules/ui/input/components/EntityTitleDoubleTextInput.tsx
index 6f08f7ead..6987021d7 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/data/field/meta-types/input/components/internal/TextInput';
+import { StyledInput } from '@/ui/object/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/board/hooks/useBoardCardFields.ts b/front/src/modules/ui/layout/board/hooks/useBoardCardFields.ts
index 328379a51..71818f362 100644
--- a/front/src/modules/ui/layout/board/hooks/useBoardCardFields.ts
+++ b/front/src/modules/ui/layout/board/hooks/useBoardCardFields.ts
@@ -1,5 +1,5 @@
-import { ColumnDefinition } from '@/ui/data/data-table/types/ColumnDefinition';
-import { FieldMetadata } from '@/ui/data/field/types/FieldMetadata';
+import { FieldMetadata } from '@/ui/object/field/types/FieldMetadata';
+import { ColumnDefinition } from '@/ui/object/record-table/types/ColumnDefinition';
 import { useRecoilScopedState } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedState';
 
 import { boardCardFieldsScopedState } from '../states/boardCardFieldsScopedState';
diff --git a/front/src/modules/ui/layout/board/hooks/useBoardColumns.ts b/front/src/modules/ui/layout/board/hooks/useBoardColumns.ts
index 466abc506..d5df4dca2 100644
--- a/front/src/modules/ui/layout/board/hooks/useBoardColumns.ts
+++ b/front/src/modules/ui/layout/board/hooks/useBoardColumns.ts
@@ -1,6 +1,6 @@
 import { useRecoilState } from 'recoil';
 
-import { useMoveViewColumns } from '@/ui/data/data-table/hooks/useMoveViewColumns';
+import { useMoveViewColumns } from '@/ui/object/record-table/hooks/useMoveViewColumns';
 import { useUpdatePipelineStageMutation } from '~/generated/graphql';
 
 import { boardColumnsState } from '../states/boardColumnsState';
diff --git a/front/src/modules/ui/layout/board/states/availableBoardCardFieldsScopedState.ts b/front/src/modules/ui/layout/board/states/availableBoardCardFieldsScopedState.ts
index e1efde93c..3202a6a36 100644
--- a/front/src/modules/ui/layout/board/states/availableBoardCardFieldsScopedState.ts
+++ b/front/src/modules/ui/layout/board/states/availableBoardCardFieldsScopedState.ts
@@ -1,6 +1,6 @@
 import { atomFamily } from 'recoil';
 
-import { FieldMetadata } from '@/ui/data/field/types/FieldMetadata';
+import { FieldMetadata } from '@/ui/object/field/types/FieldMetadata';
 
 import { BoardFieldDefinition } from '../types/BoardFieldDefinition';
 
diff --git a/front/src/modules/ui/layout/board/states/boardCardFieldsScopedState.ts b/front/src/modules/ui/layout/board/states/boardCardFieldsScopedState.ts
index 75afa2812..7fbeecd43 100644
--- a/front/src/modules/ui/layout/board/states/boardCardFieldsScopedState.ts
+++ b/front/src/modules/ui/layout/board/states/boardCardFieldsScopedState.ts
@@ -1,6 +1,6 @@
 import { atomFamily } from 'recoil';
 
-import { FieldMetadata } from '@/ui/data/field/types/FieldMetadata';
+import { FieldMetadata } from '@/ui/object/field/types/FieldMetadata';
 
 import { BoardFieldDefinition } from '../types/BoardFieldDefinition';
 
diff --git a/front/src/modules/ui/layout/board/states/savedBoardCardFieldsFamilyState.ts b/front/src/modules/ui/layout/board/states/savedBoardCardFieldsFamilyState.ts
index a251bc173..9e0656f3e 100644
--- a/front/src/modules/ui/layout/board/states/savedBoardCardFieldsFamilyState.ts
+++ b/front/src/modules/ui/layout/board/states/savedBoardCardFieldsFamilyState.ts
@@ -1,6 +1,6 @@
 import { atomFamily } from 'recoil';
 
-import { FieldMetadata } from '@/ui/data/field/types/FieldMetadata';
+import { FieldMetadata } from '@/ui/object/field/types/FieldMetadata';
 
 import { BoardFieldDefinition } from '../types/BoardFieldDefinition';
 
diff --git a/front/src/modules/ui/layout/board/states/selectors/boardCardFieldsByKeyScopedSelector.ts b/front/src/modules/ui/layout/board/states/selectors/boardCardFieldsByKeyScopedSelector.ts
index 9fb528fef..ef741eaf5 100644
--- a/front/src/modules/ui/layout/board/states/selectors/boardCardFieldsByKeyScopedSelector.ts
+++ b/front/src/modules/ui/layout/board/states/selectors/boardCardFieldsByKeyScopedSelector.ts
@@ -1,6 +1,6 @@
 import { selectorFamily } from 'recoil';
 
-import { FieldMetadata } from '@/ui/data/field/types/FieldMetadata';
+import { FieldMetadata } from '@/ui/object/field/types/FieldMetadata';
 
 import { BoardFieldDefinition } from '../../types/BoardFieldDefinition';
 import { boardCardFieldsScopedState } from '../boardCardFieldsScopedState';
diff --git a/front/src/modules/ui/layout/board/states/selectors/savedBoardCardFieldsByKeyFamilySelector.ts b/front/src/modules/ui/layout/board/states/selectors/savedBoardCardFieldsByKeyFamilySelector.ts
index dee25f8df..af64c0fb2 100644
--- a/front/src/modules/ui/layout/board/states/selectors/savedBoardCardFieldsByKeyFamilySelector.ts
+++ b/front/src/modules/ui/layout/board/states/selectors/savedBoardCardFieldsByKeyFamilySelector.ts
@@ -1,6 +1,6 @@
 import { selectorFamily } from 'recoil';
 
-import { FieldMetadata } from '@/ui/data/field/types/FieldMetadata';
+import { FieldMetadata } from '@/ui/object/field/types/FieldMetadata';
 
 import { BoardFieldDefinition } from '../../types/BoardFieldDefinition';
 import { savedBoardCardFieldsFamilyState } from '../savedBoardCardFieldsFamilyState';
diff --git a/front/src/modules/ui/layout/board/types/BoardFieldDefinition.ts b/front/src/modules/ui/layout/board/types/BoardFieldDefinition.ts
index 06d44a4c2..951b98447 100644
--- a/front/src/modules/ui/layout/board/types/BoardFieldDefinition.ts
+++ b/front/src/modules/ui/layout/board/types/BoardFieldDefinition.ts
@@ -1,5 +1,5 @@
-import { FieldDefinition } from '@/ui/data/field/types/FieldDefinition';
-import { FieldMetadata } from '@/ui/data/field/types/FieldMetadata';
+import { FieldDefinition } from '@/ui/object/field/types/FieldDefinition';
+import { FieldMetadata } from '@/ui/object/field/types/FieldMetadata';
 
 export type BoardFieldDefinition<T extends FieldMetadata> =
   FieldDefinition<T> & {
diff --git a/front/src/modules/ui/layout/board/types/BoardOptions.ts b/front/src/modules/ui/layout/board/types/BoardOptions.ts
index 181322ad2..c970d5a2c 100644
--- a/front/src/modules/ui/layout/board/types/BoardOptions.ts
+++ b/front/src/modules/ui/layout/board/types/BoardOptions.ts
@@ -1,7 +1,7 @@
 import { ComponentType } from 'react';
 
-import { FilterDefinitionByEntity } from '@/ui/data/filter/types/FilterDefinitionByEntity';
-import { SortDefinition } from '@/ui/data/sort/types/SortDefinition';
+import { FilterDefinitionByEntity } from '@/ui/object/filter/types/FilterDefinitionByEntity';
+import { SortDefinition } from '@/ui/object/sort/types/SortDefinition';
 import { PipelineProgress } from '~/generated/graphql';
 
 export type BoardOptions = {
diff --git a/front/src/modules/ui/layout/page/PageHotkeysEffect.tsx b/front/src/modules/ui/layout/page/PageHotkeysEffect.tsx
index 50c1252c5..9bd4ad91a 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/data/data-table/types/TableHotkeyScope';
+import { TableHotkeyScope } from '@/ui/object/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 28a5070d8..3a0b581d9 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
@@ -4,7 +4,7 @@ import { useSetRecoilState } from 'recoil';
 
 import { useCompanyTableContextMenuEntries } from '@/companies/hooks/useCompanyTableContextMenuEntries';
 import { CompanyTableMockMode } from '@/companies/table/components/CompanyTableMockMode';
-import { TableRecoilScopeContext } from '@/ui/data/data-table/states/recoil-scope-contexts/TableRecoilScopeContext';
+import { TableRecoilScopeContext } from '@/ui/object/record-table/states/recoil-scope-contexts/TableRecoilScopeContext';
 import { RecoilScope } from '@/ui/utilities/recoil-scope/components/RecoilScope';
 import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
 
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 a19156d29..35f2d24bd 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
@@ -4,7 +4,7 @@ import { useSetRecoilState } from 'recoil';
 
 import { useCompanyTableContextMenuEntries } from '@/companies/hooks/useCompanyTableContextMenuEntries';
 import { CompanyTableMockMode } from '@/companies/table/components/CompanyTableMockMode';
-import { TableRecoilScopeContext } from '@/ui/data/data-table/states/recoil-scope-contexts/TableRecoilScopeContext';
+import { TableRecoilScopeContext } from '@/ui/object/record-table/states/recoil-scope-contexts/TableRecoilScopeContext';
 import { RecoilScope } from '@/ui/utilities/recoil-scope/components/RecoilScope';
 import { ComponentDecorator } from '~/testing/decorators/ComponentDecorator';
 
diff --git a/front/src/modules/ui/data/field/components/FieldDisplay.tsx b/front/src/modules/ui/object/field/components/FieldDisplay.tsx
similarity index 100%
rename from front/src/modules/ui/data/field/components/FieldDisplay.tsx
rename to front/src/modules/ui/object/field/components/FieldDisplay.tsx
diff --git a/front/src/modules/ui/data/field/components/FieldInput.tsx b/front/src/modules/ui/object/field/components/FieldInput.tsx
similarity index 100%
rename from front/src/modules/ui/data/field/components/FieldInput.tsx
rename to front/src/modules/ui/object/field/components/FieldInput.tsx
diff --git a/front/src/modules/ui/data/field/contexts/FieldContext.ts b/front/src/modules/ui/object/field/contexts/FieldContext.ts
similarity index 100%
rename from front/src/modules/ui/data/field/contexts/FieldContext.ts
rename to front/src/modules/ui/object/field/contexts/FieldContext.ts
diff --git a/front/src/modules/ui/data/field/hooks/useGetButtonIcon.ts b/front/src/modules/ui/object/field/hooks/useGetButtonIcon.ts
similarity index 100%
rename from front/src/modules/ui/data/field/hooks/useGetButtonIcon.ts
rename to front/src/modules/ui/object/field/hooks/useGetButtonIcon.ts
diff --git a/front/src/modules/ui/data/field/hooks/useIsFieldEmpty.ts b/front/src/modules/ui/object/field/hooks/useIsFieldEmpty.ts
similarity index 100%
rename from front/src/modules/ui/data/field/hooks/useIsFieldEmpty.ts
rename to front/src/modules/ui/object/field/hooks/useIsFieldEmpty.ts
diff --git a/front/src/modules/ui/data/field/hooks/useIsFieldInputOnly.ts b/front/src/modules/ui/object/field/hooks/useIsFieldInputOnly.ts
similarity index 100%
rename from front/src/modules/ui/data/field/hooks/useIsFieldInputOnly.ts
rename to front/src/modules/ui/object/field/hooks/useIsFieldInputOnly.ts
diff --git a/front/src/modules/ui/data/field/hooks/usePersistField.ts b/front/src/modules/ui/object/field/hooks/usePersistField.ts
similarity index 100%
rename from front/src/modules/ui/data/field/hooks/usePersistField.ts
rename to front/src/modules/ui/object/field/hooks/usePersistField.ts
diff --git a/front/src/modules/ui/data/field/hooks/useToggleEditOnlyInput.ts b/front/src/modules/ui/object/field/hooks/useToggleEditOnlyInput.ts
similarity index 100%
rename from front/src/modules/ui/data/field/hooks/useToggleEditOnlyInput.ts
rename to front/src/modules/ui/object/field/hooks/useToggleEditOnlyInput.ts
diff --git a/front/src/modules/ui/data/field/meta-types/__stories__/FieldContextProvider.tsx b/front/src/modules/ui/object/field/meta-types/__stories__/FieldContextProvider.tsx
similarity index 93%
rename from front/src/modules/ui/data/field/meta-types/__stories__/FieldContextProvider.tsx
rename to front/src/modules/ui/object/field/meta-types/__stories__/FieldContextProvider.tsx
index 428266163..21eb4b897 100644
--- a/front/src/modules/ui/data/field/meta-types/__stories__/FieldContextProvider.tsx
+++ b/front/src/modules/ui/object/field/meta-types/__stories__/FieldContextProvider.tsx
@@ -1,7 +1,7 @@
 import {
   FieldContext,
   GenericFieldContextType,
-} from '@/ui/data/field/contexts/FieldContext';
+} from '@/ui/object/field/contexts/FieldContext';
 
 type FieldContextProviderProps = {
   children: React.ReactNode;
diff --git a/front/src/modules/ui/data/field/meta-types/display/components/ChipFieldDisplay.tsx b/front/src/modules/ui/object/field/meta-types/display/components/ChipFieldDisplay.tsx
similarity index 100%
rename from front/src/modules/ui/data/field/meta-types/display/components/ChipFieldDisplay.tsx
rename to front/src/modules/ui/object/field/meta-types/display/components/ChipFieldDisplay.tsx
diff --git a/front/src/modules/ui/data/field/meta-types/display/components/DateFieldDisplay.tsx b/front/src/modules/ui/object/field/meta-types/display/components/DateFieldDisplay.tsx
similarity index 63%
rename from front/src/modules/ui/data/field/meta-types/display/components/DateFieldDisplay.tsx
rename to front/src/modules/ui/object/field/meta-types/display/components/DateFieldDisplay.tsx
index 36d9b53e0..dc1a5f711 100644
--- a/front/src/modules/ui/data/field/meta-types/display/components/DateFieldDisplay.tsx
+++ b/front/src/modules/ui/object/field/meta-types/display/components/DateFieldDisplay.tsx
@@ -1,4 +1,4 @@
-import { DateDisplay } from '@/ui/data/field/meta-types/display/content-display/components/DateDisplay';
+import { DateDisplay } from '@/ui/object/field/meta-types/display/content-display/components/DateDisplay';
 
 import { useDateField } from '../../hooks/useDateField';
 
diff --git a/front/src/modules/ui/data/field/meta-types/display/components/DoubleTextChipFieldDisplay.tsx b/front/src/modules/ui/object/field/meta-types/display/components/DoubleTextChipFieldDisplay.tsx
similarity index 100%
rename from front/src/modules/ui/data/field/meta-types/display/components/DoubleTextChipFieldDisplay.tsx
rename to front/src/modules/ui/object/field/meta-types/display/components/DoubleTextChipFieldDisplay.tsx
diff --git a/front/src/modules/ui/data/field/meta-types/display/components/DoubleTextFieldDisplay.tsx b/front/src/modules/ui/object/field/meta-types/display/components/DoubleTextFieldDisplay.tsx
similarity index 100%
rename from front/src/modules/ui/data/field/meta-types/display/components/DoubleTextFieldDisplay.tsx
rename to front/src/modules/ui/object/field/meta-types/display/components/DoubleTextFieldDisplay.tsx
diff --git a/front/src/modules/ui/data/field/meta-types/display/components/EmailFieldDisplay.tsx b/front/src/modules/ui/object/field/meta-types/display/components/EmailFieldDisplay.tsx
similarity index 100%
rename from front/src/modules/ui/data/field/meta-types/display/components/EmailFieldDisplay.tsx
rename to front/src/modules/ui/object/field/meta-types/display/components/EmailFieldDisplay.tsx
diff --git a/front/src/modules/ui/data/field/meta-types/display/components/MoneyAmountV2FieldDisplay.tsx b/front/src/modules/ui/object/field/meta-types/display/components/MoneyAmountV2FieldDisplay.tsx
similarity index 100%
rename from front/src/modules/ui/data/field/meta-types/display/components/MoneyAmountV2FieldDisplay.tsx
rename to front/src/modules/ui/object/field/meta-types/display/components/MoneyAmountV2FieldDisplay.tsx
diff --git a/front/src/modules/ui/data/field/meta-types/display/components/MoneyFieldDisplay.tsx b/front/src/modules/ui/object/field/meta-types/display/components/MoneyFieldDisplay.tsx
similarity index 100%
rename from front/src/modules/ui/data/field/meta-types/display/components/MoneyFieldDisplay.tsx
rename to front/src/modules/ui/object/field/meta-types/display/components/MoneyFieldDisplay.tsx
diff --git a/front/src/modules/ui/data/field/meta-types/display/components/NumberFieldDisplay.tsx b/front/src/modules/ui/object/field/meta-types/display/components/NumberFieldDisplay.tsx
similarity index 64%
rename from front/src/modules/ui/data/field/meta-types/display/components/NumberFieldDisplay.tsx
rename to front/src/modules/ui/object/field/meta-types/display/components/NumberFieldDisplay.tsx
index ae62090fb..d599fe9b7 100644
--- a/front/src/modules/ui/data/field/meta-types/display/components/NumberFieldDisplay.tsx
+++ b/front/src/modules/ui/object/field/meta-types/display/components/NumberFieldDisplay.tsx
@@ -1,4 +1,4 @@
-import { NumberDisplay } from '@/ui/data/field/meta-types/display/content-display/components/NumberDisplay';
+import { NumberDisplay } from '@/ui/object/field/meta-types/display/content-display/components/NumberDisplay';
 
 import { useNumberField } from '../../hooks/useNumberField';
 
diff --git a/front/src/modules/ui/data/field/meta-types/display/components/PhoneFieldDisplay.tsx b/front/src/modules/ui/object/field/meta-types/display/components/PhoneFieldDisplay.tsx
similarity index 64%
rename from front/src/modules/ui/data/field/meta-types/display/components/PhoneFieldDisplay.tsx
rename to front/src/modules/ui/object/field/meta-types/display/components/PhoneFieldDisplay.tsx
index fc5d486d3..dd3908274 100644
--- a/front/src/modules/ui/data/field/meta-types/display/components/PhoneFieldDisplay.tsx
+++ b/front/src/modules/ui/object/field/meta-types/display/components/PhoneFieldDisplay.tsx
@@ -1,4 +1,4 @@
-import { PhoneDisplay } from '@/ui/data/field/meta-types/display/content-display/components/PhoneDisplay';
+import { PhoneDisplay } from '@/ui/object/field/meta-types/display/content-display/components/PhoneDisplay';
 
 import { usePhoneField } from '../../hooks/usePhoneField';
 
diff --git a/front/src/modules/ui/data/field/meta-types/display/components/RelationFieldDisplay.tsx b/front/src/modules/ui/object/field/meta-types/display/components/RelationFieldDisplay.tsx
similarity index 100%
rename from front/src/modules/ui/data/field/meta-types/display/components/RelationFieldDisplay.tsx
rename to front/src/modules/ui/object/field/meta-types/display/components/RelationFieldDisplay.tsx
diff --git a/front/src/modules/ui/data/field/meta-types/display/components/TextFieldDisplay.tsx b/front/src/modules/ui/object/field/meta-types/display/components/TextFieldDisplay.tsx
similarity index 63%
rename from front/src/modules/ui/data/field/meta-types/display/components/TextFieldDisplay.tsx
rename to front/src/modules/ui/object/field/meta-types/display/components/TextFieldDisplay.tsx
index a801f3186..78c7fccd5 100644
--- a/front/src/modules/ui/data/field/meta-types/display/components/TextFieldDisplay.tsx
+++ b/front/src/modules/ui/object/field/meta-types/display/components/TextFieldDisplay.tsx
@@ -1,4 +1,4 @@
-import { TextDisplay } from '@/ui/data/field/meta-types/display/content-display/components/TextDisplay';
+import { TextDisplay } from '@/ui/object/field/meta-types/display/content-display/components/TextDisplay';
 
 import { useTextField } from '../../hooks/useTextField';
 
diff --git a/front/src/modules/ui/data/field/meta-types/display/components/URLFieldDisplay.tsx b/front/src/modules/ui/object/field/meta-types/display/components/URLFieldDisplay.tsx
similarity index 63%
rename from front/src/modules/ui/data/field/meta-types/display/components/URLFieldDisplay.tsx
rename to front/src/modules/ui/object/field/meta-types/display/components/URLFieldDisplay.tsx
index f7a7339e0..3faf60069 100644
--- a/front/src/modules/ui/data/field/meta-types/display/components/URLFieldDisplay.tsx
+++ b/front/src/modules/ui/object/field/meta-types/display/components/URLFieldDisplay.tsx
@@ -1,4 +1,4 @@
-import { URLDisplay } from '@/ui/data/field/meta-types/display/content-display/components/URLDisplay';
+import { URLDisplay } from '@/ui/object/field/meta-types/display/content-display/components/URLDisplay';
 
 import { useURLField } from '../../hooks/useURLField';
 
diff --git a/front/src/modules/ui/data/field/meta-types/display/components/URLV2FieldDisplay.tsx b/front/src/modules/ui/object/field/meta-types/display/components/URLV2FieldDisplay.tsx
similarity index 100%
rename from front/src/modules/ui/data/field/meta-types/display/components/URLV2FieldDisplay.tsx
rename to front/src/modules/ui/object/field/meta-types/display/components/URLV2FieldDisplay.tsx
diff --git a/front/src/modules/ui/data/field/meta-types/display/components/__stories__/DateFieldDisplay.stories.tsx b/front/src/modules/ui/object/field/meta-types/display/components/__stories__/DateFieldDisplay.stories.tsx
similarity index 100%
rename from front/src/modules/ui/data/field/meta-types/display/components/__stories__/DateFieldDisplay.stories.tsx
rename to front/src/modules/ui/object/field/meta-types/display/components/__stories__/DateFieldDisplay.stories.tsx
diff --git a/front/src/modules/ui/data/field/meta-types/display/components/__stories__/DoubleTextFieldDisplay.stories.tsx b/front/src/modules/ui/object/field/meta-types/display/components/__stories__/DoubleTextFieldDisplay.stories.tsx
similarity index 100%
rename from front/src/modules/ui/data/field/meta-types/display/components/__stories__/DoubleTextFieldDisplay.stories.tsx
rename to front/src/modules/ui/object/field/meta-types/display/components/__stories__/DoubleTextFieldDisplay.stories.tsx
diff --git a/front/src/modules/ui/data/field/meta-types/display/components/__stories__/EmailFieldDisplay.stories.tsx b/front/src/modules/ui/object/field/meta-types/display/components/__stories__/EmailFieldDisplay.stories.tsx
similarity index 100%
rename from front/src/modules/ui/data/field/meta-types/display/components/__stories__/EmailFieldDisplay.stories.tsx
rename to front/src/modules/ui/object/field/meta-types/display/components/__stories__/EmailFieldDisplay.stories.tsx
diff --git a/front/src/modules/ui/data/field/meta-types/display/components/__stories__/MoneyFieldDisplay.stories.tsx b/front/src/modules/ui/object/field/meta-types/display/components/__stories__/MoneyFieldDisplay.stories.tsx
similarity index 100%
rename from front/src/modules/ui/data/field/meta-types/display/components/__stories__/MoneyFieldDisplay.stories.tsx
rename to front/src/modules/ui/object/field/meta-types/display/components/__stories__/MoneyFieldDisplay.stories.tsx
diff --git a/front/src/modules/ui/data/field/meta-types/display/components/__stories__/NumberFieldDisplay.stories.tsx b/front/src/modules/ui/object/field/meta-types/display/components/__stories__/NumberFieldDisplay.stories.tsx
similarity index 100%
rename from front/src/modules/ui/data/field/meta-types/display/components/__stories__/NumberFieldDisplay.stories.tsx
rename to front/src/modules/ui/object/field/meta-types/display/components/__stories__/NumberFieldDisplay.stories.tsx
diff --git a/front/src/modules/ui/data/field/meta-types/display/components/__stories__/PhoneFieldDisplay.stories.tsx b/front/src/modules/ui/object/field/meta-types/display/components/__stories__/PhoneFieldDisplay.stories.tsx
similarity index 100%
rename from front/src/modules/ui/data/field/meta-types/display/components/__stories__/PhoneFieldDisplay.stories.tsx
rename to front/src/modules/ui/object/field/meta-types/display/components/__stories__/PhoneFieldDisplay.stories.tsx
diff --git a/front/src/modules/ui/data/field/meta-types/display/components/__stories__/TextFieldDisplay.stories.tsx b/front/src/modules/ui/object/field/meta-types/display/components/__stories__/TextFieldDisplay.stories.tsx
similarity index 100%
rename from front/src/modules/ui/data/field/meta-types/display/components/__stories__/TextFieldDisplay.stories.tsx
rename to front/src/modules/ui/object/field/meta-types/display/components/__stories__/TextFieldDisplay.stories.tsx
diff --git a/front/src/modules/ui/data/field/meta-types/display/components/__stories__/URLFieldDisplay.stories.tsx b/front/src/modules/ui/object/field/meta-types/display/components/__stories__/URLFieldDisplay.stories.tsx
similarity index 100%
rename from front/src/modules/ui/data/field/meta-types/display/components/__stories__/URLFieldDisplay.stories.tsx
rename to front/src/modules/ui/object/field/meta-types/display/components/__stories__/URLFieldDisplay.stories.tsx
diff --git a/front/src/modules/ui/data/field/meta-types/display/content-display/components/ChipDisplay.tsx b/front/src/modules/ui/object/field/meta-types/display/content-display/components/ChipDisplay.tsx
similarity index 100%
rename from front/src/modules/ui/data/field/meta-types/display/content-display/components/ChipDisplay.tsx
rename to front/src/modules/ui/object/field/meta-types/display/content-display/components/ChipDisplay.tsx
diff --git a/front/src/modules/ui/data/field/meta-types/display/content-display/components/DateDisplay.tsx b/front/src/modules/ui/object/field/meta-types/display/content-display/components/DateDisplay.tsx
similarity index 100%
rename from front/src/modules/ui/data/field/meta-types/display/content-display/components/DateDisplay.tsx
rename to front/src/modules/ui/object/field/meta-types/display/content-display/components/DateDisplay.tsx
diff --git a/front/src/modules/ui/data/field/meta-types/display/content-display/components/DoubleTextDisplay.tsx b/front/src/modules/ui/object/field/meta-types/display/content-display/components/DoubleTextDisplay.tsx
similarity index 100%
rename from front/src/modules/ui/data/field/meta-types/display/content-display/components/DoubleTextDisplay.tsx
rename to front/src/modules/ui/object/field/meta-types/display/content-display/components/DoubleTextDisplay.tsx
diff --git a/front/src/modules/ui/data/field/meta-types/display/content-display/components/EllipsisDisplay.tsx b/front/src/modules/ui/object/field/meta-types/display/content-display/components/EllipsisDisplay.tsx
similarity index 100%
rename from front/src/modules/ui/data/field/meta-types/display/content-display/components/EllipsisDisplay.tsx
rename to front/src/modules/ui/object/field/meta-types/display/content-display/components/EllipsisDisplay.tsx
diff --git a/front/src/modules/ui/data/field/meta-types/display/content-display/components/EmailDisplay.tsx b/front/src/modules/ui/object/field/meta-types/display/content-display/components/EmailDisplay.tsx
similarity index 100%
rename from front/src/modules/ui/data/field/meta-types/display/content-display/components/EmailDisplay.tsx
rename to front/src/modules/ui/object/field/meta-types/display/content-display/components/EmailDisplay.tsx
diff --git a/front/src/modules/ui/data/field/meta-types/display/content-display/components/MoneyAmountV2Display.tsx b/front/src/modules/ui/object/field/meta-types/display/content-display/components/MoneyAmountV2Display.tsx
similarity index 79%
rename from front/src/modules/ui/data/field/meta-types/display/content-display/components/MoneyAmountV2Display.tsx
rename to front/src/modules/ui/object/field/meta-types/display/content-display/components/MoneyAmountV2Display.tsx
index 46749954d..a1ac631ad 100644
--- a/front/src/modules/ui/data/field/meta-types/display/content-display/components/MoneyAmountV2Display.tsx
+++ b/front/src/modules/ui/object/field/meta-types/display/content-display/components/MoneyAmountV2Display.tsx
@@ -1,4 +1,4 @@
-import { FieldMoneyAmountV2Value } from '@/ui/data/field/types/FieldMetadata';
+import { FieldMoneyAmountV2Value } from '@/ui/object/field/types/FieldMetadata';
 
 import { EllipsisDisplay } from './EllipsisDisplay';
 
diff --git a/front/src/modules/ui/data/field/meta-types/display/content-display/components/MoneyDisplay.tsx b/front/src/modules/ui/object/field/meta-types/display/content-display/components/MoneyDisplay.tsx
similarity index 100%
rename from front/src/modules/ui/data/field/meta-types/display/content-display/components/MoneyDisplay.tsx
rename to front/src/modules/ui/object/field/meta-types/display/content-display/components/MoneyDisplay.tsx
diff --git a/front/src/modules/ui/data/field/meta-types/display/content-display/components/NumberDisplay.tsx b/front/src/modules/ui/object/field/meta-types/display/content-display/components/NumberDisplay.tsx
similarity index 100%
rename from front/src/modules/ui/data/field/meta-types/display/content-display/components/NumberDisplay.tsx
rename to front/src/modules/ui/object/field/meta-types/display/content-display/components/NumberDisplay.tsx
diff --git a/front/src/modules/ui/data/field/meta-types/display/content-display/components/PhoneDisplay.tsx b/front/src/modules/ui/object/field/meta-types/display/content-display/components/PhoneDisplay.tsx
similarity index 100%
rename from front/src/modules/ui/data/field/meta-types/display/content-display/components/PhoneDisplay.tsx
rename to front/src/modules/ui/object/field/meta-types/display/content-display/components/PhoneDisplay.tsx
diff --git a/front/src/modules/ui/data/field/meta-types/display/content-display/components/TextDisplay.tsx b/front/src/modules/ui/object/field/meta-types/display/content-display/components/TextDisplay.tsx
similarity index 100%
rename from front/src/modules/ui/data/field/meta-types/display/content-display/components/TextDisplay.tsx
rename to front/src/modules/ui/object/field/meta-types/display/content-display/components/TextDisplay.tsx
diff --git a/front/src/modules/ui/data/field/meta-types/display/content-display/components/URLDisplay.tsx b/front/src/modules/ui/object/field/meta-types/display/content-display/components/URLDisplay.tsx
similarity index 100%
rename from front/src/modules/ui/data/field/meta-types/display/content-display/components/URLDisplay.tsx
rename to front/src/modules/ui/object/field/meta-types/display/content-display/components/URLDisplay.tsx
diff --git a/front/src/modules/ui/data/field/meta-types/display/content-display/components/URLDisplayV2.tsx b/front/src/modules/ui/object/field/meta-types/display/content-display/components/URLDisplayV2.tsx
similarity index 95%
rename from front/src/modules/ui/data/field/meta-types/display/content-display/components/URLDisplayV2.tsx
rename to front/src/modules/ui/object/field/meta-types/display/content-display/components/URLDisplayV2.tsx
index eaf80e513..47866c57e 100644
--- a/front/src/modules/ui/data/field/meta-types/display/content-display/components/URLDisplayV2.tsx
+++ b/front/src/modules/ui/object/field/meta-types/display/content-display/components/URLDisplayV2.tsx
@@ -1,12 +1,12 @@
 import { MouseEvent } from 'react';
 import styled from '@emotion/styled';
 
-import { FieldURLV2Value } from '@/ui/data/field/types/FieldMetadata';
 import { RoundedLink } from '@/ui/navigation/link/components/RoundedLink';
 import {
   LinkType,
   SocialLink,
 } from '@/ui/navigation/link/components/SocialLink';
+import { FieldURLV2Value } from '@/ui/object/field/types/FieldMetadata';
 
 import { EllipsisDisplay } from './EllipsisDisplay';
 
diff --git a/front/src/modules/ui/data/field/meta-types/display/content-display/components/__stories__/PhoneInputDisplay.stories.tsx b/front/src/modules/ui/object/field/meta-types/display/content-display/components/__stories__/PhoneInputDisplay.stories.tsx
similarity index 100%
rename from front/src/modules/ui/data/field/meta-types/display/content-display/components/__stories__/PhoneInputDisplay.stories.tsx
rename to front/src/modules/ui/object/field/meta-types/display/content-display/components/__stories__/PhoneInputDisplay.stories.tsx
diff --git a/front/src/modules/ui/data/field/meta-types/hooks/useBooleanField.ts b/front/src/modules/ui/object/field/meta-types/hooks/useBooleanField.ts
similarity index 100%
rename from front/src/modules/ui/data/field/meta-types/hooks/useBooleanField.ts
rename to front/src/modules/ui/object/field/meta-types/hooks/useBooleanField.ts
diff --git a/front/src/modules/ui/data/field/meta-types/hooks/useChipField.ts b/front/src/modules/ui/object/field/meta-types/hooks/useChipField.ts
similarity index 100%
rename from front/src/modules/ui/data/field/meta-types/hooks/useChipField.ts
rename to front/src/modules/ui/object/field/meta-types/hooks/useChipField.ts
diff --git a/front/src/modules/ui/data/field/meta-types/hooks/useDateField.ts b/front/src/modules/ui/object/field/meta-types/hooks/useDateField.ts
similarity index 100%
rename from front/src/modules/ui/data/field/meta-types/hooks/useDateField.ts
rename to front/src/modules/ui/object/field/meta-types/hooks/useDateField.ts
diff --git a/front/src/modules/ui/data/field/meta-types/hooks/useDoubleTextChipField.ts b/front/src/modules/ui/object/field/meta-types/hooks/useDoubleTextChipField.ts
similarity index 100%
rename from front/src/modules/ui/data/field/meta-types/hooks/useDoubleTextChipField.ts
rename to front/src/modules/ui/object/field/meta-types/hooks/useDoubleTextChipField.ts
diff --git a/front/src/modules/ui/data/field/meta-types/hooks/useDoubleTextField.ts b/front/src/modules/ui/object/field/meta-types/hooks/useDoubleTextField.ts
similarity index 100%
rename from front/src/modules/ui/data/field/meta-types/hooks/useDoubleTextField.ts
rename to front/src/modules/ui/object/field/meta-types/hooks/useDoubleTextField.ts
diff --git a/front/src/modules/ui/data/field/meta-types/hooks/useEmailField.ts b/front/src/modules/ui/object/field/meta-types/hooks/useEmailField.ts
similarity index 100%
rename from front/src/modules/ui/data/field/meta-types/hooks/useEmailField.ts
rename to front/src/modules/ui/object/field/meta-types/hooks/useEmailField.ts
diff --git a/front/src/modules/ui/data/field/meta-types/hooks/useMoneyAmountV2Field.ts b/front/src/modules/ui/object/field/meta-types/hooks/useMoneyAmountV2Field.ts
similarity index 100%
rename from front/src/modules/ui/data/field/meta-types/hooks/useMoneyAmountV2Field.ts
rename to front/src/modules/ui/object/field/meta-types/hooks/useMoneyAmountV2Field.ts
diff --git a/front/src/modules/ui/data/field/meta-types/hooks/useMoneyField.ts b/front/src/modules/ui/object/field/meta-types/hooks/useMoneyField.ts
similarity index 100%
rename from front/src/modules/ui/data/field/meta-types/hooks/useMoneyField.ts
rename to front/src/modules/ui/object/field/meta-types/hooks/useMoneyField.ts
diff --git a/front/src/modules/ui/data/field/meta-types/hooks/useNumberField.ts b/front/src/modules/ui/object/field/meta-types/hooks/useNumberField.ts
similarity index 100%
rename from front/src/modules/ui/data/field/meta-types/hooks/useNumberField.ts
rename to front/src/modules/ui/object/field/meta-types/hooks/useNumberField.ts
diff --git a/front/src/modules/ui/data/field/meta-types/hooks/usePhoneField.ts b/front/src/modules/ui/object/field/meta-types/hooks/usePhoneField.ts
similarity index 100%
rename from front/src/modules/ui/data/field/meta-types/hooks/usePhoneField.ts
rename to front/src/modules/ui/object/field/meta-types/hooks/usePhoneField.ts
diff --git a/front/src/modules/ui/data/field/meta-types/hooks/useProbabilityField.ts b/front/src/modules/ui/object/field/meta-types/hooks/useProbabilityField.ts
similarity index 100%
rename from front/src/modules/ui/data/field/meta-types/hooks/useProbabilityField.ts
rename to front/src/modules/ui/object/field/meta-types/hooks/useProbabilityField.ts
diff --git a/front/src/modules/ui/data/field/meta-types/hooks/useRelationField.ts b/front/src/modules/ui/object/field/meta-types/hooks/useRelationField.ts
similarity index 100%
rename from front/src/modules/ui/data/field/meta-types/hooks/useRelationField.ts
rename to front/src/modules/ui/object/field/meta-types/hooks/useRelationField.ts
diff --git a/front/src/modules/ui/data/field/meta-types/hooks/useTextField.ts b/front/src/modules/ui/object/field/meta-types/hooks/useTextField.ts
similarity index 100%
rename from front/src/modules/ui/data/field/meta-types/hooks/useTextField.ts
rename to front/src/modules/ui/object/field/meta-types/hooks/useTextField.ts
diff --git a/front/src/modules/ui/data/field/meta-types/hooks/useURLField.ts b/front/src/modules/ui/object/field/meta-types/hooks/useURLField.ts
similarity index 100%
rename from front/src/modules/ui/data/field/meta-types/hooks/useURLField.ts
rename to front/src/modules/ui/object/field/meta-types/hooks/useURLField.ts
diff --git a/front/src/modules/ui/data/field/meta-types/hooks/useURLV2Field.ts b/front/src/modules/ui/object/field/meta-types/hooks/useURLV2Field.ts
similarity index 100%
rename from front/src/modules/ui/data/field/meta-types/hooks/useURLV2Field.ts
rename to front/src/modules/ui/object/field/meta-types/hooks/useURLV2Field.ts
diff --git a/front/src/modules/ui/data/field/meta-types/input/components/BooleanFieldInput.tsx b/front/src/modules/ui/object/field/meta-types/input/components/BooleanFieldInput.tsx
similarity index 87%
rename from front/src/modules/ui/data/field/meta-types/input/components/BooleanFieldInput.tsx
rename to front/src/modules/ui/object/field/meta-types/input/components/BooleanFieldInput.tsx
index 003a2f2ca..251d59277 100644
--- a/front/src/modules/ui/data/field/meta-types/input/components/BooleanFieldInput.tsx
+++ b/front/src/modules/ui/object/field/meta-types/input/components/BooleanFieldInput.tsx
@@ -1,4 +1,4 @@
-import { BooleanInput } from '@/ui/data/field/meta-types/input/components/internal/BooleanInput';
+import { BooleanInput } from '@/ui/object/field/meta-types/input/components/internal/BooleanInput';
 
 import { usePersistField } from '../../../hooks/usePersistField';
 import { useBooleanField } from '../../hooks/useBooleanField';
diff --git a/front/src/modules/ui/data/field/meta-types/input/components/ChipFieldInput.tsx b/front/src/modules/ui/object/field/meta-types/input/components/ChipFieldInput.tsx
similarity index 94%
rename from front/src/modules/ui/data/field/meta-types/input/components/ChipFieldInput.tsx
rename to front/src/modules/ui/object/field/meta-types/input/components/ChipFieldInput.tsx
index ebcc784ac..45888bb6b 100644
--- a/front/src/modules/ui/data/field/meta-types/input/components/ChipFieldInput.tsx
+++ b/front/src/modules/ui/object/field/meta-types/input/components/ChipFieldInput.tsx
@@ -1,4 +1,4 @@
-import { TextInput } from '@/ui/data/field/meta-types/input/components/internal/TextInput';
+import { TextInput } from '@/ui/object/field/meta-types/input/components/internal/TextInput';
 
 import { usePersistField } from '../../../hooks/usePersistField';
 import { useChipField } from '../../hooks/useChipField';
diff --git a/front/src/modules/ui/data/field/meta-types/input/components/DateFieldInput.tsx b/front/src/modules/ui/object/field/meta-types/input/components/DateFieldInput.tsx
similarity index 93%
rename from front/src/modules/ui/data/field/meta-types/input/components/DateFieldInput.tsx
rename to front/src/modules/ui/object/field/meta-types/input/components/DateFieldInput.tsx
index 70890f8bd..847d3d434 100644
--- a/front/src/modules/ui/data/field/meta-types/input/components/DateFieldInput.tsx
+++ b/front/src/modules/ui/object/field/meta-types/input/components/DateFieldInput.tsx
@@ -1,4 +1,4 @@
-import { DateInput } from '@/ui/data/field/meta-types/input/components/internal/DateInput';
+import { DateInput } from '@/ui/object/field/meta-types/input/components/internal/DateInput';
 import { Nullable } from '~/types/Nullable';
 
 import { usePersistField } from '../../../hooks/usePersistField';
diff --git a/front/src/modules/ui/data/field/meta-types/input/components/DoubleTextChipFieldInput.tsx b/front/src/modules/ui/object/field/meta-types/input/components/DoubleTextChipFieldInput.tsx
similarity index 91%
rename from front/src/modules/ui/data/field/meta-types/input/components/DoubleTextChipFieldInput.tsx
rename to front/src/modules/ui/object/field/meta-types/input/components/DoubleTextChipFieldInput.tsx
index db50e99f4..d26bbd6fc 100644
--- a/front/src/modules/ui/data/field/meta-types/input/components/DoubleTextChipFieldInput.tsx
+++ b/front/src/modules/ui/object/field/meta-types/input/components/DoubleTextChipFieldInput.tsx
@@ -1,5 +1,5 @@
-import { DoubleTextInput } from '@/ui/data/field/meta-types/input/components/internal/DoubleTextInput';
-import { FieldDoubleText } from '@/ui/data/field/types/FieldDoubleText';
+import { DoubleTextInput } from '@/ui/object/field/meta-types/input/components/internal/DoubleTextInput';
+import { FieldDoubleText } from '@/ui/object/field/types/FieldDoubleText';
 
 import { usePersistField } from '../../../hooks/usePersistField';
 import { useDoubleTextChipField } from '../../hooks/useDoubleTextChipField';
diff --git a/front/src/modules/ui/data/field/meta-types/input/components/DoubleTextFieldInput.tsx b/front/src/modules/ui/object/field/meta-types/input/components/DoubleTextFieldInput.tsx
similarity index 91%
rename from front/src/modules/ui/data/field/meta-types/input/components/DoubleTextFieldInput.tsx
rename to front/src/modules/ui/object/field/meta-types/input/components/DoubleTextFieldInput.tsx
index 7bc7c9778..fe3fa0a45 100644
--- a/front/src/modules/ui/data/field/meta-types/input/components/DoubleTextFieldInput.tsx
+++ b/front/src/modules/ui/object/field/meta-types/input/components/DoubleTextFieldInput.tsx
@@ -1,5 +1,5 @@
-import { DoubleTextInput } from '@/ui/data/field/meta-types/input/components/internal/DoubleTextInput';
-import { FieldDoubleText } from '@/ui/data/field/types/FieldDoubleText';
+import { DoubleTextInput } from '@/ui/object/field/meta-types/input/components/internal/DoubleTextInput';
+import { FieldDoubleText } from '@/ui/object/field/types/FieldDoubleText';
 
 import { usePersistField } from '../../../hooks/usePersistField';
 import { useDoubleTextField } from '../../hooks/useDoubleTextField';
diff --git a/front/src/modules/ui/data/field/meta-types/input/components/EmailFieldInput.tsx b/front/src/modules/ui/object/field/meta-types/input/components/EmailFieldInput.tsx
similarity index 94%
rename from front/src/modules/ui/data/field/meta-types/input/components/EmailFieldInput.tsx
rename to front/src/modules/ui/object/field/meta-types/input/components/EmailFieldInput.tsx
index fe6624bf8..f86f171c8 100644
--- a/front/src/modules/ui/data/field/meta-types/input/components/EmailFieldInput.tsx
+++ b/front/src/modules/ui/object/field/meta-types/input/components/EmailFieldInput.tsx
@@ -1,4 +1,4 @@
-import { TextInput } from '@/ui/data/field/meta-types/input/components/internal/TextInput';
+import { TextInput } from '@/ui/object/field/meta-types/input/components/internal/TextInput';
 
 import { usePersistField } from '../../../hooks/usePersistField';
 import { useEmailField } from '../../hooks/useEmailField';
diff --git a/front/src/modules/ui/data/field/meta-types/input/components/MoneyAmountV2FieldInput.tsx b/front/src/modules/ui/object/field/meta-types/input/components/MoneyAmountV2FieldInput.tsx
similarity index 95%
rename from front/src/modules/ui/data/field/meta-types/input/components/MoneyAmountV2FieldInput.tsx
rename to front/src/modules/ui/object/field/meta-types/input/components/MoneyAmountV2FieldInput.tsx
index e69f0684a..ba413336e 100644
--- a/front/src/modules/ui/data/field/meta-types/input/components/MoneyAmountV2FieldInput.tsx
+++ b/front/src/modules/ui/object/field/meta-types/input/components/MoneyAmountV2FieldInput.tsx
@@ -1,4 +1,4 @@
-import { DoubleTextInput } from '@/ui/data/field/meta-types/input/components/internal/DoubleTextInput';
+import { DoubleTextInput } from '@/ui/object/field/meta-types/input/components/internal/DoubleTextInput';
 
 import { usePersistField } from '../../../hooks/usePersistField';
 import { FieldDoubleText } from '../../../types/FieldDoubleText';
diff --git a/front/src/modules/ui/data/field/meta-types/input/components/MoneyFieldInput.tsx b/front/src/modules/ui/object/field/meta-types/input/components/MoneyFieldInput.tsx
similarity index 94%
rename from front/src/modules/ui/data/field/meta-types/input/components/MoneyFieldInput.tsx
rename to front/src/modules/ui/object/field/meta-types/input/components/MoneyFieldInput.tsx
index 3bae673a1..d5ea05acb 100644
--- a/front/src/modules/ui/data/field/meta-types/input/components/MoneyFieldInput.tsx
+++ b/front/src/modules/ui/object/field/meta-types/input/components/MoneyFieldInput.tsx
@@ -1,4 +1,4 @@
-import { TextInput } from '@/ui/data/field/meta-types/input/components/internal/TextInput';
+import { TextInput } from '@/ui/object/field/meta-types/input/components/internal/TextInput';
 
 import { useMoneyField } from '../../hooks/useMoneyField';
 
diff --git a/front/src/modules/ui/data/field/meta-types/input/components/NumberFieldInput.tsx b/front/src/modules/ui/object/field/meta-types/input/components/NumberFieldInput.tsx
similarity index 94%
rename from front/src/modules/ui/data/field/meta-types/input/components/NumberFieldInput.tsx
rename to front/src/modules/ui/object/field/meta-types/input/components/NumberFieldInput.tsx
index c7aa86319..4b96fe9df 100644
--- a/front/src/modules/ui/data/field/meta-types/input/components/NumberFieldInput.tsx
+++ b/front/src/modules/ui/object/field/meta-types/input/components/NumberFieldInput.tsx
@@ -1,4 +1,4 @@
-import { TextInput } from '@/ui/data/field/meta-types/input/components/internal/TextInput';
+import { TextInput } from '@/ui/object/field/meta-types/input/components/internal/TextInput';
 
 import { useNumberField } from '../../hooks/useNumberField';
 
diff --git a/front/src/modules/ui/data/field/meta-types/input/components/PhoneFieldInput.tsx b/front/src/modules/ui/object/field/meta-types/input/components/PhoneFieldInput.tsx
similarity index 94%
rename from front/src/modules/ui/data/field/meta-types/input/components/PhoneFieldInput.tsx
rename to front/src/modules/ui/object/field/meta-types/input/components/PhoneFieldInput.tsx
index 1d3173d37..2496e4685 100644
--- a/front/src/modules/ui/data/field/meta-types/input/components/PhoneFieldInput.tsx
+++ b/front/src/modules/ui/object/field/meta-types/input/components/PhoneFieldInput.tsx
@@ -1,4 +1,4 @@
-import { PhoneInput } from '@/ui/data/field/meta-types/input/components/internal/PhoneInput';
+import { PhoneInput } from '@/ui/object/field/meta-types/input/components/internal/PhoneInput';
 
 import { usePhoneField } from '../../hooks/usePhoneField';
 
diff --git a/front/src/modules/ui/data/field/meta-types/input/components/ProbabilityFieldInput.tsx b/front/src/modules/ui/object/field/meta-types/input/components/ProbabilityFieldInput.tsx
similarity index 86%
rename from front/src/modules/ui/data/field/meta-types/input/components/ProbabilityFieldInput.tsx
rename to front/src/modules/ui/object/field/meta-types/input/components/ProbabilityFieldInput.tsx
index 0a82fc7db..33788cb1f 100644
--- a/front/src/modules/ui/data/field/meta-types/input/components/ProbabilityFieldInput.tsx
+++ b/front/src/modules/ui/object/field/meta-types/input/components/ProbabilityFieldInput.tsx
@@ -1,4 +1,4 @@
-import { ProbabilityInput } from '@/ui/data/field/meta-types/input/components/internal/ProbabilityInput';
+import { ProbabilityInput } from '@/ui/object/field/meta-types/input/components/internal/ProbabilityInput';
 
 import { usePersistField } from '../../../hooks/usePersistField';
 import { useProbabilityField } from '../../hooks/useProbabilityField';
diff --git a/front/src/modules/ui/data/field/meta-types/input/components/RelationFieldInput.tsx b/front/src/modules/ui/object/field/meta-types/input/components/RelationFieldInput.tsx
similarity index 100%
rename from front/src/modules/ui/data/field/meta-types/input/components/RelationFieldInput.tsx
rename to front/src/modules/ui/object/field/meta-types/input/components/RelationFieldInput.tsx
diff --git a/front/src/modules/ui/data/field/meta-types/input/components/TextFieldInput.tsx b/front/src/modules/ui/object/field/meta-types/input/components/TextFieldInput.tsx
similarity index 94%
rename from front/src/modules/ui/data/field/meta-types/input/components/TextFieldInput.tsx
rename to front/src/modules/ui/object/field/meta-types/input/components/TextFieldInput.tsx
index 3b69605dc..af8599869 100644
--- a/front/src/modules/ui/data/field/meta-types/input/components/TextFieldInput.tsx
+++ b/front/src/modules/ui/object/field/meta-types/input/components/TextFieldInput.tsx
@@ -1,4 +1,4 @@
-import { TextInput } from '@/ui/data/field/meta-types/input/components/internal/TextInput';
+import { TextInput } from '@/ui/object/field/meta-types/input/components/internal/TextInput';
 
 import { usePersistField } from '../../../hooks/usePersistField';
 import { useTextField } from '../../hooks/useTextField';
diff --git a/front/src/modules/ui/data/field/meta-types/input/components/URLFieldInput.tsx b/front/src/modules/ui/object/field/meta-types/input/components/URLFieldInput.tsx
similarity index 94%
rename from front/src/modules/ui/data/field/meta-types/input/components/URLFieldInput.tsx
rename to front/src/modules/ui/object/field/meta-types/input/components/URLFieldInput.tsx
index 8fe57d4d0..ecdf40930 100644
--- a/front/src/modules/ui/data/field/meta-types/input/components/URLFieldInput.tsx
+++ b/front/src/modules/ui/object/field/meta-types/input/components/URLFieldInput.tsx
@@ -1,4 +1,4 @@
-import { TextInput } from '@/ui/data/field/meta-types/input/components/internal/TextInput';
+import { TextInput } from '@/ui/object/field/meta-types/input/components/internal/TextInput';
 
 import { useURLField } from '../../hooks/useURLField';
 
diff --git a/front/src/modules/ui/data/field/meta-types/input/components/URLV2FieldInput.tsx b/front/src/modules/ui/object/field/meta-types/input/components/URLV2FieldInput.tsx
similarity index 100%
rename from front/src/modules/ui/data/field/meta-types/input/components/URLV2FieldInput.tsx
rename to front/src/modules/ui/object/field/meta-types/input/components/URLV2FieldInput.tsx
diff --git a/front/src/modules/ui/data/field/meta-types/input/components/__stories__/BooleanFieldInput.stories.tsx b/front/src/modules/ui/object/field/meta-types/input/components/__stories__/BooleanFieldInput.stories.tsx
similarity index 100%
rename from front/src/modules/ui/data/field/meta-types/input/components/__stories__/BooleanFieldInput.stories.tsx
rename to front/src/modules/ui/object/field/meta-types/input/components/__stories__/BooleanFieldInput.stories.tsx
diff --git a/front/src/modules/ui/data/field/meta-types/input/components/__stories__/ChipFieldInput.stories.tsx b/front/src/modules/ui/object/field/meta-types/input/components/__stories__/ChipFieldInput.stories.tsx
similarity index 100%
rename from front/src/modules/ui/data/field/meta-types/input/components/__stories__/ChipFieldInput.stories.tsx
rename to front/src/modules/ui/object/field/meta-types/input/components/__stories__/ChipFieldInput.stories.tsx
diff --git a/front/src/modules/ui/data/field/meta-types/input/components/__stories__/DateFieldInput.stories.tsx b/front/src/modules/ui/object/field/meta-types/input/components/__stories__/DateFieldInput.stories.tsx
similarity index 100%
rename from front/src/modules/ui/data/field/meta-types/input/components/__stories__/DateFieldInput.stories.tsx
rename to front/src/modules/ui/object/field/meta-types/input/components/__stories__/DateFieldInput.stories.tsx
diff --git a/front/src/modules/ui/data/field/meta-types/input/components/__stories__/DoubleTextChipFieldInput.stories.tsx b/front/src/modules/ui/object/field/meta-types/input/components/__stories__/DoubleTextChipFieldInput.stories.tsx
similarity index 100%
rename from front/src/modules/ui/data/field/meta-types/input/components/__stories__/DoubleTextChipFieldInput.stories.tsx
rename to front/src/modules/ui/object/field/meta-types/input/components/__stories__/DoubleTextChipFieldInput.stories.tsx
diff --git a/front/src/modules/ui/data/field/meta-types/input/components/__stories__/DoubleTextFieldInput.stories.tsx b/front/src/modules/ui/object/field/meta-types/input/components/__stories__/DoubleTextFieldInput.stories.tsx
similarity index 100%
rename from front/src/modules/ui/data/field/meta-types/input/components/__stories__/DoubleTextFieldInput.stories.tsx
rename to front/src/modules/ui/object/field/meta-types/input/components/__stories__/DoubleTextFieldInput.stories.tsx
diff --git a/front/src/modules/ui/data/field/meta-types/input/components/__stories__/EmailFieldInput.stories.tsx b/front/src/modules/ui/object/field/meta-types/input/components/__stories__/EmailFieldInput.stories.tsx
similarity index 100%
rename from front/src/modules/ui/data/field/meta-types/input/components/__stories__/EmailFieldInput.stories.tsx
rename to front/src/modules/ui/object/field/meta-types/input/components/__stories__/EmailFieldInput.stories.tsx
diff --git a/front/src/modules/ui/data/field/meta-types/input/components/__stories__/MoneyFieldInput.stories.tsx b/front/src/modules/ui/object/field/meta-types/input/components/__stories__/MoneyFieldInput.stories.tsx
similarity index 100%
rename from front/src/modules/ui/data/field/meta-types/input/components/__stories__/MoneyFieldInput.stories.tsx
rename to front/src/modules/ui/object/field/meta-types/input/components/__stories__/MoneyFieldInput.stories.tsx
diff --git a/front/src/modules/ui/data/field/meta-types/input/components/__stories__/NumberFieldInput.stories.tsx b/front/src/modules/ui/object/field/meta-types/input/components/__stories__/NumberFieldInput.stories.tsx
similarity index 100%
rename from front/src/modules/ui/data/field/meta-types/input/components/__stories__/NumberFieldInput.stories.tsx
rename to front/src/modules/ui/object/field/meta-types/input/components/__stories__/NumberFieldInput.stories.tsx
diff --git a/front/src/modules/ui/data/field/meta-types/input/components/__stories__/PhoneFieldInput.stories.tsx b/front/src/modules/ui/object/field/meta-types/input/components/__stories__/PhoneFieldInput.stories.tsx
similarity index 100%
rename from front/src/modules/ui/data/field/meta-types/input/components/__stories__/PhoneFieldInput.stories.tsx
rename to front/src/modules/ui/object/field/meta-types/input/components/__stories__/PhoneFieldInput.stories.tsx
diff --git a/front/src/modules/ui/data/field/meta-types/input/components/__stories__/ProbabilityFieldInput.stories.tsx b/front/src/modules/ui/object/field/meta-types/input/components/__stories__/ProbabilityFieldInput.stories.tsx
similarity index 100%
rename from front/src/modules/ui/data/field/meta-types/input/components/__stories__/ProbabilityFieldInput.stories.tsx
rename to front/src/modules/ui/object/field/meta-types/input/components/__stories__/ProbabilityFieldInput.stories.tsx
diff --git a/front/src/modules/ui/data/field/meta-types/input/components/__stories__/RelationFieldInput.stories.tsx b/front/src/modules/ui/object/field/meta-types/input/components/__stories__/RelationFieldInput.stories.tsx
similarity index 100%
rename from front/src/modules/ui/data/field/meta-types/input/components/__stories__/RelationFieldInput.stories.tsx
rename to front/src/modules/ui/object/field/meta-types/input/components/__stories__/RelationFieldInput.stories.tsx
diff --git a/front/src/modules/ui/data/field/meta-types/input/components/__stories__/TextFieldInput.stories.tsx b/front/src/modules/ui/object/field/meta-types/input/components/__stories__/TextFieldInput.stories.tsx
similarity index 100%
rename from front/src/modules/ui/data/field/meta-types/input/components/__stories__/TextFieldInput.stories.tsx
rename to front/src/modules/ui/object/field/meta-types/input/components/__stories__/TextFieldInput.stories.tsx
diff --git a/front/src/modules/ui/data/field/meta-types/input/components/__stories__/URLFieldInput.stories.tsx b/front/src/modules/ui/object/field/meta-types/input/components/__stories__/URLFieldInput.stories.tsx
similarity index 100%
rename from front/src/modules/ui/data/field/meta-types/input/components/__stories__/URLFieldInput.stories.tsx
rename to front/src/modules/ui/object/field/meta-types/input/components/__stories__/URLFieldInput.stories.tsx
diff --git a/front/src/modules/ui/data/field/meta-types/input/components/internal/BooleanInput.tsx b/front/src/modules/ui/object/field/meta-types/input/components/internal/BooleanInput.tsx
similarity index 100%
rename from front/src/modules/ui/data/field/meta-types/input/components/internal/BooleanInput.tsx
rename to front/src/modules/ui/object/field/meta-types/input/components/internal/BooleanInput.tsx
diff --git a/front/src/modules/ui/data/field/meta-types/input/components/internal/DateInput.tsx b/front/src/modules/ui/object/field/meta-types/input/components/internal/DateInput.tsx
similarity index 95%
rename from front/src/modules/ui/data/field/meta-types/input/components/internal/DateInput.tsx
rename to front/src/modules/ui/object/field/meta-types/input/components/internal/DateInput.tsx
index 6b509b44e..183d46f5c 100644
--- a/front/src/modules/ui/data/field/meta-types/input/components/internal/DateInput.tsx
+++ b/front/src/modules/ui/object/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 '@/ui/data/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/data/field/meta-types/input/components/internal/DoubleTextInput.tsx b/front/src/modules/ui/object/field/meta-types/input/components/internal/DoubleTextInput.tsx
similarity index 98%
rename from front/src/modules/ui/data/field/meta-types/input/components/internal/DoubleTextInput.tsx
rename to front/src/modules/ui/object/field/meta-types/input/components/internal/DoubleTextInput.tsx
index 9a613c996..9cc46bd05 100644
--- a/front/src/modules/ui/data/field/meta-types/input/components/internal/DoubleTextInput.tsx
+++ b/front/src/modules/ui/object/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/data/field/types/FieldDoubleText';
+import { FieldDoubleText } from '@/ui/object/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/data/field/meta-types/input/components/internal/FieldInputOverlay.tsx b/front/src/modules/ui/object/field/meta-types/input/components/internal/FieldInputOverlay.tsx
similarity index 100%
rename from front/src/modules/ui/data/field/meta-types/input/components/internal/FieldInputOverlay.tsx
rename to front/src/modules/ui/object/field/meta-types/input/components/internal/FieldInputOverlay.tsx
diff --git a/front/src/modules/ui/data/field/meta-types/input/components/internal/PhoneInput.tsx b/front/src/modules/ui/object/field/meta-types/input/components/internal/PhoneInput.tsx
similarity index 100%
rename from front/src/modules/ui/data/field/meta-types/input/components/internal/PhoneInput.tsx
rename to front/src/modules/ui/object/field/meta-types/input/components/internal/PhoneInput.tsx
diff --git a/front/src/modules/ui/data/field/meta-types/input/components/internal/ProbabilityInput.tsx b/front/src/modules/ui/object/field/meta-types/input/components/internal/ProbabilityInput.tsx
similarity index 100%
rename from front/src/modules/ui/data/field/meta-types/input/components/internal/ProbabilityInput.tsx
rename to front/src/modules/ui/object/field/meta-types/input/components/internal/ProbabilityInput.tsx
diff --git a/front/src/modules/ui/data/field/meta-types/input/components/internal/TextInput.tsx b/front/src/modules/ui/object/field/meta-types/input/components/internal/TextInput.tsx
similarity index 100%
rename from front/src/modules/ui/data/field/meta-types/input/components/internal/TextInput.tsx
rename to front/src/modules/ui/object/field/meta-types/input/components/internal/TextInput.tsx
diff --git a/front/src/modules/ui/data/field/meta-types/input/hooks/useRegisterInputEvents.ts b/front/src/modules/ui/object/field/meta-types/input/hooks/useRegisterInputEvents.ts
similarity index 100%
rename from front/src/modules/ui/data/field/meta-types/input/hooks/useRegisterInputEvents.ts
rename to front/src/modules/ui/object/field/meta-types/input/hooks/useRegisterInputEvents.ts
diff --git a/front/src/modules/ui/data/field/states/entityFieldsFamilyState.ts b/front/src/modules/ui/object/field/states/entityFieldsFamilyState.ts
similarity index 100%
rename from front/src/modules/ui/data/field/states/entityFieldsFamilyState.ts
rename to front/src/modules/ui/object/field/states/entityFieldsFamilyState.ts
diff --git a/front/src/modules/ui/data/field/states/isFieldEmptyScopedState.ts b/front/src/modules/ui/object/field/states/isFieldEmptyScopedState.ts
similarity index 100%
rename from front/src/modules/ui/data/field/states/isFieldEmptyScopedState.ts
rename to front/src/modules/ui/object/field/states/isFieldEmptyScopedState.ts
diff --git a/front/src/modules/ui/data/field/states/selectors/entityFieldsFamilySelector.ts b/front/src/modules/ui/object/field/states/selectors/entityFieldsFamilySelector.ts
similarity index 100%
rename from front/src/modules/ui/data/field/states/selectors/entityFieldsFamilySelector.ts
rename to front/src/modules/ui/object/field/states/selectors/entityFieldsFamilySelector.ts
diff --git a/front/src/modules/ui/data/field/states/selectors/isEntityFieldEmptyFamilySelector.ts b/front/src/modules/ui/object/field/states/selectors/isEntityFieldEmptyFamilySelector.ts
similarity index 100%
rename from front/src/modules/ui/data/field/states/selectors/isEntityFieldEmptyFamilySelector.ts
rename to front/src/modules/ui/object/field/states/selectors/isEntityFieldEmptyFamilySelector.ts
diff --git a/front/src/modules/ui/data/field/types/FieldDefinition.ts b/front/src/modules/ui/object/field/types/FieldDefinition.ts
similarity index 100%
rename from front/src/modules/ui/data/field/types/FieldDefinition.ts
rename to front/src/modules/ui/object/field/types/FieldDefinition.ts
diff --git a/front/src/modules/ui/data/field/types/FieldDefinitionWithTypeOnly.ts b/front/src/modules/ui/object/field/types/FieldDefinitionWithTypeOnly.ts
similarity index 100%
rename from front/src/modules/ui/data/field/types/FieldDefinitionWithTypeOnly.ts
rename to front/src/modules/ui/object/field/types/FieldDefinitionWithTypeOnly.ts
diff --git a/front/src/modules/ui/data/field/types/FieldDoubleText.ts b/front/src/modules/ui/object/field/types/FieldDoubleText.ts
similarity index 100%
rename from front/src/modules/ui/data/field/types/FieldDoubleText.ts
rename to front/src/modules/ui/object/field/types/FieldDoubleText.ts
diff --git a/front/src/modules/ui/data/field/types/FieldInputEvent.ts b/front/src/modules/ui/object/field/types/FieldInputEvent.ts
similarity index 100%
rename from front/src/modules/ui/data/field/types/FieldInputEvent.ts
rename to front/src/modules/ui/object/field/types/FieldInputEvent.ts
diff --git a/front/src/modules/ui/data/field/types/FieldMetadata.ts b/front/src/modules/ui/object/field/types/FieldMetadata.ts
similarity index 100%
rename from front/src/modules/ui/data/field/types/FieldMetadata.ts
rename to front/src/modules/ui/object/field/types/FieldMetadata.ts
diff --git a/front/src/modules/ui/data/field/types/FieldType.ts b/front/src/modules/ui/object/field/types/FieldType.ts
similarity index 100%
rename from front/src/modules/ui/data/field/types/FieldType.ts
rename to front/src/modules/ui/object/field/types/FieldType.ts
diff --git a/front/src/modules/ui/data/field/types/guards/assertFieldMetadata.ts b/front/src/modules/ui/object/field/types/guards/assertFieldMetadata.ts
similarity index 100%
rename from front/src/modules/ui/data/field/types/guards/assertFieldMetadata.ts
rename to front/src/modules/ui/object/field/types/guards/assertFieldMetadata.ts
diff --git a/front/src/modules/ui/data/field/types/guards/isFieldBoolean.ts b/front/src/modules/ui/object/field/types/guards/isFieldBoolean.ts
similarity index 100%
rename from front/src/modules/ui/data/field/types/guards/isFieldBoolean.ts
rename to front/src/modules/ui/object/field/types/guards/isFieldBoolean.ts
diff --git a/front/src/modules/ui/data/field/types/guards/isFieldBooleanValue.ts b/front/src/modules/ui/object/field/types/guards/isFieldBooleanValue.ts
similarity index 100%
rename from front/src/modules/ui/data/field/types/guards/isFieldBooleanValue.ts
rename to front/src/modules/ui/object/field/types/guards/isFieldBooleanValue.ts
diff --git a/front/src/modules/ui/data/field/types/guards/isFieldChip.ts b/front/src/modules/ui/object/field/types/guards/isFieldChip.ts
similarity index 100%
rename from front/src/modules/ui/data/field/types/guards/isFieldChip.ts
rename to front/src/modules/ui/object/field/types/guards/isFieldChip.ts
diff --git a/front/src/modules/ui/data/field/types/guards/isFieldChipValue.ts b/front/src/modules/ui/object/field/types/guards/isFieldChipValue.ts
similarity index 100%
rename from front/src/modules/ui/data/field/types/guards/isFieldChipValue.ts
rename to front/src/modules/ui/object/field/types/guards/isFieldChipValue.ts
diff --git a/front/src/modules/ui/data/field/types/guards/isFieldDate.ts b/front/src/modules/ui/object/field/types/guards/isFieldDate.ts
similarity index 100%
rename from front/src/modules/ui/data/field/types/guards/isFieldDate.ts
rename to front/src/modules/ui/object/field/types/guards/isFieldDate.ts
diff --git a/front/src/modules/ui/data/field/types/guards/isFieldDateValue.ts b/front/src/modules/ui/object/field/types/guards/isFieldDateValue.ts
similarity index 100%
rename from front/src/modules/ui/data/field/types/guards/isFieldDateValue.ts
rename to front/src/modules/ui/object/field/types/guards/isFieldDateValue.ts
diff --git a/front/src/modules/ui/data/field/types/guards/isFieldDoubleText.ts b/front/src/modules/ui/object/field/types/guards/isFieldDoubleText.ts
similarity index 100%
rename from front/src/modules/ui/data/field/types/guards/isFieldDoubleText.ts
rename to front/src/modules/ui/object/field/types/guards/isFieldDoubleText.ts
diff --git a/front/src/modules/ui/data/field/types/guards/isFieldDoubleTextChip.ts b/front/src/modules/ui/object/field/types/guards/isFieldDoubleTextChip.ts
similarity index 100%
rename from front/src/modules/ui/data/field/types/guards/isFieldDoubleTextChip.ts
rename to front/src/modules/ui/object/field/types/guards/isFieldDoubleTextChip.ts
diff --git a/front/src/modules/ui/data/field/types/guards/isFieldDoubleTextChipValue.ts b/front/src/modules/ui/object/field/types/guards/isFieldDoubleTextChipValue.ts
similarity index 100%
rename from front/src/modules/ui/data/field/types/guards/isFieldDoubleTextChipValue.ts
rename to front/src/modules/ui/object/field/types/guards/isFieldDoubleTextChipValue.ts
diff --git a/front/src/modules/ui/data/field/types/guards/isFieldDoubleTextValue.ts b/front/src/modules/ui/object/field/types/guards/isFieldDoubleTextValue.ts
similarity index 100%
rename from front/src/modules/ui/data/field/types/guards/isFieldDoubleTextValue.ts
rename to front/src/modules/ui/object/field/types/guards/isFieldDoubleTextValue.ts
diff --git a/front/src/modules/ui/data/field/types/guards/isFieldEmail.ts b/front/src/modules/ui/object/field/types/guards/isFieldEmail.ts
similarity index 100%
rename from front/src/modules/ui/data/field/types/guards/isFieldEmail.ts
rename to front/src/modules/ui/object/field/types/guards/isFieldEmail.ts
diff --git a/front/src/modules/ui/data/field/types/guards/isFieldEmailValue.ts b/front/src/modules/ui/object/field/types/guards/isFieldEmailValue.ts
similarity index 100%
rename from front/src/modules/ui/data/field/types/guards/isFieldEmailValue.ts
rename to front/src/modules/ui/object/field/types/guards/isFieldEmailValue.ts
diff --git a/front/src/modules/ui/data/field/types/guards/isFieldMoney.ts b/front/src/modules/ui/object/field/types/guards/isFieldMoney.ts
similarity index 100%
rename from front/src/modules/ui/data/field/types/guards/isFieldMoney.ts
rename to front/src/modules/ui/object/field/types/guards/isFieldMoney.ts
diff --git a/front/src/modules/ui/data/field/types/guards/isFieldMoneyAmountV2.ts b/front/src/modules/ui/object/field/types/guards/isFieldMoneyAmountV2.ts
similarity index 100%
rename from front/src/modules/ui/data/field/types/guards/isFieldMoneyAmountV2.ts
rename to front/src/modules/ui/object/field/types/guards/isFieldMoneyAmountV2.ts
diff --git a/front/src/modules/ui/data/field/types/guards/isFieldMoneyAmountV2Value.ts b/front/src/modules/ui/object/field/types/guards/isFieldMoneyAmountV2Value.ts
similarity index 100%
rename from front/src/modules/ui/data/field/types/guards/isFieldMoneyAmountV2Value.ts
rename to front/src/modules/ui/object/field/types/guards/isFieldMoneyAmountV2Value.ts
diff --git a/front/src/modules/ui/data/field/types/guards/isFieldMoneyValue.ts b/front/src/modules/ui/object/field/types/guards/isFieldMoneyValue.ts
similarity index 100%
rename from front/src/modules/ui/data/field/types/guards/isFieldMoneyValue.ts
rename to front/src/modules/ui/object/field/types/guards/isFieldMoneyValue.ts
diff --git a/front/src/modules/ui/data/field/types/guards/isFieldNumber.ts b/front/src/modules/ui/object/field/types/guards/isFieldNumber.ts
similarity index 100%
rename from front/src/modules/ui/data/field/types/guards/isFieldNumber.ts
rename to front/src/modules/ui/object/field/types/guards/isFieldNumber.ts
diff --git a/front/src/modules/ui/data/field/types/guards/isFieldNumberValue.ts b/front/src/modules/ui/object/field/types/guards/isFieldNumberValue.ts
similarity index 100%
rename from front/src/modules/ui/data/field/types/guards/isFieldNumberValue.ts
rename to front/src/modules/ui/object/field/types/guards/isFieldNumberValue.ts
diff --git a/front/src/modules/ui/data/field/types/guards/isFieldPhone.ts b/front/src/modules/ui/object/field/types/guards/isFieldPhone.ts
similarity index 100%
rename from front/src/modules/ui/data/field/types/guards/isFieldPhone.ts
rename to front/src/modules/ui/object/field/types/guards/isFieldPhone.ts
diff --git a/front/src/modules/ui/data/field/types/guards/isFieldPhoneValue.ts b/front/src/modules/ui/object/field/types/guards/isFieldPhoneValue.ts
similarity index 100%
rename from front/src/modules/ui/data/field/types/guards/isFieldPhoneValue.ts
rename to front/src/modules/ui/object/field/types/guards/isFieldPhoneValue.ts
diff --git a/front/src/modules/ui/data/field/types/guards/isFieldProbability.ts b/front/src/modules/ui/object/field/types/guards/isFieldProbability.ts
similarity index 100%
rename from front/src/modules/ui/data/field/types/guards/isFieldProbability.ts
rename to front/src/modules/ui/object/field/types/guards/isFieldProbability.ts
diff --git a/front/src/modules/ui/data/field/types/guards/isFieldProbabilityValue.ts b/front/src/modules/ui/object/field/types/guards/isFieldProbabilityValue.ts
similarity index 100%
rename from front/src/modules/ui/data/field/types/guards/isFieldProbabilityValue.ts
rename to front/src/modules/ui/object/field/types/guards/isFieldProbabilityValue.ts
diff --git a/front/src/modules/ui/data/field/types/guards/isFieldRelation.ts b/front/src/modules/ui/object/field/types/guards/isFieldRelation.ts
similarity index 100%
rename from front/src/modules/ui/data/field/types/guards/isFieldRelation.ts
rename to front/src/modules/ui/object/field/types/guards/isFieldRelation.ts
diff --git a/front/src/modules/ui/data/field/types/guards/isFieldRelationValue.ts b/front/src/modules/ui/object/field/types/guards/isFieldRelationValue.ts
similarity index 100%
rename from front/src/modules/ui/data/field/types/guards/isFieldRelationValue.ts
rename to front/src/modules/ui/object/field/types/guards/isFieldRelationValue.ts
diff --git a/front/src/modules/ui/data/field/types/guards/isFieldText.ts b/front/src/modules/ui/object/field/types/guards/isFieldText.ts
similarity index 100%
rename from front/src/modules/ui/data/field/types/guards/isFieldText.ts
rename to front/src/modules/ui/object/field/types/guards/isFieldText.ts
diff --git a/front/src/modules/ui/data/field/types/guards/isFieldTextValue.ts b/front/src/modules/ui/object/field/types/guards/isFieldTextValue.ts
similarity index 100%
rename from front/src/modules/ui/data/field/types/guards/isFieldTextValue.ts
rename to front/src/modules/ui/object/field/types/guards/isFieldTextValue.ts
diff --git a/front/src/modules/ui/data/field/types/guards/isFieldURL.ts b/front/src/modules/ui/object/field/types/guards/isFieldURL.ts
similarity index 100%
rename from front/src/modules/ui/data/field/types/guards/isFieldURL.ts
rename to front/src/modules/ui/object/field/types/guards/isFieldURL.ts
diff --git a/front/src/modules/ui/data/field/types/guards/isFieldURLV2.ts b/front/src/modules/ui/object/field/types/guards/isFieldURLV2.ts
similarity index 100%
rename from front/src/modules/ui/data/field/types/guards/isFieldURLV2.ts
rename to front/src/modules/ui/object/field/types/guards/isFieldURLV2.ts
diff --git a/front/src/modules/ui/data/field/types/guards/isFieldURLV2Value.ts b/front/src/modules/ui/object/field/types/guards/isFieldURLV2Value.ts
similarity index 100%
rename from front/src/modules/ui/data/field/types/guards/isFieldURLV2Value.ts
rename to front/src/modules/ui/object/field/types/guards/isFieldURLV2Value.ts
diff --git a/front/src/modules/ui/data/field/types/guards/isFieldURLValue.ts b/front/src/modules/ui/object/field/types/guards/isFieldURLValue.ts
similarity index 100%
rename from front/src/modules/ui/data/field/types/guards/isFieldURLValue.ts
rename to front/src/modules/ui/object/field/types/guards/isFieldURLValue.ts
diff --git a/front/src/modules/ui/data/field/types/resolvers/DoubleTextTypeResolver.ts b/front/src/modules/ui/object/field/types/resolvers/DoubleTextTypeResolver.ts
similarity index 100%
rename from front/src/modules/ui/data/field/types/resolvers/DoubleTextTypeResolver.ts
rename to front/src/modules/ui/object/field/types/resolvers/DoubleTextTypeResolver.ts
diff --git a/front/src/modules/ui/data/filter/components/AddFilterFromDetailsButton.tsx b/front/src/modules/ui/object/filter/components/AddFilterFromDetailsButton.tsx
similarity index 100%
rename from front/src/modules/ui/data/filter/components/AddFilterFromDetailsButton.tsx
rename to front/src/modules/ui/object/filter/components/AddFilterFromDetailsButton.tsx
diff --git a/front/src/modules/ui/data/filter/components/FilterDropdownButton.tsx b/front/src/modules/ui/object/filter/components/FilterDropdownButton.tsx
similarity index 100%
rename from front/src/modules/ui/data/filter/components/FilterDropdownButton.tsx
rename to front/src/modules/ui/object/filter/components/FilterDropdownButton.tsx
diff --git a/front/src/modules/ui/data/filter/components/FilterDropdownDateSearchInput.tsx b/front/src/modules/ui/object/filter/components/FilterDropdownDateSearchInput.tsx
similarity index 100%
rename from front/src/modules/ui/data/filter/components/FilterDropdownDateSearchInput.tsx
rename to front/src/modules/ui/object/filter/components/FilterDropdownDateSearchInput.tsx
diff --git a/front/src/modules/ui/data/filter/components/FilterDropdownEntitySearchInput.tsx b/front/src/modules/ui/object/filter/components/FilterDropdownEntitySearchInput.tsx
similarity index 100%
rename from front/src/modules/ui/data/filter/components/FilterDropdownEntitySearchInput.tsx
rename to front/src/modules/ui/object/filter/components/FilterDropdownEntitySearchInput.tsx
diff --git a/front/src/modules/ui/data/filter/components/FilterDropdownEntitySearchSelect.tsx b/front/src/modules/ui/object/filter/components/FilterDropdownEntitySearchSelect.tsx
similarity index 100%
rename from front/src/modules/ui/data/filter/components/FilterDropdownEntitySearchSelect.tsx
rename to front/src/modules/ui/object/filter/components/FilterDropdownEntitySearchSelect.tsx
diff --git a/front/src/modules/ui/data/filter/components/FilterDropdownEntitySelect.tsx b/front/src/modules/ui/object/filter/components/FilterDropdownEntitySelect.tsx
similarity index 100%
rename from front/src/modules/ui/data/filter/components/FilterDropdownEntitySelect.tsx
rename to front/src/modules/ui/object/filter/components/FilterDropdownEntitySelect.tsx
diff --git a/front/src/modules/ui/data/filter/components/FilterDropdownFilterSelect.tsx b/front/src/modules/ui/object/filter/components/FilterDropdownFilterSelect.tsx
similarity index 100%
rename from front/src/modules/ui/data/filter/components/FilterDropdownFilterSelect.tsx
rename to front/src/modules/ui/object/filter/components/FilterDropdownFilterSelect.tsx
diff --git a/front/src/modules/ui/data/filter/components/FilterDropdownNumberSearchInput.tsx b/front/src/modules/ui/object/filter/components/FilterDropdownNumberSearchInput.tsx
similarity index 100%
rename from front/src/modules/ui/data/filter/components/FilterDropdownNumberSearchInput.tsx
rename to front/src/modules/ui/object/filter/components/FilterDropdownNumberSearchInput.tsx
diff --git a/front/src/modules/ui/data/filter/components/FilterDropdownOperandButton.tsx b/front/src/modules/ui/object/filter/components/FilterDropdownOperandButton.tsx
similarity index 100%
rename from front/src/modules/ui/data/filter/components/FilterDropdownOperandButton.tsx
rename to front/src/modules/ui/object/filter/components/FilterDropdownOperandButton.tsx
diff --git a/front/src/modules/ui/data/filter/components/FilterDropdownOperandSelect.tsx b/front/src/modules/ui/object/filter/components/FilterDropdownOperandSelect.tsx
similarity index 100%
rename from front/src/modules/ui/data/filter/components/FilterDropdownOperandSelect.tsx
rename to front/src/modules/ui/object/filter/components/FilterDropdownOperandSelect.tsx
diff --git a/front/src/modules/ui/data/filter/components/FilterDropdownTextSearchInput.tsx b/front/src/modules/ui/object/filter/components/FilterDropdownTextSearchInput.tsx
similarity index 100%
rename from front/src/modules/ui/data/filter/components/FilterDropdownTextSearchInput.tsx
rename to front/src/modules/ui/object/filter/components/FilterDropdownTextSearchInput.tsx
diff --git a/front/src/modules/ui/data/filter/components/GenericEntityFilterChip.tsx b/front/src/modules/ui/object/filter/components/GenericEntityFilterChip.tsx
similarity index 100%
rename from front/src/modules/ui/data/filter/components/GenericEntityFilterChip.tsx
rename to front/src/modules/ui/object/filter/components/GenericEntityFilterChip.tsx
diff --git a/front/src/modules/ui/data/filter/components/MultipleFiltersButton.tsx b/front/src/modules/ui/object/filter/components/MultipleFiltersButton.tsx
similarity index 100%
rename from front/src/modules/ui/data/filter/components/MultipleFiltersButton.tsx
rename to front/src/modules/ui/object/filter/components/MultipleFiltersButton.tsx
diff --git a/front/src/modules/ui/data/filter/components/MultipleFiltersDropdownButton.tsx b/front/src/modules/ui/object/filter/components/MultipleFiltersDropdownButton.tsx
similarity index 100%
rename from front/src/modules/ui/data/filter/components/MultipleFiltersDropdownButton.tsx
rename to front/src/modules/ui/object/filter/components/MultipleFiltersDropdownButton.tsx
diff --git a/front/src/modules/ui/data/filter/components/MultipleFiltersDropdownContent.tsx b/front/src/modules/ui/object/filter/components/MultipleFiltersDropdownContent.tsx
similarity index 100%
rename from front/src/modules/ui/data/filter/components/MultipleFiltersDropdownContent.tsx
rename to front/src/modules/ui/object/filter/components/MultipleFiltersDropdownContent.tsx
diff --git a/front/src/modules/ui/data/filter/components/MultipleFiltersDropdownFilterOnFilterChangedEffect.tsx b/front/src/modules/ui/object/filter/components/MultipleFiltersDropdownFilterOnFilterChangedEffect.tsx
similarity index 100%
rename from front/src/modules/ui/data/filter/components/MultipleFiltersDropdownFilterOnFilterChangedEffect.tsx
rename to front/src/modules/ui/object/filter/components/MultipleFiltersDropdownFilterOnFilterChangedEffect.tsx
diff --git a/front/src/modules/ui/data/filter/components/SingleEntityFilterDropdownButton.tsx b/front/src/modules/ui/object/filter/components/SingleEntityFilterDropdownButton.tsx
similarity index 100%
rename from front/src/modules/ui/data/filter/components/SingleEntityFilterDropdownButton.tsx
rename to front/src/modules/ui/object/filter/components/SingleEntityFilterDropdownButton.tsx
diff --git a/front/src/modules/ui/data/filter/constants/FilterDropdownId.ts b/front/src/modules/ui/object/filter/constants/FilterDropdownId.ts
similarity index 100%
rename from front/src/modules/ui/data/filter/constants/FilterDropdownId.ts
rename to front/src/modules/ui/object/filter/constants/FilterDropdownId.ts
diff --git a/front/src/modules/ui/data/filter/hooks/useFilter.ts b/front/src/modules/ui/object/filter/hooks/useFilter.ts
similarity index 100%
rename from front/src/modules/ui/data/filter/hooks/useFilter.ts
rename to front/src/modules/ui/object/filter/hooks/useFilter.ts
diff --git a/front/src/modules/ui/data/filter/hooks/useFilterStates.ts b/front/src/modules/ui/object/filter/hooks/useFilterStates.ts
similarity index 100%
rename from front/src/modules/ui/data/filter/hooks/useFilterStates.ts
rename to front/src/modules/ui/object/filter/hooks/useFilterStates.ts
diff --git a/front/src/modules/ui/data/filter/scopes/FilterScope.tsx b/front/src/modules/ui/object/filter/scopes/FilterScope.tsx
similarity index 91%
rename from front/src/modules/ui/data/filter/scopes/FilterScope.tsx
rename to front/src/modules/ui/object/filter/scopes/FilterScope.tsx
index 9c75f4a43..3b8c4bdee 100644
--- a/front/src/modules/ui/data/filter/scopes/FilterScope.tsx
+++ b/front/src/modules/ui/object/filter/scopes/FilterScope.tsx
@@ -1,6 +1,6 @@
 import { ReactNode } from 'react';
 
-import { FilterDefinition } from '@/ui/data/filter/types/FilterDefinition';
+import { FilterDefinition } from '@/ui/object/filter/types/FilterDefinition';
 
 import { Filter } from '../types/Filter';
 
diff --git a/front/src/modules/ui/data/filter/scopes/init-effect/FilterScopeInitEffect.tsx b/front/src/modules/ui/object/filter/scopes/init-effect/FilterScopeInitEffect.tsx
similarity index 89%
rename from front/src/modules/ui/data/filter/scopes/init-effect/FilterScopeInitEffect.tsx
rename to front/src/modules/ui/object/filter/scopes/init-effect/FilterScopeInitEffect.tsx
index fdbf81850..e616f3a0a 100644
--- a/front/src/modules/ui/data/filter/scopes/init-effect/FilterScopeInitEffect.tsx
+++ b/front/src/modules/ui/object/filter/scopes/init-effect/FilterScopeInitEffect.tsx
@@ -1,6 +1,6 @@
 import { useEffect } from 'react';
 
-import { FilterDefinition } from '@/ui/data/filter/types/FilterDefinition';
+import { FilterDefinition } from '@/ui/object/filter/types/FilterDefinition';
 
 import { useFilterStates } from '../../hooks/useFilterStates';
 
diff --git a/front/src/modules/ui/data/filter/scopes/scope-internal-context/FilterScopeInternalContext.ts b/front/src/modules/ui/object/filter/scopes/scope-internal-context/FilterScopeInternalContext.ts
similarity index 100%
rename from front/src/modules/ui/data/filter/scopes/scope-internal-context/FilterScopeInternalContext.ts
rename to front/src/modules/ui/object/filter/scopes/scope-internal-context/FilterScopeInternalContext.ts
diff --git a/front/src/modules/ui/data/filter/states/availableFilterDefinitionsScopedState.ts b/front/src/modules/ui/object/filter/states/availableFilterDefinitionsScopedState.ts
similarity index 76%
rename from front/src/modules/ui/data/filter/states/availableFilterDefinitionsScopedState.ts
rename to front/src/modules/ui/object/filter/states/availableFilterDefinitionsScopedState.ts
index d1949810c..2ca946ba4 100644
--- a/front/src/modules/ui/data/filter/states/availableFilterDefinitionsScopedState.ts
+++ b/front/src/modules/ui/object/filter/states/availableFilterDefinitionsScopedState.ts
@@ -1,4 +1,4 @@
-import { FilterDefinition } from '@/ui/data/filter/types/FilterDefinition';
+import { FilterDefinition } from '@/ui/object/filter/types/FilterDefinition';
 import { createScopedState } from '@/ui/utilities/recoil-scope/utils/createScopedState';
 
 export const availableFilterDefinitionsScopedState = createScopedState<
diff --git a/front/src/modules/ui/data/filter/states/filterDefinitionUsedInDropdownScopedState.ts b/front/src/modules/ui/object/filter/states/filterDefinitionUsedInDropdownScopedState.ts
similarity index 100%
rename from front/src/modules/ui/data/filter/states/filterDefinitionUsedInDropdownScopedState.ts
rename to front/src/modules/ui/object/filter/states/filterDefinitionUsedInDropdownScopedState.ts
diff --git a/front/src/modules/ui/data/filter/states/filterDropdownSearchInputScopedState.ts b/front/src/modules/ui/object/filter/states/filterDropdownSearchInputScopedState.ts
similarity index 100%
rename from front/src/modules/ui/data/filter/states/filterDropdownSearchInputScopedState.ts
rename to front/src/modules/ui/object/filter/states/filterDropdownSearchInputScopedState.ts
diff --git a/front/src/modules/ui/data/filter/states/filterDropdownSelectedEntityIdScopedState.ts b/front/src/modules/ui/object/filter/states/filterDropdownSelectedEntityIdScopedState.ts
similarity index 100%
rename from front/src/modules/ui/data/filter/states/filterDropdownSelectedEntityIdScopedState.ts
rename to front/src/modules/ui/object/filter/states/filterDropdownSelectedEntityIdScopedState.ts
diff --git a/front/src/modules/ui/data/filter/states/isFilterDropdownOperandSelectUnfoldedScopedState.ts b/front/src/modules/ui/object/filter/states/isFilterDropdownOperandSelectUnfoldedScopedState.ts
similarity index 100%
rename from front/src/modules/ui/data/filter/states/isFilterDropdownOperandSelectUnfoldedScopedState.ts
rename to front/src/modules/ui/object/filter/states/isFilterDropdownOperandSelectUnfoldedScopedState.ts
diff --git a/front/src/modules/ui/data/filter/states/isFilterDropdownUnfoldedScopedState.ts b/front/src/modules/ui/object/filter/states/isFilterDropdownUnfoldedScopedState.ts
similarity index 100%
rename from front/src/modules/ui/data/filter/states/isFilterDropdownUnfoldedScopedState.ts
rename to front/src/modules/ui/object/filter/states/isFilterDropdownUnfoldedScopedState.ts
diff --git a/front/src/modules/ui/data/filter/states/selectedFilterScopedState.ts b/front/src/modules/ui/object/filter/states/selectedFilterScopedState.ts
similarity index 100%
rename from front/src/modules/ui/data/filter/states/selectedFilterScopedState.ts
rename to front/src/modules/ui/object/filter/states/selectedFilterScopedState.ts
diff --git a/front/src/modules/ui/data/filter/states/selectedOperandInDropdownScopedState.ts b/front/src/modules/ui/object/filter/states/selectedOperandInDropdownScopedState.ts
similarity index 100%
rename from front/src/modules/ui/data/filter/states/selectedOperandInDropdownScopedState.ts
rename to front/src/modules/ui/object/filter/states/selectedOperandInDropdownScopedState.ts
diff --git a/front/src/modules/ui/data/filter/types/Filter.ts b/front/src/modules/ui/object/filter/types/Filter.ts
similarity index 100%
rename from front/src/modules/ui/data/filter/types/Filter.ts
rename to front/src/modules/ui/object/filter/types/Filter.ts
diff --git a/front/src/modules/ui/data/filter/types/FilterDefinition.ts b/front/src/modules/ui/object/filter/types/FilterDefinition.ts
similarity index 100%
rename from front/src/modules/ui/data/filter/types/FilterDefinition.ts
rename to front/src/modules/ui/object/filter/types/FilterDefinition.ts
diff --git a/front/src/modules/ui/data/filter/types/FilterDefinitionByEntity.ts b/front/src/modules/ui/object/filter/types/FilterDefinitionByEntity.ts
similarity index 100%
rename from front/src/modules/ui/data/filter/types/FilterDefinitionByEntity.ts
rename to front/src/modules/ui/object/filter/types/FilterDefinitionByEntity.ts
diff --git a/front/src/modules/ui/data/filter/types/FilterOperand.ts b/front/src/modules/ui/object/filter/types/FilterOperand.ts
similarity index 100%
rename from front/src/modules/ui/data/filter/types/FilterOperand.ts
rename to front/src/modules/ui/object/filter/types/FilterOperand.ts
diff --git a/front/src/modules/ui/data/filter/types/FilterType.ts b/front/src/modules/ui/object/filter/types/FilterType.ts
similarity index 100%
rename from front/src/modules/ui/data/filter/types/FilterType.ts
rename to front/src/modules/ui/object/filter/types/FilterType.ts
diff --git a/front/src/modules/ui/data/filter/types/FiltersHotkeyScope.ts b/front/src/modules/ui/object/filter/types/FiltersHotkeyScope.ts
similarity index 100%
rename from front/src/modules/ui/data/filter/types/FiltersHotkeyScope.ts
rename to front/src/modules/ui/object/filter/types/FiltersHotkeyScope.ts
diff --git a/front/src/modules/ui/data/filter/utils/getOperandLabel.ts b/front/src/modules/ui/object/filter/utils/getOperandLabel.ts
similarity index 100%
rename from front/src/modules/ui/data/filter/utils/getOperandLabel.ts
rename to front/src/modules/ui/object/filter/utils/getOperandLabel.ts
diff --git a/front/src/modules/ui/data/filter/utils/getOperandsForFilterType.ts b/front/src/modules/ui/object/filter/utils/getOperandsForFilterType.ts
similarity index 100%
rename from front/src/modules/ui/data/filter/utils/getOperandsForFilterType.ts
rename to front/src/modules/ui/object/filter/utils/getOperandsForFilterType.ts
diff --git a/front/src/modules/ui/data/filter/utils/turnFilterIntoWhereClause.ts b/front/src/modules/ui/object/filter/utils/turnFilterIntoWhereClause.ts
similarity index 100%
rename from front/src/modules/ui/data/filter/utils/turnFilterIntoWhereClause.ts
rename to front/src/modules/ui/object/filter/utils/turnFilterIntoWhereClause.ts
diff --git a/front/src/modules/ui/data/filter/utils/turnFiltersIntoWhereClauseV2.ts b/front/src/modules/ui/object/filter/utils/turnFiltersIntoWhereClauseV2.ts
similarity index 100%
rename from front/src/modules/ui/data/filter/utils/turnFiltersIntoWhereClauseV2.ts
rename to front/src/modules/ui/object/filter/utils/turnFiltersIntoWhereClauseV2.ts
diff --git a/front/src/modules/ui/data/inline-cell/components/InlineCell.tsx b/front/src/modules/ui/object/record-inline-cell/components/InlineCell.tsx
similarity index 100%
rename from front/src/modules/ui/data/inline-cell/components/InlineCell.tsx
rename to front/src/modules/ui/object/record-inline-cell/components/InlineCell.tsx
diff --git a/front/src/modules/ui/data/inline-cell/components/InlineCellContainer.tsx b/front/src/modules/ui/object/record-inline-cell/components/InlineCellContainer.tsx
similarity index 100%
rename from front/src/modules/ui/data/inline-cell/components/InlineCellContainer.tsx
rename to front/src/modules/ui/object/record-inline-cell/components/InlineCellContainer.tsx
diff --git a/front/src/modules/ui/data/inline-cell/components/InlineCellDisplayMode.tsx b/front/src/modules/ui/object/record-inline-cell/components/InlineCellDisplayMode.tsx
similarity index 100%
rename from front/src/modules/ui/data/inline-cell/components/InlineCellDisplayMode.tsx
rename to front/src/modules/ui/object/record-inline-cell/components/InlineCellDisplayMode.tsx
diff --git a/front/src/modules/ui/data/inline-cell/components/InlineCellEditButton.tsx b/front/src/modules/ui/object/record-inline-cell/components/InlineCellEditButton.tsx
similarity index 100%
rename from front/src/modules/ui/data/inline-cell/components/InlineCellEditButton.tsx
rename to front/src/modules/ui/object/record-inline-cell/components/InlineCellEditButton.tsx
diff --git a/front/src/modules/ui/data/inline-cell/components/InlineCellEditMode.tsx b/front/src/modules/ui/object/record-inline-cell/components/InlineCellEditMode.tsx
similarity index 100%
rename from front/src/modules/ui/data/inline-cell/components/InlineCellEditMode.tsx
rename to front/src/modules/ui/object/record-inline-cell/components/InlineCellEditMode.tsx
diff --git a/front/src/modules/ui/data/inline-cell/contexts/InlineCellMutationContext.ts b/front/src/modules/ui/object/record-inline-cell/contexts/InlineCellMutationContext.ts
similarity index 100%
rename from front/src/modules/ui/data/inline-cell/contexts/InlineCellMutationContext.ts
rename to front/src/modules/ui/object/record-inline-cell/contexts/InlineCellMutationContext.ts
diff --git a/front/src/modules/ui/data/inline-cell/hooks/useInlineCell.ts b/front/src/modules/ui/object/record-inline-cell/hooks/useInlineCell.ts
similarity index 95%
rename from front/src/modules/ui/data/inline-cell/hooks/useInlineCell.ts
rename to front/src/modules/ui/object/record-inline-cell/hooks/useInlineCell.ts
index bf4834d56..d9976ee78 100644
--- a/front/src/modules/ui/data/inline-cell/hooks/useInlineCell.ts
+++ b/front/src/modules/ui/object/record-inline-cell/hooks/useInlineCell.ts
@@ -1,7 +1,7 @@
 import { useContext } from 'react';
 import { useRecoilState } from 'recoil';
 
-import { FieldContext } from '@/ui/data/field/contexts/FieldContext';
+import { FieldContext } from '@/ui/object/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/data/inline-cell/property-box/components/PropertyBox.tsx b/front/src/modules/ui/object/record-inline-cell/property-box/components/PropertyBox.tsx
similarity index 100%
rename from front/src/modules/ui/data/inline-cell/property-box/components/PropertyBox.tsx
rename to front/src/modules/ui/object/record-inline-cell/property-box/components/PropertyBox.tsx
diff --git a/front/src/modules/ui/data/inline-cell/states/customEditHotkeyScopeForFieldScopedState.ts b/front/src/modules/ui/object/record-inline-cell/states/customEditHotkeyScopeForFieldScopedState.ts
similarity index 100%
rename from front/src/modules/ui/data/inline-cell/states/customEditHotkeyScopeForFieldScopedState.ts
rename to front/src/modules/ui/object/record-inline-cell/states/customEditHotkeyScopeForFieldScopedState.ts
diff --git a/front/src/modules/ui/data/inline-cell/states/isInlineCellInEditModeScopedState.ts b/front/src/modules/ui/object/record-inline-cell/states/isInlineCellInEditModeScopedState.ts
similarity index 100%
rename from front/src/modules/ui/data/inline-cell/states/isInlineCellInEditModeScopedState.ts
rename to front/src/modules/ui/object/record-inline-cell/states/isInlineCellInEditModeScopedState.ts
diff --git a/front/src/modules/ui/data/inline-cell/states/parentHotkeyScopeForFieldScopedState.ts b/front/src/modules/ui/object/record-inline-cell/states/parentHotkeyScopeForFieldScopedState.ts
similarity index 100%
rename from front/src/modules/ui/data/inline-cell/states/parentHotkeyScopeForFieldScopedState.ts
rename to front/src/modules/ui/object/record-inline-cell/states/parentHotkeyScopeForFieldScopedState.ts
diff --git a/front/src/modules/ui/data/inline-cell/states/recoil-scope-contexts/FieldRecoilScopeContext.ts b/front/src/modules/ui/object/record-inline-cell/states/recoil-scope-contexts/FieldRecoilScopeContext.ts
similarity index 100%
rename from front/src/modules/ui/data/inline-cell/states/recoil-scope-contexts/FieldRecoilScopeContext.ts
rename to front/src/modules/ui/object/record-inline-cell/states/recoil-scope-contexts/FieldRecoilScopeContext.ts
diff --git a/front/src/modules/ui/data/inline-cell/types/InlineCellHotkeyScope.ts b/front/src/modules/ui/object/record-inline-cell/types/InlineCellHotkeyScope.ts
similarity index 100%
rename from front/src/modules/ui/data/inline-cell/types/InlineCellHotkeyScope.ts
rename to front/src/modules/ui/object/record-inline-cell/types/InlineCellHotkeyScope.ts
diff --git a/front/src/modules/ui/data/data-table/action-bar/components/DataTableActionBar.tsx b/front/src/modules/ui/object/record-table/action-bar/components/RecordTableActionBar.tsx
similarity index 89%
rename from front/src/modules/ui/data/data-table/action-bar/components/DataTableActionBar.tsx
rename to front/src/modules/ui/object/record-table/action-bar/components/RecordTableActionBar.tsx
index 3dd4332ff..6ea19c234 100644
--- a/front/src/modules/ui/data/data-table/action-bar/components/DataTableActionBar.tsx
+++ b/front/src/modules/ui/object/record-table/action-bar/components/RecordTableActionBar.tsx
@@ -5,7 +5,7 @@ import { ActionBar } from '@/ui/navigation/action-bar/components/ActionBar';
 
 import { selectedRowIdsSelector } from '../../states/selectors/selectedRowIdsSelector';
 
-export const DataTableActionBar = () => {
+export const RecordTableActionBar = () => {
   const selectedRowIds = useRecoilValue(selectedRowIdsSelector);
 
   return <ActionBar selectedIds={selectedRowIds} />;
diff --git a/front/src/modules/ui/data/data-table/components/CheckboxCell.tsx b/front/src/modules/ui/object/record-table/components/CheckboxCell.tsx
similarity index 100%
rename from front/src/modules/ui/data/data-table/components/CheckboxCell.tsx
rename to front/src/modules/ui/object/record-table/components/CheckboxCell.tsx
diff --git a/front/src/modules/ui/data/data-table/components/ColumnHead.tsx b/front/src/modules/ui/object/record-table/components/ColumnHead.tsx
similarity index 94%
rename from front/src/modules/ui/data/data-table/components/ColumnHead.tsx
rename to front/src/modules/ui/object/record-table/components/ColumnHead.tsx
index 7a827b643..c91bca8c2 100644
--- a/front/src/modules/ui/data/data-table/components/ColumnHead.tsx
+++ b/front/src/modules/ui/object/record-table/components/ColumnHead.tsx
@@ -1,7 +1,7 @@
 import { useTheme } from '@emotion/react';
 import styled from '@emotion/styled';
 
-import { FieldMetadata } from '@/ui/data/field/types/FieldMetadata';
+import { FieldMetadata } from '@/ui/object/field/types/FieldMetadata';
 
 import { ColumnDefinition } from '../types/ColumnDefinition';
 
diff --git a/front/src/modules/ui/data/data-table/components/ColumnHeadWithDropdown.tsx b/front/src/modules/ui/object/record-table/components/ColumnHeadWithDropdown.tsx
similarity index 85%
rename from front/src/modules/ui/data/data-table/components/ColumnHeadWithDropdown.tsx
rename to front/src/modules/ui/object/record-table/components/ColumnHeadWithDropdown.tsx
index 612076f77..4f92fc954 100644
--- a/front/src/modules/ui/data/data-table/components/ColumnHeadWithDropdown.tsx
+++ b/front/src/modules/ui/object/record-table/components/ColumnHeadWithDropdown.tsx
@@ -1,11 +1,11 @@
-import { FieldMetadata } from '@/ui/data/field/types/FieldMetadata';
 import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
 import { DropdownScope } from '@/ui/layout/dropdown/scopes/DropdownScope';
 
+import { FieldMetadata } from '../../field/types/FieldMetadata';
 import { ColumnDefinition } from '../types/ColumnDefinition';
 
 import { ColumnHead } from './ColumnHead';
-import { DataTableColumnDropdownMenu } from './DataTableColumnDropdownMenu';
+import { RecordTableColumnDropdownMenu } from './RecordTableColumnDropdownMenu';
 
 type ColumnHeadWithDropdownProps = {
   column: ColumnDefinition<FieldMetadata>;
@@ -25,7 +25,7 @@ export const ColumnHeadWithDropdown = ({
       <Dropdown
         clickableComponent={<ColumnHead column={column} />}
         dropdownComponents={
-          <DataTableColumnDropdownMenu
+          <RecordTableColumnDropdownMenu
             column={column}
             isFirstColumn={isFirstColumn}
             isLastColumn={isLastColumn}
diff --git a/front/src/modules/ui/data/data-table/components/DataTable.tsx b/front/src/modules/ui/object/record-table/components/RecordTable.tsx
similarity index 92%
rename from front/src/modules/ui/data/data-table/components/DataTable.tsx
rename to front/src/modules/ui/object/record-table/components/RecordTable.tsx
index cfa549624..d6cf763a5 100644
--- a/front/src/modules/ui/data/data-table/components/DataTable.tsx
+++ b/front/src/modules/ui/object/record-table/components/RecordTable.tsx
@@ -16,8 +16,8 @@ import { useResetTableRowSelection } from '../hooks/useResetTableRowSelection';
 import { useSetRowSelectedState } from '../hooks/useSetRowSelectedState';
 import { TableHotkeyScope } from '../types/TableHotkeyScope';
 
-import { DataTableBody } from './DataTableBody';
-import { DataTableHeader } from './DataTableHeader';
+import { RecordTableBody } from './RecordTableBody';
+import { RecordTableHeader } from './RecordTableHeader';
 
 const StyledTable = styled.table`
   border-collapse: collapse;
@@ -82,11 +82,11 @@ const StyledTableContainer = styled.div`
   position: relative;
 `;
 
-type DataTableProps = {
+type RecordTableProps = {
   updateEntityMutation: (params: any) => void;
 };
 
-export const DataTable = ({ updateEntityMutation }: DataTableProps) => {
+export const RecordTable = ({ updateEntityMutation }: RecordTableProps) => {
   const tableBodyRef = useRef<HTMLDivElement>(null);
 
   const setRowSelectedState = useSetRowSelectedState();
@@ -126,8 +126,8 @@ export const DataTable = ({ updateEntityMutation }: DataTableProps) => {
           <ScrollWrapper>
             <div ref={tableBodyRef}>
               <StyledTable className="entity-table-cell">
-                <DataTableHeader />
-                <DataTableBody />
+                <RecordTableHeader />
+                <RecordTableBody />
               </StyledTable>
               <DragSelect
                 dragSelectable={tableBodyRef}
diff --git a/front/src/modules/ui/data/data-table/components/DataTableBody.tsx b/front/src/modules/ui/object/record-table/components/RecordTableBody.tsx
similarity index 84%
rename from front/src/modules/ui/data/data-table/components/DataTableBody.tsx
rename to front/src/modules/ui/object/record-table/components/RecordTableBody.tsx
index 62af6f4ee..57153b753 100644
--- a/front/src/modules/ui/data/data-table/components/DataTableBody.tsx
+++ b/front/src/modules/ui/object/record-table/components/RecordTableBody.tsx
@@ -7,10 +7,10 @@ import { useScrollWrapperScopedRef } from '@/ui/utilities/scroll/hooks/useScroll
 
 import { RowIdContext } from '../contexts/RowIdContext';
 import { RowIndexContext } from '../contexts/RowIndexContext';
-import { isFetchingDataTableDataState } from '../states/isFetchingDataTableDataState';
+import { isFetchingRecordTableDataState } from '../states/isFetchingRecordTableDataState';
 import { tableRowIdsState } from '../states/tableRowIdsState';
 
-import { DataTableRow } from './DataTableRow';
+import { RecordTableRow } from './RecordTableRow';
 
 type SpaceProps = {
   top?: number;
@@ -22,13 +22,15 @@ const StyledSpace = styled.td<SpaceProps>`
   ${({ bottom }) => bottom && `padding-bottom: ${bottom}px;`}
 `;
 
-export const DataTableBody = () => {
+export const RecordTableBody = () => {
   const scrollWrapperRef = useScrollWrapperScopedRef();
 
   const tableRowIds = useRecoilValue(tableRowIdsState);
 
   const isNavbarSwitchingSize = useRecoilValue(isNavbarSwitchingSizeState);
-  const isFetchingDataTableData = useRecoilValue(isFetchingDataTableDataState);
+  const isFetchingRecordTableData = useRecoilValue(
+    isFetchingRecordTableDataState,
+  );
 
   const rowVirtualizer = useVirtual({
     size: tableRowIds.length,
@@ -43,7 +45,7 @@ export const DataTableBody = () => {
       ? rowVirtualizer.totalSize - items[items.length - 1].end
       : 0;
 
-  if (isFetchingDataTableData || isNavbarSwitchingSize) {
+  if (isFetchingRecordTableData || isNavbarSwitchingSize) {
     return null;
   }
 
@@ -60,7 +62,7 @@ export const DataTableBody = () => {
         return (
           <RowIdContext.Provider value={rowId} key={rowId}>
             <RowIndexContext.Provider value={virtualItem.index}>
-              <DataTableRow
+              <RecordTableRow
                 key={virtualItem.index}
                 ref={virtualItem.measureRef}
                 rowId={rowId}
diff --git a/front/src/modules/ui/data/data-table/components/DataTableCell.tsx b/front/src/modules/ui/object/record-table/components/RecordTableCell.tsx
similarity index 91%
rename from front/src/modules/ui/data/data-table/components/DataTableCell.tsx
rename to front/src/modules/ui/object/record-table/components/RecordTableCell.tsx
index 560696322..7643696a4 100644
--- a/front/src/modules/ui/data/data-table/components/DataTableCell.tsx
+++ b/front/src/modules/ui/object/record-table/components/RecordTableCell.tsx
@@ -1,13 +1,13 @@
 import { useContext } from 'react';
 import { useSetRecoilState } from 'recoil';
 
-import { FieldContext } from '@/ui/data/field/contexts/FieldContext';
-import { isFieldRelation } from '@/ui/data/field/types/guards/isFieldRelation';
 import { RelationPickerHotkeyScope } from '@/ui/input/relation-picker/types/RelationPickerHotkeyScope';
 import { contextMenuIsOpenState } from '@/ui/navigation/context-menu/states/contextMenuIsOpenState';
 import { contextMenuPositionState } from '@/ui/navigation/context-menu/states/contextMenuPositionState';
 import { RecoilScope } from '@/ui/utilities/recoil-scope/components/RecoilScope';
 
+import { FieldContext } from '../../field/contexts/FieldContext';
+import { isFieldRelation } from '../../field/types/guards/isFieldRelation';
 import { ColumnContext } from '../contexts/ColumnContext';
 import { ColumnIndexContext } from '../contexts/ColumnIndexContext';
 import { EntityUpdateMutationContext } from '../contexts/EntityUpdateMutationHookContext';
@@ -16,7 +16,7 @@ import { useCurrentRowSelected } from '../hooks/useCurrentRowSelected';
 import { TableCell } from '../table-cell/components/TableCell';
 import { TableHotkeyScope } from '../types/TableHotkeyScope';
 
-export const DataTableCell = ({ cellIndex }: { cellIndex: number }) => {
+export const RecordTableCell = ({ cellIndex }: { cellIndex: number }) => {
   const setContextMenuPosition = useSetRecoilState(contextMenuPositionState);
   const setContextMenuOpenState = useSetRecoilState(contextMenuIsOpenState);
   const currentRowId = useContext(RowIdContext);
diff --git a/front/src/modules/ui/data/data-table/components/DataTableColumnDropdownMenu.tsx b/front/src/modules/ui/object/record-table/components/RecordTableColumnDropdownMenu.tsx
similarity index 89%
rename from front/src/modules/ui/data/data-table/components/DataTableColumnDropdownMenu.tsx
rename to front/src/modules/ui/object/record-table/components/RecordTableColumnDropdownMenu.tsx
index fc3e2f582..ad2ba13a1 100644
--- a/front/src/modules/ui/data/data-table/components/DataTableColumnDropdownMenu.tsx
+++ b/front/src/modules/ui/object/record-table/components/RecordTableColumnDropdownMenu.tsx
@@ -1,25 +1,25 @@
-import { FieldMetadata } from '@/ui/data/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';
 
-export type DataTableColumnDropdownMenuProps = {
+export type RecordTableColumnDropdownMenuProps = {
   column: ColumnDefinition<FieldMetadata>;
   isFirstColumn: boolean;
   isLastColumn: boolean;
   primaryColumnKey: string;
 };
 
-export const DataTableColumnDropdownMenu = ({
+export const RecordTableColumnDropdownMenu = ({
   column,
   isFirstColumn,
   isLastColumn,
   primaryColumnKey,
-}: DataTableColumnDropdownMenuProps) => {
+}: RecordTableColumnDropdownMenuProps) => {
   const { handleColumnVisibilityChange, handleMoveTableColumn } =
     useTableColumns();
 
diff --git a/front/src/modules/ui/data/data-table/components/DataTableEffect.tsx b/front/src/modules/ui/object/record-table/components/RecordTableEffect.tsx
similarity index 89%
rename from front/src/modules/ui/data/data-table/components/DataTableEffect.tsx
rename to front/src/modules/ui/object/record-table/components/RecordTableEffect.tsx
index c2a996af3..3569c5c72 100644
--- a/front/src/modules/ui/data/data-table/components/DataTableEffect.tsx
+++ b/front/src/modules/ui/object/record-table/components/RecordTableEffect.tsx
@@ -4,7 +4,6 @@ import defaults from 'lodash/defaults';
 
 import { useOptimisticEffect } from '@/apollo/optimistic-effect/hooks/useOptimisticEffect';
 import { OptimisticEffectDefinition } from '@/apollo/optimistic-effect/types/OptimisticEffectDefinition';
-import { FilterDefinition } from '@/ui/data/filter/types/FilterDefinition';
 import { useRecoilScopedValue } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedValue';
 import {
   SortOrder,
@@ -12,13 +11,14 @@ import {
   useGetPeopleQuery,
 } from '~/generated/graphql';
 
+import { FilterDefinition } from '../../filter/types/FilterDefinition';
 import { SortDefinition } from '../../sort/types/SortDefinition';
-import { useSetDataTableData } from '../hooks/useSetDataTableData';
+import { useSetRecordTableData } from '../hooks/useSetRecordTableData';
 import { TableRecoilScopeContext } from '../states/recoil-scope-contexts/TableRecoilScopeContext';
 import { tablefiltersWhereScopedSelector } from '../states/selectors/tablefiltersWhereScopedSelector';
 import { tableSortsOrderByScopedSelector } from '../states/selectors/tableSortsOrderByScopedSelector';
 
-export const DataTableEffect = ({
+export const RecordTableEffect = ({
   useGetRequest,
   getRequestResultKey,
   getRequestOptimisticEffectDefinition,
@@ -35,7 +35,7 @@ export const DataTableEffect = ({
   setActionBarEntries?: () => void;
   setContextMenuEntries?: () => void;
 }) => {
-  const setDataTableData = useSetDataTableData();
+  const setRecordTableData = useSetRecordTableData();
   const { registerOptimisticEffect } = useOptimisticEffect();
 
   const tableSortsOrderBy = useRecoilScopedValue(
@@ -57,7 +57,7 @@ export const DataTableEffect = ({
     onCompleted: (data: any) => {
       const entities = data[getRequestResultKey] ?? [];
 
-      setDataTableData(entities);
+      setRecordTableData(entities);
 
       registerOptimisticEffect({
         variables: { orderBy: sortsOrderBy, where: tablefiltersWhere },
diff --git a/front/src/modules/ui/data/data-table/components/DataTableHeader.tsx b/front/src/modules/ui/object/record-table/components/RecordTableHeader.tsx
similarity index 97%
rename from front/src/modules/ui/data/data-table/components/DataTableHeader.tsx
rename to front/src/modules/ui/object/record-table/components/RecordTableHeader.tsx
index 40e2b282a..7753cc876 100644
--- a/front/src/modules/ui/data/data-table/components/DataTableHeader.tsx
+++ b/front/src/modules/ui/object/record-table/components/RecordTableHeader.tsx
@@ -18,7 +18,7 @@ import { visibleTableColumnsScopedSelector } from '../states/selectors/visibleTa
 import { tableColumnsScopedState } from '../states/tableColumnsScopedState';
 
 import { ColumnHeadWithDropdown } from './ColumnHeadWithDropdown';
-import { DataTableHeaderPlusButtonContent } from './DataTableHeaderPlusButtonContent';
+import { RecordTableHeaderPlusButtonContent } from './RecordTableHeaderPlusButtonContent';
 import { SelectAllCheckbox } from './SelectAllCheckbox';
 
 const COLUMN_MIN_WIDTH = 104;
@@ -75,7 +75,7 @@ const HIDDEN_TABLE_COLUMN_DROPDOWN_SCOPE_ID =
 const HIDDEN_TABLE_COLUMN_DROPDOWN_HOTKEY_SCOPE_ID =
   'hidden-table-columns-dropdown-hotkey-scope-id';
 
-export const DataTableHeader = () => {
+export const RecordTableHeader = () => {
   const [resizeFieldOffset, setResizeFieldOffset] = useRecoilState(
     resizeFieldOffsetState,
   );
@@ -212,7 +212,7 @@ export const DataTableHeader = () => {
                       position="middle"
                     />
                   }
-                  dropdownComponents={<DataTableHeaderPlusButtonContent />}
+                  dropdownComponents={<RecordTableHeaderPlusButtonContent />}
                   dropdownPlacement="bottom-start"
                   dropdownHotkeyScope={{
                     scope: HIDDEN_TABLE_COLUMN_DROPDOWN_HOTKEY_SCOPE_ID,
diff --git a/front/src/modules/ui/data/data-table/components/DataTableHeaderPlusButtonContent.tsx b/front/src/modules/ui/object/record-table/components/RecordTableHeaderPlusButtonContent.tsx
similarity index 92%
rename from front/src/modules/ui/data/data-table/components/DataTableHeaderPlusButtonContent.tsx
rename to front/src/modules/ui/object/record-table/components/RecordTableHeaderPlusButtonContent.tsx
index 107b4205c..40c99af59 100644
--- a/front/src/modules/ui/data/data-table/components/DataTableHeaderPlusButtonContent.tsx
+++ b/front/src/modules/ui/object/record-table/components/RecordTableHeaderPlusButtonContent.tsx
@@ -1,18 +1,18 @@
 import { useCallback } from 'react';
 
-import { FieldMetadata } from '@/ui/data/field/types/FieldMetadata';
 import { IconPlus } 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 { useRecoilScopedValue } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedValue';
 
+import { FieldMetadata } from '../../field/types/FieldMetadata';
 import { useTableColumns } from '../hooks/useTableColumns';
 import { TableRecoilScopeContext } from '../states/recoil-scope-contexts/TableRecoilScopeContext';
 import { hiddenTableColumnsScopedSelector } from '../states/selectors/hiddenTableColumnsScopedSelector';
 import { ColumnDefinition } from '../types/ColumnDefinition';
 
-export const DataTableHeaderPlusButtonContent = () => {
+export const RecordTableHeaderPlusButtonContent = () => {
   const { closeDropdown } = useDropdown();
 
   const hiddenTableColumns = useRecoilScopedValue(
diff --git a/front/src/modules/ui/object/record-table/components/RecordTableRow.tsx b/front/src/modules/ui/object/record-table/components/RecordTableRow.tsx
new file mode 100644
index 000000000..0a06c13bb
--- /dev/null
+++ b/front/src/modules/ui/object/record-table/components/RecordTableRow.tsx
@@ -0,0 +1,55 @@
+import { forwardRef } from 'react';
+import styled from '@emotion/styled';
+
+import { useRecoilScopedValue } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedValue';
+
+import { ColumnContext } from '../contexts/ColumnContext';
+import { useCurrentRowSelected } from '../hooks/useCurrentRowSelected';
+import { TableRecoilScopeContext } from '../states/recoil-scope-contexts/TableRecoilScopeContext';
+import { visibleTableColumnsScopedSelector } from '../states/selectors/visibleTableColumnsScopedSelector';
+
+import { CheckboxCell } from './CheckboxCell';
+import { RecordTableCell } from './RecordTableCell';
+
+const StyledRow = styled.tr<{ selected: boolean }>`
+  background: ${(props) =>
+    props.selected ? props.theme.accent.quaternary : 'none'};
+`;
+
+type RecordTableRowProps = {
+  rowId: string;
+};
+
+export const RecordTableRow = forwardRef<
+  HTMLTableRowElement,
+  RecordTableRowProps
+>(({ rowId }, ref) => {
+  const visibleTableColumns = useRecoilScopedValue(
+    visibleTableColumnsScopedSelector,
+    TableRecoilScopeContext,
+  );
+  const { currentRowSelected } = useCurrentRowSelected();
+
+  return (
+    <StyledRow
+      ref={ref}
+      data-testid={`row-id-${rowId}`}
+      selected={currentRowSelected}
+      data-selectable-id={rowId}
+    >
+      <td>
+        <CheckboxCell />
+      </td>
+      {[...visibleTableColumns]
+        .sort((columnA, columnB) => columnA.position - columnB.position)
+        .map((column, columnIndex) => {
+          return (
+            <ColumnContext.Provider value={column} key={column.fieldId}>
+              <RecordTableCell cellIndex={columnIndex} />
+            </ColumnContext.Provider>
+          );
+        })}
+      <td></td>
+    </StyledRow>
+  );
+});
diff --git a/front/src/modules/ui/data/data-table/components/SelectAllCheckbox.tsx b/front/src/modules/ui/object/record-table/components/SelectAllCheckbox.tsx
similarity index 100%
rename from front/src/modules/ui/data/data-table/components/SelectAllCheckbox.tsx
rename to front/src/modules/ui/object/record-table/components/SelectAllCheckbox.tsx
diff --git a/front/src/modules/ui/data/data-table/constants/ColumnHeadDropdownId.ts b/front/src/modules/ui/object/record-table/constants/ColumnHeadDropdownId.ts
similarity index 100%
rename from front/src/modules/ui/data/data-table/constants/ColumnHeadDropdownId.ts
rename to front/src/modules/ui/object/record-table/constants/ColumnHeadDropdownId.ts
diff --git a/front/src/modules/ui/data/data-table/constants/TableOptionsDropdownId.ts b/front/src/modules/ui/object/record-table/constants/TableOptionsDropdownId.ts
similarity index 100%
rename from front/src/modules/ui/data/data-table/constants/TableOptionsDropdownId.ts
rename to front/src/modules/ui/object/record-table/constants/TableOptionsDropdownId.ts
diff --git a/front/src/modules/ui/data/data-table/context-menu/components/DataTableContextMenu.tsx b/front/src/modules/ui/object/record-table/context-menu/components/RecordTableContextMenu.tsx
similarity index 88%
rename from front/src/modules/ui/data/data-table/context-menu/components/DataTableContextMenu.tsx
rename to front/src/modules/ui/object/record-table/context-menu/components/RecordTableContextMenu.tsx
index 60c3924cd..c96ea98e7 100644
--- a/front/src/modules/ui/data/data-table/context-menu/components/DataTableContextMenu.tsx
+++ b/front/src/modules/ui/object/record-table/context-menu/components/RecordTableContextMenu.tsx
@@ -5,7 +5,7 @@ import { ContextMenu } from '@/ui/navigation/context-menu/components/ContextMenu
 
 import { selectedRowIdsSelector } from '../../states/selectors/selectedRowIdsSelector';
 
-export const DataTableContextMenu = () => {
+export const RecordTableContextMenu = () => {
   const selectedRowIds = useRecoilValue(selectedRowIdsSelector);
   return <ContextMenu selectedIds={selectedRowIds} />;
 };
diff --git a/front/src/modules/ui/data/data-table/contexts/CellHotkeyScopeContext.ts b/front/src/modules/ui/object/record-table/contexts/CellHotkeyScopeContext.ts
similarity index 100%
rename from front/src/modules/ui/data/data-table/contexts/CellHotkeyScopeContext.ts
rename to front/src/modules/ui/object/record-table/contexts/CellHotkeyScopeContext.ts
diff --git a/front/src/modules/ui/data/data-table/contexts/ColumnContext.ts b/front/src/modules/ui/object/record-table/contexts/ColumnContext.ts
similarity index 73%
rename from front/src/modules/ui/data/data-table/contexts/ColumnContext.ts
rename to front/src/modules/ui/object/record-table/contexts/ColumnContext.ts
index 499ca58e1..494c09a7f 100644
--- a/front/src/modules/ui/data/data-table/contexts/ColumnContext.ts
+++ b/front/src/modules/ui/object/record-table/contexts/ColumnContext.ts
@@ -1,6 +1,6 @@
 import { createContext } from 'react';
 
-import { FieldMetadata } from '@/ui/data/field/types/FieldMetadata';
+import { FieldMetadata } from '@/ui/object/field/types/FieldMetadata';
 
 import { ColumnDefinition } from '../types/ColumnDefinition';
 
diff --git a/front/src/modules/ui/data/data-table/contexts/ColumnIndexContext.ts b/front/src/modules/ui/object/record-table/contexts/ColumnIndexContext.ts
similarity index 100%
rename from front/src/modules/ui/data/data-table/contexts/ColumnIndexContext.ts
rename to front/src/modules/ui/object/record-table/contexts/ColumnIndexContext.ts
diff --git a/front/src/modules/ui/data/data-table/contexts/EntityUpdateMutationHookContext.ts b/front/src/modules/ui/object/record-table/contexts/EntityUpdateMutationHookContext.ts
similarity index 100%
rename from front/src/modules/ui/data/data-table/contexts/EntityUpdateMutationHookContext.ts
rename to front/src/modules/ui/object/record-table/contexts/EntityUpdateMutationHookContext.ts
diff --git a/front/src/modules/ui/data/data-table/contexts/RowIdContext.ts b/front/src/modules/ui/object/record-table/contexts/RowIdContext.ts
similarity index 100%
rename from front/src/modules/ui/data/data-table/contexts/RowIdContext.ts
rename to front/src/modules/ui/object/record-table/contexts/RowIdContext.ts
diff --git a/front/src/modules/ui/data/data-table/contexts/RowIndexContext.ts b/front/src/modules/ui/object/record-table/contexts/RowIndexContext.ts
similarity index 100%
rename from front/src/modules/ui/data/data-table/contexts/RowIndexContext.ts
rename to front/src/modules/ui/object/record-table/contexts/RowIndexContext.ts
diff --git a/front/src/modules/ui/data/data-table/contexts/TableContext.ts b/front/src/modules/ui/object/record-table/contexts/TableContext.ts
similarity index 78%
rename from front/src/modules/ui/data/data-table/contexts/TableContext.ts
rename to front/src/modules/ui/object/record-table/contexts/TableContext.ts
index fc116d127..2268eb621 100644
--- a/front/src/modules/ui/data/data-table/contexts/TableContext.ts
+++ b/front/src/modules/ui/object/record-table/contexts/TableContext.ts
@@ -1,6 +1,6 @@
 import { createContext } from 'react';
 
-import { FieldMetadata } from '@/ui/data/field/types/FieldMetadata';
+import { FieldMetadata } from '@/ui/object/field/types/FieldMetadata';
 
 import { ColumnDefinition } from '../types/ColumnDefinition';
 
diff --git a/front/src/modules/ui/data/data-table/hooks/useCellInputEventHandlers.ts b/front/src/modules/ui/object/record-table/hooks/useCellInputEventHandlers.ts
similarity index 100%
rename from front/src/modules/ui/data/data-table/hooks/useCellInputEventHandlers.ts
rename to front/src/modules/ui/object/record-table/hooks/useCellInputEventHandlers.ts
diff --git a/front/src/modules/ui/data/data-table/hooks/useCloseCurrentTableCellInEditMode.ts b/front/src/modules/ui/object/record-table/hooks/useCloseCurrentTableCellInEditMode.ts
similarity index 100%
rename from front/src/modules/ui/data/data-table/hooks/useCloseCurrentTableCellInEditMode.ts
rename to front/src/modules/ui/object/record-table/hooks/useCloseCurrentTableCellInEditMode.ts
diff --git a/front/src/modules/ui/data/data-table/hooks/useCurrentEntityId.ts b/front/src/modules/ui/object/record-table/hooks/useCurrentEntityId.ts
similarity index 100%
rename from front/src/modules/ui/data/data-table/hooks/useCurrentEntityId.ts
rename to front/src/modules/ui/object/record-table/hooks/useCurrentEntityId.ts
diff --git a/front/src/modules/ui/data/data-table/hooks/useCurrentRowSelected.ts b/front/src/modules/ui/object/record-table/hooks/useCurrentRowSelected.ts
similarity index 100%
rename from front/src/modules/ui/data/data-table/hooks/useCurrentRowSelected.ts
rename to front/src/modules/ui/object/record-table/hooks/useCurrentRowSelected.ts
diff --git a/front/src/modules/ui/data/data-table/hooks/useDisableSoftFocus.ts b/front/src/modules/ui/object/record-table/hooks/useDisableSoftFocus.ts
similarity index 100%
rename from front/src/modules/ui/data/data-table/hooks/useDisableSoftFocus.ts
rename to front/src/modules/ui/object/record-table/hooks/useDisableSoftFocus.ts
diff --git a/front/src/modules/ui/data/data-table/hooks/useGetIsSomeCellInEditMode.ts b/front/src/modules/ui/object/record-table/hooks/useGetIsSomeCellInEditMode.ts
similarity index 100%
rename from front/src/modules/ui/data/data-table/hooks/useGetIsSomeCellInEditMode.ts
rename to front/src/modules/ui/object/record-table/hooks/useGetIsSomeCellInEditMode.ts
diff --git a/front/src/modules/ui/data/data-table/hooks/useLeaveTableFocus.ts b/front/src/modules/ui/object/record-table/hooks/useLeaveTableFocus.ts
similarity index 100%
rename from front/src/modules/ui/data/data-table/hooks/useLeaveTableFocus.ts
rename to front/src/modules/ui/object/record-table/hooks/useLeaveTableFocus.ts
diff --git a/front/src/modules/ui/data/data-table/hooks/useMapKeyboardToSoftFocus.ts b/front/src/modules/ui/object/record-table/hooks/useMapKeyboardToSoftFocus.ts
similarity index 100%
rename from front/src/modules/ui/data/data-table/hooks/useMapKeyboardToSoftFocus.ts
rename to front/src/modules/ui/object/record-table/hooks/useMapKeyboardToSoftFocus.ts
diff --git a/front/src/modules/ui/data/data-table/hooks/useMoveEditModeToCellPosition.ts b/front/src/modules/ui/object/record-table/hooks/useMoveEditModeToCellPosition.ts
similarity index 100%
rename from front/src/modules/ui/data/data-table/hooks/useMoveEditModeToCellPosition.ts
rename to front/src/modules/ui/object/record-table/hooks/useMoveEditModeToCellPosition.ts
diff --git a/front/src/modules/ui/data/data-table/hooks/useMoveSoftFocus.ts b/front/src/modules/ui/object/record-table/hooks/useMoveSoftFocus.ts
similarity index 100%
rename from front/src/modules/ui/data/data-table/hooks/useMoveSoftFocus.ts
rename to front/src/modules/ui/object/record-table/hooks/useMoveSoftFocus.ts
diff --git a/front/src/modules/ui/data/data-table/hooks/useMoveSoftFocusToCurrentCellOnHover.ts b/front/src/modules/ui/object/record-table/hooks/useMoveSoftFocusToCurrentCellOnHover.ts
similarity index 100%
rename from front/src/modules/ui/data/data-table/hooks/useMoveSoftFocusToCurrentCellOnHover.ts
rename to front/src/modules/ui/object/record-table/hooks/useMoveSoftFocusToCurrentCellOnHover.ts
diff --git a/front/src/modules/ui/data/data-table/hooks/useMoveViewColumns.ts b/front/src/modules/ui/object/record-table/hooks/useMoveViewColumns.ts
similarity index 100%
rename from front/src/modules/ui/data/data-table/hooks/useMoveViewColumns.ts
rename to front/src/modules/ui/object/record-table/hooks/useMoveViewColumns.ts
diff --git a/front/src/modules/ui/data/data-table/hooks/useResetTableRowSelection.ts b/front/src/modules/ui/object/record-table/hooks/useResetTableRowSelection.ts
similarity index 100%
rename from front/src/modules/ui/data/data-table/hooks/useResetTableRowSelection.ts
rename to front/src/modules/ui/object/record-table/hooks/useResetTableRowSelection.ts
diff --git a/front/src/modules/ui/data/data-table/hooks/useSelectAllRows.ts b/front/src/modules/ui/object/record-table/hooks/useSelectAllRows.ts
similarity index 100%
rename from front/src/modules/ui/data/data-table/hooks/useSelectAllRows.ts
rename to front/src/modules/ui/object/record-table/hooks/useSelectAllRows.ts
diff --git a/front/src/modules/ui/data/data-table/hooks/useSetDataTableData.ts b/front/src/modules/ui/object/record-table/hooks/useSetRecordTableData.ts
similarity index 83%
rename from front/src/modules/ui/data/data-table/hooks/useSetDataTableData.ts
rename to front/src/modules/ui/object/record-table/hooks/useSetRecordTableData.ts
index e44858044..aa8c6e608 100644
--- a/front/src/modules/ui/data/data-table/hooks/useSetDataTableData.ts
+++ b/front/src/modules/ui/object/record-table/hooks/useSetRecordTableData.ts
@@ -1,15 +1,15 @@
 import { useRecoilCallback } from 'recoil';
 
-import { entityFieldsFamilyState } from '@/ui/data/field/states/entityFieldsFamilyState';
+import { entityFieldsFamilyState } from '@/ui/object/field/states/entityFieldsFamilyState';
 import { useView } from '@/views/hooks/useView';
 
-import { isFetchingDataTableDataState } from '../states/isFetchingDataTableDataState';
+import { isFetchingRecordTableDataState } from '../states/isFetchingRecordTableDataState';
 import { numberOfTableRowsState } from '../states/numberOfTableRowsState';
 import { tableRowIdsState } from '../states/tableRowIdsState';
 
 import { useResetTableRowSelection } from './useResetTableRowSelection';
 
-export const useSetDataTableData = () => {
+export const useSetRecordTableData = () => {
   const resetTableRowSelection = useResetTableRowSelection();
   const { setEntityCountInCurrentView } = useView();
 
@@ -40,7 +40,7 @@ export const useSetDataTableData = () => {
 
         set(numberOfTableRowsState, entityIds.length);
         setEntityCountInCurrentView(entityIds.length);
-        set(isFetchingDataTableDataState, false);
+        set(isFetchingRecordTableDataState, false);
       },
     [resetTableRowSelection, setEntityCountInCurrentView],
   );
diff --git a/front/src/modules/ui/data/data-table/hooks/useSetRowSelectedState.ts b/front/src/modules/ui/object/record-table/hooks/useSetRowSelectedState.ts
similarity index 100%
rename from front/src/modules/ui/data/data-table/hooks/useSetRowSelectedState.ts
rename to front/src/modules/ui/object/record-table/hooks/useSetRowSelectedState.ts
diff --git a/front/src/modules/ui/data/data-table/hooks/useSetSoftFocusPosition.ts b/front/src/modules/ui/object/record-table/hooks/useSetSoftFocusPosition.ts
similarity index 100%
rename from front/src/modules/ui/data/data-table/hooks/useSetSoftFocusPosition.ts
rename to front/src/modules/ui/object/record-table/hooks/useSetSoftFocusPosition.ts
diff --git a/front/src/modules/ui/data/data-table/hooks/useTableColumns.ts b/front/src/modules/ui/object/record-table/hooks/useTableColumns.ts
similarity index 96%
rename from front/src/modules/ui/data/data-table/hooks/useTableColumns.ts
rename to front/src/modules/ui/object/record-table/hooks/useTableColumns.ts
index 834f89f91..d60b463f3 100644
--- a/front/src/modules/ui/data/data-table/hooks/useTableColumns.ts
+++ b/front/src/modules/ui/object/record-table/hooks/useTableColumns.ts
@@ -1,8 +1,8 @@
 import { useCallback, useContext } from 'react';
 import { useSetRecoilState } from 'recoil';
 
-import { useMoveViewColumns } from '@/ui/data/data-table/hooks/useMoveViewColumns';
-import { FieldMetadata } from '@/ui/data/field/types/FieldMetadata';
+import { FieldMetadata } from '@/ui/object/field/types/FieldMetadata';
+import { useMoveViewColumns } from '@/ui/object/record-table/hooks/useMoveViewColumns';
 import { useRecoilScopedState } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedState';
 import { useRecoilScopedValue } from '@/ui/utilities/recoil-scope/hooks/useRecoilScopedValue';
 import { useView } from '@/views/hooks/useView';
diff --git a/front/src/modules/ui/data/data-table/hooks/useUpsertDataTableItem.ts b/front/src/modules/ui/object/record-table/hooks/useUpsertRecordTableItem.ts
similarity index 75%
rename from front/src/modules/ui/data/data-table/hooks/useUpsertDataTableItem.ts
rename to front/src/modules/ui/object/record-table/hooks/useUpsertRecordTableItem.ts
index 4eb84488c..aa3f7a9d4 100644
--- a/front/src/modules/ui/data/data-table/hooks/useUpsertDataTableItem.ts
+++ b/front/src/modules/ui/object/record-table/hooks/useUpsertRecordTableItem.ts
@@ -1,8 +1,8 @@
 import { useRecoilCallback } from 'recoil';
 
-import { entityFieldsFamilyState } from '@/ui/data/field/states/entityFieldsFamilyState';
+import { entityFieldsFamilyState } from '@/ui/object/field/states/entityFieldsFamilyState';
 
-export const useUpsertDataTableItem = () =>
+export const useUpsertRecordTableItem = () =>
   useRecoilCallback(
     ({ set, snapshot }) =>
       <T extends { id: string }>(entity: T) => {
diff --git a/front/src/modules/ui/data/data-table/hooks/useUpsertDataTableItems.ts b/front/src/modules/ui/object/record-table/hooks/useUpsertRecordTableItems.ts
similarity index 87%
rename from front/src/modules/ui/data/data-table/hooks/useUpsertDataTableItems.ts
rename to front/src/modules/ui/object/record-table/hooks/useUpsertRecordTableItems.ts
index 2d259d56e..d9e47e91d 100644
--- a/front/src/modules/ui/data/data-table/hooks/useUpsertDataTableItems.ts
+++ b/front/src/modules/ui/object/record-table/hooks/useUpsertRecordTableItems.ts
@@ -1,8 +1,8 @@
 import { useRecoilCallback } from 'recoil';
 
-import { entityFieldsFamilyState } from '@/ui/data/field/states/entityFieldsFamilyState';
+import { entityFieldsFamilyState } from '@/ui/object/field/states/entityFieldsFamilyState';
 
-export const useUpsertDataTableItems = () =>
+export const useUpsertRecordTableItems = () =>
   useRecoilCallback(
     ({ set, snapshot }) =>
       <T extends { id: string }>(entities: T[]) => {
diff --git a/front/src/modules/ui/data/data-table/hooks/useUpsertTableRowId.ts b/front/src/modules/ui/object/record-table/hooks/useUpsertTableRowId.ts
similarity index 100%
rename from front/src/modules/ui/data/data-table/hooks/useUpsertTableRowId.ts
rename to front/src/modules/ui/object/record-table/hooks/useUpsertTableRowId.ts
diff --git a/front/src/modules/ui/data/data-table/hooks/useUpsertTableRowIds.ts b/front/src/modules/ui/object/record-table/hooks/useUpsertTableRowIds.ts
similarity index 100%
rename from front/src/modules/ui/data/data-table/hooks/useUpsertTableRowIds.ts
rename to front/src/modules/ui/object/record-table/hooks/useUpsertTableRowIds.ts
diff --git a/front/src/modules/ui/data/data-table/options/components/TableOptionsDropdown.tsx b/front/src/modules/ui/object/record-table/options/components/TableOptionsDropdown.tsx
similarity index 100%
rename from front/src/modules/ui/data/data-table/options/components/TableOptionsDropdown.tsx
rename to front/src/modules/ui/object/record-table/options/components/TableOptionsDropdown.tsx
diff --git a/front/src/modules/ui/data/data-table/options/components/TableOptionsDropdownButton.tsx b/front/src/modules/ui/object/record-table/options/components/TableOptionsDropdownButton.tsx
similarity index 83%
rename from front/src/modules/ui/data/data-table/options/components/TableOptionsDropdownButton.tsx
rename to front/src/modules/ui/object/record-table/options/components/TableOptionsDropdownButton.tsx
index 96d1ce499..187f88cff 100644
--- a/front/src/modules/ui/data/data-table/options/components/TableOptionsDropdownButton.tsx
+++ b/front/src/modules/ui/object/record-table/options/components/TableOptionsDropdownButton.tsx
@@ -1,6 +1,6 @@
-import { TableOptionsDropdownId } from '@/ui/data/data-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/data/data-table/options/components/TableOptionsDropdownContent.tsx b/front/src/modules/ui/object/record-table/options/components/TableOptionsDropdownContent.tsx
similarity index 100%
rename from front/src/modules/ui/data/data-table/options/components/TableOptionsDropdownContent.tsx
rename to front/src/modules/ui/object/record-table/options/components/TableOptionsDropdownContent.tsx
diff --git a/front/src/modules/ui/data/data-table/states/availableTableColumnsScopedState.ts b/front/src/modules/ui/object/record-table/states/availableTableColumnsScopedState.ts
similarity index 79%
rename from front/src/modules/ui/data/data-table/states/availableTableColumnsScopedState.ts
rename to front/src/modules/ui/object/record-table/states/availableTableColumnsScopedState.ts
index 2a037a260..c5c283811 100644
--- a/front/src/modules/ui/data/data-table/states/availableTableColumnsScopedState.ts
+++ b/front/src/modules/ui/object/record-table/states/availableTableColumnsScopedState.ts
@@ -1,6 +1,6 @@
 import { atomFamily } from 'recoil';
 
-import { FieldMetadata } from '@/ui/data/field/types/FieldMetadata';
+import { FieldMetadata } from '@/ui/object/field/types/FieldMetadata';
 
 import { ColumnDefinition } from '../types/ColumnDefinition';
 
diff --git a/front/src/modules/ui/data/data-table/states/currentTableCellInEditModePositionState.ts b/front/src/modules/ui/object/record-table/states/currentTableCellInEditModePositionState.ts
similarity index 100%
rename from front/src/modules/ui/data/data-table/states/currentTableCellInEditModePositionState.ts
rename to front/src/modules/ui/object/record-table/states/currentTableCellInEditModePositionState.ts
diff --git a/front/src/modules/ui/object/record-table/states/isFetchingRecordTableDataState.ts b/front/src/modules/ui/object/record-table/states/isFetchingRecordTableDataState.ts
new file mode 100644
index 000000000..bf55fe9ee
--- /dev/null
+++ b/front/src/modules/ui/object/record-table/states/isFetchingRecordTableDataState.ts
@@ -0,0 +1,6 @@
+import { atom } from 'recoil';
+
+export const isFetchingRecordTableDataState = atom<boolean>({
+  key: 'isFetchingRecordTableDataState',
+  default: true,
+});
diff --git a/front/src/modules/ui/data/data-table/states/isRowSelectedFamilyState.ts b/front/src/modules/ui/object/record-table/states/isRowSelectedFamilyState.ts
similarity index 100%
rename from front/src/modules/ui/data/data-table/states/isRowSelectedFamilyState.ts
rename to front/src/modules/ui/object/record-table/states/isRowSelectedFamilyState.ts
diff --git a/front/src/modules/ui/data/data-table/states/isSoftFocusActiveState.ts b/front/src/modules/ui/object/record-table/states/isSoftFocusActiveState.ts
similarity index 100%
rename from front/src/modules/ui/data/data-table/states/isSoftFocusActiveState.ts
rename to front/src/modules/ui/object/record-table/states/isSoftFocusActiveState.ts
diff --git a/front/src/modules/ui/data/data-table/states/isSoftFocusOnTableCellFamilyState.ts b/front/src/modules/ui/object/record-table/states/isSoftFocusOnTableCellFamilyState.ts
similarity index 100%
rename from front/src/modules/ui/data/data-table/states/isSoftFocusOnTableCellFamilyState.ts
rename to front/src/modules/ui/object/record-table/states/isSoftFocusOnTableCellFamilyState.ts
diff --git a/front/src/modules/ui/data/data-table/states/isTableCellInEditModeFamilyState.ts b/front/src/modules/ui/object/record-table/states/isTableCellInEditModeFamilyState.ts
similarity index 100%
rename from front/src/modules/ui/data/data-table/states/isTableCellInEditModeFamilyState.ts
rename to front/src/modules/ui/object/record-table/states/isTableCellInEditModeFamilyState.ts
diff --git a/front/src/modules/ui/data/data-table/states/numberOfTableRowsState.ts b/front/src/modules/ui/object/record-table/states/numberOfTableRowsState.ts
similarity index 100%
rename from front/src/modules/ui/data/data-table/states/numberOfTableRowsState.ts
rename to front/src/modules/ui/object/record-table/states/numberOfTableRowsState.ts
diff --git a/front/src/modules/ui/data/data-table/states/recoil-scope-contexts/TableRecoilScopeContext.ts b/front/src/modules/ui/object/record-table/states/recoil-scope-contexts/TableRecoilScopeContext.ts
similarity index 100%
rename from front/src/modules/ui/data/data-table/states/recoil-scope-contexts/TableRecoilScopeContext.ts
rename to front/src/modules/ui/object/record-table/states/recoil-scope-contexts/TableRecoilScopeContext.ts
diff --git a/front/src/modules/ui/data/data-table/states/resizeFieldOffsetState.ts b/front/src/modules/ui/object/record-table/states/resizeFieldOffsetState.ts
similarity index 100%
rename from front/src/modules/ui/data/data-table/states/resizeFieldOffsetState.ts
rename to front/src/modules/ui/object/record-table/states/resizeFieldOffsetState.ts
diff --git a/front/src/modules/ui/data/data-table/states/savedTableColumnsFamilyState.ts b/front/src/modules/ui/object/record-table/states/savedTableColumnsFamilyState.ts
similarity index 79%
rename from front/src/modules/ui/data/data-table/states/savedTableColumnsFamilyState.ts
rename to front/src/modules/ui/object/record-table/states/savedTableColumnsFamilyState.ts
index 3cd0e04cc..3723aacf0 100644
--- a/front/src/modules/ui/data/data-table/states/savedTableColumnsFamilyState.ts
+++ b/front/src/modules/ui/object/record-table/states/savedTableColumnsFamilyState.ts
@@ -1,6 +1,6 @@
 import { atomFamily } from 'recoil';
 
-import { FieldMetadata } from '@/ui/data/field/types/FieldMetadata';
+import { FieldMetadata } from '@/ui/object/field/types/FieldMetadata';
 
 import { ColumnDefinition } from '../types/ColumnDefinition';
 
diff --git a/front/src/modules/ui/data/data-table/states/selectors/allRowsSelectedStatusSelector.ts b/front/src/modules/ui/object/record-table/states/selectors/allRowsSelectedStatusSelector.ts
similarity index 100%
rename from front/src/modules/ui/data/data-table/states/selectors/allRowsSelectedStatusSelector.ts
rename to front/src/modules/ui/object/record-table/states/selectors/allRowsSelectedStatusSelector.ts
diff --git a/front/src/modules/ui/data/data-table/states/selectors/hiddenTableColumnsScopedSelector.ts b/front/src/modules/ui/object/record-table/states/selectors/hiddenTableColumnsScopedSelector.ts
similarity index 100%
rename from front/src/modules/ui/data/data-table/states/selectors/hiddenTableColumnsScopedSelector.ts
rename to front/src/modules/ui/object/record-table/states/selectors/hiddenTableColumnsScopedSelector.ts
diff --git a/front/src/modules/ui/data/data-table/states/selectors/numberOfTableColumnsScopedSelector.ts b/front/src/modules/ui/object/record-table/states/selectors/numberOfTableColumnsScopedSelector.ts
similarity index 100%
rename from front/src/modules/ui/data/data-table/states/selectors/numberOfTableColumnsScopedSelector.ts
rename to front/src/modules/ui/object/record-table/states/selectors/numberOfTableColumnsScopedSelector.ts
diff --git a/front/src/modules/ui/data/data-table/states/selectors/savedTableColumnsByKeyFamilySelector.ts b/front/src/modules/ui/object/record-table/states/selectors/savedTableColumnsByKeyFamilySelector.ts
similarity index 88%
rename from front/src/modules/ui/data/data-table/states/selectors/savedTableColumnsByKeyFamilySelector.ts
rename to front/src/modules/ui/object/record-table/states/selectors/savedTableColumnsByKeyFamilySelector.ts
index a2f0a9fbe..1b8f121f8 100644
--- a/front/src/modules/ui/data/data-table/states/selectors/savedTableColumnsByKeyFamilySelector.ts
+++ b/front/src/modules/ui/object/record-table/states/selectors/savedTableColumnsByKeyFamilySelector.ts
@@ -1,6 +1,6 @@
 import { selectorFamily } from 'recoil';
 
-import { FieldMetadata } from '@/ui/data/field/types/FieldMetadata';
+import { FieldMetadata } from '@/ui/object/field/types/FieldMetadata';
 
 import { ColumnDefinition } from '../../types/ColumnDefinition';
 import { savedTableColumnsFamilyState } from '../savedTableColumnsFamilyState';
diff --git a/front/src/modules/ui/data/data-table/states/selectors/selectedRowIdsSelector.ts b/front/src/modules/ui/object/record-table/states/selectors/selectedRowIdsSelector.ts
similarity index 100%
rename from front/src/modules/ui/data/data-table/states/selectors/selectedRowIdsSelector.ts
rename to front/src/modules/ui/object/record-table/states/selectors/selectedRowIdsSelector.ts
diff --git a/front/src/modules/ui/data/data-table/states/selectors/tableColumnsByKeyScopedSelector.ts b/front/src/modules/ui/object/record-table/states/selectors/tableColumnsByKeyScopedSelector.ts
similarity index 88%
rename from front/src/modules/ui/data/data-table/states/selectors/tableColumnsByKeyScopedSelector.ts
rename to front/src/modules/ui/object/record-table/states/selectors/tableColumnsByKeyScopedSelector.ts
index c2b32a787..c7de54f1c 100644
--- a/front/src/modules/ui/data/data-table/states/selectors/tableColumnsByKeyScopedSelector.ts
+++ b/front/src/modules/ui/object/record-table/states/selectors/tableColumnsByKeyScopedSelector.ts
@@ -1,6 +1,6 @@
 import { selectorFamily } from 'recoil';
 
-import { FieldMetadata } from '@/ui/data/field/types/FieldMetadata';
+import { FieldMetadata } from '@/ui/object/field/types/FieldMetadata';
 
 import { ColumnDefinition } from '../../types/ColumnDefinition';
 import { tableColumnsScopedState } from '../tableColumnsScopedState';
diff --git a/front/src/modules/ui/data/data-table/states/selectors/tableSortsOrderByScopedSelector.ts b/front/src/modules/ui/object/record-table/states/selectors/tableSortsOrderByScopedSelector.ts
similarity index 87%
rename from front/src/modules/ui/data/data-table/states/selectors/tableSortsOrderByScopedSelector.ts
rename to front/src/modules/ui/object/record-table/states/selectors/tableSortsOrderByScopedSelector.ts
index 2590e8af8..6f508547d 100644
--- a/front/src/modules/ui/data/data-table/states/selectors/tableSortsOrderByScopedSelector.ts
+++ b/front/src/modules/ui/object/record-table/states/selectors/tableSortsOrderByScopedSelector.ts
@@ -1,6 +1,6 @@
 import { selectorFamily } from 'recoil';
 
-import { reduceSortsToOrderBy } from '@/ui/data/sort/utils/helpers';
+import { reduceSortsToOrderBy } from '@/ui/object/sort/utils/helpers';
 import { SortOrder } from '~/generated/graphql';
 
 import { tableSortsScopedState } from '../tableSortsScopedState';
diff --git a/front/src/modules/ui/data/data-table/states/selectors/tablefiltersWhereScopedSelector.ts b/front/src/modules/ui/object/record-table/states/selectors/tablefiltersWhereScopedSelector.ts
similarity index 100%
rename from front/src/modules/ui/data/data-table/states/selectors/tablefiltersWhereScopedSelector.ts
rename to front/src/modules/ui/object/record-table/states/selectors/tablefiltersWhereScopedSelector.ts
diff --git a/front/src/modules/ui/data/data-table/states/selectors/visibleTableColumnsScopedSelector.ts b/front/src/modules/ui/object/record-table/states/selectors/visibleTableColumnsScopedSelector.ts
similarity index 100%
rename from front/src/modules/ui/data/data-table/states/selectors/visibleTableColumnsScopedSelector.ts
rename to front/src/modules/ui/object/record-table/states/selectors/visibleTableColumnsScopedSelector.ts
diff --git a/front/src/modules/ui/data/data-table/states/softFocusPositionState.ts b/front/src/modules/ui/object/record-table/states/softFocusPositionState.ts
similarity index 100%
rename from front/src/modules/ui/data/data-table/states/softFocusPositionState.ts
rename to front/src/modules/ui/object/record-table/states/softFocusPositionState.ts
diff --git a/front/src/modules/ui/data/data-table/states/tableColumnsScopedState.ts b/front/src/modules/ui/object/record-table/states/tableColumnsScopedState.ts
similarity index 78%
rename from front/src/modules/ui/data/data-table/states/tableColumnsScopedState.ts
rename to front/src/modules/ui/object/record-table/states/tableColumnsScopedState.ts
index 9ff30b5bd..23d406e78 100644
--- a/front/src/modules/ui/data/data-table/states/tableColumnsScopedState.ts
+++ b/front/src/modules/ui/object/record-table/states/tableColumnsScopedState.ts
@@ -1,6 +1,6 @@
 import { atomFamily } from 'recoil';
 
-import { FieldMetadata } from '@/ui/data/field/types/FieldMetadata';
+import { FieldMetadata } from '@/ui/object/field/types/FieldMetadata';
 
 import { ColumnDefinition } from '../types/ColumnDefinition';
 
diff --git a/front/src/modules/ui/data/data-table/states/tableFiltersScopedState.ts b/front/src/modules/ui/object/record-table/states/tableFiltersScopedState.ts
similarity index 100%
rename from front/src/modules/ui/data/data-table/states/tableFiltersScopedState.ts
rename to front/src/modules/ui/object/record-table/states/tableFiltersScopedState.ts
diff --git a/front/src/modules/ui/data/data-table/states/tableRowIdsState.ts b/front/src/modules/ui/object/record-table/states/tableRowIdsState.ts
similarity index 100%
rename from front/src/modules/ui/data/data-table/states/tableRowIdsState.ts
rename to front/src/modules/ui/object/record-table/states/tableRowIdsState.ts
diff --git a/front/src/modules/ui/data/data-table/states/tableSortsScopedState.ts b/front/src/modules/ui/object/record-table/states/tableSortsScopedState.ts
similarity index 100%
rename from front/src/modules/ui/data/data-table/states/tableSortsScopedState.ts
rename to front/src/modules/ui/object/record-table/states/tableSortsScopedState.ts
diff --git a/front/src/modules/ui/data/data-table/table-cell/components/TableCell.tsx b/front/src/modules/ui/object/record-table/table-cell/components/TableCell.tsx
similarity index 86%
rename from front/src/modules/ui/data/data-table/table-cell/components/TableCell.tsx
rename to front/src/modules/ui/object/record-table/table-cell/components/TableCell.tsx
index 58a32ffa1..d1aacfe8e 100644
--- a/front/src/modules/ui/data/data-table/table-cell/components/TableCell.tsx
+++ b/front/src/modules/ui/object/record-table/table-cell/components/TableCell.tsx
@@ -1,10 +1,10 @@
 import { useContext } from 'react';
 
-import { FieldDisplay } from '@/ui/data/field/components/FieldDisplay';
-import { FieldInput } from '@/ui/data/field/components/FieldInput';
-import { useGetButtonIcon } from '@/ui/data/field/hooks/useGetButtonIcon';
-import { FieldInputEvent } from '@/ui/data/field/types/FieldInputEvent';
 import { IconArrowUpRight } from '@/ui/display/icon';
+import { FieldDisplay } from '@/ui/object/field/components/FieldDisplay';
+import { FieldInput } from '@/ui/object/field/components/FieldInput';
+import { useGetButtonIcon } from '@/ui/object/field/hooks/useGetButtonIcon';
+import { FieldInputEvent } from '@/ui/object/field/types/FieldInputEvent';
 import { HotkeyScope } from '@/ui/utilities/hotkey/types/HotkeyScope';
 
 import { ColumnIndexContext } from '../../contexts/ColumnIndexContext';
diff --git a/front/src/modules/ui/data/data-table/table-cell/components/TableCellButton.tsx b/front/src/modules/ui/object/record-table/table-cell/components/TableCellButton.tsx
similarity index 100%
rename from front/src/modules/ui/data/data-table/table-cell/components/TableCellButton.tsx
rename to front/src/modules/ui/object/record-table/table-cell/components/TableCellButton.tsx
diff --git a/front/src/modules/ui/data/data-table/table-cell/components/TableCellContainer.tsx b/front/src/modules/ui/object/record-table/table-cell/components/TableCellContainer.tsx
similarity index 96%
rename from front/src/modules/ui/data/data-table/table-cell/components/TableCellContainer.tsx
rename to front/src/modules/ui/object/record-table/table-cell/components/TableCellContainer.tsx
index dbe9380e3..9c364a3a7 100644
--- a/front/src/modules/ui/data/data-table/table-cell/components/TableCellContainer.tsx
+++ b/front/src/modules/ui/object/record-table/table-cell/components/TableCellContainer.tsx
@@ -1,9 +1,9 @@
 import { ReactElement, useContext, useState } from 'react';
 import styled from '@emotion/styled';
 
-import { useIsFieldEmpty } from '@/ui/data/field/hooks/useIsFieldEmpty';
-import { useIsFieldInputOnly } from '@/ui/data/field/hooks/useIsFieldInputOnly';
 import { IconComponent } from '@/ui/display/icon/types/IconComponent';
+import { useIsFieldEmpty } from '@/ui/object/field/hooks/useIsFieldEmpty';
+import { useIsFieldInputOnly } from '@/ui/object/field/hooks/useIsFieldInputOnly';
 import { HotkeyScope } from '@/ui/utilities/hotkey/types/HotkeyScope';
 
 import { CellHotkeyScopeContext } from '../../contexts/CellHotkeyScopeContext';
diff --git a/front/src/modules/ui/data/data-table/table-cell/components/TableCellDisplayContainer.tsx b/front/src/modules/ui/object/record-table/table-cell/components/TableCellDisplayContainer.tsx
similarity index 100%
rename from front/src/modules/ui/data/data-table/table-cell/components/TableCellDisplayContainer.tsx
rename to front/src/modules/ui/object/record-table/table-cell/components/TableCellDisplayContainer.tsx
diff --git a/front/src/modules/ui/data/data-table/table-cell/components/TableCellDisplayMode.tsx b/front/src/modules/ui/object/record-table/table-cell/components/TableCellDisplayMode.tsx
similarity index 89%
rename from front/src/modules/ui/data/data-table/table-cell/components/TableCellDisplayMode.tsx
rename to front/src/modules/ui/object/record-table/table-cell/components/TableCellDisplayMode.tsx
index 0f117663f..ad6898711 100644
--- a/front/src/modules/ui/data/data-table/table-cell/components/TableCellDisplayMode.tsx
+++ b/front/src/modules/ui/object/record-table/table-cell/components/TableCellDisplayMode.tsx
@@ -1,4 +1,4 @@
-import { useIsFieldInputOnly } from '@/ui/data/field/hooks/useIsFieldInputOnly';
+import { useIsFieldInputOnly } from '@/ui/object/field/hooks/useIsFieldInputOnly';
 
 import { useSetSoftFocusOnCurrentTableCell } from '../hooks/useSetSoftFocusOnCurrentTableCell';
 import { useTableCell } from '../hooks/useTableCell';
diff --git a/front/src/modules/ui/data/data-table/table-cell/components/TableCellEditButton.tsx b/front/src/modules/ui/object/record-table/table-cell/components/TableCellEditButton.tsx
similarity index 100%
rename from front/src/modules/ui/data/data-table/table-cell/components/TableCellEditButton.tsx
rename to front/src/modules/ui/object/record-table/table-cell/components/TableCellEditButton.tsx
diff --git a/front/src/modules/ui/data/data-table/table-cell/components/TableCellEditMode.tsx b/front/src/modules/ui/object/record-table/table-cell/components/TableCellEditMode.tsx
similarity index 100%
rename from front/src/modules/ui/data/data-table/table-cell/components/TableCellEditMode.tsx
rename to front/src/modules/ui/object/record-table/table-cell/components/TableCellEditMode.tsx
diff --git a/front/src/modules/ui/data/data-table/table-cell/components/TableCellSoftFocusMode.tsx b/front/src/modules/ui/object/record-table/table-cell/components/TableCellSoftFocusMode.tsx
similarity index 91%
rename from front/src/modules/ui/data/data-table/table-cell/components/TableCellSoftFocusMode.tsx
rename to front/src/modules/ui/object/record-table/table-cell/components/TableCellSoftFocusMode.tsx
index 424e46429..df6aee7bc 100644
--- a/front/src/modules/ui/data/data-table/table-cell/components/TableCellSoftFocusMode.tsx
+++ b/front/src/modules/ui/object/record-table/table-cell/components/TableCellSoftFocusMode.tsx
@@ -1,7 +1,7 @@
 import { PropsWithChildren, useEffect, useRef } from 'react';
 
-import { useIsFieldInputOnly } from '@/ui/data/field/hooks/useIsFieldInputOnly';
-import { useToggleEditOnlyInput } from '@/ui/data/field/hooks/useToggleEditOnlyInput';
+import { useIsFieldInputOnly } from '@/ui/object/field/hooks/useIsFieldInputOnly';
+import { useToggleEditOnlyInput } from '@/ui/object/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/data/data-table/table-cell/hooks/useCurrentCellPosition.ts b/front/src/modules/ui/object/record-table/table-cell/hooks/useCurrentCellPosition.ts
similarity index 100%
rename from front/src/modules/ui/data/data-table/table-cell/hooks/useCurrentCellPosition.ts
rename to front/src/modules/ui/object/record-table/table-cell/hooks/useCurrentCellPosition.ts
diff --git a/front/src/modules/ui/data/data-table/table-cell/hooks/useCurrentTableCellEditMode.ts b/front/src/modules/ui/object/record-table/table-cell/hooks/useCurrentTableCellEditMode.ts
similarity index 100%
rename from front/src/modules/ui/data/data-table/table-cell/hooks/useCurrentTableCellEditMode.ts
rename to front/src/modules/ui/object/record-table/table-cell/hooks/useCurrentTableCellEditMode.ts
diff --git a/front/src/modules/ui/data/data-table/table-cell/hooks/useIsSoftFocusOnCurrentTableCell.ts b/front/src/modules/ui/object/record-table/table-cell/hooks/useIsSoftFocusOnCurrentTableCell.ts
similarity index 100%
rename from front/src/modules/ui/data/data-table/table-cell/hooks/useIsSoftFocusOnCurrentTableCell.ts
rename to front/src/modules/ui/object/record-table/table-cell/hooks/useIsSoftFocusOnCurrentTableCell.ts
diff --git a/front/src/modules/ui/data/data-table/table-cell/hooks/useSetSoftFocusOnCurrentTableCell.ts b/front/src/modules/ui/object/record-table/table-cell/hooks/useSetSoftFocusOnCurrentTableCell.ts
similarity index 100%
rename from front/src/modules/ui/data/data-table/table-cell/hooks/useSetSoftFocusOnCurrentTableCell.ts
rename to front/src/modules/ui/object/record-table/table-cell/hooks/useSetSoftFocusOnCurrentTableCell.ts
diff --git a/front/src/modules/ui/data/data-table/table-cell/hooks/useTableCell.ts b/front/src/modules/ui/object/record-table/table-cell/hooks/useTableCell.ts
similarity index 93%
rename from front/src/modules/ui/data/data-table/table-cell/hooks/useTableCell.ts
rename to front/src/modules/ui/object/record-table/table-cell/hooks/useTableCell.ts
index a1b7c8d5a..ce8927d8c 100644
--- a/front/src/modules/ui/data/data-table/table-cell/hooks/useTableCell.ts
+++ b/front/src/modules/ui/object/record-table/table-cell/hooks/useTableCell.ts
@@ -1,8 +1,8 @@
 import { useContext } from 'react';
 import { useNavigate } from 'react-router-dom';
 
-import { FieldContext } from '@/ui/data/field/contexts/FieldContext';
-import { useIsFieldEmpty } from '@/ui/data/field/hooks/useIsFieldEmpty';
+import { FieldContext } from '@/ui/object/field/contexts/FieldContext';
+import { useIsFieldEmpty } from '@/ui/object/field/hooks/useIsFieldEmpty';
 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/data/data-table/table-cell/states/isCreateModeScopedState.ts b/front/src/modules/ui/object/record-table/table-cell/states/isCreateModeScopedState.ts
similarity index 100%
rename from front/src/modules/ui/data/data-table/table-cell/states/isCreateModeScopedState.ts
rename to front/src/modules/ui/object/record-table/table-cell/states/isCreateModeScopedState.ts
diff --git a/front/src/modules/ui/data/data-table/types/AllRowSelectedStatus.ts b/front/src/modules/ui/object/record-table/types/AllRowSelectedStatus.ts
similarity index 100%
rename from front/src/modules/ui/data/data-table/types/AllRowSelectedStatus.ts
rename to front/src/modules/ui/object/record-table/types/AllRowSelectedStatus.ts
diff --git a/front/src/modules/ui/data/data-table/types/ColumnDefinition.ts b/front/src/modules/ui/object/record-table/types/ColumnDefinition.ts
similarity index 53%
rename from front/src/modules/ui/data/data-table/types/ColumnDefinition.ts
rename to front/src/modules/ui/object/record-table/types/ColumnDefinition.ts
index 604cb0b2e..5b8a64042 100644
--- a/front/src/modules/ui/data/data-table/types/ColumnDefinition.ts
+++ b/front/src/modules/ui/object/record-table/types/ColumnDefinition.ts
@@ -1,5 +1,5 @@
-import { FieldDefinition } from '@/ui/data/field/types/FieldDefinition';
-import { FieldMetadata } from '@/ui/data/field/types/FieldMetadata';
+import { FieldDefinition } from '@/ui/object/field/types/FieldDefinition';
+import { FieldMetadata } from '@/ui/object/field/types/FieldMetadata';
 
 export type ColumnDefinition<T extends FieldMetadata> = FieldDefinition<T> & {
   size: number;
diff --git a/front/src/modules/ui/data/data-table/types/TableCellPosition.ts b/front/src/modules/ui/object/record-table/types/TableCellPosition.ts
similarity index 100%
rename from front/src/modules/ui/data/data-table/types/TableCellPosition.ts
rename to front/src/modules/ui/object/record-table/types/TableCellPosition.ts
diff --git a/front/src/modules/ui/data/data-table/types/TableDimensions.ts b/front/src/modules/ui/object/record-table/types/TableDimensions.ts
similarity index 100%
rename from front/src/modules/ui/data/data-table/types/TableDimensions.ts
rename to front/src/modules/ui/object/record-table/types/TableDimensions.ts
diff --git a/front/src/modules/ui/data/data-table/types/TableHotkeyScope.ts b/front/src/modules/ui/object/record-table/types/TableHotkeyScope.ts
similarity index 100%
rename from front/src/modules/ui/data/data-table/types/TableHotkeyScope.ts
rename to front/src/modules/ui/object/record-table/types/TableHotkeyScope.ts
diff --git a/front/src/modules/ui/data/data-table/types/TableOptionsHotkeyScope.ts b/front/src/modules/ui/object/record-table/types/TableOptionsHotkeyScope.ts
similarity index 100%
rename from front/src/modules/ui/data/data-table/types/TableOptionsHotkeyScope.ts
rename to front/src/modules/ui/object/record-table/types/TableOptionsHotkeyScope.ts
diff --git a/front/src/modules/ui/data/sort/components/SortDropdownButton.tsx b/front/src/modules/ui/object/sort/components/SortDropdownButton.tsx
similarity index 100%
rename from front/src/modules/ui/data/sort/components/SortDropdownButton.tsx
rename to front/src/modules/ui/object/sort/components/SortDropdownButton.tsx
diff --git a/front/src/modules/ui/data/sort/constants/SortDropdownId.ts b/front/src/modules/ui/object/sort/constants/SortDropdownId.ts
similarity index 100%
rename from front/src/modules/ui/data/sort/constants/SortDropdownId.ts
rename to front/src/modules/ui/object/sort/constants/SortDropdownId.ts
diff --git a/front/src/modules/ui/data/sort/hooks/useSort.ts b/front/src/modules/ui/object/sort/hooks/useSort.ts
similarity index 100%
rename from front/src/modules/ui/data/sort/hooks/useSort.ts
rename to front/src/modules/ui/object/sort/hooks/useSort.ts
diff --git a/front/src/modules/ui/data/sort/hooks/useSortStates.ts b/front/src/modules/ui/object/sort/hooks/useSortStates.ts
similarity index 100%
rename from front/src/modules/ui/data/sort/hooks/useSortStates.ts
rename to front/src/modules/ui/object/sort/hooks/useSortStates.ts
diff --git a/front/src/modules/ui/data/sort/scopes/SortScope.tsx b/front/src/modules/ui/object/sort/scopes/SortScope.tsx
similarity index 100%
rename from front/src/modules/ui/data/sort/scopes/SortScope.tsx
rename to front/src/modules/ui/object/sort/scopes/SortScope.tsx
diff --git a/front/src/modules/ui/data/sort/scopes/init-effect/SortScopeInitEffect.tsx b/front/src/modules/ui/object/sort/scopes/init-effect/SortScopeInitEffect.tsx
similarity index 89%
rename from front/src/modules/ui/data/sort/scopes/init-effect/SortScopeInitEffect.tsx
rename to front/src/modules/ui/object/sort/scopes/init-effect/SortScopeInitEffect.tsx
index 7a4e8e052..57e9b6135 100644
--- a/front/src/modules/ui/data/sort/scopes/init-effect/SortScopeInitEffect.tsx
+++ b/front/src/modules/ui/object/sort/scopes/init-effect/SortScopeInitEffect.tsx
@@ -1,6 +1,6 @@
 import { useEffect } from 'react';
 
-import { SortDefinition } from '@/ui/data/sort/types/SortDefinition';
+import { SortDefinition } from '@/ui/object/sort/types/SortDefinition';
 
 import { useSortStates } from '../../hooks/useSortStates';
 
diff --git a/front/src/modules/ui/data/sort/scopes/scope-internal-context/SortScopeInternalContext.ts b/front/src/modules/ui/object/sort/scopes/scope-internal-context/SortScopeInternalContext.ts
similarity index 100%
rename from front/src/modules/ui/data/sort/scopes/scope-internal-context/SortScopeInternalContext.ts
rename to front/src/modules/ui/object/sort/scopes/scope-internal-context/SortScopeInternalContext.ts
diff --git a/front/src/modules/ui/data/sort/states/availableSortDefinitionsScopedState.ts b/front/src/modules/ui/object/sort/states/availableSortDefinitionsScopedState.ts
similarity index 100%
rename from front/src/modules/ui/data/sort/states/availableSortDefinitionsScopedState.ts
rename to front/src/modules/ui/object/sort/states/availableSortDefinitionsScopedState.ts
diff --git a/front/src/modules/ui/data/sort/states/isSortSelectedScopedState.ts b/front/src/modules/ui/object/sort/states/isSortSelectedScopedState.ts
similarity index 100%
rename from front/src/modules/ui/data/sort/states/isSortSelectedScopedState.ts
rename to front/src/modules/ui/object/sort/states/isSortSelectedScopedState.ts
diff --git a/front/src/modules/ui/data/sort/types/Sort.ts b/front/src/modules/ui/object/sort/types/Sort.ts
similarity index 100%
rename from front/src/modules/ui/data/sort/types/Sort.ts
rename to front/src/modules/ui/object/sort/types/Sort.ts
diff --git a/front/src/modules/ui/data/sort/types/SortDefinition.ts b/front/src/modules/ui/object/sort/types/SortDefinition.ts
similarity index 100%
rename from front/src/modules/ui/data/sort/types/SortDefinition.ts
rename to front/src/modules/ui/object/sort/types/SortDefinition.ts
diff --git a/front/src/modules/ui/data/sort/types/SortDirection.ts b/front/src/modules/ui/object/sort/types/SortDirection.ts
similarity index 100%
rename from front/src/modules/ui/data/sort/types/SortDirection.ts
rename to front/src/modules/ui/object/sort/types/SortDirection.ts
diff --git a/front/src/modules/ui/data/sort/types/interface.ts b/front/src/modules/ui/object/sort/types/interface.ts
similarity index 100%
rename from front/src/modules/ui/data/sort/types/interface.ts
rename to front/src/modules/ui/object/sort/types/interface.ts
diff --git a/front/src/modules/ui/data/sort/utils/helpers.ts b/front/src/modules/ui/object/sort/utils/helpers.ts
similarity index 100%
rename from front/src/modules/ui/data/sort/utils/helpers.ts
rename to front/src/modules/ui/object/sort/utils/helpers.ts
diff --git a/front/src/modules/ui/data/sort/utils/turnSortsIntoOrderByV2.ts b/front/src/modules/ui/object/sort/utils/turnSortsIntoOrderByV2.ts
similarity index 100%
rename from front/src/modules/ui/data/sort/utils/turnSortsIntoOrderByV2.ts
rename to front/src/modules/ui/object/sort/utils/turnSortsIntoOrderByV2.ts
diff --git a/front/src/modules/users/components/FilterDropdownUserSearchSelect.tsx b/front/src/modules/users/components/FilterDropdownUserSearchSelect.tsx
index dc330a223..e87ac6024 100644
--- a/front/src/modules/users/components/FilterDropdownUserSearchSelect.tsx
+++ b/front/src/modules/users/components/FilterDropdownUserSearchSelect.tsx
@@ -1,7 +1,7 @@
 import { useFilteredSearchEntityQuery } from '@/search/hooks/useFilteredSearchEntityQuery';
-import { FilterDropdownEntitySearchSelect } from '@/ui/data/filter/components/FilterDropdownEntitySearchSelect';
-import { useFilter } from '@/ui/data/filter/hooks/useFilter';
 import { Entity } from '@/ui/input/relation-picker/types/EntityTypeForSelect';
+import { FilterDropdownEntitySearchSelect } from '@/ui/object/filter/components/FilterDropdownEntitySearchSelect';
+import { useFilter } from '@/ui/object/filter/hooks/useFilter';
 import { useSearchUserQuery } from '~/generated/graphql';
 
 export const FilterDropdownUserSearchSelect = () => {
diff --git a/front/src/modules/views/components/ViewBar.tsx b/front/src/modules/views/components/ViewBar.tsx
index de040cd2f..09fbcf3e0 100644
--- a/front/src/modules/views/components/ViewBar.tsx
+++ b/front/src/modules/views/components/ViewBar.tsx
@@ -1,12 +1,12 @@
 import { ReactNode } from 'react';
 
-import { FilterDropdownButton } from '@/ui/data/filter/components/FilterDropdownButton';
-import { FilterScope } from '@/ui/data/filter/scopes/FilterScope';
-import { FiltersHotkeyScope } from '@/ui/data/filter/types/FiltersHotkeyScope';
-import { SortDropdownButton } from '@/ui/data/sort/components/SortDropdownButton';
-import { SortScope } from '@/ui/data/sort/scopes/SortScope';
 import { useDropdown } from '@/ui/layout/dropdown/hooks/useDropdown';
 import { TopBar } from '@/ui/layout/top-bar/TopBar';
+import { FilterDropdownButton } from '@/ui/object/filter/components/FilterDropdownButton';
+import { FilterScope } from '@/ui/object/filter/scopes/FilterScope';
+import { FiltersHotkeyScope } from '@/ui/object/filter/types/FiltersHotkeyScope';
+import { SortDropdownButton } from '@/ui/object/sort/components/SortDropdownButton';
+import { SortScope } from '@/ui/object/sort/scopes/SortScope';
 
 import { useView } from '../hooks/useView';
 import { useViewGetStates } from '../hooks/useViewGetStates';
diff --git a/front/src/modules/views/components/ViewBarDetails.tsx b/front/src/modules/views/components/ViewBarDetails.tsx
index c8ce4c4db..de17bc41b 100644
--- a/front/src/modules/views/components/ViewBarDetails.tsx
+++ b/front/src/modules/views/components/ViewBarDetails.tsx
@@ -1,9 +1,9 @@
 import { ReactNode } from 'react';
 import styled from '@emotion/styled';
 
-import { AddFilterFromDropdownButton } from '@/ui/data/filter/components/AddFilterFromDetailsButton';
-import { getOperandLabelShort } from '@/ui/data/filter/utils/getOperandLabel';
 import { IconArrowDown, IconArrowUp } from '@/ui/display/icon/index';
+import { AddFilterFromDropdownButton } from '@/ui/object/filter/components/AddFilterFromDetailsButton';
+import { getOperandLabelShort } from '@/ui/object/filter/utils/getOperandLabel';
 
 import { useView } from '../hooks/useView';
 import { useViewGetStates } from '../hooks/useViewGetStates';
diff --git a/front/src/modules/views/components/ViewFieldsVisibilityDropdownSection.tsx b/front/src/modules/views/components/ViewFieldsVisibilityDropdownSection.tsx
index 83a8f1ed2..a8eab87b7 100644
--- a/front/src/modules/views/components/ViewFieldsVisibilityDropdownSection.tsx
+++ b/front/src/modules/views/components/ViewFieldsVisibilityDropdownSection.tsx
@@ -6,8 +6,6 @@ import {
   ResponderProvided,
 } from '@hello-pangea/dnd';
 
-import { ColumnDefinition } from '@/ui/data/data-table/types/ColumnDefinition';
-import { FieldMetadata } from '@/ui/data/field/types/FieldMetadata';
 import { IconMinus, IconPlus } from '@/ui/display/icon';
 import { AppTooltip } from '@/ui/display/tooltip/AppTooltip';
 import { IconInfoCircle } from '@/ui/input/constants/icons';
@@ -17,6 +15,8 @@ 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 b68f42965..2cda6fbf5 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 { useFindOneMetadataObject } from '@/metadata/hooks/useFindOneMetadataObject';
-import { Filter } from '@/ui/data/filter/types/Filter';
+import { Filter } from '@/ui/object/filter/types/Filter';
 import { currentViewFiltersScopedFamilyState } from '@/views/states/currentViewFiltersScopedFamilyState';
 import { currentViewIdScopedState } from '@/views/states/currentViewIdScopedState';
 import { onViewFiltersChangeScopedState } from '@/views/states/onViewFiltersChangeScopedState';
diff --git a/front/src/modules/views/hooks/internal/useViewSorts.ts b/front/src/modules/views/hooks/internal/useViewSorts.ts
index 75594b414..deeb5e450 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 { useFindOneMetadataObject } from '@/metadata/hooks/useFindOneMetadataObject';
-import { Sort } from '@/ui/data/sort/types/Sort';
+import { Sort } from '@/ui/object/sort/types/Sort';
 import { currentViewIdScopedState } from '@/views/states/currentViewIdScopedState';
 import { currentViewSortsScopedFamilyState } from '@/views/states/currentViewSortsScopedFamilyState';
 import { onViewSortsChangeScopedState } from '@/views/states/onViewSortsChangeScopedState';
diff --git a/front/src/modules/views/scopes/ViewScope.tsx b/front/src/modules/views/scopes/ViewScope.tsx
index 23a56fad8..9ba723b21 100644
--- a/front/src/modules/views/scopes/ViewScope.tsx
+++ b/front/src/modules/views/scopes/ViewScope.tsx
@@ -1,7 +1,7 @@
 import { ReactNode } from 'react';
 
-import { Filter } from '@/ui/data/filter/types/Filter';
-import { Sort } from '@/ui/data/sort/types/Sort';
+import { Filter } from '@/ui/object/filter/types/Filter';
+import { Sort } from '@/ui/object/sort/types/Sort';
 
 import { ViewField } from '../types/ViewField';
 
diff --git a/front/src/modules/views/scopes/init-effect/ViewScopeInitEffect.tsx b/front/src/modules/views/scopes/init-effect/ViewScopeInitEffect.tsx
index 25a5147a1..be43f52b8 100644
--- a/front/src/modules/views/scopes/init-effect/ViewScopeInitEffect.tsx
+++ b/front/src/modules/views/scopes/init-effect/ViewScopeInitEffect.tsx
@@ -1,7 +1,7 @@
 import { useEffect } from 'react';
 
-import { Filter } from '@/ui/data/filter/types/Filter';
-import { Sort } from '@/ui/data/sort/types/Sort';
+import { Filter } from '@/ui/object/filter/types/Filter';
+import { Sort } from '@/ui/object/sort/types/Sort';
 import { useView } from '@/views/hooks/useView';
 import { ViewField } from '@/views/types/ViewField';
 
diff --git a/front/src/modules/views/states/availableFieldDefinitionsScopedState.ts b/front/src/modules/views/states/availableFieldDefinitionsScopedState.ts
index dee79887f..d11fb24e3 100644
--- a/front/src/modules/views/states/availableFieldDefinitionsScopedState.ts
+++ b/front/src/modules/views/states/availableFieldDefinitionsScopedState.ts
@@ -1,5 +1,5 @@
-import { ColumnDefinition } from '@/ui/data/data-table/types/ColumnDefinition';
-import { FieldMetadata } from '@/ui/data/field/types/FieldMetadata';
+import { FieldMetadata } from '@/ui/object/field/types/FieldMetadata';
+import { ColumnDefinition } from '@/ui/object/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 d1949810c..2ca946ba4 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/data/filter/types/FilterDefinition';
+import { FilterDefinition } from '@/ui/object/filter/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 f38d857fa..69556860e 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/data/sort/types/SortDefinition';
+import { SortDefinition } from '@/ui/object/sort/types/SortDefinition';
 import { createScopedState } from '@/ui/utilities/recoil-scope/utils/createScopedState';
 
 export const availableSortDefinitionsScopedState = createScopedState<
diff --git a/front/src/modules/views/states/onViewFiltersChangeScopedState.ts b/front/src/modules/views/states/onViewFiltersChangeScopedState.ts
index 907281cd0..bd42c8a43 100644
--- a/front/src/modules/views/states/onViewFiltersChangeScopedState.ts
+++ b/front/src/modules/views/states/onViewFiltersChangeScopedState.ts
@@ -1,4 +1,4 @@
-import { Filter } from '@/ui/data/filter/types/Filter';
+import { Filter } from '@/ui/object/filter/types/Filter';
 import { createScopedState } from '@/ui/utilities/recoil-scope/utils/createScopedState';
 
 export const onViewFiltersChangeScopedState = createScopedState<
diff --git a/front/src/modules/views/states/onViewSortsChangeScopedState.ts b/front/src/modules/views/states/onViewSortsChangeScopedState.ts
index 348ba0d70..cc07aa76f 100644
--- a/front/src/modules/views/states/onViewSortsChangeScopedState.ts
+++ b/front/src/modules/views/states/onViewSortsChangeScopedState.ts
@@ -1,4 +1,4 @@
-import { Sort } from '@/ui/data/sort/types/Sort';
+import { Sort } from '@/ui/object/sort/types/Sort';
 import { createScopedState } from '@/ui/utilities/recoil-scope/utils/createScopedState';
 
 export const onViewSortsChangeScopedState = createScopedState<
diff --git a/front/src/modules/views/types/ViewField.ts b/front/src/modules/views/types/ViewField.ts
index 3b4872a21..c7d3c1aa6 100644
--- a/front/src/modules/views/types/ViewField.ts
+++ b/front/src/modules/views/types/ViewField.ts
@@ -1,5 +1,5 @@
-import { ColumnDefinition } from '@/ui/data/data-table/types/ColumnDefinition';
-import { FieldMetadata } from '@/ui/data/field/types/FieldMetadata';
+import { FieldMetadata } from '@/ui/object/field/types/FieldMetadata';
+import { ColumnDefinition } from '@/ui/object/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 e3aec8bbf..d52de2773 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/data/filter/types/FilterDefinition';
+import { FilterDefinition } from '@/ui/object/filter/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 a9f4dc521..597612198 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/data/sort/types/SortDefinition';
-import { SortDirection } from '@/ui/data/sort/types/SortDirection';
+import { SortDefinition } from '@/ui/object/sort/types/SortDefinition';
+import { SortDirection } from '@/ui/object/sort/types/SortDirection';
 
 export type ViewSort = {
   id?: string;
diff --git a/front/src/modules/views/utils/columnDefinitionToViewField.ts b/front/src/modules/views/utils/columnDefinitionToViewField.ts
index 9eaeac809..cc807716c 100644
--- a/front/src/modules/views/utils/columnDefinitionToViewField.ts
+++ b/front/src/modules/views/utils/columnDefinitionToViewField.ts
@@ -1,5 +1,5 @@
-import { ColumnDefinition } from '@/ui/data/data-table/types/ColumnDefinition';
-import { FieldMetadata } from '@/ui/data/field/types/FieldMetadata';
+import { FieldMetadata } from '@/ui/object/field/types/FieldMetadata';
+import { ColumnDefinition } from '@/ui/object/record-table/types/ColumnDefinition';
 
 import { ViewField } from '../types/ViewField';
 
diff --git a/front/src/modules/views/utils/viewFieldsToBoardFieldDefinitions.ts b/front/src/modules/views/utils/viewFieldsToBoardFieldDefinitions.ts
index 8fea30cb6..39132efe6 100644
--- a/front/src/modules/views/utils/viewFieldsToBoardFieldDefinitions.ts
+++ b/front/src/modules/views/utils/viewFieldsToBoardFieldDefinitions.ts
@@ -1,5 +1,5 @@
-import { FieldMetadata } from '@/ui/data/field/types/FieldMetadata';
 import { BoardFieldDefinition } from '@/ui/layout/board/types/BoardFieldDefinition';
+import { FieldMetadata } from '@/ui/object/field/types/FieldMetadata';
 import { assertNotNull } from '~/utils/assert';
 
 import { ViewField } from '../types/ViewField';
diff --git a/front/src/modules/views/utils/viewFieldsToColumnDefinitions.ts b/front/src/modules/views/utils/viewFieldsToColumnDefinitions.ts
index a6cd02b58..90c1cb6d3 100644
--- a/front/src/modules/views/utils/viewFieldsToColumnDefinitions.ts
+++ b/front/src/modules/views/utils/viewFieldsToColumnDefinitions.ts
@@ -1,5 +1,5 @@
-import { ColumnDefinition } from '@/ui/data/data-table/types/ColumnDefinition';
-import { FieldMetadata } from '@/ui/data/field/types/FieldMetadata';
+import { FieldMetadata } from '@/ui/object/field/types/FieldMetadata';
+import { ColumnDefinition } from '@/ui/object/record-table/types/ColumnDefinition';
 import { assertNotNull } from '~/utils/assert';
 
 import { ViewField } from '../types/ViewField';
diff --git a/front/src/modules/views/utils/viewFiltersToFilters.ts b/front/src/modules/views/utils/viewFiltersToFilters.ts
index b1ec69d02..8742aa377 100644
--- a/front/src/modules/views/utils/viewFiltersToFilters.ts
+++ b/front/src/modules/views/utils/viewFiltersToFilters.ts
@@ -1,4 +1,4 @@
-import { Filter } from '@/ui/data/filter/types/Filter';
+import { Filter } from '@/ui/object/filter/types/Filter';
 
 import { ViewFilter } from '../types/ViewFilter';
 
diff --git a/front/src/modules/views/utils/viewSortsToSorts.ts b/front/src/modules/views/utils/viewSortsToSorts.ts
index 47a587115..6d1123167 100644
--- a/front/src/modules/views/utils/viewSortsToSorts.ts
+++ b/front/src/modules/views/utils/viewSortsToSorts.ts
@@ -1,4 +1,4 @@
-import { Sort } from '@/ui/data/sort/types/Sort';
+import { Sort } from '@/ui/object/sort/types/Sort';
 
 import { ViewSort } from '../types/ViewSort';
 
diff --git a/front/src/pages/companies/Companies.tsx b/front/src/pages/companies/Companies.tsx
index 05c8d856f..0f9b30046 100644
--- a/front/src/pages/companies/Companies.tsx
+++ b/front/src/pages/companies/Companies.tsx
@@ -6,17 +6,17 @@ import { useOptimisticEffect } from '@/apollo/optimistic-effect/hooks/useOptimis
 import { CompanyTable } from '@/companies/table/components/CompanyTable';
 import { SEARCH_COMPANY_QUERY } from '@/search/graphql/queries/searchCompanyQuery';
 import { SpreadsheetImportProvider } from '@/spreadsheet-import/provider/components/SpreadsheetImportProvider';
-import { DataTableActionBar } from '@/ui/data/data-table/action-bar/components/DataTableActionBar';
-import { DataTableContextMenu } from '@/ui/data/data-table/context-menu/components/DataTableContextMenu';
-import { useUpsertDataTableItem } from '@/ui/data/data-table/hooks/useUpsertDataTableItem';
-import { useUpsertTableRowId } from '@/ui/data/data-table/hooks/useUpsertTableRowId';
-import { TableRecoilScopeContext } from '@/ui/data/data-table/states/recoil-scope-contexts/TableRecoilScopeContext';
 import { IconBuildingSkyscraper } from '@/ui/display/icon';
 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 { useUpsertRecordTableItem } from '@/ui/object/record-table/hooks/useUpsertRecordTableItem';
+import { useUpsertTableRowId } from '@/ui/object/record-table/hooks/useUpsertTableRowId';
+import { TableRecoilScopeContext } from '@/ui/object/record-table/states/recoil-scope-contexts/TableRecoilScopeContext';
 import { RecoilScope } from '@/ui/utilities/recoil-scope/components/RecoilScope';
 import { useInsertOneCompanyMutation } from '~/generated/graphql';
 
@@ -27,7 +27,7 @@ const StyledTableContainer = styled.div`
 
 export const Companies = () => {
   const [insertCompany] = useInsertOneCompanyMutation();
-  const upsertDataTableItem = useUpsertDataTableItem();
+  const upsertRecordTableItem = useUpsertRecordTableItem();
   const upsertTableRowIds = useUpsertTableRowId();
   const { triggerOptimisticEffects } = useOptimisticEffect();
 
@@ -45,7 +45,7 @@ export const Companies = () => {
       update: (_cache, { data }) => {
         if (data?.createOneCompany) {
           upsertTableRowIds(data?.createOneCompany.id);
-          upsertDataTableItem(data?.createOneCompany);
+          upsertRecordTableItem(data?.createOneCompany);
           triggerOptimisticEffects('Company', [data?.createOneCompany]);
         }
       },
@@ -68,8 +68,8 @@ export const Companies = () => {
             <StyledTableContainer>
               <CompanyTable />
             </StyledTableContainer>
-            <DataTableActionBar />
-            <DataTableContextMenu />
+            <RecordTableActionBar />
+            <RecordTableContextMenu />
           </RecoilScope>
         </PageBody>
       </PageContainer>
diff --git a/front/src/pages/companies/CompaniesMockMode.tsx b/front/src/pages/companies/CompaniesMockMode.tsx
index 5e25a29a7..54e6e8108 100644
--- a/front/src/pages/companies/CompaniesMockMode.tsx
+++ b/front/src/pages/companies/CompaniesMockMode.tsx
@@ -1,11 +1,11 @@
 import styled from '@emotion/styled';
 
 import { CompanyTableMockMode } from '@/companies/table/components/CompanyTableMockMode';
-import { TableRecoilScopeContext } from '@/ui/data/data-table/states/recoil-scope-contexts/TableRecoilScopeContext';
 import { IconBuildingSkyscraper } from '@/ui/display/icon';
 import { PageBody } from '@/ui/layout/page/PageBody';
 import { PageContainer } from '@/ui/layout/page/PageContainer';
 import { PageHeader } from '@/ui/layout/page/PageHeader';
+import { TableRecoilScopeContext } from '@/ui/object/record-table/states/recoil-scope-contexts/TableRecoilScopeContext';
 import { RecoilScope } from '@/ui/utilities/recoil-scope/components/RecoilScope';
 
 const StyledTableContainer = styled.div`
diff --git a/front/src/pages/companies/CompanyShow.tsx b/front/src/pages/companies/CompanyShow.tsx
index 92cce9463..5f1d12b92 100644
--- a/front/src/pages/companies/CompanyShow.tsx
+++ b/front/src/pages/companies/CompanyShow.tsx
@@ -6,10 +6,6 @@ import { CompanyTeam } from '@/companies/components/CompanyTeam';
 import { useCompanyQuery } from '@/companies/hooks/useCompanyQuery';
 import { useFavorites } from '@/favorites/hooks/useFavorites';
 import { AppPath } from '@/types/AppPath';
-import { FieldContext } from '@/ui/data/field/contexts/FieldContext';
-import { InlineCell } from '@/ui/data/inline-cell/components/InlineCell';
-import { PropertyBox } from '@/ui/data/inline-cell/property-box/components/PropertyBox';
-import { InlineCellHotkeyScope } from '@/ui/data/inline-cell/types/InlineCellHotkeyScope';
 import { IconBuildingSkyscraper } from '@/ui/display/icon';
 import { PageBody } from '@/ui/layout/page/PageBody';
 import { PageContainer } from '@/ui/layout/page/PageContainer';
@@ -20,6 +16,10 @@ 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 { InlineCell } from '@/ui/object/record-inline-cell/components/InlineCell';
+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 { useUpdateOneCompanyMutation } from '~/generated/graphql';
diff --git a/front/src/pages/companies/constants/companyShowFieldDefinitions.tsx b/front/src/pages/companies/constants/companyShowFieldDefinitions.tsx
index be330848d..13e4e4298 100644
--- a/front/src/pages/companies/constants/companyShowFieldDefinitions.tsx
+++ b/front/src/pages/companies/constants/companyShowFieldDefinitions.tsx
@@ -1,13 +1,3 @@
-import { FieldDefinition } from '@/ui/data/field/types/FieldDefinition';
-import {
-  FieldBooleanMetadata,
-  FieldDateMetadata,
-  FieldMetadata,
-  FieldNumberMetadata,
-  FieldRelationMetadata,
-  FieldTextMetadata,
-  FieldURLMetadata,
-} from '@/ui/data/field/types/FieldMetadata';
 import {
   IconBrandX,
   IconCalendar,
@@ -18,6 +8,16 @@ import {
   IconUsers,
 } from '@/ui/display/icon';
 import { Entity } from '@/ui/input/relation-picker/types/EntityTypeForSelect';
+import { FieldDefinition } from '@/ui/object/field/types/FieldDefinition';
+import {
+  FieldBooleanMetadata,
+  FieldDateMetadata,
+  FieldMetadata,
+  FieldNumberMetadata,
+  FieldRelationMetadata,
+  FieldTextMetadata,
+  FieldURLMetadata,
+} from '@/ui/object/field/types/FieldMetadata';
 import { User } from '~/generated/graphql';
 
 export const companyShowFieldDefinitions: FieldDefinition<FieldMetadata>[] = [
diff --git a/front/src/pages/companies/constants/companyTableFilterDefinitions.tsx b/front/src/pages/companies/constants/companyTableFilterDefinitions.tsx
index 586832af9..3ebc106d1 100644
--- a/front/src/pages/companies/constants/companyTableFilterDefinitions.tsx
+++ b/front/src/pages/companies/constants/companyTableFilterDefinitions.tsx
@@ -1,4 +1,3 @@
-import { FilterDefinitionByEntity } from '@/ui/data/filter/types/FilterDefinitionByEntity';
 import {
   IconBuildingSkyscraper,
   IconCalendarEvent,
@@ -7,6 +6,7 @@ import {
   IconUser,
   IconUsers,
 } from '@/ui/display/icon/index';
+import { FilterDefinitionByEntity } from '@/ui/object/filter/types/FilterDefinitionByEntity';
 import { FilterDropdownUserSearchSelect } from '@/users/components/FilterDropdownUserSearchSelect';
 import { Company } from '~/generated/graphql';
 
diff --git a/front/src/pages/companies/constants/companyTableSortDefinitions.tsx b/front/src/pages/companies/constants/companyTableSortDefinitions.tsx
index 57f55d72d..c4447e026 100644
--- a/front/src/pages/companies/constants/companyTableSortDefinitions.tsx
+++ b/front/src/pages/companies/constants/companyTableSortDefinitions.tsx
@@ -1,4 +1,3 @@
-import { SortDefinition } from '@/ui/data/sort/types/SortDefinition';
 import {
   IconBuildingSkyscraper,
   IconCalendarEvent,
@@ -6,6 +5,7 @@ import {
   IconMap,
   IconUsers,
 } from '@/ui/display/icon/index';
+import { SortDefinition } from '@/ui/object/sort/types/SortDefinition';
 
 export const companyTableSortDefinitions: SortDefinition[] = [
   {
diff --git a/front/src/pages/opportunities/constants/opportunityBoardFilterDefinitions.tsx b/front/src/pages/opportunities/constants/opportunityBoardFilterDefinitions.tsx
index 189016c56..8f631427e 100644
--- a/front/src/pages/opportunities/constants/opportunityBoardFilterDefinitions.tsx
+++ b/front/src/pages/opportunities/constants/opportunityBoardFilterDefinitions.tsx
@@ -1,11 +1,11 @@
 import { FilterDropdownCompanySearchSelect } from '@/companies/components/FilterDropdownCompanySearchSelect';
-import { FilterDefinitionByEntity } from '@/ui/data/filter/types/FilterDefinitionByEntity';
 import {
   IconBuildingSkyscraper,
   IconCalendarEvent,
   IconCurrencyDollar,
   IconUser,
 } from '@/ui/display/icon/index';
+import { FilterDefinitionByEntity } from '@/ui/object/filter/types/FilterDefinitionByEntity';
 import { PipelineProgress } from '~/generated/graphql';
 
 import { FilterDropdownPeopleSearchSelect } from '../../../modules/people/components/FilterDropdownPeopleSearchSelect';
diff --git a/front/src/pages/opportunities/constants/opportunityBoardSortDefinitions.tsx b/front/src/pages/opportunities/constants/opportunityBoardSortDefinitions.tsx
index de707455e..9c5d86219 100644
--- a/front/src/pages/opportunities/constants/opportunityBoardSortDefinitions.tsx
+++ b/front/src/pages/opportunities/constants/opportunityBoardSortDefinitions.tsx
@@ -1,5 +1,5 @@
-import { SortDefinition } from '@/ui/data/sort/types/SortDefinition';
 import { IconCalendarEvent, IconCurrencyDollar } from '@/ui/display/icon/index';
+import { SortDefinition } from '@/ui/object/sort/types/SortDefinition';
 
 export const opportunityBoardSortDefinitions: SortDefinition[] = [
   {
diff --git a/front/src/pages/people/People.tsx b/front/src/pages/people/People.tsx
index 53c511deb..cf3db26dd 100644
--- a/front/src/pages/people/People.tsx
+++ b/front/src/pages/people/People.tsx
@@ -4,17 +4,17 @@ import { v4 } from 'uuid';
 import { useOptimisticEffect } from '@/apollo/optimistic-effect/hooks/useOptimisticEffect';
 import { PersonTable } from '@/people/table/components/PersonTable';
 import { SpreadsheetImportProvider } from '@/spreadsheet-import/provider/components/SpreadsheetImportProvider';
-import { DataTableActionBar } from '@/ui/data/data-table/action-bar/components/DataTableActionBar';
-import { DataTableContextMenu } from '@/ui/data/data-table/context-menu/components/DataTableContextMenu';
-import { useUpsertDataTableItem } from '@/ui/data/data-table/hooks/useUpsertDataTableItem';
-import { useUpsertTableRowId } from '@/ui/data/data-table/hooks/useUpsertTableRowId';
-import { TableRecoilScopeContext } from '@/ui/data/data-table/states/recoil-scope-contexts/TableRecoilScopeContext';
 import { IconUser } from '@/ui/display/icon';
 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 { useUpsertRecordTableItem } from '@/ui/object/record-table/hooks/useUpsertRecordTableItem';
+import { useUpsertTableRowId } from '@/ui/object/record-table/hooks/useUpsertTableRowId';
+import { TableRecoilScopeContext } from '@/ui/object/record-table/states/recoil-scope-contexts/TableRecoilScopeContext';
 import { RecoilScope } from '@/ui/utilities/recoil-scope/components/RecoilScope';
 import { useInsertOnePersonMutation } from '~/generated/graphql';
 
@@ -25,7 +25,7 @@ const StyledTableContainer = styled.div`
 
 export const People = () => {
   const [insertOnePerson] = useInsertOnePersonMutation();
-  const upsertDataTableItem = useUpsertDataTableItem();
+  const upsertRecordTableItem = useUpsertRecordTableItem();
   const upsertTableRowIds = useUpsertTableRowId();
   const { triggerOptimisticEffects } = useOptimisticEffect();
 
@@ -42,7 +42,7 @@ export const People = () => {
       update: (_cache, { data }) => {
         if (data?.createOnePerson) {
           upsertTableRowIds(data?.createOnePerson.id);
-          upsertDataTableItem(data?.createOnePerson);
+          upsertRecordTableItem(data?.createOnePerson);
           triggerOptimisticEffects('Person', [data?.createOnePerson]);
         }
       },
@@ -64,8 +64,8 @@ export const People = () => {
             <StyledTableContainer>
               <PersonTable />
             </StyledTableContainer>
-            <DataTableActionBar />
-            <DataTableContextMenu />
+            <RecordTableActionBar />
+            <RecordTableContextMenu />
           </RecoilScope>
         </PageBody>
       </PageContainer>
diff --git a/front/src/pages/people/PersonShow.tsx b/front/src/pages/people/PersonShow.tsx
index 8c6ad3ab7..140c9806c 100644
--- a/front/src/pages/people/PersonShow.tsx
+++ b/front/src/pages/people/PersonShow.tsx
@@ -7,10 +7,6 @@ import { useFavorites } from '@/favorites/hooks/useFavorites';
 import { GET_PERSON } from '@/people/graphql/queries/getPerson';
 import { usePersonQuery } from '@/people/hooks/usePersonQuery';
 import { AppPath } from '@/types/AppPath';
-import { FieldContext } from '@/ui/data/field/contexts/FieldContext';
-import { InlineCell } from '@/ui/data/inline-cell/components/InlineCell';
-import { PropertyBox } from '@/ui/data/inline-cell/property-box/components/PropertyBox';
-import { InlineCellHotkeyScope } from '@/ui/data/inline-cell/types/InlineCellHotkeyScope';
 import { IconUser } from '@/ui/display/icon';
 import { PageBody } from '@/ui/layout/page/PageBody';
 import { PageContainer } from '@/ui/layout/page/PageContainer';
@@ -21,6 +17,10 @@ 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 { InlineCell } from '@/ui/object/record-inline-cell/components/InlineCell';
+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 {
diff --git a/front/src/pages/people/constants/personShowFieldDefinitions.tsx b/front/src/pages/people/constants/personShowFieldDefinitions.tsx
index b205f9892..098e155d0 100644
--- a/front/src/pages/people/constants/personShowFieldDefinitions.tsx
+++ b/front/src/pages/people/constants/personShowFieldDefinitions.tsx
@@ -1,12 +1,3 @@
-import { FieldDefinition } from '@/ui/data/field/types/FieldDefinition';
-import {
-  FieldDateMetadata,
-  FieldMetadata,
-  FieldPhoneMetadata,
-  FieldRelationMetadata,
-  FieldTextMetadata,
-  FieldURLMetadata,
-} from '@/ui/data/field/types/FieldMetadata';
 import {
   IconBrandLinkedin,
   IconBrandX,
@@ -18,6 +9,15 @@ import {
   IconPhone,
 } from '@/ui/display/icon';
 import { Entity } from '@/ui/input/relation-picker/types/EntityTypeForSelect';
+import { FieldDefinition } from '@/ui/object/field/types/FieldDefinition';
+import {
+  FieldDateMetadata,
+  FieldMetadata,
+  FieldPhoneMetadata,
+  FieldRelationMetadata,
+  FieldTextMetadata,
+  FieldURLMetadata,
+} from '@/ui/object/field/types/FieldMetadata';
 import { Company } from '~/generated/graphql';
 import { getLogoUrlFromDomainName } from '~/utils';
 
diff --git a/front/src/pages/people/constants/personTableFilterDefinitions.tsx b/front/src/pages/people/constants/personTableFilterDefinitions.tsx
index 804738068..f6daeec92 100644
--- a/front/src/pages/people/constants/personTableFilterDefinitions.tsx
+++ b/front/src/pages/people/constants/personTableFilterDefinitions.tsx
@@ -1,5 +1,4 @@
 import { FilterDropdownCompanySearchSelect } from '@/companies/components/FilterDropdownCompanySearchSelect';
-import { FilterDefinitionByEntity } from '@/ui/data/filter/types/FilterDefinitionByEntity';
 import {
   IconBuildingSkyscraper,
   IconCalendarEvent,
@@ -8,6 +7,7 @@ import {
   IconPhone,
   IconUser,
 } from '@/ui/display/icon/index';
+import { FilterDefinitionByEntity } from '@/ui/object/filter/types/FilterDefinitionByEntity';
 import { Person } from '~/generated/graphql';
 
 export const personTableFilterDefinitions: FilterDefinitionByEntity<Person>[] =
diff --git a/front/src/pages/people/constants/personTableSortDefinitions.tsx b/front/src/pages/people/constants/personTableSortDefinitions.tsx
index 3d86ee4b4..870370438 100644
--- a/front/src/pages/people/constants/personTableSortDefinitions.tsx
+++ b/front/src/pages/people/constants/personTableSortDefinitions.tsx
@@ -1,5 +1,3 @@
-import { SortDefinition } from '@/ui/data/sort/types/SortDefinition';
-import { SortDirection } from '@/ui/data/sort/types/SortDirection';
 import {
   IconBuildingSkyscraper,
   IconCalendarEvent,
@@ -8,6 +6,8 @@ import {
   IconPhone,
   IconUser,
 } from '@/ui/display/icon/index';
+import { SortDefinition } from '@/ui/object/sort/types/SortDefinition';
+import { SortDirection } from '@/ui/object/sort/types/SortDirection';
 
 export const personTableSortDefinitions: SortDefinition[] = [
   {
diff --git a/front/src/pages/tasks/Tasks.tsx b/front/src/pages/tasks/Tasks.tsx
index ab13a165b..c9ac1c97a 100644
--- a/front/src/pages/tasks/Tasks.tsx
+++ b/front/src/pages/tasks/Tasks.tsx
@@ -3,8 +3,6 @@ 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 { FilterDropdownButton } from '@/ui/data/filter/components/FilterDropdownButton';
-import { FilterScope } from '@/ui/data/filter/scopes/FilterScope';
 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';
@@ -12,6 +10,8 @@ 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 { FilterDropdownButton } from '@/ui/object/filter/components/FilterDropdownButton';
+import { FilterScope } from '@/ui/object/filter/scopes/FilterScope';
 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 039edba23..035c197ef 100644
--- a/front/src/pages/tasks/TasksEffect.tsx
+++ b/front/src/pages/tasks/TasksEffect.tsx
@@ -2,7 +2,7 @@ import { useEffect } from 'react';
 import { useRecoilState } from 'recoil';
 
 import { currentUserState } from '@/auth/states/currentUserState';
-import { useFilter } from '@/ui/data/filter/hooks/useFilter';
+import { useFilter } from '@/ui/object/filter/hooks/useFilter';
 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 974019407..bd448ed5e 100644
--- a/front/src/pages/tasks/tasks-filter-definitions.tsx
+++ b/front/src/pages/tasks/tasks-filter-definitions.tsx
@@ -1,5 +1,5 @@
-import { FilterDefinitionByEntity } from '@/ui/data/filter/types/FilterDefinitionByEntity';
 import { IconUser, IconUserCircle } from '@/ui/display/icon';
+import { FilterDefinitionByEntity } from '@/ui/object/filter/types/FilterDefinitionByEntity';
 import { FilterDropdownUserSearchSelect } from '@/users/components/FilterDropdownUserSearchSelect';
 import { Activity } from '~/generated/graphql';