diff --git a/.vscode/settings.json b/.vscode/settings.json
index 812d5af56e..5e9db5cb5e 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -31,6 +31,7 @@
     "editor.formatOnSave": true
   },
   "javascript.format.enable": false,
+  "javascript.preferences.importModuleSpecifier": "non-relative",
   "typescript.format.enable": false,
   "cSpell.enableFiletypes": [
     "!javascript",
diff --git a/eslint.config.mjs b/eslint.config.mjs
index 83fb705010..8d24d478bc 100644
--- a/eslint.config.mjs
+++ b/eslint.config.mjs
@@ -137,10 +137,10 @@ export default [
       '@typescript-eslint/explicit-function-return-type': 'off',
       '@typescript-eslint/explicit-module-boundary-types': 'off',
       '@typescript-eslint/interface-name-prefix': 'off',
-      '@typescript-eslint/no-empty-interface': [
+      '@typescript-eslint/no-empty-object-type': [
         'error',
         {
-          allowSingleExtends: true,
+          allowInterfaces: 'with-single-extends',
         },
       ],
       '@typescript-eslint/no-explicit-any': 'off',
diff --git a/eslint.config.react.mjs b/eslint.config.react.mjs
index b252b92b5c..d6a2b47a8a 100644
--- a/eslint.config.react.mjs
+++ b/eslint.config.react.mjs
@@ -521,6 +521,10 @@ export default [
         'error',
         {
           patterns: [
+            {
+              group: ['../*'],
+              message: 'Relative parent imports are not allowed. Use @/ alias instead.',
+            },
             {
               group: ['@tabler/icons-react'],
               message: 'Please import icons from `twenty-ui`',
@@ -552,10 +556,10 @@ export default [
       '@typescript-eslint/explicit-function-return-type': 'off',
       '@typescript-eslint/explicit-module-boundary-types': 'off',
       '@typescript-eslint/interface-name-prefix': 'off',
-      '@typescript-eslint/no-empty-interface': [
+      '@typescript-eslint/no-empty-object-type': [
         'error',
         {
-          allowSingleExtends: true,
+          allowInterfaces: 'with-single-extends',
         },
       ],
       '@typescript-eslint/no-empty-function': 'off',
@@ -689,6 +693,7 @@ export default [
     },
   },
 
+
   // JavaScript specific configuration
   {
     files: ['*.{js,jsx}'],
diff --git a/packages/twenty-emails/src/utils/email-renderer/renderers/render-mark.tsx b/packages/twenty-emails/src/utils/email-renderer/renderers/render-mark.tsx
index c5ea0cdef4..28c212a751 100644
--- a/packages/twenty-emails/src/utils/email-renderer/renderers/render-mark.tsx
+++ b/packages/twenty-emails/src/utils/email-renderer/renderers/render-mark.tsx
@@ -6,11 +6,11 @@ import {
   TIPTAP_MARKS_RENDER_ORDER,
   TIPTAP_MARK_TYPES,
 } from 'twenty-shared/utils';
-import { bold } from '../marks/bold';
-import { italic } from '../marks/italic';
-import { link } from '../marks/link';
-import { strike } from '../marks/strike';
-import { underline } from '../marks/underline';
+import { bold } from '@/utils/email-renderer/marks/bold';
+import { italic } from '@/utils/email-renderer/marks/italic';
+import { link } from '@/utils/email-renderer/marks/link';
+import { strike } from '@/utils/email-renderer/marks/strike';
+import { underline } from '@/utils/email-renderer/marks/underline';
 
 const MARK_RENDERERS = {
   [TIPTAP_MARK_TYPES.BOLD]: bold,
diff --git a/packages/twenty-emails/src/utils/email-renderer/renderers/render-node.tsx b/packages/twenty-emails/src/utils/email-renderer/renderers/render-node.tsx
index 9d9dcded95..7744ac5f73 100644
--- a/packages/twenty-emails/src/utils/email-renderer/renderers/render-node.tsx
+++ b/packages/twenty-emails/src/utils/email-renderer/renderers/render-node.tsx
@@ -1,15 +1,15 @@
 import { type JSONContent } from '@tiptap/core';
 import { Fragment, type ReactNode } from 'react';
 import { TIPTAP_NODE_TYPES, type TipTapNodeType } from 'twenty-shared/utils';
-import { bulletList } from '../nodes/bullet-list';
-import { hardBreak } from '../nodes/hard-break';
-import { heading } from '../nodes/heading';
-import { image } from '../nodes/image';
-import { listItem } from '../nodes/list-item';
-import { orderedList } from '../nodes/ordered-list';
-import { paragraph } from '../nodes/paragraph';
-import { text } from '../nodes/text';
-import { variableTag } from '../nodes/variable-tag';
+import { bulletList } from '@/utils/email-renderer/nodes/bullet-list';
+import { hardBreak } from '@/utils/email-renderer/nodes/hard-break';
+import { heading } from '@/utils/email-renderer/nodes/heading';
+import { image } from '@/utils/email-renderer/nodes/image';
+import { listItem } from '@/utils/email-renderer/nodes/list-item';
+import { orderedList } from '@/utils/email-renderer/nodes/ordered-list';
+import { paragraph } from '@/utils/email-renderer/nodes/paragraph';
+import { text } from '@/utils/email-renderer/nodes/text';
+import { variableTag } from '@/utils/email-renderer/nodes/variable-tag';
 
 const NODE_RENDERERS = {
   [TIPTAP_NODE_TYPES.PARAGRAPH]: paragraph,
diff --git a/packages/twenty-emails/src/utils/i18n.utils.ts b/packages/twenty-emails/src/utils/i18n.utils.ts
index c07cfd2b4c..975652bd53 100644
--- a/packages/twenty-emails/src/utils/i18n.utils.ts
+++ b/packages/twenty-emails/src/utils/i18n.utils.ts
@@ -1,37 +1,37 @@
 import { setupI18n, type I18n, type Messages } from '@lingui/core';
 import { type APP_LOCALES } from 'twenty-shared/translations';
 import { isDefined } from 'twenty-shared/utils';
-import { messages as afMessages } from '../locales/generated/af-ZA';
-import { messages as arMessages } from '../locales/generated/ar-SA';
-import { messages as caMessages } from '../locales/generated/ca-ES';
-import { messages as csMessages } from '../locales/generated/cs-CZ';
-import { messages as daMessages } from '../locales/generated/da-DK';
-import { messages as deMessages } from '../locales/generated/de-DE';
-import { messages as elMessages } from '../locales/generated/el-GR';
-import { messages as enMessages } from '../locales/generated/en';
-import { messages as esMessages } from '../locales/generated/es-ES';
-import { messages as fiMessages } from '../locales/generated/fi-FI';
-import { messages as frMessages } from '../locales/generated/fr-FR';
-import { messages as heMessages } from '../locales/generated/he-IL';
-import { messages as huMessages } from '../locales/generated/hu-HU';
-import { messages as itMessages } from '../locales/generated/it-IT';
-import { messages as jaMessages } from '../locales/generated/ja-JP';
-import { messages as koMessages } from '../locales/generated/ko-KR';
-import { messages as nlMessages } from '../locales/generated/nl-NL';
-import { messages as noMessages } from '../locales/generated/no-NO';
-import { messages as plMessages } from '../locales/generated/pl-PL';
-import { messages as pseudoEnMessages } from '../locales/generated/pseudo-en';
-import { messages as ptBRMessages } from '../locales/generated/pt-BR';
-import { messages as ptPTMessages } from '../locales/generated/pt-PT';
-import { messages as roMessages } from '../locales/generated/ro-RO';
-import { messages as ruMessages } from '../locales/generated/ru-RU';
-import { messages as srMessages } from '../locales/generated/sr-Cyrl';
-import { messages as svMessages } from '../locales/generated/sv-SE';
-import { messages as trMessages } from '../locales/generated/tr-TR';
-import { messages as ukMessages } from '../locales/generated/uk-UA';
-import { messages as viMessages } from '../locales/generated/vi-VN';
-import { messages as zhHansMessages } from '../locales/generated/zh-CN';
-import { messages as zhHantMessages } from '../locales/generated/zh-TW';
+import { messages as afMessages } from '@/locales/generated/af-ZA';
+import { messages as arMessages } from '@/locales/generated/ar-SA';
+import { messages as caMessages } from '@/locales/generated/ca-ES';
+import { messages as csMessages } from '@/locales/generated/cs-CZ';
+import { messages as daMessages } from '@/locales/generated/da-DK';
+import { messages as deMessages } from '@/locales/generated/de-DE';
+import { messages as elMessages } from '@/locales/generated/el-GR';
+import { messages as enMessages } from '@/locales/generated/en';
+import { messages as esMessages } from '@/locales/generated/es-ES';
+import { messages as fiMessages } from '@/locales/generated/fi-FI';
+import { messages as frMessages } from '@/locales/generated/fr-FR';
+import { messages as heMessages } from '@/locales/generated/he-IL';
+import { messages as huMessages } from '@/locales/generated/hu-HU';
+import { messages as itMessages } from '@/locales/generated/it-IT';
+import { messages as jaMessages } from '@/locales/generated/ja-JP';
+import { messages as koMessages } from '@/locales/generated/ko-KR';
+import { messages as nlMessages } from '@/locales/generated/nl-NL';
+import { messages as noMessages } from '@/locales/generated/no-NO';
+import { messages as plMessages } from '@/locales/generated/pl-PL';
+import { messages as pseudoEnMessages } from '@/locales/generated/pseudo-en';
+import { messages as ptBRMessages } from '@/locales/generated/pt-BR';
+import { messages as ptPTMessages } from '@/locales/generated/pt-PT';
+import { messages as roMessages } from '@/locales/generated/ro-RO';
+import { messages as ruMessages } from '@/locales/generated/ru-RU';
+import { messages as srMessages } from '@/locales/generated/sr-Cyrl';
+import { messages as svMessages } from '@/locales/generated/sv-SE';
+import { messages as trMessages } from '@/locales/generated/tr-TR';
+import { messages as ukMessages } from '@/locales/generated/uk-UA';
+import { messages as viMessages } from '@/locales/generated/vi-VN';
+import { messages as zhHansMessages } from '@/locales/generated/zh-CN';
+import { messages as zhHantMessages } from '@/locales/generated/zh-TW';
 
 const messages: Record<keyof typeof APP_LOCALES, Messages> = {
   en: enMessages,
diff --git a/packages/twenty-emails/tsconfig.json b/packages/twenty-emails/tsconfig.json
index c798c9251a..90833a0260 100644
--- a/packages/twenty-emails/tsconfig.json
+++ b/packages/twenty-emails/tsconfig.json
@@ -8,6 +8,9 @@
     "strict": true,
     "types": ["vite/client"],
     "baseUrl": ".",
+    "paths": {
+      "@/*": ["./src/*"]
+    }
   },
   "files": [],
   "include": ["vite.config.ts"],
diff --git a/packages/twenty-front/.storybook/preview.tsx b/packages/twenty-front/.storybook/preview.tsx
index 6734aef0a9..af2e3991f5 100644
--- a/packages/twenty-front/.storybook/preview.tsx
+++ b/packages/twenty-front/.storybook/preview.tsx
@@ -4,13 +4,15 @@ import { initialize, mswLoader } from 'msw-storybook-addon';
 import { useEffect } from 'react';
 //import { useDarkMode } from 'storybook-dark-mode';
 
+// eslint-disable-next-line no-restricted-imports
 import { RootDecorator } from '../src/testing/decorators/RootDecorator';
+// eslint-disable-next-line no-restricted-imports
 import { mockedUserJWT } from '../src/testing/mock-data/jwt';
-
-import { ClickOutsideListenerContext } from '@/ui/utilities/pointer-event/contexts/ClickOutsideListenerContext';
 import 'react-loading-skeleton/dist/skeleton.css';
 import 'twenty-ui/style.css';
 import { THEME_LIGHT, ThemeContextProvider } from 'twenty-ui/theme';
+// eslint-disable-next-line no-restricted-imports
+import { ClickOutsideListenerContext } from '../src/modules/ui/utilities/pointer-event/contexts/ClickOutsideListenerContext';
 
 initialize({
   onUnhandledRequest: async (request: Request) => {
@@ -29,7 +31,7 @@ initialize({
       const requestBody = await request.json();
 
       // eslint-disable-next-line no-console
-      console.warn(`Unhandled ${request.method} request to ${request.url} 
+      console.warn(`Unhandled ${request.method} request to ${request.url}
         with payload ${JSON.stringify(requestBody)}\n
         This request should be mocked with MSW`);
     } catch (error) {
diff --git a/packages/twenty-front/src/modules/action-menu/actions/display/components/__stories__/ActionButton.stories.tsx b/packages/twenty-front/src/modules/action-menu/actions/display/components/__stories__/ActionButton.stories.tsx
index 5bb252600a..b5fb250d1b 100644
--- a/packages/twenty-front/src/modules/action-menu/actions/display/components/__stories__/ActionButton.stories.tsx
+++ b/packages/twenty-front/src/modules/action-menu/actions/display/components/__stories__/ActionButton.stories.tsx
@@ -5,7 +5,7 @@ import { getActionLabel } from '@/action-menu/utils/getActionLabel';
 import { expect, fn, userEvent, within } from '@storybook/test';
 import { type Meta, type StoryObj } from '@storybook/react';
 import { ComponentDecorator, RouterDecorator } from 'twenty-ui/testing';
-import { ActionButton } from '../ActionButton';
+import { ActionButton } from '@/action-menu/actions/display/components/ActionButton';
 
 const meta: Meta<typeof ActionButton> = {
   title: 'Modules/ActionMenu/Actions/Display/ActionButton',
diff --git a/packages/twenty-front/src/modules/action-menu/actions/display/components/__stories__/ActionDisplay.stories.tsx b/packages/twenty-front/src/modules/action-menu/actions/display/components/__stories__/ActionDisplay.stories.tsx
index 0de9161fd1..afc3188ea0 100644
--- a/packages/twenty-front/src/modules/action-menu/actions/display/components/__stories__/ActionDisplay.stories.tsx
+++ b/packages/twenty-front/src/modules/action-menu/actions/display/components/__stories__/ActionDisplay.stories.tsx
@@ -7,7 +7,7 @@ import { SelectableListComponentInstanceContext } from '@/ui/layout/selectable-l
 import { expect, fn, userEvent, within } from '@storybook/test';
 import { type Meta, type StoryObj } from '@storybook/react';
 import { ComponentDecorator, RouterDecorator } from 'twenty-ui/testing';
-import { ActionDisplay } from '../ActionDisplay';
+import { ActionDisplay } from '@/action-menu/actions/display/components/ActionDisplay';
 
 type Story = StoryObj<typeof ActionDisplay>;
 
diff --git a/packages/twenty-front/src/modules/action-menu/actions/display/components/__stories__/ActionDropdownItem.stories.tsx b/packages/twenty-front/src/modules/action-menu/actions/display/components/__stories__/ActionDropdownItem.stories.tsx
index 38dda658b7..2dba7d0f5b 100644
--- a/packages/twenty-front/src/modules/action-menu/actions/display/components/__stories__/ActionDropdownItem.stories.tsx
+++ b/packages/twenty-front/src/modules/action-menu/actions/display/components/__stories__/ActionDropdownItem.stories.tsx
@@ -6,7 +6,7 @@ import { SelectableListComponentInstanceContext } from '@/ui/layout/selectable-l
 import { expect, fn, userEvent, within } from '@storybook/test';
 import { type Meta, type StoryObj } from '@storybook/react';
 import { ComponentDecorator, RouterDecorator } from 'twenty-ui/testing';
-import { ActionDropdownItem } from '../ActionDropdownItem';
+import { ActionDropdownItem } from '@/action-menu/actions/display/components/ActionDropdownItem';
 
 const meta: Meta<typeof ActionDropdownItem> = {
   title: 'Modules/ActionMenu/Actions/Display/ActionDropdownItem',
diff --git a/packages/twenty-front/src/modules/action-menu/actions/display/components/__stories__/ActionListItem.stories.tsx b/packages/twenty-front/src/modules/action-menu/actions/display/components/__stories__/ActionListItem.stories.tsx
index 26c0bbdd83..6d70e33c65 100644
--- a/packages/twenty-front/src/modules/action-menu/actions/display/components/__stories__/ActionListItem.stories.tsx
+++ b/packages/twenty-front/src/modules/action-menu/actions/display/components/__stories__/ActionListItem.stories.tsx
@@ -6,7 +6,7 @@ import { SelectableListComponentInstanceContext } from '@/ui/layout/selectable-l
 import { expect, fn, userEvent, within } from '@storybook/test';
 import { type Meta, type StoryObj } from '@storybook/react';
 import { ComponentDecorator, RouterDecorator } from 'twenty-ui/testing';
-import { ActionListItem } from '../ActionListItem';
+import { ActionListItem } from '@/action-menu/actions/display/components/ActionListItem';
 
 type Story = StoryObj<typeof ActionListItem>;
 
diff --git a/packages/twenty-front/src/modules/action-menu/actions/record-actions/utils/__tests__/inheritActionsFromDefaultConfig.test.tsx b/packages/twenty-front/src/modules/action-menu/actions/record-actions/utils/__tests__/inheritActionsFromDefaultConfig.test.tsx
index 729667ca80..cf38bbb621 100644
--- a/packages/twenty-front/src/modules/action-menu/actions/record-actions/utils/__tests__/inheritActionsFromDefaultConfig.test.tsx
+++ b/packages/twenty-front/src/modules/action-menu/actions/record-actions/utils/__tests__/inheritActionsFromDefaultConfig.test.tsx
@@ -6,7 +6,7 @@ import { ActionScope } from '@/action-menu/actions/types/ActionScope';
 import { ActionType } from '@/action-menu/actions/types/ActionType';
 import { type DefaultRecordActionConfigKeys } from '@/action-menu/actions/types/DefaultRecordActionConfigKeys';
 import { IconHeart, IconPlus } from 'twenty-ui/display';
-import { inheritActionsFromDefaultConfig } from '../inheritActionsFromDefaultConfig';
+import { inheritActionsFromDefaultConfig } from '@/action-menu/actions/record-actions/utils/inheritActionsFromDefaultConfig';
 
 const MockComponent = <div>Mock Component</div>;
 
diff --git a/packages/twenty-front/src/modules/action-menu/actions/record-agnostic-actions/hooks/__tests__/useRelatedRecordActions.test.tsx b/packages/twenty-front/src/modules/action-menu/actions/record-agnostic-actions/hooks/__tests__/useRelatedRecordActions.test.tsx
index 1925e86144..4d5ce84dfd 100644
--- a/packages/twenty-front/src/modules/action-menu/actions/record-agnostic-actions/hooks/__tests__/useRelatedRecordActions.test.tsx
+++ b/packages/twenty-front/src/modules/action-menu/actions/record-agnostic-actions/hooks/__tests__/useRelatedRecordActions.test.tsx
@@ -3,7 +3,7 @@ import { type ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataI
 import { renderHook } from '@testing-library/react';
 import { type ReactNode } from 'react';
 import { RecoilRoot } from 'recoil';
-import { useRelatedRecordActions } from '../useRelatedRecordActions';
+import { useRelatedRecordActions } from '@/action-menu/actions/record-agnostic-actions/hooks/useRelatedRecordActions';
 
 jest.mock('@/object-metadata/hooks/useObjectMetadataItems', () => ({
   useObjectMetadataItems: () => ({
diff --git a/packages/twenty-front/src/modules/action-menu/utils/__tests__/getRightDrawerActionMenuDropdownIdFromActionMenuId.test.ts b/packages/twenty-front/src/modules/action-menu/utils/__tests__/getRightDrawerActionMenuDropdownIdFromActionMenuId.test.ts
index 209bdf99af..92ff58bc04 100644
--- a/packages/twenty-front/src/modules/action-menu/utils/__tests__/getRightDrawerActionMenuDropdownIdFromActionMenuId.test.ts
+++ b/packages/twenty-front/src/modules/action-menu/utils/__tests__/getRightDrawerActionMenuDropdownIdFromActionMenuId.test.ts
@@ -1,4 +1,4 @@
-import { getRightDrawerActionMenuDropdownIdFromActionMenuId } from '../getRightDrawerActionMenuDropdownIdFromActionMenuId';
+import { getRightDrawerActionMenuDropdownIdFromActionMenuId } from '@/action-menu/utils/getRightDrawerActionMenuDropdownIdFromActionMenuId';
 
 describe('getRightDrawerActionMenuDropdownIdFromActionMenuId', () => {
   it('should return the right drawer action menu dropdown id', () => {
diff --git a/packages/twenty-front/src/modules/activities/blocks/constants/Schema.ts b/packages/twenty-front/src/modules/activities/blocks/constants/Schema.ts
index 2584f3c7b8..745584f28b 100644
--- a/packages/twenty-front/src/modules/activities/blocks/constants/Schema.ts
+++ b/packages/twenty-front/src/modules/activities/blocks/constants/Schema.ts
@@ -1,6 +1,6 @@
 import { BlockNoteSchema, defaultBlockSpecs } from '@blocknote/core';
 
-import { FileBlock } from '../components/FileBlock';
+import { FileBlock } from '@/activities/blocks/components/FileBlock';
 
 export const BLOCK_SCHEMA = BlockNoteSchema.create({
   blockSpecs: {
diff --git a/packages/twenty-front/src/modules/activities/blocks/utils/getSlashMenu.ts b/packages/twenty-front/src/modules/activities/blocks/utils/getSlashMenu.ts
index b02e358276..6a5f7d17c9 100644
--- a/packages/twenty-front/src/modules/activities/blocks/utils/getSlashMenu.ts
+++ b/packages/twenty-front/src/modules/activities/blocks/utils/getSlashMenu.ts
@@ -2,7 +2,7 @@ import { getDefaultReactSlashMenuItems } from '@blocknote/react';
 
 import { type SuggestionItem } from '@/ui/input/editor/components/CustomSlashMenu';
 
-import { type BLOCK_SCHEMA } from '../constants/Schema';
+import { type BLOCK_SCHEMA } from '@/activities/blocks/constants/Schema';
 import {
   IconBlockquote,
   IconCode,
diff --git a/packages/twenty-front/src/modules/activities/calendar/utils/__tests__/hasCalendarEventEnded.test.ts b/packages/twenty-front/src/modules/activities/calendar/utils/__tests__/hasCalendarEventEnded.test.ts
index 7519fb7e06..7a9ceaf640 100644
--- a/packages/twenty-front/src/modules/activities/calendar/utils/__tests__/hasCalendarEventEnded.test.ts
+++ b/packages/twenty-front/src/modules/activities/calendar/utils/__tests__/hasCalendarEventEnded.test.ts
@@ -1,6 +1,6 @@
 import { addDays, addHours, subDays, subHours } from 'date-fns';
 
-import { hasCalendarEventEnded } from '../hasCalendarEventEnded';
+import { hasCalendarEventEnded } from '@/activities/calendar/utils/hasCalendarEventEnded';
 
 describe('hasCalendarEventEnded', () => {
   describe('Event with end date', () => {
diff --git a/packages/twenty-front/src/modules/activities/calendar/utils/__tests__/hasCalendarEventStarted.test.ts b/packages/twenty-front/src/modules/activities/calendar/utils/__tests__/hasCalendarEventStarted.test.ts
index 18a75dae8d..65cfad9967 100644
--- a/packages/twenty-front/src/modules/activities/calendar/utils/__tests__/hasCalendarEventStarted.test.ts
+++ b/packages/twenty-front/src/modules/activities/calendar/utils/__tests__/hasCalendarEventStarted.test.ts
@@ -1,6 +1,6 @@
 import { addHours, subHours } from 'date-fns';
 
-import { hasCalendarEventStarted } from '../hasCalendarEventStarted';
+import { hasCalendarEventStarted } from '@/activities/calendar/utils/hasCalendarEventStarted';
 
 describe('hasCalendarEventStarted', () => {
   it('returns true for an event with a past start date', () => {
diff --git a/packages/twenty-front/src/modules/activities/calendar/utils/__tests__/sortCalendarEvents.test.ts b/packages/twenty-front/src/modules/activities/calendar/utils/__tests__/sortCalendarEvents.test.ts
index dc1a42a9cc..7b578dce2b 100644
--- a/packages/twenty-front/src/modules/activities/calendar/utils/__tests__/sortCalendarEvents.test.ts
+++ b/packages/twenty-front/src/modules/activities/calendar/utils/__tests__/sortCalendarEvents.test.ts
@@ -3,7 +3,7 @@ import { addHours } from 'date-fns';
 import {
   sortCalendarEventsAsc,
   sortCalendarEventsDesc,
-} from '../sortCalendarEvents';
+} from '@/activities/calendar/utils/sortCalendarEvents';
 
 const someDate = new Date(2000, 1, 1);
 const someDatePlusOneHour = addHours(someDate, 1);
diff --git a/packages/twenty-front/src/modules/activities/emails/graphql/queries/__tests__/getTimelineThreadsFromCompanyId.test.ts b/packages/twenty-front/src/modules/activities/emails/graphql/queries/__tests__/getTimelineThreadsFromCompanyId.test.ts
index 9b3c3ba70f..7c09d54871 100644
--- a/packages/twenty-front/src/modules/activities/emails/graphql/queries/__tests__/getTimelineThreadsFromCompanyId.test.ts
+++ b/packages/twenty-front/src/modules/activities/emails/graphql/queries/__tests__/getTimelineThreadsFromCompanyId.test.ts
@@ -1,6 +1,6 @@
 import { gql } from '@apollo/client';
 
-import { getTimelineThreadsFromCompanyId } from '../getTimelineThreadsFromCompanyId';
+import { getTimelineThreadsFromCompanyId } from '@/activities/emails/graphql/queries/getTimelineThreadsFromCompanyId';
 
 jest.mock('@apollo/client', () => ({
   gql: jest.fn().mockImplementation((strings) => {
diff --git a/packages/twenty-front/src/modules/activities/emails/graphql/queries/__tests__/getTimelineThreadsFromPersonId.test.ts b/packages/twenty-front/src/modules/activities/emails/graphql/queries/__tests__/getTimelineThreadsFromPersonId.test.ts
index 66862b7288..1c0b1222d6 100644
--- a/packages/twenty-front/src/modules/activities/emails/graphql/queries/__tests__/getTimelineThreadsFromPersonId.test.ts
+++ b/packages/twenty-front/src/modules/activities/emails/graphql/queries/__tests__/getTimelineThreadsFromPersonId.test.ts
@@ -1,6 +1,6 @@
 import { gql } from '@apollo/client';
 
-import { getTimelineThreadsFromPersonId } from '../getTimelineThreadsFromPersonId';
+import { getTimelineThreadsFromPersonId } from '@/activities/emails/graphql/queries/getTimelineThreadsFromPersonId';
 
 jest.mock('@apollo/client', () => ({
   gql: jest.fn().mockImplementation((strings) => {
diff --git a/packages/twenty-front/src/modules/activities/emails/utils/__tests__/getDisplayNameFromParticipant.test.ts b/packages/twenty-front/src/modules/activities/emails/utils/__tests__/getDisplayNameFromParticipant.test.ts
index a343a658c3..aea38ebd34 100644
--- a/packages/twenty-front/src/modules/activities/emails/utils/__tests__/getDisplayNameFromParticipant.test.ts
+++ b/packages/twenty-front/src/modules/activities/emails/utils/__tests__/getDisplayNameFromParticipant.test.ts
@@ -1,7 +1,7 @@
 import { type EmailThreadMessageParticipant } from '@/activities/emails/types/EmailThreadMessageParticipant';
 
 import { MessageParticipantRole } from 'twenty-shared/types';
-import { getDisplayNameFromParticipant } from '../getDisplayNameFromParticipant';
+import { getDisplayNameFromParticipant } from '@/activities/emails/utils/getDisplayNameFromParticipant';
 
 describe('getDisplayNameFromParticipant', () => {
   const participantWithName: EmailThreadMessageParticipant = {
diff --git a/packages/twenty-front/src/modules/activities/files/hooks/__tests__/useAttachments.test.ts b/packages/twenty-front/src/modules/activities/files/hooks/__tests__/useAttachments.test.ts
index 5d582322ba..42ebbefdb4 100644
--- a/packages/twenty-front/src/modules/activities/files/hooks/__tests__/useAttachments.test.ts
+++ b/packages/twenty-front/src/modules/activities/files/hooks/__tests__/useAttachments.test.ts
@@ -1,6 +1,6 @@
 import { renderHook } from '@testing-library/react';
 
-import { useAttachments } from '../useAttachments';
+import { useAttachments } from '@/activities/files/hooks/useAttachments';
 
 jest.mock('@/object-record/hooks/useFindManyRecords', () => ({
   useFindManyRecords: jest.fn(),
diff --git a/packages/twenty-front/src/modules/activities/files/utils/__tests__/downloadFile.test.ts b/packages/twenty-front/src/modules/activities/files/utils/__tests__/downloadFile.test.ts
index ecc8c9aa17..38f965080c 100644
--- a/packages/twenty-front/src/modules/activities/files/utils/__tests__/downloadFile.test.ts
+++ b/packages/twenty-front/src/modules/activities/files/utils/__tests__/downloadFile.test.ts
@@ -1,4 +1,4 @@
-import { downloadFile } from '../downloadFile';
+import { downloadFile } from '@/activities/files/utils/downloadFile';
 
 global.fetch = jest.fn(() =>
   Promise.resolve({
diff --git a/packages/twenty-front/src/modules/activities/files/utils/__tests__/getFileType.test.ts b/packages/twenty-front/src/modules/activities/files/utils/__tests__/getFileType.test.ts
index c66b9686a9..e57f42b5ef 100644
--- a/packages/twenty-front/src/modules/activities/files/utils/__tests__/getFileType.test.ts
+++ b/packages/twenty-front/src/modules/activities/files/utils/__tests__/getFileType.test.ts
@@ -1,4 +1,4 @@
-import { getFileType } from '../getFileType';
+import { getFileType } from '@/activities/files/utils/getFileType';
 
 describe('getFileType', () => {
   it('should return the correct file category for a given file name', () => {
diff --git a/packages/twenty-front/src/modules/activities/notes/hooks/useNotes.ts b/packages/twenty-front/src/modules/activities/notes/hooks/useNotes.ts
index 69257591c3..da3637ea41 100644
--- a/packages/twenty-front/src/modules/activities/notes/hooks/useNotes.ts
+++ b/packages/twenty-front/src/modules/activities/notes/hooks/useNotes.ts
@@ -9,7 +9,7 @@ import { type RecordGqlOperationVariables } from '@/object-record/graphql/types/
 import { isDeeplyEqual } from '~/utils/isDeeplyEqual';
 
 import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
-import { type ActivityTargetableObject } from '../../types/ActivityTargetableEntity';
+import { type ActivityTargetableObject } from '@/activities/types/ActivityTargetableEntity';
 
 export const useNotes = (targetableObject: ActivityTargetableObject) => {
   const notesQueryVariables = useMemo(
diff --git a/packages/twenty-front/src/modules/activities/states/activityTargetableEntityArrayState.ts b/packages/twenty-front/src/modules/activities/states/activityTargetableEntityArrayState.ts
index a3ef395126..b53baf6536 100644
--- a/packages/twenty-front/src/modules/activities/states/activityTargetableEntityArrayState.ts
+++ b/packages/twenty-front/src/modules/activities/states/activityTargetableEntityArrayState.ts
@@ -1,4 +1,4 @@
-import { type ActivityTargetableObject } from '../types/ActivityTargetableEntity';
+import { type ActivityTargetableObject } from '@/activities/types/ActivityTargetableEntity';
 import { createState } from 'twenty-ui/utilities';
 
 export const activityTargetableEntityArrayState = createState<
diff --git a/packages/twenty-front/src/modules/activities/tasks/components/TaskRow.tsx b/packages/twenty-front/src/modules/activities/tasks/components/TaskRow.tsx
index 728c043f39..59c9aae5cd 100644
--- a/packages/twenty-front/src/modules/activities/tasks/components/TaskRow.tsx
+++ b/packages/twenty-front/src/modules/activities/tasks/components/TaskRow.tsx
@@ -15,7 +15,7 @@ import { StopPropagationContainer } from '@/object-record/record-board/record-bo
 import { FieldContextProvider } from '@/object-record/record-field/ui/components/FieldContextProvider';
 import { IconCalendar, OverflowingTextWithTooltip } from 'twenty-ui/display';
 import { Checkbox, CheckboxShape } from 'twenty-ui/input';
-import { useCompleteTask } from '../hooks/useCompleteTask';
+import { useCompleteTask } from '@/activities/tasks/hooks/useCompleteTask';
 
 const StyledTaskBody = styled.div`
   color: ${({ theme }) => theme.font.color.tertiary};
diff --git a/packages/twenty-front/src/modules/activities/timeline-activities/utils/__tests__/groupEventsByMonth.test.ts b/packages/twenty-front/src/modules/activities/timeline-activities/utils/__tests__/groupEventsByMonth.test.ts
index f4f9a082cc..f585fdb23c 100644
--- a/packages/twenty-front/src/modules/activities/timeline-activities/utils/__tests__/groupEventsByMonth.test.ts
+++ b/packages/twenty-front/src/modules/activities/timeline-activities/utils/__tests__/groupEventsByMonth.test.ts
@@ -1,6 +1,6 @@
 import { mockedTimelineActivities } from '~/testing/mock-data/timeline-activities';
 
-import { groupEventsByMonth } from '../groupEventsByMonth';
+import { groupEventsByMonth } from '@/activities/timeline-activities/utils/groupEventsByMonth';
 
 describe('groupEventsByMonth', () => {
   it('should group activities by month', () => {
diff --git a/packages/twenty-front/src/modules/activities/utils/__tests__/filterAttachmentsToRestore.test.ts b/packages/twenty-front/src/modules/activities/utils/__tests__/filterAttachmentsToRestore.test.ts
index 50503fe9ff..10849ae4e0 100644
--- a/packages/twenty-front/src/modules/activities/utils/__tests__/filterAttachmentsToRestore.test.ts
+++ b/packages/twenty-front/src/modules/activities/utils/__tests__/filterAttachmentsToRestore.test.ts
@@ -1,5 +1,5 @@
 import { type Attachment } from '@/activities/files/types/Attachment';
-import { filterAttachmentsToRestore } from '../filterAttachmentsToRestore';
+import { filterAttachmentsToRestore } from '@/activities/utils/filterAttachmentsToRestore';
 
 describe('filterAttachmentsToRestore', () => {
   it('should not return any ids if there are no attachment paths to restore', () => {
diff --git a/packages/twenty-front/src/modules/activities/utils/__tests__/getActivityPreview.test.ts b/packages/twenty-front/src/modules/activities/utils/__tests__/getActivityPreview.test.ts
index e2f5c67c40..183e4c0462 100644
--- a/packages/twenty-front/src/modules/activities/utils/__tests__/getActivityPreview.test.ts
+++ b/packages/twenty-front/src/modules/activities/utils/__tests__/getActivityPreview.test.ts
@@ -1,4 +1,4 @@
-import { getActivityPreview } from '../getActivityPreview';
+import { getActivityPreview } from '@/activities/utils/getActivityPreview';
 
 describe('getActivityPreview', () => {
   it('should work for empty body', () => {
diff --git a/packages/twenty-front/src/modules/activities/utils/__tests__/getActivitySummary.test.ts b/packages/twenty-front/src/modules/activities/utils/__tests__/getActivitySummary.test.ts
index 07fda39de6..763b877fa8 100644
--- a/packages/twenty-front/src/modules/activities/utils/__tests__/getActivitySummary.test.ts
+++ b/packages/twenty-front/src/modules/activities/utils/__tests__/getActivitySummary.test.ts
@@ -1,4 +1,4 @@
-import { getActivitySummary } from '../getActivitySummary';
+import { getActivitySummary } from '@/activities/utils/getActivitySummary';
 
 describe('getActivitySummary', () => {
   it('should work for empty body ""', () => {
diff --git a/packages/twenty-front/src/modules/advanced-text-editor/extensions/slash-command/__tests__/DefaultSlashCommands.test.ts b/packages/twenty-front/src/modules/advanced-text-editor/extensions/slash-command/__tests__/DefaultSlashCommands.test.ts
index 34c1767408..aa62382a50 100644
--- a/packages/twenty-front/src/modules/advanced-text-editor/extensions/slash-command/__tests__/DefaultSlashCommands.test.ts
+++ b/packages/twenty-front/src/modules/advanced-text-editor/extensions/slash-command/__tests__/DefaultSlashCommands.test.ts
@@ -6,7 +6,7 @@ import { ListKit } from '@tiptap/extension-list';
 import { Paragraph } from '@tiptap/extension-paragraph';
 import { Text } from '@tiptap/extension-text';
 
-import { DEFAULT_SLASH_COMMANDS } from '../DefaultSlashCommands';
+import { DEFAULT_SLASH_COMMANDS } from '@/advanced-text-editor/extensions/slash-command/DefaultSlashCommands';
 
 describe('DefaultSlashCommands', () => {
   let editor: Editor;
diff --git a/packages/twenty-front/src/modules/advanced-text-editor/extensions/slash-command/__tests__/SlashCommand.test.ts b/packages/twenty-front/src/modules/advanced-text-editor/extensions/slash-command/__tests__/SlashCommand.test.ts
index 8acbc68a55..08ae9dfc0c 100644
--- a/packages/twenty-front/src/modules/advanced-text-editor/extensions/slash-command/__tests__/SlashCommand.test.ts
+++ b/packages/twenty-front/src/modules/advanced-text-editor/extensions/slash-command/__tests__/SlashCommand.test.ts
@@ -6,7 +6,7 @@ import { ListKit } from '@tiptap/extension-list';
 import { Paragraph } from '@tiptap/extension-paragraph';
 import { Text } from '@tiptap/extension-text';
 
-import { SlashCommand } from '../SlashCommand';
+import { SlashCommand } from '@/advanced-text-editor/extensions/slash-command/SlashCommand';
 
 describe('SlashCommand', () => {
   let editor: Editor;
diff --git a/packages/twenty-front/src/modules/advanced-text-editor/extensions/slash-command/__tests__/SlashCommandRenderer.test.ts b/packages/twenty-front/src/modules/advanced-text-editor/extensions/slash-command/__tests__/SlashCommandRenderer.test.ts
index c0d188cc60..afd915d67a 100644
--- a/packages/twenty-front/src/modules/advanced-text-editor/extensions/slash-command/__tests__/SlashCommandRenderer.test.ts
+++ b/packages/twenty-front/src/modules/advanced-text-editor/extensions/slash-command/__tests__/SlashCommandRenderer.test.ts
@@ -3,8 +3,8 @@ import { Document } from '@tiptap/extension-document';
 import { Paragraph } from '@tiptap/extension-paragraph';
 import { Text } from '@tiptap/extension-text';
 
-import { type SlashCommandItem } from '../SlashCommand';
-import { SlashCommandRenderer } from '../SlashCommandRenderer';
+import { type SlashCommandItem } from '@/advanced-text-editor/extensions/slash-command/SlashCommand';
+import { SlashCommandRenderer } from '@/advanced-text-editor/extensions/slash-command/SlashCommandRenderer';
 
 describe('SlashCommandRenderer', () => {
   let editor: Editor;
diff --git a/packages/twenty-front/src/modules/ai/graphql/mutations/createOneAgent.ts b/packages/twenty-front/src/modules/ai/graphql/mutations/createOneAgent.ts
index d48f46abae..09b5948e5a 100644
--- a/packages/twenty-front/src/modules/ai/graphql/mutations/createOneAgent.ts
+++ b/packages/twenty-front/src/modules/ai/graphql/mutations/createOneAgent.ts
@@ -1,5 +1,5 @@
 import { gql } from '@apollo/client';
-import { AGENT_FRAGMENT } from '../fragments/agentFragment';
+import { AGENT_FRAGMENT } from '@/ai/graphql/fragments/agentFragment';
 
 export const CREATE_ONE_AGENT = gql`
   ${AGENT_FRAGMENT}
diff --git a/packages/twenty-front/src/modules/ai/graphql/mutations/deleteOneAgent.ts b/packages/twenty-front/src/modules/ai/graphql/mutations/deleteOneAgent.ts
index 02bb6db1f1..a5478df2a9 100644
--- a/packages/twenty-front/src/modules/ai/graphql/mutations/deleteOneAgent.ts
+++ b/packages/twenty-front/src/modules/ai/graphql/mutations/deleteOneAgent.ts
@@ -1,5 +1,5 @@
 import { gql } from '@apollo/client';
-import { AGENT_FRAGMENT } from '../fragments/agentFragment';
+import { AGENT_FRAGMENT } from '@/ai/graphql/fragments/agentFragment';
 
 export const DELETE_ONE_AGENT = gql`
   ${AGENT_FRAGMENT}
diff --git a/packages/twenty-front/src/modules/ai/graphql/mutations/updateOneAgent.ts b/packages/twenty-front/src/modules/ai/graphql/mutations/updateOneAgent.ts
index 66743dd26c..3aeab480df 100644
--- a/packages/twenty-front/src/modules/ai/graphql/mutations/updateOneAgent.ts
+++ b/packages/twenty-front/src/modules/ai/graphql/mutations/updateOneAgent.ts
@@ -1,5 +1,5 @@
 import { gql } from '@apollo/client';
-import { AGENT_FRAGMENT } from '../fragments/agentFragment';
+import { AGENT_FRAGMENT } from '@/ai/graphql/fragments/agentFragment';
 
 export const UPDATE_ONE_AGENT = gql`
   ${AGENT_FRAGMENT}
diff --git a/packages/twenty-front/src/modules/ai/graphql/queries/findManyAgents.ts b/packages/twenty-front/src/modules/ai/graphql/queries/findManyAgents.ts
index c7af91d570..4475742e7a 100644
--- a/packages/twenty-front/src/modules/ai/graphql/queries/findManyAgents.ts
+++ b/packages/twenty-front/src/modules/ai/graphql/queries/findManyAgents.ts
@@ -1,5 +1,5 @@
 import { gql } from '@apollo/client';
-import { AGENT_FRAGMENT } from '../fragments/agentFragment';
+import { AGENT_FRAGMENT } from '@/ai/graphql/fragments/agentFragment';
 
 export const FIND_MANY_AGENTS = gql`
   ${AGENT_FRAGMENT}
diff --git a/packages/twenty-front/src/modules/ai/graphql/queries/findOneAgent.ts b/packages/twenty-front/src/modules/ai/graphql/queries/findOneAgent.ts
index 1655c090cc..63c560149d 100644
--- a/packages/twenty-front/src/modules/ai/graphql/queries/findOneAgent.ts
+++ b/packages/twenty-front/src/modules/ai/graphql/queries/findOneAgent.ts
@@ -1,5 +1,5 @@
 import { gql } from '@apollo/client';
-import { AGENT_FRAGMENT } from '../fragments/agentFragment';
+import { AGENT_FRAGMENT } from '@/ai/graphql/fragments/agentFragment';
 
 export const FIND_ONE_AGENT = gql`
   ${AGENT_FRAGMENT}
diff --git a/packages/twenty-front/src/modules/ai/hooks/useAgentChat.ts b/packages/twenty-front/src/modules/ai/hooks/useAgentChat.ts
index 24ebe9dd3c..3df36fc902 100644
--- a/packages/twenty-front/src/modules/ai/hooks/useAgentChat.ts
+++ b/packages/twenty-front/src/modules/ai/hooks/useAgentChat.ts
@@ -15,8 +15,8 @@ import { type ExtendedUIMessage } from 'twenty-shared/ai';
 import { isDefined } from 'twenty-shared/utils';
 import { REACT_APP_SERVER_BASE_URL } from '~/config';
 import { cookieStorage } from '~/utils/cookie-storage';
-import { REST_API_BASE_URL } from '../../apollo/constant/rest-api-base-url';
-import { agentChatInputState } from '../states/agentChatInputState';
+import { REST_API_BASE_URL } from '@/apollo/constant/rest-api-base-url';
+import { agentChatInputState } from '@/ai/states/agentChatInputState';
 
 export const useAgentChat = (uiMessages: ExtendedUIMessage[]) => {
   const setTokenPair = useSetRecoilState(tokenPairState);
diff --git a/packages/twenty-front/src/modules/ai/utils/__tests__/getFieldIcon.test.ts b/packages/twenty-front/src/modules/ai/utils/__tests__/getFieldIcon.test.ts
index df4110c363..371eaff161 100644
--- a/packages/twenty-front/src/modules/ai/utils/__tests__/getFieldIcon.test.ts
+++ b/packages/twenty-front/src/modules/ai/utils/__tests__/getFieldIcon.test.ts
@@ -1,4 +1,4 @@
-import { getFieldIcon } from '../getFieldIcon';
+import { getFieldIcon } from '@/ai/utils/getFieldIcon';
 
 describe('getFieldIcon', () => {
   describe('supported field types', () => {
diff --git a/packages/twenty-front/src/modules/ai/utils/__tests__/groupThreadsByDate.test.ts b/packages/twenty-front/src/modules/ai/utils/__tests__/groupThreadsByDate.test.ts
index c4c035488f..9270e0ff49 100644
--- a/packages/twenty-front/src/modules/ai/utils/__tests__/groupThreadsByDate.test.ts
+++ b/packages/twenty-front/src/modules/ai/utils/__tests__/groupThreadsByDate.test.ts
@@ -1,5 +1,5 @@
 import { type AgentChatThread } from '~/generated-metadata/graphql';
-import { groupThreadsByDate } from '../groupThreadsByDate';
+import { groupThreadsByDate } from '@/ai/utils/groupThreadsByDate';
 
 describe('groupThreadsByDate', () => {
   const baseThread: Omit<AgentChatThread, 'createdAt' | 'id'> = {
diff --git a/packages/twenty-front/src/modules/analytics/hooks/__tests__/useEventTracker.test.tsx b/packages/twenty-front/src/modules/analytics/hooks/__tests__/useEventTracker.test.tsx
index c5acbc6676..7e8dd4eba1 100644
--- a/packages/twenty-front/src/modules/analytics/hooks/__tests__/useEventTracker.test.tsx
+++ b/packages/twenty-front/src/modules/analytics/hooks/__tests__/useEventTracker.test.tsx
@@ -5,7 +5,10 @@ import { act, renderHook, waitFor } from '@testing-library/react';
 import { type ReactNode } from 'react';
 import { RecoilRoot } from 'recoil';
 
-import { ANALYTICS_COOKIE_NAME, useEventTracker } from '../useEventTracker';
+import {
+  ANALYTICS_COOKIE_NAME,
+  useEventTracker,
+} from '@/analytics/hooks/useEventTracker';
 import { AnalyticsType } from '~/generated/graphql';
 
 // Mock document.cookie
diff --git a/packages/twenty-front/src/modules/apollo/hooks/__tests__/useApolloFactory.test.tsx b/packages/twenty-front/src/modules/apollo/hooks/__tests__/useApolloFactory.test.tsx
index 067c7cc401..1b377dda26 100644
--- a/packages/twenty-front/src/modules/apollo/hooks/__tests__/useApolloFactory.test.tsx
+++ b/packages/twenty-front/src/modules/apollo/hooks/__tests__/useApolloFactory.test.tsx
@@ -5,7 +5,7 @@ import { MemoryRouter, useLocation } from 'react-router-dom';
 import { RecoilRoot } from 'recoil';
 
 import { SnackBarComponentInstanceContext } from '@/ui/feedback/snack-bar-manager/contexts/SnackBarComponentInstanceContext';
-import { useApolloFactory } from '../useApolloFactory';
+import { useApolloFactory } from '@/apollo/hooks/useApolloFactory';
 
 enableFetchMocks();
 
diff --git a/packages/twenty-front/src/modules/apollo/hooks/useApolloFactory.ts b/packages/twenty-front/src/modules/apollo/hooks/useApolloFactory.ts
index 99cf502ac8..e99d4280d1 100644
--- a/packages/twenty-front/src/modules/apollo/hooks/useApolloFactory.ts
+++ b/packages/twenty-front/src/modules/apollo/hooks/useApolloFactory.ts
@@ -17,7 +17,7 @@ import { appVersionState } from '@/client-config/states/appVersionState';
 import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';
 import { AppPath } from 'twenty-shared/types';
 import { isDefined } from 'twenty-shared/utils';
-import { ApolloFactory, type Options } from '../services/apollo.factory';
+import { ApolloFactory, type Options } from '@/apollo/services/apollo.factory';
 
 export const useApolloFactory = (options: Partial<Options<any>> = {}) => {
   // eslint-disable-next-line @nx/workspace-no-state-useref
diff --git a/packages/twenty-front/src/modules/apollo/optimistic-effect/group-by/utils/__tests__/doesRecordBelongToGroup.test.ts b/packages/twenty-front/src/modules/apollo/optimistic-effect/group-by/utils/__tests__/doesRecordBelongToGroup.test.ts
index b815c54bce..3d17615de8 100644
--- a/packages/twenty-front/src/modules/apollo/optimistic-effect/group-by/utils/__tests__/doesRecordBelongToGroup.test.ts
+++ b/packages/twenty-front/src/modules/apollo/optimistic-effect/group-by/utils/__tests__/doesRecordBelongToGroup.test.ts
@@ -1,6 +1,6 @@
 import { type RecordGqlNode } from '@/object-record/graphql/types/RecordGqlNode';
 
-import { doesRecordBelongToGroup } from '../doesRecordBelongToGroup';
+import { doesRecordBelongToGroup } from '@/apollo/optimistic-effect/group-by/utils/doesRecordBelongToGroup';
 
 describe('doesRecordBelongToGroup', () => {
   it('should return true when groupByConfig is undefined', () => {
diff --git a/packages/twenty-front/src/modules/apollo/optimistic-effect/group-by/utils/__tests__/normalizeGroupByDimensionValue.test.ts b/packages/twenty-front/src/modules/apollo/optimistic-effect/group-by/utils/__tests__/normalizeGroupByDimensionValue.test.ts
index 05a05467bb..9acc294bb6 100644
--- a/packages/twenty-front/src/modules/apollo/optimistic-effect/group-by/utils/__tests__/normalizeGroupByDimensionValue.test.ts
+++ b/packages/twenty-front/src/modules/apollo/optimistic-effect/group-by/utils/__tests__/normalizeGroupByDimensionValue.test.ts
@@ -1,4 +1,4 @@
-import { normalizeGroupByDimensionValue } from '../normalizeGroupByDimensionValue';
+import { normalizeGroupByDimensionValue } from '@/apollo/optimistic-effect/group-by/utils/normalizeGroupByDimensionValue';
 
 describe('normalizeGroupByDimensionValue', () => {
   it('should convert string to string', () => {
diff --git a/packages/twenty-front/src/modules/apollo/optimistic-effect/group-by/utils/__tests__/processGroupByConnectionWithRecords.test.ts b/packages/twenty-front/src/modules/apollo/optimistic-effect/group-by/utils/__tests__/processGroupByConnectionWithRecords.test.ts
index a440e4e539..8adaac903e 100644
--- a/packages/twenty-front/src/modules/apollo/optimistic-effect/group-by/utils/__tests__/processGroupByConnectionWithRecords.test.ts
+++ b/packages/twenty-front/src/modules/apollo/optimistic-effect/group-by/utils/__tests__/processGroupByConnectionWithRecords.test.ts
@@ -8,7 +8,7 @@ import { type ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataI
 import { type RecordGqlRefEdge } from '@/object-record/cache/types/RecordGqlRefEdge';
 import { type RecordGqlNode } from '@/object-record/graphql/types/RecordGqlNode';
 
-import { processGroupByConnectionWithRecords } from '../processGroupByConnectionWithRecords';
+import { processGroupByConnectionWithRecords } from '@/apollo/optimistic-effect/group-by/utils/processGroupByConnectionWithRecords';
 
 describe('processGroupByConnectionWithRecords', () => {
   const mockObjectMetadataItem: ObjectMetadataItem = {
diff --git a/packages/twenty-front/src/modules/apollo/optimistic-effect/group-by/utils/__tests__/triggerUpdateGroupByQueriesOptimisticEffect.test.ts b/packages/twenty-front/src/modules/apollo/optimistic-effect/group-by/utils/__tests__/triggerUpdateGroupByQueriesOptimisticEffect.test.ts
index 90d6783ea6..9b3ecac1b6 100644
--- a/packages/twenty-front/src/modules/apollo/optimistic-effect/group-by/utils/__tests__/triggerUpdateGroupByQueriesOptimisticEffect.test.ts
+++ b/packages/twenty-front/src/modules/apollo/optimistic-effect/group-by/utils/__tests__/triggerUpdateGroupByQueriesOptimisticEffect.test.ts
@@ -3,7 +3,7 @@ import { type ApolloCache } from '@apollo/client';
 import { type ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
 import { type RecordGqlNode } from '@/object-record/graphql/types/RecordGqlNode';
 
-import { triggerUpdateGroupByQueriesOptimisticEffect } from '../triggerUpdateGroupByQueriesOptimisticEffect';
+import { triggerUpdateGroupByQueriesOptimisticEffect } from '@/apollo/optimistic-effect/group-by/utils/triggerUpdateGroupByQueriesOptimisticEffect';
 
 describe('triggerUpdateGroupByQueriesOptimisticEffect', () => {
   const mockObjectMetadataItem: ObjectMetadataItem = {
diff --git a/packages/twenty-front/src/modules/apollo/services/__tests__/apollo.factory.test.ts b/packages/twenty-front/src/modules/apollo/services/__tests__/apollo.factory.test.ts
index ad49b6f402..b29eca7071 100644
--- a/packages/twenty-front/src/modules/apollo/services/__tests__/apollo.factory.test.ts
+++ b/packages/twenty-front/src/modules/apollo/services/__tests__/apollo.factory.test.ts
@@ -5,7 +5,7 @@ import { DEFAULT_FAST_MODEL } from '@/ai/constants/DefaultFastModel';
 import { DEFAULT_SMART_MODEL } from '@/ai/constants/DefaultSmartModel';
 import { CUSTOM_WORKSPACE_APPLICATION_MOCK } from '@/object-metadata/hooks/__tests__/constants/CustomWorkspaceApplicationMock.test.constant';
 import { WorkspaceActivationStatus } from '~/generated/graphql';
-import { ApolloFactory, type Options } from '../apollo.factory';
+import { ApolloFactory, type Options } from '@/apollo/services/apollo.factory';
 
 enableFetchMocks();
 
diff --git a/packages/twenty-front/src/modules/apollo/services/apollo.factory.ts b/packages/twenty-front/src/modules/apollo/services/apollo.factory.ts
index 4484ee2af2..fc204c6a91 100644
--- a/packages/twenty-front/src/modules/apollo/services/apollo.factory.ts
+++ b/packages/twenty-front/src/modules/apollo/services/apollo.factory.ts
@@ -35,9 +35,9 @@ import isEmpty from 'lodash.isempty';
 import { getGenericOperationName, isDefined } from 'twenty-shared/utils';
 import { cookieStorage } from '~/utils/cookie-storage';
 import { isUndefinedOrNull } from '~/utils/isUndefinedOrNull';
-import { type ApolloManager } from '../types/apolloManager.interface';
-import { loggerLink } from '../utils/loggerLink';
-import { StreamingRestLink } from '../utils/streamingRestLink';
+import { type ApolloManager } from '@/apollo/types/apolloManager.interface';
+import { loggerLink } from '@/apollo/utils/loggerLink';
+import { StreamingRestLink } from '@/apollo/utils/streamingRestLink';
 
 const logger = loggerLink(() => 'Twenty');
 
diff --git a/packages/twenty-front/src/modules/apollo/utils/__tests__/formatTitle.test.ts b/packages/twenty-front/src/modules/apollo/utils/__tests__/formatTitle.test.ts
index cc3d83dc2e..47b3322cb7 100644
--- a/packages/twenty-front/src/modules/apollo/utils/__tests__/formatTitle.test.ts
+++ b/packages/twenty-front/src/modules/apollo/utils/__tests__/formatTitle.test.ts
@@ -1,6 +1,6 @@
 import { OperationType } from '@/apollo/types/operation-type';
 
-import formatTitle from '../formatTitle';
+import formatTitle from '@/apollo/utils/formatTitle';
 
 describe('formatTitle', () => {
   it('should correctly format the title', () => {
diff --git a/packages/twenty-front/src/modules/apollo/utils/__tests__/getTokenPair.test.ts b/packages/twenty-front/src/modules/apollo/utils/__tests__/getTokenPair.test.ts
index 944f4535e0..b7d687d2d4 100644
--- a/packages/twenty-front/src/modules/apollo/utils/__tests__/getTokenPair.test.ts
+++ b/packages/twenty-front/src/modules/apollo/utils/__tests__/getTokenPair.test.ts
@@ -1,5 +1,5 @@
 import { cookieStorage } from '~/utils/cookie-storage';
-import { getTokenPair } from '../getTokenPair';
+import { getTokenPair } from '@/apollo/utils/getTokenPair';
 
 jest.mock('~/utils/cookie-storage', () => ({
   cookieStorage: {
diff --git a/packages/twenty-front/src/modules/apollo/utils/__tests__/hasTokenPair.test.ts b/packages/twenty-front/src/modules/apollo/utils/__tests__/hasTokenPair.test.ts
index 9596ae6ee6..71b4ea9862 100644
--- a/packages/twenty-front/src/modules/apollo/utils/__tests__/hasTokenPair.test.ts
+++ b/packages/twenty-front/src/modules/apollo/utils/__tests__/hasTokenPair.test.ts
@@ -1,5 +1,5 @@
-import { getTokenPair } from '../getTokenPair';
-import { hasTokenPair } from '../hasTokenPair';
+import { getTokenPair } from '@/apollo/utils/getTokenPair';
+import { hasTokenPair } from '@/apollo/utils/hasTokenPair';
 
 jest.mock('../getTokenPair');
 
diff --git a/packages/twenty-front/src/modules/apollo/utils/__tests__/streamingRestLink.test.ts b/packages/twenty-front/src/modules/apollo/utils/__tests__/streamingRestLink.test.ts
index c03694bdf3..a3b2a87fc0 100644
--- a/packages/twenty-front/src/modules/apollo/utils/__tests__/streamingRestLink.test.ts
+++ b/packages/twenty-front/src/modules/apollo/utils/__tests__/streamingRestLink.test.ts
@@ -1,6 +1,6 @@
 import { gql } from '@apollo/client';
 import { type Operation } from '@apollo/client/core';
-import { StreamingRestLink } from '../streamingRestLink';
+import { StreamingRestLink } from '@/apollo/utils/streamingRestLink';
 
 global.fetch = jest.fn();
 describe('StreamingRestLink', () => {
diff --git a/packages/twenty-front/src/modules/apollo/utils/formatTitle.ts b/packages/twenty-front/src/modules/apollo/utils/formatTitle.ts
index 2553ceb415..56a01f765d 100644
--- a/packages/twenty-front/src/modules/apollo/utils/formatTitle.ts
+++ b/packages/twenty-front/src/modules/apollo/utils/formatTitle.ts
@@ -1,4 +1,4 @@
-import { OperationType } from '../types/operation-type';
+import { OperationType } from '@/apollo/types/operation-type';
 
 const operationTypeColors = {
   // eslint-disable-next-line @nx/workspace-no-hardcoded-colors
diff --git a/packages/twenty-front/src/modules/applications/graphql/queries/findOneApplication.ts b/packages/twenty-front/src/modules/applications/graphql/queries/findOneApplication.ts
index 2462a8225c..aa79dd21a3 100644
--- a/packages/twenty-front/src/modules/applications/graphql/queries/findOneApplication.ts
+++ b/packages/twenty-front/src/modules/applications/graphql/queries/findOneApplication.ts
@@ -1,5 +1,5 @@
 import { gql } from '@apollo/client';
-import { APPLICATION_FRAGMENT } from '../fragments/applicationFragment';
+import { APPLICATION_FRAGMENT } from '@/applications/graphql/fragments/applicationFragment';
 
 export const FIND_ONE_APPLICATION = gql`
   ${APPLICATION_FRAGMENT}
diff --git a/packages/twenty-front/src/modules/auth/components/AuthModalMountEffect.tsx b/packages/twenty-front/src/modules/auth/components/AuthModalMountEffect.tsx
index 0908433c78..6505698522 100644
--- a/packages/twenty-front/src/modules/auth/components/AuthModalMountEffect.tsx
+++ b/packages/twenty-front/src/modules/auth/components/AuthModalMountEffect.tsx
@@ -1,7 +1,7 @@
 import { useModal } from '@/ui/layout/modal/hooks/useModal';
 import { useEffect } from 'react';
 
-import { AUTH_MODAL_ID } from '../constants/AuthModalId';
+import { AUTH_MODAL_ID } from '@/auth/constants/AuthModalId';
 
 // TODO: Remove this component when we refactor the auth modal to open it directly in the PageChangeEffect
 export const AuthModalMountEffect = () => {
diff --git a/packages/twenty-front/src/modules/auth/components/VerifyEmailEffect.tsx b/packages/twenty-front/src/modules/auth/components/VerifyEmailEffect.tsx
index 7d1306eb66..849bdfe442 100644
--- a/packages/twenty-front/src/modules/auth/components/VerifyEmailEffect.tsx
+++ b/packages/twenty-front/src/modules/auth/components/VerifyEmailEffect.tsx
@@ -16,7 +16,7 @@ import { useRecoilValue, useSetRecoilState } from 'recoil';
 import { isDefined } from 'twenty-shared/utils';
 import { useNavigateApp } from '~/hooks/useNavigateApp';
 import { getWorkspaceUrl } from '~/utils/getWorkspaceUrl';
-import { EmailVerificationSent } from '../sign-in-up/components/EmailVerificationSent';
+import { EmailVerificationSent } from '@/auth/sign-in-up/components/EmailVerificationSent';
 
 export const VerifyEmailEffect = () => {
   const {
diff --git a/packages/twenty-front/src/modules/auth/components/__stories__/Logo.stories.tsx b/packages/twenty-front/src/modules/auth/components/__stories__/Logo.stories.tsx
index 72d7365eb1..3c07e329bd 100644
--- a/packages/twenty-front/src/modules/auth/components/__stories__/Logo.stories.tsx
+++ b/packages/twenty-front/src/modules/auth/components/__stories__/Logo.stories.tsx
@@ -5,7 +5,7 @@ import {
   RecoilRootDecorator,
   RouterDecorator,
 } from 'twenty-ui/testing';
-import { Logo } from '../Logo';
+import { Logo } from '@/auth/components/Logo';
 
 const logoUrl = 'https://picsum.photos/192/192';
 
diff --git a/packages/twenty-front/src/modules/auth/components/__stories__/VerifyEmailEffect.stories.tsx b/packages/twenty-front/src/modules/auth/components/__stories__/VerifyEmailEffect.stories.tsx
index 18610b60df..62fce5e1a9 100644
--- a/packages/twenty-front/src/modules/auth/components/__stories__/VerifyEmailEffect.stories.tsx
+++ b/packages/twenty-front/src/modules/auth/components/__stories__/VerifyEmailEffect.stories.tsx
@@ -1,13 +1,13 @@
 import { type Meta, type StoryObj } from '@storybook/react';
 import { MemoryRouter, Route, Routes } from 'react-router-dom';
 import { RecoilRoot } from 'recoil';
-import { type VerifyEmailEffect } from '../VerifyEmailEffect';
+import { type VerifyEmailEffect } from '@/auth/components/VerifyEmailEffect';
 
 // Mock component that just renders the error state of VerifyEmailEffect directly
 // (since normal VerifyEmailEffect has async logic that's hard to test in Storybook)
 import { Modal } from '@/ui/layout/modal/components/Modal';
 import { SnackBarDecorator } from '~/testing/decorators/SnackBarDecorator';
-import { EmailVerificationSent } from '../../sign-in-up/components/EmailVerificationSent';
+import { EmailVerificationSent } from '@/auth/sign-in-up/components/EmailVerificationSent';
 
 const VerifyEmailEffectErrorState = ({ email = 'user@example.com' }) => {
   return (
diff --git a/packages/twenty-front/src/modules/auth/hooks/__tests__/useAuth.test.tsx b/packages/twenty-front/src/modules/auth/hooks/__tests__/useAuth.test.tsx
index 0fbd3d2967..9038bb794a 100644
--- a/packages/twenty-front/src/modules/auth/hooks/__tests__/useAuth.test.tsx
+++ b/packages/twenty-front/src/modules/auth/hooks/__tests__/useAuth.test.tsx
@@ -16,7 +16,13 @@ import { SnackBarComponentInstanceContext } from '@/ui/feedback/snack-bar-manage
 import { renderHook } from '@testing-library/react';
 import { iconsState } from 'twenty-ui/display';
 import { SupportDriver } from '~/generated/graphql';
-import { email, mocks, password, results, token } from '../__mocks__/useAuth';
+import {
+  email,
+  mocks,
+  password,
+  results,
+  token,
+} from '@/auth/hooks/__mocks__/useAuth';
 
 const redirectSpy = jest.fn();
 
diff --git a/packages/twenty-front/src/modules/auth/hooks/__tests__/useVerifyLogin.test.ts b/packages/twenty-front/src/modules/auth/hooks/__tests__/useVerifyLogin.test.ts
index 7dc00dfaa1..a496ba6e54 100644
--- a/packages/twenty-front/src/modules/auth/hooks/__tests__/useVerifyLogin.test.ts
+++ b/packages/twenty-front/src/modules/auth/hooks/__tests__/useVerifyLogin.test.ts
@@ -6,8 +6,8 @@ import { RecoilRoot } from 'recoil';
 import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';
 import { AppPath } from 'twenty-shared/types';
 import { useNavigateApp } from '~/hooks/useNavigateApp';
-import { useAuth } from '../useAuth';
-import { useVerifyLogin } from '../useVerifyLogin';
+import { useAuth } from '@/auth/hooks/useAuth';
+import { useVerifyLogin } from '@/auth/hooks/useVerifyLogin';
 
 import { SOURCE_LOCALE } from 'twenty-shared/translations';
 import { dynamicActivate } from '~/utils/i18n/dynamicActivate';
diff --git a/packages/twenty-front/src/modules/auth/hooks/useAuth.ts b/packages/twenty-front/src/modules/auth/hooks/useAuth.ts
index d73a41bf65..596d7a2566 100644
--- a/packages/twenty-front/src/modules/auth/hooks/useAuth.ts
+++ b/packages/twenty-front/src/modules/auth/hooks/useAuth.ts
@@ -27,7 +27,7 @@ import {
 } from '~/generated-metadata/graphql';
 
 import { isDeveloperDefaultSignInPrefilledState } from '@/client-config/states/isDeveloperDefaultSignInPrefilledState';
-import { tokenPairState } from '../states/tokenPairState';
+import { tokenPairState } from '@/auth/states/tokenPairState';
 
 import { isAppEffectRedirectEnabledState } from '@/app/states/isAppEffectRedirectEnabledState';
 import { useSignUpInNewWorkspace } from '@/auth/sign-in-up/hooks/useSignUpInNewWorkspace';
@@ -66,7 +66,7 @@ import { iconsState } from 'twenty-ui/display';
 import { type AuthToken } from '~/generated/graphql';
 import { cookieStorage } from '~/utils/cookie-storage';
 import { getWorkspaceUrl } from '~/utils/getWorkspaceUrl';
-import { loginTokenState } from '../states/loginTokenState';
+import { loginTokenState } from '@/auth/states/loginTokenState';
 
 export const useAuth = () => {
   const setTokenPair = useSetRecoilState(tokenPairState);
diff --git a/packages/twenty-front/src/modules/auth/hooks/useIsLogged.ts b/packages/twenty-front/src/modules/auth/hooks/useIsLogged.ts
index 5f6165d06e..ec8966e557 100644
--- a/packages/twenty-front/src/modules/auth/hooks/useIsLogged.ts
+++ b/packages/twenty-front/src/modules/auth/hooks/useIsLogged.ts
@@ -1,6 +1,6 @@
 import { useRecoilState } from 'recoil';
 
-import { tokenPairState } from '../states/tokenPairState';
+import { tokenPairState } from '@/auth/states/tokenPairState';
 
 export const useIsLogged = (): boolean => {
   const [tokenPair] = useRecoilState(tokenPairState);
diff --git a/packages/twenty-front/src/modules/auth/sign-in-up/components/__stories__/EmailVerificationSent.stories.tsx b/packages/twenty-front/src/modules/auth/sign-in-up/components/__stories__/EmailVerificationSent.stories.tsx
index 6956374ed1..c41d71e626 100644
--- a/packages/twenty-front/src/modules/auth/sign-in-up/components/__stories__/EmailVerificationSent.stories.tsx
+++ b/packages/twenty-front/src/modules/auth/sign-in-up/components/__stories__/EmailVerificationSent.stories.tsx
@@ -3,7 +3,7 @@ import { type Meta, type StoryObj } from '@storybook/react';
 import { Modal } from '@/ui/layout/modal/components/Modal';
 import { ComponentDecorator } from 'twenty-ui/testing';
 import { SnackBarDecorator } from '~/testing/decorators/SnackBarDecorator';
-import { EmailVerificationSent } from '../EmailVerificationSent';
+import { EmailVerificationSent } from '@/auth/sign-in-up/components/EmailVerificationSent';
 
 // Wrap the component in Modal.Content to reflect how it's used in the app
 const RenderWithModal = (
diff --git a/packages/twenty-front/src/modules/auth/sign-in-up/hooks/useSignInUp.ts b/packages/twenty-front/src/modules/auth/sign-in-up/hooks/useSignInUp.ts
index a73a15b23c..23a451e887 100644
--- a/packages/twenty-front/src/modules/auth/sign-in-up/hooks/useSignInUp.ts
+++ b/packages/twenty-front/src/modules/auth/sign-in-up/hooks/useSignInUp.ts
@@ -21,7 +21,7 @@ import { AppPath } from 'twenty-shared/types';
 import { isDefined } from 'twenty-shared/utils';
 import { buildAppPathWithQueryParams } from '~/utils/buildAppPathWithQueryParams';
 import { isMatchingLocation } from '~/utils/isMatchingLocation';
-import { useAuth } from '../../hooks/useAuth';
+import { useAuth } from '@/auth/hooks/useAuth';
 
 export const useSignInUp = (form: UseFormReturn<Form>) => {
   const { enqueueErrorSnackBar } = useSnackBar();
diff --git a/packages/twenty-front/src/modules/auth/utils/__tests__/availableWorkspacesUtils.test.ts b/packages/twenty-front/src/modules/auth/utils/__tests__/availableWorkspacesUtils.test.ts
index 1518028b1e..ae599dd6d2 100644
--- a/packages/twenty-front/src/modules/auth/utils/__tests__/availableWorkspacesUtils.test.ts
+++ b/packages/twenty-front/src/modules/auth/utils/__tests__/availableWorkspacesUtils.test.ts
@@ -7,7 +7,7 @@ import {
   countAvailableWorkspaces,
   getAvailableWorkspacePathAndSearchParams,
   getFirstAvailableWorkspaces,
-} from '../availableWorkspacesUtils';
+} from '@/auth/utils/availableWorkspacesUtils';
 
 const createMockAvailableWorkspace = (
   overrides: Partial<AvailableWorkspace> = {},
diff --git a/packages/twenty-front/src/modules/captcha/utils/__tests__/getCaptchaUrlByProvider.test.ts b/packages/twenty-front/src/modules/captcha/utils/__tests__/getCaptchaUrlByProvider.test.ts
index 4567e0ece4..486791edae 100644
--- a/packages/twenty-front/src/modules/captcha/utils/__tests__/getCaptchaUrlByProvider.test.ts
+++ b/packages/twenty-front/src/modules/captcha/utils/__tests__/getCaptchaUrlByProvider.test.ts
@@ -1,6 +1,6 @@
 import { CaptchaDriverType } from '~/generated/graphql';
 
-import { getCaptchaUrlByProvider } from '../getCaptchaUrlByProvider';
+import { getCaptchaUrlByProvider } from '@/captcha/utils/getCaptchaUrlByProvider';
 
 describe('getCaptchaUrlByProvider', () => {
   it('handles GoogleRecaptcha', async () => {
diff --git a/packages/twenty-front/src/modules/captcha/utils/isCaptchaRequiredForPath.ts b/packages/twenty-front/src/modules/captcha/utils/isCaptchaRequiredForPath.ts
index 01b517e11c..c084810ed4 100644
--- a/packages/twenty-front/src/modules/captcha/utils/isCaptchaRequiredForPath.ts
+++ b/packages/twenty-front/src/modules/captcha/utils/isCaptchaRequiredForPath.ts
@@ -1,5 +1,5 @@
 import { matchPath } from 'react-router-dom';
-import { CAPTCHA_PROTECTED_PATHS } from '../constants/CaptchaProtectedPaths';
+import { CAPTCHA_PROTECTED_PATHS } from '@/captcha/constants/CaptchaProtectedPaths';
 
 export const isCaptchaRequiredForPath = (pathname: string): boolean =>
   CAPTCHA_PROTECTED_PATHS.some((path) =>
diff --git a/packages/twenty-front/src/modules/client-config/hooks/useClientConfig.ts b/packages/twenty-front/src/modules/client-config/hooks/useClientConfig.ts
index d396454768..09a9c6ccbb 100644
--- a/packages/twenty-front/src/modules/client-config/hooks/useClientConfig.ts
+++ b/packages/twenty-front/src/modules/client-config/hooks/useClientConfig.ts
@@ -26,8 +26,8 @@ import { type ClientConfig } from '@/client-config/types/ClientConfig';
 import { domainConfigurationState } from '@/domain-manager/states/domainConfigurationState';
 import { useCallback } from 'react';
 import { useRecoilState, useSetRecoilState } from 'recoil';
-import { clientConfigApiStatusState } from '../states/clientConfigApiStatusState';
-import { getClientConfig } from '../utils/getClientConfig';
+import { clientConfigApiStatusState } from '@/client-config/states/clientConfigApiStatusState';
+import { getClientConfig } from '@/client-config/utils/getClientConfig';
 
 type UseClientConfigResult = {
   data: { clientConfig: ClientConfig } | undefined;
diff --git a/packages/twenty-front/src/modules/client-config/utils/__tests__/clientConfigUtils.test.ts b/packages/twenty-front/src/modules/client-config/utils/__tests__/clientConfigUtils.test.ts
index 57c08d3643..6887a0f7a5 100644
--- a/packages/twenty-front/src/modules/client-config/utils/__tests__/clientConfigUtils.test.ts
+++ b/packages/twenty-front/src/modules/client-config/utils/__tests__/clientConfigUtils.test.ts
@@ -1,5 +1,5 @@
 import { REACT_APP_SERVER_BASE_URL } from '~/config';
-import { getClientConfig } from '../getClientConfig';
+import { getClientConfig } from '@/client-config/utils/getClientConfig';
 
 global.fetch = jest.fn();
 
diff --git a/packages/twenty-front/src/modules/command-menu/components/CommandMenuWidthEffect.tsx b/packages/twenty-front/src/modules/command-menu/components/CommandMenuWidthEffect.tsx
index 6d2fe04637..875b22bc61 100644
--- a/packages/twenty-front/src/modules/command-menu/components/CommandMenuWidthEffect.tsx
+++ b/packages/twenty-front/src/modules/command-menu/components/CommandMenuWidthEffect.tsx
@@ -4,7 +4,7 @@ import { useRecoilValue } from 'recoil';
 import {
   COMMAND_MENU_WIDTH_VAR,
   commandMenuWidthState,
-} from '../states/commandMenuWidthState';
+} from '@/command-menu/states/commandMenuWidthState';
 
 export const CommandMenuWidthEffect = () => {
   const commandMenuWidth = useRecoilValue(commandMenuWidthState);
diff --git a/packages/twenty-front/src/modules/command-menu/components/__stories__/CommandMenu.stories.tsx b/packages/twenty-front/src/modules/command-menu/components/__stories__/CommandMenu.stories.tsx
index 51e022eb94..4a669b9387 100644
--- a/packages/twenty-front/src/modules/command-menu/components/__stories__/CommandMenu.stories.tsx
+++ b/packages/twenty-front/src/modules/command-menu/components/__stories__/CommandMenu.stories.tsx
@@ -32,7 +32,7 @@ import { HttpResponse, graphql } from 'msw';
 import { IconDotsVertical } from 'twenty-ui/display';
 import { I18nFrontDecorator } from '~/testing/decorators/I18nFrontDecorator';
 import { JestContextStoreSetter } from '~/testing/jest/JestContextStoreSetter';
-import { type CommandMenu } from '../CommandMenu';
+import { type CommandMenu } from '@/command-menu/components/CommandMenu';
 
 const openTimeout = 50;
 
diff --git a/packages/twenty-front/src/modules/command-menu/hooks/__tests__/useCommandMenuOnItemClick.test.tsx b/packages/twenty-front/src/modules/command-menu/hooks/__tests__/useCommandMenuOnItemClick.test.tsx
index bcd615f273..53a30aed6f 100644
--- a/packages/twenty-front/src/modules/command-menu/hooks/__tests__/useCommandMenuOnItemClick.test.tsx
+++ b/packages/twenty-front/src/modules/command-menu/hooks/__tests__/useCommandMenuOnItemClick.test.tsx
@@ -3,7 +3,7 @@ import { renderHook } from '@testing-library/react';
 import { act } from 'react';
 import { MemoryRouter } from 'react-router-dom';
 import { RecoilRoot, useRecoilValue } from 'recoil';
-import { useCommandMenuOnItemClick } from '../useCommandMenuOnItemClick';
+import { useCommandMenuOnItemClick } from '@/command-menu/hooks/useCommandMenuOnItemClick';
 
 const Wrapper = ({ children }: { children: React.ReactNode }) => (
   <RecoilRoot>
diff --git a/packages/twenty-front/src/modules/command-menu/hooks/__tests__/useFilterActionsWithCommandMenuSearch.test.tsx b/packages/twenty-front/src/modules/command-menu/hooks/__tests__/useFilterActionsWithCommandMenuSearch.test.tsx
index 1bf16b420a..7f235d838c 100644
--- a/packages/twenty-front/src/modules/command-menu/hooks/__tests__/useFilterActionsWithCommandMenuSearch.test.tsx
+++ b/packages/twenty-front/src/modules/command-menu/hooks/__tests__/useFilterActionsWithCommandMenuSearch.test.tsx
@@ -3,7 +3,7 @@ import { ActionScope } from '@/action-menu/actions/types/ActionScope';
 import { ActionType } from '@/action-menu/actions/types/ActionType';
 import { renderHook } from '@testing-library/react';
 import { IconPlus } from 'twenty-ui/display';
-import { useFilterActionsWithCommandMenuSearch } from '../useFilterActionsWithCommandMenuSearch';
+import { useFilterActionsWithCommandMenuSearch } from '@/command-menu/hooks/useFilterActionsWithCommandMenuSearch';
 
 const MockComponent = <div>Mock Component</div>;
 
diff --git a/packages/twenty-front/src/modules/command-menu/hooks/__tests__/useWorkflowCommandMenu.test.tsx b/packages/twenty-front/src/modules/command-menu/hooks/__tests__/useWorkflowCommandMenu.test.tsx
index 3e95ea1d43..b4aae2f0e8 100644
--- a/packages/twenty-front/src/modules/command-menu/hooks/__tests__/useWorkflowCommandMenu.test.tsx
+++ b/packages/twenty-front/src/modules/command-menu/hooks/__tests__/useWorkflowCommandMenu.test.tsx
@@ -20,7 +20,7 @@ import { act } from 'react';
 import { IconBolt, IconSettingsAutomation, useIcons } from 'twenty-ui/display';
 import { getJestMetadataAndApolloMocksAndActionMenuWrapper } from '~/testing/jest/getJestMetadataAndApolloMocksAndActionMenuWrapper';
 import { generatedMockObjectMetadataItems } from '~/testing/utils/generatedMockObjectMetadataItems';
-import { useWorkflowCommandMenu } from '../useWorkflowCommandMenu';
+import { useWorkflowCommandMenu } from '@/command-menu/hooks/useWorkflowCommandMenu';
 
 jest.mock('uuid', () => ({
   v4: jest.fn().mockReturnValue('mocked-uuid'),
diff --git a/packages/twenty-front/src/modules/command-menu/hooks/useCommandMenu.ts b/packages/twenty-front/src/modules/command-menu/hooks/useCommandMenu.ts
index 1a14451836..8a6c4e7b77 100644
--- a/packages/twenty-front/src/modules/command-menu/hooks/useCommandMenu.ts
+++ b/packages/twenty-front/src/modules/command-menu/hooks/useCommandMenu.ts
@@ -13,7 +13,7 @@ import { useRemoveFocusItemFromFocusStackById } from '@/ui/utilities/focus/hooks
 import { t } from '@lingui/core/macro';
 import { useCallback } from 'react';
 import { IconDotsVertical } from 'twenty-ui/display';
-import { isCommandMenuOpenedState } from '../states/isCommandMenuOpenedState';
+import { isCommandMenuOpenedState } from '@/command-menu/states/isCommandMenuOpenedState';
 
 export const useCommandMenu = () => {
   const { navigateCommandMenu } = useNavigateCommandMenu();
diff --git a/packages/twenty-front/src/modules/command-menu/pages/message-thread/hooks/__tests__/useEmailThreadInCommandMenu.test.tsx b/packages/twenty-front/src/modules/command-menu/pages/message-thread/hooks/__tests__/useEmailThreadInCommandMenu.test.tsx
index 5fded4ab5c..197019a199 100644
--- a/packages/twenty-front/src/modules/command-menu/pages/message-thread/hooks/__tests__/useEmailThreadInCommandMenu.test.tsx
+++ b/packages/twenty-front/src/modules/command-menu/pages/message-thread/hooks/__tests__/useEmailThreadInCommandMenu.test.tsx
@@ -10,7 +10,7 @@ import {
 import { MessageParticipantRole } from 'twenty-shared/types';
 import { generateEmptyJestRecordNode } from '~/testing/jest/generateEmptyJestRecordNode';
 import { getJestMetadataAndApolloMocksWrapper } from '~/testing/jest/getJestMetadataAndApolloMocksWrapper';
-import { useEmailThreadInCommandMenu } from '../useEmailThreadInCommandMenu';
+import { useEmailThreadInCommandMenu } from '@/command-menu/pages/message-thread/hooks/useEmailThreadInCommandMenu';
 
 const mocks = [
   {
diff --git a/packages/twenty-front/src/modules/command-menu/pages/page-layout/hooks/__tests__/useChartSettingsValues.test.tsx b/packages/twenty-front/src/modules/command-menu/pages/page-layout/hooks/__tests__/useChartSettingsValues.test.tsx
index c12b0bf644..7081bf1693 100644
--- a/packages/twenty-front/src/modules/command-menu/pages/page-layout/hooks/__tests__/useChartSettingsValues.test.tsx
+++ b/packages/twenty-front/src/modules/command-menu/pages/page-layout/hooks/__tests__/useChartSettingsValues.test.tsx
@@ -14,7 +14,7 @@ import {
   GraphOrderBy,
   GraphType,
 } from '~/generated-metadata/graphql';
-import { useChartSettingsValues } from '../useChartSettingsValues';
+import { useChartSettingsValues } from '@/command-menu/pages/page-layout/hooks/useChartSettingsValues';
 
 const mockObjectMetadataItem: ObjectMetadataItem = {
   id: 'obj-1',
diff --git a/packages/twenty-front/src/modules/command-menu/pages/page-layout/utils/__tests__/buildChartGroupByFieldConfigUpdate.test.ts b/packages/twenty-front/src/modules/command-menu/pages/page-layout/utils/__tests__/buildChartGroupByFieldConfigUpdate.test.ts
index 4ee5811ae3..cda2c4621e 100644
--- a/packages/twenty-front/src/modules/command-menu/pages/page-layout/utils/__tests__/buildChartGroupByFieldConfigUpdate.test.ts
+++ b/packages/twenty-front/src/modules/command-menu/pages/page-layout/utils/__tests__/buildChartGroupByFieldConfigUpdate.test.ts
@@ -5,7 +5,7 @@ import {
   GraphOrderBy,
   type PieChartConfiguration,
 } from '~/generated/graphql';
-import { buildChartGroupByFieldConfigUpdate } from '../buildChartGroupByFieldConfigUpdate';
+import { buildChartGroupByFieldConfigUpdate } from '@/command-menu/pages/page-layout/utils/buildChartGroupByFieldConfigUpdate';
 
 describe('buildChartGroupByFieldConfigUpdate', () => {
   it('sets default orderBy and dateGranularity for primary axis', () => {
diff --git a/packages/twenty-front/src/modules/command-menu/pages/page-layout/utils/__tests__/getBarChartSettings.test.ts b/packages/twenty-front/src/modules/command-menu/pages/page-layout/utils/__tests__/getBarChartSettings.test.ts
index b60ecac331..dbf3fea6e0 100644
--- a/packages/twenty-front/src/modules/command-menu/pages/page-layout/utils/__tests__/getBarChartSettings.test.ts
+++ b/packages/twenty-front/src/modules/command-menu/pages/page-layout/utils/__tests__/getBarChartSettings.test.ts
@@ -19,7 +19,7 @@ import { SORT_BY_GROUP_BY_FIELD_SETTING } from '@/command-menu/pages/page-layout
 import { STACKED_BARS_SETTING } from '@/command-menu/pages/page-layout/constants/settings/StackedBarsSetting';
 import { IconAxisX, IconAxisY } from 'twenty-ui/display';
 import { GraphType } from '~/generated-metadata/graphql';
-import { getBarChartSettings } from '../getBarChartSettings';
+import { getBarChartSettings } from '@/command-menu/pages/page-layout/utils/getBarChartSettings';
 
 describe('getBarChartSettings', () => {
   describe('Vertical bar chart', () => {
diff --git a/packages/twenty-front/src/modules/command-menu/pages/page-layout/utils/__tests__/isAggregateChartConfiguration.test.ts b/packages/twenty-front/src/modules/command-menu/pages/page-layout/utils/__tests__/isAggregateChartConfiguration.test.ts
index 3733535dec..27d7d6fb47 100644
--- a/packages/twenty-front/src/modules/command-menu/pages/page-layout/utils/__tests__/isAggregateChartConfiguration.test.ts
+++ b/packages/twenty-front/src/modules/command-menu/pages/page-layout/utils/__tests__/isAggregateChartConfiguration.test.ts
@@ -2,7 +2,7 @@ import {
   type AggregateChartConfiguration,
   type BarChartConfiguration,
 } from '~/generated/graphql';
-import { isAggregateChartConfiguration } from '../isAggregateChartConfiguration';
+import { isAggregateChartConfiguration } from '@/command-menu/pages/page-layout/utils/isAggregateChartConfiguration';
 
 describe('isAggregateChartConfiguration', () => {
   it('should return true for AggregateChartConfiguration', () => {
diff --git a/packages/twenty-front/src/modules/command-menu/pages/page-layout/utils/__tests__/isBarChartConfiguration.test.ts b/packages/twenty-front/src/modules/command-menu/pages/page-layout/utils/__tests__/isBarChartConfiguration.test.ts
index 89b2566011..44a6019855 100644
--- a/packages/twenty-front/src/modules/command-menu/pages/page-layout/utils/__tests__/isBarChartConfiguration.test.ts
+++ b/packages/twenty-front/src/modules/command-menu/pages/page-layout/utils/__tests__/isBarChartConfiguration.test.ts
@@ -2,7 +2,7 @@ import {
   type BarChartConfiguration,
   type LineChartConfiguration,
 } from '~/generated/graphql';
-import { isBarChartConfiguration } from '../isBarChartConfiguration';
+import { isBarChartConfiguration } from '@/command-menu/pages/page-layout/utils/isBarChartConfiguration';
 
 describe('isBarChartConfiguration', () => {
   it('should return true for BarChartConfiguration', () => {
diff --git a/packages/twenty-front/src/modules/command-menu/pages/page-layout/utils/__tests__/isBarOrLineChartConfiguration.test.ts b/packages/twenty-front/src/modules/command-menu/pages/page-layout/utils/__tests__/isBarOrLineChartConfiguration.test.ts
index 18d720a6e9..beb40a69db 100644
--- a/packages/twenty-front/src/modules/command-menu/pages/page-layout/utils/__tests__/isBarOrLineChartConfiguration.test.ts
+++ b/packages/twenty-front/src/modules/command-menu/pages/page-layout/utils/__tests__/isBarOrLineChartConfiguration.test.ts
@@ -3,7 +3,7 @@ import {
   type LineChartConfiguration,
   type PieChartConfiguration,
 } from '~/generated/graphql';
-import { isBarOrLineChartConfiguration } from '../isBarOrLineChartConfiguration';
+import { isBarOrLineChartConfiguration } from '@/command-menu/pages/page-layout/utils/isBarOrLineChartConfiguration';
 
 describe('isBarOrLineChartConfiguration', () => {
   it('should return true for BarChartConfiguration', () => {
diff --git a/packages/twenty-front/src/modules/command-menu/pages/page-layout/utils/__tests__/isChartConfiguration.test.ts b/packages/twenty-front/src/modules/command-menu/pages/page-layout/utils/__tests__/isChartConfiguration.test.ts
index 0cd9f5f8b6..a397aa8e96 100644
--- a/packages/twenty-front/src/modules/command-menu/pages/page-layout/utils/__tests__/isChartConfiguration.test.ts
+++ b/packages/twenty-front/src/modules/command-menu/pages/page-layout/utils/__tests__/isChartConfiguration.test.ts
@@ -7,7 +7,7 @@ import {
   type PieChartConfiguration,
   type StandaloneRichTextConfiguration,
 } from '~/generated/graphql';
-import { isChartConfiguration } from '../isChartConfiguration';
+import { isChartConfiguration } from '@/command-menu/pages/page-layout/utils/isChartConfiguration';
 
 describe('isChartConfiguration', () => {
   it('should return true for BarChartConfiguration', () => {
diff --git a/packages/twenty-front/src/modules/command-menu/pages/page-layout/utils/__tests__/isFieldOrNestedFieldDateKind.test.ts b/packages/twenty-front/src/modules/command-menu/pages/page-layout/utils/__tests__/isFieldOrNestedFieldDateKind.test.ts
index 71711c98d0..dcdfc4bdb7 100644
--- a/packages/twenty-front/src/modules/command-menu/pages/page-layout/utils/__tests__/isFieldOrNestedFieldDateKind.test.ts
+++ b/packages/twenty-front/src/modules/command-menu/pages/page-layout/utils/__tests__/isFieldOrNestedFieldDateKind.test.ts
@@ -1,6 +1,6 @@
 import { type ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
 import { FieldMetadataType } from 'twenty-shared/types';
-import { isFieldOrRelationNestedFieldDateKind } from '../isFieldOrNestedFieldDateKind';
+import { isFieldOrRelationNestedFieldDateKind } from '@/command-menu/pages/page-layout/utils/isFieldOrNestedFieldDateKind';
 
 describe('isFieldOrNestedFieldDateKind', () => {
   it('returns false when fieldId is null', () => {
diff --git a/packages/twenty-front/src/modules/command-menu/pages/page-layout/utils/__tests__/isGaugeChartConfiguration.test.ts b/packages/twenty-front/src/modules/command-menu/pages/page-layout/utils/__tests__/isGaugeChartConfiguration.test.ts
index b80a31279d..44885060c2 100644
--- a/packages/twenty-front/src/modules/command-menu/pages/page-layout/utils/__tests__/isGaugeChartConfiguration.test.ts
+++ b/packages/twenty-front/src/modules/command-menu/pages/page-layout/utils/__tests__/isGaugeChartConfiguration.test.ts
@@ -2,7 +2,7 @@ import {
   type BarChartConfiguration,
   type GaugeChartConfiguration,
 } from '~/generated/graphql';
-import { isGaugeChartConfiguration } from '../isGaugeChartConfiguration';
+import { isGaugeChartConfiguration } from '@/command-menu/pages/page-layout/utils/isGaugeChartConfiguration';
 
 describe('isGaugeChartConfiguration', () => {
   it('should return true for GaugeChartConfiguration', () => {
diff --git a/packages/twenty-front/src/modules/command-menu/pages/page-layout/utils/__tests__/isIframeConfiguration.test.ts b/packages/twenty-front/src/modules/command-menu/pages/page-layout/utils/__tests__/isIframeConfiguration.test.ts
index e68f0e750d..9ba3af45c6 100644
--- a/packages/twenty-front/src/modules/command-menu/pages/page-layout/utils/__tests__/isIframeConfiguration.test.ts
+++ b/packages/twenty-front/src/modules/command-menu/pages/page-layout/utils/__tests__/isIframeConfiguration.test.ts
@@ -2,7 +2,7 @@ import {
   type BarChartConfiguration,
   type IframeConfiguration,
 } from '~/generated/graphql';
-import { isIframeConfiguration } from '../isIframeConfiguration';
+import { isIframeConfiguration } from '@/command-menu/pages/page-layout/utils/isIframeConfiguration';
 
 describe('isIframeConfiguration', () => {
   it('should return true for IframeConfiguration', () => {
diff --git a/packages/twenty-front/src/modules/command-menu/pages/page-layout/utils/__tests__/isLineChartConfiguration.test.ts b/packages/twenty-front/src/modules/command-menu/pages/page-layout/utils/__tests__/isLineChartConfiguration.test.ts
index 12ff2deba5..ad2e0a9c44 100644
--- a/packages/twenty-front/src/modules/command-menu/pages/page-layout/utils/__tests__/isLineChartConfiguration.test.ts
+++ b/packages/twenty-front/src/modules/command-menu/pages/page-layout/utils/__tests__/isLineChartConfiguration.test.ts
@@ -2,7 +2,7 @@ import {
   type BarChartConfiguration,
   type LineChartConfiguration,
 } from '~/generated/graphql';
-import { isLineChartConfiguration } from '../isLineChartConfiguration';
+import { isLineChartConfiguration } from '@/command-menu/pages/page-layout/utils/isLineChartConfiguration';
 
 describe('isLineChartConfiguration', () => {
   it('should return true for LineChartConfiguration', () => {
diff --git a/packages/twenty-front/src/modules/command-menu/pages/page-layout/utils/__tests__/isPieChartConfiguration.test.ts b/packages/twenty-front/src/modules/command-menu/pages/page-layout/utils/__tests__/isPieChartConfiguration.test.ts
index bf01a2472e..52bb99b6c5 100644
--- a/packages/twenty-front/src/modules/command-menu/pages/page-layout/utils/__tests__/isPieChartConfiguration.test.ts
+++ b/packages/twenty-front/src/modules/command-menu/pages/page-layout/utils/__tests__/isPieChartConfiguration.test.ts
@@ -2,7 +2,7 @@ import {
   type BarChartConfiguration,
   type PieChartConfiguration,
 } from '~/generated/graphql';
-import { isPieChartConfiguration } from '../isPieChartConfiguration';
+import { isPieChartConfiguration } from '@/command-menu/pages/page-layout/utils/isPieChartConfiguration';
 
 describe('isPieChartConfiguration', () => {
   it('should return true for PieChartConfiguration', () => {
diff --git a/packages/twenty-front/src/modules/command-menu/pages/page-layout/utils/__tests__/shouldHideChartSetting.test.ts b/packages/twenty-front/src/modules/command-menu/pages/page-layout/utils/__tests__/shouldHideChartSetting.test.ts
index ba55269def..97dbc02434 100644
--- a/packages/twenty-front/src/modules/command-menu/pages/page-layout/utils/__tests__/shouldHideChartSetting.test.ts
+++ b/packages/twenty-front/src/modules/command-menu/pages/page-layout/utils/__tests__/shouldHideChartSetting.test.ts
@@ -5,7 +5,7 @@ import { type ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataI
 import { msg } from '@lingui/core/macro';
 import { FieldMetadataType } from 'twenty-shared/types';
 import { IconChartBar } from 'twenty-ui/display';
-import { shouldHideChartSetting } from '../shouldHideChartSetting';
+import { shouldHideChartSetting } from '@/command-menu/pages/page-layout/utils/shouldHideChartSetting';
 
 describe('shouldHideChartSetting', () => {
   const mockItemWithoutDependencies: ChartSettingsItem = {
diff --git a/packages/twenty-front/src/modules/command-menu/pages/rich-text-page/components/CommandMenuEditRichTextPage.tsx b/packages/twenty-front/src/modules/command-menu/pages/rich-text-page/components/CommandMenuEditRichTextPage.tsx
index 50917ee4b5..e0edc99d80 100644
--- a/packages/twenty-front/src/modules/command-menu/pages/rich-text-page/components/CommandMenuEditRichTextPage.tsx
+++ b/packages/twenty-front/src/modules/command-menu/pages/rich-text-page/components/CommandMenuEditRichTextPage.tsx
@@ -5,7 +5,7 @@ import styled from '@emotion/styled';
 import { lazy, Suspense } from 'react';
 import Skeleton, { SkeletonTheme } from 'react-loading-skeleton';
 import { useRecoilValue } from 'recoil';
-import { viewableRichTextComponentState } from '../states/viewableRichTextComponentState';
+import { viewableRichTextComponentState } from '@/command-menu/pages/rich-text-page/states/viewableRichTextComponentState';
 
 const ActivityRichTextEditor = lazy(() =>
   import('@/activities/components/ActivityRichTextEditor').then((module) => ({
diff --git a/packages/twenty-front/src/modules/databases/utils/__tests__/getForeignDataWrapperType.test.ts b/packages/twenty-front/src/modules/databases/utils/__tests__/getForeignDataWrapperType.test.ts
index 3db265dd94..451fbc4f5a 100644
--- a/packages/twenty-front/src/modules/databases/utils/__tests__/getForeignDataWrapperType.test.ts
+++ b/packages/twenty-front/src/modules/databases/utils/__tests__/getForeignDataWrapperType.test.ts
@@ -1,4 +1,4 @@
-import { getForeignDataWrapperType } from '../getForeignDataWrapperType';
+import { getForeignDataWrapperType } from '@/databases/utils/getForeignDataWrapperType';
 
 describe('getForeignDataWrapperType', () => {
   it('should handle postgres', () => {
diff --git a/packages/twenty-front/src/modules/favorites/hooks/__tests__/useCreateFavorite.test.tsx b/packages/twenty-front/src/modules/favorites/hooks/__tests__/useCreateFavorite.test.tsx
index 46d6d2ad4d..1b54bbd98b 100644
--- a/packages/twenty-front/src/modules/favorites/hooks/__tests__/useCreateFavorite.test.tsx
+++ b/packages/twenty-front/src/modules/favorites/hooks/__tests__/useCreateFavorite.test.tsx
@@ -13,7 +13,7 @@ import {
   mockId,
   mockWorkspaceMember,
   mocks,
-} from '../__mocks__/useFavorites';
+} from '@/favorites/hooks/__mocks__/useFavorites';
 
 jest.mock('uuid', () => ({
   v4: () => mockId,
diff --git a/packages/twenty-front/src/modules/favorites/hooks/__tests__/useDeleteFavorite.test.tsx b/packages/twenty-front/src/modules/favorites/hooks/__tests__/useDeleteFavorite.test.tsx
index 64fdc17164..8d949fdf06 100644
--- a/packages/twenty-front/src/modules/favorites/hooks/__tests__/useDeleteFavorite.test.tsx
+++ b/packages/twenty-front/src/modules/favorites/hooks/__tests__/useDeleteFavorite.test.tsx
@@ -11,7 +11,7 @@ import {
   initialFavorites,
   mockWorkspaceMember,
   mocks,
-} from '../__mocks__/useFavorites';
+} from '@/favorites/hooks/__mocks__/useFavorites';
 
 jest.mock('@/object-record/hooks/useFindManyRecords', () => ({
   useFindManyRecords: () => ({ records: initialFavorites }),
diff --git a/packages/twenty-front/src/modules/favorites/hooks/__tests__/useFavorites.test.tsx b/packages/twenty-front/src/modules/favorites/hooks/__tests__/useFavorites.test.tsx
index b0ba943f06..2ac9a44ba2 100644
--- a/packages/twenty-front/src/modules/favorites/hooks/__tests__/useFavorites.test.tsx
+++ b/packages/twenty-front/src/modules/favorites/hooks/__tests__/useFavorites.test.tsx
@@ -12,7 +12,7 @@ import {
   initialFavorites,
   mockWorkspaceMember,
   sortedFavorites,
-} from '../__mocks__/useFavorites';
+} from '@/favorites/hooks/__mocks__/useFavorites';
 
 const Wrapper = getJestMetadataAndApolloMocksWrapper({
   apolloMocks: [],
diff --git a/packages/twenty-front/src/modules/favorites/hooks/__tests__/useHandleFavoriteDragAndDrop.test.tsx b/packages/twenty-front/src/modules/favorites/hooks/__tests__/useHandleFavoriteDragAndDrop.test.tsx
index ddd8c97a5c..b25543044c 100644
--- a/packages/twenty-front/src/modules/favorites/hooks/__tests__/useHandleFavoriteDragAndDrop.test.tsx
+++ b/packages/twenty-front/src/modules/favorites/hooks/__tests__/useHandleFavoriteDragAndDrop.test.tsx
@@ -17,7 +17,7 @@ import {
   initialFavorites,
   mockWorkspaceMember,
   mocks,
-} from '../__mocks__/useFavorites';
+} from '@/favorites/hooks/__mocks__/useFavorites';
 
 jest.mock('@/object-record/hooks/useFindManyRecords', () => ({
   useFindManyRecords: () => ({ records: initialFavorites }),
diff --git a/packages/twenty-front/src/modules/favorites/utils/__tests__/createFolderDroppableId.test.ts b/packages/twenty-front/src/modules/favorites/utils/__tests__/createFolderDroppableId.test.ts
index 3b43e162ec..e90bf9c5ea 100644
--- a/packages/twenty-front/src/modules/favorites/utils/__tests__/createFolderDroppableId.test.ts
+++ b/packages/twenty-front/src/modules/favorites/utils/__tests__/createFolderDroppableId.test.ts
@@ -1,5 +1,5 @@
 import { FAVORITE_DROPPABLE_IDS } from '@/favorites/constants/FavoriteDroppableIds';
-import { createFolderDroppableId } from '../createFolderDroppableId';
+import { createFolderDroppableId } from '@/favorites/utils/createFolderDroppableId';
 
 describe('createFolderDroppableId', () => {
   it('should create a valid folder droppable id', () => {
diff --git a/packages/twenty-front/src/modules/favorites/utils/__tests__/createFolderHeaderDroppableId.test.ts b/packages/twenty-front/src/modules/favorites/utils/__tests__/createFolderHeaderDroppableId.test.ts
index 997d997ca8..f2ed86c2ff 100644
--- a/packages/twenty-front/src/modules/favorites/utils/__tests__/createFolderHeaderDroppableId.test.ts
+++ b/packages/twenty-front/src/modules/favorites/utils/__tests__/createFolderHeaderDroppableId.test.ts
@@ -1,5 +1,5 @@
 import { FAVORITE_DROPPABLE_IDS } from '@/favorites/constants/FavoriteDroppableIds';
-import { createFolderHeaderDroppableId } from '../createFolderHeaderDroppableId';
+import { createFolderHeaderDroppableId } from '@/favorites/utils/createFolderHeaderDroppableId';
 
 describe('createFolderHeaderDroppableId', () => {
   it('should create a valid folder header droppable id', () => {
diff --git a/packages/twenty-front/src/modules/favorites/utils/__tests__/getFavoriteSecondaryLabel.test.ts b/packages/twenty-front/src/modules/favorites/utils/__tests__/getFavoriteSecondaryLabel.test.ts
index 1cfa403b10..dbc69744f2 100644
--- a/packages/twenty-front/src/modules/favorites/utils/__tests__/getFavoriteSecondaryLabel.test.ts
+++ b/packages/twenty-front/src/modules/favorites/utils/__tests__/getFavoriteSecondaryLabel.test.ts
@@ -1,5 +1,5 @@
 import { generatedMockObjectMetadataItems } from '~/testing/utils/generatedMockObjectMetadataItems';
-import { getFavoriteSecondaryLabel } from '../getFavoriteSecondaryLabel';
+import { getFavoriteSecondaryLabel } from '@/favorites/utils/getFavoriteSecondaryLabel';
 
 describe('getFavoriteSecondaryLabel', () => {
   it('should return "View" for view object', () => {
diff --git a/packages/twenty-front/src/modules/favorites/utils/__tests__/isLocationMatchingFavorite.test.ts b/packages/twenty-front/src/modules/favorites/utils/__tests__/isLocationMatchingFavorite.test.ts
index a5e958decc..f2632a6ba5 100644
--- a/packages/twenty-front/src/modules/favorites/utils/__tests__/isLocationMatchingFavorite.test.ts
+++ b/packages/twenty-front/src/modules/favorites/utils/__tests__/isLocationMatchingFavorite.test.ts
@@ -1,4 +1,4 @@
-import { isLocationMatchingFavorite } from '../isLocationMatchingFavorite';
+import { isLocationMatchingFavorite } from '@/favorites/utils/isLocationMatchingFavorite';
 
 describe('isLocationMatchingFavorite', () => {
   it('should return true if favorite link matches current path', () => {
diff --git a/packages/twenty-front/src/modules/favorites/utils/__tests__/validateAndExtractFolderId.test.ts b/packages/twenty-front/src/modules/favorites/utils/__tests__/validateAndExtractFolderId.test.ts
index dc579e6e64..6cf00ef4bd 100644
--- a/packages/twenty-front/src/modules/favorites/utils/__tests__/validateAndExtractFolderId.test.ts
+++ b/packages/twenty-front/src/modules/favorites/utils/__tests__/validateAndExtractFolderId.test.ts
@@ -1,5 +1,5 @@
 import { FAVORITE_DROPPABLE_IDS } from '@/favorites/constants/FavoriteDroppableIds';
-import { validateAndExtractFolderId } from '../validateAndExtractFolderId';
+import { validateAndExtractFolderId } from '@/favorites/utils/validateAndExtractFolderId';
 
 describe('validateAndExtractFolderId', () => {
   it('should return null for orphan favorites', () => {
diff --git a/packages/twenty-front/src/modules/file/utils/__tests__/formatFileSize.test.ts b/packages/twenty-front/src/modules/file/utils/__tests__/formatFileSize.test.ts
index e984857662..014d954a19 100644
--- a/packages/twenty-front/src/modules/file/utils/__tests__/formatFileSize.test.ts
+++ b/packages/twenty-front/src/modules/file/utils/__tests__/formatFileSize.test.ts
@@ -1,4 +1,4 @@
-import { formatFileSize } from '../formatFileSize';
+import { formatFileSize } from '@/file/utils/formatFileSize';
 
 describe('formatFileSize', () => {
   it('should format bytes correctly', () => {
diff --git a/packages/twenty-front/src/modules/keyboard-shortcut-menu/components/KeyboardShortcutMenu.tsx b/packages/twenty-front/src/modules/keyboard-shortcut-menu/components/KeyboardShortcutMenu.tsx
index d9ccbea016..32bfec5fa7 100644
--- a/packages/twenty-front/src/modules/keyboard-shortcut-menu/components/KeyboardShortcutMenu.tsx
+++ b/packages/twenty-front/src/modules/keyboard-shortcut-menu/components/KeyboardShortcutMenu.tsx
@@ -2,8 +2,8 @@ import { useRecoilValue } from 'recoil';
 
 import { useCommandMenu } from '@/command-menu/hooks/useCommandMenu';
 
-import { useKeyboardShortcutMenu } from '../hooks/useKeyboardShortcutMenu';
-import { isKeyboardShortcutMenuOpenedState } from '../states/isKeyboardShortcutMenuOpenedState';
+import { useKeyboardShortcutMenu } from '@/keyboard-shortcut-menu/hooks/useKeyboardShortcutMenu';
+import { isKeyboardShortcutMenuOpenedState } from '@/keyboard-shortcut-menu/states/isKeyboardShortcutMenuOpenedState';
 
 import { KeyboardShortcutMenuOpenContent } from '@/keyboard-shortcut-menu/components/KeyboardShortcutMenuOpenContent';
 import { useGlobalHotkeys } from '@/ui/utilities/hotkey/hooks/useGlobalHotkeys';
diff --git a/packages/twenty-front/src/modules/keyboard-shortcut-menu/components/KeyboardShortcutMenuOpenContent.tsx b/packages/twenty-front/src/modules/keyboard-shortcut-menu/components/KeyboardShortcutMenuOpenContent.tsx
index 1cfde2c378..7d412c7793 100644
--- a/packages/twenty-front/src/modules/keyboard-shortcut-menu/components/KeyboardShortcutMenuOpenContent.tsx
+++ b/packages/twenty-front/src/modules/keyboard-shortcut-menu/components/KeyboardShortcutMenuOpenContent.tsx
@@ -6,7 +6,7 @@ import { KEYBOARD_SHORTCUTS_TABLE } from '@/keyboard-shortcut-menu/constants/Key
 import {
   KEYBOARD_SHORTCUT_MENU_INSTANCE_ID,
   useKeyboardShortcutMenu,
-} from '../hooks/useKeyboardShortcutMenu';
+} from '@/keyboard-shortcut-menu/hooks/useKeyboardShortcutMenu';
 
 import { useHotkeysOnFocusedElement } from '@/ui/utilities/hotkey/hooks/useHotkeysOnFocusedElement';
 import { t } from '@lingui/core/macro';
diff --git a/packages/twenty-front/src/modules/keyboard-shortcut-menu/components/__stories__/KeyboardShortcutMenu.stories.tsx b/packages/twenty-front/src/modules/keyboard-shortcut-menu/components/__stories__/KeyboardShortcutMenu.stories.tsx
index 33d0a4f854..341a18c338 100644
--- a/packages/twenty-front/src/modules/keyboard-shortcut-menu/components/__stories__/KeyboardShortcutMenu.stories.tsx
+++ b/packages/twenty-front/src/modules/keyboard-shortcut-menu/components/__stories__/KeyboardShortcutMenu.stories.tsx
@@ -7,7 +7,7 @@ import { useKeyboardShortcutMenu } from '@/keyboard-shortcut-menu/hooks/useKeybo
 import { useEffect } from 'react';
 import { ComponentWithRouterDecorator } from '~/testing/decorators/ComponentWithRouterDecorator';
 import { I18nFrontDecorator } from '~/testing/decorators/I18nFrontDecorator';
-import { KeyboardShortcutMenu } from '../KeyboardShortcutMenu';
+import { KeyboardShortcutMenu } from '@/keyboard-shortcut-menu/components/KeyboardShortcutMenu';
 
 const meta: Meta<typeof KeyboardShortcutMenu> = {
   title: 'Modules/KeyboardShortcutMenu/KeyboardShortcutMenu',
diff --git a/packages/twenty-front/src/modules/keyboard-shortcut-menu/constants/KeyboardShortcutsGeneral.ts b/packages/twenty-front/src/modules/keyboard-shortcut-menu/constants/KeyboardShortcutsGeneral.ts
index 187b4b20c2..e3227d6ca7 100644
--- a/packages/twenty-front/src/modules/keyboard-shortcut-menu/constants/KeyboardShortcutsGeneral.ts
+++ b/packages/twenty-front/src/modules/keyboard-shortcut-menu/constants/KeyboardShortcutsGeneral.ts
@@ -1,4 +1,7 @@
-import { type Shortcut, ShortcutType } from '../types/Shortcut';
+import {
+  type Shortcut,
+  ShortcutType,
+} from '@/keyboard-shortcut-menu/types/Shortcut';
 import { getOsControlSymbol } from 'twenty-ui/utilities';
 
 export const KEYBOARD_SHORTCUTS_GENERAL: Shortcut[] = [
diff --git a/packages/twenty-front/src/modules/keyboard-shortcut-menu/constants/KeyboardShortcutsTable.ts b/packages/twenty-front/src/modules/keyboard-shortcut-menu/constants/KeyboardShortcutsTable.ts
index 5e6ec9ec04..6a466ee384 100644
--- a/packages/twenty-front/src/modules/keyboard-shortcut-menu/constants/KeyboardShortcutsTable.ts
+++ b/packages/twenty-front/src/modules/keyboard-shortcut-menu/constants/KeyboardShortcutsTable.ts
@@ -1,4 +1,7 @@
-import { type Shortcut, ShortcutType } from '../types/Shortcut';
+import {
+  type Shortcut,
+  ShortcutType,
+} from '@/keyboard-shortcut-menu/types/Shortcut';
 
 export const KEYBOARD_SHORTCUTS_TABLE: Shortcut[] = [
   {
diff --git a/packages/twenty-front/src/modules/keyboard-shortcut-menu/hooks/__tests__/useKeyboardShortcutMenu.test.tsx b/packages/twenty-front/src/modules/keyboard-shortcut-menu/hooks/__tests__/useKeyboardShortcutMenu.test.tsx
index d6e7bfe952..077479daa3 100644
--- a/packages/twenty-front/src/modules/keyboard-shortcut-menu/hooks/__tests__/useKeyboardShortcutMenu.test.tsx
+++ b/packages/twenty-front/src/modules/keyboard-shortcut-menu/hooks/__tests__/useKeyboardShortcutMenu.test.tsx
@@ -5,7 +5,7 @@ import { RecoilRoot, useRecoilValue } from 'recoil';
 
 import { isKeyboardShortcutMenuOpenedState } from '@/keyboard-shortcut-menu/states/isKeyboardShortcutMenuOpenedState';
 
-import { useKeyboardShortcutMenu } from '../useKeyboardShortcutMenu';
+import { useKeyboardShortcutMenu } from '@/keyboard-shortcut-menu/hooks/useKeyboardShortcutMenu';
 
 const mockPushFocusItemToFocusStack = jest.fn();
 const mockRemoveFocusItemFromFocusStackById = jest.fn();
diff --git a/packages/twenty-front/src/modules/keyboard-shortcut-menu/hooks/useKeyboardShortcutMenu.ts b/packages/twenty-front/src/modules/keyboard-shortcut-menu/hooks/useKeyboardShortcutMenu.ts
index b7fa6a5f4e..5aaca9dfcf 100644
--- a/packages/twenty-front/src/modules/keyboard-shortcut-menu/hooks/useKeyboardShortcutMenu.ts
+++ b/packages/twenty-front/src/modules/keyboard-shortcut-menu/hooks/useKeyboardShortcutMenu.ts
@@ -3,7 +3,7 @@ import { useRecoilCallback } from 'recoil';
 import { usePushFocusItemToFocusStack } from '@/ui/utilities/focus/hooks/usePushFocusItemToFocusStack';
 import { useRemoveFocusItemFromFocusStackById } from '@/ui/utilities/focus/hooks/useRemoveFocusItemFromFocusStackById';
 import { FocusComponentType } from '@/ui/utilities/focus/types/FocusComponentType';
-import { isKeyboardShortcutMenuOpenedState } from '../states/isKeyboardShortcutMenuOpenedState';
+import { isKeyboardShortcutMenuOpenedState } from '@/keyboard-shortcut-menu/states/isKeyboardShortcutMenuOpenedState';
 
 export const KEYBOARD_SHORTCUT_MENU_INSTANCE_ID = 'keyboard-shortcut-menu';
 
diff --git a/packages/twenty-front/src/modules/metadata-error-handler/hooks/useMetadataErrorHandler.ts b/packages/twenty-front/src/modules/metadata-error-handler/hooks/useMetadataErrorHandler.ts
index 09c8bca06d..0e305af4bf 100644
--- a/packages/twenty-front/src/modules/metadata-error-handler/hooks/useMetadataErrorHandler.ts
+++ b/packages/twenty-front/src/modules/metadata-error-handler/hooks/useMetadataErrorHandler.ts
@@ -7,7 +7,7 @@ import {
   type AllMetadataName,
   WorkspaceMigrationV2ExceptionCode,
 } from 'twenty-shared/metadata';
-import { classifyMetadataError } from '../utils/classify-metadata-error.util';
+import { classifyMetadataError } from '@/metadata-error-handler/utils/classify-metadata-error.util';
 
 export const useMetadataErrorHandler = () => {
   const { enqueueErrorSnackBar } = useSnackBar();
diff --git a/packages/twenty-front/src/modules/navigation/components/MobileNavigationBar.tsx b/packages/twenty-front/src/modules/navigation/components/MobileNavigationBar.tsx
index bc8d57ac93..440858002d 100644
--- a/packages/twenty-front/src/modules/navigation/components/MobileNavigationBar.tsx
+++ b/packages/twenty-front/src/modules/navigation/components/MobileNavigationBar.tsx
@@ -17,8 +17,8 @@ import {
   IconSettings,
 } from 'twenty-ui/display';
 import { NavigationBar } from 'twenty-ui/navigation';
-import { useIsSettingsPage } from '../hooks/useIsSettingsPage';
-import { currentMobileNavigationDrawerState } from '../states/currentMobileNavigationDrawerState';
+import { useIsSettingsPage } from '@/navigation/hooks/useIsSettingsPage';
+import { currentMobileNavigationDrawerState } from '@/navigation/states/currentMobileNavigationDrawerState';
 
 type NavigationBarItemName = 'main' | 'search' | 'tasks' | 'settings';
 
diff --git a/packages/twenty-front/src/modules/navigation/components/__stories__/AppNavigationDrawer.stories.tsx b/packages/twenty-front/src/modules/navigation/components/__stories__/AppNavigationDrawer.stories.tsx
index 34220894f5..74ef51c310 100644
--- a/packages/twenty-front/src/modules/navigation/components/__stories__/AppNavigationDrawer.stories.tsx
+++ b/packages/twenty-front/src/modules/navigation/components/__stories__/AppNavigationDrawer.stories.tsx
@@ -15,7 +15,7 @@ import { I18nFrontDecorator } from '~/testing/decorators/I18nFrontDecorator';
 import {
   AppNavigationDrawer,
   type AppNavigationDrawerProps,
-} from '../AppNavigationDrawer';
+} from '@/navigation/components/AppNavigationDrawer';
 
 const MobileNavigationDrawerStateSetterEffect = ({
   mobileNavigationDrawer = 'main',
diff --git a/packages/twenty-front/src/modules/navigation/hooks/__tests__/useIsSettingsPage.test.tsx b/packages/twenty-front/src/modules/navigation/hooks/__tests__/useIsSettingsPage.test.tsx
index 4faaf5901e..13efea2e57 100644
--- a/packages/twenty-front/src/modules/navigation/hooks/__tests__/useIsSettingsPage.test.tsx
+++ b/packages/twenty-front/src/modules/navigation/hooks/__tests__/useIsSettingsPage.test.tsx
@@ -1,7 +1,7 @@
 import { MemoryRouter } from 'react-router-dom';
 import { renderHook } from '@testing-library/react';
 
-import { useIsSettingsPage } from '../useIsSettingsPage';
+import { useIsSettingsPage } from '@/navigation/hooks/useIsSettingsPage';
 
 const getWrapper =
   (initialIndex: 0 | 1) =>
diff --git a/packages/twenty-front/src/modules/navigation/utils/__tests__/indexAppPath.test.ts b/packages/twenty-front/src/modules/navigation/utils/__tests__/indexAppPath.test.ts
index bd7c044214..a71170a882 100644
--- a/packages/twenty-front/src/modules/navigation/utils/__tests__/indexAppPath.test.ts
+++ b/packages/twenty-front/src/modules/navigation/utils/__tests__/indexAppPath.test.ts
@@ -1,5 +1,5 @@
 import { AppPath } from 'twenty-shared/types';
-import indexAppPath from '../indexAppPath';
+import indexAppPath from '@/navigation/utils/indexAppPath';
 
 describe('getIndexAppPath', () => {
   it('returns the index app path', () => {
diff --git a/packages/twenty-front/src/modules/object-metadata/components/ApolloCoreProvider.tsx b/packages/twenty-front/src/modules/object-metadata/components/ApolloCoreProvider.tsx
index 0b210d2355..11595b73a1 100644
--- a/packages/twenty-front/src/modules/object-metadata/components/ApolloCoreProvider.tsx
+++ b/packages/twenty-front/src/modules/object-metadata/components/ApolloCoreProvider.tsx
@@ -1,6 +1,6 @@
 import { useApolloFactory } from '@/apollo/hooks/useApolloFactory';
 
-import { ApolloCoreClientContext } from '../contexts/ApolloCoreClientContext';
+import { ApolloCoreClientContext } from '@/object-metadata/contexts/ApolloCoreClientContext';
 
 export const ApolloCoreProvider = ({
   children,
diff --git a/packages/twenty-front/src/modules/object-metadata/hooks/__tests__/useCreateOneObjectMetadataItem.test.tsx b/packages/twenty-front/src/modules/object-metadata/hooks/__tests__/useCreateOneObjectMetadataItem.test.tsx
index 0aa4845014..819ed25b23 100644
--- a/packages/twenty-front/src/modules/object-metadata/hooks/__tests__/useCreateOneObjectMetadataItem.test.tsx
+++ b/packages/twenty-front/src/modules/object-metadata/hooks/__tests__/useCreateOneObjectMetadataItem.test.tsx
@@ -8,7 +8,7 @@ import {
   query,
   responseData,
   variables,
-} from '../__mocks__/useCreateOneObjectMetadataItem';
+} from '@/object-metadata/hooks/__mocks__/useCreateOneObjectMetadataItem';
 
 import { jestExpectSuccessfulMetadataRequestResult } from '@/object-metadata/hooks/__tests__/utils/jest-expect-metadata-request-status.util';
 import { GET_CURRENT_USER } from '@/users/graphql/queries/getCurrentUser';
@@ -16,7 +16,7 @@ import { mockedUserData } from '~/testing/mock-data/users';
 import {
   query as findManyObjectMetadataItemsQuery,
   responseData as findManyObjectMetadataItemsResponseData,
-} from '../__mocks__/useFindManyObjectMetadataItems';
+} from '@/object-metadata/hooks/__mocks__/useFindManyObjectMetadataItems';
 
 const mocks = [
   {
diff --git a/packages/twenty-front/src/modules/object-metadata/hooks/__tests__/useDeleteOneObjectMetadataItem.test.tsx b/packages/twenty-front/src/modules/object-metadata/hooks/__tests__/useDeleteOneObjectMetadataItem.test.tsx
index c9b7146bc5..33acb5d50d 100644
--- a/packages/twenty-front/src/modules/object-metadata/hooks/__tests__/useDeleteOneObjectMetadataItem.test.tsx
+++ b/packages/twenty-front/src/modules/object-metadata/hooks/__tests__/useDeleteOneObjectMetadataItem.test.tsx
@@ -6,7 +6,7 @@ import {
   query,
   responseData,
   variables,
-} from '../__mocks__/useDeleteOneObjectMetadataItem';
+} from '@/object-metadata/hooks/__mocks__/useDeleteOneObjectMetadataItem';
 
 import { jestExpectSuccessfulMetadataRequestResult } from '@/object-metadata/hooks/__tests__/utils/jest-expect-metadata-request-status.util';
 import { GET_CURRENT_USER } from '@/users/graphql/queries/getCurrentUser';
@@ -17,7 +17,7 @@ import { mockedCoreViewsData } from '~/testing/mock-data/views';
 import {
   query as findManyObjectMetadataItemsQuery,
   responseData as findManyObjectMetadataItemsResponseData,
-} from '../__mocks__/useFindManyObjectMetadataItems';
+} from '@/object-metadata/hooks/__mocks__/useFindManyObjectMetadataItems';
 
 const mocks = [
   {
diff --git a/packages/twenty-front/src/modules/object-metadata/hooks/__tests__/useFieldMetadataItem.test.tsx b/packages/twenty-front/src/modules/object-metadata/hooks/__tests__/useFieldMetadataItem.test.tsx
index c8830f0cd5..eb98ee7643 100644
--- a/packages/twenty-front/src/modules/object-metadata/hooks/__tests__/useFieldMetadataItem.test.tsx
+++ b/packages/twenty-front/src/modules/object-metadata/hooks/__tests__/useFieldMetadataItem.test.tsx
@@ -13,7 +13,7 @@ import {
   queries,
   responseData,
   variables,
-} from '../__mocks__/useFieldMetadataItem';
+} from '@/object-metadata/hooks/__mocks__/useFieldMetadataItem';
 
 import { jestExpectSuccessfulMetadataRequestResult } from '@/object-metadata/hooks/__tests__/utils/jest-expect-metadata-request-status.util';
 import { GET_CURRENT_USER } from '@/users/graphql/queries/getCurrentUser';
@@ -21,7 +21,7 @@ import { mockedUserData } from '~/testing/mock-data/users';
 import {
   query as findManyObjectMetadataItemsQuery,
   responseData as findManyObjectMetadataItemsResponseData,
-} from '../__mocks__/useFindManyObjectMetadataItems';
+} from '@/object-metadata/hooks/__mocks__/useFindManyObjectMetadataItems';
 
 jest.mock('@/object-metadata/hooks/useUpdateOneFieldMetadataItem', () => ({
   useUpdateOneFieldMetadataItem: () => ({
diff --git a/packages/twenty-front/src/modules/object-metadata/hooks/__tests__/useFindManyObjectMetadataItems.test.tsx b/packages/twenty-front/src/modules/object-metadata/hooks/__tests__/useFindManyObjectMetadataItems.test.tsx
index c4668d9908..834e0b23b3 100644
--- a/packages/twenty-front/src/modules/object-metadata/hooks/__tests__/useFindManyObjectMetadataItems.test.tsx
+++ b/packages/twenty-front/src/modules/object-metadata/hooks/__tests__/useFindManyObjectMetadataItems.test.tsx
@@ -9,7 +9,7 @@ import { SnackBarComponentInstanceContext } from '@/ui/feedback/snack-bar-manage
 import {
   query,
   responseData,
-} from '../__mocks__/useFindManyObjectMetadataItems';
+} from '@/object-metadata/hooks/__mocks__/useFindManyObjectMetadataItems';
 
 const mocks = [
   {
diff --git a/packages/twenty-front/src/modules/object-metadata/hooks/__tests__/useObjectNamePluralFromSingular.test.tsx b/packages/twenty-front/src/modules/object-metadata/hooks/__tests__/useObjectNamePluralFromSingular.test.tsx
index 8d9038be47..b24ce69a71 100644
--- a/packages/twenty-front/src/modules/object-metadata/hooks/__tests__/useObjectNamePluralFromSingular.test.tsx
+++ b/packages/twenty-front/src/modules/object-metadata/hooks/__tests__/useObjectNamePluralFromSingular.test.tsx
@@ -2,7 +2,7 @@ import { renderHook } from '@testing-library/react';
 import { RecoilRoot } from 'recoil';
 
 import { JestObjectMetadataItemSetter } from '~/testing/jest/JestObjectMetadataItemSetter';
-import { useObjectNamePluralFromSingular } from '../useObjectNamePluralFromSingular';
+import { useObjectNamePluralFromSingular } from '@/object-metadata/hooks/useObjectNamePluralFromSingular';
 
 describe('useObjectNamePluralFromSingular', () => {
   it('should work as expected', async () => {
diff --git a/packages/twenty-front/src/modules/object-metadata/hooks/__tests__/useObjectNameSingularFromPlural.test.tsx b/packages/twenty-front/src/modules/object-metadata/hooks/__tests__/useObjectNameSingularFromPlural.test.tsx
index c3a5308fba..0185d0454c 100644
--- a/packages/twenty-front/src/modules/object-metadata/hooks/__tests__/useObjectNameSingularFromPlural.test.tsx
+++ b/packages/twenty-front/src/modules/object-metadata/hooks/__tests__/useObjectNameSingularFromPlural.test.tsx
@@ -2,7 +2,7 @@ import { renderHook } from '@testing-library/react';
 import { RecoilRoot } from 'recoil';
 
 import { JestObjectMetadataItemSetter } from '~/testing/jest/JestObjectMetadataItemSetter';
-import { useObjectNameSingularFromPlural } from '../useObjectNameSingularFromPlural';
+import { useObjectNameSingularFromPlural } from '@/object-metadata/hooks/useObjectNameSingularFromPlural';
 
 describe('useObjectNameSingularFromPlural', () => {
   it('should work as expected', async () => {
diff --git a/packages/twenty-front/src/modules/object-metadata/hooks/useColumnDefinitionsFromObjectMetadata.ts b/packages/twenty-front/src/modules/object-metadata/hooks/useColumnDefinitionsFromObjectMetadata.ts
index 9b05bc6282..256f165684 100644
--- a/packages/twenty-front/src/modules/object-metadata/hooks/useColumnDefinitionsFromObjectMetadata.ts
+++ b/packages/twenty-front/src/modules/object-metadata/hooks/useColumnDefinitionsFromObjectMetadata.ts
@@ -6,7 +6,7 @@ import { filterAvailableTableColumns } from '@/object-record/utils/filterAvailab
 import { availableFieldMetadataItemsForFilterFamilySelector } from '@/object-metadata/states/availableFieldMetadataItemsForFilterFamilySelector';
 import { availableFieldMetadataItemsForSortFamilySelector } from '@/object-metadata/states/availableFieldMetadataItemsForSortFamilySelector';
 import { useRecoilValue } from 'recoil';
-import { formatFieldMetadataItemAsColumnDefinition } from '../utils/formatFieldMetadataItemAsColumnDefinition';
+import { formatFieldMetadataItemAsColumnDefinition } from '@/object-metadata/utils/formatFieldMetadataItemAsColumnDefinition';
 
 export const useColumnDefinitionsFromObjectMetadata = (
   objectMetadataItem: ObjectMetadataItem,
diff --git a/packages/twenty-front/src/modules/object-metadata/hooks/useFieldMetadataItem.ts b/packages/twenty-front/src/modules/object-metadata/hooks/useFieldMetadataItem.ts
index ec22245ae5..92e50b56da 100644
--- a/packages/twenty-front/src/modules/object-metadata/hooks/useFieldMetadataItem.ts
+++ b/packages/twenty-front/src/modules/object-metadata/hooks/useFieldMetadataItem.ts
@@ -1,6 +1,6 @@
 import { type Field } from '~/generated-metadata/graphql';
 
-import { formatFieldMetadataItemInput } from '../utils/formatFieldMetadataItemInput';
+import { formatFieldMetadataItemInput } from '@/object-metadata/utils/formatFieldMetadataItemInput';
 
 import { type RelationCreationPayload } from 'twenty-shared/types';
 import { useCreateOneFieldMetadataItem } from './useCreateOneFieldMetadataItem';
diff --git a/packages/twenty-front/src/modules/object-metadata/hooks/useFindManyObjectMetadataItems.ts b/packages/twenty-front/src/modules/object-metadata/hooks/useFindManyObjectMetadataItems.ts
index dea634e657..8112024f0c 100644
--- a/packages/twenty-front/src/modules/object-metadata/hooks/useFindManyObjectMetadataItems.ts
+++ b/packages/twenty-front/src/modules/object-metadata/hooks/useFindManyObjectMetadataItems.ts
@@ -10,8 +10,8 @@ import { logError } from '~/utils/logError';
 
 import { enrichObjectMetadataItemsWithPermissions } from '@/object-metadata/utils/enrichObjectMetadataItemsWithPermissions';
 import { useObjectPermissions } from '@/object-record/hooks/useObjectPermissions';
-import { FIND_MANY_OBJECT_METADATA_ITEMS } from '../graphql/queries';
-import { mapPaginatedObjectMetadataItemsToObjectMetadataItems } from '../utils/mapPaginatedObjectMetadataItemsToObjectMetadataItems';
+import { FIND_MANY_OBJECT_METADATA_ITEMS } from '@/object-metadata/graphql/queries';
+import { mapPaginatedObjectMetadataItemsToObjectMetadataItems } from '@/object-metadata/utils/mapPaginatedObjectMetadataItemsToObjectMetadataItems';
 
 export const useFindManyObjectMetadataItems = ({
   skip,
diff --git a/packages/twenty-front/src/modules/object-metadata/hooks/useGetRelationMetadata.ts b/packages/twenty-front/src/modules/object-metadata/hooks/useGetRelationMetadata.ts
index 64b4806b2d..677228eb6b 100644
--- a/packages/twenty-front/src/modules/object-metadata/hooks/useGetRelationMetadata.ts
+++ b/packages/twenty-front/src/modules/object-metadata/hooks/useGetRelationMetadata.ts
@@ -3,7 +3,7 @@ import { useRecoilCallback } from 'recoil';
 import { objectMetadataItemFamilySelector } from '@/object-metadata/states/objectMetadataItemFamilySelector';
 import { FieldMetadataType } from '~/generated-metadata/graphql';
 
-import { type FieldMetadataItem } from '../types/FieldMetadataItem';
+import { type FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';
 
 export const useGetRelationMetadata = () =>
   useRecoilCallback(
diff --git a/packages/twenty-front/src/modules/object-metadata/hooks/useObjectMetadataItem.ts b/packages/twenty-front/src/modules/object-metadata/hooks/useObjectMetadataItem.ts
index af016b779d..0e247003a5 100644
--- a/packages/twenty-front/src/modules/object-metadata/hooks/useObjectMetadataItem.ts
+++ b/packages/twenty-front/src/modules/object-metadata/hooks/useObjectMetadataItem.ts
@@ -5,7 +5,7 @@ import { objectMetadataItemFamilySelector } from '@/object-metadata/states/objec
 import { objectMetadataItemsState } from '@/object-metadata/states/objectMetadataItemsState';
 
 import { isDefined } from 'twenty-shared/utils';
-import { type ObjectMetadataItemIdentifier } from '../types/ObjectMetadataItemIdentifier';
+import { type ObjectMetadataItemIdentifier } from '@/object-metadata/types/ObjectMetadataItemIdentifier';
 
 export const useObjectMetadataItem = ({
   objectNameSingular,
diff --git a/packages/twenty-front/src/modules/object-metadata/utils/__tests__/formatFieldMetadataItemInput.test.ts b/packages/twenty-front/src/modules/object-metadata/utils/__tests__/formatFieldMetadataItemInput.test.ts
index 90317b5286..8dee548eb0 100644
--- a/packages/twenty-front/src/modules/object-metadata/utils/__tests__/formatFieldMetadataItemInput.test.ts
+++ b/packages/twenty-front/src/modules/object-metadata/utils/__tests__/formatFieldMetadataItemInput.test.ts
@@ -1,7 +1,7 @@
 import { type FieldMetadataItemOption } from '@/object-metadata/types/FieldMetadataItem';
 import { FieldMetadataType } from '~/generated-metadata/graphql';
 
-import { formatFieldMetadataItemInput } from '../formatFieldMetadataItemInput';
+import { formatFieldMetadataItemInput } from '@/object-metadata/utils/formatFieldMetadataItemInput';
 
 describe('formatFieldMetadataItemInput', () => {
   it('should format the field metadata item input correctly', () => {
diff --git a/packages/twenty-front/src/modules/object-metadata/utils/enrichObjectMetadataItemsWithPermissions.ts b/packages/twenty-front/src/modules/object-metadata/utils/enrichObjectMetadataItemsWithPermissions.ts
index dd7c872531..4e0e7bc752 100644
--- a/packages/twenty-front/src/modules/object-metadata/utils/enrichObjectMetadataItemsWithPermissions.ts
+++ b/packages/twenty-front/src/modules/object-metadata/utils/enrichObjectMetadataItemsWithPermissions.ts
@@ -3,7 +3,7 @@ import { getNonUpdatableFieldMetadataIdsFromObjectPermissions } from '@/object-m
 import { getObjectPermissionsFromMapByObjectMetadataId } from '@/settings/roles/role-permissions/objects-permissions/utils/getObjectPermissionsFromMapByObjectMetadataId';
 import { type ObjectPermissions } from 'twenty-shared/types';
 import { isDefined } from 'twenty-shared/utils';
-import { type ObjectMetadataItem } from '../types/ObjectMetadataItem';
+import { type ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
 
 type enrichObjectMetadataItemsWithPermissionsArgs = {
   objectMetadataItems: Omit<
diff --git a/packages/twenty-front/src/modules/object-metadata/utils/formatFieldMetadataItemAsFieldDefinition.ts b/packages/twenty-front/src/modules/object-metadata/utils/formatFieldMetadataItemAsFieldDefinition.ts
index 8390fb388e..7d1780af88 100644
--- a/packages/twenty-front/src/modules/object-metadata/utils/formatFieldMetadataItemAsFieldDefinition.ts
+++ b/packages/twenty-front/src/modules/object-metadata/utils/formatFieldMetadataItemAsFieldDefinition.ts
@@ -4,7 +4,7 @@ import { type FieldMetadata } from '@/object-record/record-field/ui/types/FieldM
 
 import { getFieldButtonIcon } from '@/object-record/record-field/ui/utils/getFieldButtonIcon';
 import { FieldMetadataType } from 'twenty-shared/types';
-import { type FieldMetadataItem } from '../types/FieldMetadataItem';
+import { type FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';
 
 export type FieldMetadataItemAsFieldDefinitionProps = {
   field: FieldMetadataItem;
diff --git a/packages/twenty-front/src/modules/object-metadata/utils/formatFieldMetadataItemsAsFilterDefinitions.ts b/packages/twenty-front/src/modules/object-metadata/utils/formatFieldMetadataItemsAsFilterDefinitions.ts
index 06c2d67351..8132de5045 100644
--- a/packages/twenty-front/src/modules/object-metadata/utils/formatFieldMetadataItemsAsFilterDefinitions.ts
+++ b/packages/twenty-front/src/modules/object-metadata/utils/formatFieldMetadataItemsAsFilterDefinitions.ts
@@ -1,4 +1,4 @@
-import { type ObjectMetadataItem } from '../types/ObjectMetadataItem';
+import { type ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
 
 export const getRelationObjectMetadataNameSingular = ({
   field,
diff --git a/packages/twenty-front/src/modules/object-metadata/utils/isActiveFieldMetadataItem.ts b/packages/twenty-front/src/modules/object-metadata/utils/isActiveFieldMetadataItem.ts
index 255930ea66..eb18c862f3 100644
--- a/packages/twenty-front/src/modules/object-metadata/utils/isActiveFieldMetadataItem.ts
+++ b/packages/twenty-front/src/modules/object-metadata/utils/isActiveFieldMetadataItem.ts
@@ -1,5 +1,5 @@
 import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
-import { type FieldMetadataItem } from '../types/FieldMetadataItem';
+import { type FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';
 
 type IsFieldMetadataAvailableForViewFieldArgs = {
   objectNameSingular: string;
diff --git a/packages/twenty-front/src/modules/object-metadata/utils/mapFieldMetadataToGraphQLQuery.ts b/packages/twenty-front/src/modules/object-metadata/utils/mapFieldMetadataToGraphQLQuery.ts
index 4342e12e12..b35a3fe288 100644
--- a/packages/twenty-front/src/modules/object-metadata/utils/mapFieldMetadataToGraphQLQuery.ts
+++ b/packages/twenty-front/src/modules/object-metadata/utils/mapFieldMetadataToGraphQLQuery.ts
@@ -7,7 +7,7 @@ import { type RecordGqlFields } from '@/object-record/graphql/record-gql-fields/
 import { isNonCompositeField } from '@/object-record/object-filter-dropdown/utils/isNonCompositeField';
 import { type ObjectPermissions } from 'twenty-shared/types';
 import { computeMorphRelationFieldName, isDefined } from 'twenty-shared/utils';
-import { type FieldMetadataItem } from '../types/FieldMetadataItem';
+import { type FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';
 
 type MapFieldMetadataToGraphQLQueryArgs = {
   objectMetadataItems: ObjectMetadataItem[];
diff --git a/packages/twenty-front/src/modules/object-metadata/utils/mapPaginatedObjectMetadataItemsToObjectMetadataItems.ts b/packages/twenty-front/src/modules/object-metadata/utils/mapPaginatedObjectMetadataItemsToObjectMetadataItems.ts
index b7bdf78ea9..6613a9a0cc 100644
--- a/packages/twenty-front/src/modules/object-metadata/utils/mapPaginatedObjectMetadataItemsToObjectMetadataItems.ts
+++ b/packages/twenty-front/src/modules/object-metadata/utils/mapPaginatedObjectMetadataItemsToObjectMetadataItems.ts
@@ -2,7 +2,7 @@ import { type IndexFieldMetadataItem } from '@/object-metadata/types/IndexFieldM
 import { type IndexMetadataItem } from '@/object-metadata/types/IndexMetadataItem';
 import { objectMetadataItemSchema } from '@/object-metadata/validation-schemas/objectMetadataItemSchema';
 import { type ObjectMetadataItemsQuery } from '~/generated-metadata/graphql';
-import { type ObjectMetadataItem } from '../types/ObjectMetadataItem';
+import { type ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
 
 type mapPaginatedObjectMetadataItemsToObjectMetadataItemsArgs = {
   pagedObjectMetadataItems: ObjectMetadataItemsQuery | undefined;
diff --git a/packages/twenty-front/src/modules/object-metadata/utils/shouldFieldBeQueried.ts b/packages/twenty-front/src/modules/object-metadata/utils/shouldFieldBeQueried.ts
index 822905b186..563c31c038 100644
--- a/packages/twenty-front/src/modules/object-metadata/utils/shouldFieldBeQueried.ts
+++ b/packages/twenty-front/src/modules/object-metadata/utils/shouldFieldBeQueried.ts
@@ -5,7 +5,7 @@ import { isUndefinedOrNull } from '~/utils/isUndefinedOrNull';
 import { isFieldMorphRelation } from '@/object-record/record-field/ui/types/guards/isFieldMorphRelation';
 import { isFieldRelation } from '@/object-record/record-field/ui/types/guards/isFieldRelation';
 import { isDefined } from 'twenty-shared/utils';
-import { type FieldMetadataItem } from '../types/FieldMetadataItem';
+import { type FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';
 
 export const shouldFieldBeQueried = ({
   gqlField,
diff --git a/packages/twenty-front/src/modules/object-metadata/validation-schemas/__tests__/objectMetadataItemSchema.test.ts b/packages/twenty-front/src/modules/object-metadata/validation-schemas/__tests__/objectMetadataItemSchema.test.ts
index 6a65fbb8a9..45f7b4e8ae 100644
--- a/packages/twenty-front/src/modules/object-metadata/validation-schemas/__tests__/objectMetadataItemSchema.test.ts
+++ b/packages/twenty-front/src/modules/object-metadata/validation-schemas/__tests__/objectMetadataItemSchema.test.ts
@@ -1,6 +1,6 @@
 import { type ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
 import { generatedMockObjectMetadataItems } from '~/testing/utils/generatedMockObjectMetadataItems';
-import { objectMetadataItemSchema } from '../objectMetadataItemSchema';
+import { objectMetadataItemSchema } from '@/object-metadata/validation-schemas/objectMetadataItemSchema';
 
 describe('objectMetadataItemSchema', () => {
   it('validates a valid object metadata item', () => {
diff --git a/packages/twenty-front/src/modules/object-record/cache/utils/__tests__/createCacheEdgeWithRecordRef.test.ts b/packages/twenty-front/src/modules/object-record/cache/utils/__tests__/createCacheEdgeWithRecordRef.test.ts
index d71c1154da..afa48f7e09 100644
--- a/packages/twenty-front/src/modules/object-record/cache/utils/__tests__/createCacheEdgeWithRecordRef.test.ts
+++ b/packages/twenty-front/src/modules/object-record/cache/utils/__tests__/createCacheEdgeWithRecordRef.test.ts
@@ -5,7 +5,7 @@ import { type ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataI
 import { type RecordGqlNode } from '@/object-record/graphql/types/RecordGqlNode';
 import { type ToReferenceFunction } from '@apollo/client/cache/core/types/common';
 
-import { createCacheEdgeWithRecordRef } from '../createCacheEdgeWithRecordRef';
+import { createCacheEdgeWithRecordRef } from '@/object-record/cache/utils/createCacheEdgeWithRecordRef';
 
 describe('createCacheEdgeWithRecordRef', () => {
   it('should create an edge with reference when toReference returns a reference', () => {
diff --git a/packages/twenty-front/src/modules/object-record/cache/utils/__tests__/filterRecordOnGqlFields.test.ts b/packages/twenty-front/src/modules/object-record/cache/utils/__tests__/filterRecordOnGqlFields.test.ts
index f57b430db6..fd81b2b09e 100644
--- a/packages/twenty-front/src/modules/object-record/cache/utils/__tests__/filterRecordOnGqlFields.test.ts
+++ b/packages/twenty-front/src/modules/object-record/cache/utils/__tests__/filterRecordOnGqlFields.test.ts
@@ -1,4 +1,4 @@
-import { filterRecordOnGqlFields } from '../filterRecordOnGqlFields';
+import { filterRecordOnGqlFields } from '@/object-record/cache/utils/filterRecordOnGqlFields';
 
 describe('filterRecordOnGqlFields', () => {
   it('should filter fields based on recordGqlFields with true values', () => {
diff --git a/packages/twenty-front/src/modules/object-record/cache/utils/__tests__/getFieldMetadataFromGqlField.test.ts b/packages/twenty-front/src/modules/object-record/cache/utils/__tests__/getFieldMetadataFromGqlField.test.ts
index ba65d2288d..2711b8ab49 100644
--- a/packages/twenty-front/src/modules/object-record/cache/utils/__tests__/getFieldMetadataFromGqlField.test.ts
+++ b/packages/twenty-front/src/modules/object-record/cache/utils/__tests__/getFieldMetadataFromGqlField.test.ts
@@ -1,7 +1,7 @@
 import { type FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';
 import { RelationType } from 'twenty-shared/types';
 import { FieldMetadataType } from '~/generated-metadata/graphql';
-import { getFieldMetadataFromGqlField } from '../getFieldMetadataFromGqlField';
+import { getFieldMetadataFromGqlField } from '@/object-record/cache/utils/getFieldMetadataFromGqlField';
 
 const objectMetadataItemGenerator = (relationType: RelationType) => {
   return {
diff --git a/packages/twenty-front/src/modules/object-record/cache/utils/__tests__/getRecordFromRecordNode.test.ts b/packages/twenty-front/src/modules/object-record/cache/utils/__tests__/getRecordFromRecordNode.test.ts
index 0b327fedef..03b99dd7fc 100644
--- a/packages/twenty-front/src/modules/object-record/cache/utils/__tests__/getRecordFromRecordNode.test.ts
+++ b/packages/twenty-front/src/modules/object-record/cache/utils/__tests__/getRecordFromRecordNode.test.ts
@@ -1,4 +1,4 @@
-import { getRecordFromRecordNode } from '../getRecordFromRecordNode';
+import { getRecordFromRecordNode } from '@/object-record/cache/utils/getRecordFromRecordNode';
 
 describe('getRecordFromRecordNode', () => {
   it('should convert a simple record node', () => {
diff --git a/packages/twenty-front/src/modules/object-record/cache/utils/__tests__/getRecordNodeFromRecord.test.ts b/packages/twenty-front/src/modules/object-record/cache/utils/__tests__/getRecordNodeFromRecord.test.ts
index 725705106a..ca97c7dc4c 100644
--- a/packages/twenty-front/src/modules/object-record/cache/utils/__tests__/getRecordNodeFromRecord.test.ts
+++ b/packages/twenty-front/src/modules/object-record/cache/utils/__tests__/getRecordNodeFromRecord.test.ts
@@ -3,7 +3,7 @@ import { type ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataI
 import { getPeopleRecordConnectionMock } from '~/testing/mock-data/people';
 
 import { generatedMockObjectMetadataItems } from '~/testing/utils/generatedMockObjectMetadataItems';
-import { getRecordNodeFromRecord } from '../getRecordNodeFromRecord';
+import { getRecordNodeFromRecord } from '@/object-record/cache/utils/getRecordNodeFromRecord';
 
 const peopleMock = getPeopleRecordConnectionMock();
 
diff --git a/packages/twenty-front/src/modules/object-record/cache/utils/__tests__/isObjectRecordConnection.test.ts b/packages/twenty-front/src/modules/object-record/cache/utils/__tests__/isObjectRecordConnection.test.ts
index 4f415608a8..ccc4ca3083 100644
--- a/packages/twenty-front/src/modules/object-record/cache/utils/__tests__/isObjectRecordConnection.test.ts
+++ b/packages/twenty-front/src/modules/object-record/cache/utils/__tests__/isObjectRecordConnection.test.ts
@@ -1,4 +1,4 @@
-import { isObjectRecordConnection } from '../isObjectRecordConnection';
+import { isObjectRecordConnection } from '@/object-record/cache/utils/isObjectRecordConnection';
 
 describe('isObjectRecordConnection', () => {
   it('should return true for valid connection with edges', () => {
diff --git a/packages/twenty-front/src/modules/object-record/cache/utils/__tests__/isObjectRecordConnectionWithRefs.test.ts b/packages/twenty-front/src/modules/object-record/cache/utils/__tests__/isObjectRecordConnectionWithRefs.test.ts
index 7f375a147b..182dd29b01 100644
--- a/packages/twenty-front/src/modules/object-record/cache/utils/__tests__/isObjectRecordConnectionWithRefs.test.ts
+++ b/packages/twenty-front/src/modules/object-record/cache/utils/__tests__/isObjectRecordConnectionWithRefs.test.ts
@@ -1,4 +1,4 @@
-import { isObjectRecordConnectionWithRefs } from '../isObjectRecordConnectionWithRefs';
+import { isObjectRecordConnectionWithRefs } from '@/object-record/cache/utils/isObjectRecordConnectionWithRefs';
 
 describe('isObjectRecordConnectionWithRefs', () => {
   it('should return true for valid connection with edges', () => {
diff --git a/packages/twenty-front/src/modules/object-record/hooks/__tests__/useFindDuplicateRecords.test.tsx b/packages/twenty-front/src/modules/object-record/hooks/__tests__/useFindDuplicateRecords.test.tsx
index 61cd950ff7..2f52cc1783 100644
--- a/packages/twenty-front/src/modules/object-record/hooks/__tests__/useFindDuplicateRecords.test.tsx
+++ b/packages/twenty-front/src/modules/object-record/hooks/__tests__/useFindDuplicateRecords.test.tsx
@@ -7,7 +7,7 @@ import {
   query,
   responseData,
   variables,
-} from '../__mocks__/useFindDuplicateRecords';
+} from '@/object-record/hooks/__mocks__/useFindDuplicateRecords';
 
 const mocks = [
   {
diff --git a/packages/twenty-front/src/modules/object-record/hooks/useFetchMoreRecordsWithPagination.ts b/packages/twenty-front/src/modules/object-record/hooks/useFetchMoreRecordsWithPagination.ts
index e76bbc6fbd..2fcf6d5dff 100644
--- a/packages/twenty-front/src/modules/object-record/hooks/useFetchMoreRecordsWithPagination.ts
+++ b/packages/twenty-front/src/modules/object-record/hooks/useFetchMoreRecordsWithPagination.ts
@@ -26,9 +26,9 @@ import { filterUniqueRecordEdgesByCursor } from '@/object-record/utils/filterUni
 import { getQueryIdentifier } from '@/object-record/utils/getQueryIdentifier';
 
 import { capitalize, isDefined } from 'twenty-shared/utils';
-import { cursorFamilyState } from '../states/cursorFamilyState';
-import { hasNextPageFamilyState } from '../states/hasNextPageFamilyState';
-import { isFetchingMoreRecordsFamilyState } from '../states/isFetchingMoreRecordsFamilyState';
+import { cursorFamilyState } from '@/object-record/states/cursorFamilyState';
+import { hasNextPageFamilyState } from '@/object-record/states/hasNextPageFamilyState';
+import { isFetchingMoreRecordsFamilyState } from '@/object-record/states/isFetchingMoreRecordsFamilyState';
 
 export type UseFindManyRecordsParams<T> = ObjectMetadataItemIdentifier &
   RecordGqlOperationVariables & {
diff --git a/packages/twenty-front/src/modules/object-record/hooks/useLazyFetchMoreRecordsWithPagination.ts b/packages/twenty-front/src/modules/object-record/hooks/useLazyFetchMoreRecordsWithPagination.ts
index 05e9c43ca5..1dbf0cd0d9 100644
--- a/packages/twenty-front/src/modules/object-record/hooks/useLazyFetchMoreRecordsWithPagination.ts
+++ b/packages/twenty-front/src/modules/object-record/hooks/useLazyFetchMoreRecordsWithPagination.ts
@@ -26,8 +26,8 @@ import { getQueryIdentifier } from '@/object-record/utils/getQueryIdentifier';
 
 import { DEFAULT_SEARCH_REQUEST_LIMIT } from '@/object-record/constants/DefaultSearchRequestLimit';
 import { capitalize, isDefined } from 'twenty-shared/utils';
-import { cursorFamilyState } from '../states/cursorFamilyState';
-import { hasNextPageFamilyState } from '../states/hasNextPageFamilyState';
+import { cursorFamilyState } from '@/object-record/states/cursorFamilyState';
+import { hasNextPageFamilyState } from '@/object-record/states/hasNextPageFamilyState';
 
 export type UseFindManyRecordsParams<T> = ObjectMetadataItemIdentifier &
   RecordGqlOperationVariables & {
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/objectFilterDropdownCurrentRecordFilterComponentState.ts b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/objectFilterDropdownCurrentRecordFilterComponentState.ts
index 4c72b741fe..d5e8fede37 100644
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/objectFilterDropdownCurrentRecordFilterComponentState.ts
+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/states/objectFilterDropdownCurrentRecordFilterComponentState.ts
@@ -1,6 +1,6 @@
 import { ObjectFilterDropdownComponentInstanceContext } from '@/object-record/object-filter-dropdown/states/contexts/ObjectFilterDropdownComponentInstanceContext';
 import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState';
-import { type RecordFilter } from '../../record-filter/types/RecordFilter';
+import { type RecordFilter } from '@/object-record/record-filter/types/RecordFilter';
 
 export const objectFilterDropdownCurrentRecordFilterComponentState =
   createComponentState<RecordFilter | undefined | null>({
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/utils/__tests__/getOperandLabel.test.ts b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/utils/__tests__/getOperandLabel.test.ts
index e8ef38c505..c5339d4b65 100644
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/utils/__tests__/getOperandLabel.test.ts
+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/utils/__tests__/getOperandLabel.test.ts
@@ -1,7 +1,10 @@
 import { ViewFilterOperand } from 'twenty-shared/types';
 
 import { capitalize } from 'twenty-shared/utils';
-import { getOperandLabel, getOperandLabelShort } from '../getOperandLabel';
+import {
+  getOperandLabel,
+  getOperandLabelShort,
+} from '@/object-record/object-filter-dropdown/utils/getOperandLabel';
 
 describe('getOperandLabel', () => {
   const testCases = [
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/utils/__tests__/isFilterOperandExpectingValue.test.ts b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/utils/__tests__/isFilterOperandExpectingValue.test.ts
index 6d3e4a4679..be1f034ea2 100644
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/utils/__tests__/isFilterOperandExpectingValue.test.ts
+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/utils/__tests__/isFilterOperandExpectingValue.test.ts
@@ -1,6 +1,6 @@
 import { ViewFilterOperand } from 'twenty-shared/types';
 
-import { isFilterOperandExpectingValue } from '../isFilterOperandExpectingValue';
+import { isFilterOperandExpectingValue } from '@/object-record/object-filter-dropdown/utils/isFilterOperandExpectingValue';
 
 describe('isFilterOperandExpectingValue', () => {
   const testCases = [
diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/components/RecordCalendarAddNew.tsx b/packages/twenty-front/src/modules/object-record/record-calendar/components/RecordCalendarAddNew.tsx
index b3c1f02a72..d7e65cfd15 100644
--- a/packages/twenty-front/src/modules/object-record/record-calendar/components/RecordCalendarAddNew.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-calendar/components/RecordCalendarAddNew.tsx
@@ -11,7 +11,7 @@ import { useRecoilValue } from 'recoil';
 import { type Temporal } from 'temporal-polyfill';
 import { IconPlus } from 'twenty-ui/display';
 import { Button } from 'twenty-ui/input';
-import { useRecordCalendarContextOrThrow } from '../contexts/RecordCalendarContext';
+import { useRecordCalendarContextOrThrow } from '@/object-record/record-calendar/contexts/RecordCalendarContext';
 
 const StyledButton = styled(Button)`
   padding: ${({ theme }) => theme.spacing(0.5)};
diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/month/components/RecordCalendarMonthBodyDay.tsx b/packages/twenty-front/src/modules/object-record/record-calendar/month/components/RecordCalendarMonthBodyDay.tsx
index 0c1ab84eb9..5f6276f925 100644
--- a/packages/twenty-front/src/modules/object-record/record-calendar/month/components/RecordCalendarMonthBodyDay.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-calendar/month/components/RecordCalendarMonthBodyDay.tsx
@@ -15,7 +15,7 @@ import {
   isPlainDateInWeekend,
   isSamePlainDate,
 } from 'twenty-shared/utils';
-import { RecordCalendarAddNew } from '../../components/RecordCalendarAddNew';
+import { RecordCalendarAddNew } from '@/object-record/record-calendar/components/RecordCalendarAddNew';
 
 const StyledContainer = styled.div<{
   isOtherMonth: boolean;
diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/record-calendar-card/components/RecordCalendarCardHeader.tsx b/packages/twenty-front/src/modules/object-record/record-calendar/record-calendar-card/components/RecordCalendarCardHeader.tsx
index 53c56a6dc0..9f80132266 100644
--- a/packages/twenty-front/src/modules/object-record/record-calendar/record-calendar-card/components/RecordCalendarCardHeader.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-calendar/record-calendar-card/components/RecordCalendarCardHeader.tsx
@@ -13,7 +13,7 @@ import { useRecoilValue } from 'recoil';
 import { isDefined } from 'twenty-shared/utils';
 import { ChipVariant } from 'twenty-ui/components';
 import { Checkbox, CheckboxVariant } from 'twenty-ui/input';
-import { isRecordCalendarCardSelectedComponentFamilyState } from '../states/isRecordCalendarCardSelectedComponentFamilyState';
+import { isRecordCalendarCardSelectedComponentFamilyState } from '@/object-record/record-calendar/record-calendar-card/states/isRecordCalendarCardSelectedComponentFamilyState';
 
 const StyledCheckboxContainer = styled.div`
   margin-left: auto;
diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/record-calendar-card/states/isRecordCalendarCardSelectedComponentFamilyState.ts b/packages/twenty-front/src/modules/object-record/record-calendar/record-calendar-card/states/isRecordCalendarCardSelectedComponentFamilyState.ts
index c8c4dc1d10..1b13cce073 100644
--- a/packages/twenty-front/src/modules/object-record/record-calendar/record-calendar-card/states/isRecordCalendarCardSelectedComponentFamilyState.ts
+++ b/packages/twenty-front/src/modules/object-record/record-calendar/record-calendar-card/states/isRecordCalendarCardSelectedComponentFamilyState.ts
@@ -1,5 +1,5 @@
 import { createComponentFamilyState } from '@/ui/utilities/state/component-state/utils/createComponentFamilyState';
-import { RecordCalendarComponentInstanceContext } from '../../states/contexts/RecordCalendarComponentInstanceContext';
+import { RecordCalendarComponentInstanceContext } from '@/object-record/record-calendar/states/contexts/RecordCalendarComponentInstanceContext';
 
 export const isRecordCalendarCardSelectedComponentFamilyState =
   createComponentFamilyState<boolean, string>({
diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/states/selectors/recordCalendarSelectedRecordIdsComponentSelector.ts b/packages/twenty-front/src/modules/object-record/record-calendar/states/selectors/recordCalendarSelectedRecordIdsComponentSelector.ts
index 97e99d74cc..eeb00bf83c 100644
--- a/packages/twenty-front/src/modules/object-record/record-calendar/states/selectors/recordCalendarSelectedRecordIdsComponentSelector.ts
+++ b/packages/twenty-front/src/modules/object-record/record-calendar/states/selectors/recordCalendarSelectedRecordIdsComponentSelector.ts
@@ -1,7 +1,7 @@
 import { recordIndexAllRecordIdsComponentSelector } from '@/object-record/record-index/states/selectors/recordIndexAllRecordIdsComponentSelector';
 import { createComponentSelector } from '@/ui/utilities/state/component-state/utils/createComponentSelector';
-import { isRecordCalendarCardSelectedComponentFamilyState } from '../../record-calendar-card/states/isRecordCalendarCardSelectedComponentFamilyState';
-import { RecordCalendarComponentInstanceContext } from '../contexts/RecordCalendarComponentInstanceContext';
+import { isRecordCalendarCardSelectedComponentFamilyState } from '@/object-record/record-calendar/record-calendar-card/states/isRecordCalendarCardSelectedComponentFamilyState';
+import { RecordCalendarComponentInstanceContext } from '@/object-record/record-calendar/states/contexts/RecordCalendarComponentInstanceContext';
 
 export const recordCalendarSelectedRecordIdsComponentSelector =
   createComponentSelector<string[]>({
diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/states/selectors/useRecordCalendarSelection.ts b/packages/twenty-front/src/modules/object-record/record-calendar/states/selectors/useRecordCalendarSelection.ts
index f3d2a36642..8c06145ccc 100644
--- a/packages/twenty-front/src/modules/object-record/record-calendar/states/selectors/useRecordCalendarSelection.ts
+++ b/packages/twenty-front/src/modules/object-record/record-calendar/states/selectors/useRecordCalendarSelection.ts
@@ -6,8 +6,8 @@ import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
 import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';
 import { useRecoilComponentCallbackState } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackState';
 import { getSnapshotValue } from '@/ui/utilities/state/utils/getSnapshotValue';
-import { isRecordCalendarCardSelectedComponentFamilyState } from '../../record-calendar-card/states/isRecordCalendarCardSelectedComponentFamilyState';
-import { RecordCalendarComponentInstanceContext } from '../contexts/RecordCalendarComponentInstanceContext';
+import { isRecordCalendarCardSelectedComponentFamilyState } from '@/object-record/record-calendar/record-calendar-card/states/isRecordCalendarCardSelectedComponentFamilyState';
+import { RecordCalendarComponentInstanceContext } from '@/object-record/record-calendar/states/contexts/RecordCalendarComponentInstanceContext';
 import { recordCalendarSelectedRecordIdsComponentSelector } from './recordCalendarSelectedRecordIdsComponentSelector';
 
 export const useRecordCalendarSelection = (recordCalendarId?: string) => {
diff --git a/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/duplicate/components/__stories__/RecordDetailDuplicatesSection.stories.tsx b/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/duplicate/components/__stories__/RecordDetailDuplicatesSection.stories.tsx
index 962215a198..996868e998 100644
--- a/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/duplicate/components/__stories__/RecordDetailDuplicatesSection.stories.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/duplicate/components/__stories__/RecordDetailDuplicatesSection.stories.tsx
@@ -8,7 +8,7 @@ import { graphqlMocks } from '~/testing/graphqlMocks';
 import { getCompaniesMock } from '~/testing/mock-data/companies';
 
 import { ComponentDecorator } from 'twenty-ui/testing';
-import { RecordDetailDuplicatesSection } from '../../components/RecordDetailDuplicatesSection';
+import { RecordDetailDuplicatesSection } from '@/object-record/record-field-list/record-detail-section/duplicate/components/RecordDetailDuplicatesSection';
 
 const companiesMock = getCompaniesMock();
 
diff --git a/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/relation/components/__stories__/RecordDetailRelationSection.stories.tsx b/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/relation/components/__stories__/RecordDetailRelationSection.stories.tsx
index cf7af0787a..d6b555ffde 100644
--- a/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/relation/components/__stories__/RecordDetailRelationSection.stories.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field-list/record-detail-section/relation/components/__stories__/RecordDetailRelationSection.stories.tsx
@@ -15,7 +15,7 @@ import { I18nFrontDecorator } from '~/testing/decorators/I18nFrontDecorator';
 import { RightDrawerDecorator } from '~/testing/decorators/RightDrawerDecorator';
 import { allMockPersonRecords } from '~/testing/mock-data/people';
 import { generatedMockObjectMetadataItems } from '~/testing/utils/generatedMockObjectMetadataItems';
-import { RecordDetailRelationSection } from '../RecordDetailRelationSection';
+import { RecordDetailRelationSection } from '@/object-record/record-field-list/record-detail-section/relation/components/RecordDetailRelationSection';
 
 const companiesMock = getCompaniesMock();
 
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/components/FieldDisplay.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/components/FieldDisplay.tsx
index 9a80fc4f20..44fdbc08f8 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/components/FieldDisplay.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/components/FieldDisplay.tsx
@@ -29,31 +29,31 @@ import { isFieldMorphRelationOneToMany } from '@/object-record/record-field/ui/t
 import { isFieldRelationManyToOne } from '@/object-record/record-field/ui/types/guards/isFieldRelationManyToOne';
 import { isFieldRelationOneToMany } from '@/object-record/record-field/ui/types/guards/isFieldRelationOneToMany';
 import { isDefined } from 'twenty-shared/utils';
-import { FieldContext } from '../contexts/FieldContext';
-import { AddressFieldDisplay } from '../meta-types/display/components/AddressFieldDisplay';
-import { ChipFieldDisplay } from '../meta-types/display/components/ChipFieldDisplay';
-import { CurrencyFieldDisplay } from '../meta-types/display/components/CurrencyFieldDisplay';
-import { DateFieldDisplay } from '../meta-types/display/components/DateFieldDisplay';
-import { DateTimeFieldDisplay } from '../meta-types/display/components/DateTimeFieldDisplay';
-import { FullNameFieldDisplay } from '../meta-types/display/components/FullNameFieldDisplay';
-import { JsonFieldDisplay } from '../meta-types/display/components/JsonFieldDisplay';
-import { MultiSelectFieldDisplay } from '../meta-types/display/components/MultiSelectFieldDisplay';
-import { NumberFieldDisplay } from '../meta-types/display/components/NumberFieldDisplay';
-import { RelationToOneFieldDisplay } from '../meta-types/display/components/RelationToOneFieldDisplay';
-import { SelectFieldDisplay } from '../meta-types/display/components/SelectFieldDisplay';
-import { TextFieldDisplay } from '../meta-types/display/components/TextFieldDisplay';
-import { UuidFieldDisplay } from '../meta-types/display/components/UuidFieldDisplay';
-import { isFieldAddress } from '../types/guards/isFieldAddress';
-import { isFieldCurrency } from '../types/guards/isFieldCurrency';
-import { isFieldDate } from '../types/guards/isFieldDate';
-import { isFieldDateTime } from '../types/guards/isFieldDateTime';
-import { isFieldFullName } from '../types/guards/isFieldFullName';
-import { isFieldMultiSelect } from '../types/guards/isFieldMultiSelect';
-import { isFieldNumber } from '../types/guards/isFieldNumber';
-import { isFieldRawJson } from '../types/guards/isFieldRawJson';
-import { isFieldSelect } from '../types/guards/isFieldSelect';
-import { isFieldText } from '../types/guards/isFieldText';
-import { isFieldUuid } from '../types/guards/isFieldUuid';
+import { FieldContext } from '@/object-record/record-field/ui/contexts/FieldContext';
+import { AddressFieldDisplay } from '@/object-record/record-field/ui/meta-types/display/components/AddressFieldDisplay';
+import { ChipFieldDisplay } from '@/object-record/record-field/ui/meta-types/display/components/ChipFieldDisplay';
+import { CurrencyFieldDisplay } from '@/object-record/record-field/ui/meta-types/display/components/CurrencyFieldDisplay';
+import { DateFieldDisplay } from '@/object-record/record-field/ui/meta-types/display/components/DateFieldDisplay';
+import { DateTimeFieldDisplay } from '@/object-record/record-field/ui/meta-types/display/components/DateTimeFieldDisplay';
+import { FullNameFieldDisplay } from '@/object-record/record-field/ui/meta-types/display/components/FullNameFieldDisplay';
+import { JsonFieldDisplay } from '@/object-record/record-field/ui/meta-types/display/components/JsonFieldDisplay';
+import { MultiSelectFieldDisplay } from '@/object-record/record-field/ui/meta-types/display/components/MultiSelectFieldDisplay';
+import { NumberFieldDisplay } from '@/object-record/record-field/ui/meta-types/display/components/NumberFieldDisplay';
+import { RelationToOneFieldDisplay } from '@/object-record/record-field/ui/meta-types/display/components/RelationToOneFieldDisplay';
+import { SelectFieldDisplay } from '@/object-record/record-field/ui/meta-types/display/components/SelectFieldDisplay';
+import { TextFieldDisplay } from '@/object-record/record-field/ui/meta-types/display/components/TextFieldDisplay';
+import { UuidFieldDisplay } from '@/object-record/record-field/ui/meta-types/display/components/UuidFieldDisplay';
+import { isFieldAddress } from '@/object-record/record-field/ui/types/guards/isFieldAddress';
+import { isFieldCurrency } from '@/object-record/record-field/ui/types/guards/isFieldCurrency';
+import { isFieldDate } from '@/object-record/record-field/ui/types/guards/isFieldDate';
+import { isFieldDateTime } from '@/object-record/record-field/ui/types/guards/isFieldDateTime';
+import { isFieldFullName } from '@/object-record/record-field/ui/types/guards/isFieldFullName';
+import { isFieldMultiSelect } from '@/object-record/record-field/ui/types/guards/isFieldMultiSelect';
+import { isFieldNumber } from '@/object-record/record-field/ui/types/guards/isFieldNumber';
+import { isFieldRawJson } from '@/object-record/record-field/ui/types/guards/isFieldRawJson';
+import { isFieldSelect } from '@/object-record/record-field/ui/types/guards/isFieldSelect';
+import { isFieldText } from '@/object-record/record-field/ui/types/guards/isFieldText';
+import { isFieldUuid } from '@/object-record/record-field/ui/types/guards/isFieldUuid';
 
 export const FieldDisplay = () => {
   const {
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/components/FieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/components/FieldInput.tsx
index 5caf084543..65c2d20500 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/components/FieldInput.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/components/FieldInput.tsx
@@ -36,14 +36,14 @@ import { isFieldRelationManyToOne } from '@/object-record/record-field/ui/types/
 import { isFieldRelationOneToMany } from '@/object-record/record-field/ui/types/guards/isFieldRelationOneToMany';
 import { isFieldRichTextV2 } from '@/object-record/record-field/ui/types/guards/isFieldRichTextV2';
 import { isFieldSelect } from '@/object-record/record-field/ui/types/guards/isFieldSelect';
-import { FieldContext } from '../contexts/FieldContext';
-import { BooleanFieldInput } from '../meta-types/input/components/BooleanFieldInput';
-import { CurrencyFieldInput } from '../meta-types/input/components/CurrencyFieldInput';
-import { DateTimeFieldInput } from '../meta-types/input/components/DateTimeFieldInput';
-import { NumberFieldInput } from '../meta-types/input/components/NumberFieldInput';
-import { RatingFieldInput } from '../meta-types/input/components/RatingFieldInput';
-import { TextFieldInput } from '../meta-types/input/components/TextFieldInput';
-import { isFieldText } from '../types/guards/isFieldText';
+import { FieldContext } from '@/object-record/record-field/ui/contexts/FieldContext';
+import { BooleanFieldInput } from '@/object-record/record-field/ui/meta-types/input/components/BooleanFieldInput';
+import { CurrencyFieldInput } from '@/object-record/record-field/ui/meta-types/input/components/CurrencyFieldInput';
+import { DateTimeFieldInput } from '@/object-record/record-field/ui/meta-types/input/components/DateTimeFieldInput';
+import { NumberFieldInput } from '@/object-record/record-field/ui/meta-types/input/components/NumberFieldInput';
+import { RatingFieldInput } from '@/object-record/record-field/ui/meta-types/input/components/RatingFieldInput';
+import { TextFieldInput } from '@/object-record/record-field/ui/meta-types/input/components/TextFieldInput';
+import { isFieldText } from '@/object-record/record-field/ui/types/guards/isFieldText';
 
 export const FieldInput = () => {
   const { fieldDefinition } = useContext(FieldContext);
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/contexts/FieldContext.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/contexts/FieldContext.ts
index 103a2cec2e..af3a3b58bb 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/contexts/FieldContext.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/contexts/FieldContext.ts
@@ -1,8 +1,8 @@
 import { createContext, type MouseEvent } from 'react';
 
 import { type TriggerEventType } from 'twenty-ui/utilities';
-import { type FieldDefinition } from '../types/FieldDefinition';
-import { type FieldMetadata } from '../types/FieldMetadata';
+import { type FieldDefinition } from '@/object-record/record-field/ui/types/FieldDefinition';
+import { type FieldMetadata } from '@/object-record/record-field/ui/types/FieldMetadata';
 
 export type RecordUpdateHookParams = {
   variables: {
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/__stories__/FormAddressFieldInput.stories.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/__stories__/FormAddressFieldInput.stories.tsx
index 22d2105d6f..16eedf1bfc 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/__stories__/FormAddressFieldInput.stories.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/__stories__/FormAddressFieldInput.stories.tsx
@@ -2,7 +2,7 @@ import { type Meta, type StoryObj } from '@storybook/react';
 import { expect, fn, userEvent, within } from '@storybook/test';
 import { I18nFrontDecorator } from '~/testing/decorators/I18nFrontDecorator';
 import { WorkflowStepDecorator } from '~/testing/decorators/WorkflowStepDecorator';
-import { FormAddressFieldInput } from '../FormAddressFieldInput';
+import { FormAddressFieldInput } from '@/object-record/record-field/ui/form-types/components/FormAddressFieldInput';
 
 const meta: Meta<typeof FormAddressFieldInput> = {
   title: 'UI/Data/Field/Form/Input/FormAddressFieldInput',
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/__stories__/FormArrayFieldInput.stories.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/__stories__/FormArrayFieldInput.stories.tsx
index 22efcf05f5..cbd1bbe131 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/__stories__/FormArrayFieldInput.stories.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/__stories__/FormArrayFieldInput.stories.tsx
@@ -5,7 +5,7 @@ import { getCanvasElementForDropdownTesting } from 'twenty-ui/testing';
 import { I18nFrontDecorator } from '~/testing/decorators/I18nFrontDecorator';
 import { WorkflowStepDecorator } from '~/testing/decorators/WorkflowStepDecorator';
 import { MOCKED_STEP_ID } from '~/testing/mock-data/workflow';
-import { FormArrayFieldInput } from '../FormArrayFieldInput';
+import { FormArrayFieldInput } from '@/object-record/record-field/ui/form-types/components/FormArrayFieldInput';
 
 const meta: Meta<typeof FormArrayFieldInput> = {
   title: 'UI/Data/Field/Form/Input/FormArrayFieldInput',
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/__stories__/FormBooleanFieldInput.stories.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/__stories__/FormBooleanFieldInput.stories.tsx
index a49d872a6d..f0991fb9eb 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/__stories__/FormBooleanFieldInput.stories.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/__stories__/FormBooleanFieldInput.stories.tsx
@@ -4,7 +4,7 @@ import { getCanvasElementForDropdownTesting } from 'twenty-ui/testing';
 import { I18nFrontDecorator } from '~/testing/decorators/I18nFrontDecorator';
 import { WorkflowStepDecorator } from '~/testing/decorators/WorkflowStepDecorator';
 import { MOCKED_STEP_ID } from '~/testing/mock-data/workflow';
-import { FormBooleanFieldInput } from '../FormBooleanFieldInput';
+import { FormBooleanFieldInput } from '@/object-record/record-field/ui/form-types/components/FormBooleanFieldInput';
 
 const meta: Meta<typeof FormBooleanFieldInput> = {
   title: 'UI/Data/Field/Form/Input/FormBooleanFieldInput',
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/__stories__/FormCountryCodeSelectInput.stories.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/__stories__/FormCountryCodeSelectInput.stories.tsx
index 91b80c0b78..d0db420e91 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/__stories__/FormCountryCodeSelectInput.stories.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/__stories__/FormCountryCodeSelectInput.stories.tsx
@@ -1,7 +1,7 @@
 import { type Meta, type StoryObj } from '@storybook/react';
 import { within } from '@storybook/test';
 
-import { FormCountryCodeSelectInput } from '../FormCountryCodeSelectInput';
+import { FormCountryCodeSelectInput } from '@/object-record/record-field/ui/form-types/components/FormCountryCodeSelectInput';
 
 const meta: Meta<typeof FormCountryCodeSelectInput> = {
   title: 'UI/Data/Field/Form/Input/FormCountryCodeSelectInput',
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/__stories__/FormCountrySelectInput.stories.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/__stories__/FormCountrySelectInput.stories.tsx
index 1c53a0cc29..2a38b392e5 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/__stories__/FormCountrySelectInput.stories.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/__stories__/FormCountrySelectInput.stories.tsx
@@ -1,6 +1,6 @@
 import { type Meta, type StoryObj } from '@storybook/react';
 import { within } from '@storybook/test';
-import { FormCountrySelectInput } from '../FormCountrySelectInput';
+import { FormCountrySelectInput } from '@/object-record/record-field/ui/form-types/components/FormCountrySelectInput';
 
 const meta: Meta<typeof FormCountrySelectInput> = {
   title: 'UI/Data/Field/Form/Input/FormCountrySelectInput',
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/__stories__/FormCurrencyFieldInput.stories.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/__stories__/FormCurrencyFieldInput.stories.tsx
index 0f0b6c7670..17fb2e7a41 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/__stories__/FormCurrencyFieldInput.stories.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/__stories__/FormCurrencyFieldInput.stories.tsx
@@ -5,7 +5,7 @@ import { CurrencyCode } from 'twenty-shared/constants';
 import { I18nFrontDecorator } from '~/testing/decorators/I18nFrontDecorator';
 import { WorkflowStepDecorator } from '~/testing/decorators/WorkflowStepDecorator';
 import { MOCKED_STEP_ID } from '~/testing/mock-data/workflow';
-import { FormCurrencyFieldInput } from '../FormCurrencyFieldInput';
+import { FormCurrencyFieldInput } from '@/object-record/record-field/ui/form-types/components/FormCurrencyFieldInput';
 
 const meta: Meta<typeof FormCurrencyFieldInput> = {
   title: 'UI/Data/Field/Form/Input/FormCurrencyFieldInput',
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/__stories__/FormEmailsFieldInput.stories.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/__stories__/FormEmailsFieldInput.stories.tsx
index 602a303559..7ac370e33a 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/__stories__/FormEmailsFieldInput.stories.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/__stories__/FormEmailsFieldInput.stories.tsx
@@ -3,7 +3,7 @@ import { expect, fn, userEvent, waitFor, within } from '@storybook/test';
 import { I18nFrontDecorator } from '~/testing/decorators/I18nFrontDecorator';
 import { WorkflowStepDecorator } from '~/testing/decorators/WorkflowStepDecorator';
 import { MOCKED_STEP_ID } from '~/testing/mock-data/workflow';
-import { FormEmailsFieldInput } from '../FormEmailsFieldInput';
+import { FormEmailsFieldInput } from '@/object-record/record-field/ui/form-types/components/FormEmailsFieldInput';
 
 const meta: Meta<typeof FormEmailsFieldInput> = {
   title: 'UI/Data/Field/Form/Input/FormEmailsFieldInput',
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/__stories__/FormFullNameFieldInput.stories.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/__stories__/FormFullNameFieldInput.stories.tsx
index bad57de650..72984d76ee 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/__stories__/FormFullNameFieldInput.stories.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/__stories__/FormFullNameFieldInput.stories.tsx
@@ -3,7 +3,7 @@ import { expect, fn, userEvent, within } from '@storybook/test';
 import { I18nFrontDecorator } from '~/testing/decorators/I18nFrontDecorator';
 import { WorkflowStepDecorator } from '~/testing/decorators/WorkflowStepDecorator';
 import { MOCKED_STEP_ID } from '~/testing/mock-data/workflow';
-import { FormFullNameFieldInput } from '../FormFullNameFieldInput';
+import { FormFullNameFieldInput } from '@/object-record/record-field/ui/form-types/components/FormFullNameFieldInput';
 
 const meta: Meta<typeof FormFullNameFieldInput> = {
   title: 'UI/Data/Field/Form/Input/FormFullNameFieldInput',
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/__stories__/FormLinksFieldInput.stories.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/__stories__/FormLinksFieldInput.stories.tsx
index b925301707..2bed7dd259 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/__stories__/FormLinksFieldInput.stories.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/__stories__/FormLinksFieldInput.stories.tsx
@@ -2,7 +2,7 @@ import { expect, fn, userEvent, within } from '@storybook/test';
 import { type Meta, type StoryObj } from '@storybook/react';
 import { I18nFrontDecorator } from '~/testing/decorators/I18nFrontDecorator';
 import { WorkflowStepDecorator } from '~/testing/decorators/WorkflowStepDecorator';
-import { FormLinksFieldInput } from '../FormLinksFieldInput';
+import { FormLinksFieldInput } from '@/object-record/record-field/ui/form-types/components/FormLinksFieldInput';
 
 const meta: Meta<typeof FormLinksFieldInput> = {
   title: 'UI/Data/Field/Form/Input/FormLinksFieldInput',
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/__stories__/FormMultiSelectFieldInput.stories.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/__stories__/FormMultiSelectFieldInput.stories.tsx
index b84526ecdd..8410cddb75 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/__stories__/FormMultiSelectFieldInput.stories.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/__stories__/FormMultiSelectFieldInput.stories.tsx
@@ -3,7 +3,7 @@ import { expect, fn, userEvent, within } from '@storybook/test';
 import { I18nFrontDecorator } from '~/testing/decorators/I18nFrontDecorator';
 import { WorkflowStepDecorator } from '~/testing/decorators/WorkflowStepDecorator';
 import { MOCKED_STEP_ID } from '~/testing/mock-data/workflow';
-import { FormMultiSelectFieldInput } from '../FormMultiSelectFieldInput';
+import { FormMultiSelectFieldInput } from '@/object-record/record-field/ui/form-types/components/FormMultiSelectFieldInput';
 
 const meta: Meta<typeof FormMultiSelectFieldInput> = {
   title: 'UI/Data/Field/Form/Input/FormMultiSelectFieldInput',
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/__stories__/FormNumberFieldInput.stories.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/__stories__/FormNumberFieldInput.stories.tsx
index 5d8d9c9768..e5f3645bff 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/__stories__/FormNumberFieldInput.stories.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/__stories__/FormNumberFieldInput.stories.tsx
@@ -1,6 +1,6 @@
 import { expect, within } from '@storybook/test';
 import { type Meta, type StoryObj } from '@storybook/react';
-import { FormNumberFieldInput } from '../FormNumberFieldInput';
+import { FormNumberFieldInput } from '@/object-record/record-field/ui/form-types/components/FormNumberFieldInput';
 
 const meta: Meta<typeof FormNumberFieldInput> = {
   title: 'UI/Data/Field/Form/Input/FormNumberFieldInput',
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/__stories__/FormPhoneFieldInput.stories.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/__stories__/FormPhoneFieldInput.stories.tsx
index 868f7d4613..2b723e873e 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/__stories__/FormPhoneFieldInput.stories.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/__stories__/FormPhoneFieldInput.stories.tsx
@@ -6,7 +6,7 @@ import { type FieldPhonesValue } from '@/object-record/record-field/ui/types/Fie
 import { I18nFrontDecorator } from '~/testing/decorators/I18nFrontDecorator';
 import { WorkflowStepDecorator } from '~/testing/decorators/WorkflowStepDecorator';
 import { MOCKED_STEP_ID } from '~/testing/mock-data/workflow';
-import { FormPhoneFieldInput } from '../FormPhoneFieldInput';
+import { FormPhoneFieldInput } from '@/object-record/record-field/ui/form-types/components/FormPhoneFieldInput';
 
 const meta: Meta<typeof FormPhoneFieldInput> = {
   title: 'UI/Data/Field/Form/Input/FormPhoneFieldInput',
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/__stories__/FormRawJsonFieldInput.stories.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/__stories__/FormRawJsonFieldInput.stories.tsx
index ac3b8b5905..ff0aa6ba1f 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/__stories__/FormRawJsonFieldInput.stories.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/__stories__/FormRawJsonFieldInput.stories.tsx
@@ -4,7 +4,7 @@ import { getUserDevice } from 'twenty-ui/utilities';
 import { I18nFrontDecorator } from '~/testing/decorators/I18nFrontDecorator';
 import { WorkflowStepDecorator } from '~/testing/decorators/WorkflowStepDecorator';
 import { MOCKED_STEP_ID } from '~/testing/mock-data/workflow';
-import { FormRawJsonFieldInput } from '../FormRawJsonFieldInput';
+import { FormRawJsonFieldInput } from '@/object-record/record-field/ui/form-types/components/FormRawJsonFieldInput';
 
 const meta: Meta<typeof FormRawJsonFieldInput> = {
   title: 'UI/Data/Field/Form/Input/FormRawJsonFieldInput',
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/__stories__/FormRichTextV2FieldInput.stories.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/__stories__/FormRichTextV2FieldInput.stories.tsx
index f84efb4751..494b08c82b 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/__stories__/FormRichTextV2FieldInput.stories.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/__stories__/FormRichTextV2FieldInput.stories.tsx
@@ -11,7 +11,7 @@ import { getUserDevice } from 'twenty-ui/utilities';
 import { I18nFrontDecorator } from '~/testing/decorators/I18nFrontDecorator';
 import { WorkflowStepDecorator } from '~/testing/decorators/WorkflowStepDecorator';
 import { MOCKED_STEP_ID } from '~/testing/mock-data/workflow';
-import { FormRichTextV2FieldInput } from '../FormRichTextV2FieldInput';
+import { FormRichTextV2FieldInput } from '@/object-record/record-field/ui/form-types/components/FormRichTextV2FieldInput';
 
 const meta: Meta<typeof FormRichTextV2FieldInput> = {
   title: 'UI/Data/Field/Form/Input/FormRichTextV2FieldInput',
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/__stories__/FormSelectFieldInput.stories.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/__stories__/FormSelectFieldInput.stories.tsx
index 8b91c207f3..74642e4964 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/__stories__/FormSelectFieldInput.stories.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/__stories__/FormSelectFieldInput.stories.tsx
@@ -3,7 +3,7 @@ import { expect, fn, userEvent, within } from '@storybook/test';
 import { I18nFrontDecorator } from '~/testing/decorators/I18nFrontDecorator';
 import { WorkflowStepDecorator } from '~/testing/decorators/WorkflowStepDecorator';
 import { MOCKED_STEP_ID } from '~/testing/mock-data/workflow';
-import { FormSelectFieldInput } from '../FormSelectFieldInput';
+import { FormSelectFieldInput } from '@/object-record/record-field/ui/form-types/components/FormSelectFieldInput';
 
 const meta: Meta<typeof FormSelectFieldInput> = {
   title: 'UI/Data/Field/Form/Input/FormSelectFieldInput',
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/__stories__/FormSingleRecordPicker.stories.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/__stories__/FormSingleRecordPicker.stories.tsx
index 99f345befd..5e91de9860 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/__stories__/FormSingleRecordPicker.stories.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/__stories__/FormSingleRecordPicker.stories.tsx
@@ -9,7 +9,7 @@ import { WorkflowStepDecorator } from '~/testing/decorators/WorkflowStepDecorato
 import { WorkspaceDecorator } from '~/testing/decorators/WorkspaceDecorator';
 import { graphqlMocks } from '~/testing/graphqlMocks';
 import { MOCKED_STEP_ID } from '~/testing/mock-data/workflow';
-import { FormSingleRecordPicker } from '../FormSingleRecordPicker';
+import { FormSingleRecordPicker } from '@/object-record/record-field/ui/form-types/components/FormSingleRecordPicker';
 
 const meta: Meta<typeof FormSingleRecordPicker> = {
   title: 'UI/Data/Field/Form/Input/FormSingleRecordPicker',
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/__stories__/FormTextFieldInput.stories.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/__stories__/FormTextFieldInput.stories.tsx
index f8ced3de8a..8e03d50f5f 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/__stories__/FormTextFieldInput.stories.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/__stories__/FormTextFieldInput.stories.tsx
@@ -11,7 +11,7 @@ import { getUserDevice } from 'twenty-ui/utilities';
 import { I18nFrontDecorator } from '~/testing/decorators/I18nFrontDecorator';
 import { WorkflowStepDecorator } from '~/testing/decorators/WorkflowStepDecorator';
 import { MOCKED_STEP_ID } from '~/testing/mock-data/workflow';
-import { FormTextFieldInput } from '../FormTextFieldInput';
+import { FormTextFieldInput } from '@/object-record/record-field/ui/form-types/components/FormTextFieldInput';
 
 const meta: Meta<typeof FormTextFieldInput> = {
   title: 'UI/Data/Field/Form/Input/FormTextFieldInput',
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/__stories__/FormUuidFieldInput.stories.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/__stories__/FormUuidFieldInput.stories.tsx
index 032c5c2d91..85f0a52739 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/__stories__/FormUuidFieldInput.stories.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/__stories__/FormUuidFieldInput.stories.tsx
@@ -3,7 +3,7 @@ import { type Meta, type StoryObj } from '@storybook/react';
 import { I18nFrontDecorator } from '~/testing/decorators/I18nFrontDecorator';
 import { WorkflowStepDecorator } from '~/testing/decorators/WorkflowStepDecorator';
 import { MOCKED_STEP_ID } from '~/testing/mock-data/workflow';
-import { FormUuidFieldInput } from '../FormUuidFieldInput';
+import { FormUuidFieldInput } from '@/object-record/record-field/ui/form-types/components/FormUuidFieldInput';
 
 const meta: Meta<typeof FormUuidFieldInput> = {
   title: 'UI/Data/Field/Form/Input/FormUuidFieldInput',
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/hooks/useClearField.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/hooks/useClearField.ts
index 4f08c4cad3..6ff3b95c2a 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/hooks/useClearField.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/hooks/useClearField.ts
@@ -5,7 +5,7 @@ import { objectMetadataItemsState } from '@/object-metadata/states/objectMetadat
 import { recordStoreFamilySelector } from '@/object-record/record-store/states/selectors/recordStoreFamilySelector';
 import { generateEmptyFieldValue } from '@/object-record/utils/generateEmptyFieldValue';
 
-import { FieldContext } from '../contexts/FieldContext';
+import { FieldContext } from '@/object-record/record-field/ui/contexts/FieldContext';
 
 export const useClearField = () => {
   const {
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/hooks/useGetButtonIcon.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/hooks/useGetButtonIcon.ts
index 973d9debb5..6f25b9c827 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/hooks/useGetButtonIcon.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/hooks/useGetButtonIcon.ts
@@ -3,7 +3,7 @@ import { useContext } from 'react';
 import { getFieldButtonIcon } from '@/object-record/record-field/ui/utils/getFieldButtonIcon';
 
 import { type IconComponent } from 'twenty-ui/display';
-import { FieldContext } from '../contexts/FieldContext';
+import { FieldContext } from '@/object-record/record-field/ui/contexts/FieldContext';
 
 export const useGetButtonIcon = (): IconComponent | undefined => {
   const { fieldDefinition } = useContext(FieldContext);
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/hooks/useIsFieldClearable.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/hooks/useIsFieldClearable.ts
index fdc04a5f98..02f910cbea 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/hooks/useIsFieldClearable.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/hooks/useIsFieldClearable.ts
@@ -1,6 +1,6 @@
 import { useContext } from 'react';
 
-import { FieldContext } from '../contexts/FieldContext';
+import { FieldContext } from '@/object-record/record-field/ui/contexts/FieldContext';
 
 // TODO: have a better clearable settings in metadata ?
 // We might want to define what's clearable in the metadata
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/hooks/useIsFieldEmpty.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/hooks/useIsFieldEmpty.ts
index b7a2352070..d1571aa902 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/hooks/useIsFieldEmpty.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/hooks/useIsFieldEmpty.ts
@@ -4,7 +4,7 @@ import { isFieldValueEmpty } from '@/object-record/record-field/ui/utils/isField
 
 import { useRecordFieldValue } from '@/object-record/record-store/hooks/useRecordFieldValue';
 import { isDefined } from 'twenty-shared/utils';
-import { FieldContext } from '../contexts/FieldContext';
+import { FieldContext } from '@/object-record/record-field/ui/contexts/FieldContext';
 
 export const useIsFieldEmpty = () => {
   const { recordId, fieldDefinition, overridenIsFieldEmpty } =
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/hooks/useIsFieldInputOnly.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/hooks/useIsFieldInputOnly.ts
index 750ea8b0b4..918b6301d8 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/hooks/useIsFieldInputOnly.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/hooks/useIsFieldInputOnly.ts
@@ -1,8 +1,8 @@
 import { useContext } from 'react';
 
-import { FieldContext } from '../contexts/FieldContext';
-import { isFieldBoolean } from '../types/guards/isFieldBoolean';
-import { isFieldRating } from '../types/guards/isFieldRating';
+import { FieldContext } from '@/object-record/record-field/ui/contexts/FieldContext';
+import { isFieldBoolean } from '@/object-record/record-field/ui/types/guards/isFieldBoolean';
+import { isFieldRating } from '@/object-record/record-field/ui/types/guards/isFieldRating';
 
 export const useIsFieldInputOnly = () => {
   const { fieldDefinition } = useContext(FieldContext);
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/hooks/usePersistField.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/hooks/usePersistField.ts
index 4d9c612f64..4918c76c1c 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/hooks/usePersistField.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/hooks/usePersistField.ts
@@ -41,18 +41,18 @@ import { isFieldRichTextV2Value } from '@/object-record/record-field/ui/types/gu
 import { useUpsertRecordsInStore } from '@/object-record/record-store/hooks/useUpsertRecordsInStore';
 import { getForeignKeyNameFromRelationFieldName } from '@/object-record/utils/getForeignKeyNameFromRelationFieldName';
 import { isDeeplyEqual } from '~/utils/isDeeplyEqual';
-import { isFieldBoolean } from '../types/guards/isFieldBoolean';
-import { isFieldBooleanValue } from '../types/guards/isFieldBooleanValue';
-import { isFieldCurrency } from '../types/guards/isFieldCurrency';
-import { isFieldCurrencyValue } from '../types/guards/isFieldCurrencyValue';
-import { isFieldDateTime } from '../types/guards/isFieldDateTime';
-import { isFieldDateTimeValue } from '../types/guards/isFieldDateTimeValue';
-import { isFieldNumber } from '../types/guards/isFieldNumber';
-import { isFieldNumberValue } from '../types/guards/isFieldNumberValue';
-import { isFieldRating } from '../types/guards/isFieldRating';
-import { isFieldRatingValue } from '../types/guards/isFieldRatingValue';
-import { isFieldText } from '../types/guards/isFieldText';
-import { isFieldTextValue } from '../types/guards/isFieldTextValue';
+import { isFieldBoolean } from '@/object-record/record-field/ui/types/guards/isFieldBoolean';
+import { isFieldBooleanValue } from '@/object-record/record-field/ui/types/guards/isFieldBooleanValue';
+import { isFieldCurrency } from '@/object-record/record-field/ui/types/guards/isFieldCurrency';
+import { isFieldCurrencyValue } from '@/object-record/record-field/ui/types/guards/isFieldCurrencyValue';
+import { isFieldDateTime } from '@/object-record/record-field/ui/types/guards/isFieldDateTime';
+import { isFieldDateTimeValue } from '@/object-record/record-field/ui/types/guards/isFieldDateTimeValue';
+import { isFieldNumber } from '@/object-record/record-field/ui/types/guards/isFieldNumber';
+import { isFieldNumberValue } from '@/object-record/record-field/ui/types/guards/isFieldNumberValue';
+import { isFieldRating } from '@/object-record/record-field/ui/types/guards/isFieldRating';
+import { isFieldRatingValue } from '@/object-record/record-field/ui/types/guards/isFieldRatingValue';
+import { isFieldText } from '@/object-record/record-field/ui/types/guards/isFieldText';
+import { isFieldTextValue } from '@/object-record/record-field/ui/types/guards/isFieldTextValue';
 
 export const usePersistField = ({
   objectMetadataItemId,
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/hooks/useToggleEditOnlyInput.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/hooks/useToggleEditOnlyInput.ts
index 571f134246..0401970444 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/hooks/useToggleEditOnlyInput.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/hooks/useToggleEditOnlyInput.ts
@@ -3,8 +3,8 @@ import { useRecoilCallback } from 'recoil';
 
 import { recordStoreFamilySelector } from '@/object-record/record-store/states/selectors/recordStoreFamilySelector';
 
-import { FieldContext } from '../contexts/FieldContext';
-import { isFieldBoolean } from '../types/guards/isFieldBoolean';
+import { FieldContext } from '@/object-record/record-field/ui/contexts/FieldContext';
+import { isFieldBoolean } from '@/object-record/record-field/ui/types/guards/isFieldBoolean';
 
 export const useToggleEditOnlyInput = () => {
   const {
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useActorFieldDisplay.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useActorFieldDisplay.ts
index 777ed92b07..508327f3b2 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useActorFieldDisplay.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useActorFieldDisplay.ts
@@ -6,7 +6,7 @@ import { AuthContext } from '@/auth/contexts/AuthContext';
 import { useRecordFieldValue } from '@/object-record/record-store/hooks/useRecordFieldValue';
 import { isDefined } from 'twenty-shared/utils';
 import { type WorkspaceMember } from '~/generated-metadata/graphql';
-import { FieldContext } from '../../contexts/FieldContext';
+import { FieldContext } from '@/object-record/record-field/ui/contexts/FieldContext';
 
 export type ActorFieldDisplayValue = {
   fieldValue: FieldActorValue;
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useAddressField.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useAddressField.ts
index 7ab2d53e10..1c7b14ee23 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useAddressField.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useAddressField.ts
@@ -7,10 +7,10 @@ import { FieldMetadataType } from '~/generated-metadata/graphql';
 
 import { recordFieldInputDraftValueComponentState } from '@/object-record/record-field/ui/states/recordFieldInputDraftValueComponentState';
 import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue';
-import { FieldContext } from '../../contexts/FieldContext';
-import { type FieldAddressValue } from '../../types/FieldMetadata';
-import { assertFieldMetadata } from '../../types/guards/assertFieldMetadata';
-import { isFieldAddress } from '../../types/guards/isFieldAddress';
+import { FieldContext } from '@/object-record/record-field/ui/contexts/FieldContext';
+import { type FieldAddressValue } from '@/object-record/record-field/ui/types/FieldMetadata';
+import { assertFieldMetadata } from '@/object-record/record-field/ui/types/guards/assertFieldMetadata';
+import { isFieldAddress } from '@/object-record/record-field/ui/types/guards/isFieldAddress';
 
 export const useAddressField = () => {
   const { recordId, fieldDefinition } = useContext(FieldContext);
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useAddressFieldDisplay.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useAddressFieldDisplay.ts
index b2f7efaa55..81414bfc98 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useAddressFieldDisplay.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useAddressFieldDisplay.ts
@@ -1,8 +1,8 @@
 import { useContext } from 'react';
 
 import { useRecordFieldValue } from '@/object-record/record-store/hooks/useRecordFieldValue';
-import { FieldContext } from '../../contexts/FieldContext';
-import { type FieldAddressValue } from '../../types/FieldMetadata';
+import { FieldContext } from '@/object-record/record-field/ui/contexts/FieldContext';
+import { type FieldAddressValue } from '@/object-record/record-field/ui/types/FieldMetadata';
 
 export const useAddressFieldDisplay = () => {
   const { recordId, fieldDefinition } = useContext(FieldContext);
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useBooleanField.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useBooleanField.ts
index 5bff89892f..a65a3de5ad 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useBooleanField.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useBooleanField.ts
@@ -4,9 +4,9 @@ import { useRecoilState } from 'recoil';
 import { recordStoreFamilySelector } from '@/object-record/record-store/states/selectors/recordStoreFamilySelector';
 import { FieldMetadataType } from '~/generated-metadata/graphql';
 
-import { FieldContext } from '../../contexts/FieldContext';
-import { assertFieldMetadata } from '../../types/guards/assertFieldMetadata';
-import { isFieldBoolean } from '../../types/guards/isFieldBoolean';
+import { FieldContext } from '@/object-record/record-field/ui/contexts/FieldContext';
+import { assertFieldMetadata } from '@/object-record/record-field/ui/types/guards/assertFieldMetadata';
+import { isFieldBoolean } from '@/object-record/record-field/ui/types/guards/isFieldBoolean';
 
 export const useBooleanField = () => {
   const { recordId, fieldDefinition } = useContext(FieldContext);
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useBooleanFieldDisplay.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useBooleanFieldDisplay.ts
index 20b5d94064..bdf218a287 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useBooleanFieldDisplay.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useBooleanFieldDisplay.ts
@@ -1,7 +1,7 @@
 import { useContext } from 'react';
 
 import { useRecordFieldValue } from '@/object-record/record-store/hooks/useRecordFieldValue';
-import { FieldContext } from '../../contexts/FieldContext';
+import { FieldContext } from '@/object-record/record-field/ui/contexts/FieldContext';
 
 export const useBooleanFieldDisplay = () => {
   const { recordId, fieldDefinition } = useContext(FieldContext);
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useChipField.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useChipField.ts
index f51c114be4..1d8512b4af 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useChipField.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useChipField.ts
@@ -6,7 +6,7 @@ import { isFieldNumber } from '@/object-record/record-field/ui/types/guards/isFi
 import { isFieldText } from '@/object-record/record-field/ui/types/guards/isFieldText';
 import { recordStoreFamilyState } from '@/object-record/record-store/states/recordStoreFamilyState';
 
-import { FieldContext } from '../../contexts/FieldContext';
+import { FieldContext } from '@/object-record/record-field/ui/contexts/FieldContext';
 
 export const useChipField = () => {
   const { recordId, fieldDefinition } = useContext(FieldContext);
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useChipFieldDisplay.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useChipFieldDisplay.ts
index 6cf9f141ce..ee0e13b17e 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useChipFieldDisplay.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useChipFieldDisplay.ts
@@ -10,7 +10,7 @@ import { isFieldActor } from '@/object-record/record-field/ui/types/guards/isFie
 import { useRecordIndexContextOrThrow } from '@/object-record/record-index/contexts/RecordIndexContext';
 import { recordStoreFamilyState } from '@/object-record/record-store/states/recordStoreFamilyState';
 import { isDefined } from 'twenty-shared/utils';
-import { FieldContext } from '../../contexts/FieldContext';
+import { FieldContext } from '@/object-record/record-field/ui/contexts/FieldContext';
 
 export const useChipFieldDisplay = () => {
   const {
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useCurrencyFieldDisplay.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useCurrencyFieldDisplay.ts
index afe51cedb0..628f4d5aef 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useCurrencyFieldDisplay.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useCurrencyFieldDisplay.ts
@@ -4,8 +4,8 @@ import { assertFieldMetadata } from '@/object-record/record-field/ui/types/guard
 import { isFieldCurrency } from '@/object-record/record-field/ui/types/guards/isFieldCurrency';
 import { useRecordFieldValue } from '@/object-record/record-store/hooks/useRecordFieldValue';
 import { FieldMetadataType } from 'twenty-shared/types';
-import { FieldContext } from '../../contexts/FieldContext';
-import { type FieldCurrencyValue } from '../../types/FieldMetadata';
+import { FieldContext } from '@/object-record/record-field/ui/contexts/FieldContext';
+import { type FieldCurrencyValue } from '@/object-record/record-field/ui/types/FieldMetadata';
 
 export const useCurrencyFieldDisplay = () => {
   const { recordId, fieldDefinition } = useContext(FieldContext);
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useDateField.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useDateField.ts
index 0b390a507a..029e11ce65 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useDateField.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useDateField.ts
@@ -7,8 +7,8 @@ import { isFieldDate } from '@/object-record/record-field/ui/types/guards/isFiel
 import { recordStoreFamilySelector } from '@/object-record/record-store/states/selectors/recordStoreFamilySelector';
 import { FieldMetadataType } from '~/generated-metadata/graphql';
 
-import { FieldContext } from '../../contexts/FieldContext';
-import { assertFieldMetadata } from '../../types/guards/assertFieldMetadata';
+import { FieldContext } from '@/object-record/record-field/ui/contexts/FieldContext';
+import { assertFieldMetadata } from '@/object-record/record-field/ui/types/guards/assertFieldMetadata';
 
 export const useDateField = () => {
   const { recordId, fieldDefinition, clearable } = useContext(FieldContext);
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useDateFieldDisplay.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useDateFieldDisplay.ts
index 5fe63e4a0c..39d1b67a51 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useDateFieldDisplay.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useDateFieldDisplay.ts
@@ -3,7 +3,7 @@ import { useContext } from 'react';
 import { type FieldDefinition } from '@/object-record/record-field/ui/types/FieldDefinition';
 import { type FieldDateMetadata } from '@/object-record/record-field/ui/types/FieldMetadata';
 import { useRecordFieldValue } from '@/object-record/record-store/hooks/useRecordFieldValue';
-import { FieldContext } from '../../contexts/FieldContext';
+import { FieldContext } from '@/object-record/record-field/ui/contexts/FieldContext';
 
 export const useDateFieldDisplay = () => {
   const { recordId, fieldDefinition, clearable } = useContext(FieldContext);
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useDateTimeField.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useDateTimeField.ts
index 4e5ba1cb5f..cbda5c11d6 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useDateTimeField.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useDateTimeField.ts
@@ -6,9 +6,9 @@ import { type FieldDateTimeValue } from '@/object-record/record-field/ui/types/F
 import { recordStoreFamilySelector } from '@/object-record/record-store/states/selectors/recordStoreFamilySelector';
 import { FieldMetadataType } from '~/generated-metadata/graphql';
 
-import { FieldContext } from '../../contexts/FieldContext';
-import { assertFieldMetadata } from '../../types/guards/assertFieldMetadata';
-import { isFieldDateTime } from '../../types/guards/isFieldDateTime';
+import { FieldContext } from '@/object-record/record-field/ui/contexts/FieldContext';
+import { assertFieldMetadata } from '@/object-record/record-field/ui/types/guards/assertFieldMetadata';
+import { isFieldDateTime } from '@/object-record/record-field/ui/types/guards/isFieldDateTime';
 
 export const useDateTimeField = () => {
   const { recordId, fieldDefinition, clearable } = useContext(FieldContext);
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useDateTimeFieldDisplay.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useDateTimeFieldDisplay.ts
index 12576441d7..227f0452d8 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useDateTimeFieldDisplay.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useDateTimeFieldDisplay.ts
@@ -3,7 +3,7 @@ import { useContext } from 'react';
 import { type FieldDefinition } from '@/object-record/record-field/ui/types/FieldDefinition';
 import { type FieldDateTimeMetadata } from '@/object-record/record-field/ui/types/FieldMetadata';
 import { useRecordFieldValue } from '@/object-record/record-store/hooks/useRecordFieldValue';
-import { FieldContext } from '../../contexts/FieldContext';
+import { FieldContext } from '@/object-record/record-field/ui/contexts/FieldContext';
 
 export const useDateTimeFieldDisplay = () => {
   const { recordId, fieldDefinition, clearable } = useContext(FieldContext);
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useEmailsField.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useEmailsField.ts
index d680c98462..8c728ecb52 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useEmailsField.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useEmailsField.ts
@@ -9,8 +9,8 @@ import { FieldMetadataType } from '~/generated-metadata/graphql';
 
 import { recordFieldInputDraftValueComponentState } from '@/object-record/record-field/ui/states/recordFieldInputDraftValueComponentState';
 import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue';
-import { FieldContext } from '../../contexts/FieldContext';
-import { assertFieldMetadata } from '../../types/guards/assertFieldMetadata';
+import { FieldContext } from '@/object-record/record-field/ui/contexts/FieldContext';
+import { assertFieldMetadata } from '@/object-record/record-field/ui/types/guards/assertFieldMetadata';
 
 export const useEmailsField = () => {
   const { recordId, fieldDefinition } = useContext(FieldContext);
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useEmailsFieldDisplay.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useEmailsFieldDisplay.ts
index 8a49b65e87..ed711e91e0 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useEmailsFieldDisplay.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useEmailsFieldDisplay.ts
@@ -5,7 +5,7 @@ import { assertFieldMetadata } from '@/object-record/record-field/ui/types/guard
 import { isFieldEmails } from '@/object-record/record-field/ui/types/guards/isFieldEmails';
 import { useRecordFieldValue } from '@/object-record/record-store/hooks/useRecordFieldValue';
 import { FieldMetadataType } from 'twenty-shared/types';
-import { FieldContext } from '../../contexts/FieldContext';
+import { FieldContext } from '@/object-record/record-field/ui/contexts/FieldContext';
 
 export const useEmailsFieldDisplay = () => {
   const { recordId, fieldDefinition } = useContext(FieldContext);
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useFullNameFieldDisplay.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useFullNameFieldDisplay.ts
index 7b4a5deaa0..75cef5e1f7 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useFullNameFieldDisplay.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useFullNameFieldDisplay.ts
@@ -3,7 +3,7 @@ import { useContext } from 'react';
 import { type FieldFullNameValue } from '@/object-record/record-field/ui/types/FieldMetadata';
 
 import { useRecordFieldValue } from '@/object-record/record-store/hooks/useRecordFieldValue';
-import { FieldContext } from '../../contexts/FieldContext';
+import { FieldContext } from '@/object-record/record-field/ui/contexts/FieldContext';
 
 export const useFullNameFieldDisplay = () => {
   const { recordId, fieldDefinition } = useContext(FieldContext);
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useJsonField.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useJsonField.ts
index 8a2def9001..166eb6beff 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useJsonField.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useJsonField.ts
@@ -9,9 +9,9 @@ import { FieldMetadataType } from '~/generated-metadata/graphql';
 import { usePrecomputedJsonDraftValue } from '@/object-record/record-field/ui/meta-types/hooks/usePrecomputedJsonDraftValue';
 import { recordFieldInputDraftValueComponentState } from '@/object-record/record-field/ui/states/recordFieldInputDraftValueComponentState';
 import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue';
-import { FieldContext } from '../../contexts/FieldContext';
-import { assertFieldMetadata } from '../../types/guards/assertFieldMetadata';
-import { isFieldRawJson } from '../../types/guards/isFieldRawJson';
+import { FieldContext } from '@/object-record/record-field/ui/contexts/FieldContext';
+import { assertFieldMetadata } from '@/object-record/record-field/ui/types/guards/assertFieldMetadata';
+import { isFieldRawJson } from '@/object-record/record-field/ui/types/guards/isFieldRawJson';
 
 export const useJsonField = () => {
   const { recordId, fieldDefinition, maxWidth } = useContext(FieldContext);
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useJsonFieldDisplay.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useJsonFieldDisplay.ts
index bafe6c73f2..f571c4df26 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useJsonFieldDisplay.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useJsonFieldDisplay.ts
@@ -4,7 +4,7 @@ import { type FieldJsonValue } from '@/object-record/record-field/ui/types/Field
 
 import { useFormattedJsonFieldValue } from '@/object-record/record-field/ui/meta-types/hooks/useFormattedJsonFieldValue';
 import { useRecordFieldValue } from '@/object-record/record-store/hooks/useRecordFieldValue';
-import { FieldContext } from '../../contexts/FieldContext';
+import { FieldContext } from '@/object-record/record-field/ui/contexts/FieldContext';
 
 export const useJsonFieldDisplay = () => {
   const { recordId, fieldDefinition, maxWidth, isRecordFieldReadOnly } =
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useLinksField.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useLinksField.ts
index 17f09c75ee..5cf9f29b8e 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useLinksField.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useLinksField.ts
@@ -9,8 +9,8 @@ import { FieldMetadataType } from '~/generated-metadata/graphql';
 
 import { recordFieldInputDraftValueComponentState } from '@/object-record/record-field/ui/states/recordFieldInputDraftValueComponentState';
 import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue';
-import { FieldContext } from '../../contexts/FieldContext';
-import { assertFieldMetadata } from '../../types/guards/assertFieldMetadata';
+import { FieldContext } from '@/object-record/record-field/ui/contexts/FieldContext';
+import { assertFieldMetadata } from '@/object-record/record-field/ui/types/guards/assertFieldMetadata';
 
 export const useLinksField = () => {
   const { recordId, fieldDefinition } = useContext(FieldContext);
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useLinksFieldDisplay.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useLinksFieldDisplay.ts
index c780e4135c..2aec9dd92d 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useLinksFieldDisplay.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useLinksFieldDisplay.ts
@@ -6,7 +6,7 @@ import { assertFieldMetadata } from '@/object-record/record-field/ui/types/guard
 import { isFieldLinks } from '@/object-record/record-field/ui/types/guards/isFieldLinks';
 import { useRecordFieldValue } from '@/object-record/record-store/hooks/useRecordFieldValue';
 import { FieldMetadataType } from 'twenty-shared/types';
-import { FieldContext } from '../../contexts/FieldContext';
+import { FieldContext } from '@/object-record/record-field/ui/contexts/FieldContext';
 
 export const useLinksFieldDisplay = () => {
   const { recordId, fieldDefinition } = useContext(FieldContext);
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useMorphRelationFromManyFieldDisplay.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useMorphRelationFromManyFieldDisplay.ts
index 03fc10956b..fe375b943b 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useMorphRelationFromManyFieldDisplay.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useMorphRelationFromManyFieldDisplay.ts
@@ -10,8 +10,8 @@ import { isFieldMorphRelation } from '@/object-record/record-field/ui/types/guar
 import { useRecordFieldValue } from '@/object-record/record-store/hooks/useRecordFieldValue';
 import { type ObjectRecord } from 'twenty-shared/types';
 import { isDefined } from 'twenty-shared/utils';
-import { FieldContext } from '../../contexts/FieldContext';
-import { assertFieldMetadata } from '../../types/guards/assertFieldMetadata';
+import { FieldContext } from '@/object-record/record-field/ui/contexts/FieldContext';
+import { assertFieldMetadata } from '@/object-record/record-field/ui/types/guards/assertFieldMetadata';
 
 export const useMorphRelationFromManyFieldDisplay = () => {
   const { recordId, fieldDefinition, maxWidth } = useContext(FieldContext);
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useNumberField.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useNumberField.ts
index 1c3d73ad8e..56658eee3a 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useNumberField.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useNumberField.ts
@@ -8,9 +8,9 @@ import { FieldMetadataType } from '~/generated-metadata/graphql';
 
 import { recordFieldInputDraftValueComponentState } from '@/object-record/record-field/ui/states/recordFieldInputDraftValueComponentState';
 import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue';
-import { FieldContext } from '../../contexts/FieldContext';
-import { assertFieldMetadata } from '../../types/guards/assertFieldMetadata';
-import { isFieldNumber } from '../../types/guards/isFieldNumber';
+import { FieldContext } from '@/object-record/record-field/ui/contexts/FieldContext';
+import { assertFieldMetadata } from '@/object-record/record-field/ui/types/guards/assertFieldMetadata';
+import { isFieldNumber } from '@/object-record/record-field/ui/types/guards/isFieldNumber';
 
 export const useNumberField = () => {
   const { recordId, fieldDefinition } = useContext(FieldContext);
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useNumberFieldDisplay.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useNumberFieldDisplay.ts
index aabb6a2e52..b2b3f62c02 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useNumberFieldDisplay.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useNumberFieldDisplay.ts
@@ -3,9 +3,9 @@ import { useContext } from 'react';
 import { FieldMetadataType } from '~/generated-metadata/graphql';
 
 import { useRecordFieldValue } from '@/object-record/record-store/hooks/useRecordFieldValue';
-import { FieldContext } from '../../contexts/FieldContext';
-import { assertFieldMetadata } from '../../types/guards/assertFieldMetadata';
-import { isFieldNumber } from '../../types/guards/isFieldNumber';
+import { FieldContext } from '@/object-record/record-field/ui/contexts/FieldContext';
+import { assertFieldMetadata } from '@/object-record/record-field/ui/types/guards/assertFieldMetadata';
+import { isFieldNumber } from '@/object-record/record-field/ui/types/guards/isFieldNumber';
 
 export const useNumberFieldDisplay = () => {
   const { recordId, fieldDefinition } = useContext(FieldContext);
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/usePhonesField.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/usePhonesField.ts
index 8158d3441b..f311a504d2 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/usePhonesField.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/usePhonesField.ts
@@ -9,8 +9,8 @@ import { FieldMetadataType } from '~/generated-metadata/graphql';
 
 import { recordFieldInputDraftValueComponentState } from '@/object-record/record-field/ui/states/recordFieldInputDraftValueComponentState';
 import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue';
-import { FieldContext } from '../../contexts/FieldContext';
-import { assertFieldMetadata } from '../../types/guards/assertFieldMetadata';
+import { FieldContext } from '@/object-record/record-field/ui/contexts/FieldContext';
+import { assertFieldMetadata } from '@/object-record/record-field/ui/types/guards/assertFieldMetadata';
 
 export const usePhonesField = () => {
   const { recordId, fieldDefinition } = useContext(FieldContext);
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/usePhonesFieldDisplay.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/usePhonesFieldDisplay.ts
index fea10a6d7f..b54acfe690 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/usePhonesFieldDisplay.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/usePhonesFieldDisplay.ts
@@ -6,7 +6,7 @@ import { assertFieldMetadata } from '@/object-record/record-field/ui/types/guard
 import { isFieldPhones } from '@/object-record/record-field/ui/types/guards/isFieldPhones';
 import { useRecordFieldValue } from '@/object-record/record-store/hooks/useRecordFieldValue';
 import { FieldMetadataType } from 'twenty-shared/types';
-import { FieldContext } from '../../contexts/FieldContext';
+import { FieldContext } from '@/object-record/record-field/ui/contexts/FieldContext';
 
 export const usePhonesFieldDisplay = () => {
   const { recordId, fieldDefinition } = useContext(FieldContext);
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useRatingField.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useRatingField.ts
index dfe6560915..00b0d04d89 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useRatingField.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useRatingField.ts
@@ -5,9 +5,9 @@ import { recordStoreFamilySelector } from '@/object-record/record-store/states/s
 import { FieldMetadataType } from '~/generated-metadata/graphql';
 
 import { type FieldRatingValue } from 'twenty-shared/types';
-import { FieldContext } from '../../contexts/FieldContext';
-import { assertFieldMetadata } from '../../types/guards/assertFieldMetadata';
-import { isFieldRating } from '../../types/guards/isFieldRating';
+import { FieldContext } from '@/object-record/record-field/ui/contexts/FieldContext';
+import { assertFieldMetadata } from '@/object-record/record-field/ui/types/guards/assertFieldMetadata';
+import { isFieldRating } from '@/object-record/record-field/ui/types/guards/isFieldRating';
 
 export const useRatingField = () => {
   const { recordId, fieldDefinition } = useContext(FieldContext);
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useRatingFieldDisplay.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useRatingFieldDisplay.ts
index e668bb1827..d79be589a5 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useRatingFieldDisplay.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useRatingFieldDisplay.ts
@@ -2,7 +2,7 @@ import { useContext } from 'react';
 
 import { useRecordFieldValue } from '@/object-record/record-store/hooks/useRecordFieldValue';
 import { type FieldRatingValue } from 'twenty-shared/types';
-import { FieldContext } from '../../contexts/FieldContext';
+import { FieldContext } from '@/object-record/record-field/ui/contexts/FieldContext';
 
 export const useRatingFieldDisplay = () => {
   const { recordId, fieldDefinition } = useContext(FieldContext);
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useRelationFromManyFieldDisplay.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useRelationFromManyFieldDisplay.ts
index ceaed52261..d37178c46b 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useRelationFromManyFieldDisplay.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useRelationFromManyFieldDisplay.ts
@@ -10,9 +10,9 @@ import { FieldMetadataType } from '~/generated-metadata/graphql';
 
 import { useRecordFieldValue } from '@/object-record/record-store/hooks/useRecordFieldValue';
 import { isDefined } from 'twenty-shared/utils';
-import { FieldContext } from '../../contexts/FieldContext';
-import { assertFieldMetadata } from '../../types/guards/assertFieldMetadata';
-import { isFieldRelation } from '../../types/guards/isFieldRelation';
+import { FieldContext } from '@/object-record/record-field/ui/contexts/FieldContext';
+import { assertFieldMetadata } from '@/object-record/record-field/ui/types/guards/assertFieldMetadata';
+import { isFieldRelation } from '@/object-record/record-field/ui/types/guards/isFieldRelation';
 
 export const useRelationFromManyFieldDisplay = () => {
   const { recordId, fieldDefinition, maxWidth } = useContext(FieldContext);
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useRichTextFieldDisplay.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useRichTextFieldDisplay.ts
index fee3db2eb2..7a8064f0b9 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useRichTextFieldDisplay.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useRichTextFieldDisplay.ts
@@ -7,7 +7,7 @@ import { useRecordFieldValue } from '@/object-record/record-store/hooks/useRecor
 import type { PartialBlock } from '@blocknote/core';
 import { isDefined, parseJson } from 'twenty-shared/utils';
 import { FieldMetadataType } from '~/generated-metadata/graphql';
-import { FieldContext } from '../../contexts/FieldContext';
+import { FieldContext } from '@/object-record/record-field/ui/contexts/FieldContext';
 
 export const useRichTextFieldDisplay = () => {
   const { recordId, fieldDefinition } = useContext(FieldContext);
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useRichTextV2FieldDisplay.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useRichTextV2FieldDisplay.ts
index 4873d06996..ef36cde0e7 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useRichTextV2FieldDisplay.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useRichTextV2FieldDisplay.ts
@@ -5,7 +5,7 @@ import { assertFieldMetadata } from '@/object-record/record-field/ui/types/guard
 import { isFieldRichTextV2 } from '@/object-record/record-field/ui/types/guards/isFieldRichTextV2';
 import { useRecordFieldValue } from '@/object-record/record-store/hooks/useRecordFieldValue';
 import { FieldMetadataType } from '~/generated-metadata/graphql';
-import { FieldContext } from '../../contexts/FieldContext';
+import { FieldContext } from '@/object-record/record-field/ui/contexts/FieldContext';
 
 export const useRichTextV2FieldDisplay = () => {
   const { recordId, fieldDefinition } = useContext(FieldContext);
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useSelectField.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useSelectField.ts
index 426e8e0480..8ac8566975 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useSelectField.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useSelectField.ts
@@ -7,11 +7,11 @@ import { FieldMetadataType } from '~/generated-metadata/graphql';
 
 import { recordFieldInputDraftValueComponentState } from '@/object-record/record-field/ui/states/recordFieldInputDraftValueComponentState';
 import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue';
-import { FieldContext } from '../../contexts/FieldContext';
-import { type FieldSelectValue } from '../../types/FieldMetadata';
-import { assertFieldMetadata } from '../../types/guards/assertFieldMetadata';
-import { isFieldSelect } from '../../types/guards/isFieldSelect';
-import { isFieldSelectValue } from '../../types/guards/isFieldSelectValue';
+import { FieldContext } from '@/object-record/record-field/ui/contexts/FieldContext';
+import { type FieldSelectValue } from '@/object-record/record-field/ui/types/FieldMetadata';
+import { assertFieldMetadata } from '@/object-record/record-field/ui/types/guards/assertFieldMetadata';
+import { isFieldSelect } from '@/object-record/record-field/ui/types/guards/isFieldSelect';
+import { isFieldSelectValue } from '@/object-record/record-field/ui/types/guards/isFieldSelectValue';
 
 export const useSelectField = () => {
   const { recordId, fieldDefinition } = useContext(FieldContext);
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useSelectFieldDisplay.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useSelectFieldDisplay.ts
index 8fd0d5862f..14146fd919 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useSelectFieldDisplay.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useSelectFieldDisplay.ts
@@ -3,11 +3,11 @@ import { useContext } from 'react';
 import { type FieldDefinition } from '@/object-record/record-field/ui/types/FieldDefinition';
 
 import { useRecordFieldValue } from '@/object-record/record-store/hooks/useRecordFieldValue';
-import { FieldContext } from '../../contexts/FieldContext';
+import { FieldContext } from '@/object-record/record-field/ui/contexts/FieldContext';
 import {
   type FieldSelectMetadata,
   type FieldSelectValue,
-} from '../../types/FieldMetadata';
+} from '@/object-record/record-field/ui/types/FieldMetadata';
 
 export const useSelectFieldDisplay = () => {
   const { recordId, fieldDefinition } = useContext(FieldContext);
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useTextFieldDisplay.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useTextFieldDisplay.ts
index bd4f7f6368..4deb57269a 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useTextFieldDisplay.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/hooks/useTextFieldDisplay.ts
@@ -1,7 +1,7 @@
 import { useContext } from 'react';
 
 import { useRecordFieldValue } from '@/object-record/record-store/hooks/useRecordFieldValue';
-import { FieldContext } from '../../contexts/FieldContext';
+import { FieldContext } from '@/object-record/record-field/ui/contexts/FieldContext';
 
 export const useTextFieldDisplay = () => {
   const { recordId, fieldDefinition, displayedMaxRows } =
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/BooleanFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/BooleanFieldInput.tsx
index a5bf7ea27a..334026971d 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/BooleanFieldInput.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/BooleanFieldInput.tsx
@@ -3,7 +3,7 @@ import { BooleanInput } from '@/ui/field/input/components/BooleanInput';
 import { FieldContext } from '@/object-record/record-field/ui/contexts/FieldContext';
 import { FieldInputEventContext } from '@/object-record/record-field/ui/contexts/FieldInputEventContext';
 import { useContext } from 'react';
-import { useBooleanField } from '../../hooks/useBooleanField';
+import { useBooleanField } from '@/object-record/record-field/ui/meta-types/hooks/useBooleanField';
 
 export type BooleanFieldInputProps = {
   testId?: string;
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/CurrencyFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/CurrencyFieldInput.tsx
index 93832eccff..b071e71475 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/CurrencyFieldInput.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/CurrencyFieldInput.tsx
@@ -5,7 +5,7 @@ import { type FieldCurrencyValue } from '@/object-record/record-field/ui/types/F
 import { CurrencyInput } from '@/ui/field/input/components/CurrencyInput';
 import { CurrencyCode } from 'twenty-shared/constants';
 
-import { useCurrencyField } from '../../hooks/useCurrencyField';
+import { useCurrencyField } from '@/object-record/record-field/ui/meta-types/hooks/useCurrencyField';
 
 import { FieldInputEventContext } from '@/object-record/record-field/ui/contexts/FieldInputEventContext';
 import { RecordFieldComponentInstanceContext } from '@/object-record/record-field/ui/states/contexts/RecordFieldComponentInstanceContext';
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/DateTimeFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/DateTimeFieldInput.tsx
index 96ae1c4017..1d7c0e8268 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/DateTimeFieldInput.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/DateTimeFieldInput.tsx
@@ -6,7 +6,7 @@ import { isNonEmptyString } from '@sniptt/guards';
 import { useContext } from 'react';
 import { Temporal } from 'temporal-polyfill';
 import { type Nullable } from 'twenty-ui/utilities';
-import { useDateTimeField } from '../../hooks/useDateTimeField';
+import { useDateTimeField } from '@/object-record/record-field/ui/meta-types/hooks/useDateTimeField';
 
 export const DateTimeFieldInput = () => {
   const { fieldValue, setDraftValue } = useDateTimeField();
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/NumberFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/NumberFieldInput.tsx
index 727661a4b6..1579867f02 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/NumberFieldInput.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/NumberFieldInput.tsx
@@ -10,7 +10,7 @@ import {
   canBeCastAsNumberOrNull,
   castAsNumberOrNull,
 } from '~/utils/cast-as-number-or-null';
-import { useNumberField } from '../../hooks/useNumberField';
+import { useNumberField } from '@/object-record/record-field/ui/meta-types/hooks/useNumberField';
 
 export const NumberFieldInput = () => {
   const { fieldDefinition, draftValue, setDraftValue } = useNumberField();
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/RatingFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/RatingFieldInput.tsx
index 2e2cf50efd..ec3784f981 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/RatingFieldInput.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/RatingFieldInput.tsx
@@ -4,7 +4,7 @@ import { FieldContext } from '@/object-record/record-field/ui/contexts/FieldCont
 import { FieldInputEventContext } from '@/object-record/record-field/ui/contexts/FieldInputEventContext';
 import { useContext } from 'react';
 import { type FieldRatingValue } from 'twenty-shared/types';
-import { useRatingField } from '../../hooks/useRatingField';
+import { useRatingField } from '@/object-record/record-field/ui/meta-types/hooks/useRatingField';
 
 export const RatingFieldInput = () => {
   const { rating } = useRatingField();
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/RawJsonFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/RawJsonFieldInput.tsx
index 438c57b300..42ef7887cd 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/RawJsonFieldInput.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/RawJsonFieldInput.tsx
@@ -13,7 +13,7 @@ import { IconPencil } from 'twenty-ui/display';
 import { CodeEditor, FloatingIconButton } from 'twenty-ui/input';
 import { JsonTree, isTwoFirstDepths } from 'twenty-ui/json-visualizer';
 import { useCopyToClipboard } from '~/hooks/useCopyToClipboard';
-import { useJsonField } from '../../hooks/useJsonField';
+import { useJsonField } from '@/object-record/record-field/ui/meta-types/hooks/useJsonField';
 
 const CONTAINER_HEIGHT = 300;
 
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/RelationManyToOneFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/RelationManyToOneFieldInput.tsx
index 132d088d0d..2d0e3063ce 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/RelationManyToOneFieldInput.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/RelationManyToOneFieldInput.tsx
@@ -1,5 +1,5 @@
 import { FieldInputEventContext } from '@/object-record/record-field/ui/contexts/FieldInputEventContext';
-import { useRelationField } from '../../hooks/useRelationField';
+import { useRelationField } from '@/object-record/record-field/ui/meta-types/hooks/useRelationField';
 
 import { useObjectMetadataItem } from '@/object-metadata/hooks/useObjectMetadataItem';
 import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/TextFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/TextFieldInput.tsx
index 42f6a11ce5..8b7d7757cd 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/TextFieldInput.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/TextFieldInput.tsx
@@ -1,6 +1,6 @@
 import { TextAreaInput } from '@/ui/field/input/components/TextAreaInput';
 
-import { useTextField } from '../../hooks/useTextField';
+import { useTextField } from '@/object-record/record-field/ui/meta-types/hooks/useTextField';
 
 import { FieldInputEventContext } from '@/object-record/record-field/ui/contexts/FieldInputEventContext';
 import { RecordFieldComponentInstanceContext } from '@/object-record/record-field/ui/states/contexts/RecordFieldComponentInstanceContext';
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/__stories__/ArrayFieldInput.stories.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/__stories__/ArrayFieldInput.stories.tsx
index a622152834..dfd1cc8254 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/__stories__/ArrayFieldInput.stories.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/__stories__/ArrayFieldInput.stories.tsx
@@ -13,7 +13,7 @@ import { FocusComponentType } from '@/ui/utilities/focus/types/FocusComponentTyp
 
 import { FieldMetadataType } from '~/generated-metadata/graphql';
 import { I18nFrontDecorator } from '~/testing/decorators/I18nFrontDecorator';
-import { ArrayFieldInput } from '../ArrayFieldInput';
+import { ArrayFieldInput } from '@/object-record/record-field/ui/meta-types/input/components/ArrayFieldInput';
 
 const { FieldInputEventContextProviderWithJestMocks } =
   getFieldInputEventContextProviderWithJestMocks();
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/__stories__/BooleanFieldInput.stories.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/__stories__/BooleanFieldInput.stories.tsx
index c38ff1e7cb..90e32f15c9 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/__stories__/BooleanFieldInput.stories.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/__stories__/BooleanFieldInput.stories.tsx
@@ -12,7 +12,7 @@ import { getFieldInputEventContextProviderWithJestMocks } from '@/object-record/
 import { RecordFieldComponentInstanceContext } from '@/object-record/record-field/ui/states/contexts/RecordFieldComponentInstanceContext';
 import { RECORD_TABLE_CELL_INPUT_ID_PREFIX } from '@/object-record/record-table/constants/RecordTableCellInputIdPrefix';
 import { getRecordFieldInputInstanceId } from '@/object-record/utils/getRecordFieldInputId';
-import { BooleanFieldInput } from '../BooleanFieldInput';
+import { BooleanFieldInput } from '@/object-record/record-field/ui/meta-types/input/components/BooleanFieldInput';
 
 const { FieldInputEventContextProviderWithJestMocks, handleSubmitMocked } =
   getFieldInputEventContextProviderWithJestMocks();
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/__stories__/DateTimeFieldInput.stories.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/__stories__/DateTimeFieldInput.stories.tsx
index ed80e90c08..feddce92da 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/__stories__/DateTimeFieldInput.stories.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/__stories__/DateTimeFieldInput.stories.tsx
@@ -12,8 +12,8 @@ import { RECORD_TABLE_CELL_INPUT_ID_PREFIX } from '@/object-record/record-table/
 import { getRecordFieldInputInstanceId } from '@/object-record/utils/getRecordFieldInputId';
 import { FocusComponentType } from '@/ui/utilities/focus/types/FocusComponentType';
 import { StorybookFieldInputDropdownFocusIdSetterEffect } from '~/testing/components/StorybookFieldInputDropdownFocusIdSetterEffect';
-import { useDateTimeField } from '../../../hooks/useDateTimeField';
-import { DateTimeFieldInput } from '../DateTimeFieldInput';
+import { useDateTimeField } from '@/object-record/record-field/ui/meta-types/hooks/useDateTimeField';
+import { DateTimeFieldInput } from '@/object-record/record-field/ui/meta-types/input/components/DateTimeFieldInput';
 
 const {
   FieldInputEventContextProviderWithJestMocks,
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/__stories__/EmailsFieldInput.stories.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/__stories__/EmailsFieldInput.stories.tsx
index 6b3d8d71cb..60ca68b099 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/__stories__/EmailsFieldInput.stories.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/__stories__/EmailsFieldInput.stories.tsx
@@ -15,7 +15,7 @@ import { FocusComponentType } from '@/ui/utilities/focus/types/FocusComponentTyp
 import { FieldMetadataType } from '~/generated-metadata/graphql';
 import { I18nFrontDecorator } from '~/testing/decorators/I18nFrontDecorator';
 import { SnackBarDecorator } from '~/testing/decorators/SnackBarDecorator';
-import { EmailsFieldInput } from '../EmailsFieldInput';
+import { EmailsFieldInput } from '@/object-record/record-field/ui/meta-types/input/components/EmailsFieldInput';
 
 const updateRecord = fn();
 
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/__stories__/LinksFieldInput.stories.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/__stories__/LinksFieldInput.stories.tsx
index 003efbff0f..c1b3f092ed 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/__stories__/LinksFieldInput.stories.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/__stories__/LinksFieldInput.stories.tsx
@@ -13,7 +13,7 @@ import { FocusComponentType } from '@/ui/utilities/focus/types/FocusComponentTyp
 import { getCanvasElementForDropdownTesting } from 'twenty-ui/testing';
 import { I18nFrontDecorator } from '~/testing/decorators/I18nFrontDecorator';
 import { FieldMetadataType } from '~/generated-metadata/graphql';
-import { LinksFieldInput } from '../LinksFieldInput';
+import { LinksFieldInput } from '@/object-record/record-field/ui/meta-types/input/components/LinksFieldInput';
 
 const updateRecord = fn();
 
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/__stories__/MultiItemBaseInput.stories.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/__stories__/MultiItemBaseInput.stories.tsx
index 453c9999b8..c3d0b9619a 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/__stories__/MultiItemBaseInput.stories.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/__stories__/MultiItemBaseInput.stories.tsx
@@ -1,7 +1,7 @@
 import { type Meta, type StoryObj } from '@storybook/react';
 
 import { ComponentDecorator } from 'twenty-ui/testing';
-import { MultiItemBaseInput } from '../MultiItemBaseInput';
+import { MultiItemBaseInput } from '@/object-record/record-field/ui/meta-types/input/components/MultiItemBaseInput';
 
 const meta: Meta<typeof MultiItemBaseInput> = {
   title: 'UI/Data/Field/Input/BaseFieldInput',
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/__stories__/NumberFieldInput.stories.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/__stories__/NumberFieldInput.stories.tsx
index 455b8f1a1e..e50987597e 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/__stories__/NumberFieldInput.stories.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/__stories__/NumberFieldInput.stories.tsx
@@ -14,8 +14,8 @@ import { getRecordFieldInputInstanceId } from '@/object-record/utils/getRecordFi
 import { FocusComponentType } from '@/ui/utilities/focus/types/FocusComponentType';
 import { StorybookFieldInputDropdownFocusIdSetterEffect } from '~/testing/components/StorybookFieldInputDropdownFocusIdSetterEffect';
 import { I18nFrontDecorator } from '~/testing/decorators/I18nFrontDecorator';
-import { useNumberField } from '../../../hooks/useNumberField';
-import { NumberFieldInput } from '../NumberFieldInput';
+import { useNumberField } from '@/object-record/record-field/ui/meta-types/hooks/useNumberField';
+import { NumberFieldInput } from '@/object-record/record-field/ui/meta-types/input/components/NumberFieldInput';
 
 const {
   FieldInputEventContextProviderWithJestMocks,
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/__stories__/PhonesFieldInput.stories.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/__stories__/PhonesFieldInput.stories.tsx
index cb5c21d7f9..db6779ed52 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/__stories__/PhonesFieldInput.stories.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/__stories__/PhonesFieldInput.stories.tsx
@@ -14,7 +14,7 @@ import { getRecordFieldInputInstanceId } from '@/object-record/utils/getRecordFi
 import { usePushFocusItemToFocusStack } from '@/ui/utilities/focus/hooks/usePushFocusItemToFocusStack';
 import { FocusComponentType } from '@/ui/utilities/focus/types/FocusComponentType';
 import { FieldMetadataType } from '~/generated-metadata/graphql';
-import { PhonesFieldInput } from '../PhonesFieldInput';
+import { PhonesFieldInput } from '@/object-record/record-field/ui/meta-types/input/components/PhonesFieldInput';
 
 const { FieldInputEventContextProviderWithJestMocks } =
   getFieldInputEventContextProviderWithJestMocks();
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/__stories__/RatingFieldInput.stories.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/__stories__/RatingFieldInput.stories.tsx
index 0c86a78e44..0d2fdfd99d 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/__stories__/RatingFieldInput.stories.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/__stories__/RatingFieldInput.stories.tsx
@@ -12,8 +12,8 @@ import { RECORD_TABLE_CELL_INPUT_ID_PREFIX } from '@/object-record/record-table/
 import { getRecordFieldInputInstanceId } from '@/object-record/utils/getRecordFieldInputId';
 import { FocusComponentType } from '@/ui/utilities/focus/types/FocusComponentType';
 import { FieldMetadataType, type FieldRatingValue } from 'twenty-shared/types';
-import { useRatingField } from '../../../hooks/useRatingField';
-import { RatingFieldInput } from '../RatingFieldInput';
+import { useRatingField } from '@/object-record/record-field/ui/meta-types/hooks/useRatingField';
+import { RatingFieldInput } from '@/object-record/record-field/ui/meta-types/input/components/RatingFieldInput';
 
 const { FieldInputEventContextProviderWithJestMocks, handleSubmitMocked } =
   getFieldInputEventContextProviderWithJestMocks();
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/__stories__/RichTextFieldInput.stories.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/__stories__/RichTextFieldInput.stories.tsx
index 2c980ef063..144060acf6 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/__stories__/RichTextFieldInput.stories.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/__stories__/RichTextFieldInput.stories.tsx
@@ -12,7 +12,7 @@ import { FieldMetadataType } from '~/generated-metadata/graphql';
 import { I18nFrontDecorator } from '~/testing/decorators/I18nFrontDecorator';
 import { ObjectMetadataItemsDecorator } from '~/testing/decorators/ObjectMetadataItemsDecorator';
 import { SnackBarDecorator } from '~/testing/decorators/SnackBarDecorator';
-import { RichTextFieldInput } from '../RichTextFieldInput';
+import { RichTextFieldInput } from '@/object-record/record-field/ui/meta-types/input/components/RichTextFieldInput';
 import { getFieldInputEventContextProviderWithJestMocks } from './utils/getFieldInputEventContextProviderWithJestMocks';
 
 const targetableObjectId = 'test-id';
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/__stories__/TextFieldInput.stories.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/__stories__/TextFieldInput.stories.tsx
index 1e9ff6ca3b..6c47dd9dd6 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/__stories__/TextFieldInput.stories.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/__stories__/TextFieldInput.stories.tsx
@@ -13,8 +13,8 @@ import { type Decorator, type Meta, type StoryObj } from '@storybook/react';
 import { FieldMetadataType } from '~/generated-metadata/graphql';
 import { I18nFrontDecorator } from '~/testing/decorators/I18nFrontDecorator';
 import { SnackBarDecorator } from '~/testing/decorators/SnackBarDecorator';
-import { useTextField } from '../../../hooks/useTextField';
-import { TextFieldInput } from '../TextFieldInput';
+import { useTextField } from '@/object-record/record-field/ui/meta-types/hooks/useTextField';
+import { TextFieldInput } from '@/object-record/record-field/ui/meta-types/input/components/TextFieldInput';
 
 const TextFieldValueSetterEffect = ({ value }: { value: string }) => {
   const { setFieldValue } = useTextField();
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/utils/__tests__/getFieldLinkDefinedLinks.test.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/utils/__tests__/getFieldLinkDefinedLinks.test.ts
index 288bed4cbd..0856c382fc 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/utils/__tests__/getFieldLinkDefinedLinks.test.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/utils/__tests__/getFieldLinkDefinedLinks.test.ts
@@ -1,4 +1,4 @@
-import { getFieldLinkDefinedLinks } from '../getFieldLinkDefinedLinks';
+import { getFieldLinkDefinedLinks } from '@/object-record/record-field/ui/meta-types/input/utils/getFieldLinkDefinedLinks';
 
 describe('getFieldLinkDefinedLinks', () => {
   describe('Primary link', () => {
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/utils/__tests__/phonesUtils.test.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/utils/__tests__/phonesUtils.test.ts
index 780d1e8c39..df7939963b 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/utils/__tests__/phonesUtils.test.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/utils/__tests__/phonesUtils.test.ts
@@ -1,5 +1,5 @@
 import { type FieldPhonesValue } from '@/object-record/record-field/ui/types/FieldMetadata';
-import { createPhonesFromFieldValue } from '../phonesUtils';
+import { createPhonesFromFieldValue } from '@/object-record/record-field/ui/meta-types/input/utils/phonesUtils';
 
 describe('createPhonesFromFieldValue test suite', () => {
   it('should return an empty array if fieldValue is undefined', () => {
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/assertFieldMetadata.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/assertFieldMetadata.ts
index ba637ff314..b8cb3213de 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/assertFieldMetadata.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/assertFieldMetadata.ts
@@ -1,6 +1,6 @@
 import { type FieldMetadataType } from '~/generated-metadata/graphql';
 
-import { type FieldDefinition } from '../FieldDefinition';
+import { type FieldDefinition } from '@/object-record/record-field/ui/types/FieldDefinition';
 import {
   type FieldActorMetadata,
   type FieldAddressMetadata,
@@ -28,7 +28,7 @@ import {
   type FieldSelectMetadata,
   type FieldTextMetadata,
   type FieldUuidMetadata,
-} from '../FieldMetadata';
+} from '@/object-record/record-field/ui/types/FieldMetadata';
 
 type AssertFieldMetadataFunction = <
   E extends FieldMetadataType,
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isDateFIeldCustomDisplayFormat.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isDateFIeldCustomDisplayFormat.ts
index 6c1051e25c..29ddb860e0 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isDateFIeldCustomDisplayFormat.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isDateFIeldCustomDisplayFormat.ts
@@ -1,4 +1,4 @@
-import { FieldDateDisplayFormat } from '../FieldMetadata';
+import { FieldDateDisplayFormat } from '@/object-record/record-field/ui/types/FieldMetadata';
 
 export const isDateFieldCustomDisplayFormat = (
   displayFormat: FieldDateDisplayFormat,
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldActor.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldActor.ts
index d819d9e12a..fe7d98f019 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldActor.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldActor.ts
@@ -1,7 +1,10 @@
 import { FieldMetadataType } from '~/generated-metadata/graphql';
 
-import { type FieldDefinition } from '../FieldDefinition';
-import { type FieldActorMetadata, type FieldMetadata } from '../FieldMetadata';
+import { type FieldDefinition } from '@/object-record/record-field/ui/types/FieldDefinition';
+import {
+  type FieldActorMetadata,
+  type FieldMetadata,
+} from '@/object-record/record-field/ui/types/FieldMetadata';
 
 export const isFieldActor = (
   field: Pick<FieldDefinition<FieldMetadata>, 'type'>,
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldAddress.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldAddress.ts
index 7be547b647..836602c35c 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldAddress.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldAddress.ts
@@ -1,10 +1,10 @@
 import { FieldMetadataType } from '~/generated-metadata/graphql';
 
-import { type FieldDefinition } from '../FieldDefinition';
+import { type FieldDefinition } from '@/object-record/record-field/ui/types/FieldDefinition';
 import {
   type FieldAddressMetadata,
   type FieldMetadata,
-} from '../FieldMetadata';
+} from '@/object-record/record-field/ui/types/FieldMetadata';
 
 export const isFieldAddress = (
   field: Pick<FieldDefinition<FieldMetadata>, 'type'>,
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldAddressValue.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldAddressValue.ts
index 9d68b27e51..157ba39f6c 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldAddressValue.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldAddressValue.ts
@@ -1,7 +1,7 @@
 import { z } from 'zod';
 
 import { ALLOWED_ADDRESS_SUBFIELDS } from 'twenty-shared/types';
-import { type FieldAddressValue } from '../FieldMetadata';
+import { type FieldAddressValue } from '@/object-record/record-field/ui/types/FieldMetadata';
 
 export const addressSchema = z.object({
   addressStreet1: z.string(),
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldArray.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldArray.ts
index 15276e2433..8ee1646ff3 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldArray.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldArray.ts
@@ -1,7 +1,10 @@
 import { FieldMetadataType } from '~/generated-metadata/graphql';
 
-import { type FieldDefinition } from '../FieldDefinition';
-import { type FieldArrayMetadata, type FieldMetadata } from '../FieldMetadata';
+import { type FieldDefinition } from '@/object-record/record-field/ui/types/FieldDefinition';
+import {
+  type FieldArrayMetadata,
+  type FieldMetadata,
+} from '@/object-record/record-field/ui/types/FieldMetadata';
 
 export const isFieldArray = (
   field: Pick<FieldDefinition<FieldMetadata>, 'type'>,
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldBoolean.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldBoolean.ts
index f5b2b77a2c..4cab0d5440 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldBoolean.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldBoolean.ts
@@ -1,10 +1,10 @@
 import { FieldMetadataType } from '~/generated-metadata/graphql';
 
-import { type FieldDefinition } from '../FieldDefinition';
+import { type FieldDefinition } from '@/object-record/record-field/ui/types/FieldDefinition';
 import {
   type FieldBooleanMetadata,
   type FieldMetadata,
-} from '../FieldMetadata';
+} from '@/object-record/record-field/ui/types/FieldMetadata';
 
 export const isFieldBoolean = (
   field: Pick<FieldDefinition<FieldMetadata>, 'type'>,
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldBooleanValue.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldBooleanValue.ts
index 68a67a3b01..69f1492842 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldBooleanValue.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldBooleanValue.ts
@@ -1,6 +1,6 @@
 import { isBoolean } from '@sniptt/guards';
 
-import { type FieldBooleanValue } from '../FieldMetadata';
+import { type FieldBooleanValue } from '@/object-record/record-field/ui/types/FieldMetadata';
 
 // TODO: add zod
 export const isFieldBooleanValue = (
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldCurrency.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldCurrency.ts
index 71129a9163..f2d5f0ac37 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldCurrency.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldCurrency.ts
@@ -1,10 +1,10 @@
 import { FieldMetadataType } from '~/generated-metadata/graphql';
 
-import { type FieldDefinition } from '../FieldDefinition';
+import { type FieldDefinition } from '@/object-record/record-field/ui/types/FieldDefinition';
 import {
   type FieldCurrencyMetadata,
   type FieldMetadata,
-} from '../FieldMetadata';
+} from '@/object-record/record-field/ui/types/FieldMetadata';
 
 export const isFieldCurrency = (
   field: Pick<FieldDefinition<FieldMetadata>, 'type'>,
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldCurrencyValue.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldCurrencyValue.ts
index 15dcc35a67..4c16751223 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldCurrencyValue.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldCurrencyValue.ts
@@ -1,7 +1,7 @@
 import { z } from 'zod';
 
 import { CurrencyCode } from 'twenty-shared/constants';
-import { type FieldCurrencyValue } from '../FieldMetadata';
+import { type FieldCurrencyValue } from '@/object-record/record-field/ui/types/FieldMetadata';
 
 const currencySchema = z.object({
   currencyCode: z.union([z.enum(CurrencyCode), z.literal('')]).nullable(),
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldDate.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldDate.ts
index 36632065d2..132639226c 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldDate.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldDate.ts
@@ -1,5 +1,8 @@
-import { type FieldDefinition } from '../FieldDefinition';
-import { type FieldDateMetadata, type FieldMetadata } from '../FieldMetadata';
+import { type FieldDefinition } from '@/object-record/record-field/ui/types/FieldDefinition';
+import {
+  type FieldDateMetadata,
+  type FieldMetadata,
+} from '@/object-record/record-field/ui/types/FieldMetadata';
 
 export const isFieldDate = (
   field: Pick<FieldDefinition<FieldMetadata>, 'type'>,
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldDateTime.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldDateTime.ts
index 8145b1475d..5ae52d68d1 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldDateTime.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldDateTime.ts
@@ -1,10 +1,10 @@
 import { FieldMetadataType } from '~/generated-metadata/graphql';
 
-import { type FieldDefinition } from '../FieldDefinition';
+import { type FieldDefinition } from '@/object-record/record-field/ui/types/FieldDefinition';
 import {
   type FieldDateTimeMetadata,
   type FieldMetadata,
-} from '../FieldMetadata';
+} from '@/object-record/record-field/ui/types/FieldMetadata';
 
 export const isFieldDateTime = (
   field: Pick<FieldDefinition<FieldMetadata>, 'type'>,
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldDateTimeValue.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldDateTimeValue.ts
index 1d33528e34..ed6a3513a4 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldDateTimeValue.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldDateTimeValue.ts
@@ -1,6 +1,6 @@
 import { isNull, isString } from '@sniptt/guards';
 
-import { type FieldDateTimeValue } from '../FieldMetadata';
+import { type FieldDateTimeValue } from '@/object-record/record-field/ui/types/FieldMetadata';
 
 // TODO: add zod
 export const isFieldDateTimeValue = (
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldDisplayedAsPhone.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldDisplayedAsPhone.ts
index b3292cc28e..bcc5bc6c77 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldDisplayedAsPhone.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldDisplayedAsPhone.ts
@@ -1,8 +1,11 @@
 import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
 import { FieldMetadataType } from '~/generated-metadata/graphql';
 
-import { type FieldDefinition } from '../FieldDefinition';
-import { type FieldMetadata, type FieldTextMetadata } from '../FieldMetadata';
+import { type FieldDefinition } from '@/object-record/record-field/ui/types/FieldDefinition';
+import {
+  type FieldMetadata,
+  type FieldTextMetadata,
+} from '@/object-record/record-field/ui/types/FieldMetadata';
 
 // TODO: temporary - remove when 'Phone' field in 'Person' object
 // is migrated to use FieldMetadataType.Phone as type.
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldEmails.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldEmails.ts
index d2da28e098..c85c716a2b 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldEmails.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldEmails.ts
@@ -1,7 +1,10 @@
 import { FieldMetadataType } from '~/generated-metadata/graphql';
 
-import { type FieldDefinition } from '../FieldDefinition';
-import { type FieldEmailsMetadata, type FieldMetadata } from '../FieldMetadata';
+import { type FieldDefinition } from '@/object-record/record-field/ui/types/FieldDefinition';
+import {
+  type FieldEmailsMetadata,
+  type FieldMetadata,
+} from '@/object-record/record-field/ui/types/FieldMetadata';
 
 export const isFieldEmails = (
   field: Pick<FieldDefinition<FieldMetadata>, 'type'>,
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldFullName.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldFullName.ts
index 19dce0ef77..1f99952f85 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldFullName.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldFullName.ts
@@ -1,10 +1,10 @@
 import { FieldMetadataType } from '~/generated-metadata/graphql';
 
-import { type FieldDefinition } from '../FieldDefinition';
+import { type FieldDefinition } from '@/object-record/record-field/ui/types/FieldDefinition';
 import {
   type FieldFullNameMetadata,
   type FieldMetadata,
-} from '../FieldMetadata';
+} from '@/object-record/record-field/ui/types/FieldMetadata';
 
 export const isFieldFullName = (
   field: Pick<FieldDefinition<FieldMetadata>, 'type'>,
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldFullNameValue.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldFullNameValue.ts
index 13cb4ec309..05ec7d3f61 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldFullNameValue.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldFullNameValue.ts
@@ -1,6 +1,6 @@
 import { z } from 'zod';
 
-import { type FieldFullNameValue } from '../FieldMetadata';
+import { type FieldFullNameValue } from '@/object-record/record-field/ui/types/FieldMetadata';
 
 const fullnameSchema = z.object({
   firstName: z.string(),
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldLinks.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldLinks.ts
index d9566a4887..4bed672f26 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldLinks.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldLinks.ts
@@ -1,7 +1,10 @@
 import { FieldMetadataType } from '~/generated-metadata/graphql';
 
-import { type FieldDefinition } from '../FieldDefinition';
-import { type FieldLinksMetadata, type FieldMetadata } from '../FieldMetadata';
+import { type FieldDefinition } from '@/object-record/record-field/ui/types/FieldDefinition';
+import {
+  type FieldLinksMetadata,
+  type FieldMetadata,
+} from '@/object-record/record-field/ui/types/FieldMetadata';
 
 export const isFieldLinks = (
   field: Pick<FieldDefinition<FieldMetadata>, 'type'>,
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldLinksValue.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldLinksValue.ts
index 4780277764..43b075c9a2 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldLinksValue.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldLinksValue.ts
@@ -1,5 +1,5 @@
 import { z } from 'zod';
-import { type FieldLinksValue } from '../FieldMetadata';
+import { type FieldLinksValue } from '@/object-record/record-field/ui/types/FieldMetadata';
 
 export const linksSchema = z.object({
   primaryLinkLabel: z.string().nullable(),
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldMorphRelationManyToOne.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldMorphRelationManyToOne.ts
index 3460fa1348..df5bed8e0d 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldMorphRelationManyToOne.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldMorphRelationManyToOne.ts
@@ -1,10 +1,10 @@
 import { isFieldMorphRelation } from '@/object-record/record-field/ui/types/guards/isFieldMorphRelation';
 import { RelationType } from '~/generated-metadata/graphql';
-import { type FieldDefinition } from '../FieldDefinition';
+import { type FieldDefinition } from '@/object-record/record-field/ui/types/FieldDefinition';
 import {
   type FieldMetadata,
   type FieldMorphRelationMetadata,
-} from '../FieldMetadata';
+} from '@/object-record/record-field/ui/types/FieldMetadata';
 
 export const isFieldMorphRelationManyToOne = (
   field: Pick<FieldDefinition<FieldMetadata>, 'type' | 'metadata'>,
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldMorphRelationOneToMany.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldMorphRelationOneToMany.ts
index a6dba9ce67..2eac34e03d 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldMorphRelationOneToMany.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldMorphRelationOneToMany.ts
@@ -1,10 +1,10 @@
 import { isFieldMorphRelation } from '@/object-record/record-field/ui/types/guards/isFieldMorphRelation';
 import { RelationType } from '~/generated-metadata/graphql';
-import { type FieldDefinition } from '../FieldDefinition';
+import { type FieldDefinition } from '@/object-record/record-field/ui/types/FieldDefinition';
 import {
   type FieldMetadata,
   type FieldMorphRelationMetadata,
-} from '../FieldMetadata';
+} from '@/object-record/record-field/ui/types/FieldMetadata';
 
 export const isFieldMorphRelationOneToMany = (
   field: Pick<FieldDefinition<FieldMetadata>, 'type' | 'metadata'>,
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldNumber.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldNumber.ts
index 39d9de1997..2fb8029048 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldNumber.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldNumber.ts
@@ -1,7 +1,10 @@
 import { FieldMetadataType } from '~/generated-metadata/graphql';
 
-import { type FieldDefinition } from '../FieldDefinition';
-import { type FieldMetadata, type FieldNumberMetadata } from '../FieldMetadata';
+import { type FieldDefinition } from '@/object-record/record-field/ui/types/FieldDefinition';
+import {
+  type FieldMetadata,
+  type FieldNumberMetadata,
+} from '@/object-record/record-field/ui/types/FieldMetadata';
 
 export const isFieldNumber = (
   field: Pick<FieldDefinition<FieldMetadata>, 'type'>,
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldNumberValue.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldNumberValue.ts
index d108fb94ea..53f43a3318 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldNumberValue.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldNumberValue.ts
@@ -1,6 +1,6 @@
 import { isNull, isNumber } from '@sniptt/guards';
 
-import { type FieldNumberValue } from '../FieldMetadata';
+import { type FieldNumberValue } from '@/object-record/record-field/ui/types/FieldMetadata';
 
 // TODO: add zod
 export const isFieldNumberValue = (
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldPhones.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldPhones.ts
index b456824418..0d9455fb43 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldPhones.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldPhones.ts
@@ -1,7 +1,10 @@
 import { FieldMetadataType } from '~/generated-metadata/graphql';
 
-import { type FieldDefinition } from '../FieldDefinition';
-import { type FieldMetadata, type FieldPhonesMetadata } from '../FieldMetadata';
+import { type FieldDefinition } from '@/object-record/record-field/ui/types/FieldDefinition';
+import {
+  type FieldMetadata,
+  type FieldPhonesMetadata,
+} from '@/object-record/record-field/ui/types/FieldMetadata';
 
 export const isFieldPhones = (
   field: Pick<FieldDefinition<FieldMetadata>, 'type'>,
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldPhonesValue.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldPhonesValue.ts
index 5ce552cc4f..ed883bfd6b 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldPhonesValue.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldPhonesValue.ts
@@ -1,6 +1,6 @@
 import { z } from 'zod';
 
-import { type FieldPhonesValue } from '../FieldMetadata';
+import { type FieldPhonesValue } from '@/object-record/record-field/ui/types/FieldMetadata';
 
 export const phonesSchema = z.object({
   primaryPhoneNumber: z.string(),
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldPosition.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldPosition.ts
index d5fd12812e..978c3033d6 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldPosition.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldPosition.ts
@@ -1,10 +1,10 @@
 import { FieldMetadataType } from '~/generated-metadata/graphql';
 
-import { type FieldDefinition } from '../FieldDefinition';
+import { type FieldDefinition } from '@/object-record/record-field/ui/types/FieldDefinition';
 import {
   type FieldMetadata,
   type FieldPositionMetadata,
-} from '../FieldMetadata';
+} from '@/object-record/record-field/ui/types/FieldMetadata';
 
 export const isFieldPosition = (
   field: Pick<FieldDefinition<FieldMetadata>, 'type'>,
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldPositionValue.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldPositionValue.ts
index 47a007f43c..f697ccbcff 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldPositionValue.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldPositionValue.ts
@@ -1,5 +1,5 @@
 import { isNumber } from '@sniptt/guards';
-import { type FieldPositionMetadata } from '../FieldMetadata';
+import { type FieldPositionMetadata } from '@/object-record/record-field/ui/types/FieldMetadata';
 
 // TODO: add zod
 export const isFieldPhoneValue = (
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldRating.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldRating.ts
index c7bcdfa5d6..c50a3fb6f9 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldRating.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldRating.ts
@@ -1,7 +1,10 @@
 import { FieldMetadataType } from '~/generated-metadata/graphql';
 
-import { type FieldDefinition } from '../FieldDefinition';
-import { type FieldMetadata, type FieldRatingMetadata } from '../FieldMetadata';
+import { type FieldDefinition } from '@/object-record/record-field/ui/types/FieldDefinition';
+import {
+  type FieldMetadata,
+  type FieldRatingMetadata,
+} from '@/object-record/record-field/ui/types/FieldMetadata';
 
 export const isFieldRating = (
   field: Pick<FieldDefinition<FieldMetadata>, 'type'>,
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldRawJson.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldRawJson.ts
index e58b0dd3ec..001debacdb 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldRawJson.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldRawJson.ts
@@ -1,10 +1,10 @@
 import { FieldMetadataType } from '~/generated-metadata/graphql';
 
-import { type FieldDefinition } from '../FieldDefinition';
+import { type FieldDefinition } from '@/object-record/record-field/ui/types/FieldDefinition';
 import {
   type FieldMetadata,
   type FieldRawJsonMetadata,
-} from '../FieldMetadata';
+} from '@/object-record/record-field/ui/types/FieldMetadata';
 
 export const isFieldRawJson = (
   field: Pick<FieldDefinition<FieldMetadata>, 'type'>,
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldRawJsonValue.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldRawJsonValue.ts
index 5c238ae22e..c2940fff08 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldRawJsonValue.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldRawJsonValue.ts
@@ -1,6 +1,9 @@
 import { z } from 'zod';
 
-import { type FieldJsonValue, type Json } from '../FieldMetadata';
+import {
+  type FieldJsonValue,
+  type Json,
+} from '@/object-record/record-field/ui/types/FieldMetadata';
 
 // See https://zod.dev/?id=json-type
 const literalSchema = z.union([z.string(), z.number(), z.boolean(), z.null()]);
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldRelation.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldRelation.ts
index 0060d0ffb2..f29d8427e2 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldRelation.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldRelation.ts
@@ -1,10 +1,10 @@
 import { FieldMetadataType } from '~/generated-metadata/graphql';
 
-import { type FieldDefinition } from '../FieldDefinition';
+import { type FieldDefinition } from '@/object-record/record-field/ui/types/FieldDefinition';
 import {
   type FieldMetadata,
   type FieldRelationMetadata,
-} from '../FieldMetadata';
+} from '@/object-record/record-field/ui/types/FieldMetadata';
 
 export const isFieldRelation = (
   field: Pick<FieldDefinition<FieldMetadata>, 'type'>,
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldRelationManyToOne.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldRelationManyToOne.ts
index 82149c6f32..cba211789f 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldRelationManyToOne.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldRelationManyToOne.ts
@@ -1,11 +1,11 @@
 import { isFieldRelation } from '@/object-record/record-field/ui/types/guards/isFieldRelation';
 
 import { RelationType } from '~/generated-metadata/graphql';
-import { type FieldDefinition } from '../FieldDefinition';
+import { type FieldDefinition } from '@/object-record/record-field/ui/types/FieldDefinition';
 import {
   type FieldMetadata,
   type FieldRelationMetadata,
-} from '../FieldMetadata';
+} from '@/object-record/record-field/ui/types/FieldMetadata';
 
 export const isFieldRelationManyToOne = (
   field: Pick<FieldDefinition<FieldMetadata>, 'type' | 'metadata'>,
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldRelationOneToMany.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldRelationOneToMany.ts
index a3b42bf3fd..1d57d41c76 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldRelationOneToMany.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldRelationOneToMany.ts
@@ -1,11 +1,11 @@
 import { isFieldRelation } from '@/object-record/record-field/ui/types/guards/isFieldRelation';
 
 import { RelationType } from '~/generated-metadata/graphql';
-import { type FieldDefinition } from '../FieldDefinition';
+import { type FieldDefinition } from '@/object-record/record-field/ui/types/FieldDefinition';
 import {
   type FieldMetadata,
   type FieldRelationMetadata,
-} from '../FieldMetadata';
+} from '@/object-record/record-field/ui/types/FieldMetadata';
 
 export const isFieldRelationOneToMany = (
   field: Pick<FieldDefinition<FieldMetadata>, 'type' | 'metadata'>,
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldRichText.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldRichText.ts
index 3d72a7b824..13fada8e50 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldRichText.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldRichText.ts
@@ -1,10 +1,10 @@
 import { FieldMetadataType } from '~/generated-metadata/graphql';
 
-import { type FieldDefinition } from '../FieldDefinition';
+import { type FieldDefinition } from '@/object-record/record-field/ui/types/FieldDefinition';
 import {
   type FieldMetadata,
   type FieldRichTextMetadata,
-} from '../FieldMetadata';
+} from '@/object-record/record-field/ui/types/FieldMetadata';
 
 export const isFieldRichText = (
   field: Pick<FieldDefinition<FieldMetadata>, 'type'>,
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldRichTextV2.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldRichTextV2.ts
index be7ee89ac9..e8b521d3b4 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldRichTextV2.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldRichTextV2.ts
@@ -1,10 +1,10 @@
 import { FieldMetadataType } from '~/generated-metadata/graphql';
 
-import { type FieldDefinition } from '../FieldDefinition';
+import { type FieldDefinition } from '@/object-record/record-field/ui/types/FieldDefinition';
 import {
   type FieldMetadata,
   type FieldRichTextV2Metadata,
-} from '../FieldMetadata';
+} from '@/object-record/record-field/ui/types/FieldMetadata';
 
 export const isFieldRichTextV2 = (
   field: Pick<FieldDefinition<FieldMetadata>, 'type'>,
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldRichTextValue.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldRichTextValue.ts
index 3634f784b0..a7627f5a01 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldRichTextValue.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldRichTextValue.ts
@@ -1,5 +1,5 @@
 import { z } from 'zod';
-import { type FieldRichTextValue } from '../FieldMetadata';
+import { type FieldRichTextValue } from '@/object-record/record-field/ui/types/FieldMetadata';
 
 export const richTextSchema: z.ZodType<FieldRichTextValue> = z.union([
   z.null(),
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldSelect.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldSelect.ts
index d80c0eb901..e155d5357e 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldSelect.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldSelect.ts
@@ -1,7 +1,10 @@
 import { FieldMetadataType } from '~/generated-metadata/graphql';
 
-import { type FieldDefinition } from '../FieldDefinition';
-import { type FieldMetadata, type FieldSelectMetadata } from '../FieldMetadata';
+import { type FieldDefinition } from '@/object-record/record-field/ui/types/FieldDefinition';
+import {
+  type FieldMetadata,
+  type FieldSelectMetadata,
+} from '@/object-record/record-field/ui/types/FieldMetadata';
 
 export const isFieldSelect = (
   field: Pick<FieldDefinition<FieldMetadata>, 'type'>,
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldText.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldText.ts
index 5edfc6b194..5692f9d6dc 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldText.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldText.ts
@@ -1,7 +1,10 @@
 import { FieldMetadataType } from '~/generated-metadata/graphql';
 
-import { type FieldDefinition } from '../FieldDefinition';
-import { type FieldMetadata, type FieldTextMetadata } from '../FieldMetadata';
+import { type FieldDefinition } from '@/object-record/record-field/ui/types/FieldDefinition';
+import {
+  type FieldMetadata,
+  type FieldTextMetadata,
+} from '@/object-record/record-field/ui/types/FieldMetadata';
 
 export const isFieldText = (
   field: Pick<FieldDefinition<FieldMetadata>, 'type'>,
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldTextValue.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldTextValue.ts
index c2fe82df72..98d320c74c 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldTextValue.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldTextValue.ts
@@ -1,6 +1,6 @@
 import { isString } from '@sniptt/guards';
 
-import { type FieldTextValue } from '../FieldMetadata';
+import { type FieldTextValue } from '@/object-record/record-field/ui/types/FieldMetadata';
 
 // TODO: add zod
 export const isFieldTextValue = (
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldTsVectorValue.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldTsVectorValue.ts
index ccab23d3f4..983aab5248 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldTsVectorValue.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldTsVectorValue.ts
@@ -1,9 +1,9 @@
 import {
   type FieldMetadata,
   type FieldTsVectorMetadata,
-} from '../FieldMetadata';
+} from '@/object-record/record-field/ui/types/FieldMetadata';
 
-import { type FieldDefinition } from '../FieldDefinition';
+import { type FieldDefinition } from '@/object-record/record-field/ui/types/FieldDefinition';
 
 import { FieldMetadataType } from '~/generated-metadata/graphql';
 
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldUuid.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldUuid.ts
index c630209fe9..842ca331e3 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldUuid.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/types/guards/isFieldUuid.ts
@@ -1,7 +1,10 @@
 import { FieldMetadataType } from '~/generated-metadata/graphql';
 
-import { type FieldDefinition } from '../FieldDefinition';
-import { type FieldMetadata, type FieldUuidMetadata } from '../FieldMetadata';
+import { type FieldDefinition } from '@/object-record/record-field/ui/types/FieldDefinition';
+import {
+  type FieldMetadata,
+  type FieldUuidMetadata,
+} from '@/object-record/record-field/ui/types/FieldMetadata';
 
 export const isFieldUuid = (
   field: Pick<FieldDefinition<FieldMetadata>, 'type'>,
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/utils/__tests__/isFieldValueEmpty.test.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/utils/__tests__/isFieldValueEmpty.test.ts
index f13c63dca6..e92401551e 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/utils/__tests__/isFieldValueEmpty.test.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/utils/__tests__/isFieldValueEmpty.test.ts
@@ -11,7 +11,7 @@ import { type FieldDefinition } from '@/object-record/record-field/ui/types/Fiel
 import { type FieldCurrencyMetadata } from '@/object-record/record-field/ui/types/FieldMetadata';
 import { FieldMetadataType } from '~/generated-metadata/graphql';
 
-import { isFieldValueEmpty } from '../isFieldValueEmpty';
+import { isFieldValueEmpty } from '@/object-record/record-field/ui/utils/isFieldValueEmpty';
 
 describe('isFieldValueEmpty', () => {
   it('should return correct value for boolean field', () => {
diff --git a/packages/twenty-front/src/modules/object-record/record-filter-group/hooks/__tests__/useRemoveRecordFilterGroup.test.tsx b/packages/twenty-front/src/modules/object-record/record-filter-group/hooks/__tests__/useRemoveRecordFilterGroup.test.tsx
index 18f1d71ca0..6ac1b321a7 100644
--- a/packages/twenty-front/src/modules/object-record/record-filter-group/hooks/__tests__/useRemoveRecordFilterGroup.test.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-filter-group/hooks/__tests__/useRemoveRecordFilterGroup.test.tsx
@@ -6,8 +6,8 @@ import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/ho
 import { act } from 'react';
 import { RecordFilterGroupLogicalOperator } from 'twenty-shared/types';
 import { getJestMetadataAndApolloMocksWrapper } from '~/testing/jest/getJestMetadataAndApolloMocksWrapper';
-import { useRemoveRecordFilterGroup } from '../useRemoveRecordFilterGroup';
-import { useUpsertRecordFilterGroup } from '../useUpsertRecordFilterGroup';
+import { useRemoveRecordFilterGroup } from '@/object-record/record-filter-group/hooks/useRemoveRecordFilterGroup';
+import { useUpsertRecordFilterGroup } from '@/object-record/record-filter-group/hooks/useUpsertRecordFilterGroup';
 
 const Wrapper = getJestMetadataAndApolloMocksWrapper({
   apolloMocks: [],
diff --git a/packages/twenty-front/src/modules/object-record/record-filter/hooks/__tests__/useRemoveRecordFilter.test.tsx b/packages/twenty-front/src/modules/object-record/record-filter/hooks/__tests__/useRemoveRecordFilter.test.tsx
index 63578e41c9..07cf8340b1 100644
--- a/packages/twenty-front/src/modules/object-record/record-filter/hooks/__tests__/useRemoveRecordFilter.test.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-filter/hooks/__tests__/useRemoveRecordFilter.test.tsx
@@ -7,8 +7,8 @@ import { act } from 'react';
 import { ViewFilterOperand } from 'twenty-shared/types';
 import { FieldMetadataType } from '~/generated-metadata/graphql';
 import { getJestMetadataAndApolloMocksWrapper } from '~/testing/jest/getJestMetadataAndApolloMocksWrapper';
-import { useRemoveRecordFilter } from '../useRemoveRecordFilter';
-import { useUpsertRecordFilter } from '../useUpsertRecordFilter';
+import { useRemoveRecordFilter } from '@/object-record/record-filter/hooks/useRemoveRecordFilter';
+import { useUpsertRecordFilter } from '@/object-record/record-filter/hooks/useUpsertRecordFilter';
 
 const Wrapper = getJestMetadataAndApolloMocksWrapper({
   apolloMocks: [],
diff --git a/packages/twenty-front/src/modules/object-record/record-filter/hooks/__tests__/useUpsertRecordFilter.test.tsx b/packages/twenty-front/src/modules/object-record/record-filter/hooks/__tests__/useUpsertRecordFilter.test.tsx
index 074f65e2d6..0532ea05f5 100644
--- a/packages/twenty-front/src/modules/object-record/record-filter/hooks/__tests__/useUpsertRecordFilter.test.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-filter/hooks/__tests__/useUpsertRecordFilter.test.tsx
@@ -7,7 +7,7 @@ import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/ho
 import { ViewFilterOperand } from 'twenty-shared/types';
 import { FieldMetadataType } from '~/generated-metadata/graphql';
 import { getJestMetadataAndApolloMocksWrapper } from '~/testing/jest/getJestMetadataAndApolloMocksWrapper';
-import { useUpsertRecordFilter } from '../useUpsertRecordFilter';
+import { useUpsertRecordFilter } from '@/object-record/record-filter/hooks/useUpsertRecordFilter';
 
 const Wrapper = getJestMetadataAndApolloMocksWrapper({
   apolloMocks: [],
diff --git a/packages/twenty-front/src/modules/object-record/record-filter/states/currentRecordFiltersComponentState.ts b/packages/twenty-front/src/modules/object-record/record-filter/states/currentRecordFiltersComponentState.ts
index 5b0861bc31..bd7ab8564c 100644
--- a/packages/twenty-front/src/modules/object-record/record-filter/states/currentRecordFiltersComponentState.ts
+++ b/packages/twenty-front/src/modules/object-record/record-filter/states/currentRecordFiltersComponentState.ts
@@ -1,6 +1,6 @@
 import { RecordFiltersComponentInstanceContext } from '@/object-record/record-filter/states/context/RecordFiltersComponentInstanceContext';
 import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState';
-import { type RecordFilter } from '../../record-filter/types/RecordFilter';
+import { type RecordFilter } from '@/object-record/record-filter/types/RecordFilter';
 
 export const currentRecordFiltersComponentState = createComponentState<
   RecordFilter[]
diff --git a/packages/twenty-front/src/modules/object-record/record-filter/utils/__tests__/getAllRecordFilterDescendantsOfRecordFilterGroup.test.ts b/packages/twenty-front/src/modules/object-record/record-filter/utils/__tests__/getAllRecordFilterDescendantsOfRecordFilterGroup.test.ts
index 8e41c7d355..faa71bb9f1 100644
--- a/packages/twenty-front/src/modules/object-record/record-filter/utils/__tests__/getAllRecordFilterDescendantsOfRecordFilterGroup.test.ts
+++ b/packages/twenty-front/src/modules/object-record/record-filter/utils/__tests__/getAllRecordFilterDescendantsOfRecordFilterGroup.test.ts
@@ -3,7 +3,7 @@ import { type RecordFilter } from '@/object-record/record-filter/types/RecordFil
 import { RecordFilterOperand } from '@/object-record/record-filter/types/RecordFilterOperand';
 import { RecordFilterGroupLogicalOperator } from 'twenty-shared/types';
 import { sortByProperty } from '~/utils/array/sortByProperty';
-import { getAllRecordFilterDescendantsOfRecordFilterGroup } from '../getAllRecordFilterDescendantsOfRecordFilterGroup';
+import { getAllRecordFilterDescendantsOfRecordFilterGroup } from '@/object-record/record-filter/utils/getAllRecordFilterDescendantsOfRecordFilterGroup';
 
 const MOCK_RECORD_FILTER_FIELDS: RecordFilter = {
   id: 'filter-1',
diff --git a/packages/twenty-front/src/modules/object-record/record-filter/utils/__tests__/isMatchingArrayFilter.test.ts b/packages/twenty-front/src/modules/object-record/record-filter/utils/__tests__/isMatchingArrayFilter.test.ts
index 6dde97f7bc..12d4ad3704 100644
--- a/packages/twenty-front/src/modules/object-record/record-filter/utils/__tests__/isMatchingArrayFilter.test.ts
+++ b/packages/twenty-front/src/modules/object-record/record-filter/utils/__tests__/isMatchingArrayFilter.test.ts
@@ -1,4 +1,4 @@
-import { isMatchingArrayFilter } from '../isMatchingArrayFilter';
+import { isMatchingArrayFilter } from '@/object-record/record-filter/utils/isMatchingArrayFilter';
 
 describe('isMatchingArrayFilter', () => {
   describe('is filter', () => {
diff --git a/packages/twenty-front/src/modules/object-record/record-group/utils/__tests__/recordGroupSortedInsert.test.ts b/packages/twenty-front/src/modules/object-record/record-group/utils/__tests__/recordGroupSortedInsert.test.ts
index f0577105fd..4c4e93b7bc 100644
--- a/packages/twenty-front/src/modules/object-record/record-group/utils/__tests__/recordGroupSortedInsert.test.ts
+++ b/packages/twenty-front/src/modules/object-record/record-group/utils/__tests__/recordGroupSortedInsert.test.ts
@@ -19,7 +19,7 @@
 //   array.splice(low, 0, item);
 // };
 
-import { recordGroupSortedInsert } from '../recordGroupSortedInsert';
+import { recordGroupSortedInsert } from '@/object-record/record-group/utils/recordGroupSortedInsert';
 
 describe('recordGroupSortedInsert', () => {
   it('should insert an item into an empty array', () => {
diff --git a/packages/twenty-front/src/modules/object-record/record-index/export/hooks/__tests__/useRecordIndexExportRecords.test.ts b/packages/twenty-front/src/modules/object-record/record-index/export/hooks/__tests__/useRecordIndexExportRecords.test.ts
index 34434ac8c3..6ce08f5cf4 100644
--- a/packages/twenty-front/src/modules/object-record/record-index/export/hooks/__tests__/useRecordIndexExportRecords.test.ts
+++ b/packages/twenty-front/src/modules/object-record/record-index/export/hooks/__tests__/useRecordIndexExportRecords.test.ts
@@ -6,7 +6,7 @@ import { FieldMetadataType, RelationType } from '~/generated-metadata/graphql';
 import {
   displayedExportProgress,
   generateCsv,
-} from '../useRecordIndexExportRecords';
+} from '@/object-record/record-index/export/hooks/useRecordIndexExportRecords';
 
 jest.useFakeTimers();
 
diff --git a/packages/twenty-front/src/modules/object-record/record-index/export/hooks/__tests__/useRecordIndexLazyFetchRecords.test.ts b/packages/twenty-front/src/modules/object-record/record-index/export/hooks/__tests__/useRecordIndexLazyFetchRecords.test.ts
index 1f56ec15c2..8f9c4609f7 100644
--- a/packages/twenty-front/src/modules/object-record/record-index/export/hooks/__tests__/useRecordIndexLazyFetchRecords.test.ts
+++ b/packages/twenty-front/src/modules/object-record/record-index/export/hooks/__tests__/useRecordIndexLazyFetchRecords.test.ts
@@ -4,7 +4,7 @@ import {
   percentage,
   sleep,
   useRecordIndexLazyFetchRecords,
-} from '../useRecordIndexLazyFetchRecords';
+} from '@/object-record/record-index/export/hooks/useRecordIndexLazyFetchRecords';
 
 import { useLazyFetchAllRecords } from '@/object-record/hooks/useLazyFetchAllRecords';
 import { ViewType } from '@/views/types/ViewType';
diff --git a/packages/twenty-front/src/modules/object-record/record-merge/components/MergeRecordsContainer.tsx b/packages/twenty-front/src/modules/object-record/record-merge/components/MergeRecordsContainer.tsx
index 28a1edc635..f6e6dd5aec 100644
--- a/packages/twenty-front/src/modules/object-record/record-merge/components/MergeRecordsContainer.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-merge/components/MergeRecordsContainer.tsx
@@ -11,7 +11,7 @@ import { CommandMenuPageComponentInstanceContext } from '@/command-menu/states/c
 import { useMergeRecordsSelectedRecords } from '@/object-record/record-merge/hooks/useMergeRecordsSelectedRecords';
 import { MergeRecordsTabId } from '@/object-record/record-merge/types/MergeRecordsTabId';
 import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';
-import { useMergeRecordsContainerTabs } from '../hooks/useMergeRecordsContainerTabs';
+import { useMergeRecordsContainerTabs } from '@/object-record/record-merge/hooks/useMergeRecordsContainerTabs';
 import { MergePreviewTab } from './MergePreviewTab';
 import { MergeRecordTab } from './MergeRecordTab';
 import { MergeRecordsFooter } from './MergeRecordsFooter';
diff --git a/packages/twenty-front/src/modules/object-record/record-merge/components/MergeSettingsTab.tsx b/packages/twenty-front/src/modules/object-record/record-merge/components/MergeSettingsTab.tsx
index e2c788425f..e318654554 100644
--- a/packages/twenty-front/src/modules/object-record/record-merge/components/MergeSettingsTab.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-merge/components/MergeSettingsTab.tsx
@@ -4,8 +4,8 @@ import { useMergeRecordsSettings } from '@/object-record/record-merge/hooks/useM
 import { Select } from '@/ui/input/components/Select';
 import styled from '@emotion/styled';
 import { Section } from 'twenty-ui/layout';
-import { getPositionNumberIcon } from '../utils/getPositionNumberIcon';
-import { getPositionWordLabel } from '../utils/getPositionWordLabel';
+import { getPositionNumberIcon } from '@/object-record/record-merge/utils/getPositionNumberIcon';
+import { getPositionWordLabel } from '@/object-record/record-merge/utils/getPositionWordLabel';
 
 const StyledSection = styled(Section)`
   margin: ${({ theme }) => theme.spacing(4)};
diff --git a/packages/twenty-front/src/modules/object-record/record-merge/hooks/useMergeRecordsActions.ts b/packages/twenty-front/src/modules/object-record/record-merge/hooks/useMergeRecordsActions.ts
index 2fe05af5eb..b91caf547e 100644
--- a/packages/twenty-front/src/modules/object-record/record-merge/hooks/useMergeRecordsActions.ts
+++ b/packages/twenty-front/src/modules/object-record/record-merge/hooks/useMergeRecordsActions.ts
@@ -7,8 +7,8 @@ import { useMergeRecordsSelectedRecords } from '@/object-record/record-merge/hoo
 import { useSnackBar } from '@/ui/feedback/snack-bar-manager/hooks/useSnackBar';
 import { AppPath } from 'twenty-shared/types';
 import { useNavigateApp } from '~/hooks/useNavigateApp';
-import { isMergeInProgressState } from '../states/mergeInProgressState';
-import { mergeSettingsState } from '../states/mergeSettingsState';
+import { isMergeInProgressState } from '@/object-record/record-merge/states/mergeInProgressState';
+import { mergeSettingsState } from '@/object-record/record-merge/states/mergeSettingsState';
 
 type UseMergeRecordsActionsProps = {
   objectNameSingular: string;
diff --git a/packages/twenty-front/src/modules/object-record/record-merge/hooks/useMergeRecordsContainerTabs.ts b/packages/twenty-front/src/modules/object-record/record-merge/hooks/useMergeRecordsContainerTabs.ts
index d3a35e0415..4d47fc4c15 100644
--- a/packages/twenty-front/src/modules/object-record/record-merge/hooks/useMergeRecordsContainerTabs.ts
+++ b/packages/twenty-front/src/modules/object-record/record-merge/hooks/useMergeRecordsContainerTabs.ts
@@ -6,9 +6,9 @@ import { IconArrowMerge, IconSettings } from 'twenty-ui/display';
 
 import { type ObjectRecord } from '@/object-record/types/ObjectRecord';
 import { type SingleTabProps } from '@/ui/layout/tab-list/types/SingleTabProps';
-import { MergeRecordsTabId } from '../types/MergeRecordsTabId';
-import { getPositionNumberIcon } from '../utils/getPositionNumberIcon';
-import { getPositionWordLabel } from '../utils/getPositionWordLabel';
+import { MergeRecordsTabId } from '@/object-record/record-merge/types/MergeRecordsTabId';
+import { getPositionNumberIcon } from '@/object-record/record-merge/utils/getPositionNumberIcon';
+import { getPositionWordLabel } from '@/object-record/record-merge/utils/getPositionWordLabel';
 
 export const useMergeRecordsContainerTabs = (
   selectedRecords: ObjectRecord[],
diff --git a/packages/twenty-front/src/modules/object-record/record-merge/hooks/useMergeRecordsSettings.ts b/packages/twenty-front/src/modules/object-record/record-merge/hooks/useMergeRecordsSettings.ts
index 0d7033d91b..229ab43e47 100644
--- a/packages/twenty-front/src/modules/object-record/record-merge/hooks/useMergeRecordsSettings.ts
+++ b/packages/twenty-front/src/modules/object-record/record-merge/hooks/useMergeRecordsSettings.ts
@@ -1,7 +1,7 @@
 import { useRecoilState } from 'recoil';
 
 import { type MergeManySettings } from '@/object-record/hooks/useMergeManyRecords';
-import { mergeSettingsState } from '../states/mergeSettingsState';
+import { mergeSettingsState } from '@/object-record/record-merge/states/mergeSettingsState';
 
 export const useMergeRecordsSettings = () => {
   const [mergeSettings, setMergeSettings] = useRecoilState(mergeSettingsState);
diff --git a/packages/twenty-front/src/modules/object-record/record-merge/hooks/usePerformMergePreview.ts b/packages/twenty-front/src/modules/object-record/record-merge/hooks/usePerformMergePreview.ts
index 83524e204c..6d73891536 100644
--- a/packages/twenty-front/src/modules/object-record/record-merge/hooks/usePerformMergePreview.ts
+++ b/packages/twenty-front/src/modules/object-record/record-merge/hooks/usePerformMergePreview.ts
@@ -5,8 +5,8 @@ import { useUpsertRecordsInStore } from '@/object-record/record-store/hooks/useU
 import { type ObjectRecord } from '@/object-record/types/ObjectRecord';
 import { useEffect, useState } from 'react';
 import { useRecoilValue } from 'recoil';
-import { isMergeInProgressState } from '../states/mergeInProgressState';
-import { mergeSettingsState } from '../states/mergeSettingsState';
+import { isMergeInProgressState } from '@/object-record/record-merge/states/mergeInProgressState';
+import { mergeSettingsState } from '@/object-record/record-merge/states/mergeSettingsState';
 
 type UseMergePreviewProps = {
   objectNameSingular: string;
diff --git a/packages/twenty-front/src/modules/object-record/record-merge/utils/getPositionNumberIcon.ts b/packages/twenty-front/src/modules/object-record/record-merge/utils/getPositionNumberIcon.ts
index c901a87149..ca60a56974 100644
--- a/packages/twenty-front/src/modules/object-record/record-merge/utils/getPositionNumberIcon.ts
+++ b/packages/twenty-front/src/modules/object-record/record-merge/utils/getPositionNumberIcon.ts
@@ -10,7 +10,7 @@ import {
   IconSquareNumber8,
   IconSquareNumber9,
 } from 'twenty-ui/display';
-import { type FixedLengthArray } from '../types/FixedLengthArray';
+import { type FixedLengthArray } from '@/object-record/record-merge/types/FixedLengthArray';
 
 export const getPositionNumberIcon = (index: number) => {
   const iconMapping: FixedLengthArray<
diff --git a/packages/twenty-front/src/modules/object-record/record-merge/utils/getPositionWordLabel.ts b/packages/twenty-front/src/modules/object-record/record-merge/utils/getPositionWordLabel.ts
index b3b5871a09..1f940b1fc6 100644
--- a/packages/twenty-front/src/modules/object-record/record-merge/utils/getPositionWordLabel.ts
+++ b/packages/twenty-front/src/modules/object-record/record-merge/utils/getPositionWordLabel.ts
@@ -1,6 +1,6 @@
 import { t } from '@lingui/core/macro';
 import { type MUTATION_MAX_MERGE_RECORDS } from 'twenty-shared/constants';
-import { type FixedLengthArray } from '../types/FixedLengthArray';
+import { type FixedLengthArray } from '@/object-record/record-merge/types/FixedLengthArray';
 
 export const getPositionWordLabel = (index: number): string => {
   const labels: FixedLengthArray<string, typeof MUTATION_MAX_MERGE_RECORDS> = [
diff --git a/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/utils/__tests__/sortMorphItems.test.ts b/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/utils/__tests__/sortMorphItems.test.ts
index 38be5fab4a..7b8ea299f5 100644
--- a/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/utils/__tests__/sortMorphItems.test.ts
+++ b/packages/twenty-front/src/modules/object-record/record-picker/multiple-record-picker/utils/__tests__/sortMorphItems.test.ts
@@ -1,6 +1,6 @@
 import { type RecordPickerPickableMorphItem } from '@/object-record/record-picker/types/RecordPickerPickableMorphItem';
 import { type SearchRecord } from '~/generated-metadata/graphql';
-import { sortMorphItems } from '../sortMorphItems';
+import { sortMorphItems } from '@/object-record/record-picker/multiple-record-picker/utils/sortMorphItems';
 
 const createMorphItem = (
   recordId: string,
diff --git a/packages/twenty-front/src/modules/object-record/record-store/hooks/__tests__/useUpsertRecordsInStore.test.tsx b/packages/twenty-front/src/modules/object-record/record-store/hooks/__tests__/useUpsertRecordsInStore.test.tsx
index 75fc77d212..f6a60a08c1 100644
--- a/packages/twenty-front/src/modules/object-record/record-store/hooks/__tests__/useUpsertRecordsInStore.test.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-store/hooks/__tests__/useUpsertRecordsInStore.test.tsx
@@ -3,7 +3,7 @@ import { type ReactNode } from 'react';
 import { RecoilRoot, useRecoilValue } from 'recoil';
 
 import { recordStoreFamilyState } from '@/object-record/record-store/states/recordStoreFamilyState';
-import { useUpsertRecordsInStore } from '../useUpsertRecordsInStore';
+import { useUpsertRecordsInStore } from '@/object-record/record-store/hooks/useUpsertRecordsInStore';
 
 const Wrapper = ({ children }: { children: ReactNode }) => (
   <RecoilRoot>{children}</RecoilRoot>
diff --git a/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableWithWrappers.tsx b/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableWithWrappers.tsx
index aba93ef692..0ec5366e89 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableWithWrappers.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/components/RecordTableWithWrappers.tsx
@@ -11,7 +11,7 @@ import { useFocusedRecordTableRow } from '@/object-record/record-table/hooks/use
 import { PageFocusId } from '@/types/PageFocusId';
 import { useHotkeysOnFocusedElement } from '@/ui/utilities/hotkey/hooks/useHotkeysOnFocusedElement';
 import { ScrollWrapper } from '@/ui/utilities/scroll/components/ScrollWrapper';
-import { RecordUpdateContext } from '../contexts/EntityUpdateMutationHookContext';
+import { RecordUpdateContext } from '@/object-record/record-table/contexts/EntityUpdateMutationHookContext';
 
 type RecordTableWithWrappersProps = {
   objectNameSingular: string;
diff --git a/packages/twenty-front/src/modules/object-record/record-table/empty-state/utils/__tests__/getEmptyStateSubTitle.test.ts b/packages/twenty-front/src/modules/object-record/record-table/empty-state/utils/__tests__/getEmptyStateSubTitle.test.ts
index bc23535f21..22ed3f5ed7 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/empty-state/utils/__tests__/getEmptyStateSubTitle.test.ts
+++ b/packages/twenty-front/src/modules/object-record/record-table/empty-state/utils/__tests__/getEmptyStateSubTitle.test.ts
@@ -1,5 +1,5 @@
 import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
-import { getEmptyStateSubTitle } from '../getEmptyStateSubTitle';
+import { getEmptyStateSubTitle } from '@/object-record/record-table/empty-state/utils/getEmptyStateSubTitle';
 
 describe('getEmptyStateSubTitle', () => {
   it('should return the correct sub title for workflow version', () => {
diff --git a/packages/twenty-front/src/modules/object-record/record-table/empty-state/utils/__tests__/getEmptyStateTitle.test.ts b/packages/twenty-front/src/modules/object-record/record-table/empty-state/utils/__tests__/getEmptyStateTitle.test.ts
index 03442b7dac..afdce574ff 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/empty-state/utils/__tests__/getEmptyStateTitle.test.ts
+++ b/packages/twenty-front/src/modules/object-record/record-table/empty-state/utils/__tests__/getEmptyStateTitle.test.ts
@@ -1,5 +1,5 @@
 import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
-import { getEmptyStateTitle } from '../getEmptyStateTitle';
+import { getEmptyStateTitle } from '@/object-record/record-table/empty-state/utils/getEmptyStateTitle';
 
 describe('getEmptyStateTitle', () => {
   it('should return the correct title for workflow version', () => {
diff --git a/packages/twenty-front/src/modules/object-record/record-table/hooks/internal/useResetTableRowSelection.ts b/packages/twenty-front/src/modules/object-record/record-table/hooks/internal/useResetTableRowSelection.ts
index 83f8fe3640..9a7a13efd2 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/hooks/internal/useResetTableRowSelection.ts
+++ b/packages/twenty-front/src/modules/object-record/record-table/hooks/internal/useResetTableRowSelection.ts
@@ -10,7 +10,7 @@ import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
 import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';
 import { useRecoilComponentCallbackState } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackState';
 import { getSnapshotValue } from '@/ui/utilities/state/utils/getSnapshotValue';
-import { lastSelectedRowIndexComponentState } from '../../record-table-row/states/lastSelectedRowIndexComponentState';
+import { lastSelectedRowIndexComponentState } from '@/object-record/record-table/record-table-row/states/lastSelectedRowIndexComponentState';
 
 export const useResetTableRowSelection = (recordTableId?: string) => {
   const recordTableIdFromContext = useAvailableComponentInstanceIdOrThrow(
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-body/components/RecordTableBodyNoRecordGroupDragDropContextProvider.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-body/components/RecordTableBodyNoRecordGroupDragDropContextProvider.tsx
index ee24d5228f..5b9a31c8d2 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-body/components/RecordTableBodyNoRecordGroupDragDropContextProvider.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-body/components/RecordTableBodyNoRecordGroupDragDropContextProvider.tsx
@@ -13,7 +13,7 @@ import { getSnapshotValue } from '@/ui/utilities/state/utils/getSnapshotValue';
 import { useEndRecordDrag } from '@/object-record/record-drag/hooks/useEndRecordDrag';
 import { useProcessTableWithoutGroupRecordDrop } from '@/object-record/record-drag/hooks/useProcessTableWithoutGroupRecordDrop';
 import { useStartRecordDrag } from '@/object-record/record-drag/hooks/useStartRecordDrag';
-import { selectedRowIdsComponentSelector } from '../../states/selectors/selectedRowIdsComponentSelector';
+import { selectedRowIdsComponentSelector } from '@/object-record/record-table/states/selectors/selectedRowIdsComponentSelector';
 
 export const RecordTableBodyNoRecordGroupDragDropContextProvider = ({
   children,
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/useFocusRecordTableCell.ts b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/useFocusRecordTableCell.ts
index 340329ee10..700eae2e6a 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/useFocusRecordTableCell.ts
+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-cell/hooks/useFocusRecordTableCell.ts
@@ -8,7 +8,7 @@ import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/com
 import { useRecoilComponentCallbackState } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackState';
 import { useRecoilCallback } from 'recoil';
 import { isDefined } from 'twenty-shared/utils';
-import { type TableCellPosition } from '../../types/TableCellPosition';
+import { type TableCellPosition } from '@/object-record/record-table/types/TableCellPosition';
 import { useSetIsRecordTableCellFocusActive } from './useSetIsRecordTableCellFocusActive';
 
 export const useFocusRecordTableCell = (recordTableId?: string) => {
diff --git a/packages/twenty-front/src/modules/object-record/record-table/states/recordTableCellEditModePositionComponentState.ts b/packages/twenty-front/src/modules/object-record/record-table/states/recordTableCellEditModePositionComponentState.ts
index 2514474666..7d477bfe24 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/states/recordTableCellEditModePositionComponentState.ts
+++ b/packages/twenty-front/src/modules/object-record/record-table/states/recordTableCellEditModePositionComponentState.ts
@@ -1,6 +1,6 @@
 import { RecordTableComponentInstanceContext } from '@/object-record/record-table/states/context/RecordTableComponentInstanceContext';
 import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState';
-import { type TableCellPosition } from '../types/TableCellPosition';
+import { type TableCellPosition } from '@/object-record/record-table/types/TableCellPosition';
 
 export const recordTableCellEditModePositionComponentState =
   createComponentState<TableCellPosition | null>({
diff --git a/packages/twenty-front/src/modules/object-record/record-table/states/recordTableFocusPositionComponentState.ts b/packages/twenty-front/src/modules/object-record/record-table/states/recordTableFocusPositionComponentState.ts
index 1433c7fdc3..444b192b0f 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/states/recordTableFocusPositionComponentState.ts
+++ b/packages/twenty-front/src/modules/object-record/record-table/states/recordTableFocusPositionComponentState.ts
@@ -1,6 +1,6 @@
 import { RecordTableComponentInstanceContext } from '@/object-record/record-table/states/context/RecordTableComponentInstanceContext';
 import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState';
-import { type TableCellPosition } from '../types/TableCellPosition';
+import { type TableCellPosition } from '@/object-record/record-table/types/TableCellPosition';
 
 export const recordTableFocusPositionComponentState =
   createComponentState<TableCellPosition | null>({
diff --git a/packages/twenty-front/src/modules/object-record/record-table/states/recordTableHoverPositionComponentState.ts b/packages/twenty-front/src/modules/object-record/record-table/states/recordTableHoverPositionComponentState.ts
index 7872f7c9ad..af536a1744 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/states/recordTableHoverPositionComponentState.ts
+++ b/packages/twenty-front/src/modules/object-record/record-table/states/recordTableHoverPositionComponentState.ts
@@ -1,6 +1,6 @@
 import { RecordTableComponentInstanceContext } from '@/object-record/record-table/states/context/RecordTableComponentInstanceContext';
 import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState';
-import { type TableCellPosition } from '../types/TableCellPosition';
+import { type TableCellPosition } from '@/object-record/record-table/types/TableCellPosition';
 
 export const recordTableHoverPositionComponentState =
   createComponentState<TableCellPosition | null>({
diff --git a/packages/twenty-front/src/modules/object-record/record-table/states/selectors/allRowsSelectedStatusComponentSelector.ts b/packages/twenty-front/src/modules/object-record/record-table/states/selectors/allRowsSelectedStatusComponentSelector.ts
index 024a8caa80..fcf94c6721 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/states/selectors/allRowsSelectedStatusComponentSelector.ts
+++ b/packages/twenty-front/src/modules/object-record/record-table/states/selectors/allRowsSelectedStatusComponentSelector.ts
@@ -3,7 +3,7 @@ import { selectedRowIdsComponentSelector } from '@/object-record/record-table/st
 import { recordIndexAllRecordIdsComponentSelector } from '@/object-record/record-index/states/selectors/recordIndexAllRecordIdsComponentSelector';
 import { RecordTableComponentInstanceContext } from '@/object-record/record-table/states/context/RecordTableComponentInstanceContext';
 import { createComponentSelector } from '@/ui/utilities/state/component-state/utils/createComponentSelector';
-import { type AllRowsSelectedStatus } from '../../types/AllRowSelectedStatus';
+import { type AllRowsSelectedStatus } from '@/object-record/record-table/types/AllRowSelectedStatus';
 
 export const allRowsSelectedStatusComponentSelector =
   createComponentSelector<AllRowsSelectedStatus>({
diff --git a/packages/twenty-front/src/modules/object-record/utils/__tests__/generateAggregateQuery.test.ts b/packages/twenty-front/src/modules/object-record/utils/__tests__/generateAggregateQuery.test.ts
index 21107f5ad3..1e41d98a59 100644
--- a/packages/twenty-front/src/modules/object-record/utils/__tests__/generateAggregateQuery.test.ts
+++ b/packages/twenty-front/src/modules/object-record/utils/__tests__/generateAggregateQuery.test.ts
@@ -1,5 +1,5 @@
 import { type ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
-import { generateAggregateQuery } from '../generateAggregateQuery';
+import { generateAggregateQuery } from '@/object-record/utils/generateAggregateQuery';
 
 describe('generateAggregateQuery', () => {
   it('should generate correct aggregate query', () => {
diff --git a/packages/twenty-front/src/modules/object-record/utils/__tests__/generateGroupByQuery.test.ts b/packages/twenty-front/src/modules/object-record/utils/__tests__/generateGroupByQuery.test.ts
index 12d6544e1a..67375c7d01 100644
--- a/packages/twenty-front/src/modules/object-record/utils/__tests__/generateGroupByQuery.test.ts
+++ b/packages/twenty-front/src/modules/object-record/utils/__tests__/generateGroupByQuery.test.ts
@@ -1,5 +1,5 @@
 import { type ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
-import { generateGroupByAggregateQuery } from '../../record-aggregate/utils/generateGroupByAggregateQuery';
+import { generateGroupByAggregateQuery } from '@/object-record/record-aggregate/utils/generateGroupByAggregateQuery';
 
 describe('generateGroupByQuery', () => {
   const testCases = [
diff --git a/packages/twenty-front/src/modules/page-layout/graphql/mutations/updatePageLayoutWithTabsAndWidgets.ts b/packages/twenty-front/src/modules/page-layout/graphql/mutations/updatePageLayoutWithTabsAndWidgets.ts
index e69ad74375..71b82fac5c 100644
--- a/packages/twenty-front/src/modules/page-layout/graphql/mutations/updatePageLayoutWithTabsAndWidgets.ts
+++ b/packages/twenty-front/src/modules/page-layout/graphql/mutations/updatePageLayoutWithTabsAndWidgets.ts
@@ -1,6 +1,6 @@
 import { gql } from '@apollo/client';
 
-import { PAGE_LAYOUT_WIDGET_FRAGMENT } from '../fragments/pageLayoutWidgetFragment';
+import { PAGE_LAYOUT_WIDGET_FRAGMENT } from '@/page-layout/graphql/fragments/pageLayoutWidgetFragment';
 
 export const UPDATE_PAGE_LAYOUT_WITH_TABS_AND_WIDGETS = gql`
   ${PAGE_LAYOUT_WIDGET_FRAGMENT}
diff --git a/packages/twenty-front/src/modules/page-layout/hooks/__tests__/useChangePageLayoutDragSelection.test.tsx b/packages/twenty-front/src/modules/page-layout/hooks/__tests__/useChangePageLayoutDragSelection.test.tsx
index a454ecca73..e237a96d38 100644
--- a/packages/twenty-front/src/modules/page-layout/hooks/__tests__/useChangePageLayoutDragSelection.test.tsx
+++ b/packages/twenty-front/src/modules/page-layout/hooks/__tests__/useChangePageLayoutDragSelection.test.tsx
@@ -1,12 +1,12 @@
 import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue';
 import { act, renderHook } from '@testing-library/react';
 import { type ReactNode } from 'react';
-import { pageLayoutSelectedCellsComponentState } from '../../states/pageLayoutSelectedCellsComponentState';
+import { pageLayoutSelectedCellsComponentState } from '@/page-layout/states/pageLayoutSelectedCellsComponentState';
 import {
   PageLayoutTestWrapper,
   PAGE_LAYOUT_TEST_INSTANCE_ID,
 } from './PageLayoutTestWrapper';
-import { useChangePageLayoutDragSelection } from '../useChangePageLayoutDragSelection';
+import { useChangePageLayoutDragSelection } from '@/page-layout/hooks/useChangePageLayoutDragSelection';
 
 describe('useChangePageLayoutDragSelection', () => {
   it('should add cell to selection when selected is true', () => {
diff --git a/packages/twenty-front/src/modules/page-layout/hooks/__tests__/useCreatePageLayoutTab.test.tsx b/packages/twenty-front/src/modules/page-layout/hooks/__tests__/useCreatePageLayoutTab.test.tsx
index eca9915602..815184061b 100644
--- a/packages/twenty-front/src/modules/page-layout/hooks/__tests__/useCreatePageLayoutTab.test.tsx
+++ b/packages/twenty-front/src/modules/page-layout/hooks/__tests__/useCreatePageLayoutTab.test.tsx
@@ -6,7 +6,7 @@ import { useSetRecoilComponentState } from '@/ui/utilities/state/component-state
 import { act, renderHook } from '@testing-library/react';
 import { useSetRecoilState } from 'recoil';
 import { PageLayoutType } from '~/generated/graphql';
-import { useCreatePageLayoutTab } from '../useCreatePageLayoutTab';
+import { useCreatePageLayoutTab } from '@/page-layout/hooks/useCreatePageLayoutTab';
 import {
   PAGE_LAYOUT_TEST_INSTANCE_ID,
   PageLayoutTestWrapper,
diff --git a/packages/twenty-front/src/modules/page-layout/hooks/__tests__/useCreateWidgetFromClick.test.tsx b/packages/twenty-front/src/modules/page-layout/hooks/__tests__/useCreateWidgetFromClick.test.tsx
index fe430fce45..c23c899245 100644
--- a/packages/twenty-front/src/modules/page-layout/hooks/__tests__/useCreateWidgetFromClick.test.tsx
+++ b/packages/twenty-front/src/modules/page-layout/hooks/__tests__/useCreateWidgetFromClick.test.tsx
@@ -3,9 +3,9 @@ import { CommandMenuPages } from '@/command-menu/types/CommandMenuPages';
 import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue';
 import { act, renderHook } from '@testing-library/react';
 import { type ReactNode } from 'react';
-import { pageLayoutDraggedAreaComponentState } from '../../states/pageLayoutDraggedAreaComponentState';
-import { pageLayoutEditingWidgetIdComponentState } from '../../states/pageLayoutEditingWidgetIdComponentState';
-import { useCreateWidgetFromClick } from '../useCreateWidgetFromClick';
+import { pageLayoutDraggedAreaComponentState } from '@/page-layout/states/pageLayoutDraggedAreaComponentState';
+import { pageLayoutEditingWidgetIdComponentState } from '@/page-layout/states/pageLayoutEditingWidgetIdComponentState';
+import { useCreateWidgetFromClick } from '@/page-layout/hooks/useCreateWidgetFromClick';
 import {
   PAGE_LAYOUT_TEST_INSTANCE_ID,
   PageLayoutTestWrapper,
diff --git a/packages/twenty-front/src/modules/page-layout/hooks/__tests__/useDeletePageLayoutWidget.test.tsx b/packages/twenty-front/src/modules/page-layout/hooks/__tests__/useDeletePageLayoutWidget.test.tsx
index 0365af6599..ef864bc48c 100644
--- a/packages/twenty-front/src/modules/page-layout/hooks/__tests__/useDeletePageLayoutWidget.test.tsx
+++ b/packages/twenty-front/src/modules/page-layout/hooks/__tests__/useDeletePageLayoutWidget.test.tsx
@@ -3,7 +3,7 @@ import {
   PageLayoutTestWrapper,
   PAGE_LAYOUT_TEST_INSTANCE_ID,
 } from './PageLayoutTestWrapper';
-import { useDeletePageLayoutWidget } from '../useDeletePageLayoutWidget';
+import { useDeletePageLayoutWidget } from '@/page-layout/hooks/useDeletePageLayoutWidget';
 
 describe('useDeletePageLayoutWidget', () => {
   it('should remove widget from all states', () => {
diff --git a/packages/twenty-front/src/modules/page-layout/hooks/__tests__/useEndPageLayoutDragSelection.test.tsx b/packages/twenty-front/src/modules/page-layout/hooks/__tests__/useEndPageLayoutDragSelection.test.tsx
index faeb9986f7..665bcaca05 100644
--- a/packages/twenty-front/src/modules/page-layout/hooks/__tests__/useEndPageLayoutDragSelection.test.tsx
+++ b/packages/twenty-front/src/modules/page-layout/hooks/__tests__/useEndPageLayoutDragSelection.test.tsx
@@ -4,10 +4,10 @@ import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/ho
 import { act, renderHook } from '@testing-library/react';
 import { type ReactNode } from 'react';
 import { isDefined } from 'twenty-shared/utils';
-import { pageLayoutDraggedAreaComponentState } from '../../states/pageLayoutDraggedAreaComponentState';
-import { pageLayoutSelectedCellsComponentState } from '../../states/pageLayoutSelectedCellsComponentState';
-import { calculateGridBoundsFromSelectedCells } from '../../utils/calculateGridBoundsFromSelectedCells';
-import { useEndPageLayoutDragSelection } from '../useEndPageLayoutDragSelection';
+import { pageLayoutDraggedAreaComponentState } from '@/page-layout/states/pageLayoutDraggedAreaComponentState';
+import { pageLayoutSelectedCellsComponentState } from '@/page-layout/states/pageLayoutSelectedCellsComponentState';
+import { calculateGridBoundsFromSelectedCells } from '@/page-layout/utils/calculateGridBoundsFromSelectedCells';
+import { useEndPageLayoutDragSelection } from '@/page-layout/hooks/useEndPageLayoutDragSelection';
 import {
   PAGE_LAYOUT_TEST_INSTANCE_ID,
   PageLayoutTestWrapper,
diff --git a/packages/twenty-front/src/modules/page-layout/hooks/__tests__/usePageLayoutDraftState.test.tsx b/packages/twenty-front/src/modules/page-layout/hooks/__tests__/usePageLayoutDraftState.test.tsx
index d87ec46c07..e6d29f84e7 100644
--- a/packages/twenty-front/src/modules/page-layout/hooks/__tests__/usePageLayoutDraftState.test.tsx
+++ b/packages/twenty-front/src/modules/page-layout/hooks/__tests__/usePageLayoutDraftState.test.tsx
@@ -5,7 +5,7 @@ import {
   WidgetType,
 } from '~/generated-metadata/graphql';
 import { AggregateOperations, PageLayoutType } from '~/generated/graphql';
-import { usePageLayoutDraftState } from '../usePageLayoutDraftState';
+import { usePageLayoutDraftState } from '@/page-layout/hooks/usePageLayoutDraftState';
 import {
   PAGE_LAYOUT_TEST_INSTANCE_ID,
   PageLayoutTestWrapper,
diff --git a/packages/twenty-front/src/modules/page-layout/hooks/__tests__/usePageLayoutHandleLayoutChange.test.tsx b/packages/twenty-front/src/modules/page-layout/hooks/__tests__/usePageLayoutHandleLayoutChange.test.tsx
index 04bf7a8932..9cc2e0c6f0 100644
--- a/packages/twenty-front/src/modules/page-layout/hooks/__tests__/usePageLayoutHandleLayoutChange.test.tsx
+++ b/packages/twenty-front/src/modules/page-layout/hooks/__tests__/usePageLayoutHandleLayoutChange.test.tsx
@@ -1,8 +1,8 @@
 import { activeTabIdComponentState } from '@/ui/layout/tab-list/states/activeTabIdComponentState';
 import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue';
 import { act, renderHook } from '@testing-library/react';
-import { pageLayoutCurrentLayoutsComponentState } from '../../states/pageLayoutCurrentLayoutsComponentState';
-import { usePageLayoutHandleLayoutChange } from '../usePageLayoutHandleLayoutChange';
+import { pageLayoutCurrentLayoutsComponentState } from '@/page-layout/states/pageLayoutCurrentLayoutsComponentState';
+import { usePageLayoutHandleLayoutChange } from '@/page-layout/hooks/usePageLayoutHandleLayoutChange';
 import {
   PAGE_LAYOUT_TEST_INSTANCE_ID,
   PageLayoutTestWrapper,
diff --git a/packages/twenty-front/src/modules/page-layout/hooks/__tests__/useStartPageLayoutDragSelection.test.tsx b/packages/twenty-front/src/modules/page-layout/hooks/__tests__/useStartPageLayoutDragSelection.test.tsx
index 3ee03440af..358bcb3aad 100644
--- a/packages/twenty-front/src/modules/page-layout/hooks/__tests__/useStartPageLayoutDragSelection.test.tsx
+++ b/packages/twenty-front/src/modules/page-layout/hooks/__tests__/useStartPageLayoutDragSelection.test.tsx
@@ -2,8 +2,8 @@ import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/ho
 import { act, renderHook } from '@testing-library/react';
 import { type ReactNode } from 'react';
 import { isDefined } from 'twenty-shared/utils';
-import { pageLayoutSelectedCellsComponentState } from '../../states/pageLayoutSelectedCellsComponentState';
-import { useStartPageLayoutDragSelection } from '../useStartPageLayoutDragSelection';
+import { pageLayoutSelectedCellsComponentState } from '@/page-layout/states/pageLayoutSelectedCellsComponentState';
+import { useStartPageLayoutDragSelection } from '@/page-layout/hooks/useStartPageLayoutDragSelection';
 import {
   PAGE_LAYOUT_TEST_INSTANCE_ID,
   PageLayoutTestWrapper,
diff --git a/packages/twenty-front/src/modules/page-layout/hooks/useChangePageLayoutDragSelection.ts b/packages/twenty-front/src/modules/page-layout/hooks/useChangePageLayoutDragSelection.ts
index 36f782bd95..85dbf2270a 100644
--- a/packages/twenty-front/src/modules/page-layout/hooks/useChangePageLayoutDragSelection.ts
+++ b/packages/twenty-front/src/modules/page-layout/hooks/useChangePageLayoutDragSelection.ts
@@ -2,7 +2,7 @@ import { PageLayoutComponentInstanceContext } from '@/page-layout/states/context
 import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';
 import { useRecoilComponentCallbackState } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackState';
 import { useRecoilCallback } from 'recoil';
-import { pageLayoutSelectedCellsComponentState } from '../states/pageLayoutSelectedCellsComponentState';
+import { pageLayoutSelectedCellsComponentState } from '@/page-layout/states/pageLayoutSelectedCellsComponentState';
 
 export const useChangePageLayoutDragSelection = (
   pageLayoutIdFromProps?: string,
diff --git a/packages/twenty-front/src/modules/page-layout/hooks/useCreatePageLayoutTab.ts b/packages/twenty-front/src/modules/page-layout/hooks/useCreatePageLayoutTab.ts
index a51d7a1720..17b1ab822b 100644
--- a/packages/twenty-front/src/modules/page-layout/hooks/useCreatePageLayoutTab.ts
+++ b/packages/twenty-front/src/modules/page-layout/hooks/useCreatePageLayoutTab.ts
@@ -6,10 +6,10 @@ import { useRecoilComponentCallbackState } from '@/ui/utilities/state/component-
 import { useSetRecoilComponentState } from '@/ui/utilities/state/component-state/hooks/useSetRecoilComponentState';
 import { useRecoilCallback } from 'recoil';
 import { v4 as uuidv4 } from 'uuid';
-import { pageLayoutCurrentLayoutsComponentState } from '../states/pageLayoutCurrentLayoutsComponentState';
-import { pageLayoutDraftComponentState } from '../states/pageLayoutDraftComponentState';
-import { type PageLayoutTab } from '../types/PageLayoutTab';
-import { getEmptyTabLayout } from '../utils/getEmptyTabLayout';
+import { pageLayoutCurrentLayoutsComponentState } from '@/page-layout/states/pageLayoutCurrentLayoutsComponentState';
+import { pageLayoutDraftComponentState } from '@/page-layout/states/pageLayoutDraftComponentState';
+import { type PageLayoutTab } from '@/page-layout/types/PageLayoutTab';
+import { getEmptyTabLayout } from '@/page-layout/utils/getEmptyTabLayout';
 
 export const useCreatePageLayoutTab = (pageLayoutIdFromProps?: string) => {
   const pageLayoutId = useAvailableComponentInstanceIdOrThrow(
diff --git a/packages/twenty-front/src/modules/page-layout/hooks/useDeletePageLayoutWidget.ts b/packages/twenty-front/src/modules/page-layout/hooks/useDeletePageLayoutWidget.ts
index 708bab26bc..fe5f625ff6 100644
--- a/packages/twenty-front/src/modules/page-layout/hooks/useDeletePageLayoutWidget.ts
+++ b/packages/twenty-front/src/modules/page-layout/hooks/useDeletePageLayoutWidget.ts
@@ -4,10 +4,10 @@ import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/com
 import { useRecoilComponentCallbackState } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackState';
 import { useRecoilCallback } from 'recoil';
 import { isDefined } from 'twenty-shared/utils';
-import { pageLayoutCurrentLayoutsComponentState } from '../states/pageLayoutCurrentLayoutsComponentState';
-import { pageLayoutDraftComponentState } from '../states/pageLayoutDraftComponentState';
-import { removeWidgetFromTab } from '../utils/removeWidgetFromTab';
-import { removeWidgetLayoutFromTab } from '../utils/removeWidgetLayoutFromTab';
+import { pageLayoutCurrentLayoutsComponentState } from '@/page-layout/states/pageLayoutCurrentLayoutsComponentState';
+import { pageLayoutDraftComponentState } from '@/page-layout/states/pageLayoutDraftComponentState';
+import { removeWidgetFromTab } from '@/page-layout/utils/removeWidgetFromTab';
+import { removeWidgetLayoutFromTab } from '@/page-layout/utils/removeWidgetLayoutFromTab';
 
 export const useDeletePageLayoutWidget = (pageLayoutIdFromProps?: string) => {
   const pageLayoutId = useAvailableComponentInstanceIdOrThrow(
diff --git a/packages/twenty-front/src/modules/page-layout/hooks/useEndPageLayoutDragSelection.ts b/packages/twenty-front/src/modules/page-layout/hooks/useEndPageLayoutDragSelection.ts
index 9175a5a99f..6ea20b3227 100644
--- a/packages/twenty-front/src/modules/page-layout/hooks/useEndPageLayoutDragSelection.ts
+++ b/packages/twenty-front/src/modules/page-layout/hooks/useEndPageLayoutDragSelection.ts
@@ -7,8 +7,8 @@ import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/com
 import { useRecoilComponentCallbackState } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackState';
 import { useRecoilCallback } from 'recoil';
 import { isDefined } from 'twenty-shared/utils';
-import { pageLayoutSelectedCellsComponentState } from '../states/pageLayoutSelectedCellsComponentState';
-import { calculateGridBoundsFromSelectedCells } from '../utils/calculateGridBoundsFromSelectedCells';
+import { pageLayoutSelectedCellsComponentState } from '@/page-layout/states/pageLayoutSelectedCellsComponentState';
+import { calculateGridBoundsFromSelectedCells } from '@/page-layout/utils/calculateGridBoundsFromSelectedCells';
 
 export const useEndPageLayoutDragSelection = (
   pageLayoutIdFromProps?: string,
diff --git a/packages/twenty-front/src/modules/page-layout/hooks/usePageLayoutDraftState.ts b/packages/twenty-front/src/modules/page-layout/hooks/usePageLayoutDraftState.ts
index 762916a15d..c47ec02dea 100644
--- a/packages/twenty-front/src/modules/page-layout/hooks/usePageLayoutDraftState.ts
+++ b/packages/twenty-front/src/modules/page-layout/hooks/usePageLayoutDraftState.ts
@@ -3,8 +3,8 @@ import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/com
 import { useRecoilComponentState } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentState';
 import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue';
 import { isDeeplyEqual } from '~/utils/isDeeplyEqual';
-import { pageLayoutDraftComponentState } from '../states/pageLayoutDraftComponentState';
-import { pageLayoutPersistedComponentState } from '../states/pageLayoutPersistedComponentState';
+import { pageLayoutDraftComponentState } from '@/page-layout/states/pageLayoutDraftComponentState';
+import { pageLayoutPersistedComponentState } from '@/page-layout/states/pageLayoutPersistedComponentState';
 
 export const usePageLayoutDraftState = (pageLayoutIdFromProps?: string) => {
   const pageLayoutId = useAvailableComponentInstanceIdOrThrow(
diff --git a/packages/twenty-front/src/modules/page-layout/hooks/usePageLayoutHandleLayoutChange.ts b/packages/twenty-front/src/modules/page-layout/hooks/usePageLayoutHandleLayoutChange.ts
index 13ccec298d..d26ce85ee6 100644
--- a/packages/twenty-front/src/modules/page-layout/hooks/usePageLayoutHandleLayoutChange.ts
+++ b/packages/twenty-front/src/modules/page-layout/hooks/usePageLayoutHandleLayoutChange.ts
@@ -6,9 +6,9 @@ import { useRecoilComponentCallbackState } from '@/ui/utilities/state/component-
 import { type Layout, type Layouts } from 'react-grid-layout';
 import { useRecoilCallback } from 'recoil';
 import { isDefined } from 'twenty-shared/utils';
-import { pageLayoutCurrentLayoutsComponentState } from '../states/pageLayoutCurrentLayoutsComponentState';
-import { pageLayoutDraftComponentState } from '../states/pageLayoutDraftComponentState';
-import { convertLayoutsToWidgets } from '../utils/convertLayoutsToWidgets';
+import { pageLayoutCurrentLayoutsComponentState } from '@/page-layout/states/pageLayoutCurrentLayoutsComponentState';
+import { pageLayoutDraftComponentState } from '@/page-layout/states/pageLayoutDraftComponentState';
+import { convertLayoutsToWidgets } from '@/page-layout/utils/convertLayoutsToWidgets';
 
 export const usePageLayoutHandleLayoutChange = (
   pageLayoutIdFromProps?: string,
diff --git a/packages/twenty-front/src/modules/page-layout/hooks/useStartPageLayoutDragSelection.ts b/packages/twenty-front/src/modules/page-layout/hooks/useStartPageLayoutDragSelection.ts
index 6cbe8df4bd..38df02bcb0 100644
--- a/packages/twenty-front/src/modules/page-layout/hooks/useStartPageLayoutDragSelection.ts
+++ b/packages/twenty-front/src/modules/page-layout/hooks/useStartPageLayoutDragSelection.ts
@@ -2,7 +2,7 @@ import { PageLayoutComponentInstanceContext } from '@/page-layout/states/context
 import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';
 import { useRecoilComponentCallbackState } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackState';
 import { useRecoilCallback } from 'recoil';
-import { pageLayoutSelectedCellsComponentState } from '../states/pageLayoutSelectedCellsComponentState';
+import { pageLayoutSelectedCellsComponentState } from '@/page-layout/states/pageLayoutSelectedCellsComponentState';
 
 export const useStartPageLayoutDragSelection = (
   pageLayoutIdFromProps?: string,
diff --git a/packages/twenty-front/src/modules/page-layout/hooks/useUpdatePageLayoutTab.ts b/packages/twenty-front/src/modules/page-layout/hooks/useUpdatePageLayoutTab.ts
index 5a889373b9..138b94caed 100644
--- a/packages/twenty-front/src/modules/page-layout/hooks/useUpdatePageLayoutTab.ts
+++ b/packages/twenty-front/src/modules/page-layout/hooks/useUpdatePageLayoutTab.ts
@@ -3,7 +3,7 @@ import { pageLayoutDraftComponentState } from '@/page-layout/states/pageLayoutDr
 import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';
 import { useRecoilComponentCallbackState } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentCallbackState';
 import { useRecoilCallback } from 'recoil';
-import { type PageLayoutTab } from '../types/PageLayoutTab';
+import { type PageLayoutTab } from '@/page-layout/types/PageLayoutTab';
 
 export const useUpdatePageLayoutTab = (pageLayoutIdFromProps?: string) => {
   const pageLayoutId = useAvailableComponentInstanceIdOrThrow(
diff --git a/packages/twenty-front/src/modules/page-layout/states/pageLayoutCurrentBreakpointComponentState.ts b/packages/twenty-front/src/modules/page-layout/states/pageLayoutCurrentBreakpointComponentState.ts
index 9b45961173..6e71380160 100644
--- a/packages/twenty-front/src/modules/page-layout/states/pageLayoutCurrentBreakpointComponentState.ts
+++ b/packages/twenty-front/src/modules/page-layout/states/pageLayoutCurrentBreakpointComponentState.ts
@@ -1,5 +1,5 @@
 import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState';
-import { type PageLayoutBreakpoint } from '../constants/PageLayoutBreakpoints';
+import { type PageLayoutBreakpoint } from '@/page-layout/constants/PageLayoutBreakpoints';
 
 import { PageLayoutComponentInstanceContext } from './contexts/PageLayoutComponentInstanceContext';
 
diff --git a/packages/twenty-front/src/modules/page-layout/states/savedPageLayoutsComponentState.ts b/packages/twenty-front/src/modules/page-layout/states/savedPageLayoutsComponentState.ts
index 1f9a566d1f..17149255a8 100644
--- a/packages/twenty-front/src/modules/page-layout/states/savedPageLayoutsComponentState.ts
+++ b/packages/twenty-front/src/modules/page-layout/states/savedPageLayoutsComponentState.ts
@@ -1,5 +1,5 @@
 import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState';
-import { type PageLayout } from '../types/PageLayout';
+import { type PageLayout } from '@/page-layout/types/PageLayout';
 
 import { PageLayoutComponentInstanceContext } from './contexts/PageLayoutComponentInstanceContext';
 
diff --git a/packages/twenty-front/src/modules/page-layout/utils/__tests__/addWidgetToTab.test.ts b/packages/twenty-front/src/modules/page-layout/utils/__tests__/addWidgetToTab.test.ts
index 6a8a65f80a..a40db74e5f 100644
--- a/packages/twenty-front/src/modules/page-layout/utils/__tests__/addWidgetToTab.test.ts
+++ b/packages/twenty-front/src/modules/page-layout/utils/__tests__/addWidgetToTab.test.ts
@@ -3,8 +3,8 @@ import {
   AggregateOperations,
   type PageLayoutWidget,
 } from '~/generated/graphql';
-import { type PageLayoutTab } from '../../types/PageLayoutTab';
-import { addWidgetToTab } from '../addWidgetToTab';
+import { type PageLayoutTab } from '@/page-layout/types/PageLayoutTab';
+import { addWidgetToTab } from '@/page-layout/utils/addWidgetToTab';
 
 describe('addWidgetToTab', () => {
   const mockWidget: PageLayoutWidget = {
diff --git a/packages/twenty-front/src/modules/page-layout/utils/__tests__/calculateGridBoundsFromSelectedCells.test.ts b/packages/twenty-front/src/modules/page-layout/utils/__tests__/calculateGridBoundsFromSelectedCells.test.ts
index 9bf87c94e5..6ccd10ee3d 100644
--- a/packages/twenty-front/src/modules/page-layout/utils/__tests__/calculateGridBoundsFromSelectedCells.test.ts
+++ b/packages/twenty-front/src/modules/page-layout/utils/__tests__/calculateGridBoundsFromSelectedCells.test.ts
@@ -1,4 +1,4 @@
-import { calculateGridBoundsFromSelectedCells } from '../calculateGridBoundsFromSelectedCells';
+import { calculateGridBoundsFromSelectedCells } from '@/page-layout/utils/calculateGridBoundsFromSelectedCells';
 
 describe('calculateGridBoundsFromSelectedCells', () => {
   it('should return null for empty array', () => {
diff --git a/packages/twenty-front/src/modules/page-layout/utils/__tests__/calculateGridCellPosition.test.ts b/packages/twenty-front/src/modules/page-layout/utils/__tests__/calculateGridCellPosition.test.ts
index dd5862bb01..c1913fa647 100644
--- a/packages/twenty-front/src/modules/page-layout/utils/__tests__/calculateGridCellPosition.test.ts
+++ b/packages/twenty-front/src/modules/page-layout/utils/__tests__/calculateGridCellPosition.test.ts
@@ -1,4 +1,4 @@
-import { calculateGridCellPosition } from '../calculateGridCellPosition';
+import { calculateGridCellPosition } from '@/page-layout/utils/calculateGridCellPosition';
 
 describe('calculateGridCellPosition', () => {
   it('should calculate correct position for first cell', () => {
diff --git a/packages/twenty-front/src/modules/page-layout/utils/__tests__/calculateTotalGridRows.test.ts b/packages/twenty-front/src/modules/page-layout/utils/__tests__/calculateTotalGridRows.test.ts
index 83c5f6ac6d..7700a38db1 100644
--- a/packages/twenty-front/src/modules/page-layout/utils/__tests__/calculateTotalGridRows.test.ts
+++ b/packages/twenty-front/src/modules/page-layout/utils/__tests__/calculateTotalGridRows.test.ts
@@ -1,5 +1,5 @@
-import { GRID_MIN_ROWS } from '../../constants/GridMinRows';
-import { calculateTotalGridRows } from '../calculateTotalGridRows';
+import { GRID_MIN_ROWS } from '@/page-layout/constants/GridMinRows';
+import { calculateTotalGridRows } from '@/page-layout/utils/calculateTotalGridRows';
 
 describe('calculateTotalGridRows', () => {
   it('should return minimum rows for empty layouts', () => {
diff --git a/packages/twenty-front/src/modules/page-layout/utils/__tests__/checkFieldPermissions.test.ts b/packages/twenty-front/src/modules/page-layout/utils/__tests__/checkFieldPermissions.test.ts
index a3b9a2b972..29a7fcb179 100644
--- a/packages/twenty-front/src/modules/page-layout/utils/__tests__/checkFieldPermissions.test.ts
+++ b/packages/twenty-front/src/modules/page-layout/utils/__tests__/checkFieldPermissions.test.ts
@@ -1,5 +1,5 @@
 import { type ObjectPermissions } from 'twenty-shared/types';
-import { checkFieldPermissions } from '../checkFieldPermissions';
+import { checkFieldPermissions } from '@/page-layout/utils/checkFieldPermissions';
 
 describe('checkFieldPermissions', () => {
   const mockObjectPermissions: ObjectPermissions = {
diff --git a/packages/twenty-front/src/modules/page-layout/utils/__tests__/convertLayoutsToWidgets.test.ts b/packages/twenty-front/src/modules/page-layout/utils/__tests__/convertLayoutsToWidgets.test.ts
index e39bdb8543..c22fadc032 100644
--- a/packages/twenty-front/src/modules/page-layout/utils/__tests__/convertLayoutsToWidgets.test.ts
+++ b/packages/twenty-front/src/modules/page-layout/utils/__tests__/convertLayoutsToWidgets.test.ts
@@ -5,7 +5,7 @@ import {
   WidgetType,
   type PageLayoutWidget,
 } from '~/generated-metadata/graphql';
-import { convertLayoutsToWidgets } from '../convertLayoutsToWidgets';
+import { convertLayoutsToWidgets } from '@/page-layout/utils/convertLayoutsToWidgets';
 
 describe('convertLayoutsToWidgets', () => {
   const mockWidgets: PageLayoutWidget[] = [
diff --git a/packages/twenty-front/src/modules/page-layout/utils/__tests__/createDefaultGraphWidget.test.ts b/packages/twenty-front/src/modules/page-layout/utils/__tests__/createDefaultGraphWidget.test.ts
index 35f64724d7..75fe8967ef 100644
--- a/packages/twenty-front/src/modules/page-layout/utils/__tests__/createDefaultGraphWidget.test.ts
+++ b/packages/twenty-front/src/modules/page-layout/utils/__tests__/createDefaultGraphWidget.test.ts
@@ -6,7 +6,7 @@ import {
   GraphType,
   WidgetType,
 } from '~/generated/graphql';
-import { createDefaultGraphWidget } from '../createDefaultGraphWidget';
+import { createDefaultGraphWidget } from '@/page-layout/utils/createDefaultGraphWidget';
 
 describe('createDefaultGraphWidget', () => {
   const baseParams = {
diff --git a/packages/twenty-front/src/modules/page-layout/utils/__tests__/createDefaultStandaloneRichTextWidget.test.ts b/packages/twenty-front/src/modules/page-layout/utils/__tests__/createDefaultStandaloneRichTextWidget.test.ts
index 0e918b1b71..27678e86b0 100644
--- a/packages/twenty-front/src/modules/page-layout/utils/__tests__/createDefaultStandaloneRichTextWidget.test.ts
+++ b/packages/twenty-front/src/modules/page-layout/utils/__tests__/createDefaultStandaloneRichTextWidget.test.ts
@@ -1,5 +1,5 @@
 import { WidgetType } from '~/generated/graphql';
-import { createDefaultStandaloneRichTextWidget } from '../createDefaultStandaloneRichTextWidget';
+import { createDefaultStandaloneRichTextWidget } from '@/page-layout/utils/createDefaultStandaloneRichTextWidget';
 
 describe('createDefaultStandaloneRichTextWidget', () => {
   it('should create a standalone rich text widget with correct structure', () => {
diff --git a/packages/twenty-front/src/modules/page-layout/utils/__tests__/createPendingWidgetPlaceholderLayoutItem.test.ts b/packages/twenty-front/src/modules/page-layout/utils/__tests__/createPendingWidgetPlaceholderLayoutItem.test.ts
index 114dea9feb..22d6dda77d 100644
--- a/packages/twenty-front/src/modules/page-layout/utils/__tests__/createPendingWidgetPlaceholderLayoutItem.test.ts
+++ b/packages/twenty-front/src/modules/page-layout/utils/__tests__/createPendingWidgetPlaceholderLayoutItem.test.ts
@@ -1,6 +1,6 @@
 import { DEFAULT_WIDGET_SIZE } from '@/page-layout/constants/DefaultWidgetSize';
 import { PENDING_WIDGET_PLACEHOLDER_LAYOUT_KEY } from '@/page-layout/constants/PendingWidgetPlaceholderLayoutKey';
-import { createPendingWidgetPlaceholderLayoutItem } from '../createPendingWidgetPlaceholderLayoutItem';
+import { createPendingWidgetPlaceholderLayoutItem } from '@/page-layout/utils/createPendingWidgetPlaceholderLayoutItem';
 
 describe('createPendingWidgetPlaceholderLayoutItem', () => {
   const draggedArea = { x: 2, y: 3, w: 5, h: 6 };
diff --git a/packages/twenty-front/src/modules/page-layout/utils/__tests__/evaluateWidgetVisibility.test.ts b/packages/twenty-front/src/modules/page-layout/utils/__tests__/evaluateWidgetVisibility.test.ts
index 76a2348e79..4a8c7ce1f5 100644
--- a/packages/twenty-front/src/modules/page-layout/utils/__tests__/evaluateWidgetVisibility.test.ts
+++ b/packages/twenty-front/src/modules/page-layout/utils/__tests__/evaluateWidgetVisibility.test.ts
@@ -1,6 +1,6 @@
 import { type RulesLogic } from 'json-logic-js';
 
-import { evaluateWidgetVisibility } from '../evaluateWidgetVisibility';
+import { evaluateWidgetVisibility } from '@/page-layout/utils/evaluateWidgetVisibility';
 
 describe('evaluateWidgetVisibility', () => {
   it('should return true (visible) when no conditionalDisplay is provided', () => {
diff --git a/packages/twenty-front/src/modules/page-layout/utils/__tests__/extractFieldMetadataIdsFromWidget.test.ts b/packages/twenty-front/src/modules/page-layout/utils/__tests__/extractFieldMetadataIdsFromWidget.test.ts
index 74fb78067c..0cbb760d5a 100644
--- a/packages/twenty-front/src/modules/page-layout/utils/__tests__/extractFieldMetadataIdsFromWidget.test.ts
+++ b/packages/twenty-front/src/modules/page-layout/utils/__tests__/extractFieldMetadataIdsFromWidget.test.ts
@@ -8,7 +8,7 @@ import {
   GraphOrderBy,
   GraphType,
 } from '~/generated/graphql';
-import { extractFieldMetadataIdsFromWidget } from '../extractFieldMetadataIdsFromWidget';
+import { extractFieldMetadataIdsFromWidget } from '@/page-layout/utils/extractFieldMetadataIdsFromWidget';
 
 const createMockWidget = (
   overrides: Partial<PageLayoutWidget>,
diff --git a/packages/twenty-front/src/modules/page-layout/utils/__tests__/filterPendingPlaceholderFromLayouts.test.ts b/packages/twenty-front/src/modules/page-layout/utils/__tests__/filterPendingPlaceholderFromLayouts.test.ts
index 94135b9a36..b611b7554f 100644
--- a/packages/twenty-front/src/modules/page-layout/utils/__tests__/filterPendingPlaceholderFromLayouts.test.ts
+++ b/packages/twenty-front/src/modules/page-layout/utils/__tests__/filterPendingPlaceholderFromLayouts.test.ts
@@ -1,6 +1,6 @@
 import { PENDING_WIDGET_PLACEHOLDER_LAYOUT_KEY } from '@/page-layout/constants/PendingWidgetPlaceholderLayoutKey';
 import { type Layouts } from 'react-grid-layout';
-import { filterPendingPlaceholderFromLayouts } from '../filterPendingPlaceholderFromLayouts';
+import { filterPendingPlaceholderFromLayouts } from '@/page-layout/utils/filterPendingPlaceholderFromLayouts';
 
 describe('filterPendingPlaceholderFromLayouts', () => {
   it('should remove pending placeholder from both desktop and mobile layouts', () => {
diff --git a/packages/twenty-front/src/modules/page-layout/utils/__tests__/filterVisibleWidgets.test.ts b/packages/twenty-front/src/modules/page-layout/utils/__tests__/filterVisibleWidgets.test.ts
index e666c85cbb..31c95fb60b 100644
--- a/packages/twenty-front/src/modules/page-layout/utils/__tests__/filterVisibleWidgets.test.ts
+++ b/packages/twenty-front/src/modules/page-layout/utils/__tests__/filterVisibleWidgets.test.ts
@@ -1,6 +1,6 @@
 import { type PageLayoutTab } from '@/page-layout/types/PageLayoutTab';
 import { WidgetType } from '~/generated/graphql';
-import { filterVisibleWidgets } from '../filterVisibleWidgets';
+import { filterVisibleWidgets } from '@/page-layout/utils/filterVisibleWidgets';
 
 describe('filterVisibleWidgets', () => {
   const createMockWidget = (
diff --git a/packages/twenty-front/src/modules/page-layout/utils/__tests__/generateCellId.test.ts b/packages/twenty-front/src/modules/page-layout/utils/__tests__/generateCellId.test.ts
index 71b5abb831..3729966d67 100644
--- a/packages/twenty-front/src/modules/page-layout/utils/__tests__/generateCellId.test.ts
+++ b/packages/twenty-front/src/modules/page-layout/utils/__tests__/generateCellId.test.ts
@@ -1,4 +1,4 @@
-import { generateCellId } from '../generateCellId';
+import { generateCellId } from '@/page-layout/utils/generateCellId';
 
 describe('generateCellId', () => {
   it('should generate cell ID with correct format', () => {
diff --git a/packages/twenty-front/src/modules/page-layout/utils/__tests__/getDefaultWidgetPosition.test.ts b/packages/twenty-front/src/modules/page-layout/utils/__tests__/getDefaultWidgetPosition.test.ts
index d97f01fefd..bf1a3c3910 100644
--- a/packages/twenty-front/src/modules/page-layout/utils/__tests__/getDefaultWidgetPosition.test.ts
+++ b/packages/twenty-front/src/modules/page-layout/utils/__tests__/getDefaultWidgetPosition.test.ts
@@ -1,4 +1,4 @@
-import { getDefaultWidgetPosition } from '../getDefaultWidgetPosition';
+import { getDefaultWidgetPosition } from '@/page-layout/utils/getDefaultWidgetPosition';
 
 describe('getDefaultWidgetPosition', () => {
   it('should return dragged area when it meets minimum size', () => {
diff --git a/packages/twenty-front/src/modules/page-layout/utils/__tests__/getEmptyTabLayout.test.ts b/packages/twenty-front/src/modules/page-layout/utils/__tests__/getEmptyTabLayout.test.ts
index b6d8809af6..4c58e7cef8 100644
--- a/packages/twenty-front/src/modules/page-layout/utils/__tests__/getEmptyTabLayout.test.ts
+++ b/packages/twenty-front/src/modules/page-layout/utils/__tests__/getEmptyTabLayout.test.ts
@@ -1,5 +1,5 @@
 import { type TabLayouts } from '@/page-layout/types/tab-layouts';
-import { getEmptyTabLayout } from '../getEmptyTabLayout';
+import { getEmptyTabLayout } from '@/page-layout/utils/getEmptyTabLayout';
 
 describe('getEmptyTabLayout', () => {
   const mockTabLayouts: TabLayouts = {
diff --git a/packages/twenty-front/src/modules/page-layout/utils/__tests__/getPageLayoutTabListInitialActiveTabId.test.ts b/packages/twenty-front/src/modules/page-layout/utils/__tests__/getPageLayoutTabListInitialActiveTabId.test.ts
index 457ce48477..16ddebc8c5 100644
--- a/packages/twenty-front/src/modules/page-layout/utils/__tests__/getPageLayoutTabListInitialActiveTabId.test.ts
+++ b/packages/twenty-front/src/modules/page-layout/utils/__tests__/getPageLayoutTabListInitialActiveTabId.test.ts
@@ -1,5 +1,5 @@
 import { type PageLayoutTab } from '@/page-layout/types/PageLayoutTab';
-import { getPageLayoutTabListInitialActiveTabId } from '../getPageLayoutTabListInitialActiveTabId';
+import { getPageLayoutTabListInitialActiveTabId } from '@/page-layout/utils/getPageLayoutTabListInitialActiveTabId';
 
 describe('getPageLayoutTabListInitialActiveTabId', () => {
   const createMockTab = (id: string): PageLayoutTab => ({
diff --git a/packages/twenty-front/src/modules/page-layout/utils/__tests__/getTabsByDisplayMode.test.ts b/packages/twenty-front/src/modules/page-layout/utils/__tests__/getTabsByDisplayMode.test.ts
index 4382ff1fd9..e08aa14578 100644
--- a/packages/twenty-front/src/modules/page-layout/utils/__tests__/getTabsByDisplayMode.test.ts
+++ b/packages/twenty-front/src/modules/page-layout/utils/__tests__/getTabsByDisplayMode.test.ts
@@ -1,7 +1,7 @@
 import { type DraftPageLayout } from '@/page-layout/types/draft-page-layout';
 import { type PageLayoutTab } from '@/page-layout/types/PageLayoutTab';
 import { PageLayoutType } from '~/generated/graphql';
-import { getTabsByDisplayMode } from '../getTabsByDisplayMode';
+import { getTabsByDisplayMode } from '@/page-layout/utils/getTabsByDisplayMode';
 
 describe('getTabsByDisplayMode', () => {
   const createMockTab = (id: string): PageLayoutTab => ({
diff --git a/packages/twenty-front/src/modules/page-layout/utils/__tests__/getTabsWithVisibleWidgets.test.ts b/packages/twenty-front/src/modules/page-layout/utils/__tests__/getTabsWithVisibleWidgets.test.ts
index d16efd0157..6ce2141df8 100644
--- a/packages/twenty-front/src/modules/page-layout/utils/__tests__/getTabsWithVisibleWidgets.test.ts
+++ b/packages/twenty-front/src/modules/page-layout/utils/__tests__/getTabsWithVisibleWidgets.test.ts
@@ -1,6 +1,6 @@
 import { type PageLayoutTab } from '@/page-layout/types/PageLayoutTab';
 import { WidgetType } from '~/generated/graphql';
-import { getTabsWithVisibleWidgets } from '../getTabsWithVisibleWidgets';
+import { getTabsWithVisibleWidgets } from '@/page-layout/utils/getTabsWithVisibleWidgets';
 
 describe('getTabsWithVisibleWidgets', () => {
   const createMockWidget = (
diff --git a/packages/twenty-front/src/modules/page-layout/utils/__tests__/getUpdatedTabLayouts.test.ts b/packages/twenty-front/src/modules/page-layout/utils/__tests__/getUpdatedTabLayouts.test.ts
index 4d2cbdff9b..60252bf799 100644
--- a/packages/twenty-front/src/modules/page-layout/utils/__tests__/getUpdatedTabLayouts.test.ts
+++ b/packages/twenty-front/src/modules/page-layout/utils/__tests__/getUpdatedTabLayouts.test.ts
@@ -1,5 +1,5 @@
 import { type TabLayouts } from '@/page-layout/types/tab-layouts';
-import { getUpdatedTabLayouts } from '../getUpdatedTabLayouts';
+import { getUpdatedTabLayouts } from '@/page-layout/utils/getUpdatedTabLayouts';
 
 describe('getUpdatedTabLayouts', () => {
   const mockTabLayouts: TabLayouts = {
diff --git a/packages/twenty-front/src/modules/page-layout/utils/__tests__/parseCellIdToCoordinates.test.ts b/packages/twenty-front/src/modules/page-layout/utils/__tests__/parseCellIdToCoordinates.test.ts
index 2dddbc1d63..62f2120811 100644
--- a/packages/twenty-front/src/modules/page-layout/utils/__tests__/parseCellIdToCoordinates.test.ts
+++ b/packages/twenty-front/src/modules/page-layout/utils/__tests__/parseCellIdToCoordinates.test.ts
@@ -1,4 +1,4 @@
-import { parseCellIdToCoordinates } from '../parseCellIdToCoordinates';
+import { parseCellIdToCoordinates } from '@/page-layout/utils/parseCellIdToCoordinates';
 
 describe('parseCellIdToCoordinates', () => {
   it('should parse cell ID correctly', () => {
diff --git a/packages/twenty-front/src/modules/page-layout/utils/__tests__/prepareGridLayoutItemsWithPlaceholders.test.ts b/packages/twenty-front/src/modules/page-layout/utils/__tests__/prepareGridLayoutItemsWithPlaceholders.test.ts
index 642aa905b1..cc68ae9c9f 100644
--- a/packages/twenty-front/src/modules/page-layout/utils/__tests__/prepareGridLayoutItemsWithPlaceholders.test.ts
+++ b/packages/twenty-front/src/modules/page-layout/utils/__tests__/prepareGridLayoutItemsWithPlaceholders.test.ts
@@ -5,7 +5,7 @@ import {
   WidgetType,
   type PageLayoutWidget,
 } from '~/generated/graphql';
-import { prepareGridLayoutItemsWithPlaceholders } from '../prepareGridLayoutItemsWithPlaceholders';
+import { prepareGridLayoutItemsWithPlaceholders } from '@/page-layout/utils/prepareGridLayoutItemsWithPlaceholders';
 
 describe('prepareGridLayoutItemsWithPlaceholders', () => {
   const createMockWidget = (id: string): PageLayoutWidget => ({
diff --git a/packages/twenty-front/src/modules/page-layout/utils/__tests__/removeWidgetFromTab.test.ts b/packages/twenty-front/src/modules/page-layout/utils/__tests__/removeWidgetFromTab.test.ts
index 44af87f4e8..1ab5e05e71 100644
--- a/packages/twenty-front/src/modules/page-layout/utils/__tests__/removeWidgetFromTab.test.ts
+++ b/packages/twenty-front/src/modules/page-layout/utils/__tests__/removeWidgetFromTab.test.ts
@@ -4,8 +4,8 @@ import {
   GraphType,
   WidgetType,
 } from '~/generated-metadata/graphql';
-import { type PageLayoutTab } from '../../types/PageLayoutTab';
-import { removeWidgetFromTab } from '../removeWidgetFromTab';
+import { type PageLayoutTab } from '@/page-layout/types/PageLayoutTab';
+import { removeWidgetFromTab } from '@/page-layout/utils/removeWidgetFromTab';
 
 describe('removeWidgetFromTab', () => {
   const mockTabs: PageLayoutTab[] = [
diff --git a/packages/twenty-front/src/modules/page-layout/utils/__tests__/removeWidgetLayoutFromTab.test.ts b/packages/twenty-front/src/modules/page-layout/utils/__tests__/removeWidgetLayoutFromTab.test.ts
index c843c91993..c107519e0f 100644
--- a/packages/twenty-front/src/modules/page-layout/utils/__tests__/removeWidgetLayoutFromTab.test.ts
+++ b/packages/twenty-front/src/modules/page-layout/utils/__tests__/removeWidgetLayoutFromTab.test.ts
@@ -1,5 +1,5 @@
 import { type TabLayouts } from '@/page-layout/types/tab-layouts';
-import { removeWidgetLayoutFromTab } from '../removeWidgetLayoutFromTab';
+import { removeWidgetLayoutFromTab } from '@/page-layout/utils/removeWidgetLayoutFromTab';
 
 describe('removeWidgetLayoutFromTab', () => {
   const mockTabLayouts: TabLayouts = {
diff --git a/packages/twenty-front/src/modules/page-layout/utils/__tests__/updateLayoutItemConstraints.test.ts b/packages/twenty-front/src/modules/page-layout/utils/__tests__/updateLayoutItemConstraints.test.ts
index 91c3d0c877..20f1bd0a10 100644
--- a/packages/twenty-front/src/modules/page-layout/utils/__tests__/updateLayoutItemConstraints.test.ts
+++ b/packages/twenty-front/src/modules/page-layout/utils/__tests__/updateLayoutItemConstraints.test.ts
@@ -1,5 +1,5 @@
 import { type Layouts } from 'react-grid-layout';
-import { updateLayoutItemConstraints } from '../updateLayoutItemConstraints';
+import { updateLayoutItemConstraints } from '@/page-layout/utils/updateLayoutItemConstraints';
 
 describe('updateLayoutItemConstraints', () => {
   it('should update constraints for the specified layout item in desktop layout', () => {
diff --git a/packages/twenty-front/src/modules/page-layout/utils/__tests__/updateWidgetMinimumSizeForGraphType.test.ts b/packages/twenty-front/src/modules/page-layout/utils/__tests__/updateWidgetMinimumSizeForGraphType.test.ts
index 0cad47a3ac..0813bbbb13 100644
--- a/packages/twenty-front/src/modules/page-layout/utils/__tests__/updateWidgetMinimumSizeForGraphType.test.ts
+++ b/packages/twenty-front/src/modules/page-layout/utils/__tests__/updateWidgetMinimumSizeForGraphType.test.ts
@@ -1,8 +1,8 @@
 import { type Layouts } from 'react-grid-layout';
 import { GraphType } from '~/generated/graphql';
-import { getWidgetSize } from '../getWidgetSize';
-import { updateLayoutItemConstraints } from '../updateLayoutItemConstraints';
-import { updateWidgetMinimumSizeForGraphType } from '../updateWidgetMinimumSizeForGraphType';
+import { getWidgetSize } from '@/page-layout/utils/getWidgetSize';
+import { updateLayoutItemConstraints } from '@/page-layout/utils/updateLayoutItemConstraints';
+import { updateWidgetMinimumSizeForGraphType } from '@/page-layout/utils/updateWidgetMinimumSizeForGraphType';
 
 jest.mock('../getWidgetSize');
 jest.mock('../updateLayoutItemConstraints');
diff --git a/packages/twenty-front/src/modules/page-layout/utils/calculateTotalGridRows.ts b/packages/twenty-front/src/modules/page-layout/utils/calculateTotalGridRows.ts
index f382ccbabb..c5a7d1e48e 100644
--- a/packages/twenty-front/src/modules/page-layout/utils/calculateTotalGridRows.ts
+++ b/packages/twenty-front/src/modules/page-layout/utils/calculateTotalGridRows.ts
@@ -1,6 +1,6 @@
 import { type Layouts } from 'react-grid-layout';
-import { GRID_BUFFER_ROWS } from '../constants/GridBufferRows';
-import { GRID_MIN_ROWS } from '../constants/GridMinRows';
+import { GRID_BUFFER_ROWS } from '@/page-layout/constants/GridBufferRows';
+import { GRID_MIN_ROWS } from '@/page-layout/constants/GridMinRows';
 
 export const calculateTotalGridRows = (
   layouts: Layouts,
diff --git a/packages/twenty-front/src/modules/page-layout/utils/removeWidgetFromTab.ts b/packages/twenty-front/src/modules/page-layout/utils/removeWidgetFromTab.ts
index f3401944b8..62b90ab6a2 100644
--- a/packages/twenty-front/src/modules/page-layout/utils/removeWidgetFromTab.ts
+++ b/packages/twenty-front/src/modules/page-layout/utils/removeWidgetFromTab.ts
@@ -1,4 +1,4 @@
-import { type PageLayoutTab } from '../types/PageLayoutTab';
+import { type PageLayoutTab } from '@/page-layout/types/PageLayoutTab';
 
 export const removeWidgetFromTab = (
   tabs: PageLayoutTab[],
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/components/WidgetActionFieldEdit.tsx b/packages/twenty-front/src/modules/page-layout/widgets/components/WidgetActionFieldEdit.tsx
index 9588874497..adf53c1d06 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/components/WidgetActionFieldEdit.tsx
+++ b/packages/twenty-front/src/modules/page-layout/widgets/components/WidgetActionFieldEdit.tsx
@@ -22,7 +22,7 @@ import { getObjectPermissionsFromMapByObjectMetadataId } from '@/settings/roles/
 import { useLayoutRenderingContext } from '@/ui/layout/contexts/LayoutRenderingContext';
 import { useTargetRecord } from '@/ui/layout/contexts/useTargetRecord';
 import { assertIsDefinedOrThrow } from 'twenty-shared/utils';
-import { useCurrentWidget } from '../hooks/useCurrentWidget';
+import { useCurrentWidget } from '@/page-layout/widgets/hooks/useCurrentWidget';
 
 export const WidgetActionFieldEdit = () => {
   const widget = useCurrentWidget();
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/components/WidgetActionRenderer.tsx b/packages/twenty-front/src/modules/page-layout/widgets/components/WidgetActionRenderer.tsx
index fc979eb21a..2d4e16f82a 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/components/WidgetActionRenderer.tsx
+++ b/packages/twenty-front/src/modules/page-layout/widgets/components/WidgetActionRenderer.tsx
@@ -1,7 +1,7 @@
 import { type WidgetAction } from '@/page-layout/widgets/types/WidgetAction';
 import { CustomError } from 'twenty-shared/utils';
 import { WidgetType } from '~/generated/graphql';
-import { useCurrentWidget } from '../hooks/useCurrentWidget';
+import { useCurrentWidget } from '@/page-layout/widgets/hooks/useCurrentWidget';
 import { WidgetActionFieldEdit } from './WidgetActionFieldEdit';
 
 type WidgetActionRendererProps = {
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/graph/components/GraphWidget.tsx b/packages/twenty-front/src/modules/page-layout/widgets/graph/components/GraphWidget.tsx
index 3c82de2357..5ab753a8e9 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/graph/components/GraphWidget.tsx
+++ b/packages/twenty-front/src/modules/page-layout/widgets/graph/components/GraphWidget.tsx
@@ -9,7 +9,7 @@ import { GraphWidgetPieChartRenderer } from '@/page-layout/widgets/graph/graphWi
 import { areChartConfigurationFieldsValidForQuery } from '@/page-layout/widgets/graph/utils/areChartConfigurationFieldsValidForQuery';
 import { lazy, Suspense } from 'react';
 import { GraphType } from '~/generated/graphql';
-import { useCurrentWidget } from '../../hooks/useCurrentWidget';
+import { useCurrentWidget } from '@/page-layout/widgets/hooks/useCurrentWidget';
 
 const GraphWidgetGaugeChart = lazy(() =>
   import(
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/graph/components/__stories__/GraphWidgetLegend.stories.tsx b/packages/twenty-front/src/modules/page-layout/widgets/graph/components/__stories__/GraphWidgetLegend.stories.tsx
index 3849f80df4..3187281275 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/graph/components/__stories__/GraphWidgetLegend.stories.tsx
+++ b/packages/twenty-front/src/modules/page-layout/widgets/graph/components/__stories__/GraphWidgetLegend.stories.tsx
@@ -2,7 +2,7 @@ import { type Meta, type StoryObj } from '@storybook/react';
 
 import { GraphWidgetTestWrapper } from '@/page-layout/widgets/graph/__tests__/GraphWidgetTestWrapper';
 import { ComponentDecorator } from 'twenty-ui/testing';
-import { GraphWidgetLegend } from '../GraphWidgetLegend';
+import { GraphWidgetLegend } from '@/page-layout/widgets/graph/components/GraphWidgetLegend';
 
 const meta: Meta<typeof GraphWidgetLegend> = {
   title: 'Modules/PageLayout/Widgets/GraphWidgetLegend',
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/graph/components/__stories__/GraphWidgetTooltip.stories.tsx b/packages/twenty-front/src/modules/page-layout/widgets/graph/components/__stories__/GraphWidgetTooltip.stories.tsx
index 1bcff1b28f..6434bb26d6 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/graph/components/__stories__/GraphWidgetTooltip.stories.tsx
+++ b/packages/twenty-front/src/modules/page-layout/widgets/graph/components/__stories__/GraphWidgetTooltip.stories.tsx
@@ -1,7 +1,7 @@
 import { type Meta, type StoryObj } from '@storybook/react';
 
 import { ComponentDecorator } from 'twenty-ui/testing';
-import { GraphWidgetTooltip } from '../GraphWidgetTooltip';
+import { GraphWidgetTooltip } from '@/page-layout/widgets/graph/components/GraphWidgetTooltip';
 
 const meta: Meta<typeof GraphWidgetTooltip> = {
   title: 'Modules/PageLayout/Widgets/GraphWidgetTooltip',
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetAggregateChart/components/GraphWidgetAggregateChartRenderer.tsx b/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetAggregateChart/components/GraphWidgetAggregateChartRenderer.tsx
index 80505ca807..24f54ace43 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetAggregateChart/components/GraphWidgetAggregateChartRenderer.tsx
+++ b/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetAggregateChart/components/GraphWidgetAggregateChartRenderer.tsx
@@ -2,7 +2,7 @@ import { ChartSkeletonLoader } from '@/page-layout/widgets/graph/components/Char
 import { useGraphWidgetAggregateQuery } from '@/page-layout/widgets/graph/hooks/useGraphWidgetAggregateQuery';
 import { assertAggregateChartWidgetOrThrow } from '@/page-layout/widgets/graph/utils/assertAggregateChartWidget';
 import { lazy, Suspense } from 'react';
-import { useCurrentWidget } from '../../../hooks/useCurrentWidget';
+import { useCurrentWidget } from '@/page-layout/widgets/hooks/useCurrentWidget';
 
 const GraphWidgetAggregateChart = lazy(() =>
   import(
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetAggregateChart/utils/__tests__/buildRatioNumeratorFilter.test.ts b/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetAggregateChart/utils/__tests__/buildRatioNumeratorFilter.test.ts
index 9e80ca3dfe..2c9f2a50b2 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetAggregateChart/utils/__tests__/buildRatioNumeratorFilter.test.ts
+++ b/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetAggregateChart/utils/__tests__/buildRatioNumeratorFilter.test.ts
@@ -2,7 +2,7 @@ import { type FieldMetadataItem } from '@/object-metadata/types/FieldMetadataIte
 import { FieldMetadataType } from '~/generated-metadata/graphql';
 import { type RatioAggregateConfig } from '~/generated/graphql';
 
-import { buildRatioNumeratorFilter } from '../buildRatioNumeratorFilter';
+import { buildRatioNumeratorFilter } from '@/page-layout/widgets/graph/graphWidgetAggregateChart/utils/buildRatioNumeratorFilter';
 
 describe('buildRatioNumeratorFilter', () => {
   const mockBooleanField = {
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetAggregateChart/utils/__tests__/computeRatioDisplayValue.test.ts b/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetAggregateChart/utils/__tests__/computeRatioDisplayValue.test.ts
index 67fd2b52b3..333ac3a52d 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetAggregateChart/utils/__tests__/computeRatioDisplayValue.test.ts
+++ b/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetAggregateChart/utils/__tests__/computeRatioDisplayValue.test.ts
@@ -1,4 +1,4 @@
-import { computeRatioDisplayValue } from '../computeRatioDisplayValue';
+import { computeRatioDisplayValue } from '@/page-layout/widgets/graph/graphWidgetAggregateChart/utils/computeRatioDisplayValue';
 
 describe('computeRatioDisplayValue', () => {
   it('should return "0%" when denominator is 0', () => {
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetAggregateChart/utils/__tests__/getAvailableAggregateOperationsForAggregateChart.test.ts b/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetAggregateChart/utils/__tests__/getAvailableAggregateOperationsForAggregateChart.test.ts
index 27d25c0cec..5f4e51b369 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetAggregateChart/utils/__tests__/getAvailableAggregateOperationsForAggregateChart.test.ts
+++ b/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetAggregateChart/utils/__tests__/getAvailableAggregateOperationsForAggregateChart.test.ts
@@ -1,7 +1,7 @@
 import { DASHBOARD_AGGREGATE_OPERATION_RATIO } from '@/page-layout/widgets/graph/constants/DashboardAggregateOperationRatio';
 import { FieldMetadataType } from '~/generated-metadata/graphql';
 
-import { getAvailableAggregateOperationsForAggregateChart } from '../getAvailableAggregateOperationsForAggregateChart';
+import { getAvailableAggregateOperationsForAggregateChart } from '@/page-layout/widgets/graph/graphWidgetAggregateChart/utils/getAvailableAggregateOperationsForAggregateChart';
 
 describe('getAvailableAggregateOperationsForAggregateChart', () => {
   it('should include RATIO for BOOLEAN field', () => {
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetBarChart/hooks/__tests__/useBarChartData.test.ts b/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetBarChart/hooks/__tests__/useBarChartData.test.ts
index 4f321c8840..fcf97fd28a 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetBarChart/hooks/__tests__/useBarChartData.test.ts
+++ b/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetBarChart/hooks/__tests__/useBarChartData.test.ts
@@ -2,7 +2,7 @@ import { type BarChartSeries } from '@/page-layout/widgets/graph/graphWidgetBarC
 import { type GraphColorRegistry } from '@/page-layout/widgets/graph/types/GraphColorRegistry';
 import { type BarDatum } from '@nivo/bar';
 import { renderHook } from '@testing-library/react';
-import { useBarChartData } from '../useBarChartData';
+import { useBarChartData } from '@/page-layout/widgets/graph/graphWidgetBarChart/hooks/useBarChartData';
 
 const mockUseRecoilComponentValue = jest.fn();
 jest.mock(
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetBarChart/utils/__tests__/calculateBarChartEndLineCoordinates.test.ts b/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetBarChart/utils/__tests__/calculateBarChartEndLineCoordinates.test.ts
index 15bb75c160..015569718e 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetBarChart/utils/__tests__/calculateBarChartEndLineCoordinates.test.ts
+++ b/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetBarChart/utils/__tests__/calculateBarChartEndLineCoordinates.test.ts
@@ -1,6 +1,6 @@
 import { BarChartLayout } from '@/page-layout/widgets/graph/graphWidgetBarChart/types/BarChartLayout';
 import { type BarDatum, type ComputedBarDatum } from '@nivo/bar';
-import { calculateBarChartEndLineCoordinates } from '../calculateBarChartEndLineCoordinates';
+import { calculateBarChartEndLineCoordinates } from '@/page-layout/widgets/graph/graphWidgetBarChart/utils/calculateBarChartEndLineCoordinates';
 describe('calculateBarChartEndLineCoordinates', () => {
   const createMockBar = (
     overrides?: Partial<ComputedBarDatum<BarDatum>>,
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetBarChart/utils/__tests__/calculateBarChartValueRange.test.ts b/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetBarChart/utils/__tests__/calculateBarChartValueRange.test.ts
index e11622372e..cbe40d0802 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetBarChart/utils/__tests__/calculateBarChartValueRange.test.ts
+++ b/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetBarChart/utils/__tests__/calculateBarChartValueRange.test.ts
@@ -1,5 +1,5 @@
 import { type BarDatum } from '@nivo/bar';
-import { calculateValueRangeFromBarChartKeys } from '../calculateValueRangeFromBarChartKeys';
+import { calculateValueRangeFromBarChartKeys } from '@/page-layout/widgets/graph/graphWidgetBarChart/utils/calculateValueRangeFromBarChartKeys';
 
 describe('calculateValueRangeFromBarChartKeys (essential cases)', () => {
   it('returns minimum=0 and maximum=highest value for all positive values', () => {
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetBarChart/utils/__tests__/calculateStackedBarChartValueRange.test.ts b/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetBarChart/utils/__tests__/calculateStackedBarChartValueRange.test.ts
index 72f786fe11..f3b39dfd0d 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetBarChart/utils/__tests__/calculateStackedBarChartValueRange.test.ts
+++ b/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetBarChart/utils/__tests__/calculateStackedBarChartValueRange.test.ts
@@ -1,5 +1,5 @@
 import { type BarDatum } from '@nivo/bar';
-import { calculateStackedBarChartValueRange } from '../calculateStackedBarChartValueRange';
+import { calculateStackedBarChartValueRange } from '@/page-layout/widgets/graph/graphWidgetBarChart/utils/calculateStackedBarChartValueRange';
 
 describe('calculateStackedBarChartValueRange (essential cases)', () => {
   it('returns minimum=0 and maximum=largest positive stack', () => {
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetBarChart/utils/__tests__/computeBarChartStackedLabels.test.ts b/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetBarChart/utils/__tests__/computeBarChartStackedLabels.test.ts
index 7c2dadf67a..1d8c588162 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetBarChart/utils/__tests__/computeBarChartStackedLabels.test.ts
+++ b/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetBarChart/utils/__tests__/computeBarChartStackedLabels.test.ts
@@ -1,5 +1,5 @@
 import { type BarDatum, type ComputedBarDatum } from '@nivo/bar';
-import { computeBarChartStackedLabels } from '../computeBarChartStackedLabels';
+import { computeBarChartStackedLabels } from '@/page-layout/widgets/graph/graphWidgetBarChart/utils/computeBarChartStackedLabels';
 
 const createMockBar = (
   id: string,
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetBarChart/utils/__tests__/fillDateGapsInBarChartData.test.ts b/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetBarChart/utils/__tests__/fillDateGapsInBarChartData.test.ts
index c0e67ea9aa..8b5cea2156 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetBarChart/utils/__tests__/fillDateGapsInBarChartData.test.ts
+++ b/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetBarChart/utils/__tests__/fillDateGapsInBarChartData.test.ts
@@ -1,6 +1,6 @@
 import { ObjectRecordGroupByDateGranularity } from 'twenty-shared/types';
 import { GraphOrderBy } from '~/generated/graphql';
-import { fillDateGapsInBarChartData } from '../fillDateGapsInBarChartData';
+import { fillDateGapsInBarChartData } from '@/page-layout/widgets/graph/graphWidgetBarChart/utils/fillDateGapsInBarChartData';
 
 describe('fillDateGapsInBarChartData', () => {
   describe('one-dimensional data', () => {
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetBarChart/utils/__tests__/generateDateGroupsInRange.test.ts b/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetBarChart/utils/__tests__/generateDateGroupsInRange.test.ts
index e5b4f955fb..de573c67fa 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetBarChart/utils/__tests__/generateDateGroupsInRange.test.ts
+++ b/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetBarChart/utils/__tests__/generateDateGroupsInRange.test.ts
@@ -1,7 +1,7 @@
 import { BAR_CHART_CONSTANTS } from '@/page-layout/widgets/graph/graphWidgetBarChart/constants/BarChartConstants';
 import { Temporal } from 'temporal-polyfill';
 import { ObjectRecordGroupByDateGranularity } from 'twenty-shared/types';
-import { generateDateGroupsInRange } from '../generateDateGroupsInRange';
+import { generateDateGroupsInRange } from '@/page-layout/widgets/graph/graphWidgetBarChart/utils/generateDateGroupsInRange';
 
 describe('generateDateGroupsInRange', () => {
   it('generates daily date groups', () => {
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetBarChart/utils/__tests__/getBarChartQueryLimit.test.ts b/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetBarChart/utils/__tests__/getBarChartQueryLimit.test.ts
index 01f6b52f01..cd9b92978d 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetBarChart/utils/__tests__/getBarChartQueryLimit.test.ts
+++ b/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetBarChart/utils/__tests__/getBarChartQueryLimit.test.ts
@@ -4,7 +4,7 @@ import {
   type BarChartConfiguration,
   BarChartGroupMode,
 } from '~/generated-metadata/graphql';
-import { getBarChartQueryLimit } from '../getBarChartQueryLimit';
+import { getBarChartQueryLimit } from '@/page-layout/widgets/graph/graphWidgetBarChart/utils/getBarChartQueryLimit';
 
 describe('getBarChartQueryLimit', () => {
   it('should return one-dimensional limit for bar chart without secondary axis', () => {
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetBarChart/utils/__tests__/sortBarChartDataBySecondaryDimensionSum.test.ts b/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetBarChart/utils/__tests__/sortBarChartDataBySecondaryDimensionSum.test.ts
index 9c0e97bb67..fe1918276f 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetBarChart/utils/__tests__/sortBarChartDataBySecondaryDimensionSum.test.ts
+++ b/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetBarChart/utils/__tests__/sortBarChartDataBySecondaryDimensionSum.test.ts
@@ -1,5 +1,5 @@
 import { GraphOrderBy } from '~/generated/graphql';
-import { sortBarChartDataBySecondaryDimensionSum } from '../sortBarChartDataBySecondaryDimensionSum';
+import { sortBarChartDataBySecondaryDimensionSum } from '@/page-layout/widgets/graph/graphWidgetBarChart/utils/sortBarChartDataBySecondaryDimensionSum';
 
 describe('sortBarChartDataBySecondaryDimensionSum', () => {
   const mockData = [
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetBarChart/utils/__tests__/transformTwoDimensionalGroupByToBarChartData.test.ts b/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetBarChart/utils/__tests__/transformTwoDimensionalGroupByToBarChartData.test.ts
index 9681154468..57c96e7453 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetBarChart/utils/__tests__/transformTwoDimensionalGroupByToBarChartData.test.ts
+++ b/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetBarChart/utils/__tests__/transformTwoDimensionalGroupByToBarChartData.test.ts
@@ -9,7 +9,7 @@ import {
   GraphType,
   type BarChartConfiguration,
 } from '~/generated/graphql';
-import { transformTwoDimensionalGroupByToBarChartData } from '../transformTwoDimensionalGroupByToBarChartData';
+import { transformTwoDimensionalGroupByToBarChartData } from '@/page-layout/widgets/graph/graphWidgetBarChart/utils/transformTwoDimensionalGroupByToBarChartData';
 
 describe('transformTwoDimensionalGroupByToBarChartData', () => {
   const userTimezone = 'Europe/Paris';
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetBarChart/utils/__tests__/truncateTickLabel.test.ts b/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetBarChart/utils/__tests__/truncateTickLabel.test.ts
index 50ba6d8014..e67fbff56b 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetBarChart/utils/__tests__/truncateTickLabel.test.ts
+++ b/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetBarChart/utils/__tests__/truncateTickLabel.test.ts
@@ -1,4 +1,4 @@
-import { truncateTickLabel } from '../truncateTickLabel';
+import { truncateTickLabel } from '@/page-layout/widgets/graph/graphWidgetBarChart/utils/truncateTickLabel';
 
 describe('truncateTickLabel', () => {
   it('should return the original string when it fits within maxLength', () => {
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetGaugeChart/hooks/__tests__/useGaugeChartData.test.ts b/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetGaugeChart/hooks/__tests__/useGaugeChartData.test.ts
index a1cde3a179..471db5b2c4 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetGaugeChart/hooks/__tests__/useGaugeChartData.test.ts
+++ b/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetGaugeChart/hooks/__tests__/useGaugeChartData.test.ts
@@ -1,7 +1,7 @@
 import { type GaugeChartData } from '@/page-layout/widgets/graph/graphWidgetGaugeChart/types/GaugeChartData';
 import { type GraphColorRegistry } from '@/page-layout/widgets/graph/types/GraphColorRegistry';
 import { renderHook } from '@testing-library/react';
-import { useGaugeChartData } from '../useGaugeChartData';
+import { useGaugeChartData } from '@/page-layout/widgets/graph/graphWidgetGaugeChart/hooks/useGaugeChartData';
 
 describe('useGaugeChartData', () => {
   const mockColorRegistry: GraphColorRegistry = {
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetGaugeChart/utils/__tests__/calculateGaugeChartEndLineCoordinates.test.ts b/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetGaugeChart/utils/__tests__/calculateGaugeChartEndLineCoordinates.test.ts
index b234bc2137..cfcc609cfe 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetGaugeChart/utils/__tests__/calculateGaugeChartEndLineCoordinates.test.ts
+++ b/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetGaugeChart/utils/__tests__/calculateGaugeChartEndLineCoordinates.test.ts
@@ -1,4 +1,4 @@
-import { calculateGaugeChartEndLineCoordinates } from '../calculateGaugeChartEndLineCoordinates';
+import { calculateGaugeChartEndLineCoordinates } from '@/page-layout/widgets/graph/graphWidgetGaugeChart/utils/calculateGaugeChartEndLineCoordinates';
 
 describe('calculateGaugeChartEndLineCoordinates', () => {
   it('should calculate coordinates for angle π/2 (after adjustment points right)', () => {
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetLineChart/hooks/__tests__/useLineChartData.test.ts b/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetLineChart/hooks/__tests__/useLineChartData.test.ts
index 8976cec4f4..044f11df9e 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetLineChart/hooks/__tests__/useLineChartData.test.ts
+++ b/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetLineChart/hooks/__tests__/useLineChartData.test.ts
@@ -2,7 +2,7 @@ import { type LineChartSeries } from '@/page-layout/widgets/graph/graphWidgetLin
 import { type GraphColorRegistry } from '@/page-layout/widgets/graph/types/GraphColorRegistry';
 import { renderHook } from '@testing-library/react';
 
-import { useLineChartData } from '../useLineChartData';
+import { useLineChartData } from '@/page-layout/widgets/graph/graphWidgetLineChart/hooks/useLineChartData';
 
 const mockUseRecoilComponentValue = jest.fn();
 jest.mock(
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetLineChart/utils/__tests__/computeLineAreaPath.test.ts b/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetLineChart/utils/__tests__/computeLineAreaPath.test.ts
index 47a4cd99cc..6f25b54b12 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetLineChart/utils/__tests__/computeLineAreaPath.test.ts
+++ b/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetLineChart/utils/__tests__/computeLineAreaPath.test.ts
@@ -27,7 +27,7 @@ jest.mock('d3-shape', () => {
   };
 });
 
-import { computeLineAreaPath } from '../computeLineAreaPath';
+import { computeLineAreaPath } from '@/page-layout/widgets/graph/graphWidgetLineChart/utils/computeLineAreaPath';
 
 const buildComputedSeries = (
   points: { x: number; y: number }[],
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetLineChart/utils/__tests__/computeLineChartStackedLabels.test.ts b/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetLineChart/utils/__tests__/computeLineChartStackedLabels.test.ts
index a20798bd61..a8ff158feb 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetLineChart/utils/__tests__/computeLineChartStackedLabels.test.ts
+++ b/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetLineChart/utils/__tests__/computeLineChartStackedLabels.test.ts
@@ -1,5 +1,5 @@
 import { type LineSeries, type Point } from '@nivo/line';
-import { computeLineChartStackedLabels } from '../computeLineChartStackedLabels';
+import { computeLineChartStackedLabels } from '@/page-layout/widgets/graph/graphWidgetLineChart/utils/computeLineChartStackedLabels';
 
 const createMockPoint = (
   seriesId: string,
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetLineChart/utils/__tests__/getLineChartQueryLimit.test.ts b/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetLineChart/utils/__tests__/getLineChartQueryLimit.test.ts
index 005110f711..6fb02b69f7 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetLineChart/utils/__tests__/getLineChartQueryLimit.test.ts
+++ b/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetLineChart/utils/__tests__/getLineChartQueryLimit.test.ts
@@ -1,7 +1,7 @@
 import { EXTRA_ITEM_TO_DETECT_TOO_MANY_GROUPS } from '@/page-layout/widgets/graph/constants/ExtraItemToDetectTooManyGroups';
 import { LINE_CHART_CONSTANTS } from '@/page-layout/widgets/graph/graphWidgetLineChart/constants/LineChartConstants';
 import { type LineChartConfiguration } from '~/generated-metadata/graphql';
-import { getLineChartQueryLimit } from '../getLineChartQueryLimit';
+import { getLineChartQueryLimit } from '@/page-layout/widgets/graph/graphWidgetLineChart/utils/getLineChartQueryLimit';
 
 describe('getLineChartQueryLimit', () => {
   it('should return one-dimensional limit for line chart without secondary axis', () => {
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetPieChart/hooks/__tests__/usePieChartData.test.ts b/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetPieChart/hooks/__tests__/usePieChartData.test.ts
index 1e65a02b27..08e56de61d 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetPieChart/hooks/__tests__/usePieChartData.test.ts
+++ b/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetPieChart/hooks/__tests__/usePieChartData.test.ts
@@ -1,7 +1,7 @@
 import { type PieChartDataItem } from '@/page-layout/widgets/graph/graphWidgetPieChart/types/PieChartDataItem';
 import { type GraphColorRegistry } from '@/page-layout/widgets/graph/types/GraphColorRegistry';
 import { renderHook } from '@testing-library/react';
-import { usePieChartData } from '../usePieChartData';
+import { usePieChartData } from '@/page-layout/widgets/graph/graphWidgetPieChart/hooks/usePieChartData';
 
 const mockUseRecoilComponentValue = jest.fn();
 jest.mock(
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetPieChart/states/graphWidgetPieTooltipComponentState.ts b/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetPieChart/states/graphWidgetPieTooltipComponentState.ts
index 71a2116284..518b6cfd27 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetPieChart/states/graphWidgetPieTooltipComponentState.ts
+++ b/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetPieChart/states/graphWidgetPieTooltipComponentState.ts
@@ -1,7 +1,7 @@
 import { WidgetComponentInstanceContext } from '@/page-layout/widgets/states/contexts/WidgetComponentInstanceContext';
 import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState';
 import { type ComputedDatum } from '@nivo/pie';
-import { type PieChartDataItem } from '../types/PieChartDataItem';
+import { type PieChartDataItem } from '@/page-layout/widgets/graph/graphWidgetPieChart/types/PieChartDataItem';
 
 export const graphWidgetPieTooltipComponentState = createComponentState<{
   datum: ComputedDatum<PieChartDataItem>;
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetPieChart/utils/getPieChartFormattedValue.ts b/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetPieChart/utils/getPieChartFormattedValue.ts
index e38f4835a0..408a6d6bcc 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetPieChart/utils/getPieChartFormattedValue.ts
+++ b/packages/twenty-front/src/modules/page-layout/widgets/graph/graphWidgetPieChart/utils/getPieChartFormattedValue.ts
@@ -5,8 +5,8 @@ import {
 import { type ComputedDatum } from '@nivo/pie';
 import { isDefined } from 'twenty-shared/utils';
 
-import { type PieChartDataItem } from '../types/PieChartDataItem';
-import { type PieChartEnrichedData } from '../types/PieChartEnrichedData';
+import { type PieChartDataItem } from '@/page-layout/widgets/graph/graphWidgetPieChart/types/PieChartDataItem';
+import { type PieChartEnrichedData } from '@/page-layout/widgets/graph/graphWidgetPieChart/types/PieChartEnrichedData';
 
 type GetPieChartFormattedValueParams = {
   datum: ComputedDatum<PieChartDataItem>;
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/graph/utils/__tests__/applyCumulativeTransformToBarChartData.test.ts b/packages/twenty-front/src/modules/page-layout/widgets/graph/utils/__tests__/applyCumulativeTransformToBarChartData.test.ts
index cceea0fd9b..8598ce13a9 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/graph/utils/__tests__/applyCumulativeTransformToBarChartData.test.ts
+++ b/packages/twenty-front/src/modules/page-layout/widgets/graph/utils/__tests__/applyCumulativeTransformToBarChartData.test.ts
@@ -1,4 +1,4 @@
-import { applyCumulativeTransformToBarChartData } from '../applyCumulativeTransformToBarChartData';
+import { applyCumulativeTransformToBarChartData } from '@/page-layout/widgets/graph/utils/applyCumulativeTransformToBarChartData';
 
 describe('applyCumulativeTransformToBarChartData', () => {
   const testCases = [
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/graph/utils/__tests__/applyCumulativeTransformToLineChartData.test.ts b/packages/twenty-front/src/modules/page-layout/widgets/graph/utils/__tests__/applyCumulativeTransformToLineChartData.test.ts
index dfaf42a02f..f4548240cd 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/graph/utils/__tests__/applyCumulativeTransformToLineChartData.test.ts
+++ b/packages/twenty-front/src/modules/page-layout/widgets/graph/utils/__tests__/applyCumulativeTransformToLineChartData.test.ts
@@ -1,4 +1,4 @@
-import { applyCumulativeTransformToLineChartData } from '../applyCumulativeTransformToLineChartData';
+import { applyCumulativeTransformToLineChartData } from '@/page-layout/widgets/graph/utils/applyCumulativeTransformToLineChartData';
 
 describe('applyCumulativeTransformToLineChartData', () => {
   const testCases = [
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/graph/utils/__tests__/applyCumulativeTransformToTwoDimensionalBarChartData.test.ts b/packages/twenty-front/src/modules/page-layout/widgets/graph/utils/__tests__/applyCumulativeTransformToTwoDimensionalBarChartData.test.ts
index 677874724f..a5f4347243 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/graph/utils/__tests__/applyCumulativeTransformToTwoDimensionalBarChartData.test.ts
+++ b/packages/twenty-front/src/modules/page-layout/widgets/graph/utils/__tests__/applyCumulativeTransformToTwoDimensionalBarChartData.test.ts
@@ -1,4 +1,4 @@
-import { applyCumulativeTransformToTwoDimensionalBarChartData } from '../applyCumulativeTransformToTwoDimensionalBarChartData';
+import { applyCumulativeTransformToTwoDimensionalBarChartData } from '@/page-layout/widgets/graph/utils/applyCumulativeTransformToTwoDimensionalBarChartData';
 
 describe('applyCumulativeTransformToTwoDimensionalBarChartData', () => {
   const testCases = [
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/graph/utils/__tests__/areChartConfigurationFieldsValidForQuery.test.ts b/packages/twenty-front/src/modules/page-layout/widgets/graph/utils/__tests__/areChartConfigurationFieldsValidForQuery.test.ts
index bd517e1f2a..3aaafee314 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/graph/utils/__tests__/areChartConfigurationFieldsValidForQuery.test.ts
+++ b/packages/twenty-front/src/modules/page-layout/widgets/graph/utils/__tests__/areChartConfigurationFieldsValidForQuery.test.ts
@@ -6,7 +6,7 @@ import {
   type AggregateChartConfiguration,
 } from '~/generated/graphql';
 
-import { areChartConfigurationFieldsValidForQuery } from '../areChartConfigurationFieldsValidForQuery';
+import { areChartConfigurationFieldsValidForQuery } from '@/page-layout/widgets/graph/utils/areChartConfigurationFieldsValidForQuery';
 
 describe('areChartConfigurationFieldsValidForQuery', () => {
   const createMockObjectMetadataItem = (
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/graph/utils/__tests__/buildDateFilterForDayGranularity.test.ts b/packages/twenty-front/src/modules/page-layout/widgets/graph/utils/__tests__/buildDateFilterForDayGranularity.test.ts
index fd4af1bd28..7776ad0163 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/graph/utils/__tests__/buildDateFilterForDayGranularity.test.ts
+++ b/packages/twenty-front/src/modules/page-layout/widgets/graph/utils/__tests__/buildDateFilterForDayGranularity.test.ts
@@ -1,7 +1,7 @@
 import { Temporal } from 'temporal-polyfill';
 import { ViewFilterOperand } from 'twenty-shared/types';
 import { FieldMetadataType } from '~/generated-metadata/graphql';
-import { buildDateFilterForDayGranularity } from '../buildDateFilterForDayGranularity';
+import { buildDateFilterForDayGranularity } from '@/page-layout/widgets/graph/utils/buildDateFilterForDayGranularity';
 
 describe('buildDateFilterForDayGranularity', () => {
   describe('DATE field type', () => {
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/graph/utils/__tests__/buildDateRangeFiltersForGranularity.test.ts b/packages/twenty-front/src/modules/page-layout/widgets/graph/utils/__tests__/buildDateRangeFiltersForGranularity.test.ts
index c76cb0efeb..f22773ff72 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/graph/utils/__tests__/buildDateRangeFiltersForGranularity.test.ts
+++ b/packages/twenty-front/src/modules/page-layout/widgets/graph/utils/__tests__/buildDateRangeFiltersForGranularity.test.ts
@@ -4,7 +4,7 @@ import {
   ViewFilterOperand,
 } from 'twenty-shared/types';
 import { FieldMetadataType } from '~/generated-metadata/graphql';
-import { buildDateRangeFiltersForGranularity } from '../buildDateRangeFiltersForGranularity';
+import { buildDateRangeFiltersForGranularity } from '@/page-layout/widgets/graph/utils/buildDateRangeFiltersForGranularity';
 
 const testDate = Temporal.PlainDate.from('2024-03-15').toZonedDateTime({
   timeZone: 'Europe/Paris',
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/graph/utils/__tests__/calculateValueRangeFromValues.test.ts b/packages/twenty-front/src/modules/page-layout/widgets/graph/utils/__tests__/calculateValueRangeFromValues.test.ts
index 838efe7516..527a3bb61b 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/graph/utils/__tests__/calculateValueRangeFromValues.test.ts
+++ b/packages/twenty-front/src/modules/page-layout/widgets/graph/utils/__tests__/calculateValueRangeFromValues.test.ts
@@ -1,4 +1,4 @@
-import { calculateValueRangeFromValues } from '../calculateValueRangeFromValues';
+import { calculateValueRangeFromValues } from '@/page-layout/widgets/graph/utils/calculateValueRangeFromValues';
 
 describe('calculateValueRangeFromValues', () => {
   it('should return minimum=0 and maximum=highest value for all positive values', () => {
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/graph/utils/__tests__/computeAggregateNumericValueForGraph.test.ts b/packages/twenty-front/src/modules/page-layout/widgets/graph/utils/__tests__/computeAggregateNumericValueForGraph.test.ts
index e62ce702df..dbe410befc 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/graph/utils/__tests__/computeAggregateNumericValueForGraph.test.ts
+++ b/packages/twenty-front/src/modules/page-layout/widgets/graph/utils/__tests__/computeAggregateNumericValueForGraph.test.ts
@@ -1,6 +1,6 @@
 import { AggregateOperations } from '@/object-record/record-table/constants/AggregateOperations';
 import { FieldMetadataType } from '~/generated-metadata/graphql';
-import { computeAggregateNumericValueForGraph } from '../computeAggregateNumericValueForGraph';
+import { computeAggregateNumericValueForGraph } from '@/page-layout/widgets/graph/utils/computeAggregateNumericValueForGraph';
 
 describe('computeAggregateNumericValueForGraph', () => {
   it('should throw error for empty data', () => {
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/graph/utils/__tests__/computeChartCategoryTickValues.test.ts b/packages/twenty-front/src/modules/page-layout/widgets/graph/utils/__tests__/computeChartCategoryTickValues.test.ts
index 492a44ddae..d01a2469d1 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/graph/utils/__tests__/computeChartCategoryTickValues.test.ts
+++ b/packages/twenty-front/src/modules/page-layout/widgets/graph/utils/__tests__/computeChartCategoryTickValues.test.ts
@@ -1,5 +1,5 @@
 import { ROTATION_THRESHOLD_WIDTH } from '@/page-layout/widgets/graph/constants/RotationThresholdWidth';
-import { computeChartCategoryTickValues } from '../computeChartCategoryTickValues';
+import { computeChartCategoryTickValues } from '@/page-layout/widgets/graph/utils/computeChartCategoryTickValues';
 
 describe('computeChartCategoryTickValues', () => {
   it('should return all values when available size allows', () => {
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/graph/utils/__tests__/computeEffectiveValueRange.test.ts b/packages/twenty-front/src/modules/page-layout/widgets/graph/utils/__tests__/computeEffectiveValueRange.test.ts
index 0772fd2ec7..80a996ad1d 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/graph/utils/__tests__/computeEffectiveValueRange.test.ts
+++ b/packages/twenty-front/src/modules/page-layout/widgets/graph/utils/__tests__/computeEffectiveValueRange.test.ts
@@ -1,4 +1,4 @@
-import { computeEffectiveValueRange } from '../computeEffectiveValueRange';
+import { computeEffectiveValueRange } from '@/page-layout/widgets/graph/utils/computeEffectiveValueRange';
 
 describe('computeEffectiveValueRange', () => {
   describe('minimum value calculation', () => {
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/graph/utils/__tests__/computeMaxLabelLengthForMargin.test.ts b/packages/twenty-front/src/modules/page-layout/widgets/graph/utils/__tests__/computeMaxLabelLengthForMargin.test.ts
index 536d76d985..050b0e6f80 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/graph/utils/__tests__/computeMaxLabelLengthForMargin.test.ts
+++ b/packages/twenty-front/src/modules/page-layout/widgets/graph/utils/__tests__/computeMaxLabelLengthForMargin.test.ts
@@ -1,5 +1,5 @@
 import { COMMON_CHART_CONSTANTS } from '@/page-layout/widgets/graph/constants/CommonChartConstants';
-import { computeMaxLabelLengthForMargin } from '../computeMaxLabelLengthForMargin';
+import { computeMaxLabelLengthForMargin } from '@/page-layout/widgets/graph/utils/computeMaxLabelLengthForMargin';
 
 describe('computeMaxLabelLengthForMargin', () => {
   it('should calculate label length based on margin size and font size', () => {
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/graph/utils/__tests__/computeValueTickValues.test.ts b/packages/twenty-front/src/modules/page-layout/widgets/graph/utils/__tests__/computeValueTickValues.test.ts
index 882f571ad7..7c77301a65 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/graph/utils/__tests__/computeValueTickValues.test.ts
+++ b/packages/twenty-front/src/modules/page-layout/widgets/graph/utils/__tests__/computeValueTickValues.test.ts
@@ -1,4 +1,4 @@
-import { computeValueTickValues } from '../computeValueTickValues';
+import { computeValueTickValues } from '@/page-layout/widgets/graph/utils/computeValueTickValues';
 
 describe('computeValueTickValues', () => {
   it('should return empty array for non-finite inputs', () => {
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/graph/utils/__tests__/filterGroupByResults.test.ts b/packages/twenty-front/src/modules/page-layout/widgets/graph/utils/__tests__/filterGroupByResults.test.ts
index 42c4466752..3a129f6fd0 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/graph/utils/__tests__/filterGroupByResults.test.ts
+++ b/packages/twenty-front/src/modules/page-layout/widgets/graph/utils/__tests__/filterGroupByResults.test.ts
@@ -1,6 +1,6 @@
 import { AggregateOperations } from '@/object-record/record-table/constants/AggregateOperations';
 import { FieldMetadataType } from 'twenty-shared/types';
-import { filterGroupByResults } from '../filterGroupByResults';
+import { filterGroupByResults } from '@/page-layout/widgets/graph/utils/filterGroupByResults';
 
 describe('filterGroupByResults', () => {
   const mockAggregateField = {
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/graph/utils/__tests__/formatDateByGranularity.spec.ts b/packages/twenty-front/src/modules/page-layout/widgets/graph/utils/__tests__/formatDateByGranularity.spec.ts
index 153ed0da46..7ba15d7132 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/graph/utils/__tests__/formatDateByGranularity.spec.ts
+++ b/packages/twenty-front/src/modules/page-layout/widgets/graph/utils/__tests__/formatDateByGranularity.spec.ts
@@ -3,7 +3,7 @@ import {
   FirstDayOfTheWeek,
   ObjectRecordGroupByDateGranularity,
 } from 'twenty-shared/types';
-import { formatDateByGranularity } from '../formatDateByGranularity';
+import { formatDateByGranularity } from '@/page-layout/widgets/graph/utils/formatDateByGranularity';
 
 describe('formatDateByGranularity', () => {
   const testDate = Temporal.PlainDate.from('2024-03-20');
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/graph/utils/__tests__/generateChartAggregateFilterKey.test.ts b/packages/twenty-front/src/modules/page-layout/widgets/graph/utils/__tests__/generateChartAggregateFilterKey.test.ts
index d12d5ae0a7..07058cf4dc 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/graph/utils/__tests__/generateChartAggregateFilterKey.test.ts
+++ b/packages/twenty-front/src/modules/page-layout/widgets/graph/utils/__tests__/generateChartAggregateFilterKey.test.ts
@@ -1,4 +1,4 @@
-import { generateChartAggregateFilterKey } from '../generateChartAggregateFilterKey';
+import { generateChartAggregateFilterKey } from '@/page-layout/widgets/graph/utils/generateChartAggregateFilterKey';
 
 describe('generateChartAggregateFilterKey', () => {
   it('should generate key with all values provided', () => {
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/graph/utils/__tests__/generateGroupByQueryVariablesFromPieChartConfiguration.test.ts b/packages/twenty-front/src/modules/page-layout/widgets/graph/utils/__tests__/generateGroupByQueryVariablesFromPieChartConfiguration.test.ts
index 6233e00fe9..c9dcde0e8c 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/graph/utils/__tests__/generateGroupByQueryVariablesFromPieChartConfiguration.test.ts
+++ b/packages/twenty-front/src/modules/page-layout/widgets/graph/utils/__tests__/generateGroupByQueryVariablesFromPieChartConfiguration.test.ts
@@ -7,7 +7,7 @@ import {
   GraphType,
   type PieChartConfiguration,
 } from '~/generated-metadata/graphql';
-import { generateGroupByQueryVariablesFromPieChartConfiguration } from '../generateGroupByQueryVariablesFromPieChartConfiguration';
+import { generateGroupByQueryVariablesFromPieChartConfiguration } from '@/page-layout/widgets/graph/utils/generateGroupByQueryVariablesFromPieChartConfiguration';
 
 describe('generateGroupByQueryVariablesFromPieChartConfiguration', () => {
   const mockObjectMetadataItem: ObjectMetadataItem = {
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/graph/utils/__tests__/getFieldKey.spec.ts b/packages/twenty-front/src/modules/page-layout/widgets/graph/utils/__tests__/getFieldKey.spec.ts
index caf5ed4763..ba253b96c9 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/graph/utils/__tests__/getFieldKey.spec.ts
+++ b/packages/twenty-front/src/modules/page-layout/widgets/graph/utils/__tests__/getFieldKey.spec.ts
@@ -1,6 +1,6 @@
 import { type FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';
 import { FieldMetadataType } from 'twenty-shared/types';
-import { getFieldKey } from '../getFieldKey';
+import { getFieldKey } from '@/page-layout/widgets/graph/utils/getFieldKey';
 
 describe('getFieldKey', () => {
   it('should return field name for non-composite field', () => {
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/graph/utils/__tests__/isChartConfigurationTwoDimensional.test.ts b/packages/twenty-front/src/modules/page-layout/widgets/graph/utils/__tests__/isChartConfigurationTwoDimensional.test.ts
index ece53cb5be..ded1e168ad 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/graph/utils/__tests__/isChartConfigurationTwoDimensional.test.ts
+++ b/packages/twenty-front/src/modules/page-layout/widgets/graph/utils/__tests__/isChartConfigurationTwoDimensional.test.ts
@@ -2,7 +2,7 @@ import {
   type BarChartConfiguration,
   type LineChartConfiguration,
 } from '~/generated-metadata/graphql';
-import { isChartConfigurationTwoDimensional } from '../isChartConfigurationTwoDimensional';
+import { isChartConfigurationTwoDimensional } from '@/page-layout/widgets/graph/utils/isChartConfigurationTwoDimensional';
 
 describe('isChartConfigurationTwoDimensional', () => {
   describe('BarChartConfiguration', () => {
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/graph/utils/__tests__/normalizeChartConfigurationFields.test.ts b/packages/twenty-front/src/modules/page-layout/widgets/graph/utils/__tests__/normalizeChartConfigurationFields.test.ts
index 8ee27b6270..3f72895344 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/graph/utils/__tests__/normalizeChartConfigurationFields.test.ts
+++ b/packages/twenty-front/src/modules/page-layout/widgets/graph/utils/__tests__/normalizeChartConfigurationFields.test.ts
@@ -4,7 +4,7 @@ import {
   GraphType,
   ObjectRecordGroupByDateGranularity,
 } from '~/generated-metadata/graphql';
-import { normalizeChartConfigurationFields } from '../normalizeChartConfigurationFields';
+import { normalizeChartConfigurationFields } from '@/page-layout/widgets/graph/utils/normalizeChartConfigurationFields';
 
 describe('normalizeChartConfigurationFields', () => {
   describe('Bar and Line charts (with primaryAxis prefix)', () => {
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/graph/utils/__tests__/serializeChartBucketValueForFilter.test.ts b/packages/twenty-front/src/modules/page-layout/widgets/graph/utils/__tests__/serializeChartBucketValueForFilter.test.ts
index 04accf631e..60a8ba2b71 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/graph/utils/__tests__/serializeChartBucketValueForFilter.test.ts
+++ b/packages/twenty-front/src/modules/page-layout/widgets/graph/utils/__tests__/serializeChartBucketValueForFilter.test.ts
@@ -1,6 +1,6 @@
 import { FieldMetadataType, ViewFilterOperand } from 'twenty-shared/types';
 
-import { serializeChartBucketValueForFilter } from '../serializeChartBucketValueForFilter';
+import { serializeChartBucketValueForFilter } from '@/page-layout/widgets/graph/utils/serializeChartBucketValueForFilter';
 
 describe('serializeChartBucketValueForFilter', () => {
   describe('fields requiring JSON array with IS operand', () => {
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/graph/utils/__tests__/transformOneDimensionalGroupByToLineChartData.test.ts b/packages/twenty-front/src/modules/page-layout/widgets/graph/utils/__tests__/transformOneDimensionalGroupByToLineChartData.test.ts
index 2e6e4c18ac..872159f171 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/graph/utils/__tests__/transformOneDimensionalGroupByToLineChartData.test.ts
+++ b/packages/twenty-front/src/modules/page-layout/widgets/graph/utils/__tests__/transformOneDimensionalGroupByToLineChartData.test.ts
@@ -8,7 +8,7 @@ import {
   GraphType,
   type LineChartConfiguration,
 } from '~/generated-metadata/graphql';
-import { transformOneDimensionalGroupByToLineChartData } from '../transformOneDimensionalGroupByToLineChartData';
+import { transformOneDimensionalGroupByToLineChartData } from '@/page-layout/widgets/graph/utils/transformOneDimensionalGroupByToLineChartData';
 
 describe('transformOneDimensionalGroupByToLineChartData', () => {
   const userTimezone = 'Europe/Paris';
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/graph/utils/__tests__/transformTwoDimensionalGroupByToLineChartData.test.ts b/packages/twenty-front/src/modules/page-layout/widgets/graph/utils/__tests__/transformTwoDimensionalGroupByToLineChartData.test.ts
index 7c428b1247..e0d11419a4 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/graph/utils/__tests__/transformTwoDimensionalGroupByToLineChartData.test.ts
+++ b/packages/twenty-front/src/modules/page-layout/widgets/graph/utils/__tests__/transformTwoDimensionalGroupByToLineChartData.test.ts
@@ -8,7 +8,7 @@ import {
   GraphType,
   type LineChartConfiguration,
 } from '~/generated-metadata/graphql';
-import { transformTwoDimensionalGroupByToLineChartData } from '../transformTwoDimensionalGroupByToLineChartData';
+import { transformTwoDimensionalGroupByToLineChartData } from '@/page-layout/widgets/graph/utils/transformTwoDimensionalGroupByToLineChartData';
 
 describe('transformTwoDimensionalGroupByToLineChartData', () => {
   const userTimezone = 'Europe/Paris';
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/graph/utils/createGraphColorRegistry.ts b/packages/twenty-front/src/modules/page-layout/widgets/graph/utils/createGraphColorRegistry.ts
index 82a8997c1c..dd65abb669 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/graph/utils/createGraphColorRegistry.ts
+++ b/packages/twenty-front/src/modules/page-layout/widgets/graph/utils/createGraphColorRegistry.ts
@@ -1,6 +1,6 @@
 import { type ThemeType } from 'twenty-ui/theme';
 
-import { type GraphColorRegistry } from '../types/GraphColorRegistry';
+import { type GraphColorRegistry } from '@/page-layout/widgets/graph/types/GraphColorRegistry';
 
 export const createGraphColorRegistry = (
   theme: ThemeType,
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/graph/utils/getColorScheme.ts b/packages/twenty-front/src/modules/page-layout/widgets/graph/utils/getColorScheme.ts
index 00e7e03efc..68884084b9 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/graph/utils/getColorScheme.ts
+++ b/packages/twenty-front/src/modules/page-layout/widgets/graph/utils/getColorScheme.ts
@@ -1,9 +1,9 @@
 import { generateGroupColor } from '@/page-layout/widgets/graph/utils/generateGroupColor';
 import { getColorSchemeByIndex } from '@/page-layout/widgets/graph/utils/getColorSchemeByIndex';
 import { isDefined } from 'twenty-shared/utils';
-import { type GraphColor } from '../types/GraphColor';
-import { type GraphColorRegistry } from '../types/GraphColorRegistry';
-import { type GraphColorScheme } from '../types/GraphColorScheme';
+import { type GraphColor } from '@/page-layout/widgets/graph/types/GraphColor';
+import { type GraphColorRegistry } from '@/page-layout/widgets/graph/types/GraphColorRegistry';
+import { type GraphColorScheme } from '@/page-layout/widgets/graph/types/GraphColorScheme';
 
 export const getColorScheme = ({
   registry,
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/graph/utils/getColorSchemeByIndex.ts b/packages/twenty-front/src/modules/page-layout/widgets/graph/utils/getColorSchemeByIndex.ts
index 378aa27458..eface2069e 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/graph/utils/getColorSchemeByIndex.ts
+++ b/packages/twenty-front/src/modules/page-layout/widgets/graph/utils/getColorSchemeByIndex.ts
@@ -1,5 +1,5 @@
-import { type GraphColorRegistry } from '../types/GraphColorRegistry';
-import { type GraphColorScheme } from '../types/GraphColorScheme';
+import { type GraphColorRegistry } from '@/page-layout/widgets/graph/types/GraphColorRegistry';
+import { type GraphColorScheme } from '@/page-layout/widgets/graph/types/GraphColorScheme';
 
 export const getColorSchemeByIndex = (
   registry: GraphColorRegistry,
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/graph/utils/getColorSchemeByName.ts b/packages/twenty-front/src/modules/page-layout/widgets/graph/utils/getColorSchemeByName.ts
index aed17adf46..cf8532d87f 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/graph/utils/getColorSchemeByName.ts
+++ b/packages/twenty-front/src/modules/page-layout/widgets/graph/utils/getColorSchemeByName.ts
@@ -1,5 +1,5 @@
-import { type GraphColorRegistry } from '../types/GraphColorRegistry';
-import { type GraphColorScheme } from '../types/GraphColorScheme';
+import { type GraphColorRegistry } from '@/page-layout/widgets/graph/types/GraphColorRegistry';
+import { type GraphColorScheme } from '@/page-layout/widgets/graph/types/GraphColorScheme';
 
 export const getColorSchemeByName = (
   registry: GraphColorRegistry,
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/hooks/useCurrentWidget.ts b/packages/twenty-front/src/modules/page-layout/widgets/hooks/useCurrentWidget.ts
index cbc5125ab6..cf1911189a 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/hooks/useCurrentWidget.ts
+++ b/packages/twenty-front/src/modules/page-layout/widgets/hooks/useCurrentWidget.ts
@@ -2,7 +2,7 @@ import { useCurrentPageLayout } from '@/page-layout/hooks/useCurrentPageLayout';
 import { type PageLayoutWidget } from '@/page-layout/types/PageLayoutWidget';
 import { useComponentInstanceStateContext } from '@/ui/utilities/state/component-state/hooks/useComponentInstanceStateContext';
 import { assertIsDefinedOrThrow } from 'twenty-shared/utils';
-import { WidgetComponentInstanceContext } from '../states/contexts/WidgetComponentInstanceContext';
+import { WidgetComponentInstanceContext } from '@/page-layout/widgets/states/contexts/WidgetComponentInstanceContext';
 
 export const useCurrentWidget = (): PageLayoutWidget => {
   const widgetComponentInstanceId = useComponentInstanceStateContext(
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/standalone-rich-text/utils/__tests__/extractColorFromProps.test.ts b/packages/twenty-front/src/modules/page-layout/widgets/standalone-rich-text/utils/__tests__/extractColorFromProps.test.ts
index 79928866e7..63f4545ed7 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/standalone-rich-text/utils/__tests__/extractColorFromProps.test.ts
+++ b/packages/twenty-front/src/modules/page-layout/widgets/standalone-rich-text/utils/__tests__/extractColorFromProps.test.ts
@@ -1,4 +1,4 @@
-import { extractColorFromProps } from '../extractColorFromProps';
+import { extractColorFromProps } from '@/page-layout/widgets/standalone-rich-text/utils/extractColorFromProps';
 
 describe('extractColorFromProps', () => {
   describe('text color extraction', () => {
diff --git a/packages/twenty-front/src/modules/prefetch/graphql/operation-signatures/factories/findAllFavoritesFolderOperationSignatureFactory.ts b/packages/twenty-front/src/modules/prefetch/graphql/operation-signatures/factories/findAllFavoritesFolderOperationSignatureFactory.ts
index 358741bad2..fcc2f276db 100644
--- a/packages/twenty-front/src/modules/prefetch/graphql/operation-signatures/factories/findAllFavoritesFolderOperationSignatureFactory.ts
+++ b/packages/twenty-front/src/modules/prefetch/graphql/operation-signatures/factories/findAllFavoritesFolderOperationSignatureFactory.ts
@@ -1,17 +1,18 @@
 import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
 import { type RecordGqlOperationSignatureFactory } from '@/object-record/graphql/types/RecordGqlOperationSignatureFactory';
 
-export const findAllFavoritesFolderOperationSignatureFactory: RecordGqlOperationSignatureFactory<{}> =
-  () => ({
-    objectNameSingular: CoreObjectNameSingular.FavoriteFolder,
-    variables: {},
-    fields: {
-      id: true,
-      position: true,
-      createdAt: true,
-      updatedAt: true,
-      deletedAt: true,
-      name: true,
-      icon: true,
-    },
-  });
+export const findAllFavoritesFolderOperationSignatureFactory: RecordGqlOperationSignatureFactory<
+  object
+> = () => ({
+  objectNameSingular: CoreObjectNameSingular.FavoriteFolder,
+  variables: {},
+  fields: {
+    id: true,
+    position: true,
+    createdAt: true,
+    updatedAt: true,
+    deletedAt: true,
+    name: true,
+    icon: true,
+  },
+});
diff --git a/packages/twenty-front/src/modules/serverless-functions/utils/__tests__/mergeDefaultFunctionInputAndFunctionInput.test.ts b/packages/twenty-front/src/modules/serverless-functions/utils/__tests__/mergeDefaultFunctionInputAndFunctionInput.test.ts
index 897e71621b..4b94b58821 100644
--- a/packages/twenty-front/src/modules/serverless-functions/utils/__tests__/mergeDefaultFunctionInputAndFunctionInput.test.ts
+++ b/packages/twenty-front/src/modules/serverless-functions/utils/__tests__/mergeDefaultFunctionInputAndFunctionInput.test.ts
@@ -1,4 +1,4 @@
-import { mergeDefaultFunctionInputAndFunctionInput } from '../mergeDefaultFunctionInputAndFunctionInput';
+import { mergeDefaultFunctionInputAndFunctionInput } from '@/serverless-functions/utils/mergeDefaultFunctionInputAndFunctionInput';
 
 describe('mergeDefaultFunctionInputAndFunctionInput', () => {
   it('should merge properly', () => {
diff --git a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsEditImapSmtpCaldavConnection.tsx b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsEditImapSmtpCaldavConnection.tsx
index ff76c533ad..2e0712a888 100644
--- a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsEditImapSmtpCaldavConnection.tsx
+++ b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsEditImapSmtpCaldavConnection.tsx
@@ -14,7 +14,7 @@ import { getSettingsPath } from 'twenty-shared/utils';
 import { useNavigateSettings } from '~/hooks/useNavigateSettings';
 
 import { NotFound } from '~/pages/not-found/NotFound';
-import { useImapSmtpCaldavConnectionForm } from '../hooks/useImapSmtpCaldavConnectionForm';
+import { useImapSmtpCaldavConnectionForm } from '@/settings/accounts/hooks/useImapSmtpCaldavConnectionForm';
 import { SettingsAccountsConnectionForm } from './SettingsAccountsConnectionForm';
 
 const StyledLoadingContainer = styled.div`
diff --git a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsNewImapSmtpCaldavConnection.tsx b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsNewImapSmtpCaldavConnection.tsx
index 8ebd40db18..5cbc4d87c1 100644
--- a/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsNewImapSmtpCaldavConnection.tsx
+++ b/packages/twenty-front/src/modules/settings/accounts/components/SettingsAccountsNewImapSmtpCaldavConnection.tsx
@@ -10,7 +10,7 @@ import { getSettingsPath } from 'twenty-shared/utils';
 import { useNavigateSettings } from '~/hooks/useNavigateSettings';
 
 import { SettingsAccountsConnectionForm } from '@/settings/accounts/components/SettingsAccountsConnectionForm';
-import { useImapSmtpCaldavConnectionForm } from '../hooks/useImapSmtpCaldavConnectionForm';
+import { useImapSmtpCaldavConnectionForm } from '@/settings/accounts/hooks/useImapSmtpCaldavConnectionForm';
 
 export const SettingsAccountsNewImapSmtpCaldavConnection = () => {
   const { t } = useLingui();
diff --git a/packages/twenty-front/src/modules/settings/accounts/hooks/__tests__/useTriggerProviderReconnect.test.tsx b/packages/twenty-front/src/modules/settings/accounts/hooks/__tests__/useTriggerProviderReconnect.test.tsx
index f331b82235..43079c49c7 100644
--- a/packages/twenty-front/src/modules/settings/accounts/hooks/__tests__/useTriggerProviderReconnect.test.tsx
+++ b/packages/twenty-front/src/modules/settings/accounts/hooks/__tests__/useTriggerProviderReconnect.test.tsx
@@ -7,7 +7,7 @@ import {
   CalendarChannelVisibility,
   MessageChannelVisibility,
 } from '~/generated-metadata/graphql';
-import { useTriggerProviderReconnect } from '../useTriggerProviderReconnect';
+import { useTriggerProviderReconnect } from '@/settings/accounts/hooks/useTriggerProviderReconnect';
 
 const mockTriggerApisOAuth = jest.fn();
 const mockNavigate = jest.fn();
diff --git a/packages/twenty-front/src/modules/settings/accounts/utils/__tests__/computeSyncStatus.test.ts b/packages/twenty-front/src/modules/settings/accounts/utils/__tests__/computeSyncStatus.test.ts
index 06e14e77b2..845bddacc5 100644
--- a/packages/twenty-front/src/modules/settings/accounts/utils/__tests__/computeSyncStatus.test.ts
+++ b/packages/twenty-front/src/modules/settings/accounts/utils/__tests__/computeSyncStatus.test.ts
@@ -1,7 +1,7 @@
 import { CalendarChannelSyncStatus } from '@/accounts/types/CalendarChannel';
 import { MessageChannelSyncStatus } from '@/accounts/types/MessageChannel';
 import { SyncStatus } from '@/settings/accounts/constants/SyncStatus';
-import { computeSyncStatus } from '../computeSyncStatus';
+import { computeSyncStatus } from '@/settings/accounts/utils/computeSyncStatus';
 
 describe('computeSyncStatus', () => {
   test('should return FAILED when both sync statuses are FAILED', () => {
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/config-variables/components/ConfigVariableDatabaseInput.tsx b/packages/twenty-front/src/modules/settings/admin-panel/config-variables/components/ConfigVariableDatabaseInput.tsx
index ed0873dd3d..3d67839ecb 100644
--- a/packages/twenty-front/src/modules/settings/admin-panel/config-variables/components/ConfigVariableDatabaseInput.tsx
+++ b/packages/twenty-front/src/modules/settings/admin-panel/config-variables/components/ConfigVariableDatabaseInput.tsx
@@ -10,7 +10,7 @@ import { type ConfigVariableValue } from 'twenty-shared/types';
 import { CustomError } from 'twenty-shared/utils';
 import { MenuItemMultiSelect } from 'twenty-ui/navigation';
 import { ConfigVariableType } from '~/generated/graphql';
-import { type ConfigVariableOptions } from '../types/ConfigVariableOptions';
+import { type ConfigVariableOptions } from '@/settings/admin-panel/config-variables/types/ConfigVariableOptions';
 
 type ConfigVariableDatabaseInputProps = {
   label: string;
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/health-status/components/SettingsAdminWorkerHealthStatus.tsx b/packages/twenty-front/src/modules/settings/admin-panel/health-status/components/SettingsAdminWorkerHealthStatus.tsx
index 677caa0fd1..18eb92c114 100644
--- a/packages/twenty-front/src/modules/settings/admin-panel/health-status/components/SettingsAdminWorkerHealthStatus.tsx
+++ b/packages/twenty-front/src/modules/settings/admin-panel/health-status/components/SettingsAdminWorkerHealthStatus.tsx
@@ -3,7 +3,7 @@ import styled from '@emotion/styled';
 import { t } from '@lingui/core/macro';
 import { useContext } from 'react';
 import { AdminPanelHealthServiceStatus } from '~/generated-metadata/graphql';
-import { SettingsAdminIndicatorHealthContext } from '../contexts/SettingsAdminIndicatorHealthContext';
+import { SettingsAdminIndicatorHealthContext } from '@/settings/admin-panel/health-status/contexts/SettingsAdminIndicatorHealthContext';
 
 const StyledErrorMessage = styled.div`
   color: ${({ theme }) => theme.color.red};
diff --git a/packages/twenty-front/src/modules/settings/components/SettingsNavigationDrawerItem.tsx b/packages/twenty-front/src/modules/settings/components/SettingsNavigationDrawerItem.tsx
index a21cfebfdd..f5bf9d2173 100644
--- a/packages/twenty-front/src/modules/settings/components/SettingsNavigationDrawerItem.tsx
+++ b/packages/twenty-front/src/modules/settings/components/SettingsNavigationDrawerItem.tsx
@@ -37,7 +37,7 @@ export const SettingsNavigationDrawerItem = ({
           indentationLevel={item.indentationLevel}
           subItemState={subItemState}
           label={item.label}
-          to={href || undefined}
+          to={href}
           Icon={item.Icon}
           active={isActive}
           soon={item.soon}
diff --git a/packages/twenty-front/src/modules/settings/components/__stories__/CancelButton.stories.tsx b/packages/twenty-front/src/modules/settings/components/__stories__/CancelButton.stories.tsx
index 4a301cbf12..dca6d99d9c 100644
--- a/packages/twenty-front/src/modules/settings/components/__stories__/CancelButton.stories.tsx
+++ b/packages/twenty-front/src/modules/settings/components/__stories__/CancelButton.stories.tsx
@@ -1,7 +1,7 @@
 import { type Meta, type StoryObj } from '@storybook/react';
 
 import { I18nFrontDecorator } from '~/testing/decorators/I18nFrontDecorator';
-import { CancelButton } from '../SaveAndCancelButtons/CancelButton';
+import { CancelButton } from '@/settings/components/SaveAndCancelButtons/CancelButton';
 
 const meta: Meta<typeof CancelButton> = {
   title: 'Modules/Settings/CancelButton',
diff --git a/packages/twenty-front/src/modules/settings/components/__stories__/SaveButton.stories.tsx b/packages/twenty-front/src/modules/settings/components/__stories__/SaveButton.stories.tsx
index eb0f1e7ef0..2e2dcddb42 100644
--- a/packages/twenty-front/src/modules/settings/components/__stories__/SaveButton.stories.tsx
+++ b/packages/twenty-front/src/modules/settings/components/__stories__/SaveButton.stories.tsx
@@ -1,6 +1,6 @@
 import { type Meta, type StoryObj } from '@storybook/react';
 
-import { SaveButton } from '../SaveAndCancelButtons/SaveButton';
+import { SaveButton } from '@/settings/components/SaveAndCancelButtons/SaveButton';
 
 const meta: Meta<typeof SaveButton> = {
   title: 'Modules/Settings/SaveButton',
diff --git a/packages/twenty-front/src/modules/settings/data-model/constants/RelationTypes.ts b/packages/twenty-front/src/modules/settings/data-model/constants/RelationTypes.ts
index 6fcf382705..9fab47586d 100644
--- a/packages/twenty-front/src/modules/settings/data-model/constants/RelationTypes.ts
+++ b/packages/twenty-front/src/modules/settings/data-model/constants/RelationTypes.ts
@@ -3,7 +3,7 @@ import {
   IllustrationIconOneToMany,
 } from 'twenty-ui/display';
 import { RelationType } from '~/generated-metadata/graphql';
-import OneToManySvg from '../assets/OneToMany.svg';
+import OneToManySvg from '@/settings/data-model/assets/OneToMany.svg';
 
 export const RELATION_TYPES: Record<
   RelationType,
diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/forms/address/hooks/__tests__/useAddressSettingsFormInitialValues.test.tsx b/packages/twenty-front/src/modules/settings/data-model/fields/forms/address/hooks/__tests__/useAddressSettingsFormInitialValues.test.tsx
index 600478be8a..2292e36e13 100644
--- a/packages/twenty-front/src/modules/settings/data-model/fields/forms/address/hooks/__tests__/useAddressSettingsFormInitialValues.test.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/fields/forms/address/hooks/__tests__/useAddressSettingsFormInitialValues.test.tsx
@@ -4,7 +4,7 @@ import { useFormContext } from 'react-hook-form';
 import { FieldMetadataType } from 'twenty-shared/types';
 import { getJestMetadataAndApolloMocksWrapper } from '~/testing/jest/getJestMetadataAndApolloMocksWrapper';
 import { generatedMockObjectMetadataItems } from '~/testing/utils/generatedMockObjectMetadataItems';
-import { useAddressSettingsFormInitialValues } from '../useAddressSettingsFormInitialValues';
+import { useAddressSettingsFormInitialValues } from '@/settings/data-model/fields/forms/address/hooks/useAddressSettingsFormInitialValues';
 
 jest.mock('react-hook-form', () => ({
   useFormContext: jest.fn(),
diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/__stories__/SettingsDataModelFieldDescriptionForm.stories.tsx b/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/__stories__/SettingsDataModelFieldDescriptionForm.stories.tsx
index 87cf6fa81a..e5746e0046 100644
--- a/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/__stories__/SettingsDataModelFieldDescriptionForm.stories.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/__stories__/SettingsDataModelFieldDescriptionForm.stories.tsx
@@ -4,7 +4,7 @@ import { FormProviderDecorator } from '~/testing/decorators/FormProviderDecorato
 
 import { ComponentDecorator } from 'twenty-ui/testing';
 import { generatedMockObjectMetadataItems } from '~/testing/utils/generatedMockObjectMetadataItems';
-import { SettingsDataModelFieldDescriptionForm } from '../SettingsDataModelFieldDescriptionForm';
+import { SettingsDataModelFieldDescriptionForm } from '@/settings/data-model/fields/forms/components/SettingsDataModelFieldDescriptionForm';
 
 const meta: Meta<typeof SettingsDataModelFieldDescriptionForm> = {
   title: 'Modules/Settings/DataModel/SettingsDataModelFieldDescriptionForm',
diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/__stories__/SettingsDataModelFieldIconLabelForm.stories.tsx b/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/__stories__/SettingsDataModelFieldIconLabelForm.stories.tsx
index a830924ba3..6770d89c98 100644
--- a/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/__stories__/SettingsDataModelFieldIconLabelForm.stories.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/__stories__/SettingsDataModelFieldIconLabelForm.stories.tsx
@@ -7,7 +7,7 @@ import { IconsProviderDecorator } from '~/testing/decorators/IconsProviderDecora
 import { ComponentDecorator } from 'twenty-ui/testing';
 import { I18nFrontDecorator } from '~/testing/decorators/I18nFrontDecorator';
 import { generatedMockObjectMetadataItems } from '~/testing/utils/generatedMockObjectMetadataItems';
-import { SettingsDataModelFieldIconLabelForm } from '../SettingsDataModelFieldIconLabelForm';
+import { SettingsDataModelFieldIconLabelForm } from '@/settings/data-model/fields/forms/components/SettingsDataModelFieldIconLabelForm';
 
 const StyledContainer = styled.div`
   flex: 1;
diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/__stories__/SettingsDataModelFieldSettingsFormCard.stories.tsx b/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/__stories__/SettingsDataModelFieldSettingsFormCard.stories.tsx
index cbac1d9b4c..35229139c0 100644
--- a/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/__stories__/SettingsDataModelFieldSettingsFormCard.stories.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/__stories__/SettingsDataModelFieldSettingsFormCard.stories.tsx
@@ -10,7 +10,7 @@ import { graphqlMocks } from '~/testing/graphqlMocks';
 import { ComponentDecorator } from 'twenty-ui/testing';
 import { I18nFrontDecorator } from '~/testing/decorators/I18nFrontDecorator';
 import { generatedMockObjectMetadataItems } from '~/testing/utils/generatedMockObjectMetadataItems';
-import { SettingsDataModelFieldSettingsFormCard } from '../SettingsDataModelFieldSettingsFormCard';
+import { SettingsDataModelFieldSettingsFormCard } from '@/settings/data-model/fields/forms/components/SettingsDataModelFieldSettingsFormCard';
 
 const mockedCompanyObjectMetadataItem = generatedMockObjectMetadataItems.find(
   (item) => item.nameSingular === 'company',
diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/forms/select/utils/__tests__/generateNewSelectOptionLabel.test.ts b/packages/twenty-front/src/modules/settings/data-model/fields/forms/select/utils/__tests__/generateNewSelectOptionLabel.test.ts
index 5c67f655a4..cbfe214412 100644
--- a/packages/twenty-front/src/modules/settings/data-model/fields/forms/select/utils/__tests__/generateNewSelectOptionLabel.test.ts
+++ b/packages/twenty-front/src/modules/settings/data-model/fields/forms/select/utils/__tests__/generateNewSelectOptionLabel.test.ts
@@ -1,4 +1,4 @@
-import { generateNewSelectOptionLabel } from '../generateNewSelectOptionLabel';
+import { generateNewSelectOptionLabel } from '@/settings/data-model/fields/forms/select/utils/generateNewSelectOptionLabel';
 
 describe('generateNewSelectOptionLabel', () => {
   it('generates a new select option label', () => {
diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/preview/components/__stories__/SettingsDataModelFieldPreviewWidget.stories.tsx b/packages/twenty-front/src/modules/settings/data-model/fields/preview/components/__stories__/SettingsDataModelFieldPreviewWidget.stories.tsx
index a363fe51b1..f82a3de7d7 100644
--- a/packages/twenty-front/src/modules/settings/data-model/fields/preview/components/__stories__/SettingsDataModelFieldPreviewWidget.stories.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/fields/preview/components/__stories__/SettingsDataModelFieldPreviewWidget.stories.tsx
@@ -10,7 +10,7 @@ import { ObjectMetadataItemsDecorator } from '~/testing/decorators/ObjectMetadat
 import { SnackBarDecorator } from '~/testing/decorators/SnackBarDecorator';
 import { getMockFieldMetadataItemOrThrow } from '~/testing/utils/getMockFieldMetadataItemOrThrow';
 import { getMockObjectMetadataItemOrThrow } from '~/testing/utils/getMockObjectMetadataItemOrThrow';
-import { SettingsDataModelFieldPreviewWidget } from '../SettingsDataModelFieldPreviewWidget';
+import { SettingsDataModelFieldPreviewWidget } from '@/settings/data-model/fields/preview/components/SettingsDataModelFieldPreviewWidget';
 
 const mockedCompanyObjectMetadataItem =
   getMockObjectMetadataItemOrThrow('company');
diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/preview/hooks/__tests__/useFieldPreviewValue.test.tsx b/packages/twenty-front/src/modules/settings/data-model/fields/preview/hooks/__tests__/useFieldPreviewValue.test.tsx
index 806ff4db77..8e859a8fb4 100644
--- a/packages/twenty-front/src/modules/settings/data-model/fields/preview/hooks/__tests__/useFieldPreviewValue.test.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/fields/preview/hooks/__tests__/useFieldPreviewValue.test.tsx
@@ -5,7 +5,7 @@ import { FieldMetadataType } from '~/generated-metadata/graphql';
 
 import { getJestMetadataAndApolloMocksWrapper } from '~/testing/jest/getJestMetadataAndApolloMocksWrapper';
 import { generatedMockObjectMetadataItems } from '~/testing/utils/generatedMockObjectMetadataItems';
-import { useFieldPreviewValue } from '../useFieldPreviewValue';
+import { useFieldPreviewValue } from '@/settings/data-model/fields/preview/hooks/useFieldPreviewValue';
 
 const mockedCompanyObjectMetadataItem = generatedMockObjectMetadataItems.find(
   (item) => item.nameSingular === 'company',
diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/preview/utils/__tests__/getCurrencyFieldPreviewValue.test.ts b/packages/twenty-front/src/modules/settings/data-model/fields/preview/utils/__tests__/getCurrencyFieldPreviewValue.test.ts
index dc91d9087e..23f400e3d1 100644
--- a/packages/twenty-front/src/modules/settings/data-model/fields/preview/utils/__tests__/getCurrencyFieldPreviewValue.test.ts
+++ b/packages/twenty-front/src/modules/settings/data-model/fields/preview/utils/__tests__/getCurrencyFieldPreviewValue.test.ts
@@ -1,7 +1,7 @@
 import { FieldMetadataType } from '~/generated-metadata/graphql';
 
 import { generatedMockObjectMetadataItems } from '~/testing/utils/generatedMockObjectMetadataItems';
-import { getCurrencyFieldPreviewValue } from '../getCurrencyFieldPreviewValue';
+import { getCurrencyFieldPreviewValue } from '@/settings/data-model/fields/preview/utils/getCurrencyFieldPreviewValue';
 import { CurrencyCode } from 'twenty-shared/constants';
 
 const mockedCompanyObjectMetadataItem = generatedMockObjectMetadataItems.find(
diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/preview/utils/__tests__/getMultiSelectFieldPreviewValue.test.ts b/packages/twenty-front/src/modules/settings/data-model/fields/preview/utils/__tests__/getMultiSelectFieldPreviewValue.test.ts
index f20e711cbb..2ca872d20b 100644
--- a/packages/twenty-front/src/modules/settings/data-model/fields/preview/utils/__tests__/getMultiSelectFieldPreviewValue.test.ts
+++ b/packages/twenty-front/src/modules/settings/data-model/fields/preview/utils/__tests__/getMultiSelectFieldPreviewValue.test.ts
@@ -1,6 +1,6 @@
 import { FieldMetadataType } from '~/generated-metadata/graphql';
 import { generatedMockObjectMetadataItems } from '~/testing/utils/generatedMockObjectMetadataItems';
-import { getMultiSelectFieldPreviewValue } from '../getMultiSelectFieldPreviewValue';
+import { getMultiSelectFieldPreviewValue } from '@/settings/data-model/fields/preview/utils/getMultiSelectFieldPreviewValue';
 
 const mockedCompanyObjectMetadataItem = generatedMockObjectMetadataItems.find(
   (item) => item.nameSingular === 'company',
diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/preview/utils/__tests__/getSelectFieldPreviewValue.test.ts b/packages/twenty-front/src/modules/settings/data-model/fields/preview/utils/__tests__/getSelectFieldPreviewValue.test.ts
index 1888811fa2..048d8d8e05 100644
--- a/packages/twenty-front/src/modules/settings/data-model/fields/preview/utils/__tests__/getSelectFieldPreviewValue.test.ts
+++ b/packages/twenty-front/src/modules/settings/data-model/fields/preview/utils/__tests__/getSelectFieldPreviewValue.test.ts
@@ -1,7 +1,7 @@
 import { FieldMetadataType } from '~/generated-metadata/graphql';
 
 import { generatedMockObjectMetadataItems } from '~/testing/utils/generatedMockObjectMetadataItems';
-import { getSelectFieldPreviewValue } from '../getSelectFieldPreviewValue';
+import { getSelectFieldPreviewValue } from '@/settings/data-model/fields/preview/utils/getSelectFieldPreviewValue';
 
 const mockedCompanyObjectMetadataItem = generatedMockObjectMetadataItems.find(
   (item) => item.nameSingular === 'company',
diff --git a/packages/twenty-front/src/modules/settings/data-model/graph-overview/utils/__tests__/calculateHandlePosition.test.ts b/packages/twenty-front/src/modules/settings/data-model/graph-overview/utils/__tests__/calculateHandlePosition.test.ts
index 0c278ee95e..69713cf408 100644
--- a/packages/twenty-front/src/modules/settings/data-model/graph-overview/utils/__tests__/calculateHandlePosition.test.ts
+++ b/packages/twenty-front/src/modules/settings/data-model/graph-overview/utils/__tests__/calculateHandlePosition.test.ts
@@ -1,4 +1,4 @@
-import { calculateHandlePosition } from '../calculateHandlePosition';
+import { calculateHandlePosition } from '@/settings/data-model/graph-overview/utils/calculateHandlePosition';
 describe('calculatePosition', () => {
   test('should calculate source handle', () => {
     // Source node right from start of target node
diff --git a/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectFieldItemTableRow.tsx b/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectFieldItemTableRow.tsx
index 133dd6e0a2..91f3435a4f 100644
--- a/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectFieldItemTableRow.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/object-details/components/SettingsObjectFieldItemTableRow.tsx
@@ -28,7 +28,7 @@ import { useNavigateSettings } from '~/hooks/useNavigateSettings';
 import { type SettingsObjectDetailTableItem } from '~/pages/settings/data-model/types/SettingsObjectDetailTableItem';
 
 import { isObjectMetadataSettingsReadOnly } from '@/object-record/read-only/utils/isObjectMetadataSettingsReadOnly';
-import { RELATION_TYPES } from '../../constants/RelationTypes';
+import { RELATION_TYPES } from '@/settings/data-model/constants/RelationTypes';
 import { SettingsObjectFieldDataType } from './SettingsObjectFieldDataType';
 
 type SettingsObjectFieldItemTableRowProps = {
diff --git a/packages/twenty-front/src/modules/settings/data-model/objects/components/SettingsObjectCoverImage.tsx b/packages/twenty-front/src/modules/settings/data-model/objects/components/SettingsObjectCoverImage.tsx
index a2891d4566..8241d3c4da 100644
--- a/packages/twenty-front/src/modules/settings/data-model/objects/components/SettingsObjectCoverImage.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/objects/components/SettingsObjectCoverImage.tsx
@@ -7,8 +7,8 @@ import { IconEye } from 'twenty-ui/display';
 import { FloatingButton } from 'twenty-ui/input';
 import { Card } from 'twenty-ui/layout';
 
-import DarkCoverImage from '../../assets/cover-dark.png';
-import LightCoverImage from '../../assets/cover-light.png';
+import DarkCoverImage from '@/settings/data-model/assets/cover-dark.png';
+import LightCoverImage from '@/settings/data-model/assets/cover-light.png';
 
 const StyledCoverImageContainer = styled(Card)`
   align-items: center;
diff --git a/packages/twenty-front/src/modules/settings/data-model/objects/components/__stories__/SettingsObjectInactiveMenuDropDown.stories.tsx b/packages/twenty-front/src/modules/settings/data-model/objects/components/__stories__/SettingsObjectInactiveMenuDropDown.stories.tsx
index dfcd98fd88..0fe3131f76 100644
--- a/packages/twenty-front/src/modules/settings/data-model/objects/components/__stories__/SettingsObjectInactiveMenuDropDown.stories.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/objects/components/__stories__/SettingsObjectInactiveMenuDropDown.stories.tsx
@@ -3,7 +3,7 @@ import { expect, fn, userEvent, within } from '@storybook/test';
 
 import { ComponentDecorator } from 'twenty-ui/testing';
 import { I18nFrontDecorator } from '~/testing/decorators/I18nFrontDecorator';
-import { SettingsObjectInactiveMenuDropDown } from '../SettingsObjectInactiveMenuDropDown';
+import { SettingsObjectInactiveMenuDropDown } from '@/settings/data-model/objects/components/SettingsObjectInactiveMenuDropDown';
 
 const handleActivateMockFunction = fn();
 const handleDeleteMockFunction = fn();
diff --git a/packages/twenty-front/src/modules/settings/data-model/objects/forms/components/__stories__/SettingsDataModelObjectAboutForm.stories.tsx b/packages/twenty-front/src/modules/settings/data-model/objects/forms/components/__stories__/SettingsDataModelObjectAboutForm.stories.tsx
index a371d5b71c..fee318d34b 100644
--- a/packages/twenty-front/src/modules/settings/data-model/objects/forms/components/__stories__/SettingsDataModelObjectAboutForm.stories.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/objects/forms/components/__stories__/SettingsDataModelObjectAboutForm.stories.tsx
@@ -7,7 +7,7 @@ import { MemoryRouterDecorator } from '~/testing/decorators/MemoryRouterDecorato
 import { ComponentDecorator } from 'twenty-ui/testing';
 import { I18nFrontDecorator } from '~/testing/decorators/I18nFrontDecorator';
 import { generatedMockObjectMetadataItems } from '~/testing/utils/generatedMockObjectMetadataItems';
-import { SettingsDataModelObjectAboutForm } from '../SettingsDataModelObjectAboutForm';
+import { SettingsDataModelObjectAboutForm } from '@/settings/data-model/objects/forms/components/SettingsDataModelObjectAboutForm';
 
 const mockedCompanyObjectMetadataItem = generatedMockObjectMetadataItems.find(
   (item) => item.nameSingular === 'company',
diff --git a/packages/twenty-front/src/modules/settings/data-model/utils/__tests__/getFieldPreviewValueFromRecord.test.ts b/packages/twenty-front/src/modules/settings/data-model/utils/__tests__/getFieldPreviewValueFromRecord.test.ts
index 387c46b533..245876de4c 100644
--- a/packages/twenty-front/src/modules/settings/data-model/utils/__tests__/getFieldPreviewValueFromRecord.test.ts
+++ b/packages/twenty-front/src/modules/settings/data-model/utils/__tests__/getFieldPreviewValueFromRecord.test.ts
@@ -1,7 +1,7 @@
 import { type ObjectRecord } from '@/object-record/types/ObjectRecord';
 
 import { generatedMockObjectMetadataItems } from '~/testing/utils/generatedMockObjectMetadataItems';
-import { getFieldPreviewValueFromRecord } from '../getFieldPreviewValueFromRecord';
+import { getFieldPreviewValueFromRecord } from '@/settings/data-model/utils/getFieldPreviewValueFromRecord';
 const mockedCompanyObjectMetadataItem = generatedMockObjectMetadataItems.find(
   (item) => item.nameSingular === 'company',
 );
diff --git a/packages/twenty-front/src/modules/settings/data-model/utils/__tests__/isSelectOptionDefaultValue.test.ts b/packages/twenty-front/src/modules/settings/data-model/utils/__tests__/isSelectOptionDefaultValue.test.ts
index c69c7fd442..e8eea7bbb6 100644
--- a/packages/twenty-front/src/modules/settings/data-model/utils/__tests__/isSelectOptionDefaultValue.test.ts
+++ b/packages/twenty-front/src/modules/settings/data-model/utils/__tests__/isSelectOptionDefaultValue.test.ts
@@ -1,6 +1,6 @@
 import { FieldMetadataType } from '~/generated-metadata/graphql';
 
-import { isSelectOptionDefaultValue } from '../isSelectOptionDefaultValue';
+import { isSelectOptionDefaultValue } from '@/settings/data-model/utils/isSelectOptionDefaultValue';
 
 describe('isSelectOptionDefaultValue', () => {
   describe('SELECT field', () => {
diff --git a/packages/twenty-front/src/modules/settings/developers/graphql/mutations/createApiKey.ts b/packages/twenty-front/src/modules/settings/developers/graphql/mutations/createApiKey.ts
index 8055029050..1d67c3a86b 100644
--- a/packages/twenty-front/src/modules/settings/developers/graphql/mutations/createApiKey.ts
+++ b/packages/twenty-front/src/modules/settings/developers/graphql/mutations/createApiKey.ts
@@ -1,5 +1,5 @@
 import gql from 'graphql-tag';
-import { API_KEY_FRAGMENT } from '../fragments/apiKeyFragment';
+import { API_KEY_FRAGMENT } from '@/settings/developers/graphql/fragments/apiKeyFragment';
 
 export const CREATE_API_KEY = gql`
   mutation CreateApiKey($input: CreateApiKeyInput!) {
diff --git a/packages/twenty-front/src/modules/settings/developers/graphql/mutations/createWebhook.ts b/packages/twenty-front/src/modules/settings/developers/graphql/mutations/createWebhook.ts
index 0783fad16f..c005c6dc7d 100644
--- a/packages/twenty-front/src/modules/settings/developers/graphql/mutations/createWebhook.ts
+++ b/packages/twenty-front/src/modules/settings/developers/graphql/mutations/createWebhook.ts
@@ -1,5 +1,5 @@
 import gql from 'graphql-tag';
-import { WEBHOOK_FRAGMENT } from '../fragments/webhookFragment';
+import { WEBHOOK_FRAGMENT } from '@/settings/developers/graphql/fragments/webhookFragment';
 
 export const CREATE_WEBHOOK = gql`
   mutation CreateWebhook($input: CreateWebhookInput!) {
diff --git a/packages/twenty-front/src/modules/settings/developers/graphql/mutations/updateApiKey.ts b/packages/twenty-front/src/modules/settings/developers/graphql/mutations/updateApiKey.ts
index e9a20efe35..fba7a9d6c0 100644
--- a/packages/twenty-front/src/modules/settings/developers/graphql/mutations/updateApiKey.ts
+++ b/packages/twenty-front/src/modules/settings/developers/graphql/mutations/updateApiKey.ts
@@ -1,5 +1,5 @@
 import gql from 'graphql-tag';
-import { API_KEY_FRAGMENT } from '../fragments/apiKeyFragment';
+import { API_KEY_FRAGMENT } from '@/settings/developers/graphql/fragments/apiKeyFragment';
 
 export const UPDATE_API_KEY = gql`
   mutation UpdateApiKey($input: UpdateApiKeyInput!) {
diff --git a/packages/twenty-front/src/modules/settings/developers/graphql/mutations/updateWebhook.ts b/packages/twenty-front/src/modules/settings/developers/graphql/mutations/updateWebhook.ts
index 5beb68f5e2..5b77fc5968 100644
--- a/packages/twenty-front/src/modules/settings/developers/graphql/mutations/updateWebhook.ts
+++ b/packages/twenty-front/src/modules/settings/developers/graphql/mutations/updateWebhook.ts
@@ -1,5 +1,5 @@
 import gql from 'graphql-tag';
-import { WEBHOOK_FRAGMENT } from '../fragments/webhookFragment';
+import { WEBHOOK_FRAGMENT } from '@/settings/developers/graphql/fragments/webhookFragment';
 
 export const UPDATE_WEBHOOK = gql`
   mutation UpdateWebhook($input: UpdateWebhookInput!) {
diff --git a/packages/twenty-front/src/modules/settings/developers/graphql/queries/getApiKey.ts b/packages/twenty-front/src/modules/settings/developers/graphql/queries/getApiKey.ts
index ac4693db97..59d97bbde8 100644
--- a/packages/twenty-front/src/modules/settings/developers/graphql/queries/getApiKey.ts
+++ b/packages/twenty-front/src/modules/settings/developers/graphql/queries/getApiKey.ts
@@ -1,5 +1,5 @@
 import gql from 'graphql-tag';
-import { API_KEY_FRAGMENT } from '../fragments/apiKeyFragment';
+import { API_KEY_FRAGMENT } from '@/settings/developers/graphql/fragments/apiKeyFragment';
 
 export const GET_API_KEY = gql`
   query GetApiKey($input: GetApiKeyInput!) {
diff --git a/packages/twenty-front/src/modules/settings/developers/graphql/queries/getApiKeys.ts b/packages/twenty-front/src/modules/settings/developers/graphql/queries/getApiKeys.ts
index 785950a83f..daddebc152 100644
--- a/packages/twenty-front/src/modules/settings/developers/graphql/queries/getApiKeys.ts
+++ b/packages/twenty-front/src/modules/settings/developers/graphql/queries/getApiKeys.ts
@@ -1,5 +1,5 @@
 import gql from 'graphql-tag';
-import { API_KEY_FRAGMENT } from '../fragments/apiKeyFragment';
+import { API_KEY_FRAGMENT } from '@/settings/developers/graphql/fragments/apiKeyFragment';
 
 export const GET_API_KEYS = gql`
   query GetApiKeys {
diff --git a/packages/twenty-front/src/modules/settings/developers/graphql/queries/getWebhook.ts b/packages/twenty-front/src/modules/settings/developers/graphql/queries/getWebhook.ts
index 91eb434358..d530b84d16 100644
--- a/packages/twenty-front/src/modules/settings/developers/graphql/queries/getWebhook.ts
+++ b/packages/twenty-front/src/modules/settings/developers/graphql/queries/getWebhook.ts
@@ -1,5 +1,5 @@
 import gql from 'graphql-tag';
-import { WEBHOOK_FRAGMENT } from '../fragments/webhookFragment';
+import { WEBHOOK_FRAGMENT } from '@/settings/developers/graphql/fragments/webhookFragment';
 
 export const GET_WEBHOOK = gql`
   query GetWebhook($input: GetWebhookInput!) {
diff --git a/packages/twenty-front/src/modules/settings/developers/graphql/queries/getWebhooks.ts b/packages/twenty-front/src/modules/settings/developers/graphql/queries/getWebhooks.ts
index 4746392b2c..a6a1863fe5 100644
--- a/packages/twenty-front/src/modules/settings/developers/graphql/queries/getWebhooks.ts
+++ b/packages/twenty-front/src/modules/settings/developers/graphql/queries/getWebhooks.ts
@@ -1,5 +1,5 @@
 import gql from 'graphql-tag';
-import { WEBHOOK_FRAGMENT } from '../fragments/webhookFragment';
+import { WEBHOOK_FRAGMENT } from '@/settings/developers/graphql/fragments/webhookFragment';
 
 export const GET_WEBHOOKS = gql`
   query GetWebhooks {
diff --git a/packages/twenty-front/src/modules/settings/developers/hooks/__tests__/useWebhookForm.test.tsx b/packages/twenty-front/src/modules/settings/developers/hooks/__tests__/useWebhookForm.test.tsx
index 2b29ddb24d..c6d1684475 100644
--- a/packages/twenty-front/src/modules/settings/developers/hooks/__tests__/useWebhookForm.test.tsx
+++ b/packages/twenty-front/src/modules/settings/developers/hooks/__tests__/useWebhookForm.test.tsx
@@ -9,7 +9,7 @@ import { CREATE_WEBHOOK } from '@/settings/developers/graphql/mutations/createWe
 import { DELETE_WEBHOOK } from '@/settings/developers/graphql/mutations/deleteWebhook';
 import { UPDATE_WEBHOOK } from '@/settings/developers/graphql/mutations/updateWebhook';
 import { GET_WEBHOOK } from '@/settings/developers/graphql/queries/getWebhook';
-import { useWebhookForm } from '../useWebhookForm';
+import { useWebhookForm } from '@/settings/developers/hooks/useWebhookForm';
 
 const mockNavigateSettings = jest.fn();
 const mockEnqueueSuccessSnackBar = jest.fn();
diff --git a/packages/twenty-front/src/modules/settings/developers/utils/__tests__/addEmptyOperationIfNecessary.test.ts b/packages/twenty-front/src/modules/settings/developers/utils/__tests__/addEmptyOperationIfNecessary.test.ts
index 6aa94eb37b..21d966830c 100644
--- a/packages/twenty-front/src/modules/settings/developers/utils/__tests__/addEmptyOperationIfNecessary.test.ts
+++ b/packages/twenty-front/src/modules/settings/developers/utils/__tests__/addEmptyOperationIfNecessary.test.ts
@@ -1,6 +1,6 @@
 import { WEBHOOK_EMPTY_OPERATION } from '~/pages/settings/developers/webhooks/constants/WebhookEmptyOperation';
 import { type WebhookOperationType } from '~/pages/settings/developers/webhooks/types/WebhookOperationsType';
-import { addEmptyOperationIfNecessary } from '../addEmptyOperationIfNecessary';
+import { addEmptyOperationIfNecessary } from '@/settings/developers/utils/addEmptyOperationIfNecessary';
 
 describe('addEmptyOperationIfNecessary', () => {
   it('should add empty operation when no wildcard or null object operations exist', () => {
diff --git a/packages/twenty-front/src/modules/settings/developers/utils/__tests__/cleanAndFormatOperations.test.ts b/packages/twenty-front/src/modules/settings/developers/utils/__tests__/cleanAndFormatOperations.test.ts
index e8b3022c7b..4a5fd34281 100644
--- a/packages/twenty-front/src/modules/settings/developers/utils/__tests__/cleanAndFormatOperations.test.ts
+++ b/packages/twenty-front/src/modules/settings/developers/utils/__tests__/cleanAndFormatOperations.test.ts
@@ -1,5 +1,5 @@
 import { type WebhookOperationType } from '~/pages/settings/developers/webhooks/types/WebhookOperationsType';
-import { cleanAndFormatOperations } from '../cleanAndFormatOperations';
+import { cleanAndFormatOperations } from '@/settings/developers/utils/cleanAndFormatOperations';
 
 describe('cleanAndFormatOperations', () => {
   it('should filter out operations with null object values', () => {
diff --git a/packages/twenty-front/src/modules/settings/developers/utils/__tests__/createWebhookInput.test.ts b/packages/twenty-front/src/modules/settings/developers/utils/__tests__/createWebhookInput.test.ts
index c3e96fa458..d7ed9eea5a 100644
--- a/packages/twenty-front/src/modules/settings/developers/utils/__tests__/createWebhookInput.test.ts
+++ b/packages/twenty-front/src/modules/settings/developers/utils/__tests__/createWebhookInput.test.ts
@@ -2,7 +2,7 @@ import { type WebhookFormValues } from '@/settings/developers/validation-schemas
 import {
   createWebhookCreateInput,
   createWebhookUpdateInput,
-} from '../createWebhookInput';
+} from '@/settings/developers/utils/createWebhookInput';
 
 describe('createWebhookInput', () => {
   const mockFormValues: WebhookFormValues = {
diff --git a/packages/twenty-front/src/modules/settings/developers/utils/__tests__/parseOperationsFromStrings.test.ts b/packages/twenty-front/src/modules/settings/developers/utils/__tests__/parseOperationsFromStrings.test.ts
index 307aaa3f63..ce5230625a 100644
--- a/packages/twenty-front/src/modules/settings/developers/utils/__tests__/parseOperationsFromStrings.test.ts
+++ b/packages/twenty-front/src/modules/settings/developers/utils/__tests__/parseOperationsFromStrings.test.ts
@@ -1,4 +1,4 @@
-import { parseOperationsFromStrings } from '../parseOperationsFromStrings';
+import { parseOperationsFromStrings } from '@/settings/developers/utils/parseOperationsFromStrings';
 
 describe('parseOperationsFromStrings', () => {
   it('should parse operation strings into object/action pairs', () => {
diff --git a/packages/twenty-front/src/modules/settings/hooks/__tests__/useSettingsNavigationItems.test.tsx b/packages/twenty-front/src/modules/settings/hooks/__tests__/useSettingsNavigationItems.test.tsx
index 9ab9b8b939..b55bab4f0b 100644
--- a/packages/twenty-front/src/modules/settings/hooks/__tests__/useSettingsNavigationItems.test.tsx
+++ b/packages/twenty-front/src/modules/settings/hooks/__tests__/useSettingsNavigationItems.test.tsx
@@ -18,7 +18,7 @@ import { SnackBarComponentInstanceContext } from '@/ui/feedback/snack-bar-manage
 import { i18n } from '@lingui/core';
 import { I18nProvider } from '@lingui/react';
 import { SOURCE_LOCALE } from 'twenty-shared/translations';
-import { messages } from '../../../../locales/generated/en';
+import { messages } from '~/locales/generated/en';
 
 i18n.load({
   [SOURCE_LOCALE]: messages,
diff --git a/packages/twenty-front/src/modules/settings/integrations/components/SettingsIntegrationPreview.tsx b/packages/twenty-front/src/modules/settings/integrations/components/SettingsIntegrationPreview.tsx
index 4faf4603cf..f20012593b 100644
--- a/packages/twenty-front/src/modules/settings/integrations/components/SettingsIntegrationPreview.tsx
+++ b/packages/twenty-front/src/modules/settings/integrations/components/SettingsIntegrationPreview.tsx
@@ -1,8 +1,8 @@
 import { t } from '@lingui/core/macro';
 import styled from '@emotion/styled';
 
-import PreviewBackgroundImage from '../assets/preview-background.svg';
-import SyncImage from '../assets/sync.svg?react';
+import PreviewBackgroundImage from '@/settings/integrations/assets/preview-background.svg';
+import SyncImage from '@/settings/integrations/assets/sync.svg?react';
 import { Card, CardContent } from 'twenty-ui/layout';
 
 type SettingsIntegrationPreviewProps = {
diff --git a/packages/twenty-front/src/modules/settings/playground/components/SettingsPlaygroundCoverImage.tsx b/packages/twenty-front/src/modules/settings/playground/components/SettingsPlaygroundCoverImage.tsx
index 9fb7ea23c4..779e9ea03b 100644
--- a/packages/twenty-front/src/modules/settings/playground/components/SettingsPlaygroundCoverImage.tsx
+++ b/packages/twenty-front/src/modules/settings/playground/components/SettingsPlaygroundCoverImage.tsx
@@ -1,7 +1,7 @@
 import styled from '@emotion/styled';
 
-import DarkCoverImage from '../assets/cover-dark.png';
-import LightCoverImage from '../assets/cover-light.png';
+import DarkCoverImage from '@/settings/playground/assets/cover-dark.png';
+import LightCoverImage from '@/settings/playground/assets/cover-light.png';
 import { Card } from 'twenty-ui/layout';
 
 export const StyledSettingsApiPlaygroundCoverImage = styled(Card)`
diff --git a/packages/twenty-front/src/modules/settings/playground/components/__stories__/PlaygroundSetupForm.stories.tsx b/packages/twenty-front/src/modules/settings/playground/components/__stories__/PlaygroundSetupForm.stories.tsx
index f7cf574efc..b78da5d8e7 100644
--- a/packages/twenty-front/src/modules/settings/playground/components/__stories__/PlaygroundSetupForm.stories.tsx
+++ b/packages/twenty-front/src/modules/settings/playground/components/__stories__/PlaygroundSetupForm.stories.tsx
@@ -1,7 +1,7 @@
 import { type Meta, type StoryObj } from '@storybook/react';
 import { ComponentDecorator, RouterDecorator } from 'twenty-ui/testing';
 import { I18nFrontDecorator } from '~/testing/decorators/I18nFrontDecorator';
-import { PlaygroundSetupForm } from '../PlaygroundSetupForm';
+import { PlaygroundSetupForm } from '@/settings/playground/components/PlaygroundSetupForm';
 
 const meta: Meta<typeof PlaygroundSetupForm> = {
   title: 'Modules/Settings/Playground/PlaygroundSetupForm',
diff --git a/packages/twenty-front/src/modules/settings/playground/components/__stories__/RestPlayground.stories.tsx b/packages/twenty-front/src/modules/settings/playground/components/__stories__/RestPlayground.stories.tsx
index ed210357a2..c70b479100 100644
--- a/packages/twenty-front/src/modules/settings/playground/components/__stories__/RestPlayground.stories.tsx
+++ b/packages/twenty-front/src/modules/settings/playground/components/__stories__/RestPlayground.stories.tsx
@@ -7,7 +7,7 @@ import { useEffect } from 'react';
 import { useSetRecoilState } from 'recoil';
 import { ComponentDecorator } from 'twenty-ui/testing';
 import { I18nFrontDecorator } from '~/testing/decorators/I18nFrontDecorator';
-import { RestPlayground } from '../RestPlayground';
+import { RestPlayground } from '@/settings/playground/components/RestPlayground';
 
 const PlaygroundApiKeySetterEffect = () => {
   const setPlaygroundApiKey = useSetRecoilState(playgroundApiKeyState);
diff --git a/packages/twenty-front/src/modules/settings/roles/components/SettingsRolesDefaultRole.tsx b/packages/twenty-front/src/modules/settings/roles/components/SettingsRolesDefaultRole.tsx
index 7101b3556b..8c49bd529c 100644
--- a/packages/twenty-front/src/modules/settings/roles/components/SettingsRolesDefaultRole.tsx
+++ b/packages/twenty-front/src/modules/settings/roles/components/SettingsRolesDefaultRole.tsx
@@ -13,7 +13,7 @@ import {
   type UpdateWorkspaceMutation,
   useUpdateWorkspaceMutation,
 } from '~/generated-metadata/graphql';
-import { type RoleWithPartialMembers } from '../types/RoleWithPartialMembers';
+import { type RoleWithPartialMembers } from '@/settings/roles/types/RoleWithPartialMembers';
 
 type SettingsRoleDefaultRoleProps = {
   roles: RoleWithPartialMembers[];
diff --git a/packages/twenty-front/src/modules/settings/roles/components/SettingsRolesTableRow.tsx b/packages/twenty-front/src/modules/settings/roles/components/SettingsRolesTableRow.tsx
index adc50264c4..b1344cc417 100644
--- a/packages/twenty-front/src/modules/settings/roles/components/SettingsRolesTableRow.tsx
+++ b/packages/twenty-front/src/modules/settings/roles/components/SettingsRolesTableRow.tsx
@@ -16,7 +16,7 @@ import {
   useIcons,
 } from 'twenty-ui/display';
 
-import { type RoleWithPartialMembers } from '../types/RoleWithPartialMembers';
+import { type RoleWithPartialMembers } from '@/settings/roles/types/RoleWithPartialMembers';
 
 const StyledAssignedText = styled.div`
   color: ${({ theme }) => theme.font.color.secondary};
diff --git a/packages/twenty-front/src/modules/settings/roles/hooks/useUpdateWorkspaceMemberRole.ts b/packages/twenty-front/src/modules/settings/roles/hooks/useUpdateWorkspaceMemberRole.ts
index bee35b950d..b7e90fc002 100644
--- a/packages/twenty-front/src/modules/settings/roles/hooks/useUpdateWorkspaceMemberRole.ts
+++ b/packages/twenty-front/src/modules/settings/roles/hooks/useUpdateWorkspaceMemberRole.ts
@@ -2,7 +2,7 @@ import { settingsDraftRoleFamilyState } from '@/settings/roles/states/settingsDr
 import { settingsPersistedRoleFamilyState } from '@/settings/roles/states/settingsPersistedRoleFamilyState';
 import { useRecoilState, useSetRecoilState } from 'recoil';
 import { useUpdateWorkspaceMemberRoleMutation } from '~/generated-metadata/graphql';
-import { type PartialWorkspaceMember } from '../types/RoleWithPartialMembers';
+import { type PartialWorkspaceMember } from '@/settings/roles/types/RoleWithPartialMembers';
 
 type AddWorkspaceMemberToRoleAndUpdateStateParams = {
   workspaceMemberId: string;
diff --git a/packages/twenty-front/src/modules/settings/roles/role-assignment/components/RoleAssignmentSection.tsx b/packages/twenty-front/src/modules/settings/roles/role-assignment/components/RoleAssignmentSection.tsx
index f58d087865..a42623e428 100644
--- a/packages/twenty-front/src/modules/settings/roles/role-assignment/components/RoleAssignmentSection.tsx
+++ b/packages/twenty-front/src/modules/settings/roles/role-assignment/components/RoleAssignmentSection.tsx
@@ -12,8 +12,8 @@ import { type ApiKeyForRole } from '~/generated/graphql';
 import {
   type PartialWorkspaceMember,
   type RoleWithPartialMembers,
-} from '../../types/RoleWithPartialMembers';
-import { ROLE_TARGET_CONFIG } from '../constants/RoleTargetConfig';
+} from '@/settings/roles/types/RoleWithPartialMembers';
+import { ROLE_TARGET_CONFIG } from '@/settings/roles/role-assignment/constants/RoleTargetConfig';
 
 const StyledAssignToMemberContainer = styled.div`
   display: flex;
diff --git a/packages/twenty-front/src/modules/settings/roles/role-assignment/components/SettingsRoleAssignment.tsx b/packages/twenty-front/src/modules/settings/roles/role-assignment/components/SettingsRoleAssignment.tsx
index 56280e7ed7..76de3b4862 100644
--- a/packages/twenty-front/src/modules/settings/roles/role-assignment/components/SettingsRoleAssignment.tsx
+++ b/packages/twenty-front/src/modules/settings/roles/role-assignment/components/SettingsRoleAssignment.tsx
@@ -22,10 +22,10 @@ import {
 } from '~/generated-metadata/graphql';
 import { FeatureFlagKey, type ApiKeyForRole } from '~/generated/graphql';
 import { useNavigateSettings } from '~/hooks/useNavigateSettings';
-import { type PartialWorkspaceMember } from '../../types/RoleWithPartialMembers';
-import { ROLE_ASSIGNMENT_CONFIRMATION_MODAL_ID } from '../constants/RoleAssignmentConfirmationModalId';
-import { ROLE_TARGET_CONFIG } from '../constants/RoleTargetConfig';
-import { buildRoleMaps } from '../utils/build-role-maps';
+import { type PartialWorkspaceMember } from '@/settings/roles/types/RoleWithPartialMembers';
+import { ROLE_ASSIGNMENT_CONFIRMATION_MODAL_ID } from '@/settings/roles/role-assignment/constants/RoleAssignmentConfirmationModalId';
+import { ROLE_TARGET_CONFIG } from '@/settings/roles/role-assignment/constants/RoleTargetConfig';
+import { buildRoleMaps } from '@/settings/roles/role-assignment/utils/build-role-maps';
 
 type SettingsRoleAssignmentProps = {
   roleId: string;
diff --git a/packages/twenty-front/src/modules/settings/roles/role-assignment/components/SettingsRoleAssignmentTable.tsx b/packages/twenty-front/src/modules/settings/roles/role-assignment/components/SettingsRoleAssignmentTable.tsx
index 25f2221d62..a0f234420f 100644
--- a/packages/twenty-front/src/modules/settings/roles/role-assignment/components/SettingsRoleAssignmentTable.tsx
+++ b/packages/twenty-front/src/modules/settings/roles/role-assignment/components/SettingsRoleAssignmentTable.tsx
@@ -16,7 +16,7 @@ import { H2Title, IconSearch } from 'twenty-ui/display';
 import { type Agent } from '~/generated-metadata/graphql';
 import { type ApiKeyForRole } from '~/generated/graphql';
 import { normalizeSearchText } from '~/utils/normalizeSearchText';
-import { type PartialWorkspaceMember } from '../../types/RoleWithPartialMembers';
+import { type PartialWorkspaceMember } from '@/settings/roles/types/RoleWithPartialMembers';
 
 const StyledTable = styled.div`
   border-bottom: 1px solid ${({ theme }) => theme.border.color.light};
diff --git a/packages/twenty-front/src/modules/settings/roles/role-assignment/components/SettingsRoleAssignmentTableRow.tsx b/packages/twenty-front/src/modules/settings/roles/role-assignment/components/SettingsRoleAssignmentTableRow.tsx
index 85ac1658ab..ceba066d77 100644
--- a/packages/twenty-front/src/modules/settings/roles/role-assignment/components/SettingsRoleAssignmentTableRow.tsx
+++ b/packages/twenty-front/src/modules/settings/roles/role-assignment/components/SettingsRoleAssignmentTableRow.tsx
@@ -17,7 +17,7 @@ import { type Agent } from '~/generated-metadata/graphql';
 import { type ApiKeyForRole } from '~/generated/graphql';
 import { dateLocaleState } from '~/localization/states/dateLocaleState';
 import { formatDateString } from '~/utils/string/formatDateString';
-import { type PartialWorkspaceMember } from '../../types/RoleWithPartialMembers';
+import { type PartialWorkspaceMember } from '@/settings/roles/types/RoleWithPartialMembers';
 
 const StyledIconWrapper = styled.div`
   align-items: center;
diff --git a/packages/twenty-front/src/modules/settings/roles/role-assignment/components/SettingsRoleAssignmentWorkspaceMemberPickerDropdown.tsx b/packages/twenty-front/src/modules/settings/roles/role-assignment/components/SettingsRoleAssignmentWorkspaceMemberPickerDropdown.tsx
index 52406aaff2..b618f775ad 100644
--- a/packages/twenty-front/src/modules/settings/roles/role-assignment/components/SettingsRoleAssignmentWorkspaceMemberPickerDropdown.tsx
+++ b/packages/twenty-front/src/modules/settings/roles/role-assignment/components/SettingsRoleAssignmentWorkspaceMemberPickerDropdown.tsx
@@ -8,7 +8,7 @@ import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownM
 import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth';
 import { useLingui } from '@lingui/react/macro';
 import { type ChangeEvent, useState } from 'react';
-import { type PartialWorkspaceMember } from '../../types/RoleWithPartialMembers';
+import { type PartialWorkspaceMember } from '@/settings/roles/types/RoleWithPartialMembers';
 
 type SettingsRoleAssignmentWorkspaceMemberPickerDropdownProps = {
   excludedWorkspaceMemberIds: string[];
diff --git a/packages/twenty-front/src/modules/settings/roles/role-assignment/components/SettingsRoleAssignmentWorkspaceMemberPickerDropdownContent.tsx b/packages/twenty-front/src/modules/settings/roles/role-assignment/components/SettingsRoleAssignmentWorkspaceMemberPickerDropdownContent.tsx
index a0a18e7143..bb83756437 100644
--- a/packages/twenty-front/src/modules/settings/roles/role-assignment/components/SettingsRoleAssignmentWorkspaceMemberPickerDropdownContent.tsx
+++ b/packages/twenty-front/src/modules/settings/roles/role-assignment/components/SettingsRoleAssignmentWorkspaceMemberPickerDropdownContent.tsx
@@ -4,7 +4,7 @@ import { useRecoilValue } from 'recoil';
 import { isDefined } from 'twenty-shared/utils';
 import { MenuItem, MenuItemAvatar } from 'twenty-ui/navigation';
 import { type SearchRecord } from '~/generated-metadata/graphql';
-import { type PartialWorkspaceMember } from '../../types/RoleWithPartialMembers';
+import { type PartialWorkspaceMember } from '@/settings/roles/types/RoleWithPartialMembers';
 
 type SettingsRoleAssignmentWorkspaceMemberPickerDropdownContentProps = {
   loading: boolean;
diff --git a/packages/twenty-front/src/modules/settings/roles/role-assignment/constants/RoleTargetConfig.ts b/packages/twenty-front/src/modules/settings/roles/role-assignment/constants/RoleTargetConfig.ts
index f8f93daac3..fc1936821d 100644
--- a/packages/twenty-front/src/modules/settings/roles/role-assignment/constants/RoleTargetConfig.ts
+++ b/packages/twenty-front/src/modules/settings/roles/role-assignment/constants/RoleTargetConfig.ts
@@ -7,8 +7,8 @@ import { type ApiKeyForRole } from '~/generated/graphql';
 import {
   type PartialWorkspaceMember,
   type RoleWithPartialMembers,
-} from '../../types/RoleWithPartialMembers';
-import { type RoleMaps } from '../types/role-maps';
+} from '@/settings/roles/types/RoleWithPartialMembers';
+import { type RoleMaps } from '@/settings/roles/role-assignment/types/role-maps';
 
 export const ROLE_TARGET_CONFIG = {
   member: {
diff --git a/packages/twenty-front/src/modules/settings/roles/role-assignment/utils/build-role-maps.ts b/packages/twenty-front/src/modules/settings/roles/role-assignment/utils/build-role-maps.ts
index da8fc23059..e82f11a3d8 100644
--- a/packages/twenty-front/src/modules/settings/roles/role-assignment/utils/build-role-maps.ts
+++ b/packages/twenty-front/src/modules/settings/roles/role-assignment/utils/build-role-maps.ts
@@ -1,5 +1,5 @@
-import { type RoleWithPartialMembers } from '../../types/RoleWithPartialMembers';
-import { type RoleMaps } from '../types/role-maps';
+import { type RoleWithPartialMembers } from '@/settings/roles/types/RoleWithPartialMembers';
+import { type RoleMaps } from '@/settings/roles/role-assignment/types/role-maps';
 
 export const buildRoleMaps = (roles: RoleWithPartialMembers[]): RoleMaps => {
   const maps: RoleMaps = {
diff --git a/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/field-permissions/hooks/tests/useGetObjectPermissionDerivedStates.test.ts b/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/field-permissions/hooks/tests/useGetObjectPermissionDerivedStates.test.ts
index e24b1219fc..0b05443eb8 100644
--- a/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/field-permissions/hooks/tests/useGetObjectPermissionDerivedStates.test.ts
+++ b/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/field-permissions/hooks/tests/useGetObjectPermissionDerivedStates.test.ts
@@ -7,7 +7,7 @@ import {
   MOCK_ROLE_ID_REVOKES_ALL,
   rolesMockHookWrapper,
 } from '~/testing/mock-data/roles/roles-mock';
-import { useGetObjectPermissionDerivedStates } from '../useGetObjectPermissionDerivedStates';
+import { useGetObjectPermissionDerivedStates } from '@/settings/roles/role-permissions/object-level-permissions/field-permissions/hooks/useGetObjectPermissionDerivedStates';
 
 describe('useGetObjectPermissionDerivedStates', () => {
   it('should return expected for object that revoke permissions', () => {
diff --git a/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/field-permissions/utils/tests/getRoleWithRemovedFieldPermission.spec.ts b/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/field-permissions/utils/tests/getRoleWithRemovedFieldPermission.spec.ts
index 35436f9fbc..fab0f601a9 100644
--- a/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/field-permissions/utils/tests/getRoleWithRemovedFieldPermission.spec.ts
+++ b/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/field-permissions/utils/tests/getRoleWithRemovedFieldPermission.spec.ts
@@ -1,5 +1,5 @@
 import { type FieldPermission, type Role } from '~/generated-metadata/graphql';
-import { getRoleWithRemovedFieldPermission } from '../getRoleWithRemovedFieldPermission';
+import { getRoleWithRemovedFieldPermission } from '@/settings/roles/role-permissions/object-level-permissions/field-permissions/utils/getRoleWithRemovedFieldPermission';
 
 const BASE_FIELD_PERMISSION: FieldPermission = {
   id: 'field-permission-1',
diff --git a/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/field-permissions/utils/tests/getRoleWithUpsertedFieldPermission.spec.ts b/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/field-permissions/utils/tests/getRoleWithUpsertedFieldPermission.spec.ts
index 5f723c9150..9bd2ba037b 100644
--- a/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/field-permissions/utils/tests/getRoleWithUpsertedFieldPermission.spec.ts
+++ b/packages/twenty-front/src/modules/settings/roles/role-permissions/object-level-permissions/field-permissions/utils/tests/getRoleWithUpsertedFieldPermission.spec.ts
@@ -1,5 +1,5 @@
 import { type FieldPermission, type Role } from '~/generated-metadata/graphql';
-import { getRoleWithUpsertedFieldPermission } from '../getRoleWithUpsertedFieldPermission';
+import { getRoleWithUpsertedFieldPermission } from '@/settings/roles/role-permissions/object-level-permissions/field-permissions/utils/getRoleWithUpsertedFieldPermission';
 
 const BASE_ROLE_MOCK: Role = {
   canAccessAllTools: false,
diff --git a/packages/twenty-front/src/modules/settings/roles/states/settingsDraftRoleFamilyState.ts b/packages/twenty-front/src/modules/settings/roles/states/settingsDraftRoleFamilyState.ts
index a92ca2d786..731881d0b0 100644
--- a/packages/twenty-front/src/modules/settings/roles/states/settingsDraftRoleFamilyState.ts
+++ b/packages/twenty-front/src/modules/settings/roles/states/settingsDraftRoleFamilyState.ts
@@ -1,5 +1,5 @@
 import { createFamilyState } from '@/ui/utilities/state/utils/createFamilyState';
-import { type RoleWithPartialMembers } from '../types/RoleWithPartialMembers';
+import { type RoleWithPartialMembers } from '@/settings/roles/types/RoleWithPartialMembers';
 
 export const settingsDraftRoleFamilyState = createFamilyState<
   RoleWithPartialMembers,
diff --git a/packages/twenty-front/src/modules/settings/roles/states/settingsPersistedRoleFamilyState.ts b/packages/twenty-front/src/modules/settings/roles/states/settingsPersistedRoleFamilyState.ts
index e019d66524..0d53d23f44 100644
--- a/packages/twenty-front/src/modules/settings/roles/states/settingsPersistedRoleFamilyState.ts
+++ b/packages/twenty-front/src/modules/settings/roles/states/settingsPersistedRoleFamilyState.ts
@@ -1,5 +1,5 @@
 import { createFamilyState } from '@/ui/utilities/state/utils/createFamilyState';
-import { type RoleWithPartialMembers } from '../types/RoleWithPartialMembers';
+import { type RoleWithPartialMembers } from '@/settings/roles/types/RoleWithPartialMembers';
 
 export const settingsPersistedRoleFamilyState = createFamilyState<
   RoleWithPartialMembers | undefined,
diff --git a/packages/twenty-front/src/modules/settings/security/utils/__tests__/parseSAMLMetadataFromXMLFile.test.ts b/packages/twenty-front/src/modules/settings/security/utils/__tests__/parseSAMLMetadataFromXMLFile.test.ts
index 0bf18a404f..e52225f94a 100644
--- a/packages/twenty-front/src/modules/settings/security/utils/__tests__/parseSAMLMetadataFromXMLFile.test.ts
+++ b/packages/twenty-front/src/modules/settings/security/utils/__tests__/parseSAMLMetadataFromXMLFile.test.ts
@@ -1,6 +1,6 @@
 /* @license Enterprise */
 
-import { parseSAMLMetadataFromXMLFile } from '../parseSAMLMetadataFromXMLFile';
+import { parseSAMLMetadataFromXMLFile } from '@/settings/security/utils/parseSAMLMetadataFromXMLFile';
 
 describe('parseSAMLMetadataFromXMLFile', () => {
   it('should parse SAML metadata from XML file', () => {
diff --git a/packages/twenty-front/src/modules/settings/two-factor-authentication/components/DeleteTwoFactorAuthenticationMethod.tsx b/packages/twenty-front/src/modules/settings/two-factor-authentication/components/DeleteTwoFactorAuthenticationMethod.tsx
index 8e1c9a9e46..b144e1fb7f 100644
--- a/packages/twenty-front/src/modules/settings/two-factor-authentication/components/DeleteTwoFactorAuthenticationMethod.tsx
+++ b/packages/twenty-front/src/modules/settings/two-factor-authentication/components/DeleteTwoFactorAuthenticationMethod.tsx
@@ -14,8 +14,8 @@ import { H2Title } from 'twenty-ui/display';
 import { Button } from 'twenty-ui/input';
 import { useDeleteTwoFactorAuthenticationMethodMutation } from '~/generated-metadata/graphql';
 import { useNavigateSettings } from '~/hooks/useNavigateSettings';
-import { useCurrentUserWorkspaceTwoFactorAuthentication } from '../hooks/useCurrentUserWorkspaceTwoFactorAuthentication';
-import { useCurrentWorkspaceTwoFactorAuthenticationPolicy } from '../hooks/useWorkspaceTwoFactorAuthenticationPolicy';
+import { useCurrentUserWorkspaceTwoFactorAuthentication } from '@/settings/two-factor-authentication/hooks/useCurrentUserWorkspaceTwoFactorAuthentication';
+import { useCurrentWorkspaceTwoFactorAuthenticationPolicy } from '@/settings/two-factor-authentication/hooks/useWorkspaceTwoFactorAuthenticationPolicy';
 
 const DELETE_TWO_FACTOR_AUTHENTICATION_MODAL_ID =
   'delete-two-factor-authentication-modal';
diff --git a/packages/twenty-front/src/modules/spreadsheet-import/states/spreadsheetImportDialogState.ts b/packages/twenty-front/src/modules/spreadsheet-import/states/spreadsheetImportDialogState.ts
index 5c087642ab..2b9b04cc26 100644
--- a/packages/twenty-front/src/modules/spreadsheet-import/states/spreadsheetImportDialogState.ts
+++ b/packages/twenty-front/src/modules/spreadsheet-import/states/spreadsheetImportDialogState.ts
@@ -1,5 +1,5 @@
 import { createState } from 'twenty-ui/utilities';
-import { type SpreadsheetImportDialogOptions } from '../types';
+import { type SpreadsheetImportDialogOptions } from '@/spreadsheet-import/types';
 
 export type SpreadsheetImportDialogState = {
   isOpen: boolean;
diff --git a/packages/twenty-front/src/modules/spreadsheet-import/steps/components/ValidationStep/components/columns.tsx b/packages/twenty-front/src/modules/spreadsheet-import/steps/components/ValidationStep/components/columns.tsx
index 61d563bd95..ce59b26b9e 100644
--- a/packages/twenty-front/src/modules/spreadsheet-import/steps/components/ValidationStep/components/columns.tsx
+++ b/packages/twenty-front/src/modules/spreadsheet-import/steps/components/ValidationStep/components/columns.tsx
@@ -14,7 +14,7 @@ import camelCase from 'lodash.camelcase';
 import { isDefined } from 'twenty-shared/utils';
 import { AppTooltip, TooltipDelay } from 'twenty-ui/display';
 import { Checkbox, CheckboxVariant, Toggle } from 'twenty-ui/input';
-import { type ImportedStructuredRowMetadata } from '../types';
+import { type ImportedStructuredRowMetadata } from '@/spreadsheet-import/steps/components/ValidationStep/types';
 
 const StyledHeaderContainer = styled.div`
   align-items: center;
diff --git a/packages/twenty-front/src/modules/spreadsheet-import/steps/components/__stories__/Steps.stories.tsx b/packages/twenty-front/src/modules/spreadsheet-import/steps/components/__stories__/Steps.stories.tsx
index 69ddd5f7a3..44c89d79d7 100644
--- a/packages/twenty-front/src/modules/spreadsheet-import/steps/components/__stories__/Steps.stories.tsx
+++ b/packages/twenty-front/src/modules/spreadsheet-import/steps/components/__stories__/Steps.stories.tsx
@@ -6,7 +6,7 @@ import { stepBarInternalState } from '@/ui/navigation/step-bar/states/stepBarInt
 import { ContextStoreDecorator } from '~/testing/decorators/ContextStoreDecorator';
 import { I18nFrontDecorator } from '~/testing/decorators/I18nFrontDecorator';
 import { ObjectMetadataItemsDecorator } from '~/testing/decorators/ObjectMetadataItemsDecorator';
-import { SpreadsheetImportStepperContainer } from '../SpreadsheetImportStepperContainer';
+import { SpreadsheetImportStepperContainer } from '@/spreadsheet-import/steps/components/SpreadsheetImportStepperContainer';
 
 const meta: Meta<typeof SpreadsheetImportStepperContainer> = {
   title: 'Modules/SpreadsheetImport/Steps',
diff --git a/packages/twenty-front/src/modules/spreadsheet-import/types/SpreadsheetImportDialogOptions.ts b/packages/twenty-front/src/modules/spreadsheet-import/types/SpreadsheetImportDialogOptions.ts
index 41789e503f..9eda7c4f2a 100644
--- a/packages/twenty-front/src/modules/spreadsheet-import/types/SpreadsheetImportDialogOptions.ts
+++ b/packages/twenty-front/src/modules/spreadsheet-import/types/SpreadsheetImportDialogOptions.ts
@@ -6,7 +6,7 @@ import { type ImportedRow } from '@/spreadsheet-import/types/SpreadsheetImportIm
 import { type ImportedStructuredRow } from '@/spreadsheet-import/types/SpreadsheetImportImportedStructuredRow';
 import { type SpreadsheetImportRowHook } from '@/spreadsheet-import/types/SpreadsheetImportRowHook';
 import { type SpreadsheetImportTableHook } from '@/spreadsheet-import/types/SpreadsheetImportTableHook';
-import { type SpreadsheetImportStep } from '../steps/types/SpreadsheetImportStep';
+import { type SpreadsheetImportStep } from '@/spreadsheet-import/steps/types/SpreadsheetImportStep';
 
 export type SpreadsheetImportDialogOptions = {
   // callback when RSI is closed before final submit
diff --git a/packages/twenty-front/src/modules/spreadsheet-import/utils/__tests__/csvSecurity.test.ts b/packages/twenty-front/src/modules/spreadsheet-import/utils/__tests__/csvSecurity.test.ts
index b7b8907c81..0240b3715a 100644
--- a/packages/twenty-front/src/modules/spreadsheet-import/utils/__tests__/csvSecurity.test.ts
+++ b/packages/twenty-front/src/modules/spreadsheet-import/utils/__tests__/csvSecurity.test.ts
@@ -1,8 +1,8 @@
 import { CSV_DANGEROUS_CHARACTERS } from '@/spreadsheet-import/constants/CsvDangerousCharacters';
 import { CSV_INJECTION_PREVENTION_ZWJ } from '@/spreadsheet-import/constants/CsvInjectionPreventionZwj';
-import { cleanZWJFromImportedValue } from '../cleanZWJFromImportedValue';
-import { containsCSVProtectionZWJ } from '../containsCSVProtectionZWJ';
-import { sanitizeValueForCSVExport } from '../sanitizeValueForCSVExport';
+import { cleanZWJFromImportedValue } from '@/spreadsheet-import/utils/cleanZWJFromImportedValue';
+import { containsCSVProtectionZWJ } from '@/spreadsheet-import/utils/containsCSVProtectionZWJ';
+import { sanitizeValueForCSVExport } from '@/spreadsheet-import/utils/sanitizeValueForCSVExport';
 
 describe('csvSecurity', () => {
   describe('CSV_DANGEROUS_CHARACTERS regex', () => {
diff --git a/packages/twenty-front/src/modules/subscription/hooks/__tests__/useOnDbEvent.test.tsx b/packages/twenty-front/src/modules/subscription/hooks/__tests__/useOnDbEvent.test.tsx
index 52b380d59c..399b328c59 100644
--- a/packages/twenty-front/src/modules/subscription/hooks/__tests__/useOnDbEvent.test.tsx
+++ b/packages/twenty-front/src/modules/subscription/hooks/__tests__/useOnDbEvent.test.tsx
@@ -3,7 +3,7 @@ import { createClient } from 'graphql-sse';
 
 import { DatabaseEventAction } from '~/generated/graphql';
 import { getTokenPair } from '~/modules/apollo/utils/getTokenPair';
-import { useOnDbEvent } from '../useOnDbEvent';
+import { useOnDbEvent } from '@/subscription/hooks/useOnDbEvent';
 
 jest.mock('~/modules/apollo/utils/getTokenPair');
 jest.mock('graphql-sse');
diff --git a/packages/twenty-front/src/modules/support/components/SupportChatEffect.tsx b/packages/twenty-front/src/modules/support/components/SupportChatEffect.tsx
index fcf1be55cf..0aa602f1da 100644
--- a/packages/twenty-front/src/modules/support/components/SupportChatEffect.tsx
+++ b/packages/twenty-front/src/modules/support/components/SupportChatEffect.tsx
@@ -1,7 +1,7 @@
-import { useSupportChat } from '@/support/hooks/useSupportChat';
+import { useInstantiateSupportChat } from '@/support/hooks/useInstantiateSupportChat';
 
 export const SupportChatEffect = () => {
-  useSupportChat();
+  useInstantiateSupportChat();
 
   return null;
 };
diff --git a/packages/twenty-front/src/modules/support/hooks/useSupportChat.ts b/packages/twenty-front/src/modules/support/hooks/useInstantiateSupportChat.ts
similarity index 98%
rename from packages/twenty-front/src/modules/support/hooks/useSupportChat.ts
rename to packages/twenty-front/src/modules/support/hooks/useInstantiateSupportChat.ts
index 04d11d3ed0..cc1e2c63a2 100644
--- a/packages/twenty-front/src/modules/support/hooks/useSupportChat.ts
+++ b/packages/twenty-front/src/modules/support/hooks/useInstantiateSupportChat.ts
@@ -27,7 +27,7 @@ const insertScript = ({
   document.body.appendChild(script);
 };
 
-export const useSupportChat = () => {
+export const useInstantiateSupportChat = () => {
   const currentUser = useRecoilValue(currentUserState);
   const currentWorkspaceMember = useRecoilValue(currentWorkspaceMemberState);
   const supportChat = useRecoilValue(supportChatState);
diff --git a/packages/twenty-front/src/modules/ui/feedback/dialog-manager/components/DialogManager.tsx b/packages/twenty-front/src/modules/ui/feedback/dialog-manager/components/DialogManager.tsx
index 96658fc69e..7670effe0b 100644
--- a/packages/twenty-front/src/modules/ui/feedback/dialog-manager/components/DialogManager.tsx
+++ b/packages/twenty-front/src/modules/ui/feedback/dialog-manager/components/DialogManager.tsx
@@ -1,5 +1,5 @@
 import { dialogInternalComponentState } from '@/ui/feedback/dialog-manager/states/dialogInternalComponentState';
-import { useDialogManager } from '../hooks/useDialogManager';
+import { useDialogManager } from '@/ui/feedback/dialog-manager/hooks/useDialogManager';
 
 import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue';
 import { Dialog } from './Dialog';
diff --git a/packages/twenty-front/src/modules/ui/feedback/dialog-manager/hooks/useDialogManager.ts b/packages/twenty-front/src/modules/ui/feedback/dialog-manager/hooks/useDialogManager.ts
index 1a6f54cf24..07fea851f0 100644
--- a/packages/twenty-front/src/modules/ui/feedback/dialog-manager/hooks/useDialogManager.ts
+++ b/packages/twenty-front/src/modules/ui/feedback/dialog-manager/hooks/useDialogManager.ts
@@ -6,8 +6,8 @@ import { useRemoveFocusItemFromFocusStackById } from '@/ui/utilities/focus/hooks
 
 import { DialogComponentInstanceContext } from '@/ui/feedback/dialog-manager/contexts/DialogComponentInstanceContext';
 import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';
-import { dialogInternalComponentState } from '../states/dialogInternalComponentState';
-import { type DialogOptions } from '../types/DialogOptions';
+import { dialogInternalComponentState } from '@/ui/feedback/dialog-manager/states/dialogInternalComponentState';
+import { type DialogOptions } from '@/ui/feedback/dialog-manager/types/DialogOptions';
 
 export const useDialogManager = () => {
   const componentInstanceId = useAvailableComponentInstanceIdOrThrow(
diff --git a/packages/twenty-front/src/modules/ui/feedback/dialog-manager/states/dialogInternalComponentState.ts b/packages/twenty-front/src/modules/ui/feedback/dialog-manager/states/dialogInternalComponentState.ts
index 30841c485f..dee5e28b3c 100644
--- a/packages/twenty-front/src/modules/ui/feedback/dialog-manager/states/dialogInternalComponentState.ts
+++ b/packages/twenty-front/src/modules/ui/feedback/dialog-manager/states/dialogInternalComponentState.ts
@@ -1,6 +1,6 @@
 import { DialogComponentInstanceContext } from '@/ui/feedback/dialog-manager/contexts/DialogComponentInstanceContext';
 import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState';
-import { type DialogOptions } from '../types/DialogOptions';
+import { type DialogOptions } from '@/ui/feedback/dialog-manager/types/DialogOptions';
 
 type DialogState = {
   maxQueue: number;
diff --git a/packages/twenty-front/src/modules/ui/feedback/dialog-manager/types/DialogOptions.ts b/packages/twenty-front/src/modules/ui/feedback/dialog-manager/types/DialogOptions.ts
index 2d1e58fdfe..743bcb998e 100644
--- a/packages/twenty-front/src/modules/ui/feedback/dialog-manager/types/DialogOptions.ts
+++ b/packages/twenty-front/src/modules/ui/feedback/dialog-manager/types/DialogOptions.ts
@@ -1,4 +1,4 @@
-import { type DialogProps } from '../components/Dialog';
+import { type DialogProps } from '@/ui/feedback/dialog-manager/components/Dialog';
 
 export type DialogOptions = DialogProps & {
   id: string;
diff --git a/packages/twenty-front/src/modules/ui/feedback/snack-bar-manager/components/__stories__/SnackBar.stories.tsx b/packages/twenty-front/src/modules/ui/feedback/snack-bar-manager/components/__stories__/SnackBar.stories.tsx
index 1c89b6b703..c8088000dc 100644
--- a/packages/twenty-front/src/modules/ui/feedback/snack-bar-manager/components/__stories__/SnackBar.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/feedback/snack-bar-manager/components/__stories__/SnackBar.stories.tsx
@@ -3,7 +3,10 @@ import { fn } from '@storybook/test';
 import { SnackBarDecorator } from '~/testing/decorators/SnackBarDecorator';
 
 import { I18nFrontDecorator } from '~/testing/decorators/I18nFrontDecorator';
-import { SnackBar, SnackBarVariant } from '../SnackBar';
+import {
+  SnackBar,
+  SnackBarVariant,
+} from '@/ui/feedback/snack-bar-manager/components/SnackBar';
 import {
   CatalogDecorator,
   type CatalogStory,
diff --git a/packages/twenty-front/src/modules/ui/feedback/snack-bar-manager/states/snackBarInternalComponentState.ts b/packages/twenty-front/src/modules/ui/feedback/snack-bar-manager/states/snackBarInternalComponentState.ts
index 597b8d7f3e..7d03782f28 100644
--- a/packages/twenty-front/src/modules/ui/feedback/snack-bar-manager/states/snackBarInternalComponentState.ts
+++ b/packages/twenty-front/src/modules/ui/feedback/snack-bar-manager/states/snackBarInternalComponentState.ts
@@ -1,6 +1,6 @@
 import { SnackBarComponentInstanceContext } from '@/ui/feedback/snack-bar-manager/contexts/SnackBarComponentInstanceContext';
 import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState';
-import { type SnackBarProps } from '../components/SnackBar';
+import { type SnackBarProps } from '@/ui/feedback/snack-bar-manager/components/SnackBar';
 
 export type SnackBarOptions = SnackBarProps & {
   id: string;
diff --git a/packages/twenty-front/src/modules/ui/feedback/snack-bar-manager/utils/build-error-action.util.ts b/packages/twenty-front/src/modules/ui/feedback/snack-bar-manager/utils/build-error-action.util.ts
index fb8a16c0dc..0a4ce5d0e2 100644
--- a/packages/twenty-front/src/modules/ui/feedback/snack-bar-manager/utils/build-error-action.util.ts
+++ b/packages/twenty-front/src/modules/ui/feedback/snack-bar-manager/utils/build-error-action.util.ts
@@ -3,7 +3,7 @@ import { t } from '@lingui/core/macro';
 import { AppPath } from 'twenty-shared/types';
 import { getAppPath, isDefined } from 'twenty-shared/utils';
 import { getConflictingRecordFromApolloError } from '~/utils/get-conflicting-record-from-apollo-error.util';
-import { type SnackBarOptions } from '../states/snackBarInternalComponentState';
+import { type SnackBarOptions } from '@/ui/feedback/snack-bar-manager/states/snackBarInternalComponentState';
 
 export const buildErrorAction = (
   apolloError?: ApolloError,
diff --git a/packages/twenty-front/src/modules/ui/field/display/components/__stories__/DateDisplay.stories.tsx b/packages/twenty-front/src/modules/ui/field/display/components/__stories__/DateDisplay.stories.tsx
index 4e5ea3a33b..2e3bb32ae3 100644
--- a/packages/twenty-front/src/modules/ui/field/display/components/__stories__/DateDisplay.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/field/display/components/__stories__/DateDisplay.stories.tsx
@@ -4,7 +4,7 @@ import { FieldDateDisplayFormat } from '@/object-record/record-field/ui/types/Fi
 import { UserContext } from '@/users/contexts/UserContext';
 import type { Meta, StoryObj } from '@storybook/react';
 import { expect, within } from '@storybook/test';
-import { DateDisplay } from '../DateDisplay';
+import { DateDisplay } from '@/ui/field/display/components/DateDisplay';
 
 const meta: Meta<typeof DateDisplay> = {
   title: 'UI/Field/Display/DateDisplay',
diff --git a/packages/twenty-front/src/modules/ui/field/display/components/__stories__/PhoneInputDisplay.stories.tsx b/packages/twenty-front/src/modules/ui/field/display/components/__stories__/PhoneInputDisplay.stories.tsx
index 59e4ee6a6a..2238371c03 100644
--- a/packages/twenty-front/src/modules/ui/field/display/components/__stories__/PhoneInputDisplay.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/field/display/components/__stories__/PhoneInputDisplay.stories.tsx
@@ -2,7 +2,7 @@ import { type Meta, type StoryObj } from '@storybook/react';
 
 import { ComponentWithRouterDecorator } from '~/testing/decorators/ComponentWithRouterDecorator';
 
-import { PhoneDisplay } from '../PhoneDisplay'; // Adjust the import path as needed
+import { PhoneDisplay } from '@/ui/field/display/components/PhoneDisplay'; // Adjust the import path as needed
 
 const meta: Meta = {
   title: 'UI/Input/PhoneInputDisplay/PhoneInputDisplay',
diff --git a/packages/twenty-front/src/modules/ui/field/input/components/AddressInput.tsx b/packages/twenty-front/src/modules/ui/field/input/components/AddressInput.tsx
index fe7a72145f..5250d2f673 100644
--- a/packages/twenty-front/src/modules/ui/field/input/components/AddressInput.tsx
+++ b/packages/twenty-front/src/modules/ui/field/input/components/AddressInput.tsx
@@ -20,9 +20,9 @@ import { v4 } from 'uuid';
 
 import { t } from '@lingui/core/macro';
 import { type AllowedAddressSubField } from 'twenty-shared/types';
-import { useAddressAutocomplete } from '../hooks/useAddressAutocomplete';
-import { useCountryUtils } from '../hooks/useCountryUtils';
-import { useFocusManagement } from '../hooks/useFocusManagement';
+import { useAddressAutocomplete } from '@/ui/field/input/hooks/useAddressAutocomplete';
+import { useCountryUtils } from '@/ui/field/input/hooks/useCountryUtils';
+import { useFocusManagement } from '@/ui/field/input/hooks/useFocusManagement';
 
 const StyledAddressContainer = styled.div`
   padding: 4px 8px;
diff --git a/packages/twenty-front/src/modules/ui/field/input/components/__stories__/MultiSelectInput.stories.tsx b/packages/twenty-front/src/modules/ui/field/input/components/__stories__/MultiSelectInput.stories.tsx
index 1a4306420d..ec731f33f1 100644
--- a/packages/twenty-front/src/modules/ui/field/input/components/__stories__/MultiSelectInput.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/field/input/components/__stories__/MultiSelectInput.stories.tsx
@@ -18,7 +18,7 @@ import {
 import { type SelectOption } from 'twenty-ui/input';
 import { ComponentDecorator } from 'twenty-ui/testing';
 import { I18nFrontDecorator } from '~/testing/decorators/I18nFrontDecorator';
-import { MultiSelectInput } from '../MultiSelectInput';
+import { MultiSelectInput } from '@/ui/field/input/components/MultiSelectInput';
 
 type RenderProps = {
   values: FieldMultiSelectValue;
diff --git a/packages/twenty-front/src/modules/ui/field/input/hooks/__tests__/useAddressAutocomplete.test.tsx b/packages/twenty-front/src/modules/ui/field/input/hooks/__tests__/useAddressAutocomplete.test.tsx
index b0bf78cccd..cef677a24d 100644
--- a/packages/twenty-front/src/modules/ui/field/input/hooks/__tests__/useAddressAutocomplete.test.tsx
+++ b/packages/twenty-front/src/modules/ui/field/input/hooks/__tests__/useAddressAutocomplete.test.tsx
@@ -2,8 +2,8 @@ import { useGetPlaceApiData } from '@/geo-map/hooks/useGetPlaceApiData';
 import { useCloseDropdown } from '@/ui/layout/dropdown/hooks/useCloseDropdown';
 import { useOpenDropdown } from '@/ui/layout/dropdown/hooks/useOpenDropdown';
 import { act, renderHook } from '@testing-library/react';
-import { useAddressAutocomplete } from '../useAddressAutocomplete';
-import { useCountryUtils } from '../useCountryUtils';
+import { useAddressAutocomplete } from '@/ui/field/input/hooks/useAddressAutocomplete';
+import { useCountryUtils } from '@/ui/field/input/hooks/useCountryUtils';
 
 // Mock dependencies
 jest.mock('@/geo-map/hooks/useGetPlaceApiData');
diff --git a/packages/twenty-front/src/modules/ui/input/components/IconPicker.tsx b/packages/twenty-front/src/modules/ui/input/components/IconPicker.tsx
index d64b5037d2..f963294ff7 100644
--- a/packages/twenty-front/src/modules/ui/input/components/IconPicker.tsx
+++ b/packages/twenty-front/src/modules/ui/input/components/IconPicker.tsx
@@ -25,8 +25,8 @@ import {
   type IconButtonVariant,
   LightIconButton,
 } from 'twenty-ui/input';
-import { IconPickerScrollEffect } from '../hooks/IconPickerScrollEffect';
-import { iconPickerVisibleCountState } from '../states/iconPickerVisibleCountState';
+import { IconPickerScrollEffect } from '@/ui/input/hooks/IconPickerScrollEffect';
+import { iconPickerVisibleCountState } from '@/ui/input/states/iconPickerVisibleCountState';
 
 export type IconPickerProps = {
   disabled?: boolean;
diff --git a/packages/twenty-front/src/modules/ui/input/components/__stories__/IconPicker.stories.tsx b/packages/twenty-front/src/modules/ui/input/components/__stories__/IconPicker.stories.tsx
index e3205a6523..dc2b649a4b 100644
--- a/packages/twenty-front/src/modules/ui/input/components/__stories__/IconPicker.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/input/components/__stories__/IconPicker.stories.tsx
@@ -7,7 +7,10 @@ import { IconsProviderDecorator } from '~/testing/decorators/IconsProviderDecora
 import { sleep } from '~/utils/sleep';
 
 import { ComponentDecorator } from 'twenty-ui/testing';
-import { IconPicker, type IconPickerProps } from '../IconPicker';
+import {
+  IconPicker,
+  type IconPickerProps,
+} from '@/ui/input/components/IconPicker';
 
 type RenderProps = IconPickerProps;
 const Render = (args: RenderProps) => {
diff --git a/packages/twenty-front/src/modules/ui/input/components/__stories__/ImageInput.stories.tsx b/packages/twenty-front/src/modules/ui/input/components/__stories__/ImageInput.stories.tsx
index 16bc2fbae7..dbae7b5a36 100644
--- a/packages/twenty-front/src/modules/ui/input/components/__stories__/ImageInput.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/input/components/__stories__/ImageInput.stories.tsx
@@ -3,7 +3,7 @@ import { type Meta, type StoryObj } from '@storybook/react';
 import { I18nFrontDecorator } from '~/testing/decorators/I18nFrontDecorator';
 import { workspaceLogoUrl } from '~/testing/mock-data/users';
 
-import { ImageInput } from '../ImageInput';
+import { ImageInput } from '@/ui/input/components/ImageInput';
 import { ComponentDecorator } from 'twenty-ui/testing';
 
 const meta: Meta<typeof ImageInput> = {
diff --git a/packages/twenty-front/src/modules/ui/input/components/__stories__/Select.stories.tsx b/packages/twenty-front/src/modules/ui/input/components/__stories__/Select.stories.tsx
index a170baf6b3..6d95dd3820 100644
--- a/packages/twenty-front/src/modules/ui/input/components/__stories__/Select.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/input/components/__stories__/Select.stories.tsx
@@ -4,7 +4,7 @@ import { useState } from 'react';
 
 import { IconPlus } from 'twenty-ui/display';
 import { ComponentDecorator } from 'twenty-ui/testing';
-import { Select, type SelectProps } from '../Select';
+import { Select, type SelectProps } from '@/ui/input/components/Select';
 
 type RenderProps = SelectProps<string | number | boolean | null>;
 
diff --git a/packages/twenty-front/src/modules/ui/input/components/__stories__/TextArea.stories.tsx b/packages/twenty-front/src/modules/ui/input/components/__stories__/TextArea.stories.tsx
index af5c663fd1..fb1062869f 100644
--- a/packages/twenty-front/src/modules/ui/input/components/__stories__/TextArea.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/input/components/__stories__/TextArea.stories.tsx
@@ -2,7 +2,7 @@ import { type Meta, type StoryObj } from '@storybook/react';
 import { useState } from 'react';
 
 import { expect, userEvent, within } from '@storybook/test';
-import { TextArea, type TextAreaProps } from '../TextArea';
+import { TextArea, type TextAreaProps } from '@/ui/input/components/TextArea';
 import { ComponentDecorator } from 'twenty-ui/testing';
 
 type RenderProps = TextAreaProps;
diff --git a/packages/twenty-front/src/modules/ui/input/components/internal/date/components/__stories__/InternalDatePicker.stories.tsx b/packages/twenty-front/src/modules/ui/input/components/internal/date/components/__stories__/InternalDatePicker.stories.tsx
index 7bc097d6e2..07c28a9825 100644
--- a/packages/twenty-front/src/modules/ui/input/components/internal/date/components/__stories__/InternalDatePicker.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/input/components/internal/date/components/__stories__/InternalDatePicker.stories.tsx
@@ -3,7 +3,7 @@ import { type Meta, type StoryObj } from '@storybook/react';
 import { expect, userEvent, within } from '@storybook/test';
 import { Temporal } from 'temporal-polyfill';
 import { ComponentDecorator } from 'twenty-ui/testing';
-import { DateTimePicker } from '../DateTimePicker';
+import { DateTimePicker } from '@/ui/input/components/internal/date/components/DateTimePicker';
 
 const meta: Meta<typeof DateTimePicker> = {
   title: 'UI/Input/Internal/InternalDatePicker',
diff --git a/packages/twenty-front/src/modules/ui/input/editor/utils/__tests__/getFirstNonEmptyLineOfRichText.test.ts b/packages/twenty-front/src/modules/ui/input/editor/utils/__tests__/getFirstNonEmptyLineOfRichText.test.ts
index b47150baf8..4217fb71d9 100644
--- a/packages/twenty-front/src/modules/ui/input/editor/utils/__tests__/getFirstNonEmptyLineOfRichText.test.ts
+++ b/packages/twenty-front/src/modules/ui/input/editor/utils/__tests__/getFirstNonEmptyLineOfRichText.test.ts
@@ -1,5 +1,5 @@
 import type { PartialBlock } from '@blocknote/core';
-import { getFirstNonEmptyLineOfRichText } from '../getFirstNonEmptyLineOfRichText';
+import { getFirstNonEmptyLineOfRichText } from '@/ui/input/editor/utils/getFirstNonEmptyLineOfRichText';
 
 describe('getFirstNonEmptyLineOfRichText', () => {
   it('should return an empty string if the input is null', () => {
diff --git a/packages/twenty-front/src/modules/ui/input/editor/utils/__tests__/parseInitialBlocknote.test.ts b/packages/twenty-front/src/modules/ui/input/editor/utils/__tests__/parseInitialBlocknote.test.ts
index 10a86d1cba..872f5d6c86 100644
--- a/packages/twenty-front/src/modules/ui/input/editor/utils/__tests__/parseInitialBlocknote.test.ts
+++ b/packages/twenty-front/src/modules/ui/input/editor/utils/__tests__/parseInitialBlocknote.test.ts
@@ -1,4 +1,4 @@
-import { parseInitialBlocknote } from '../parseInitialBlocknote';
+import { parseInitialBlocknote } from '@/ui/input/editor/utils/parseInitialBlocknote';
 
 describe('parseInitialBlocknote', () => {
   it('should parse valid JSON array string', () => {
diff --git a/packages/twenty-front/src/modules/ui/input/editor/utils/__tests__/prepareBodyWithSignedUrls.test.ts b/packages/twenty-front/src/modules/ui/input/editor/utils/__tests__/prepareBodyWithSignedUrls.test.ts
index 9c6cebd2d8..aa37849d47 100644
--- a/packages/twenty-front/src/modules/ui/input/editor/utils/__tests__/prepareBodyWithSignedUrls.test.ts
+++ b/packages/twenty-front/src/modules/ui/input/editor/utils/__tests__/prepareBodyWithSignedUrls.test.ts
@@ -1,4 +1,4 @@
-import { prepareBodyWithSignedUrls } from '../prepareBodyWithSignedUrls';
+import { prepareBodyWithSignedUrls } from '@/ui/input/editor/utils/prepareBodyWithSignedUrls';
 
 describe('prepareBodyWithSignedUrls', () => {
   it('should return empty string as-is', () => {
diff --git a/packages/twenty-front/src/modules/ui/input/hooks/IconPickerScrollEffect.tsx b/packages/twenty-front/src/modules/ui/input/hooks/IconPickerScrollEffect.tsx
index a2e8740297..aa2fa66558 100644
--- a/packages/twenty-front/src/modules/ui/input/hooks/IconPickerScrollEffect.tsx
+++ b/packages/twenty-front/src/modules/ui/input/hooks/IconPickerScrollEffect.tsx
@@ -1,7 +1,7 @@
 import { useScrollWrapperHTMLElement } from '@/ui/utilities/scroll/hooks/useScrollWrapperHTMLElement';
 import { useEffect } from 'react';
 import { useSetRecoilState } from 'recoil';
-import { iconPickerVisibleCountState } from '../states/iconPickerVisibleCountState';
+import { iconPickerVisibleCountState } from '@/ui/input/states/iconPickerVisibleCountState';
 
 type IconPickerScrollEffectProps = {
   sentinelId: string;
diff --git a/packages/twenty-front/src/modules/ui/input/hooks/useIconPicker.ts b/packages/twenty-front/src/modules/ui/input/hooks/useIconPicker.ts
index 141431c715..e363eaac89 100644
--- a/packages/twenty-front/src/modules/ui/input/hooks/useIconPicker.ts
+++ b/packages/twenty-front/src/modules/ui/input/hooks/useIconPicker.ts
@@ -1,6 +1,6 @@
 import { useRecoilState } from 'recoil';
 
-import { iconPickerState } from '../states/iconPickerState';
+import { iconPickerState } from '@/ui/input/states/iconPickerState';
 
 export const useIconPicker = () => {
   const [iconPicker, setIconPicker] = useRecoilState(iconPickerState);
diff --git a/packages/twenty-front/src/modules/ui/layout/dropdown/components/__stories__/Dropdown.stories.tsx b/packages/twenty-front/src/modules/ui/layout/dropdown/components/__stories__/Dropdown.stories.tsx
index 47443dc8e5..8bffe4949e 100644
--- a/packages/twenty-front/src/modules/ui/layout/dropdown/components/__stories__/Dropdown.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/dropdown/components/__stories__/Dropdown.stories.tsx
@@ -24,13 +24,13 @@ import { Button } from 'twenty-ui/input';
 import { MenuItem } from 'twenty-ui/navigation';
 import { ComponentDecorator } from 'twenty-ui/testing';
 import { I18nFrontDecorator } from '~/testing/decorators/I18nFrontDecorator';
-import { Dropdown } from '../Dropdown';
-import { DropdownMenuHeader } from '../DropdownMenuHeader/DropdownMenuHeader';
-import { DropdownMenuInput } from '../DropdownMenuInput';
-import { DropdownMenuItemsContainer } from '../DropdownMenuItemsContainer';
-import { DropdownMenuSearchInput } from '../DropdownMenuSearchInput';
-import { DropdownMenuSeparator } from '../DropdownMenuSeparator';
-import { StyledDropdownMenuSubheader } from '../StyledDropdownMenuSubheader';
+import { Dropdown } from '@/ui/layout/dropdown/components/Dropdown';
+import { DropdownMenuHeader } from '@/ui/layout/dropdown/components/DropdownMenuHeader/DropdownMenuHeader';
+import { DropdownMenuInput } from '@/ui/layout/dropdown/components/DropdownMenuInput';
+import { DropdownMenuItemsContainer } from '@/ui/layout/dropdown/components/DropdownMenuItemsContainer';
+import { DropdownMenuSearchInput } from '@/ui/layout/dropdown/components/DropdownMenuSearchInput';
+import { DropdownMenuSeparator } from '@/ui/layout/dropdown/components/DropdownMenuSeparator';
+import { StyledDropdownMenuSubheader } from '@/ui/layout/dropdown/components/StyledDropdownMenuSubheader';
 
 const meta: Meta<typeof Dropdown> = {
   title: 'UI/Layout/Dropdown/Dropdown',
diff --git a/packages/twenty-front/src/modules/ui/layout/dropdown/components/__stories__/DropdownMenuInput.stories.tsx b/packages/twenty-front/src/modules/ui/layout/dropdown/components/__stories__/DropdownMenuInput.stories.tsx
index 782be7b1b6..4ef11679a6 100644
--- a/packages/twenty-front/src/modules/ui/layout/dropdown/components/__stories__/DropdownMenuInput.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/dropdown/components/__stories__/DropdownMenuInput.stories.tsx
@@ -1,7 +1,7 @@
 import { type Meta, type StoryObj } from '@storybook/react';
 
 import { ComponentDecorator } from 'twenty-ui/testing';
-import { DropdownMenuInput } from '../DropdownMenuInput';
+import { DropdownMenuInput } from '@/ui/layout/dropdown/components/DropdownMenuInput';
 
 const meta: Meta<typeof DropdownMenuInput> = {
   title: 'UI/Layout/Dropdown/DropdownMenuInput',
diff --git a/packages/twenty-front/src/modules/ui/layout/modal/components/__stories__/ConfirmationModal.stories.tsx b/packages/twenty-front/src/modules/ui/layout/modal/components/__stories__/ConfirmationModal.stories.tsx
index 5d58fc6e31..8a79b6f6e0 100644
--- a/packages/twenty-front/src/modules/ui/layout/modal/components/__stories__/ConfirmationModal.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/modal/components/__stories__/ConfirmationModal.stories.tsx
@@ -8,8 +8,8 @@ import { ComponentDecorator } from 'twenty-ui/testing';
 import { I18nFrontDecorator } from '~/testing/decorators/I18nFrontDecorator';
 import { RootDecorator } from '~/testing/decorators/RootDecorator';
 import { sleep } from '~/utils/sleep';
-import { isModalOpenedComponentState } from '../../states/isModalOpenedComponentState';
-import { ConfirmationModal } from '../ConfirmationModal';
+import { isModalOpenedComponentState } from '@/ui/layout/modal/states/isModalOpenedComponentState';
+import { ConfirmationModal } from '@/ui/layout/modal/components/ConfirmationModal';
 
 const initializeState = ({ set }: { set: SetRecoilState }) => {
   set(
diff --git a/packages/twenty-front/src/modules/ui/layout/modal/components/__stories__/Modal.stories.tsx b/packages/twenty-front/src/modules/ui/layout/modal/components/__stories__/Modal.stories.tsx
index 21bfc77b5e..de81ed0dd5 100644
--- a/packages/twenty-front/src/modules/ui/layout/modal/components/__stories__/Modal.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/modal/components/__stories__/Modal.stories.tsx
@@ -8,8 +8,8 @@ import { ComponentDecorator } from 'twenty-ui/testing';
 import { I18nFrontDecorator } from '~/testing/decorators/I18nFrontDecorator';
 import { RootDecorator } from '~/testing/decorators/RootDecorator';
 import { sleep } from '~/utils/sleep';
-import { isModalOpenedComponentState } from '../../states/isModalOpenedComponentState';
-import { Modal } from '../Modal';
+import { isModalOpenedComponentState } from '@/ui/layout/modal/states/isModalOpenedComponentState';
+import { Modal } from '@/ui/layout/modal/components/Modal';
 
 const initializeState = ({ set }: { set: SetRecoilState }) => {
   set(
diff --git a/packages/twenty-front/src/modules/ui/layout/modal/states/isModalOpenedComponentState.ts b/packages/twenty-front/src/modules/ui/layout/modal/states/isModalOpenedComponentState.ts
index 112f19c081..d9ccb1056e 100644
--- a/packages/twenty-front/src/modules/ui/layout/modal/states/isModalOpenedComponentState.ts
+++ b/packages/twenty-front/src/modules/ui/layout/modal/states/isModalOpenedComponentState.ts
@@ -1,5 +1,5 @@
 import { createComponentState } from '@/ui/utilities/state/component-state/utils/createComponentState';
-import { ModalComponentInstanceContext } from '../contexts/ModalComponentInstanceContext';
+import { ModalComponentInstanceContext } from '@/ui/layout/modal/contexts/ModalComponentInstanceContext';
 
 export const isModalOpenedComponentState = createComponentState<boolean>({
   key: 'isModalOpenedComponentState',
diff --git a/packages/twenty-front/src/modules/ui/layout/resizable-panel/components/ResizablePanelEdge.tsx b/packages/twenty-front/src/modules/ui/layout/resizable-panel/components/ResizablePanelEdge.tsx
index f12f77e530..b3e648d8a7 100644
--- a/packages/twenty-front/src/modules/ui/layout/resizable-panel/components/ResizablePanelEdge.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/resizable-panel/components/ResizablePanelEdge.tsx
@@ -1,9 +1,9 @@
 import styled from '@emotion/styled';
 
-import { RESIZE_EDGE_WIDTH_PX } from '../constants/ResizeEdgeWidthPx';
-import { useResizablePanel } from '../hooks/useResizablePanel';
-import { type ResizablePanelConstraints } from '../types/ResizablePanelConstraints';
-import { type ResizablePanelSide } from '../types/ResizablePanelSide';
+import { RESIZE_EDGE_WIDTH_PX } from '@/ui/layout/resizable-panel/constants/ResizeEdgeWidthPx';
+import { useResizablePanel } from '@/ui/layout/resizable-panel/hooks/useResizablePanel';
+import { type ResizablePanelConstraints } from '@/ui/layout/resizable-panel/types/ResizablePanelConstraints';
+import { type ResizablePanelSide } from '@/ui/layout/resizable-panel/types/ResizablePanelSide';
 
 type StyledEdgeProps = {
   isActive: boolean;
diff --git a/packages/twenty-front/src/modules/ui/layout/resizable-panel/components/ResizablePanelGap.tsx b/packages/twenty-front/src/modules/ui/layout/resizable-panel/components/ResizablePanelGap.tsx
index bd3394d562..db08935dab 100644
--- a/packages/twenty-front/src/modules/ui/layout/resizable-panel/components/ResizablePanelGap.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/resizable-panel/components/ResizablePanelGap.tsx
@@ -1,8 +1,8 @@
 import styled from '@emotion/styled';
 
-import { useResizablePanel } from '../hooks/useResizablePanel';
-import { type ResizablePanelConstraints } from '../types/ResizablePanelConstraints';
-import { type ResizablePanelSide } from '../types/ResizablePanelSide';
+import { useResizablePanel } from '@/ui/layout/resizable-panel/hooks/useResizablePanel';
+import { type ResizablePanelConstraints } from '@/ui/layout/resizable-panel/types/ResizablePanelConstraints';
+import { type ResizablePanelSide } from '@/ui/layout/resizable-panel/types/ResizablePanelSide';
 
 const StyledGap = styled.div<{ gapWidth: number }>`
   cursor: col-resize;
diff --git a/packages/twenty-front/src/modules/ui/layout/resizable-panel/constants/CommandMenuConstraints.ts b/packages/twenty-front/src/modules/ui/layout/resizable-panel/constants/CommandMenuConstraints.ts
index ad388a161d..26eb6b2d8a 100644
--- a/packages/twenty-front/src/modules/ui/layout/resizable-panel/constants/CommandMenuConstraints.ts
+++ b/packages/twenty-front/src/modules/ui/layout/resizable-panel/constants/CommandMenuConstraints.ts
@@ -1,4 +1,4 @@
-import { type ResizablePanelConstraints } from '../types/ResizablePanelConstraints';
+import { type ResizablePanelConstraints } from '@/ui/layout/resizable-panel/types/ResizablePanelConstraints';
 
 export const COMMAND_MENU_CONSTRAINTS: ResizablePanelConstraints = {
   min: 320,
diff --git a/packages/twenty-front/src/modules/ui/layout/resizable-panel/constants/NavigationDrawerConstraints.ts b/packages/twenty-front/src/modules/ui/layout/resizable-panel/constants/NavigationDrawerConstraints.ts
index f6913f3bd7..99373a445d 100644
--- a/packages/twenty-front/src/modules/ui/layout/resizable-panel/constants/NavigationDrawerConstraints.ts
+++ b/packages/twenty-front/src/modules/ui/layout/resizable-panel/constants/NavigationDrawerConstraints.ts
@@ -1,4 +1,4 @@
-import { type ResizablePanelConstraints } from '../types/ResizablePanelConstraints';
+import { type ResizablePanelConstraints } from '@/ui/layout/resizable-panel/types/ResizablePanelConstraints';
 
 export const NAVIGATION_DRAWER_CONSTRAINTS: ResizablePanelConstraints = {
   min: 180,
diff --git a/packages/twenty-front/src/modules/ui/layout/resizable-panel/hooks/useResizablePanel.ts b/packages/twenty-front/src/modules/ui/layout/resizable-panel/hooks/useResizablePanel.ts
index 28b892dbfe..2fc5d79182 100644
--- a/packages/twenty-front/src/modules/ui/layout/resizable-panel/hooks/useResizablePanel.ts
+++ b/packages/twenty-front/src/modules/ui/layout/resizable-panel/hooks/useResizablePanel.ts
@@ -3,9 +3,9 @@ import { useCallback, useState } from 'react';
 import { useTrackPointer } from '@/ui/utilities/pointer-event/hooks/useTrackPointer';
 import { type PointerEventListener } from '@/ui/utilities/pointer-event/types/PointerEventListener';
 
-import { RESIZE_DRAG_THRESHOLD_PX } from '../constants/ResizeDragThresholdPx';
-import { type ResizablePanelConstraints } from '../types/ResizablePanelConstraints';
-import { type ResizablePanelSide } from '../types/ResizablePanelSide';
+import { RESIZE_DRAG_THRESHOLD_PX } from '@/ui/layout/resizable-panel/constants/ResizeDragThresholdPx';
+import { type ResizablePanelConstraints } from '@/ui/layout/resizable-panel/types/ResizablePanelConstraints';
+import { type ResizablePanelSide } from '@/ui/layout/resizable-panel/types/ResizablePanelSide';
 
 type UseResizablePanelProps = {
   side: ResizablePanelSide;
diff --git a/packages/twenty-front/src/modules/ui/layout/tab-list/components/__stories__/TabMoreButton.stories.tsx b/packages/twenty-front/src/modules/ui/layout/tab-list/components/__stories__/TabMoreButton.stories.tsx
index 71391ec9ee..576095c56b 100644
--- a/packages/twenty-front/src/modules/ui/layout/tab-list/components/__stories__/TabMoreButton.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/tab-list/components/__stories__/TabMoreButton.stories.tsx
@@ -1,5 +1,5 @@
 import { type Meta, type StoryObj } from '@storybook/react';
-import { TabMoreButton } from '../TabMoreButton';
+import { TabMoreButton } from '@/ui/layout/tab-list/components/TabMoreButton';
 
 const meta: Meta<typeof TabMoreButton> = {
   title: 'UI/Layout/TabList/TabMoreButton',
diff --git a/packages/twenty-front/src/modules/ui/layout/tab-list/components/__stories__/Tablist.stories.tsx b/packages/twenty-front/src/modules/ui/layout/tab-list/components/__stories__/Tablist.stories.tsx
index 7bc9846590..16ff6a3c9c 100644
--- a/packages/twenty-front/src/modules/ui/layout/tab-list/components/__stories__/Tablist.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/tab-list/components/__stories__/Tablist.stories.tsx
@@ -10,7 +10,7 @@ import {
   IconUser,
 } from 'twenty-ui/display';
 import { ComponentWithRouterDecorator } from 'twenty-ui/testing';
-import { TabList } from '../TabList';
+import { TabList } from '@/ui/layout/tab-list/components/TabList';
 
 const tabs = [
   { id: 'general', title: 'General', logo: 'https://picsum.photos/200' },
diff --git a/packages/twenty-front/src/modules/ui/layout/table/components/__stories__/Table.stories.tsx b/packages/twenty-front/src/modules/ui/layout/table/components/__stories__/Table.stories.tsx
index 972c3eb155..3ff8f37bc5 100644
--- a/packages/twenty-front/src/modules/ui/layout/table/components/__stories__/Table.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/layout/table/components/__stories__/Table.stories.tsx
@@ -1,10 +1,10 @@
 import { type Meta, type StoryObj } from '@storybook/react';
 
-import { Table } from '../Table';
-import { TableCell } from '../TableCell';
-import { TableHeader } from '../TableHeader';
-import { TableRow } from '../TableRow';
-import { TableSection } from '../TableSection';
+import { Table } from '@/ui/layout/table/components/Table';
+import { TableCell } from '@/ui/layout/table/components/TableCell';
+import { TableHeader } from '@/ui/layout/table/components/TableHeader';
+import { TableRow } from '@/ui/layout/table/components/TableRow';
+import { TableSection } from '@/ui/layout/table/components/TableSection';
 import { ComponentDecorator } from 'twenty-ui/testing';
 
 const meta: Meta<typeof Table> = {
diff --git a/packages/twenty-front/src/modules/ui/navigation/bread-crumb/components/__stories__/Breadcrumb.stories.tsx b/packages/twenty-front/src/modules/ui/navigation/bread-crumb/components/__stories__/Breadcrumb.stories.tsx
index 8448477d99..a6fb75266c 100644
--- a/packages/twenty-front/src/modules/ui/navigation/bread-crumb/components/__stories__/Breadcrumb.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/navigation/bread-crumb/components/__stories__/Breadcrumb.stories.tsx
@@ -1,5 +1,5 @@
 import { type Meta, type StoryObj } from '@storybook/react';
-import { Breadcrumb } from '../Breadcrumb';
+import { Breadcrumb } from '@/ui/navigation/bread-crumb/components/Breadcrumb';
 
 import { ComponentWithRouterDecorator } from '~/testing/decorators/ComponentWithRouterDecorator';
 import { ComponentDecorator } from 'twenty-ui/testing';
diff --git a/packages/twenty-front/src/modules/ui/navigation/components/NavigationDrawerWidthEffect.tsx b/packages/twenty-front/src/modules/ui/navigation/components/NavigationDrawerWidthEffect.tsx
index 7f4912b378..b36aecd6ba 100644
--- a/packages/twenty-front/src/modules/ui/navigation/components/NavigationDrawerWidthEffect.tsx
+++ b/packages/twenty-front/src/modules/ui/navigation/components/NavigationDrawerWidthEffect.tsx
@@ -4,7 +4,7 @@ import { useRecoilValue } from 'recoil';
 import {
   NAVIGATION_DRAWER_WIDTH_VAR,
   navigationDrawerWidthState,
-} from '../states/navigationDrawerWidthState';
+} from '@/ui/navigation/states/navigationDrawerWidthState';
 
 export const NavigationDrawerWidthEffect = () => {
   const navigationDrawerWidth = useRecoilValue(navigationDrawerWidthState);
diff --git a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawer.tsx b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawer.tsx
index 18f36e737a..a158a6df0f 100644
--- a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawer.tsx
+++ b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/NavigationDrawer.tsx
@@ -1,5 +1,5 @@
 import styled from '@emotion/styled';
-import { type ReactNode, useCallback, useState } from 'react';
+import { type ReactNode, useState } from 'react';
 import { useRecoilState, useSetRecoilState } from 'recoil';
 
 import { useIsSettingsDrawer } from '@/navigation/hooks/useIsSettingsDrawer';
@@ -9,12 +9,12 @@ import { NAVIGATION_DRAWER_COLLAPSED_WIDTH } from '@/ui/layout/resizable-panel/c
 import { NAVIGATION_DRAWER_CONSTRAINTS } from '@/ui/layout/resizable-panel/constants/NavigationDrawerConstraints';
 import { useIsMobile } from '@/ui/utilities/responsive/hooks/useIsMobile';
 import { MOBILE_VIEWPORT } from 'twenty-ui/theme';
-import { isNavigationDrawerExpandedState } from '../../states/isNavigationDrawerExpanded';
+import { isNavigationDrawerExpandedState } from '@/ui/navigation/states/isNavigationDrawerExpanded';
 import {
   NAVIGATION_DRAWER_WIDTH_VAR,
   navigationDrawerWidthState,
-} from '../../states/navigationDrawerWidthState';
-import { NavigationDrawerWidthEffect } from '../../components/NavigationDrawerWidthEffect';
+} from '@/ui/navigation/states/navigationDrawerWidthState';
+import { NavigationDrawerWidthEffect } from '@/ui/navigation/components/NavigationDrawerWidthEffect';
 import { NavigationDrawerBackButton } from './NavigationDrawerBackButton';
 import { NavigationDrawerHeader } from './NavigationDrawerHeader';
 
@@ -93,25 +93,22 @@ export const NavigationDrawer = ({
     setIsHovered(false);
   };
 
-  const handleCollapse = useCallback(() => {
+  const handleCollapse = () => {
     setIsNavigationDrawerExpanded(false);
     setIsResizing(false);
     setTableWidthResizeIsActive(true);
-  }, [setIsNavigationDrawerExpanded, setTableWidthResizeIsActive]);
+  };
 
-  const handleWidthChange = useCallback(
-    (width: number) => {
-      setNavigationDrawerWidth(width);
-      setIsResizing(false);
-      setTableWidthResizeIsActive(true);
-    },
-    [setNavigationDrawerWidth, setTableWidthResizeIsActive],
-  );
+  const handleWidthChange = (width: number) => {
+    setNavigationDrawerWidth(width);
+    setIsResizing(false);
+    setTableWidthResizeIsActive(true);
+  };
 
-  const handleResizeStart = useCallback(() => {
+  const handleResizeStart = () => {
     setIsResizing(true);
     setTableWidthResizeIsActive(false);
-  }, [setTableWidthResizeIsActive]);
+  };
 
   return (
     <>
diff --git a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/__stories__/NavigationDrawer.stories.tsx b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/__stories__/NavigationDrawer.stories.tsx
index 4cd72e4c77..a21d14a96b 100644
--- a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/__stories__/NavigationDrawer.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/__stories__/NavigationDrawer.stories.tsx
@@ -38,11 +38,11 @@ import { AdvancedSettingsToggle } from 'twenty-ui/navigation';
 import { getOsControlSymbol } from 'twenty-ui/utilities';
 import { I18nFrontDecorator } from '~/testing/decorators/I18nFrontDecorator';
 
-import { NavigationDrawer } from '../NavigationDrawer';
-import { NavigationDrawerItem } from '../NavigationDrawerItem';
-import { NavigationDrawerItemGroup } from '../NavigationDrawerItemGroup';
-import { NavigationDrawerSection } from '../NavigationDrawerSection';
-import { NavigationDrawerSectionTitle } from '../NavigationDrawerSectionTitle';
+import { NavigationDrawer } from '@/ui/navigation/navigation-drawer/components/NavigationDrawer';
+import { NavigationDrawerItem } from '@/ui/navigation/navigation-drawer/components/NavigationDrawerItem';
+import { NavigationDrawerItemGroup } from '@/ui/navigation/navigation-drawer/components/NavigationDrawerItemGroup';
+import { NavigationDrawerSection } from '@/ui/navigation/navigation-drawer/components/NavigationDrawerSection';
+import { NavigationDrawerSectionTitle } from '@/ui/navigation/navigation-drawer/components/NavigationDrawerSectionTitle';
 
 const meta: Meta<typeof NavigationDrawer> = {
   title: 'UI/Navigation/NavigationDrawer/NavigationDrawer',
diff --git a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/__stories__/NavigationDrawerCollapseButton.stories.tsx b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/__stories__/NavigationDrawerCollapseButton.stories.tsx
index e680715643..a82091f0bb 100644
--- a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/__stories__/NavigationDrawerCollapseButton.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/__stories__/NavigationDrawerCollapseButton.stories.tsx
@@ -1,6 +1,6 @@
 import { type Meta, type StoryObj } from '@storybook/react';
 
-import { NavigationDrawerCollapseButton } from '../NavigationDrawerCollapseButton';
+import { NavigationDrawerCollapseButton } from '@/ui/navigation/navigation-drawer/components/NavigationDrawerCollapseButton';
 import { ComponentDecorator } from 'twenty-ui/testing';
 
 const meta: Meta<typeof NavigationDrawerCollapseButton> = {
diff --git a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/__stories__/NavigationDrawerItem.stories.tsx b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/__stories__/NavigationDrawerItem.stories.tsx
index fe14d5dee5..e6ef688fc5 100644
--- a/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/__stories__/NavigationDrawerItem.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/navigation/navigation-drawer/components/__stories__/NavigationDrawerItem.stories.tsx
@@ -6,7 +6,7 @@ import { CatalogDecorator, type CatalogStory } from 'twenty-ui/testing';
 import { getOsControlSymbol } from 'twenty-ui/utilities';
 import { ComponentWithRouterDecorator } from '~/testing/decorators/ComponentWithRouterDecorator';
 import { MemoryRouterDecorator } from '~/testing/decorators/MemoryRouterDecorator';
-import { NavigationDrawerItem } from '../NavigationDrawerItem';
+import { NavigationDrawerItem } from '@/ui/navigation/navigation-drawer/components/NavigationDrawerItem';
 
 const StyledContainer = styled.div`
   display: flex;
diff --git a/packages/twenty-front/src/modules/ui/navigation/step-bar/hooks/__tests__/useStepBar.test.tsx b/packages/twenty-front/src/modules/ui/navigation/step-bar/hooks/__tests__/useStepBar.test.tsx
index b4d36aa115..9592d736d5 100644
--- a/packages/twenty-front/src/modules/ui/navigation/step-bar/hooks/__tests__/useStepBar.test.tsx
+++ b/packages/twenty-front/src/modules/ui/navigation/step-bar/hooks/__tests__/useStepBar.test.tsx
@@ -1,8 +1,8 @@
 import { act, renderHook } from '@testing-library/react';
 import { RecoilRoot, useRecoilValue } from 'recoil';
 
-import { stepBarInternalState } from '../../states/stepBarInternalState';
-import { useStepBar } from '../useStepBar';
+import { stepBarInternalState } from '@/ui/navigation/step-bar/states/stepBarInternalState';
+import { useStepBar } from '@/ui/navigation/step-bar/hooks/useStepBar';
 
 const renderHooks = (initialStep: number) => {
   const { result } = renderHook(
diff --git a/packages/twenty-front/src/modules/ui/navigation/step-bar/hooks/useStepBar.ts b/packages/twenty-front/src/modules/ui/navigation/step-bar/hooks/useStepBar.ts
index 0bc1449420..fce51408cd 100644
--- a/packages/twenty-front/src/modules/ui/navigation/step-bar/hooks/useStepBar.ts
+++ b/packages/twenty-front/src/modules/ui/navigation/step-bar/hooks/useStepBar.ts
@@ -1,7 +1,7 @@
 import { useCallback, useEffect } from 'react';
 import { useRecoilState } from 'recoil';
 
-import { stepBarInternalState } from '../states/stepBarInternalState';
+import { stepBarInternalState } from '@/ui/navigation/step-bar/states/stepBarInternalState';
 
 export type StepsOptions = {
   initialStep: number;
diff --git a/packages/twenty-front/src/modules/ui/theme/components/UserThemeProviderEffect.tsx b/packages/twenty-front/src/modules/ui/theme/components/UserThemeProviderEffect.tsx
index 544f6af827..72cb40054c 100644
--- a/packages/twenty-front/src/modules/ui/theme/components/UserThemeProviderEffect.tsx
+++ b/packages/twenty-front/src/modules/ui/theme/components/UserThemeProviderEffect.tsx
@@ -1,7 +1,7 @@
 import { useContext, useEffect } from 'react';
 
 import { ThemeSchemeContext } from '@/ui/theme/components/BaseThemeProvider';
-import { useColorScheme } from '../hooks/useColorScheme';
+import { useColorScheme } from '@/ui/theme/hooks/useColorScheme';
 
 export const UserThemeProviderEffect = () => {
   const { colorScheme } = useColorScheme();
diff --git a/packages/twenty-front/src/modules/ui/utilities/drag-select/components/DragSelect.tsx b/packages/twenty-front/src/modules/ui/utilities/drag-select/components/DragSelect.tsx
index a479676a88..9c75af260e 100644
--- a/packages/twenty-front/src/modules/ui/utilities/drag-select/components/DragSelect.tsx
+++ b/packages/twenty-front/src/modules/ui/utilities/drag-select/components/DragSelect.tsx
@@ -6,8 +6,8 @@ import { useDragSelectWithAutoScroll } from '@/ui/utilities/drag-select/hooks/us
 import { useTrackPointer } from '@/ui/utilities/pointer-event/hooks/useTrackPointer';
 import { isDefined } from 'twenty-shared/utils';
 import { isDeeplyEqual } from '~/utils/isDeeplyEqual';
-import { type SelectionBox } from '../types/SelectionBox';
-import { isValidSelectionStart } from '../utils/selectionBoxValidation';
+import { type SelectionBox } from '@/ui/utilities/drag-select/types/SelectionBox';
+import { isValidSelectionStart } from '@/ui/utilities/drag-select/utils/selectionBoxValidation';
 
 type DragSelectProps = {
   selectableItemsContainerRef: RefObject<HTMLElement>;
diff --git a/packages/twenty-front/src/modules/ui/utilities/drag-select/components/__stories__/DragSelect.stories.tsx b/packages/twenty-front/src/modules/ui/utilities/drag-select/components/__stories__/DragSelect.stories.tsx
index dcf392609a..efaf6d0d55 100644
--- a/packages/twenty-front/src/modules/ui/utilities/drag-select/components/__stories__/DragSelect.stories.tsx
+++ b/packages/twenty-front/src/modules/ui/utilities/drag-select/components/__stories__/DragSelect.stories.tsx
@@ -6,7 +6,7 @@ import { useRef, useState } from 'react';
 import { ScrollWrapper } from '@/ui/utilities/scroll/components/ScrollWrapper';
 import { isDefined } from 'twenty-shared/utils';
 import { ComponentDecorator } from 'twenty-ui/testing';
-import { DragSelect } from '../DragSelect';
+import { DragSelect } from '@/ui/utilities/drag-select/components/DragSelect';
 
 const StyledContainer = styled.div`
   border: 1px solid ${({ theme }) => theme.border.color.light};
diff --git a/packages/twenty-front/src/modules/ui/utilities/drag-select/components/__tests__/DragSelect.test.tsx b/packages/twenty-front/src/modules/ui/utilities/drag-select/components/__tests__/DragSelect.test.tsx
index 7b4da919e0..5458ff0a87 100644
--- a/packages/twenty-front/src/modules/ui/utilities/drag-select/components/__tests__/DragSelect.test.tsx
+++ b/packages/twenty-front/src/modules/ui/utilities/drag-select/components/__tests__/DragSelect.test.tsx
@@ -3,8 +3,8 @@ import { act } from 'react';
 import { RecoilRoot } from 'recoil';
 
 import { type PointerEventListener } from '@/ui/utilities/pointer-event/types/PointerEventListener';
-import { useDragSelect } from '../../hooks/useDragSelect';
-import { DragSelect } from '../DragSelect';
+import { useDragSelect } from '@/ui/utilities/drag-select/hooks/useDragSelect';
+import { DragSelect } from '@/ui/utilities/drag-select/components/DragSelect';
 
 jest.mock('../../hooks/useDragSelect');
 jest.mock('../../hooks/useDragSelectWithAutoScroll', () => ({
diff --git a/packages/twenty-front/src/modules/ui/utilities/drag-select/hooks/__tests__/useDragSelect.test.tsx b/packages/twenty-front/src/modules/ui/utilities/drag-select/hooks/__tests__/useDragSelect.test.tsx
index cbc62c02d1..c75fe128b1 100644
--- a/packages/twenty-front/src/modules/ui/utilities/drag-select/hooks/__tests__/useDragSelect.test.tsx
+++ b/packages/twenty-front/src/modules/ui/utilities/drag-select/hooks/__tests__/useDragSelect.test.tsx
@@ -2,7 +2,7 @@ import { renderHook } from '@testing-library/react';
 import { act } from 'react';
 import { RecoilRoot } from 'recoil';
 
-import { useDragSelect } from '../useDragSelect';
+import { useDragSelect } from '@/ui/utilities/drag-select/hooks/useDragSelect';
 
 describe('useDragSelect', () => {
   it('Should set drag selection start state', () => {
diff --git a/packages/twenty-front/src/modules/ui/utilities/drag-select/hooks/__tests__/useDragSelectWithAutoScroll.test.tsx b/packages/twenty-front/src/modules/ui/utilities/drag-select/hooks/__tests__/useDragSelectWithAutoScroll.test.tsx
index 7eda05a3ae..c436c32b69 100644
--- a/packages/twenty-front/src/modules/ui/utilities/drag-select/hooks/__tests__/useDragSelectWithAutoScroll.test.tsx
+++ b/packages/twenty-front/src/modules/ui/utilities/drag-select/hooks/__tests__/useDragSelectWithAutoScroll.test.tsx
@@ -1,7 +1,7 @@
 import { renderHook } from '@testing-library/react';
 
 import { useComponentInstanceStateContext } from '@/ui/utilities/state/component-state/hooks/useComponentInstanceStateContext';
-import { useDragSelectWithAutoScroll } from '../useDragSelectWithAutoScroll';
+import { useDragSelectWithAutoScroll } from '@/ui/utilities/drag-select/hooks/useDragSelectWithAutoScroll';
 
 jest.mock(
   '@/ui/utilities/state/component-state/hooks/useComponentInstanceStateContext',
diff --git a/packages/twenty-front/src/modules/ui/utilities/drag-select/hooks/useDragSelect.ts b/packages/twenty-front/src/modules/ui/utilities/drag-select/hooks/useDragSelect.ts
index fb9c21a75a..49b39662d9 100644
--- a/packages/twenty-front/src/modules/ui/utilities/drag-select/hooks/useDragSelect.ts
+++ b/packages/twenty-front/src/modules/ui/utilities/drag-select/hooks/useDragSelect.ts
@@ -1,6 +1,6 @@
 import { useRecoilCallback, useSetRecoilState } from 'recoil';
 
-import { isDragSelectionStartEnabledState } from '../states/internal/isDragSelectionStartEnabledState';
+import { isDragSelectionStartEnabledState } from '@/ui/utilities/drag-select/states/internal/isDragSelectionStartEnabledState';
 
 export const useDragSelect = () => {
   const setIsDragSelectionStartEnabled = useSetRecoilState(
diff --git a/packages/twenty-front/src/modules/ui/utilities/drag-select/hooks/useDragSelectWithAutoScroll.ts b/packages/twenty-front/src/modules/ui/utilities/drag-select/hooks/useDragSelectWithAutoScroll.ts
index f9015df799..3b6fb29587 100644
--- a/packages/twenty-front/src/modules/ui/utilities/drag-select/hooks/useDragSelectWithAutoScroll.ts
+++ b/packages/twenty-front/src/modules/ui/utilities/drag-select/hooks/useDragSelectWithAutoScroll.ts
@@ -4,8 +4,8 @@ import { ScrollWrapperComponentInstanceContext } from '@/ui/utilities/scroll/sta
 import { useComponentInstanceStateContext } from '@/ui/utilities/state/component-state/hooks/useComponentInstanceStateContext';
 import { isNonEmptyString } from '@sniptt/guards';
 import { isDefined } from 'twenty-shared/utils';
-import { AUTO_SCROLL_EDGE_THRESHOLD_PX } from '../constants/AutoScrollEdgeThresholdPx';
-import { AUTO_SCROLL_MAX_SPEED_PX } from '../constants/AutoScrollMaxSpeedPx';
+import { AUTO_SCROLL_EDGE_THRESHOLD_PX } from '@/ui/utilities/drag-select/constants/AutoScrollEdgeThresholdPx';
+import { AUTO_SCROLL_MAX_SPEED_PX } from '@/ui/utilities/drag-select/constants/AutoScrollMaxSpeedPx';
 
 type UseDragSelectWithAutoScrollProps = {
   scrollWrapperComponentInstanceId?: string;
diff --git a/packages/twenty-front/src/modules/ui/utilities/drag-select/utils/__tests__/selectionBoxValidation.test.ts b/packages/twenty-front/src/modules/ui/utilities/drag-select/utils/__tests__/selectionBoxValidation.test.ts
index b0be4aa0a3..0e652da28f 100644
--- a/packages/twenty-front/src/modules/ui/utilities/drag-select/utils/__tests__/selectionBoxValidation.test.ts
+++ b/packages/twenty-front/src/modules/ui/utilities/drag-select/utils/__tests__/selectionBoxValidation.test.ts
@@ -1,5 +1,5 @@
-import { type SelectionBox } from '../../types/SelectionBox';
-import { isValidSelectionStart } from '../selectionBoxValidation';
+import { type SelectionBox } from '@/ui/utilities/drag-select/types/SelectionBox';
+import { isValidSelectionStart } from '@/ui/utilities/drag-select/utils/selectionBoxValidation';
 
 describe('selectionBoxValidation', () => {
   describe('isValidSelectionStart', () => {
diff --git a/packages/twenty-front/src/modules/ui/utilities/hotkey/hooks/__tests__/useGoToHotkeys.test.tsx b/packages/twenty-front/src/modules/ui/utilities/hotkey/hooks/__tests__/useGoToHotkeys.test.tsx
index b4de42707e..c2a46b5b20 100644
--- a/packages/twenty-front/src/modules/ui/utilities/hotkey/hooks/__tests__/useGoToHotkeys.test.tsx
+++ b/packages/twenty-front/src/modules/ui/utilities/hotkey/hooks/__tests__/useGoToHotkeys.test.tsx
@@ -2,7 +2,7 @@ import { act, fireEvent, renderHook } from '@testing-library/react';
 import { MemoryRouter, useLocation } from 'react-router-dom';
 import { RecoilRoot } from 'recoil';
 
-import { useGoToHotkeys } from '../useGoToHotkeys';
+import { useGoToHotkeys } from '@/ui/utilities/hotkey/hooks/useGoToHotkeys';
 
 const Wrapper = ({ children }: { children: React.ReactNode }) => (
   <MemoryRouter
diff --git a/packages/twenty-front/src/modules/ui/utilities/hotkey/hooks/useGlobalHotkeysSequence.ts b/packages/twenty-front/src/modules/ui/utilities/hotkey/hooks/useGlobalHotkeysSequence.ts
index 9b8a37ca04..7a68e75416 100644
--- a/packages/twenty-front/src/modules/ui/utilities/hotkey/hooks/useGlobalHotkeysSequence.ts
+++ b/packages/twenty-front/src/modules/ui/utilities/hotkey/hooks/useGlobalHotkeysSequence.ts
@@ -2,7 +2,7 @@ import { type Options, useHotkeys } from 'react-hotkeys-hook';
 import { type Keys } from 'react-hotkeys-hook/dist/types';
 import { useRecoilState } from 'recoil';
 
-import { pendingHotkeyState } from '../states/internal/pendingHotkeysState';
+import { pendingHotkeyState } from '@/ui/utilities/hotkey/states/internal/pendingHotkeysState';
 
 import { useGlobalHotkeysCallback } from '@/ui/utilities/hotkey/hooks/useGlobalHotkeysCallback';
 import { isDefined } from 'twenty-shared/utils';
diff --git a/packages/twenty-front/src/modules/ui/utilities/hotkey/hooks/useHotkeysOnFocusedElementCallback.ts b/packages/twenty-front/src/modules/ui/utilities/hotkey/hooks/useHotkeysOnFocusedElementCallback.ts
index 660e8cc893..56a5f07c95 100644
--- a/packages/twenty-front/src/modules/ui/utilities/hotkey/hooks/useHotkeysOnFocusedElementCallback.ts
+++ b/packages/twenty-front/src/modules/ui/utilities/hotkey/hooks/useHotkeysOnFocusedElementCallback.ts
@@ -5,7 +5,7 @@ import {
 } from 'react-hotkeys-hook/dist/types';
 import { useRecoilCallback } from 'recoil';
 import { logDebug } from '~/utils/logDebug';
-import { currentFocusIdSelector } from '../../focus/states/currentFocusIdSelector';
+import { currentFocusIdSelector } from '@/ui/utilities/focus/states/currentFocusIdSelector';
 
 export const useHotkeysOnFocusedElementCallback = (
   dependencies?: OptionsOrDependencyArray,
diff --git a/packages/twenty-front/src/modules/ui/utilities/pointer-event/hooks/__tests__/useTrackPointer.test.tsx b/packages/twenty-front/src/modules/ui/utilities/pointer-event/hooks/__tests__/useTrackPointer.test.tsx
index f313a48616..a78f4a5c0e 100644
--- a/packages/twenty-front/src/modules/ui/utilities/pointer-event/hooks/__tests__/useTrackPointer.test.tsx
+++ b/packages/twenty-front/src/modules/ui/utilities/pointer-event/hooks/__tests__/useTrackPointer.test.tsx
@@ -1,6 +1,6 @@
 import { act, renderHook } from '@testing-library/react';
 
-import { useTrackPointer } from '../useTrackPointer';
+import { useTrackPointer } from '@/ui/utilities/pointer-event/hooks/useTrackPointer';
 
 describe('useTrackPointer', () => {
   it('Should call onMouseDown when mouse down event is triggered', () => {
diff --git a/packages/twenty-front/src/modules/views/hooks/__tests__/useApplyCurrentViewFiltersToCurrentRecordFilters.test.tsx b/packages/twenty-front/src/modules/views/hooks/__tests__/useApplyCurrentViewFiltersToCurrentRecordFilters.test.tsx
index 9ff907e04e..b9188b1f4d 100644
--- a/packages/twenty-front/src/modules/views/hooks/__tests__/useApplyCurrentViewFiltersToCurrentRecordFilters.test.tsx
+++ b/packages/twenty-front/src/modules/views/hooks/__tests__/useApplyCurrentViewFiltersToCurrentRecordFilters.test.tsx
@@ -21,7 +21,7 @@ import {
   mockedViewsData,
 } from '~/testing/mock-data/views';
 import { generatedMockObjectMetadataItems } from '~/testing/utils/generatedMockObjectMetadataItems';
-import { useApplyCurrentViewFiltersToCurrentRecordFilters } from '../useApplyCurrentViewFiltersToCurrentRecordFilters';
+import { useApplyCurrentViewFiltersToCurrentRecordFilters } from '@/views/hooks/useApplyCurrentViewFiltersToCurrentRecordFilters';
 
 const mockObjectMetadataItemNameSingular = 'company';
 
diff --git a/packages/twenty-front/src/modules/views/hooks/__tests__/useApplyCurrentViewSortsToCurrentRecordSorts.test.tsx b/packages/twenty-front/src/modules/views/hooks/__tests__/useApplyCurrentViewSortsToCurrentRecordSorts.test.tsx
index 3183f20b02..1824540c08 100644
--- a/packages/twenty-front/src/modules/views/hooks/__tests__/useApplyCurrentViewSortsToCurrentRecordSorts.test.tsx
+++ b/packages/twenty-front/src/modules/views/hooks/__tests__/useApplyCurrentViewSortsToCurrentRecordSorts.test.tsx
@@ -18,7 +18,7 @@ import {
   mockedViewsData,
 } from '~/testing/mock-data/views';
 import { generatedMockObjectMetadataItems } from '~/testing/utils/generatedMockObjectMetadataItems';
-import { useApplyCurrentViewSortsToCurrentRecordSorts } from '../useApplyCurrentViewSortsToCurrentRecordSorts';
+import { useApplyCurrentViewSortsToCurrentRecordSorts } from '@/views/hooks/useApplyCurrentViewSortsToCurrentRecordSorts';
 
 const mockObjectMetadataItemNameSingular = 'company';
 
diff --git a/packages/twenty-front/src/modules/views/hooks/__tests__/useApplyViewFiltersToCurrentRecordFilters.test.tsx b/packages/twenty-front/src/modules/views/hooks/__tests__/useApplyViewFiltersToCurrentRecordFilters.test.tsx
index 24337959de..13f7b8566a 100644
--- a/packages/twenty-front/src/modules/views/hooks/__tests__/useApplyViewFiltersToCurrentRecordFilters.test.tsx
+++ b/packages/twenty-front/src/modules/views/hooks/__tests__/useApplyViewFiltersToCurrentRecordFilters.test.tsx
@@ -8,7 +8,7 @@ import { ViewFilterOperand } from 'twenty-shared/types';
 import { getFilterTypeFromFieldType, isDefined } from 'twenty-shared/utils';
 import { getJestMetadataAndApolloMocksAndActionMenuWrapper } from '~/testing/jest/getJestMetadataAndApolloMocksAndActionMenuWrapper';
 import { generatedMockObjectMetadataItems } from '~/testing/utils/generatedMockObjectMetadataItems';
-import { useApplyViewFiltersToCurrentRecordFilters } from '../useApplyViewFiltersToCurrentRecordFilters';
+import { useApplyViewFiltersToCurrentRecordFilters } from '@/views/hooks/useApplyViewFiltersToCurrentRecordFilters';
 
 const mockObjectMetadataItemNameSingular = 'company';
 
diff --git a/packages/twenty-front/src/modules/views/hooks/__tests__/useApplyViewSortsToCurrentRecordSorts.test.tsx b/packages/twenty-front/src/modules/views/hooks/__tests__/useApplyViewSortsToCurrentRecordSorts.test.tsx
index 07ddb0c55e..9400eb27ba 100644
--- a/packages/twenty-front/src/modules/views/hooks/__tests__/useApplyViewSortsToCurrentRecordSorts.test.tsx
+++ b/packages/twenty-front/src/modules/views/hooks/__tests__/useApplyViewSortsToCurrentRecordSorts.test.tsx
@@ -9,7 +9,7 @@ import { type CoreViewSortEssential } from '@/views/types/CoreViewSortEssential'
 import { isDefined } from 'twenty-shared/utils';
 import { ViewSortDirection } from '~/generated/graphql';
 import { getJestMetadataAndApolloMocksAndActionMenuWrapper } from '~/testing/jest/getJestMetadataAndApolloMocksAndActionMenuWrapper';
-import { useApplyViewSortsToCurrentRecordSorts } from '../useApplyViewSortsToCurrentRecordSorts';
+import { useApplyViewSortsToCurrentRecordSorts } from '@/views/hooks/useApplyViewSortsToCurrentRecordSorts';
 
 const mockObjectMetadataItemNameSingular = 'company';
 
diff --git a/packages/twenty-front/src/modules/views/hooks/__tests__/useInitializeFilterOnFieldMetadataItemFromViewBarFilterDropdown.test.tsx b/packages/twenty-front/src/modules/views/hooks/__tests__/useInitializeFilterOnFieldMetadataItemFromViewBarFilterDropdown.test.tsx
index b82483b8de..3f1e29808d 100644
--- a/packages/twenty-front/src/modules/views/hooks/__tests__/useInitializeFilterOnFieldMetadataItemFromViewBarFilterDropdown.test.tsx
+++ b/packages/twenty-front/src/modules/views/hooks/__tests__/useInitializeFilterOnFieldMetadataItemFromViewBarFilterDropdown.test.tsx
@@ -4,7 +4,7 @@ import { RecoilRoot } from 'recoil';
 
 import { objectFilterDropdownFilterIsSelectedComponentState } from '@/object-record/object-filter-dropdown/states/objectFilterDropdownFilterIsSelectedComponentState';
 import { selectedOperandInDropdownComponentState } from '@/object-record/object-filter-dropdown/states/selectedOperandInDropdownComponentState';
-import { useInitializeFilterOnFieldMetadataItemFromViewBarFilterDropdown } from '../useInitializeFilterOnFieldMetadataItemFromViewBarFilterDropdown';
+import { useInitializeFilterOnFieldMetadataItemFromViewBarFilterDropdown } from '@/views/hooks/useInitializeFilterOnFieldMetadataItemFromViewBarFilterDropdown';
 
 import { objectMetadataItemsState } from '@/object-metadata/states/objectMetadataItemsState';
 import { ObjectFilterDropdownComponentInstanceContext } from '@/object-record/object-filter-dropdown/states/contexts/ObjectFilterDropdownComponentInstanceContext';
diff --git a/packages/twenty-front/src/modules/views/hooks/useMapViewFiltersToFilters.ts b/packages/twenty-front/src/modules/views/hooks/useMapViewFiltersToFilters.ts
index 5202b8d050..a396a2ac77 100644
--- a/packages/twenty-front/src/modules/views/hooks/useMapViewFiltersToFilters.ts
+++ b/packages/twenty-front/src/modules/views/hooks/useMapViewFiltersToFilters.ts
@@ -1,8 +1,8 @@
 import { useRecordIndexContextOrThrow } from '@/object-record/record-index/contexts/RecordIndexContext';
 import { type CoreViewFilter } from '~/generated/graphql';
-import { type ViewFilter } from '../types/ViewFilter';
-import { getFilterableFields } from '../utils/getFilterableFields';
-import { mapViewFiltersToFilters } from '../utils/mapViewFiltersToFilters';
+import { type ViewFilter } from '@/views/types/ViewFilter';
+import { getFilterableFields } from '@/views/utils/getFilterableFields';
+import { mapViewFiltersToFilters } from '@/views/utils/mapViewFiltersToFilters';
 
 export const useMapViewFiltersToFilters = () => {
   const { objectMetadataItem } = useRecordIndexContextOrThrow();
diff --git a/packages/twenty-front/src/modules/views/hooks/useQueryVariablesFromParentView.ts b/packages/twenty-front/src/modules/views/hooks/useQueryVariablesFromParentView.ts
index a730843a21..6de737a3da 100644
--- a/packages/twenty-front/src/modules/views/hooks/useQueryVariablesFromParentView.ts
+++ b/packages/twenty-front/src/modules/views/hooks/useQueryVariablesFromParentView.ts
@@ -3,7 +3,7 @@ import { contextStoreRecordShowParentViewComponentState } from '@/context-store/
 import { type ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
 import { useFilterValueDependencies } from '@/object-record/record-filter/hooks/useFilterValueDependencies';
 import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValue';
-import { getQueryVariablesFromFiltersAndSorts } from '../utils/getQueryVariablesFromFiltersAndSorts';
+import { getQueryVariablesFromFiltersAndSorts } from '@/views/utils/getQueryVariablesFromFiltersAndSorts';
 
 export const useQueryVariablesFromParentView = ({
   objectMetadataItem,
diff --git a/packages/twenty-front/src/modules/views/utils/__tests__/areViewFiltersEqual.test.ts b/packages/twenty-front/src/modules/views/utils/__tests__/areViewFiltersEqual.test.ts
index 5981a3d6aa..3b98d304f3 100644
--- a/packages/twenty-front/src/modules/views/utils/__tests__/areViewFiltersEqual.test.ts
+++ b/packages/twenty-front/src/modules/views/utils/__tests__/areViewFiltersEqual.test.ts
@@ -1,6 +1,6 @@
 import { type ViewFilter } from '@/views/types/ViewFilter';
 import { ViewFilterOperand } from 'twenty-shared/types';
-import { areViewFiltersEqual } from '../areViewFiltersEqual';
+import { areViewFiltersEqual } from '@/views/utils/areViewFiltersEqual';
 
 describe('areViewFiltersEqual', () => {
   const baseFilter: ViewFilter = {
diff --git a/packages/twenty-front/src/modules/views/utils/__tests__/getViewFiltersToCreate.test.ts b/packages/twenty-front/src/modules/views/utils/__tests__/getViewFiltersToCreate.test.ts
index 3013a646e7..dc736c4462 100644
--- a/packages/twenty-front/src/modules/views/utils/__tests__/getViewFiltersToCreate.test.ts
+++ b/packages/twenty-front/src/modules/views/utils/__tests__/getViewFiltersToCreate.test.ts
@@ -1,6 +1,6 @@
 import { type ViewFilter } from '@/views/types/ViewFilter';
 import { ViewFilterOperand } from 'twenty-shared/types';
-import { getViewFiltersToCreate } from '../getViewFiltersToCreate';
+import { getViewFiltersToCreate } from '@/views/utils/getViewFiltersToCreate';
 
 describe('getViewFiltersToCreate', () => {
   const baseFilter: ViewFilter = {
diff --git a/packages/twenty-front/src/modules/views/utils/__tests__/getViewFiltersToDelete.test.ts b/packages/twenty-front/src/modules/views/utils/__tests__/getViewFiltersToDelete.test.ts
index 566070c54e..61ee89a7a4 100644
--- a/packages/twenty-front/src/modules/views/utils/__tests__/getViewFiltersToDelete.test.ts
+++ b/packages/twenty-front/src/modules/views/utils/__tests__/getViewFiltersToDelete.test.ts
@@ -1,6 +1,6 @@
 import { type ViewFilter } from '@/views/types/ViewFilter';
 import { ViewFilterOperand } from 'twenty-shared/types';
-import { getViewFiltersToDelete } from '../getViewFiltersToDelete';
+import { getViewFiltersToDelete } from '@/views/utils/getViewFiltersToDelete';
 
 describe('getViewFiltersToDelete', () => {
   const baseFilter: ViewFilter = {
diff --git a/packages/twenty-front/src/modules/views/utils/__tests__/getViewFiltersToUpdate.test.ts b/packages/twenty-front/src/modules/views/utils/__tests__/getViewFiltersToUpdate.test.ts
index 85fdc6eb8f..95116bd39d 100644
--- a/packages/twenty-front/src/modules/views/utils/__tests__/getViewFiltersToUpdate.test.ts
+++ b/packages/twenty-front/src/modules/views/utils/__tests__/getViewFiltersToUpdate.test.ts
@@ -1,6 +1,6 @@
 import { type ViewFilter } from '@/views/types/ViewFilter';
 import { ViewFilterOperand } from 'twenty-shared/types';
-import { getViewFiltersToUpdate } from '../getViewFiltersToUpdate';
+import { getViewFiltersToUpdate } from '@/views/utils/getViewFiltersToUpdate';
 
 describe('getViewFiltersToUpdate', () => {
   const baseFilter: ViewFilter = {
diff --git a/packages/twenty-front/src/modules/views/utils/__tests__/getViewSortsToCreate.test.ts b/packages/twenty-front/src/modules/views/utils/__tests__/getViewSortsToCreate.test.ts
index 100b2fc7a7..12ddb14a67 100644
--- a/packages/twenty-front/src/modules/views/utils/__tests__/getViewSortsToCreate.test.ts
+++ b/packages/twenty-front/src/modules/views/utils/__tests__/getViewSortsToCreate.test.ts
@@ -1,6 +1,6 @@
 import { type CoreViewSortEssential } from '@/views/types/CoreViewSortEssential';
 import { ViewSortDirection } from '~/generated/graphql';
-import { getViewSortsToCreate } from '../getViewSortsToCreate';
+import { getViewSortsToCreate } from '@/views/utils/getViewSortsToCreate';
 
 describe('getViewSortsToCreate', () => {
   const baseSort: CoreViewSortEssential = {
diff --git a/packages/twenty-front/src/modules/views/utils/__tests__/getViewSortsToDelete.test.ts b/packages/twenty-front/src/modules/views/utils/__tests__/getViewSortsToDelete.test.ts
index a64d651b9f..a790b64b02 100644
--- a/packages/twenty-front/src/modules/views/utils/__tests__/getViewSortsToDelete.test.ts
+++ b/packages/twenty-front/src/modules/views/utils/__tests__/getViewSortsToDelete.test.ts
@@ -1,6 +1,6 @@
 import { type CoreViewSortEssential } from '@/views/types/CoreViewSortEssential';
 import { ViewSortDirection } from '~/generated/graphql';
-import { getViewSortsToDelete } from '../getViewSortsToDelete';
+import { getViewSortsToDelete } from '@/views/utils/getViewSortsToDelete';
 
 describe('getViewSortsToDelete', () => {
   const baseSort: CoreViewSortEssential = {
diff --git a/packages/twenty-front/src/modules/views/utils/__tests__/getViewSortsToUpdate.test.ts b/packages/twenty-front/src/modules/views/utils/__tests__/getViewSortsToUpdate.test.ts
index ac2fc0d0eb..e53dcf4f7a 100644
--- a/packages/twenty-front/src/modules/views/utils/__tests__/getViewSortsToUpdate.test.ts
+++ b/packages/twenty-front/src/modules/views/utils/__tests__/getViewSortsToUpdate.test.ts
@@ -1,6 +1,6 @@
 import { type CoreViewSortEssential } from '@/views/types/CoreViewSortEssential';
 import { ViewSortDirection } from '~/generated/graphql';
-import { getViewSortsToUpdate } from '../getViewSortsToUpdate';
+import { getViewSortsToUpdate } from '@/views/utils/getViewSortsToUpdate';
 
 describe('getViewSortsToUpdate', () => {
   const baseSort: CoreViewSortEssential = {
diff --git a/packages/twenty-front/src/modules/views/utils/mapColumnDefinitionToViewField.ts b/packages/twenty-front/src/modules/views/utils/mapColumnDefinitionToViewField.ts
index c254c28299..be1e18e52d 100644
--- a/packages/twenty-front/src/modules/views/utils/mapColumnDefinitionToViewField.ts
+++ b/packages/twenty-front/src/modules/views/utils/mapColumnDefinitionToViewField.ts
@@ -1,7 +1,7 @@
 import { type FieldMetadata } from '@/object-record/record-field/ui/types/FieldMetadata';
 import { type ColumnDefinition } from '@/object-record/record-table/types/ColumnDefinition';
 
-import { type ViewField } from '../types/ViewField';
+import { type ViewField } from '@/views/types/ViewField';
 
 export const mapColumnDefinitionsToViewFields = (
   columnDefinitions: ColumnDefinition<FieldMetadata>[],
diff --git a/packages/twenty-front/src/modules/views/utils/mapViewFieldsToColumnDefinitions.ts b/packages/twenty-front/src/modules/views/utils/mapViewFieldsToColumnDefinitions.ts
index 4eb1be8e64..dc39dc223d 100644
--- a/packages/twenty-front/src/modules/views/utils/mapViewFieldsToColumnDefinitions.ts
+++ b/packages/twenty-front/src/modules/views/utils/mapViewFieldsToColumnDefinitions.ts
@@ -5,7 +5,7 @@ import { moveArrayItem } from '~/utils/array/moveArrayItem';
 import { isUndefinedOrNull } from '~/utils/isUndefinedOrNull';
 
 import { isDefined } from 'twenty-shared/utils';
-import { type ViewField } from '../types/ViewField';
+import { type ViewField } from '@/views/types/ViewField';
 
 export const mapViewFieldsToColumnDefinitions = ({
   columnDefinitions,
diff --git a/packages/twenty-front/src/modules/views/utils/mapViewFiltersToFilters.ts b/packages/twenty-front/src/modules/views/utils/mapViewFiltersToFilters.ts
index 626db4c736..41ed4bd7b2 100644
--- a/packages/twenty-front/src/modules/views/utils/mapViewFiltersToFilters.ts
+++ b/packages/twenty-front/src/modules/views/utils/mapViewFiltersToFilters.ts
@@ -6,7 +6,7 @@ import { isSystemSearchVectorField } from '@/object-record/utils/isSystemSearchV
 import { type CompositeFieldSubFieldName } from '@/settings/data-model/types/CompositeFieldSubFieldName';
 import { getFilterTypeFromFieldType, isDefined } from 'twenty-shared/utils';
 import { type CoreViewFilter } from '~/generated/graphql';
-import { type ViewFilter } from '../types/ViewFilter';
+import { type ViewFilter } from '@/views/types/ViewFilter';
 
 export const mapViewFiltersToFilters = (
   viewFilters: ViewFilter[] | CoreViewFilter[],
diff --git a/packages/twenty-front/src/modules/views/view-filter-value/utils/__tests__/stringifyRelativeDateFilter.test.ts b/packages/twenty-front/src/modules/views/view-filter-value/utils/__tests__/stringifyRelativeDateFilter.test.ts
index 91b8de7115..a3d8ff5044 100644
--- a/packages/twenty-front/src/modules/views/view-filter-value/utils/__tests__/stringifyRelativeDateFilter.test.ts
+++ b/packages/twenty-front/src/modules/views/view-filter-value/utils/__tests__/stringifyRelativeDateFilter.test.ts
@@ -1,7 +1,7 @@
 import { detectCalendarStartDay } from '@/localization/utils/detection/detectCalendarStartDay';
 import { FirstDayOfTheWeek } from 'twenty-shared/types';
 import { type RelativeDateFilter } from 'twenty-shared/utils';
-import { stringifyRelativeDateFilter } from '../stringifyRelativeDateFilter';
+import { stringifyRelativeDateFilter } from '@/views/view-filter-value/utils/stringifyRelativeDateFilter';
 
 jest.mock('@/localization/utils/detection/detectCalendarStartDay');
 
diff --git a/packages/twenty-front/src/modules/workflow/components/__stories__/WorkflowFieldsMultiSelect.stories.ts b/packages/twenty-front/src/modules/workflow/components/__stories__/WorkflowFieldsMultiSelect.stories.ts
index 7cb856c1f5..d4cc3c1655 100644
--- a/packages/twenty-front/src/modules/workflow/components/__stories__/WorkflowFieldsMultiSelect.stories.ts
+++ b/packages/twenty-front/src/modules/workflow/components/__stories__/WorkflowFieldsMultiSelect.stories.ts
@@ -2,7 +2,7 @@ import { type ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataI
 import type { Meta, StoryObj } from '@storybook/react';
 import { expect, within } from '@storybook/test';
 import { FieldMetadataType } from '~/generated-metadata/graphql';
-import { WorkflowFieldsMultiSelect } from '../WorkflowEditUpdateEventFieldsMultiSelect';
+import { WorkflowFieldsMultiSelect } from '@/workflow/components/WorkflowEditUpdateEventFieldsMultiSelect';
 
 const meta: Meta<typeof WorkflowFieldsMultiSelect> = {
   title: 'Modules/Workflow/WorkflowFieldsMultiSelect',
diff --git a/packages/twenty-front/src/modules/workflow/hooks/__tests__/useComputeStepOutputSchema.test.ts b/packages/twenty-front/src/modules/workflow/hooks/__tests__/useComputeStepOutputSchema.test.ts
index cd71a55116..3fa4aa881d 100644
--- a/packages/twenty-front/src/modules/workflow/hooks/__tests__/useComputeStepOutputSchema.test.ts
+++ b/packages/twenty-front/src/modules/workflow/hooks/__tests__/useComputeStepOutputSchema.test.ts
@@ -1,7 +1,7 @@
 import { useMutation } from '@apollo/client';
 import { renderHook } from '@testing-library/react';
 import { type ComputeStepOutputSchemaInput } from '~/generated/graphql';
-import { useComputeStepOutputSchema } from '../useComputeStepOutputSchema';
+import { useComputeStepOutputSchema } from '@/workflow/hooks/useComputeStepOutputSchema';
 
 jest.mock('@apollo/client');
 jest.mock('@/object-metadata/hooks/useApolloCoreClient', () => ({
diff --git a/packages/twenty-front/src/modules/workflow/utils/__tests__/findStepPosition.test.ts b/packages/twenty-front/src/modules/workflow/utils/__tests__/findStepPosition.test.ts
index 082410f127..54d2d3b354 100644
--- a/packages/twenty-front/src/modules/workflow/utils/__tests__/findStepPosition.test.ts
+++ b/packages/twenty-front/src/modules/workflow/utils/__tests__/findStepPosition.test.ts
@@ -1,6 +1,6 @@
 import { type WorkflowStep } from '@/workflow/types/Workflow';
 import { TRIGGER_STEP_ID } from 'twenty-shared/workflow';
-import { findStepPosition } from '../findStepPosition';
+import { findStepPosition } from '@/workflow/utils/findStepPosition';
 
 describe('findStepPosition', () => {
   const mockSteps: WorkflowStep[] = [
diff --git a/packages/twenty-front/src/modules/workflow/utils/__tests__/getAgentIdFromStep.test.ts b/packages/twenty-front/src/modules/workflow/utils/__tests__/getAgentIdFromStep.test.ts
index 443d50af87..1933af3e0b 100644
--- a/packages/twenty-front/src/modules/workflow/utils/__tests__/getAgentIdFromStep.test.ts
+++ b/packages/twenty-front/src/modules/workflow/utils/__tests__/getAgentIdFromStep.test.ts
@@ -1,4 +1,4 @@
-import { getAgentIdFromStep } from '../getAgentIdFromStep';
+import { getAgentIdFromStep } from '@/workflow/utils/getAgentIdFromStep';
 
 describe('getAgentIdFromStep', () => {
   it('should return undefined when stepDefinition is undefined', () => {
diff --git a/packages/twenty-front/src/modules/workflow/utils/__tests__/getStepDefinitionOrThrow.test.ts b/packages/twenty-front/src/modules/workflow/utils/__tests__/getStepDefinitionOrThrow.test.ts
index bfdfb5ddc6..17b972edbc 100644
--- a/packages/twenty-front/src/modules/workflow/utils/__tests__/getStepDefinitionOrThrow.test.ts
+++ b/packages/twenty-front/src/modules/workflow/utils/__tests__/getStepDefinitionOrThrow.test.ts
@@ -3,7 +3,7 @@ import {
   type WorkflowTrigger,
 } from '@/workflow/types/Workflow';
 import { TRIGGER_STEP_ID } from 'twenty-shared/workflow';
-import { getStepDefinitionOrThrow } from '../getStepDefinitionOrThrow';
+import { getStepDefinitionOrThrow } from '@/workflow/utils/getStepDefinitionOrThrow';
 
 describe('getStepDefinitionOrThrow', () => {
   const mockTrigger: WorkflowTrigger = {
diff --git a/packages/twenty-front/src/modules/workflow/utils/__tests__/getStepOutputSchemaFamilyStateKey.test.ts b/packages/twenty-front/src/modules/workflow/utils/__tests__/getStepOutputSchemaFamilyStateKey.test.ts
index fd13a0526d..7d784d6c53 100644
--- a/packages/twenty-front/src/modules/workflow/utils/__tests__/getStepOutputSchemaFamilyStateKey.test.ts
+++ b/packages/twenty-front/src/modules/workflow/utils/__tests__/getStepOutputSchemaFamilyStateKey.test.ts
@@ -1,4 +1,4 @@
-import { getStepOutputSchemaFamilyStateKey } from '../getStepOutputSchemaFamilyStateKey';
+import { getStepOutputSchemaFamilyStateKey } from '@/workflow/utils/getStepOutputSchemaFamilyStateKey';
 
 describe('getStepOutputSchemaFamilyStateKey', () => {
   it('should concatenate workflowVersionId and stepId with a dash', () => {
diff --git a/packages/twenty-front/src/modules/workflow/utils/__tests__/getWorkflowVisualizerComponentInstanceId.test.ts b/packages/twenty-front/src/modules/workflow/utils/__tests__/getWorkflowVisualizerComponentInstanceId.test.ts
index cbf4a1c536..04b1ddcda9 100644
--- a/packages/twenty-front/src/modules/workflow/utils/__tests__/getWorkflowVisualizerComponentInstanceId.test.ts
+++ b/packages/twenty-front/src/modules/workflow/utils/__tests__/getWorkflowVisualizerComponentInstanceId.test.ts
@@ -1,4 +1,4 @@
-import { getWorkflowVisualizerComponentInstanceId } from '../getWorkflowVisualizerComponentInstanceId';
+import { getWorkflowVisualizerComponentInstanceId } from '@/workflow/utils/getWorkflowVisualizerComponentInstanceId';
 
 describe('getWorkflowVisualizerComponentInstanceId', () => {
   it('should return the same recordId that was passed in', () => {
diff --git a/packages/twenty-front/src/modules/workflow/utils/__tests__/isStandaloneVariableString.test.ts b/packages/twenty-front/src/modules/workflow/utils/__tests__/isStandaloneVariableString.test.ts
index 9a4b816c50..68d2f72db7 100644
--- a/packages/twenty-front/src/modules/workflow/utils/__tests__/isStandaloneVariableString.test.ts
+++ b/packages/twenty-front/src/modules/workflow/utils/__tests__/isStandaloneVariableString.test.ts
@@ -1,4 +1,4 @@
-import { isStandaloneVariableString } from '../isStandaloneVariableString';
+import { isStandaloneVariableString } from '@/workflow/utils/isStandaloneVariableString';
 
 it('returns false if the provided value is not a string', () => {
   expect(isStandaloneVariableString(42)).toBe(false);
diff --git a/packages/twenty-front/src/modules/workflow/utils/__tests__/parseAndValidateVariableFriendlyStringifiedJson.test.ts b/packages/twenty-front/src/modules/workflow/utils/__tests__/parseAndValidateVariableFriendlyStringifiedJson.test.ts
index c67d858275..b090109fb9 100644
--- a/packages/twenty-front/src/modules/workflow/utils/__tests__/parseAndValidateVariableFriendlyStringifiedJson.test.ts
+++ b/packages/twenty-front/src/modules/workflow/utils/__tests__/parseAndValidateVariableFriendlyStringifiedJson.test.ts
@@ -1,4 +1,4 @@
-import { parseAndValidateVariableFriendlyStringifiedJson } from '../parseAndValidateVariableFriendlyStringifiedJson';
+import { parseAndValidateVariableFriendlyStringifiedJson } from '@/workflow/utils/parseAndValidateVariableFriendlyStringifiedJson';
 
 describe('parseAndValidateVariableFriendlyStringifiedJson', () => {
   describe('Valid JSON with variable-friendly keys', () => {
diff --git a/packages/twenty-front/src/modules/workflow/utils/__tests__/splitWorkflowTriggerEventName.test.ts b/packages/twenty-front/src/modules/workflow/utils/__tests__/splitWorkflowTriggerEventName.test.ts
index 8395a77646..c2f17becf9 100644
--- a/packages/twenty-front/src/modules/workflow/utils/__tests__/splitWorkflowTriggerEventName.test.ts
+++ b/packages/twenty-front/src/modules/workflow/utils/__tests__/splitWorkflowTriggerEventName.test.ts
@@ -1,4 +1,4 @@
-import { splitWorkflowTriggerEventName } from '../splitWorkflowTriggerEventName';
+import { splitWorkflowTriggerEventName } from '@/workflow/utils/splitWorkflowTriggerEventName';
 
 describe('splitWorkflowTriggerEventName', () => {
   it('should split a basic event name into objectType and event', () => {
diff --git a/packages/twenty-front/src/modules/workflow/workflow-diagram/components/__stories__/WorkflowDiagramEmptyTriggerEditable.stories.tsx b/packages/twenty-front/src/modules/workflow/workflow-diagram/components/__stories__/WorkflowDiagramEmptyTriggerEditable.stories.tsx
index 23a7fe50ed..4520f771ba 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-diagram/components/__stories__/WorkflowDiagramEmptyTriggerEditable.stories.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-diagram/components/__stories__/WorkflowDiagramEmptyTriggerEditable.stories.tsx
@@ -7,7 +7,7 @@ import { RecoilRoot } from 'recoil';
 import { ComponentDecorator } from 'twenty-ui/testing';
 import { I18nFrontDecorator } from '~/testing/decorators/I18nFrontDecorator';
 import { ReactflowDecorator } from '~/testing/decorators/ReactflowDecorator';
-import { WorkflowDiagramEmptyTriggerEditable } from '../../workflow-nodes/components/WorkflowDiagramEmptyTriggerEditable';
+import { WorkflowDiagramEmptyTriggerEditable } from '@/workflow/workflow-diagram/workflow-nodes/components/WorkflowDiagramEmptyTriggerEditable';
 
 const meta: Meta<typeof WorkflowDiagramEmptyTriggerEditable> = {
   title: 'Modules/Workflow/WorkflowDiagramEmptyTriggerEditable',
diff --git a/packages/twenty-front/src/modules/workflow/workflow-diagram/components/__stories__/WorkflowDiagramStepNodeEditableContent.stories.tsx b/packages/twenty-front/src/modules/workflow/workflow-diagram/components/__stories__/WorkflowDiagramStepNodeEditableContent.stories.tsx
index 3f7c85db11..65d9b68fae 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-diagram/components/__stories__/WorkflowDiagramStepNodeEditableContent.stories.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-diagram/components/__stories__/WorkflowDiagramStepNodeEditableContent.stories.tsx
@@ -9,7 +9,7 @@ import { CatalogDecorator, type CatalogStory } from 'twenty-ui/testing';
 import { I18nFrontDecorator } from '~/testing/decorators/I18nFrontDecorator';
 import { ReactflowDecorator } from '~/testing/decorators/ReactflowDecorator';
 import { graphqlMocks } from '~/testing/graphqlMocks';
-import { WorkflowDiagramStepNodeEditableContent } from '../../workflow-nodes/components/WorkflowDiagramStepNodeEditableContent';
+import { WorkflowDiagramStepNodeEditableContent } from '@/workflow/workflow-diagram/workflow-nodes/components/WorkflowDiagramStepNodeEditableContent';
 
 const meta: Meta<typeof WorkflowDiagramStepNodeEditableContent> = {
   title: 'Modules/Workflow/WorkflowDiagramStepNodeEditableContent',
diff --git a/packages/twenty-front/src/modules/workflow/workflow-diagram/utils/__tests__/generateWorkflowDiagram.test.ts b/packages/twenty-front/src/modules/workflow/workflow-diagram/utils/__tests__/generateWorkflowDiagram.test.ts
index 75380b19c3..a71bbf8148 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-diagram/utils/__tests__/generateWorkflowDiagram.test.ts
+++ b/packages/twenty-front/src/modules/workflow/workflow-diagram/utils/__tests__/generateWorkflowDiagram.test.ts
@@ -2,7 +2,7 @@ import {
   type WorkflowStep,
   type WorkflowTrigger,
 } from '@/workflow/types/Workflow';
-import { generateWorkflowDiagram } from '../generateWorkflowDiagram';
+import { generateWorkflowDiagram } from '@/workflow/workflow-diagram/utils/generateWorkflowDiagram';
 
 describe('generateWorkflowDiagram', () => {
   it('should generate a single trigger node when no step is provided', () => {
diff --git a/packages/twenty-front/src/modules/workflow/workflow-diagram/utils/__tests__/generateWorkflowRunDiagram.test.ts b/packages/twenty-front/src/modules/workflow/workflow-diagram/utils/__tests__/generateWorkflowRunDiagram.test.ts
index fa5dba34e2..26e6ddfb48 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-diagram/utils/__tests__/generateWorkflowRunDiagram.test.ts
+++ b/packages/twenty-front/src/modules/workflow/workflow-diagram/utils/__tests__/generateWorkflowRunDiagram.test.ts
@@ -5,7 +5,7 @@ import {
 import { FieldMetadataType } from 'twenty-shared/types';
 import { StepStatus, type WorkflowRunStepInfos } from 'twenty-shared/workflow';
 import { getUuidV4Mock } from '~/testing/utils/getUuidV4Mock';
-import { generateWorkflowRunDiagram } from '../generateWorkflowRunDiagram';
+import { generateWorkflowRunDiagram } from '@/workflow/workflow-diagram/utils/generateWorkflowRunDiagram';
 
 jest.mock('uuid', () => ({
   v4: getUuidV4Mock(),
diff --git a/packages/twenty-front/src/modules/workflow/workflow-diagram/utils/__tests__/getWorkflowDiagramTriggerNode.test.ts b/packages/twenty-front/src/modules/workflow/workflow-diagram/utils/__tests__/getWorkflowDiagramTriggerNode.test.ts
index 7cfcd35a86..6fe8f9bb65 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-diagram/utils/__tests__/getWorkflowDiagramTriggerNode.test.ts
+++ b/packages/twenty-front/src/modules/workflow/workflow-diagram/utils/__tests__/getWorkflowDiagramTriggerNode.test.ts
@@ -1,5 +1,5 @@
 import { type WorkflowTrigger } from '@/workflow/types/Workflow';
-import { getWorkflowDiagramTriggerNode } from '../getWorkflowDiagramTriggerNode';
+import { getWorkflowDiagramTriggerNode } from '@/workflow/workflow-diagram/utils/getWorkflowDiagramTriggerNode';
 
 describe('getWorkflowDiagramTriggerNode', () => {
   describe('MANUAL trigger type', () => {
diff --git a/packages/twenty-front/src/modules/workflow/workflow-diagram/utils/__tests__/getWorkflowNodeIconKey.test.ts b/packages/twenty-front/src/modules/workflow/workflow-diagram/utils/__tests__/getWorkflowNodeIconKey.test.ts
index 349a14497a..05cb73a78f 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-diagram/utils/__tests__/getWorkflowNodeIconKey.test.ts
+++ b/packages/twenty-front/src/modules/workflow/workflow-diagram/utils/__tests__/getWorkflowNodeIconKey.test.ts
@@ -1,5 +1,5 @@
 import { type WorkflowDiagramStepNodeData } from '@/workflow/workflow-diagram/types/WorkflowDiagram';
-import { getWorkflowNodeIconKey } from '../getWorkflowNodeIconKey';
+import { getWorkflowNodeIconKey } from '@/workflow/workflow-diagram/utils/getWorkflowNodeIconKey';
 
 // Mock the getActionIcon function
 jest.mock(
diff --git a/packages/twenty-front/src/modules/workflow/workflow-diagram/utils/__tests__/getWorkflowVersionDiagram.test.ts b/packages/twenty-front/src/modules/workflow/workflow-diagram/utils/__tests__/getWorkflowVersionDiagram.test.ts
index af78a96581..5d821a9e1b 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-diagram/utils/__tests__/getWorkflowVersionDiagram.test.ts
+++ b/packages/twenty-front/src/modules/workflow/workflow-diagram/utils/__tests__/getWorkflowVersionDiagram.test.ts
@@ -1,5 +1,5 @@
 import { getUuidV4Mock } from '~/testing/utils/getUuidV4Mock';
-import { getWorkflowVersionDiagram } from '../getWorkflowVersionDiagram';
+import { getWorkflowVersionDiagram } from '@/workflow/workflow-diagram/utils/getWorkflowVersionDiagram';
 
 jest.mock('uuid', () => ({
   v4: getUuidV4Mock(),
diff --git a/packages/twenty-front/src/modules/workflow/workflow-diagram/utils/__tests__/isLastStepOfLoop.test.ts b/packages/twenty-front/src/modules/workflow/workflow-diagram/utils/__tests__/isLastStepOfLoop.test.ts
index 0301190841..1758e62b79 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-diagram/utils/__tests__/isLastStepOfLoop.test.ts
+++ b/packages/twenty-front/src/modules/workflow/workflow-diagram/utils/__tests__/isLastStepOfLoop.test.ts
@@ -2,7 +2,7 @@ import {
   type WorkflowIteratorAction,
   type WorkflowStep,
 } from '@/workflow/types/Workflow';
-import { isLastStepOfLoop } from '../isLastStepOfLoop';
+import { isLastStepOfLoop } from '@/workflow/workflow-diagram/utils/isLastStepOfLoop';
 
 describe('isLastStepOfLoop', () => {
   const makeIterator = (
diff --git a/packages/twenty-front/src/modules/workflow/workflow-diagram/utils/__tests__/isStepNode.test.ts b/packages/twenty-front/src/modules/workflow/workflow-diagram/utils/__tests__/isStepNode.test.ts
index 6721171015..5d507a2874 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-diagram/utils/__tests__/isStepNode.test.ts
+++ b/packages/twenty-front/src/modules/workflow/workflow-diagram/utils/__tests__/isStepNode.test.ts
@@ -1,5 +1,5 @@
 import { type WorkflowDiagramNode } from '@/workflow/workflow-diagram/types/WorkflowDiagram';
-import { isStepNode } from '../isStepNode';
+import { isStepNode } from '@/workflow/workflow-diagram/utils/isStepNode';
 
 describe('isStepNode', () => {
   it('should return true for trigger node', () => {
diff --git a/packages/twenty-front/src/modules/workflow/workflow-diagram/utils/__tests__/mergeWorkflowDiagrams.test.ts b/packages/twenty-front/src/modules/workflow/workflow-diagram/utils/__tests__/mergeWorkflowDiagrams.test.ts
index ff567129b5..0a882417ae 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-diagram/utils/__tests__/mergeWorkflowDiagrams.test.ts
+++ b/packages/twenty-front/src/modules/workflow/workflow-diagram/utils/__tests__/mergeWorkflowDiagrams.test.ts
@@ -1,5 +1,5 @@
 import { type WorkflowDiagram } from '@/workflow/workflow-diagram/types/WorkflowDiagram';
-import { mergeWorkflowDiagrams } from '../mergeWorkflowDiagrams';
+import { mergeWorkflowDiagrams } from '@/workflow/workflow-diagram/utils/mergeWorkflowDiagrams';
 
 it('Preserves the properties defined in the previous version but not in the next one', () => {
   const previousDiagram: WorkflowDiagram = {
diff --git a/packages/twenty-front/src/modules/workflow/workflow-diagram/utils/__tests__/selectWorkflowDiagramNode.test.ts b/packages/twenty-front/src/modules/workflow/workflow-diagram/utils/__tests__/selectWorkflowDiagramNode.test.ts
index 4325866fa2..9600c55502 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-diagram/utils/__tests__/selectWorkflowDiagramNode.test.ts
+++ b/packages/twenty-front/src/modules/workflow/workflow-diagram/utils/__tests__/selectWorkflowDiagramNode.test.ts
@@ -1,5 +1,5 @@
 import { type WorkflowDiagram } from '@/workflow/workflow-diagram/types/WorkflowDiagram';
-import { selectWorkflowDiagramNode } from '../selectWorkflowDiagramNode';
+import { selectWorkflowDiagramNode } from '@/workflow/workflow-diagram/utils/selectWorkflowDiagramNode';
 
 describe('selectWorkflowDiagramNode', () => {
   it('should select the specified node', () => {
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/__tests__/useCreateStep.test.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/__tests__/useCreateStep.test.tsx
index afdc4dbf8e..c8f4fd5e20 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/__tests__/useCreateStep.test.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/__tests__/useCreateStep.test.tsx
@@ -1,7 +1,7 @@
 import { act, renderHook } from '@testing-library/react';
 import { RecoilRoot } from 'recoil';
-import { WorkflowVisualizerComponentInstanceContext } from '../../../workflow-diagram/states/contexts/WorkflowVisualizerComponentInstanceContext';
-import { useCreateStep } from '../useCreateStep';
+import { WorkflowVisualizerComponentInstanceContext } from '@/workflow/workflow-diagram/states/contexts/WorkflowVisualizerComponentInstanceContext';
+import { useCreateStep } from '@/workflow/workflow-steps/hooks/useCreateStep';
 
 const mockGetUpdatableWorkflowVersion = jest.fn();
 const mockCreateWorkflowVersionStep = jest.fn().mockResolvedValue({
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/__tests__/useDeleteStep.test.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/__tests__/useDeleteStep.test.tsx
index e174ac9f27..23ba5db332 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/__tests__/useDeleteStep.test.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/__tests__/useDeleteStep.test.tsx
@@ -3,7 +3,7 @@ import React from 'react';
 import { useDeleteStep } from '@/workflow/workflow-steps/hooks/useDeleteStep';
 import { renderHook } from '@testing-library/react';
 import { RecoilRoot } from 'recoil';
-import { WorkflowVisualizerComponentInstanceContext } from '../../../workflow-diagram/states/contexts/WorkflowVisualizerComponentInstanceContext';
+import { WorkflowVisualizerComponentInstanceContext } from '@/workflow/workflow-diagram/states/contexts/WorkflowVisualizerComponentInstanceContext';
 
 const mockDeleteWorkflowVersionStep = jest.fn();
 const mockGetUpdatableWorkflowVersion = jest.fn();
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/__tests__/useDuplicateStep.test.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/__tests__/useDuplicateStep.test.tsx
index 5a1ffd83d0..b0b6881c79 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/__tests__/useDuplicateStep.test.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/__tests__/useDuplicateStep.test.tsx
@@ -1,7 +1,7 @@
 import { useDuplicateStep } from '@/workflow/workflow-steps/hooks/useDuplicateStep';
 import { act, renderHook } from '@testing-library/react';
 import { RecoilRoot } from 'recoil';
-import { WorkflowVisualizerComponentInstanceContext } from '../../../workflow-diagram/states/contexts/WorkflowVisualizerComponentInstanceContext';
+import { WorkflowVisualizerComponentInstanceContext } from '@/workflow/workflow-diagram/states/contexts/WorkflowVisualizerComponentInstanceContext';
 
 const mockGetUpdatableWorkflowVersion = jest.fn();
 const mockDuplicateWorkflowVersionStep = jest.fn().mockResolvedValue({
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/__tests__/useUpdateAgentLabel.test.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/__tests__/useUpdateAgentLabel.test.tsx
index 619282d4d0..adebd2b852 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/__tests__/useUpdateAgentLabel.test.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/__tests__/useUpdateAgentLabel.test.tsx
@@ -1,5 +1,5 @@
 import { renderHook } from '@testing-library/react';
-import { useUpdateAgentLabel } from '../useUpdateAgentLabel';
+import { useUpdateAgentLabel } from '@/workflow/workflow-steps/hooks/useUpdateAgentLabel';
 
 const mockUpdateAgent = jest.fn();
 const mockUseFindOneAgentQuery = jest.fn();
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/useWorkflowRunStepInfo.ts b/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/useWorkflowRunStepInfo.ts
index 424c0b3801..f9e492d810 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/useWorkflowRunStepInfo.ts
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/hooks/useWorkflowRunStepInfo.ts
@@ -3,7 +3,7 @@ import { useRecoilComponentValue } from '@/ui/utilities/state/component-state/ho
 import { useWorkflowRun } from '@/workflow/hooks/useWorkflowRun';
 import { useWorkflowRunIdOrThrow } from '@/workflow/hooks/useWorkflowRunIdOrThrow';
 import { isDefined } from 'twenty-shared/utils';
-import { getStepInfoHistoryItem } from '../utils/getStepInfoHistoryItem';
+import { getStepInfoHistoryItem } from '@/workflow/workflow-steps/utils/getStepInfoHistoryItem';
 
 export const useWorkflowRunStepInfo = ({ stepId }: { stepId: string }) => {
   const workflowRunId = useWorkflowRunIdOrThrow();
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/utils/__tests__/getIsDescendantOfIterator.test.ts b/packages/twenty-front/src/modules/workflow/workflow-steps/utils/__tests__/getIsDescendantOfIterator.test.ts
index a8f86db740..f96360d322 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/utils/__tests__/getIsDescendantOfIterator.test.ts
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/utils/__tests__/getIsDescendantOfIterator.test.ts
@@ -1,5 +1,5 @@
 import { type WorkflowStep } from '@/workflow/types/Workflow';
-import { getIsDescendantOfIterator } from '../getIsDescendantOfIterator';
+import { getIsDescendantOfIterator } from '@/workflow/workflow-steps/utils/getIsDescendantOfIterator';
 
 describe('getIsDescendantOfIterator', () => {
   const iteratorStep: WorkflowStep = {
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/utils/__tests__/getStepInfoHistoryItem.test.ts b/packages/twenty-front/src/modules/workflow/workflow-steps/utils/__tests__/getStepInfoHistoryItem.test.ts
index 6ff169950d..864610e7d0 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/utils/__tests__/getStepInfoHistoryItem.test.ts
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/utils/__tests__/getStepInfoHistoryItem.test.ts
@@ -1,6 +1,6 @@
 import { type WorkflowStep } from '@/workflow/types/Workflow';
 import { type WorkflowRunStepInfo, StepStatus } from 'twenty-shared/workflow';
-import { getStepInfoHistoryItem } from '../getStepInfoHistoryItem';
+import { getStepInfoHistoryItem } from '@/workflow/workflow-steps/utils/getStepInfoHistoryItem';
 
 describe('getStepInfoHistoryItem', () => {
   const iteratorStep: WorkflowStep = {
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/utils/__tests__/getWorkflowPreviousSteps.test.ts b/packages/twenty-front/src/modules/workflow/workflow-steps/utils/__tests__/getWorkflowPreviousSteps.test.ts
index 81d9ee73c6..59879255ed 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/utils/__tests__/getWorkflowPreviousSteps.test.ts
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/utils/__tests__/getWorkflowPreviousSteps.test.ts
@@ -1,5 +1,5 @@
 import { type WorkflowStep } from '@/workflow/types/Workflow';
-import { getPreviousSteps } from '../getWorkflowPreviousSteps';
+import { getPreviousSteps } from '@/workflow/workflow-steps/utils/getWorkflowPreviousSteps';
 
 describe('getWorkflowPreviousSteps', () => {
   describe('using a simple workflow', () => {
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/utils/__tests__/getWorkflowRunStepContext.test.ts b/packages/twenty-front/src/modules/workflow/workflow-steps/utils/__tests__/getWorkflowRunStepContext.test.ts
index 15a404f19e..6cf1fd4bac 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/utils/__tests__/getWorkflowRunStepContext.test.ts
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/utils/__tests__/getWorkflowRunStepContext.test.ts
@@ -1,6 +1,6 @@
 import { type WorkflowRunFlow } from '@/workflow/types/Workflow';
 import { StepStatus, TRIGGER_STEP_ID } from 'twenty-shared/workflow';
-import { getWorkflowRunStepContext } from '../getWorkflowRunStepContext';
+import { getWorkflowRunStepContext } from '@/workflow/workflow-steps/utils/getWorkflowRunStepContext';
 
 const mockFlow = {
   trigger: {
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/utils/__tests__/getWorkflowRunStepExecutionStatus.test.ts b/packages/twenty-front/src/modules/workflow/workflow-steps/utils/__tests__/getWorkflowRunStepExecutionStatus.test.ts
index f2a4f0823b..72cb2da624 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/utils/__tests__/getWorkflowRunStepExecutionStatus.test.ts
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/utils/__tests__/getWorkflowRunStepExecutionStatus.test.ts
@@ -1,4 +1,4 @@
-import { getWorkflowRunStepExecutionStatus } from '../getWorkflowRunStepExecutionStatus';
+import { getWorkflowRunStepExecutionStatus } from '@/workflow/workflow-steps/utils/getWorkflowRunStepExecutionStatus';
 import { StepStatus } from 'twenty-shared/workflow';
 
 describe('getWorkflowRunStepExecutionStatus', () => {
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/ai-agent-action/components/WorkflowAiAgentPermissionList.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/ai-agent-action/components/WorkflowAiAgentPermissionList.tsx
index 51cad5fde2..a18e7a0f5e 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/ai-agent-action/components/WorkflowAiAgentPermissionList.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/ai-agent-action/components/WorkflowAiAgentPermissionList.tsx
@@ -3,7 +3,7 @@ import { type SettingsRoleObjectPermissionKey } from '@/settings/roles/role-perm
 import { t } from '@lingui/core/macro';
 import { type ObjectPermission } from '~/generated/graphql';
 import { filterBySearchQuery } from '~/utils/filterBySearchQuery';
-import { CRUD_PERMISSIONS } from '../constants/WorkflowAiAgentCrudPermissions';
+import { CRUD_PERMISSIONS } from '@/workflow/workflow-steps/workflow-actions/ai-agent-action/constants/WorkflowAiAgentCrudPermissions';
 import { WorkflowAiAgentPermissionsPermissionRow } from './WorkflowAiAgentPermissionsPermissionRow';
 import { StyledLabel, StyledList } from './WorkflowAiAgentPermissionsStyles';
 
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/ai-agent-action/components/WorkflowEditActionAiAgent.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/ai-agent-action/components/WorkflowEditActionAiAgent.tsx
index af9c8b395b..ba08ae2280 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/ai-agent-action/components/WorkflowEditActionAiAgent.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/ai-agent-action/components/WorkflowEditActionAiAgent.tsx
@@ -32,7 +32,7 @@ import {
 } from '~/generated-metadata/graphql';
 import { useNavigateSettings } from '~/hooks/useNavigateSettings';
 import { RightDrawerSkeletonLoader } from '~/loading/components/RightDrawerSkeletonLoader';
-import { WORKFLOW_AI_AGENT_TAB_LIST_COMPONENT_ID } from '../constants/WorkflowAiAgentTabListComponentId';
+import { WORKFLOW_AI_AGENT_TAB_LIST_COMPONENT_ID } from '@/workflow/workflow-steps/workflow-actions/ai-agent-action/constants/WorkflowAiAgentTabListComponentId';
 import { WorkflowAiAgentPromptTab } from './WorkflowAiAgentPromptTab';
 
 export type WorkflowAiAgentTabId =
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/__stories__/WorkflowEditActionCreateRecord.stories.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/__stories__/WorkflowEditActionCreateRecord.stories.tsx
index 0059ca22b4..e7b5b23ab2 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/__stories__/WorkflowEditActionCreateRecord.stories.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/__stories__/WorkflowEditActionCreateRecord.stories.tsx
@@ -9,7 +9,7 @@ import { WorkflowStepDecorator } from '~/testing/decorators/WorkflowStepDecorato
 import { WorkspaceDecorator } from '~/testing/decorators/WorkspaceDecorator';
 import { graphqlMocks } from '~/testing/graphqlMocks';
 import { getWorkflowNodeIdMock } from '~/testing/mock-data/workflow';
-import { WorkflowEditActionCreateRecord } from '../WorkflowEditActionCreateRecord';
+import { WorkflowEditActionCreateRecord } from '@/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionCreateRecord';
 
 const meta: Meta<typeof WorkflowEditActionCreateRecord> = {
   title: 'Modules/Workflow/Actions/CreateRecord/EditAction',
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/__stories__/WorkflowEditActionDeleteRecord.stories.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/__stories__/WorkflowEditActionDeleteRecord.stories.tsx
index 11913df9c5..d4d5ce4849 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/__stories__/WorkflowEditActionDeleteRecord.stories.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/__stories__/WorkflowEditActionDeleteRecord.stories.tsx
@@ -11,7 +11,7 @@ import { WorkspaceDecorator } from '~/testing/decorators/WorkspaceDecorator';
 import { graphqlMocks } from '~/testing/graphqlMocks';
 import { allMockPersonRecords } from '~/testing/mock-data/people';
 import { getWorkflowNodeIdMock } from '~/testing/mock-data/workflow';
-import { WorkflowEditActionDeleteRecord } from '../WorkflowEditActionDeleteRecord';
+import { WorkflowEditActionDeleteRecord } from '@/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionDeleteRecord';
 
 const DEFAULT_ACTION = {
   id: getWorkflowNodeIdMock(),
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/__stories__/WorkflowEditActionSendEmail.stories.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/__stories__/WorkflowEditActionSendEmail.stories.tsx
index 78a38bd9cd..14a110b043 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/__stories__/WorkflowEditActionSendEmail.stories.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/__stories__/WorkflowEditActionSendEmail.stories.tsx
@@ -15,7 +15,7 @@ import {
   mockedConnectedAccounts,
 } from '~/testing/mock-data/connected-accounts';
 import { getWorkflowNodeIdMock } from '~/testing/mock-data/workflow';
-import { WorkflowEditActionSendEmail } from '../WorkflowEditActionSendEmail';
+import { WorkflowEditActionSendEmail } from '@/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionSendEmail';
 
 const DEFAULT_ACTION: WorkflowSendEmailAction = {
   id: getWorkflowNodeIdMock(),
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/__stories__/WorkflowEditActionUpdateRecord.stories.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/__stories__/WorkflowEditActionUpdateRecord.stories.tsx
index eb612d7d79..a3f9ce9816 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/__stories__/WorkflowEditActionUpdateRecord.stories.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/__stories__/WorkflowEditActionUpdateRecord.stories.tsx
@@ -11,7 +11,7 @@ import { WorkspaceDecorator } from '~/testing/decorators/WorkspaceDecorator';
 import { graphqlMocks } from '~/testing/graphqlMocks';
 import { allMockPersonRecords } from '~/testing/mock-data/people';
 import { getWorkflowNodeIdMock } from '~/testing/mock-data/workflow';
-import { WorkflowEditActionUpdateRecord } from '../WorkflowEditActionUpdateRecord';
+import { WorkflowEditActionUpdateRecord } from '@/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionUpdateRecord';
 
 const DEFAULT_ACTION = {
   id: getWorkflowNodeIdMock(),
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/filter-action/components/__stories__/WorkflowEditActionFilter.stories.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/filter-action/components/__stories__/WorkflowEditActionFilter.stories.tsx
index 4a3c10798f..f733f112f0 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/filter-action/components/__stories__/WorkflowEditActionFilter.stories.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/filter-action/components/__stories__/WorkflowEditActionFilter.stories.tsx
@@ -9,7 +9,7 @@ import { WorkflowStepDecorator } from '~/testing/decorators/WorkflowStepDecorato
 import { WorkspaceDecorator } from '~/testing/decorators/WorkspaceDecorator';
 import { graphqlMocks } from '~/testing/graphqlMocks';
 import { getWorkflowNodeIdMock } from '~/testing/mock-data/workflow';
-import { WorkflowEditActionFilter } from '../WorkflowEditActionFilter';
+import { WorkflowEditActionFilter } from '@/workflow/workflow-steps/workflow-actions/filter-action/components/WorkflowEditActionFilter';
 
 const DEFAULT_ACTION: WorkflowFilterAction = {
   id: getWorkflowNodeIdMock(),
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/filter-action/components/__stories__/WorkflowEditActionFilterBody.stories.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/filter-action/components/__stories__/WorkflowEditActionFilterBody.stories.tsx
index b3ecd42cf4..c0d98c676b 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/filter-action/components/__stories__/WorkflowEditActionFilterBody.stories.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/filter-action/components/__stories__/WorkflowEditActionFilterBody.stories.tsx
@@ -9,7 +9,7 @@ import { WorkflowStepDecorator } from '~/testing/decorators/WorkflowStepDecorato
 import { WorkspaceDecorator } from '~/testing/decorators/WorkspaceDecorator';
 import { graphqlMocks } from '~/testing/graphqlMocks';
 import { getWorkflowNodeIdMock } from '~/testing/mock-data/workflow';
-import { WorkflowEditActionFilterBody } from '../WorkflowEditActionFilterBody';
+import { WorkflowEditActionFilterBody } from '@/workflow/workflow-steps/workflow-actions/filter-action/components/WorkflowEditActionFilterBody';
 
 const DEFAULT_ACTION: WorkflowFilterAction = {
   id: getWorkflowNodeIdMock(),
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/filter-action/components/__stories__/WorkflowStepFilterAddFilterRuleSelect.stories.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/filter-action/components/__stories__/WorkflowStepFilterAddFilterRuleSelect.stories.tsx
index 47c5b94d85..a9a7ecef9e 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/filter-action/components/__stories__/WorkflowStepFilterAddFilterRuleSelect.stories.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/filter-action/components/__stories__/WorkflowStepFilterAddFilterRuleSelect.stories.tsx
@@ -8,7 +8,7 @@ import { WorkflowStepActionDrawerDecorator } from '~/testing/decorators/Workflow
 import { WorkflowStepDecorator } from '~/testing/decorators/WorkflowStepDecorator';
 import { WorkspaceDecorator } from '~/testing/decorators/WorkspaceDecorator';
 import { graphqlMocks } from '~/testing/graphqlMocks';
-import { WorkflowStepFilterAddFilterRuleSelect } from '../WorkflowStepFilterAddFilterRuleSelect';
+import { WorkflowStepFilterAddFilterRuleSelect } from '@/workflow/workflow-steps/workflow-actions/filter-action/components/WorkflowStepFilterAddFilterRuleSelect';
 
 const STEP_FILTER_GROUP: StepFilterGroup = {
   id: 'filter-group-1',
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/filter-action/components/__stories__/WorkflowStepFilterAddRootStepFilterButton.stories.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/filter-action/components/__stories__/WorkflowStepFilterAddRootStepFilterButton.stories.tsx
index 425a1d0f22..8ab3908997 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/filter-action/components/__stories__/WorkflowStepFilterAddRootStepFilterButton.stories.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/filter-action/components/__stories__/WorkflowStepFilterAddRootStepFilterButton.stories.tsx
@@ -7,7 +7,7 @@ import { WorkflowStepActionDrawerDecorator } from '~/testing/decorators/Workflow
 import { WorkflowStepDecorator } from '~/testing/decorators/WorkflowStepDecorator';
 import { WorkspaceDecorator } from '~/testing/decorators/WorkspaceDecorator';
 import { graphqlMocks } from '~/testing/graphqlMocks';
-import { WorkflowStepFilterAddRootStepFilterButton } from '../WorkflowStepFilterAddRootStepFilterButton';
+import { WorkflowStepFilterAddRootStepFilterButton } from '@/workflow/workflow-steps/workflow-actions/filter-action/components/WorkflowStepFilterAddRootStepFilterButton';
 
 const meta: Meta<typeof WorkflowStepFilterAddRootStepFilterButton> = {
   title:
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/filter-action/components/__stories__/WorkflowStepFilterColumn.stories.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/filter-action/components/__stories__/WorkflowStepFilterColumn.stories.tsx
index 4209cec3ae..52fc9b6c41 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/filter-action/components/__stories__/WorkflowStepFilterColumn.stories.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/filter-action/components/__stories__/WorkflowStepFilterColumn.stories.tsx
@@ -12,7 +12,7 @@ import { WorkflowStepActionDrawerDecorator } from '~/testing/decorators/Workflow
 import { WorkflowStepDecorator } from '~/testing/decorators/WorkflowStepDecorator';
 import { WorkspaceDecorator } from '~/testing/decorators/WorkspaceDecorator';
 import { graphqlMocks } from '~/testing/graphqlMocks';
-import { WorkflowStepFilterColumn } from '../WorkflowStepFilterColumn';
+import { WorkflowStepFilterColumn } from '@/workflow/workflow-steps/workflow-actions/filter-action/components/WorkflowStepFilterColumn';
 
 const STEP_FILTER_GROUP: StepFilterGroup = {
   id: 'filter-group-1',
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/filter-action/components/__stories__/WorkflowStepFilterFieldSelect.stories.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/filter-action/components/__stories__/WorkflowStepFilterFieldSelect.stories.tsx
index f703952c87..7eb24a1e34 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/filter-action/components/__stories__/WorkflowStepFilterFieldSelect.stories.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/filter-action/components/__stories__/WorkflowStepFilterFieldSelect.stories.tsx
@@ -7,7 +7,7 @@ import { WorkflowStepActionDrawerDecorator } from '~/testing/decorators/Workflow
 import { WorkflowStepDecorator } from '~/testing/decorators/WorkflowStepDecorator';
 import { WorkspaceDecorator } from '~/testing/decorators/WorkspaceDecorator';
 import { graphqlMocks } from '~/testing/graphqlMocks';
-import { WorkflowStepFilterFieldSelect } from '../WorkflowStepFilterFieldSelect';
+import { WorkflowStepFilterFieldSelect } from '@/workflow/workflow-steps/workflow-actions/filter-action/components/WorkflowStepFilterFieldSelect';
 
 const DEFAULT_STEP_FILTER: StepFilter = {
   id: 'filter-1',
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/filter-action/components/__stories__/WorkflowStepFilterLogicalOperatorCell.stories.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/filter-action/components/__stories__/WorkflowStepFilterLogicalOperatorCell.stories.tsx
index 16f2bbd0ce..154d42aab9 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/filter-action/components/__stories__/WorkflowStepFilterLogicalOperatorCell.stories.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/filter-action/components/__stories__/WorkflowStepFilterLogicalOperatorCell.stories.tsx
@@ -8,7 +8,7 @@ import { WorkflowStepActionDrawerDecorator } from '~/testing/decorators/Workflow
 import { WorkflowStepDecorator } from '~/testing/decorators/WorkflowStepDecorator';
 import { WorkspaceDecorator } from '~/testing/decorators/WorkspaceDecorator';
 import { graphqlMocks } from '~/testing/graphqlMocks';
-import { WorkflowStepFilterLogicalOperatorCell } from '../WorkflowStepFilterLogicalOperatorCell';
+import { WorkflowStepFilterLogicalOperatorCell } from '@/workflow/workflow-steps/workflow-actions/filter-action/components/WorkflowStepFilterLogicalOperatorCell';
 
 const AND_STEP_FILTER_GROUP: StepFilterGroup = {
   id: 'filter-group-1',
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/filter-action/components/__stories__/WorkflowStepFilterValueInput.stories.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/filter-action/components/__stories__/WorkflowStepFilterValueInput.stories.tsx
index 6d9101cf8c..67fa64ea57 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/filter-action/components/__stories__/WorkflowStepFilterValueInput.stories.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/filter-action/components/__stories__/WorkflowStepFilterValueInput.stories.tsx
@@ -8,7 +8,7 @@ import { WorkflowStepActionDrawerDecorator } from '~/testing/decorators/Workflow
 import { WorkflowStepDecorator } from '~/testing/decorators/WorkflowStepDecorator';
 import { WorkspaceDecorator } from '~/testing/decorators/WorkspaceDecorator';
 import { graphqlMocks } from '~/testing/graphqlMocks';
-import { WorkflowStepFilterValueInput } from '../WorkflowStepFilterValueInput';
+import { WorkflowStepFilterValueInput } from '@/workflow/workflow-steps/workflow-actions/filter-action/components/WorkflowStepFilterValueInput';
 
 const TEXT_FILTER: StepFilter = {
   id: 'filter-1',
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/filter-action/hooks/useRemoveStepFilter.ts b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/filter-action/hooks/useRemoveStepFilter.ts
index e608a28fe6..433d3cc744 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/filter-action/hooks/useRemoveStepFilter.ts
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/filter-action/hooks/useRemoveStepFilter.ts
@@ -5,7 +5,7 @@ import { currentStepFiltersComponentState } from '@/workflow/workflow-steps/work
 import { useContext } from 'react';
 import { useRecoilCallback } from 'recoil';
 import { isDefined } from 'twenty-shared/utils';
-import { WorkflowStepFilterContext } from '../states/context/WorkflowStepFilterContext';
+import { WorkflowStepFilterContext } from '@/workflow/workflow-steps/workflow-actions/filter-action/states/context/WorkflowStepFilterContext';
 
 export const useRemoveStepFilter = () => {
   const { onFilterSettingsUpdate } = useContext(WorkflowStepFilterContext);
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/form-action/components/__stories__/WorkflowEditActionFormFieldSettings.stories.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/form-action/components/__stories__/WorkflowEditActionFormFieldSettings.stories.tsx
index dae4834453..a4cc2f3e48 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/form-action/components/__stories__/WorkflowEditActionFormFieldSettings.stories.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/form-action/components/__stories__/WorkflowEditActionFormFieldSettings.stories.tsx
@@ -6,7 +6,7 @@ import { ComponentDecorator } from 'twenty-ui/testing';
 import { I18nFrontDecorator } from '~/testing/decorators/I18nFrontDecorator';
 import { ObjectMetadataItemsDecorator } from '~/testing/decorators/ObjectMetadataItemsDecorator';
 import { WorkflowStepActionDrawerDecorator } from '~/testing/decorators/WorkflowStepActionDrawerDecorator';
-import { WorkflowEditActionFormFieldSettings } from '../WorkflowEditActionFormFieldSettings';
+import { WorkflowEditActionFormFieldSettings } from '@/workflow/workflow-steps/workflow-actions/form-action/components/WorkflowEditActionFormFieldSettings';
 
 const meta: Meta<typeof WorkflowEditActionFormFieldSettings> = {
   title: 'Modules/Workflow/Actions/Form/WorkflowEditActionFormFieldSettings',
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/form-action/components/__stories__/WorkflowEditActionFormFiller.stories.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/form-action/components/__stories__/WorkflowEditActionFormFiller.stories.tsx
index 16d12c4cb9..eb93cf1410 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/form-action/components/__stories__/WorkflowEditActionFormFiller.stories.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/form-action/components/__stories__/WorkflowEditActionFormFiller.stories.tsx
@@ -10,7 +10,7 @@ import { WorkflowStepActionDrawerDecorator } from '~/testing/decorators/Workflow
 import { WorkflowStepDecorator } from '~/testing/decorators/WorkflowStepDecorator';
 import { WorkspaceDecorator } from '~/testing/decorators/WorkspaceDecorator';
 import { graphqlMocks } from '~/testing/graphqlMocks';
-import { WorkflowEditActionFormFiller } from '../WorkflowEditActionFormFiller';
+import { WorkflowEditActionFormFiller } from '@/workflow/workflow-steps/workflow-actions/form-action/components/WorkflowEditActionFormFiller';
 
 const meta: Meta<typeof WorkflowEditActionFormFiller> = {
   title: 'Modules/Workflow/Actions/Form/WorkflowEditActionFormFiller',
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/form-action/components/__stories__/WorkflowFormEmptyMessage.stories.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/form-action/components/__stories__/WorkflowFormEmptyMessage.stories.tsx
index d9fa1e71fd..9d43e85bec 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/form-action/components/__stories__/WorkflowFormEmptyMessage.stories.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/form-action/components/__stories__/WorkflowFormEmptyMessage.stories.tsx
@@ -1,7 +1,7 @@
 import type { Meta, StoryObj } from '@storybook/react';
 import { expect, within } from '@storybook/test';
 import { I18nFrontDecorator } from '~/testing/decorators/I18nFrontDecorator';
-import { WorkflowFormEmptyMessage } from '../WorkflowFormEmptyMessage';
+import { WorkflowFormEmptyMessage } from '@/workflow/workflow-steps/workflow-actions/form-action/components/WorkflowFormEmptyMessage';
 
 const meta: Meta<typeof WorkflowFormEmptyMessage> = {
   title: 'Modules/Workflow/Actions/Form/WorkflowFormEmptyMessage',
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/form-action/utils/__tests__/getDefaultFormFieldSettings.test.ts b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/form-action/utils/__tests__/getDefaultFormFieldSettings.test.ts
index 8bbe03a0ee..e58f90500a 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/form-action/utils/__tests__/getDefaultFormFieldSettings.test.ts
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/form-action/utils/__tests__/getDefaultFormFieldSettings.test.ts
@@ -1,6 +1,6 @@
 import { FieldMetadataType } from 'twenty-shared/types';
 import { v4 } from 'uuid';
-import { getDefaultFormFieldSettings } from '../getDefaultFormFieldSettings';
+import { getDefaultFormFieldSettings } from '@/workflow/workflow-steps/workflow-actions/form-action/utils/getDefaultFormFieldSettings';
 
 jest.mock('uuid', () => ({
   v4: jest.fn(() => 'test-uuid-123'),
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/http-request-action/components/WorkflowEditActionHttpRequest.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/http-request-action/components/WorkflowEditActionHttpRequest.tsx
index 1a8885f58b..be410ee7ea 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/http-request-action/components/WorkflowEditActionHttpRequest.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/http-request-action/components/WorkflowEditActionHttpRequest.tsx
@@ -21,12 +21,12 @@ import { IconPlayerPlay, IconSettings } from 'twenty-ui/display';
 import {
   HTTP_METHODS,
   JSON_RESPONSE_PLACEHOLDER,
-} from '../constants/HttpRequest';
-import { WORKFLOW_HTTP_REQUEST_TAB_LIST_COMPONENT_ID } from '../constants/WorkflowHttpRequestTabListComponentId';
-import { useHttpRequestForm } from '../hooks/useHttpRequestForm';
-import { useHttpRequestOutputSchema } from '../hooks/useHttpRequestOutputSchema';
-import { useTestHttpRequest } from '../hooks/useTestHttpRequest';
-import { WorkflowHttpRequestTabId } from '../types/WorkflowHttpRequestTabId';
+} from '@/workflow/workflow-steps/workflow-actions/http-request-action/constants/HttpRequest';
+import { WORKFLOW_HTTP_REQUEST_TAB_LIST_COMPONENT_ID } from '@/workflow/workflow-steps/workflow-actions/http-request-action/constants/WorkflowHttpRequestTabListComponentId';
+import { useHttpRequestForm } from '@/workflow/workflow-steps/workflow-actions/http-request-action/hooks/useHttpRequestForm';
+import { useHttpRequestOutputSchema } from '@/workflow/workflow-steps/workflow-actions/http-request-action/hooks/useHttpRequestOutputSchema';
+import { useTestHttpRequest } from '@/workflow/workflow-steps/workflow-actions/http-request-action/hooks/useTestHttpRequest';
+import { WorkflowHttpRequestTabId } from '@/workflow/workflow-steps/workflow-actions/http-request-action/types/WorkflowHttpRequestTabId';
 import { BodyInput } from './BodyInput';
 import { HttpRequestExecutionResult } from './HttpRequestExecutionResult';
 import { HttpRequestTestVariableInput } from './HttpRequestTestVariableInput';
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/http-request-action/components/__stories__/WorkflowEditActionHttpRequest.stories.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/http-request-action/components/__stories__/WorkflowEditActionHttpRequest.stories.tsx
index 28e3ce0e20..945fe6911f 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/http-request-action/components/__stories__/WorkflowEditActionHttpRequest.stories.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/http-request-action/components/__stories__/WorkflowEditActionHttpRequest.stories.tsx
@@ -13,7 +13,7 @@ import {
   getWorkflowNodeIdMock,
   MOCKED_STEP_ID,
 } from '~/testing/mock-data/workflow';
-import { WorkflowEditActionHttpRequest } from '../WorkflowEditActionHttpRequest';
+import { WorkflowEditActionHttpRequest } from '@/workflow/workflow-steps/workflow-actions/http-request-action/components/WorkflowEditActionHttpRequest';
 
 const DEFAULT_ACTION: WorkflowHttpRequestAction = {
   id: getWorkflowNodeIdMock(),
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/http-request-action/hooks/__tests__/useHttpRequestForm.test.ts b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/http-request-action/hooks/__tests__/useHttpRequestForm.test.ts
index 631d8bc079..998834f7c3 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/http-request-action/hooks/__tests__/useHttpRequestForm.test.ts
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/http-request-action/hooks/__tests__/useHttpRequestForm.test.ts
@@ -1,6 +1,6 @@
 import { type WorkflowHttpRequestAction } from '@/workflow/types/Workflow';
 import { act, renderHook } from '@testing-library/react';
-import { useHttpRequestForm } from '../useHttpRequestForm';
+import { useHttpRequestForm } from '@/workflow/workflow-steps/workflow-actions/http-request-action/hooks/useHttpRequestForm';
 
 describe('useHttpRequestForm', () => {
   const mockAction: WorkflowHttpRequestAction = {
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/http-request-action/hooks/__tests__/useTestHttpRequest.test.ts b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/http-request-action/hooks/__tests__/useTestHttpRequest.test.ts
index 999a417050..997e899815 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/http-request-action/hooks/__tests__/useTestHttpRequest.test.ts
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/http-request-action/hooks/__tests__/useTestHttpRequest.test.ts
@@ -5,7 +5,7 @@ import { act, renderHook } from '@testing-library/react';
 import React from 'react';
 import { RecoilRoot } from 'recoil';
 import { resolveInput } from 'twenty-shared/utils';
-import { useTestHttpRequest } from '../useTestHttpRequest';
+import { useTestHttpRequest } from '@/workflow/workflow-steps/workflow-actions/http-request-action/hooks/useTestHttpRequest';
 
 // Mock Apollo Client
 jest.mock('@apollo/client', () => ({
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/http-request-action/hooks/useHttpRequestForm.ts b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/http-request-action/hooks/useHttpRequestForm.ts
index 7e268e6d6a..108d23446c 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/http-request-action/hooks/useHttpRequestForm.ts
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/http-request-action/hooks/useHttpRequestForm.ts
@@ -5,7 +5,7 @@ import { useDebouncedCallback } from 'use-debounce';
 import {
   type HttpRequestBody,
   type HttpRequestFormData,
-} from '../constants/HttpRequest';
+} from '@/workflow/workflow-steps/workflow-actions/http-request-action/constants/HttpRequest';
 
 export type UseHttpRequestFormParams = {
   action: WorkflowHttpRequestAction;
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/http-request-action/hooks/useHttpRequestOutputSchema.ts b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/http-request-action/hooks/useHttpRequestOutputSchema.ts
index d2d0b22003..9061c5c81f 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/http-request-action/hooks/useHttpRequestOutputSchema.ts
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/http-request-action/hooks/useHttpRequestOutputSchema.ts
@@ -3,8 +3,8 @@ import { parseAndValidateVariableFriendlyStringifiedJson } from '@/workflow/util
 import { isNonEmptyString } from '@sniptt/guards';
 import { useState } from 'react';
 import { type BaseOutputSchemaV2 } from 'twenty-shared/workflow';
-import { convertOutputSchemaToJson } from '../utils/convertOutputSchemaToJson';
-import { getHttpRequestOutputSchema } from '../utils/getHttpRequestOutputSchema';
+import { convertOutputSchemaToJson } from '@/workflow/workflow-steps/workflow-actions/http-request-action/utils/convertOutputSchemaToJson';
+import { getHttpRequestOutputSchema } from '@/workflow/workflow-steps/workflow-actions/http-request-action/utils/getHttpRequestOutputSchema';
 
 type UseHttpRequestOutputSchemaProps = {
   action: WorkflowHttpRequestAction;
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/http-request-action/utils/__tests__/convertOutputSchemaToJson.test.ts b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/http-request-action/utils/__tests__/convertOutputSchemaToJson.test.ts
index 358b2b41cd..2797021bd0 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/http-request-action/utils/__tests__/convertOutputSchemaToJson.test.ts
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/http-request-action/utils/__tests__/convertOutputSchemaToJson.test.ts
@@ -1,5 +1,5 @@
 import { type BaseOutputSchemaV2 } from 'twenty-shared/workflow';
-import { convertOutputSchemaToJson } from '../convertOutputSchemaToJson';
+import { convertOutputSchemaToJson } from '@/workflow/workflow-steps/workflow-actions/http-request-action/utils/convertOutputSchemaToJson';
 
 describe('convertOutputSchemaToJson', () => {
   it('should convert simple object schema to JSON', () => {
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/http-request-action/utils/__tests__/getBodyTypeFromHeaders.test.ts b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/http-request-action/utils/__tests__/getBodyTypeFromHeaders.test.ts
index 0eed650151..3d418d103f 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/http-request-action/utils/__tests__/getBodyTypeFromHeaders.test.ts
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/http-request-action/utils/__tests__/getBodyTypeFromHeaders.test.ts
@@ -1,5 +1,5 @@
-import { BODY_TYPES } from '../../constants/HttpRequest';
-import { getBodyTypeFromHeaders } from '../getBodyTypeFromHeaders';
+import { BODY_TYPES } from '@/workflow/workflow-steps/workflow-actions/http-request-action/constants/HttpRequest';
+import { getBodyTypeFromHeaders } from '@/workflow/workflow-steps/workflow-actions/http-request-action/utils/getBodyTypeFromHeaders';
 
 describe('getBodyTypeFromHeaders', () => {
   describe('when headers is undefined or null', () => {
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/http-request-action/utils/__tests__/getHttpRequestOutputSchema.test.ts b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/http-request-action/utils/__tests__/getHttpRequestOutputSchema.test.ts
index ee53898119..62725030c9 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/http-request-action/utils/__tests__/getHttpRequestOutputSchema.test.ts
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/http-request-action/utils/__tests__/getHttpRequestOutputSchema.test.ts
@@ -1,4 +1,4 @@
-import { getHttpRequestOutputSchema } from '../getHttpRequestOutputSchema';
+import { getHttpRequestOutputSchema } from '@/workflow/workflow-steps/workflow-actions/http-request-action/utils/getHttpRequestOutputSchema';
 
 describe('getHttpRequestOutputSchema', () => {
   it('should return empty object for null input', () => {
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/http-request-action/utils/__tests__/hasNonStringValues.test.ts b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/http-request-action/utils/__tests__/hasNonStringValues.test.ts
index 0987e5e0a6..fdb9bb4cb0 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/http-request-action/utils/__tests__/hasNonStringValues.test.ts
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/http-request-action/utils/__tests__/hasNonStringValues.test.ts
@@ -1,5 +1,5 @@
-import { type HttpRequestBody } from '../../constants/HttpRequest';
-import { hasNonStringValues } from '../hasNonStringValues';
+import { type HttpRequestBody } from '@/workflow/workflow-steps/workflow-actions/http-request-action/constants/HttpRequest';
+import { hasNonStringValues } from '@/workflow/workflow-steps/workflow-actions/http-request-action/utils/hasNonStringValues';
 
 describe('hasNonStringValues', () => {
   it('should return true for empty object', () => {
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/http-request-action/utils/__tests__/isMethodWithBody.test.ts b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/http-request-action/utils/__tests__/isMethodWithBody.test.ts
index 74a5a14f0a..cfec77635a 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/http-request-action/utils/__tests__/isMethodWithBody.test.ts
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/http-request-action/utils/__tests__/isMethodWithBody.test.ts
@@ -1,5 +1,5 @@
-import { type HttpMethodWithBody } from '../../constants/HttpRequest';
-import { isMethodWithBody } from '../isMethodWithBody';
+import { type HttpMethodWithBody } from '@/workflow/workflow-steps/workflow-actions/http-request-action/constants/HttpRequest';
+import { isMethodWithBody } from '@/workflow/workflow-steps/workflow-actions/http-request-action/utils/isMethodWithBody';
 
 describe('isMethodWithBody', () => {
   it('should return false for null input', () => {
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/http-request-action/utils/__tests__/parseHttpJsonBodyWithoutVariablesOrThrow.test.ts b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/http-request-action/utils/__tests__/parseHttpJsonBodyWithoutVariablesOrThrow.test.ts
index daf5939dc3..58a89983e8 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/http-request-action/utils/__tests__/parseHttpJsonBodyWithoutVariablesOrThrow.test.ts
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/http-request-action/utils/__tests__/parseHttpJsonBodyWithoutVariablesOrThrow.test.ts
@@ -1,4 +1,4 @@
-import { parseHttpJsonBodyWithoutVariablesOrThrow } from '../parseHttpJsonBodyWithoutVariablesOrThrow';
+import { parseHttpJsonBodyWithoutVariablesOrThrow } from '@/workflow/workflow-steps/workflow-actions/http-request-action/utils/parseHttpJsonBodyWithoutVariablesOrThrow';
 
 describe('parseHttpJsonBodyWithoutVariablesOrThrow', () => {
   it('should parse valid JSON without variables', () => {
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/http-request-action/utils/__tests__/shouldDisplayRawJsonByDefault.test.ts b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/http-request-action/utils/__tests__/shouldDisplayRawJsonByDefault.test.ts
index 959963b6d5..26e8cc1a08 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/http-request-action/utils/__tests__/shouldDisplayRawJsonByDefault.test.ts
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/http-request-action/utils/__tests__/shouldDisplayRawJsonByDefault.test.ts
@@ -1,5 +1,5 @@
-import { type HttpRequestBody } from '../../constants/HttpRequest';
-import { shouldDisplayRawJsonByDefault } from '../shouldDisplayRawJsonByDefault';
+import { type HttpRequestBody } from '@/workflow/workflow-steps/workflow-actions/http-request-action/constants/HttpRequest';
+import { shouldDisplayRawJsonByDefault } from '@/workflow/workflow-steps/workflow-actions/http-request-action/utils/shouldDisplayRawJsonByDefault';
 
 describe('shouldDisplayRawJsonByDefault', () => {
   describe('when defaultValue is undefined', () => {
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/http-request-action/utils/isReadOnlyHeaderKey.ts b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/http-request-action/utils/isReadOnlyHeaderKey.ts
index c7158353cb..c767ff1c1c 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/http-request-action/utils/isReadOnlyHeaderKey.ts
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/http-request-action/utils/isReadOnlyHeaderKey.ts
@@ -1,4 +1,4 @@
-import { AUTO_SET_HEADER_KEYS } from '../constants/AutoSetHeaderKeys';
+import { AUTO_SET_HEADER_KEYS } from '@/workflow/workflow-steps/workflow-actions/http-request-action/constants/AutoSetHeaderKeys';
 
 export const isAutoSetHeaderKey = (key: string): boolean => {
   return AUTO_SET_HEADER_KEYS.includes(key.trim().toLowerCase());
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/utils/__tests__/getActionHeaderTypeOrThrow.test.ts b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/utils/__tests__/getActionHeaderTypeOrThrow.test.ts
index 9e181fa06b..c8739d8878 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/utils/__tests__/getActionHeaderTypeOrThrow.test.ts
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/utils/__tests__/getActionHeaderTypeOrThrow.test.ts
@@ -1,4 +1,4 @@
-import { getActionHeaderTypeOrThrow } from '../getActionHeaderTypeOrThrow';
+import { getActionHeaderTypeOrThrow } from '@/workflow/workflow-steps/workflow-actions/utils/getActionHeaderTypeOrThrow';
 
 describe('getActionHeaderTypeOrThrow', () => {
   it('should return "Core" for CODE action type', () => {
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/utils/__tests__/getActionIcon.test.ts b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/utils/__tests__/getActionIcon.test.ts
index e087a5daf8..a34adaa7bf 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/utils/__tests__/getActionIcon.test.ts
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/utils/__tests__/getActionIcon.test.ts
@@ -1,8 +1,8 @@
-import { AI_ACTIONS } from '../../constants/AiActions';
-import { CORE_ACTIONS } from '../../constants/CoreActions';
-import { HUMAN_INPUT_ACTIONS } from '../../constants/HumanInputActions';
-import { RECORD_ACTIONS } from '../../constants/RecordActions';
-import { getActionIcon } from '../getActionIcon';
+import { AI_ACTIONS } from '@/workflow/workflow-steps/workflow-actions/constants/AiActions';
+import { CORE_ACTIONS } from '@/workflow/workflow-steps/workflow-actions/constants/CoreActions';
+import { HUMAN_INPUT_ACTIONS } from '@/workflow/workflow-steps/workflow-actions/constants/HumanInputActions';
+import { RECORD_ACTIONS } from '@/workflow/workflow-steps/workflow-actions/constants/RecordActions';
+import { getActionIcon } from '@/workflow/workflow-steps/workflow-actions/utils/getActionIcon';
 
 describe('getActionIcon', () => {
   it('should return correct icon for all action types', () => {
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/utils/__tests__/getActionIconColorOrThrow.test.ts b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/utils/__tests__/getActionIconColorOrThrow.test.ts
index 32a1141d48..617b034940 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/utils/__tests__/getActionIconColorOrThrow.test.ts
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/utils/__tests__/getActionIconColorOrThrow.test.ts
@@ -1,7 +1,7 @@
 import { type WorkflowActionType } from '@/workflow/types/Workflow';
 import { type Theme } from '@emotion/react';
 import { COLOR_LIGHT, GRAY_SCALE_LIGHT } from 'twenty-ui/theme';
-import { getActionIconColorOrThrow } from '../getActionIconColorOrThrow';
+import { getActionIconColorOrThrow } from '@/workflow/workflow-steps/workflow-actions/utils/getActionIconColorOrThrow';
 
 const mockTheme: Theme = {
   color: {
diff --git a/packages/twenty-front/src/modules/workflow/workflow-trigger/utils/__tests__/getManualTriggerDefaultSettings.test.ts b/packages/twenty-front/src/modules/workflow/workflow-trigger/utils/__tests__/getManualTriggerDefaultSettings.test.ts
index 7e5b48c4e1..045732d2b5 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-trigger/utils/__tests__/getManualTriggerDefaultSettings.test.ts
+++ b/packages/twenty-front/src/modules/workflow/workflow-trigger/utils/__tests__/getManualTriggerDefaultSettings.test.ts
@@ -1,6 +1,6 @@
 import { type ObjectMetadataItem } from '@/object-metadata/types/ObjectMetadataItem';
 import { COMMAND_MENU_DEFAULT_ICON } from '@/workflow/workflow-trigger/constants/CommandMenuDefaultIcon';
-import { getManualTriggerDefaultSettings } from '../getManualTriggerDefaultSettings';
+import { getManualTriggerDefaultSettings } from '@/workflow/workflow-trigger/utils/getManualTriggerDefaultSettings';
 
 const mockObjectMetadataItems: ObjectMetadataItem[] = [
   {
diff --git a/packages/twenty-front/src/modules/workflow/workflow-trigger/utils/__tests__/getRootStepIds.test.ts b/packages/twenty-front/src/modules/workflow/workflow-trigger/utils/__tests__/getRootStepIds.test.ts
index 92089fc56a..225b3e0106 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-trigger/utils/__tests__/getRootStepIds.test.ts
+++ b/packages/twenty-front/src/modules/workflow/workflow-trigger/utils/__tests__/getRootStepIds.test.ts
@@ -1,5 +1,5 @@
 import { type WorkflowAction } from '@/workflow/types/Workflow';
-import { getRootStepIds } from '../getRootStepIds';
+import { getRootStepIds } from '@/workflow/workflow-trigger/utils/getRootStepIds';
 
 describe('getRootStepIds', () => {
   it('should return empty array for empty steps', () => {
diff --git a/packages/twenty-front/src/modules/workflow/workflow-trigger/utils/__tests__/getTriggerDefaultDefinition.test.ts b/packages/twenty-front/src/modules/workflow/workflow-trigger/utils/__tests__/getTriggerDefaultDefinition.test.ts
index 50fc86fc8a..fc3fedec17 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-trigger/utils/__tests__/getTriggerDefaultDefinition.test.ts
+++ b/packages/twenty-front/src/modules/workflow/workflow-trigger/utils/__tests__/getTriggerDefaultDefinition.test.ts
@@ -1,7 +1,7 @@
 import { COMMAND_MENU_DEFAULT_ICON } from '@/workflow/workflow-trigger/constants/CommandMenuDefaultIcon';
 import { DatabaseTriggerDefaultLabel } from '@/workflow/workflow-trigger/constants/DatabaseTriggerDefaultLabel';
 import { generatedMockObjectMetadataItems } from '~/testing/utils/generatedMockObjectMetadataItems';
-import { getTriggerDefaultDefinition } from '../getTriggerDefaultDefinition';
+import { getTriggerDefaultDefinition } from '@/workflow/workflow-trigger/utils/getTriggerDefaultDefinition';
 
 describe('getTriggerDefaultDefinition', () => {
   it('throws if the activeNonSystemObjectMetadataItems list is empty', () => {
diff --git a/packages/twenty-front/src/modules/workflow/workflow-trigger/utils/__tests__/getTriggerHeaderType.test.ts b/packages/twenty-front/src/modules/workflow/workflow-trigger/utils/__tests__/getTriggerHeaderType.test.ts
index 25b3b8f778..aec6bee3fc 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-trigger/utils/__tests__/getTriggerHeaderType.test.ts
+++ b/packages/twenty-front/src/modules/workflow/workflow-trigger/utils/__tests__/getTriggerHeaderType.test.ts
@@ -1,5 +1,5 @@
 import { type WorkflowTrigger } from '@/workflow/types/Workflow';
-import { getTriggerHeaderType } from '../getTriggerHeaderType';
+import { getTriggerHeaderType } from '@/workflow/workflow-trigger/utils/getTriggerHeaderType';
 
 describe('getTriggerHeaderType', () => {
   describe('DATABASE_EVENT triggers', () => {
diff --git a/packages/twenty-front/src/modules/workflow/workflow-trigger/utils/__tests__/getTriggerIconColor.test.ts b/packages/twenty-front/src/modules/workflow/workflow-trigger/utils/__tests__/getTriggerIconColor.test.ts
index 0524dbfd70..48f95da894 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-trigger/utils/__tests__/getTriggerIconColor.test.ts
+++ b/packages/twenty-front/src/modules/workflow/workflow-trigger/utils/__tests__/getTriggerIconColor.test.ts
@@ -1,6 +1,6 @@
 import { type Theme } from '@emotion/react';
 import { COLOR_LIGHT } from 'twenty-ui/theme';
-import { getTriggerIconColor } from '../getTriggerIconColor';
+import { getTriggerIconColor } from '@/workflow/workflow-trigger/utils/getTriggerIconColor';
 
 describe('getTriggerIconColor', () => {
   const mockTheme: Theme = {
diff --git a/packages/twenty-front/src/modules/workflow/workflow-trigger/utils/cron-to-human/descriptors/getDayOfMonthDescription.ts b/packages/twenty-front/src/modules/workflow/workflow-trigger/utils/cron-to-human/descriptors/getDayOfMonthDescription.ts
index dbe630ad97..31cf066d9b 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-trigger/utils/cron-to-human/descriptors/getDayOfMonthDescription.ts
+++ b/packages/twenty-front/src/modules/workflow/workflow-trigger/utils/cron-to-human/descriptors/getDayOfMonthDescription.ts
@@ -5,7 +5,7 @@ import { getOrdinalNumber } from '~/utils/format/getOrdinalNumber';
 import { isListValue } from '~/utils/validation/isListValue';
 import { isNumericRange } from '~/utils/validation/isNumericRange';
 import { isStepValue } from '~/utils/validation/isStepValue';
-import { type CronDescriptionOptions } from '../types/cronDescriptionOptions';
+import { type CronDescriptionOptions } from '@/workflow/workflow-trigger/utils/cron-to-human/types/cronDescriptionOptions';
 
 export const getDayOfMonthDescription = (
   dayOfMonth: string,
diff --git a/packages/twenty-front/src/modules/workflow/workflow-trigger/utils/cron-to-human/descriptors/getDayOfWeekDescription.ts b/packages/twenty-front/src/modules/workflow/workflow-trigger/utils/cron-to-human/descriptors/getDayOfWeekDescription.ts
index 503da30f36..43c4b71a01 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-trigger/utils/cron-to-human/descriptors/getDayOfWeekDescription.ts
+++ b/packages/twenty-front/src/modules/workflow/workflow-trigger/utils/cron-to-human/descriptors/getDayOfWeekDescription.ts
@@ -5,7 +5,7 @@ import { isDefined } from 'twenty-shared/utils';
 import { isListValue } from '~/utils/validation/isListValue';
 import { isNumericRange } from '~/utils/validation/isNumericRange';
 import { isStepValue } from '~/utils/validation/isStepValue';
-import { type CronDescriptionOptions } from '../types/cronDescriptionOptions';
+import { type CronDescriptionOptions } from '@/workflow/workflow-trigger/utils/cron-to-human/types/cronDescriptionOptions';
 
 const getDayName = (
   dayNum: number,
diff --git a/packages/twenty-front/src/modules/workflow/workflow-trigger/utils/cron-to-human/descriptors/getHoursDescription.ts b/packages/twenty-front/src/modules/workflow/workflow-trigger/utils/cron-to-human/descriptors/getHoursDescription.ts
index 8921224d2c..43179661ff 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-trigger/utils/cron-to-human/descriptors/getHoursDescription.ts
+++ b/packages/twenty-front/src/modules/workflow/workflow-trigger/utils/cron-to-human/descriptors/getHoursDescription.ts
@@ -5,7 +5,7 @@ import { formatTime as formatCronTime } from '~/utils/format/formatTime';
 import { isListValue } from '~/utils/validation/isListValue';
 import { isNumericRange } from '~/utils/validation/isNumericRange';
 import { isStepValue } from '~/utils/validation/isStepValue';
-import { type CronDescriptionOptions } from '../types/cronDescriptionOptions';
+import { type CronDescriptionOptions } from '@/workflow/workflow-trigger/utils/cron-to-human/types/cronDescriptionOptions';
 
 export const getHoursDescription = (
   hours: string,
diff --git a/packages/twenty-front/src/modules/workflow/workflow-trigger/utils/cron-to-human/descriptors/getMinutesDescription.ts b/packages/twenty-front/src/modules/workflow/workflow-trigger/utils/cron-to-human/descriptors/getMinutesDescription.ts
index 5fa0253b31..0d9cdd7904 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-trigger/utils/cron-to-human/descriptors/getMinutesDescription.ts
+++ b/packages/twenty-front/src/modules/workflow/workflow-trigger/utils/cron-to-human/descriptors/getMinutesDescription.ts
@@ -4,7 +4,7 @@ import { isDefined } from 'twenty-shared/utils';
 import { isListValue } from '~/utils/validation/isListValue';
 import { isNumericRange } from '~/utils/validation/isNumericRange';
 import { isStepValue } from '~/utils/validation/isStepValue';
-import { type CronDescriptionOptions } from '../types/cronDescriptionOptions';
+import { type CronDescriptionOptions } from '@/workflow/workflow-trigger/utils/cron-to-human/types/cronDescriptionOptions';
 
 export const getMinutesDescription = (
   minutes: string,
diff --git a/packages/twenty-front/src/modules/workflow/workflow-trigger/utils/cron-to-human/descriptors/getMonthsDescription.ts b/packages/twenty-front/src/modules/workflow/workflow-trigger/utils/cron-to-human/descriptors/getMonthsDescription.ts
index 5b25b7fa34..a4e1bd5c96 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-trigger/utils/cron-to-human/descriptors/getMonthsDescription.ts
+++ b/packages/twenty-front/src/modules/workflow/workflow-trigger/utils/cron-to-human/descriptors/getMonthsDescription.ts
@@ -5,7 +5,7 @@ import { isDefined } from 'twenty-shared/utils';
 import { isListValue } from '~/utils/validation/isListValue';
 import { isNumericRange } from '~/utils/validation/isNumericRange';
 import { isStepValue } from '~/utils/validation/isStepValue';
-import { type CronDescriptionOptions } from '../types/cronDescriptionOptions';
+import { type CronDescriptionOptions } from '@/workflow/workflow-trigger/utils/cron-to-human/types/cronDescriptionOptions';
 
 const getMonthName = (
   monthNum: number,
diff --git a/packages/twenty-front/src/modules/workflow/workflow-trigger/utils/cron-to-human/utils/validateCronField.ts b/packages/twenty-front/src/modules/workflow/workflow-trigger/utils/cron-to-human/utils/validateCronField.ts
index 71600bbacb..dd8bceacfe 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-trigger/utils/cron-to-human/utils/validateCronField.ts
+++ b/packages/twenty-front/src/modules/workflow/workflow-trigger/utils/cron-to-human/utils/validateCronField.ts
@@ -1,6 +1,6 @@
 import { isDefined } from 'twenty-shared/utils';
 
-import { type CronFieldType } from '../types/cronExpressionParts';
+import { type CronFieldType } from '@/workflow/workflow-trigger/utils/cron-to-human/types/cronExpressionParts';
 
 type FieldRange = {
   min: number;
diff --git a/packages/twenty-front/src/modules/workflow/workflow-variables/components/WorkflowVariablesDropdownStepItems.tsx b/packages/twenty-front/src/modules/workflow/workflow-variables/components/WorkflowVariablesDropdownStepItems.tsx
index d5afe47f7c..b404ac4f17 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-variables/components/WorkflowVariablesDropdownStepItems.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-variables/components/WorkflowVariablesDropdownStepItems.tsx
@@ -21,7 +21,7 @@ import {
   useIcons,
 } from 'twenty-ui/display';
 import { MenuItemSelect } from 'twenty-ui/navigation';
-import { useVariableDropdown } from '../hooks/useVariableDropdown';
+import { useVariableDropdown } from '@/workflow/workflow-variables/hooks/useVariableDropdown';
 
 type WorkflowVariablesDropdownStepItemsProps = {
   step: StepOutputSchemaV2;
diff --git a/packages/twenty-front/src/modules/workflow/workflow-variables/hooks/useVariableDropdown.ts b/packages/twenty-front/src/modules/workflow/workflow-variables/hooks/useVariableDropdown.ts
index cfe41c9eab..87024beb4c 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-variables/hooks/useVariableDropdown.ts
+++ b/packages/twenty-front/src/modules/workflow/workflow-variables/hooks/useVariableDropdown.ts
@@ -15,10 +15,10 @@ import { useSetRecoilState } from 'recoil';
 import { isDefined } from 'twenty-shared/utils';
 import { type BaseOutputSchemaV2 } from 'twenty-shared/workflow';
 import { useIcons } from 'twenty-ui/display';
-import { isBaseOutputSchemaV2 } from '../types/guards/isBaseOutputSchemaV2';
-import { isLinkOutputSchema } from '../types/guards/isLinkOutputSchema';
-import { isRecordOutputSchemaV2 } from '../types/guards/isRecordOutputSchemaV2';
-import { getCurrentSubStepFromPath } from '../utils/getCurrentSubStepFromPath';
+import { isBaseOutputSchemaV2 } from '@/workflow/workflow-variables/types/guards/isBaseOutputSchemaV2';
+import { isLinkOutputSchema } from '@/workflow/workflow-variables/types/guards/isLinkOutputSchema';
+import { isRecordOutputSchemaV2 } from '@/workflow/workflow-variables/types/guards/isRecordOutputSchemaV2';
+import { getCurrentSubStepFromPath } from '@/workflow/workflow-variables/utils/getCurrentSubStepFromPath';
 
 type UseVariableDropdownProps = {
   step: StepOutputSchemaV2;
diff --git a/packages/twenty-front/src/modules/workflow/workflow-variables/types/guards/isIteratorOutputSchema.ts b/packages/twenty-front/src/modules/workflow/workflow-variables/types/guards/isIteratorOutputSchema.ts
index 6a1e6b6c0e..c290afb404 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-variables/types/guards/isIteratorOutputSchema.ts
+++ b/packages/twenty-front/src/modules/workflow/workflow-variables/types/guards/isIteratorOutputSchema.ts
@@ -3,7 +3,7 @@ import {
   type WorkflowTriggerType,
 } from '@/workflow/types/Workflow';
 import { type OutputSchemaV2 } from '@/workflow/workflow-variables/types/StepOutputSchemaV2';
-import { type IteratorOutputSchema } from '../IteratorOutputSchema';
+import { type IteratorOutputSchema } from '@/workflow/workflow-variables/types/IteratorOutputSchema';
 
 export const isIteratorOutputSchema = (
   stepType: WorkflowActionType | WorkflowTriggerType,
diff --git a/packages/twenty-front/src/modules/workflow/workflow-variables/utils/__tests__/filterOutputSchema.test.ts b/packages/twenty-front/src/modules/workflow/workflow-variables/utils/__tests__/filterOutputSchema.test.ts
index e825476319..04542829df 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-variables/utils/__tests__/filterOutputSchema.test.ts
+++ b/packages/twenty-front/src/modules/workflow/workflow-variables/utils/__tests__/filterOutputSchema.test.ts
@@ -1,7 +1,7 @@
 import { type RecordOutputSchemaV2 } from '@/workflow/workflow-variables/types/RecordOutputSchemaV2';
 import { FieldMetadataType } from 'twenty-shared/types';
 import { type BaseOutputSchemaV2 } from 'twenty-shared/workflow';
-import { filterOutputSchema } from '../filterOutputSchema';
+import { filterOutputSchema } from '@/workflow/workflow-variables/utils/filterOutputSchema';
 
 describe('filterOutputSchema', () => {
   const createRecordSchema = (
diff --git a/packages/twenty-front/src/modules/workflow/workflow-variables/utils/__tests__/getInitialEditorContent.test.ts b/packages/twenty-front/src/modules/workflow/workflow-variables/utils/__tests__/getInitialEditorContent.test.ts
index 88000ea27f..3a6dba8ab1 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-variables/utils/__tests__/getInitialEditorContent.test.ts
+++ b/packages/twenty-front/src/modules/workflow/workflow-variables/utils/__tests__/getInitialEditorContent.test.ts
@@ -1,4 +1,4 @@
-import { getInitialEditorContent } from '../getInitialEditorContent';
+import { getInitialEditorContent } from '@/workflow/workflow-variables/utils/getInitialEditorContent';
 
 describe('getInitialEditorContent', () => {
   it('should handle single line text', () => {
diff --git a/packages/twenty-front/src/modules/workflow/workflow-variables/utils/__tests__/parseEditorContent.test.ts b/packages/twenty-front/src/modules/workflow/workflow-variables/utils/__tests__/parseEditorContent.test.ts
index eb91b4b0f3..c493b6ec8f 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-variables/utils/__tests__/parseEditorContent.test.ts
+++ b/packages/twenty-front/src/modules/workflow/workflow-variables/utils/__tests__/parseEditorContent.test.ts
@@ -1,5 +1,5 @@
 import type { JSONContent } from '@tiptap/react';
-import { parseEditorContent } from '../parseEditorContent';
+import { parseEditorContent } from '@/workflow/workflow-variables/utils/parseEditorContent';
 
 describe('parseEditorContent', () => {
   it('should parse empty doc', () => {
diff --git a/packages/twenty-front/src/modules/workspace-invitation/hooks/useCreateWorkspaceInvitation.ts b/packages/twenty-front/src/modules/workspace-invitation/hooks/useCreateWorkspaceInvitation.ts
index 99428219e8..e24fb628c6 100644
--- a/packages/twenty-front/src/modules/workspace-invitation/hooks/useCreateWorkspaceInvitation.ts
+++ b/packages/twenty-front/src/modules/workspace-invitation/hooks/useCreateWorkspaceInvitation.ts
@@ -3,7 +3,7 @@ import {
   type SendInvitationsMutationVariables,
   useSendInvitationsMutation,
 } from '~/generated-metadata/graphql';
-import { workspaceInvitationsState } from '../states/workspaceInvitationsStates';
+import { workspaceInvitationsState } from '@/workspace-invitation/states/workspaceInvitationsStates';
 
 export const useCreateWorkspaceInvitation = () => {
   const [sendInvitationsMutation] = useSendInvitationsMutation();
diff --git a/packages/twenty-front/src/modules/workspace-invitation/hooks/useDeleteWorkspaceInvitation.ts b/packages/twenty-front/src/modules/workspace-invitation/hooks/useDeleteWorkspaceInvitation.ts
index 2032e2e39a..6af85e2dab 100644
--- a/packages/twenty-front/src/modules/workspace-invitation/hooks/useDeleteWorkspaceInvitation.ts
+++ b/packages/twenty-front/src/modules/workspace-invitation/hooks/useDeleteWorkspaceInvitation.ts
@@ -3,7 +3,7 @@ import {
   type DeleteWorkspaceInvitationMutationVariables,
   useDeleteWorkspaceInvitationMutation,
 } from '~/generated-metadata/graphql';
-import { workspaceInvitationsState } from '../states/workspaceInvitationsStates';
+import { workspaceInvitationsState } from '@/workspace-invitation/states/workspaceInvitationsStates';
 
 export const useDeleteWorkspaceInvitation = () => {
   const [deleteWorkspaceInvitationMutation] =
diff --git a/packages/twenty-front/src/modules/workspace-invitation/hooks/useResendWorkspaceInvitation.ts b/packages/twenty-front/src/modules/workspace-invitation/hooks/useResendWorkspaceInvitation.ts
index aea6177ed7..ccfeabad68 100644
--- a/packages/twenty-front/src/modules/workspace-invitation/hooks/useResendWorkspaceInvitation.ts
+++ b/packages/twenty-front/src/modules/workspace-invitation/hooks/useResendWorkspaceInvitation.ts
@@ -3,7 +3,7 @@ import {
   type ResendWorkspaceInvitationMutationVariables,
   useResendWorkspaceInvitationMutation,
 } from '~/generated-metadata/graphql';
-import { workspaceInvitationsState } from '../states/workspaceInvitationsStates';
+import { workspaceInvitationsState } from '@/workspace-invitation/states/workspaceInvitationsStates';
 
 export const useResendWorkspaceInvitation = () => {
   const [resendWorkspaceInvitationMutation] =
diff --git a/packages/twenty-front/src/modules/workspace/components/WorkspaceInviteTeam.tsx b/packages/twenty-front/src/modules/workspace/components/WorkspaceInviteTeam.tsx
index 7691333dae..f1b968cf3d 100644
--- a/packages/twenty-front/src/modules/workspace/components/WorkspaceInviteTeam.tsx
+++ b/packages/twenty-front/src/modules/workspace/components/WorkspaceInviteTeam.tsx
@@ -13,7 +13,7 @@ import { useLingui } from '@lingui/react/macro';
 import { isDefined } from 'twenty-shared/utils';
 import { IconSend } from 'twenty-ui/display';
 import { Button } from 'twenty-ui/input';
-import { useCreateWorkspaceInvitation } from '../../workspace-invitation/hooks/useCreateWorkspaceInvitation';
+import { useCreateWorkspaceInvitation } from '@/workspace-invitation/hooks/useCreateWorkspaceInvitation';
 
 const StyledContainer = styled.div`
   display: flex;
diff --git a/packages/twenty-front/src/pages/auth/__stories__/SignInUp.stories.tsx b/packages/twenty-front/src/pages/auth/__stories__/SignInUp.stories.tsx
index 1ef2fb832e..a486418f82 100644
--- a/packages/twenty-front/src/pages/auth/__stories__/SignInUp.stories.tsx
+++ b/packages/twenty-front/src/pages/auth/__stories__/SignInUp.stories.tsx
@@ -14,7 +14,7 @@ import {
 import { graphqlMocks } from '~/testing/graphqlMocks';
 
 import { AppPath } from 'twenty-shared/types';
-import { SignInUp } from '../SignInUp';
+import { SignInUp } from '~/pages/auth/SignInUp';
 
 const CaptchaTokenSetterEffect = () => {
   const setCaptchaToken = useSetRecoilState(captchaTokenState);
diff --git a/packages/twenty-front/src/pages/auth/__stories__/SignInUpWithInvite.stories.tsx b/packages/twenty-front/src/pages/auth/__stories__/SignInUpWithInvite.stories.tsx
index c65d62040a..f4c3fa999f 100644
--- a/packages/twenty-front/src/pages/auth/__stories__/SignInUpWithInvite.stories.tsx
+++ b/packages/twenty-front/src/pages/auth/__stories__/SignInUpWithInvite.stories.tsx
@@ -15,7 +15,7 @@ import {
 import { graphqlMocks } from '~/testing/graphqlMocks';
 
 import { AppPath } from 'twenty-shared/types';
-import { SignInUp } from '../SignInUp';
+import { SignInUp } from '~/pages/auth/SignInUp';
 
 const CaptchaTokenSetterEffect = () => {
   const setCaptchaToken = useSetRecoilState(captchaTokenState);
diff --git a/packages/twenty-front/src/pages/not-found/__stories__/NotFound.stories.tsx b/packages/twenty-front/src/pages/not-found/__stories__/NotFound.stories.tsx
index bceafd67ee..d32c6f3f1e 100644
--- a/packages/twenty-front/src/pages/not-found/__stories__/NotFound.stories.tsx
+++ b/packages/twenty-front/src/pages/not-found/__stories__/NotFound.stories.tsx
@@ -7,7 +7,7 @@ import {
 } from '~/testing/decorators/PageDecorator';
 import { graphqlMocks } from '~/testing/graphqlMocks';
 
-import { NotFound } from '../NotFound';
+import { NotFound } from '~/pages/not-found/NotFound';
 const meta: Meta<PageDecoratorArgs> = {
   title: 'Pages/NotFound/Default',
   component: NotFound,
diff --git a/packages/twenty-front/src/pages/object-record/__stories__/RecordIndexPage.stories.tsx b/packages/twenty-front/src/pages/object-record/__stories__/RecordIndexPage.stories.tsx
index af3d94495b..aa504c13e5 100644
--- a/packages/twenty-front/src/pages/object-record/__stories__/RecordIndexPage.stories.tsx
+++ b/packages/twenty-front/src/pages/object-record/__stories__/RecordIndexPage.stories.tsx
@@ -6,7 +6,7 @@ import {
 } from '~/testing/decorators/PageDecorator';
 import { graphqlMocks } from '~/testing/graphqlMocks';
 
-import { RecordIndexPage } from '../RecordIndexPage';
+import { RecordIndexPage } from '~/pages/object-record/RecordIndexPage';
 
 const meta: Meta<PageDecoratorArgs> = {
   title: 'Pages/ObjectRecord/RecordIndexPage',
diff --git a/packages/twenty-front/src/pages/object-record/__stories__/RecordShowPage.stories.tsx b/packages/twenty-front/src/pages/object-record/__stories__/RecordShowPage.stories.tsx
index 888f5a27ff..5a2ee4d0d6 100644
--- a/packages/twenty-front/src/pages/object-record/__stories__/RecordShowPage.stories.tsx
+++ b/packages/twenty-front/src/pages/object-record/__stories__/RecordShowPage.stories.tsx
@@ -9,7 +9,7 @@ import {
 } from '~/testing/mock-data/people';
 import { mockedWorkspaceMemberData } from '~/testing/mock-data/users';
 
-import { RecordShowPage } from '../RecordShowPage';
+import { RecordShowPage } from '~/pages/object-record/RecordShowPage';
 
 const personRecord = allMockPersonRecords[0];
 const meta: Meta<PageDecoratorArgs> = {
diff --git a/packages/twenty-front/src/pages/onboarding/InviteTeam.tsx b/packages/twenty-front/src/pages/onboarding/InviteTeam.tsx
index 16c5ce8121..e2ef9ca442 100644
--- a/packages/twenty-front/src/pages/onboarding/InviteTeam.tsx
+++ b/packages/twenty-front/src/pages/onboarding/InviteTeam.tsx
@@ -26,7 +26,7 @@ import { LightButton, MainButton } from 'twenty-ui/input';
 import { ClickToActionLink } from 'twenty-ui/navigation';
 import { z } from 'zod';
 import { useCopyToClipboard } from '~/hooks/useCopyToClipboard';
-import { useCreateWorkspaceInvitation } from '../../modules/workspace-invitation/hooks/useCreateWorkspaceInvitation';
+import { useCreateWorkspaceInvitation } from '@/workspace-invitation/hooks/useCreateWorkspaceInvitation';
 
 const StyledAnimatedContainer = styled.div`
   display: flex;
diff --git a/packages/twenty-front/src/pages/settings/__stories__/SettingsBilling.stories.tsx b/packages/twenty-front/src/pages/settings/__stories__/SettingsBilling.stories.tsx
index 59e6b73526..a7ebb755ca 100644
--- a/packages/twenty-front/src/pages/settings/__stories__/SettingsBilling.stories.tsx
+++ b/packages/twenty-front/src/pages/settings/__stories__/SettingsBilling.stories.tsx
@@ -11,7 +11,7 @@ import { sleep } from '~/utils/sleep';
 
 import { getSettingsPath } from 'twenty-shared/utils';
 
-import { SettingsBilling } from '../SettingsBilling';
+import { SettingsBilling } from '~/pages/settings/SettingsBilling';
 import { WorkspaceDecorator } from '~/testing/decorators/WorkspaceDecorator';
 
 const meta: Meta<PageDecoratorArgs> = {
diff --git a/packages/twenty-front/src/pages/settings/__stories__/SettingsExperience.stories.tsx b/packages/twenty-front/src/pages/settings/__stories__/SettingsExperience.stories.tsx
index d044e4dc91..b03401686a 100644
--- a/packages/twenty-front/src/pages/settings/__stories__/SettingsExperience.stories.tsx
+++ b/packages/twenty-front/src/pages/settings/__stories__/SettingsExperience.stories.tsx
@@ -8,7 +8,7 @@ import { graphqlMocks } from '~/testing/graphqlMocks';
 
 import { within } from '@storybook/test';
 import { getCanvasElementForDropdownTesting } from 'twenty-ui/testing';
-import { SettingsExperience } from '../profile/appearance/components/SettingsExperience';
+import { SettingsExperience } from '~/pages/settings/profile/appearance/components/SettingsExperience';
 
 const meta: Meta<PageDecoratorArgs> = {
   title: 'Pages/Settings/SettingsExperience',
diff --git a/packages/twenty-front/src/pages/settings/__stories__/SettingsProfile.stories.tsx b/packages/twenty-front/src/pages/settings/__stories__/SettingsProfile.stories.tsx
index fbc1d2fee2..a86e56483f 100644
--- a/packages/twenty-front/src/pages/settings/__stories__/SettingsProfile.stories.tsx
+++ b/packages/twenty-front/src/pages/settings/__stories__/SettingsProfile.stories.tsx
@@ -6,7 +6,7 @@ import {
 } from '~/testing/decorators/PageDecorator';
 import { graphqlMocks } from '~/testing/graphqlMocks';
 
-import { SettingsProfile } from '../SettingsProfile';
+import { SettingsProfile } from '~/pages/settings/SettingsProfile';
 
 const meta: Meta<PageDecoratorArgs> = {
   title: 'Pages/Settings/SettingsProfile',
diff --git a/packages/twenty-front/src/pages/settings/__stories__/SettingsWorkspace.stories.tsx b/packages/twenty-front/src/pages/settings/__stories__/SettingsWorkspace.stories.tsx
index b1b6911372..065dada50c 100644
--- a/packages/twenty-front/src/pages/settings/__stories__/SettingsWorkspace.stories.tsx
+++ b/packages/twenty-front/src/pages/settings/__stories__/SettingsWorkspace.stories.tsx
@@ -6,7 +6,7 @@ import {
 } from '~/testing/decorators/PageDecorator';
 import { graphqlMocks } from '~/testing/graphqlMocks';
 
-import { SettingsWorkspace } from '../SettingsWorkspace';
+import { SettingsWorkspace } from '~/pages/settings/SettingsWorkspace';
 
 const meta: Meta<PageDecoratorArgs> = {
   title: 'Pages/Settings/SettingsWorkspace',
diff --git a/packages/twenty-front/src/pages/settings/__stories__/SettingsWorkspaceMembers.stories.tsx b/packages/twenty-front/src/pages/settings/__stories__/SettingsWorkspaceMembers.stories.tsx
index edb52ef482..901eed6221 100644
--- a/packages/twenty-front/src/pages/settings/__stories__/SettingsWorkspaceMembers.stories.tsx
+++ b/packages/twenty-front/src/pages/settings/__stories__/SettingsWorkspaceMembers.stories.tsx
@@ -9,7 +9,7 @@ import { graphqlMocks } from '~/testing/graphqlMocks';
 // TEMP_DISABLED_TEST: Removed unused import due to commented test
 // import { sleep } from '~/utils/sleep';
 
-import { SettingsWorkspaceMembers } from '../members/SettingsWorkspaceMembers';
+import { SettingsWorkspaceMembers } from '~/pages/settings/members/SettingsWorkspaceMembers';
 
 const meta: Meta<PageDecoratorArgs> = {
   title: 'Pages/Settings/SettingsWorkspaceMembers',
diff --git a/packages/twenty-front/src/pages/settings/accounts/__stories__/SettingsAccounts.stories.tsx b/packages/twenty-front/src/pages/settings/accounts/__stories__/SettingsAccounts.stories.tsx
index c75ef2e583..5e58c9086e 100644
--- a/packages/twenty-front/src/pages/settings/accounts/__stories__/SettingsAccounts.stories.tsx
+++ b/packages/twenty-front/src/pages/settings/accounts/__stories__/SettingsAccounts.stories.tsx
@@ -7,7 +7,7 @@ import {
 } from '~/testing/decorators/PageDecorator';
 import { graphqlMocks } from '~/testing/graphqlMocks';
 
-import { SettingsAccounts } from '../SettingsAccounts';
+import { SettingsAccounts } from '~/pages/settings/accounts/SettingsAccounts';
 
 const meta: Meta<PageDecoratorArgs> = {
   title: 'Pages/Settings/Accounts/SettingsAccounts',
diff --git a/packages/twenty-front/src/pages/settings/accounts/__stories__/SettingsAccountsEmails.stories.tsx b/packages/twenty-front/src/pages/settings/accounts/__stories__/SettingsAccountsEmails.stories.tsx
index 63c528a9d1..65d7e604c9 100644
--- a/packages/twenty-front/src/pages/settings/accounts/__stories__/SettingsAccountsEmails.stories.tsx
+++ b/packages/twenty-front/src/pages/settings/accounts/__stories__/SettingsAccountsEmails.stories.tsx
@@ -7,7 +7,7 @@ import {
 } from '~/testing/decorators/PageDecorator';
 import { graphqlMocks } from '~/testing/graphqlMocks';
 
-import { SettingsAccountsEmails } from '../SettingsAccountsEmails';
+import { SettingsAccountsEmails } from '~/pages/settings/accounts/SettingsAccountsEmails';
 
 const meta: Meta<PageDecoratorArgs> = {
   title: 'Pages/Settings/Accounts/SettingsAccountsEmails',
diff --git a/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentEvalsTab.tsx b/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentEvalsTab.tsx
index b2f8e4d23b..8447cd145f 100644
--- a/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentEvalsTab.tsx
+++ b/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentEvalsTab.tsx
@@ -28,7 +28,7 @@ import { Button, LightIconButton } from 'twenty-ui/input';
 import { Section } from 'twenty-ui/layout';
 import { MenuItem } from 'twenty-ui/navigation';
 import { v4 as uuidv4 } from 'uuid';
-import { SETTINGS_AGENT_DETAIL_TABS } from '../constants/SettingsAgentDetailTabs';
+import { SETTINGS_AGENT_DETAIL_TABS } from '~/pages/settings/ai/constants/SettingsAgentDetailTabs';
 
 const DELETE_EVAL_INPUT_MODAL_ID = 'delete-eval-input-modal';
 
diff --git a/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentRoleTab.tsx b/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentRoleTab.tsx
index c13a89e988..b709c6e3cd 100644
--- a/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentRoleTab.tsx
+++ b/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentRoleTab.tsx
@@ -18,7 +18,7 @@ import {
   useCreateOneRoleMutation,
   useGetRolesQuery,
 } from '~/generated-metadata/graphql';
-import { type SettingsAIAgentFormValues } from '../hooks/useSettingsAgentFormState';
+import { type SettingsAIAgentFormValues } from '~/pages/settings/ai/hooks/useSettingsAgentFormState';
 
 const StyledWarningText = styled.div`
   color: ${({ theme }) => theme.font.color.tertiary};
diff --git a/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentSettingsTab.tsx b/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentSettingsTab.tsx
index c3950a53a7..3ee8274549 100644
--- a/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentSettingsTab.tsx
+++ b/packages/twenty-front/src/pages/settings/ai/components/SettingsAgentSettingsTab.tsx
@@ -20,8 +20,8 @@ import { type Agent } from '~/generated/graphql';
 import { SettingsAgentDeleteConfirmationModal } from '~/pages/settings/ai/components/SettingsAgentDeleteConfirmationModal';
 import { SettingsAgentResponseFormat } from '~/pages/settings/ai/components/SettingsAgentResponseFormat';
 import { computeMetadataNameFromLabel } from '~/pages/settings/data-model/utils/computeMetadataNameFromLabel';
-import { SettingsAgentModelCapabilities } from '../components/SettingsAgentModelCapabilities';
-import { type SettingsAIAgentFormValues } from '../hooks/useSettingsAgentFormState';
+import { SettingsAgentModelCapabilities } from '~/pages/settings/ai/components/SettingsAgentModelCapabilities';
+import { type SettingsAIAgentFormValues } from '~/pages/settings/ai/hooks/useSettingsAgentFormState';
 
 const StyledFormContainer = styled.div`
   display: flex;
diff --git a/packages/twenty-front/src/pages/settings/ai/forms/components/SettingsAIAgentForm.tsx b/packages/twenty-front/src/pages/settings/ai/forms/components/SettingsAIAgentForm.tsx
index 41e5524ad7..f13ad5aec9 100644
--- a/packages/twenty-front/src/pages/settings/ai/forms/components/SettingsAIAgentForm.tsx
+++ b/packages/twenty-front/src/pages/settings/ai/forms/components/SettingsAIAgentForm.tsx
@@ -8,8 +8,8 @@ import { SettingsTextInput } from '@/ui/input/components/SettingsTextInput';
 import { TextArea } from '@/ui/input/components/TextArea';
 import { isDefined } from 'twenty-shared/utils';
 import { computeMetadataNameFromLabel } from '~/pages/settings/data-model/utils/computeMetadataNameFromLabel';
-import { SettingsAgentModelCapabilities } from '../../components/SettingsAgentModelCapabilities';
-import { type SettingsAIAgentFormValues } from '../../hooks/useSettingsAgentFormState';
+import { SettingsAgentModelCapabilities } from '~/pages/settings/ai/components/SettingsAgentModelCapabilities';
+import { type SettingsAIAgentFormValues } from '~/pages/settings/ai/hooks/useSettingsAgentFormState';
 
 const StyledFormContainer = styled.div`
   display: flex;
diff --git a/packages/twenty-front/src/pages/settings/ai/hooks/useSettingsAgentFormState.ts b/packages/twenty-front/src/pages/settings/ai/hooks/useSettingsAgentFormState.ts
index fcbbc47b8f..6c52002ed9 100644
--- a/packages/twenty-front/src/pages/settings/ai/hooks/useSettingsAgentFormState.ts
+++ b/packages/twenty-front/src/pages/settings/ai/hooks/useSettingsAgentFormState.ts
@@ -1,7 +1,7 @@
 import { useState } from 'react';
 import { isDefined } from 'twenty-shared/utils';
 import { type z } from 'zod';
-import { settingsAIAgentFormSchema } from '../validation-schemas/settingsAIAgentFormSchema';
+import { settingsAIAgentFormSchema } from '~/pages/settings/ai/validation-schemas/settingsAIAgentFormSchema';
 
 export type SettingsAIAgentFormValues = z.infer<
   typeof settingsAIAgentFormSchema
diff --git a/packages/twenty-front/src/pages/settings/data-model/__stories__/SettingsNewObject.stories.tsx b/packages/twenty-front/src/pages/settings/data-model/__stories__/SettingsNewObject.stories.tsx
index f06321d97b..190ad0f3fe 100644
--- a/packages/twenty-front/src/pages/settings/data-model/__stories__/SettingsNewObject.stories.tsx
+++ b/packages/twenty-front/src/pages/settings/data-model/__stories__/SettingsNewObject.stories.tsx
@@ -8,7 +8,7 @@ import {
 import { graphqlMocks } from '~/testing/graphqlMocks';
 
 import { I18nFrontDecorator } from '~/testing/decorators/I18nFrontDecorator';
-import { SettingsNewObject } from '../SettingsNewObject';
+import { SettingsNewObject } from '~/pages/settings/data-model/SettingsNewObject';
 
 const meta: Meta<PageDecoratorArgs> = {
   title: 'Pages/Settings/DataModel/SettingsNewObject',
diff --git a/packages/twenty-front/src/pages/settings/data-model/__stories__/SettingsObjectDetail.stories.tsx b/packages/twenty-front/src/pages/settings/data-model/__stories__/SettingsObjectDetail.stories.tsx
index 6d409a7c92..90e6fdb3b2 100644
--- a/packages/twenty-front/src/pages/settings/data-model/__stories__/SettingsObjectDetail.stories.tsx
+++ b/packages/twenty-front/src/pages/settings/data-model/__stories__/SettingsObjectDetail.stories.tsx
@@ -8,7 +8,7 @@ import {
 import { graphqlMocks } from '~/testing/graphqlMocks';
 import { sleep } from '~/utils/sleep';
 
-import { SettingsObjectDetailPage } from '../SettingsObjectDetailPage';
+import { SettingsObjectDetailPage } from '~/pages/settings/data-model/SettingsObjectDetailPage';
 
 const meta: Meta<PageDecoratorArgs> = {
   title: 'Pages/Settings/DataModel/SettingsObjectDetail',
diff --git a/packages/twenty-front/src/pages/settings/data-model/__stories__/SettingsObjectFieldEdit.stories.tsx b/packages/twenty-front/src/pages/settings/data-model/__stories__/SettingsObjectFieldEdit.stories.tsx
index a7bdffd982..86392d3dc9 100644
--- a/packages/twenty-front/src/pages/settings/data-model/__stories__/SettingsObjectFieldEdit.stories.tsx
+++ b/packages/twenty-front/src/pages/settings/data-model/__stories__/SettingsObjectFieldEdit.stories.tsx
@@ -6,7 +6,7 @@ import {
 } from '~/testing/decorators/PageDecorator';
 import { graphqlMocks } from '~/testing/graphqlMocks';
 
-import { SettingsObjectFieldEdit } from '../SettingsObjectFieldEdit';
+import { SettingsObjectFieldEdit } from '~/pages/settings/data-model/SettingsObjectFieldEdit';
 
 const meta: Meta<PageDecoratorArgs> = {
   title: 'Pages/Settings/DataModel/SettingsObjectFieldEdit',
diff --git a/packages/twenty-front/src/pages/settings/data-model/__stories__/SettingsObjects.stories.tsx b/packages/twenty-front/src/pages/settings/data-model/__stories__/SettingsObjects.stories.tsx
index 981662f87d..e12fb763a3 100644
--- a/packages/twenty-front/src/pages/settings/data-model/__stories__/SettingsObjects.stories.tsx
+++ b/packages/twenty-front/src/pages/settings/data-model/__stories__/SettingsObjects.stories.tsx
@@ -7,7 +7,7 @@ import {
 } from '~/testing/decorators/PageDecorator';
 import { graphqlMocks } from '~/testing/graphqlMocks';
 
-import { SettingsObjects } from '../SettingsObjects';
+import { SettingsObjects } from '~/pages/settings/data-model/SettingsObjects';
 
 const meta: Meta<PageDecoratorArgs> = {
   title: 'Pages/Settings/DataModel/SettingsObjects',
diff --git a/packages/twenty-front/src/pages/settings/developers/__stories__/webhooks/SettingsDevelopersWebhooksDetail.stories.tsx b/packages/twenty-front/src/pages/settings/developers/__stories__/webhooks/SettingsDevelopersWebhooksDetail.stories.tsx
index ccb1efbe23..55a9e34642 100644
--- a/packages/twenty-front/src/pages/settings/developers/__stories__/webhooks/SettingsDevelopersWebhooksDetail.stories.tsx
+++ b/packages/twenty-front/src/pages/settings/developers/__stories__/webhooks/SettingsDevelopersWebhooksDetail.stories.tsx
@@ -7,7 +7,7 @@ import {
   type PageDecoratorArgs,
 } from '~/testing/decorators/PageDecorator';
 import { graphqlMocks } from '~/testing/graphqlMocks';
-import { SettingsDevelopersWebhookDetail } from '../../webhooks/components/SettingsDevelopersWebhookDetail';
+import { SettingsDevelopersWebhookDetail } from '~/pages/settings/developers/webhooks/components/SettingsDevelopersWebhookDetail';
 
 const meta: Meta<PageDecoratorArgs> = {
   title: 'Pages/Settings/Webhooks/SettingsDevelopersWebhookDetail',
diff --git a/packages/twenty-front/src/pages/settings/members/SettingsWorkspaceMembers.tsx b/packages/twenty-front/src/pages/settings/members/SettingsWorkspaceMembers.tsx
index 2954880a9b..f3fe2edbb7 100644
--- a/packages/twenty-front/src/pages/settings/members/SettingsWorkspaceMembers.tsx
+++ b/packages/twenty-front/src/pages/settings/members/SettingsWorkspaceMembers.tsx
@@ -46,11 +46,11 @@ import { useGetWorkspaceInvitationsQuery } from '~/generated-metadata/graphql';
 
 import { useNavigateSettings } from '~/hooks/useNavigateSettings';
 import { normalizeSearchText } from '~/utils/normalizeSearchText';
-import { TableCell } from '../../../modules/ui/layout/table/components/TableCell';
-import { TableRow } from '../../../modules/ui/layout/table/components/TableRow';
-import { useDeleteWorkspaceInvitation } from '../../../modules/workspace-invitation/hooks/useDeleteWorkspaceInvitation';
-import { useResendWorkspaceInvitation } from '../../../modules/workspace-invitation/hooks/useResendWorkspaceInvitation';
-import { workspaceInvitationsState } from '../../../modules/workspace-invitation/states/workspaceInvitationsStates';
+import { TableCell } from '@/ui/layout/table/components/TableCell';
+import { TableRow } from '@/ui/layout/table/components/TableRow';
+import { useDeleteWorkspaceInvitation } from '@/workspace-invitation/hooks/useDeleteWorkspaceInvitation';
+import { useResendWorkspaceInvitation } from '@/workspace-invitation/hooks/useResendWorkspaceInvitation';
+import { workspaceInvitationsState } from '@/workspace-invitation/states/workspaceInvitationsStates';
 
 const StyledButtonContainer = styled.div`
   align-items: center;
diff --git a/packages/twenty-front/src/pages/settings/roles/__stories__/SettingsRoleCreate.stories.tsx b/packages/twenty-front/src/pages/settings/roles/__stories__/SettingsRoleCreate.stories.tsx
index 3600d95919..41a398a54e 100644
--- a/packages/twenty-front/src/pages/settings/roles/__stories__/SettingsRoleCreate.stories.tsx
+++ b/packages/twenty-front/src/pages/settings/roles/__stories__/SettingsRoleCreate.stories.tsx
@@ -6,7 +6,7 @@ import {
 } from '~/testing/decorators/PageDecorator';
 import { graphqlMocks } from '~/testing/graphqlMocks';
 
-import { SettingsRoleCreate } from '../SettingsRoleCreate';
+import { SettingsRoleCreate } from '~/pages/settings/roles/SettingsRoleCreate';
 
 const meta: Meta<PageDecoratorArgs> = {
   title: 'Pages/Settings/Roles/SettingsRoleCreate',
diff --git a/packages/twenty-front/src/pages/settings/roles/__stories__/SettingsRoleEdit.stories.tsx b/packages/twenty-front/src/pages/settings/roles/__stories__/SettingsRoleEdit.stories.tsx
index 127e13c342..f17508d121 100644
--- a/packages/twenty-front/src/pages/settings/roles/__stories__/SettingsRoleEdit.stories.tsx
+++ b/packages/twenty-front/src/pages/settings/roles/__stories__/SettingsRoleEdit.stories.tsx
@@ -6,7 +6,7 @@ import {
 } from '~/testing/decorators/PageDecorator';
 import { graphqlMocks } from '~/testing/graphqlMocks';
 
-import { SettingsRoleEdit } from '../SettingsRoleEdit';
+import { SettingsRoleEdit } from '~/pages/settings/roles/SettingsRoleEdit';
 
 const meta: Meta<PageDecoratorArgs> = {
   title: 'Pages/Settings/Roles/SettingsRoleEdit',
diff --git a/packages/twenty-front/src/pages/settings/roles/__stories__/SettingsRoles.stories.tsx b/packages/twenty-front/src/pages/settings/roles/__stories__/SettingsRoles.stories.tsx
index ec35bdb15b..c62dc641f2 100644
--- a/packages/twenty-front/src/pages/settings/roles/__stories__/SettingsRoles.stories.tsx
+++ b/packages/twenty-front/src/pages/settings/roles/__stories__/SettingsRoles.stories.tsx
@@ -9,7 +9,7 @@ import { graphqlMocks } from '~/testing/graphqlMocks';
 import { GET_ROLES } from '@/settings/roles/graphql/queries/getRolesQuery';
 import { getOperationName } from '@apollo/client/utilities';
 import { graphql, HttpResponse } from 'msw';
-import { SettingsRoles } from '../SettingsRoles';
+import { SettingsRoles } from '~/pages/settings/roles/SettingsRoles';
 
 const meta: Meta<PageDecoratorArgs> = {
   title: 'Pages/Settings/Roles/SettingsRoles',
diff --git a/packages/twenty-front/src/testing/decorators/ComponentWithRouterDecorator.tsx b/packages/twenty-front/src/testing/decorators/ComponentWithRouterDecorator.tsx
index d3b3f1ddca..4fc42f6bab 100644
--- a/packages/twenty-front/src/testing/decorators/ComponentWithRouterDecorator.tsx
+++ b/packages/twenty-front/src/testing/decorators/ComponentWithRouterDecorator.tsx
@@ -12,7 +12,7 @@ import {
   isRouteParams,
 } from '~/testing/decorators/PageDecorator';
 
-import { ComponentStorybookLayout } from '../ComponentStorybookLayout';
+import { ComponentStorybookLayout } from '~/testing/ComponentStorybookLayout';
 
 interface StrictArgs {
   [name: string]: unknown;
diff --git a/packages/twenty-front/src/testing/decorators/I18nFrontDecorator.tsx b/packages/twenty-front/src/testing/decorators/I18nFrontDecorator.tsx
index ca06884acf..5e9129ad5f 100644
--- a/packages/twenty-front/src/testing/decorators/I18nFrontDecorator.tsx
+++ b/packages/twenty-front/src/testing/decorators/I18nFrontDecorator.tsx
@@ -1,7 +1,7 @@
 import { i18n } from '@lingui/core';
 import { I18nProvider } from '@lingui/react';
 import { type Decorator } from '@storybook/react';
-import { messages as enMessages } from '../../locales/generated/en';
+import { messages as enMessages } from '~/locales/generated/en';
 import { SOURCE_LOCALE } from 'twenty-shared/translations';
 
 i18n.load({
diff --git a/packages/twenty-front/src/testing/decorators/PageDecorator.tsx b/packages/twenty-front/src/testing/decorators/PageDecorator.tsx
index e36aa6659e..f53a26db42 100644
--- a/packages/twenty-front/src/testing/decorators/PageDecorator.tsx
+++ b/packages/twenty-front/src/testing/decorators/PageDecorator.tsx
@@ -33,7 +33,7 @@ import { I18nProvider } from '@lingui/react';
 import { SOURCE_LOCALE } from 'twenty-shared/translations';
 import { IconsProvider } from 'twenty-ui/display';
 import { dynamicActivate } from '~/utils/i18n/dynamicActivate';
-import { FullHeightStorybookLayout } from '../FullHeightStorybookLayout';
+import { FullHeightStorybookLayout } from '~/testing/FullHeightStorybookLayout';
 
 export type PageDecoratorArgs = {
   routePath: string;
diff --git a/packages/twenty-front/src/testing/decorators/RootDecorator.tsx b/packages/twenty-front/src/testing/decorators/RootDecorator.tsx
index 7b09256bfc..1b242c99af 100644
--- a/packages/twenty-front/src/testing/decorators/RootDecorator.tsx
+++ b/packages/twenty-front/src/testing/decorators/RootDecorator.tsx
@@ -4,7 +4,7 @@ import { RecoilRoot } from 'recoil';
 
 import { ApolloCoreClientMockedProvider } from '@/object-metadata/hooks/__mocks__/ApolloCoreClientMockedProvider';
 
-import { mockedApolloClient } from '../mockedApolloClient';
+import { mockedApolloClient } from '~/testing/mockedApolloClient';
 
 export const RootDecorator: Decorator = (Story, context) => {
   const { parameters } = context;
diff --git a/packages/twenty-front/src/utils/__tests__/cast-as-number-or-null.test.ts b/packages/twenty-front/src/utils/__tests__/cast-as-number-or-null.test.ts
index 082527de7e..38b53922db 100644
--- a/packages/twenty-front/src/utils/__tests__/cast-as-number-or-null.test.ts
+++ b/packages/twenty-front/src/utils/__tests__/cast-as-number-or-null.test.ts
@@ -1,7 +1,7 @@
 import {
   canBeCastAsNumberOrNull,
   castAsNumberOrNull,
-} from '../cast-as-number-or-null';
+} from '~/utils/cast-as-number-or-null';
 
 describe('canBeCastAsNumberOrNull', () => {
   it(`should return true if null`, () => {
diff --git a/packages/twenty-front/src/utils/__tests__/castToString.test.ts b/packages/twenty-front/src/utils/__tests__/castToString.test.ts
index fc93ea5c9b..98e8e6cf13 100644
--- a/packages/twenty-front/src/utils/__tests__/castToString.test.ts
+++ b/packages/twenty-front/src/utils/__tests__/castToString.test.ts
@@ -1,4 +1,4 @@
-import { castToString } from '../castToString';
+import { castToString } from '~/utils/castToString';
 
 it('returns an empty string when undefined is provided', () => {
   expect(castToString(undefined)).toBe('');
diff --git a/packages/twenty-front/src/utils/__tests__/combineRefs.test.ts b/packages/twenty-front/src/utils/__tests__/combineRefs.test.ts
index bd4449dada..77cde38d2a 100644
--- a/packages/twenty-front/src/utils/__tests__/combineRefs.test.ts
+++ b/packages/twenty-front/src/utils/__tests__/combineRefs.test.ts
@@ -1,5 +1,5 @@
 import { type MutableRefObject } from 'react';
-import { combineRefs } from '../combineRefs';
+import { combineRefs } from '~/utils/combineRefs';
 
 describe('combineRefs', () => {
   it('should handle function refs', () => {
diff --git a/packages/twenty-front/src/utils/__tests__/date-utils.test.ts b/packages/twenty-front/src/utils/__tests__/date-utils.test.ts
index 6fbc2fd71a..53af6a3b36 100644
--- a/packages/twenty-front/src/utils/__tests__/date-utils.test.ts
+++ b/packages/twenty-front/src/utils/__tests__/date-utils.test.ts
@@ -12,8 +12,8 @@ import {
   beautifyPastDateRelativeToNow,
   hasDatePassed,
   parseDate,
-} from '../date-utils';
-import { logError } from '../logError';
+} from '~/utils/date-utils';
+import { logError } from '~/utils/logError';
 
 i18n.load(SOURCE_LOCALE, enMessages);
 i18n.activate(SOURCE_LOCALE);
diff --git a/packages/twenty-front/src/utils/__tests__/filterBySearchQuery.test.ts b/packages/twenty-front/src/utils/__tests__/filterBySearchQuery.test.ts
index d309436f45..10fa2bfe39 100644
--- a/packages/twenty-front/src/utils/__tests__/filterBySearchQuery.test.ts
+++ b/packages/twenty-front/src/utils/__tests__/filterBySearchQuery.test.ts
@@ -1,4 +1,4 @@
-import { filterBySearchQuery } from '../filterBySearchQuery';
+import { filterBySearchQuery } from '~/utils/filterBySearchQuery';
 
 describe('filterBySearchQuery', () => {
   type TestUser = {
diff --git a/packages/twenty-front/src/utils/__tests__/formatAddressDisplay.test.ts b/packages/twenty-front/src/utils/__tests__/formatAddressDisplay.test.ts
index a387d10176..223360bc7f 100644
--- a/packages/twenty-front/src/utils/__tests__/formatAddressDisplay.test.ts
+++ b/packages/twenty-front/src/utils/__tests__/formatAddressDisplay.test.ts
@@ -1,5 +1,5 @@
 import { type FieldAddressValue } from '@/object-record/record-field/ui/types/FieldMetadata';
-import { formatAddressDisplay } from '../formatAddressDisplay';
+import { formatAddressDisplay } from '~/utils/formatAddressDisplay';
 
 describe('formatAddressDisplay', () => {
   const mockAddressValue: FieldAddressValue = {
diff --git a/packages/twenty-front/src/utils/__tests__/getWorkspaceUrl.test.ts b/packages/twenty-front/src/utils/__tests__/getWorkspaceUrl.test.ts
index 6b6d9252e4..935be988c0 100644
--- a/packages/twenty-front/src/utils/__tests__/getWorkspaceUrl.test.ts
+++ b/packages/twenty-front/src/utils/__tests__/getWorkspaceUrl.test.ts
@@ -1,5 +1,5 @@
 import { type WorkspaceUrls } from '~/generated/graphql';
-import { getWorkspaceUrl } from '../getWorkspaceUrl';
+import { getWorkspaceUrl } from '~/utils/getWorkspaceUrl';
 
 describe('getWorkspaceUrl', () => {
   it('should return customUrl when it is defined', () => {
diff --git a/packages/twenty-front/src/utils/__tests__/isInIframe.test.ts b/packages/twenty-front/src/utils/__tests__/isInIframe.test.ts
index df8fafea47..c10cdb3034 100644
--- a/packages/twenty-front/src/utils/__tests__/isInIframe.test.ts
+++ b/packages/twenty-front/src/utils/__tests__/isInIframe.test.ts
@@ -1,4 +1,4 @@
-import { isInFrame } from '../isInIframe';
+import { isInFrame } from '~/utils/isInIframe';
 
 describe('isInFrame', () => {
   it('should return a boolean value', () => {
diff --git a/packages/twenty-front/src/utils/__tests__/isMatchingLocation.test.tsx b/packages/twenty-front/src/utils/__tests__/isMatchingLocation.test.tsx
index 863298485a..89035899de 100644
--- a/packages/twenty-front/src/utils/__tests__/isMatchingLocation.test.tsx
+++ b/packages/twenty-front/src/utils/__tests__/isMatchingLocation.test.tsx
@@ -1,5 +1,5 @@
 import { AppBasePath } from 'twenty-shared/types';
-import { isMatchingLocation } from '../isMatchingLocation';
+import { isMatchingLocation } from '~/utils/isMatchingLocation';
 
 describe('isMatchingLocation', () => {
   it('returns true when paths match with no basePath', () => {
diff --git a/packages/twenty-front/src/utils/__tests__/joinAddressFieldValues.test.ts b/packages/twenty-front/src/utils/__tests__/joinAddressFieldValues.test.ts
index 01ed9d2028..509bd244e9 100644
--- a/packages/twenty-front/src/utils/__tests__/joinAddressFieldValues.test.ts
+++ b/packages/twenty-front/src/utils/__tests__/joinAddressFieldValues.test.ts
@@ -1,5 +1,5 @@
 import { type FieldAddressValue } from '@/object-record/record-field/ui/types/FieldMetadata';
-import { joinAddressFieldValues } from '../joinAddressFieldValues';
+import { joinAddressFieldValues } from '~/utils/joinAddressFieldValues';
 
 describe('joinAddressFieldValues', () => {
   const mockAddressValue: FieldAddressValue = {
diff --git a/packages/twenty-front/src/utils/__tests__/logDebug.test.ts b/packages/twenty-front/src/utils/__tests__/logDebug.test.ts
index 302d2a072b..35039f234a 100644
--- a/packages/twenty-front/src/utils/__tests__/logDebug.test.ts
+++ b/packages/twenty-front/src/utils/__tests__/logDebug.test.ts
@@ -1,4 +1,4 @@
-import { logDebug } from '../logDebug';
+import { logDebug } from '~/utils/logDebug';
 
 describe('logDebug', () => {
   let consoleDebugSpy: jest.SpyInstance;
diff --git a/packages/twenty-front/src/utils/__tests__/logError.test.ts b/packages/twenty-front/src/utils/__tests__/logError.test.ts
index e0ece28ccc..3cc89c05c2 100644
--- a/packages/twenty-front/src/utils/__tests__/logError.test.ts
+++ b/packages/twenty-front/src/utils/__tests__/logError.test.ts
@@ -1,4 +1,4 @@
-import { logError } from '../logError';
+import { logError } from '~/utils/logError';
 
 describe('logError', () => {
   let consoleErrorSpy: jest.SpyInstance;
diff --git a/packages/twenty-front/src/utils/__tests__/normalizeSearchText.test.ts b/packages/twenty-front/src/utils/__tests__/normalizeSearchText.test.ts
index a21feab393..69ed9a008f 100644
--- a/packages/twenty-front/src/utils/__tests__/normalizeSearchText.test.ts
+++ b/packages/twenty-front/src/utils/__tests__/normalizeSearchText.test.ts
@@ -1,4 +1,4 @@
-import { normalizeSearchText } from '../normalizeSearchText';
+import { normalizeSearchText } from '~/utils/normalizeSearchText';
 
 describe('normalizeSearchText', () => {
   it('should handle basic ASCII text', () => {
diff --git a/packages/twenty-front/src/utils/__tests__/parseApolloStoreFieldName.test.ts b/packages/twenty-front/src/utils/__tests__/parseApolloStoreFieldName.test.ts
index dcb5acb9c0..39b9fa1334 100644
--- a/packages/twenty-front/src/utils/__tests__/parseApolloStoreFieldName.test.ts
+++ b/packages/twenty-front/src/utils/__tests__/parseApolloStoreFieldName.test.ts
@@ -1,4 +1,4 @@
-import { parseApolloStoreFieldName } from '../parseApolloStoreFieldName';
+import { parseApolloStoreFieldName } from '~/utils/parseApolloStoreFieldName';
 
 describe('parseApolloStoreFieldName', () => {
   it('returns an empty object if string is not a valid store field name', () => {
diff --git a/packages/twenty-front/src/utils/__tests__/sort.test.ts b/packages/twenty-front/src/utils/__tests__/sort.test.ts
index 9f0a4ea4f6..d531810df2 100644
--- a/packages/twenty-front/src/utils/__tests__/sort.test.ts
+++ b/packages/twenty-front/src/utils/__tests__/sort.test.ts
@@ -1,4 +1,4 @@
-import { sortAsc, sortDesc, sortNullsFirst, sortNullsLast } from '../sort';
+import { sortAsc, sortDesc, sortNullsFirst, sortNullsLast } from '~/utils/sort';
 
 describe('sort', () => {
   describe('sortNullsFirst', () => {
diff --git a/packages/twenty-front/src/utils/__tests__/sortFieldMetadataItem.test.ts b/packages/twenty-front/src/utils/__tests__/sortFieldMetadataItem.test.ts
index 07ed35c910..53fc250766 100644
--- a/packages/twenty-front/src/utils/__tests__/sortFieldMetadataItem.test.ts
+++ b/packages/twenty-front/src/utils/__tests__/sortFieldMetadataItem.test.ts
@@ -1,6 +1,6 @@
 import { type FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';
 
-import { sortFieldMetadataItem } from '../sortFieldMetadataItem';
+import { sortFieldMetadataItem } from '~/utils/sortFieldMetadataItem';
 
 describe('sortFieldMetadataItem', () => {
   it('should return an empty array for an empty array', () => {
diff --git a/packages/twenty-front/src/utils/__tests__/title-utils.test.ts b/packages/twenty-front/src/utils/__tests__/title-utils.test.ts
index 958d8ac957..9d30ab2241 100644
--- a/packages/twenty-front/src/utils/__tests__/title-utils.test.ts
+++ b/packages/twenty-front/src/utils/__tests__/title-utils.test.ts
@@ -1,6 +1,6 @@
 import { i18n } from '@lingui/core';
 import { messages as enMessages } from '~/locales/generated/en';
-import { getPageTitleFromPath } from '../title-utils';
+import { getPageTitleFromPath } from '~/utils/title-utils';
 
 i18n.load('en', enMessages);
 i18n.activate('en');
diff --git a/packages/twenty-front/src/utils/__tests__/turnOrderByIntoSort.test.ts b/packages/twenty-front/src/utils/__tests__/turnOrderByIntoSort.test.ts
index f9468b271e..1d5ddc4d34 100644
--- a/packages/twenty-front/src/utils/__tests__/turnOrderByIntoSort.test.ts
+++ b/packages/twenty-front/src/utils/__tests__/turnOrderByIntoSort.test.ts
@@ -1,4 +1,4 @@
-import { turnOrderByIntoSort } from '../turnOrderByIntoSort';
+import { turnOrderByIntoSort } from '~/utils/turnOrderByIntoSort';
 
 describe('turnOrderByIntoSort', () => {
   it('should be ok for "AscNullsFirst"', () => {
diff --git a/packages/twenty-front/src/utils/array/__tests__/getIndexNeighboursElementsFromArray.test.ts b/packages/twenty-front/src/utils/array/__tests__/getIndexNeighboursElementsFromArray.test.ts
index 4633342efc..35ba5e6a67 100644
--- a/packages/twenty-front/src/utils/array/__tests__/getIndexNeighboursElementsFromArray.test.ts
+++ b/packages/twenty-front/src/utils/array/__tests__/getIndexNeighboursElementsFromArray.test.ts
@@ -1,5 +1,5 @@
 import { type EachTestingContext } from 'twenty-shared/testing';
-import { getIndexNeighboursElementsFromArray } from '../getIndexNeighboursElementsFromArray';
+import { getIndexNeighboursElementsFromArray } from '~/utils/array/getIndexNeighboursElementsFromArray';
 
 type TestCase = {
   expected: ReturnType<typeof getIndexNeighboursElementsFromArray>;
diff --git a/packages/twenty-front/src/utils/array/__tests__/groupArrayItemsBy.test.ts b/packages/twenty-front/src/utils/array/__tests__/groupArrayItemsBy.test.ts
index 79aba40c74..192dad2c78 100644
--- a/packages/twenty-front/src/utils/array/__tests__/groupArrayItemsBy.test.ts
+++ b/packages/twenty-front/src/utils/array/__tests__/groupArrayItemsBy.test.ts
@@ -1,4 +1,4 @@
-import { groupArrayItemsBy } from '../groupArrayItemsBy';
+import { groupArrayItemsBy } from '~/utils/array/groupArrayItemsBy';
 
 describe('groupArrayItemsBy', () => {
   it('groups an array of objects by a computed key', () => {
diff --git a/packages/twenty-front/src/utils/array/__tests__/toSpliced.test.ts b/packages/twenty-front/src/utils/array/__tests__/toSpliced.test.ts
index 4b3052acea..ce4f3e0e4b 100644
--- a/packages/twenty-front/src/utils/array/__tests__/toSpliced.test.ts
+++ b/packages/twenty-front/src/utils/array/__tests__/toSpliced.test.ts
@@ -1,4 +1,4 @@
-import { toSpliced } from '../toSpliced';
+import { toSpliced } from '~/utils/array/toSpliced';
 
 describe('toSpliced', () => {
   it('removes elements from the array starting at the given index', () => {
diff --git a/packages/twenty-front/src/utils/format/__tests__/formatDate.test.ts b/packages/twenty-front/src/utils/format/__tests__/formatDate.test.ts
index 8deec2a111..e29c9ea7cc 100644
--- a/packages/twenty-front/src/utils/format/__tests__/formatDate.test.ts
+++ b/packages/twenty-front/src/utils/format/__tests__/formatDate.test.ts
@@ -2,7 +2,7 @@ import {
   formatToHumanReadableDay,
   formatToHumanReadableMonth,
   formatToHumanReadableTime,
-} from '../formatDate';
+} from '~/utils/format/formatDate';
 
 describe('formatToHumanReadableMonth', () => {
   it('should format the date to a human-readable month', () => {
diff --git a/packages/twenty-front/src/utils/format/__tests__/formatTime.test.ts b/packages/twenty-front/src/utils/format/__tests__/formatTime.test.ts
index 59d2ec26d2..37d294a241 100644
--- a/packages/twenty-front/src/utils/format/__tests__/formatTime.test.ts
+++ b/packages/twenty-front/src/utils/format/__tests__/formatTime.test.ts
@@ -1,4 +1,4 @@
-import { formatTime } from '../formatTime';
+import { formatTime } from '~/utils/format/formatTime';
 
 describe('formatTime', () => {
   it('should format 24-hour time', () => {
diff --git a/packages/twenty-front/src/utils/format/__tests__/formatToShortNumber.test.ts b/packages/twenty-front/src/utils/format/__tests__/formatToShortNumber.test.ts
index 97dc6f6168..bb0923af1e 100644
--- a/packages/twenty-front/src/utils/format/__tests__/formatToShortNumber.test.ts
+++ b/packages/twenty-front/src/utils/format/__tests__/formatToShortNumber.test.ts
@@ -1,4 +1,4 @@
-import { formatToShortNumber } from '../formatToShortNumber';
+import { formatToShortNumber } from '~/utils/format/formatToShortNumber';
 
 describe('formatToShortNumber', () => {
   it('formats numbers less than 1000 correctly', () => {
diff --git a/packages/twenty-front/src/utils/format/__tests__/getOrdinalNumber.test.ts b/packages/twenty-front/src/utils/format/__tests__/getOrdinalNumber.test.ts
index 4f44f1cfdc..23b831a4ba 100644
--- a/packages/twenty-front/src/utils/format/__tests__/getOrdinalNumber.test.ts
+++ b/packages/twenty-front/src/utils/format/__tests__/getOrdinalNumber.test.ts
@@ -1,4 +1,4 @@
-import { getOrdinalNumber } from '../getOrdinalNumber';
+import { getOrdinalNumber } from '~/utils/format/getOrdinalNumber';
 
 describe('getOrdinalNumber', () => {
   it('should return correct ordinal numbers', () => {
diff --git a/packages/twenty-front/src/utils/recoil/localStorageEffect.ts b/packages/twenty-front/src/utils/recoil/localStorageEffect.ts
index df36e3225c..1eb958ab8d 100644
--- a/packages/twenty-front/src/utils/recoil/localStorageEffect.ts
+++ b/packages/twenty-front/src/utils/recoil/localStorageEffect.ts
@@ -1,10 +1,11 @@
 import { type AtomEffect } from 'recoil';
+import { isDefined } from 'twenty-shared/utils';
 
 export const localStorageEffect =
   <T>(key?: string): AtomEffect<T> =>
   ({ setSelf, onSet, node }) => {
     const savedValue = localStorage.getItem(key ?? node.key);
-    if (savedValue != null) {
+    if (isDefined(savedValue)) {
       try {
         setSelf(JSON.parse(savedValue));
       } catch {
diff --git a/packages/twenty-front/src/utils/sortFieldMetadataItem.ts b/packages/twenty-front/src/utils/sortFieldMetadataItem.ts
index 52707c529e..183825abc2 100644
--- a/packages/twenty-front/src/utils/sortFieldMetadataItem.ts
+++ b/packages/twenty-front/src/utils/sortFieldMetadataItem.ts
@@ -1,6 +1,6 @@
 import { type FieldMetadataItem } from '@/object-metadata/types/FieldMetadataItem';
 
-import { parseDate } from '../utils/date-utils';
+import { parseDate } from '~/utils/date-utils';
 
 export const sortFieldMetadataItem = (
   a: FieldMetadataItem,
diff --git a/packages/twenty-front/src/utils/string/__tests__/applySimpleQuotesToString.test.ts b/packages/twenty-front/src/utils/string/__tests__/applySimpleQuotesToString.test.ts
index 7dedbb0704..6affe93e79 100644
--- a/packages/twenty-front/src/utils/string/__tests__/applySimpleQuotesToString.test.ts
+++ b/packages/twenty-front/src/utils/string/__tests__/applySimpleQuotesToString.test.ts
@@ -1,4 +1,4 @@
-import { applySimpleQuotesToString } from '../applySimpleQuotesToString';
+import { applySimpleQuotesToString } from '~/utils/string/applySimpleQuotesToString';
 
 describe('applySimpleQuotesToString', () => {
   it('wraps the input string with single quotes', () => {
diff --git a/packages/twenty-front/src/utils/string/__tests__/pascalCase.test.ts b/packages/twenty-front/src/utils/string/__tests__/pascalCase.test.ts
index 61d32f07cb..4fe787e9ea 100644
--- a/packages/twenty-front/src/utils/string/__tests__/pascalCase.test.ts
+++ b/packages/twenty-front/src/utils/string/__tests__/pascalCase.test.ts
@@ -1,4 +1,4 @@
-import { pascalCase } from '../pascalCase';
+import { pascalCase } from '~/utils/string/pascalCase';
 
 describe('pascalCase', () => {
   it('converts a string to pascal case', () => {
diff --git a/packages/twenty-front/src/utils/string/__tests__/stripSimpleQuotesFromString.test.ts b/packages/twenty-front/src/utils/string/__tests__/stripSimpleQuotesFromString.test.ts
index acf7765967..8edadc2179 100644
--- a/packages/twenty-front/src/utils/string/__tests__/stripSimpleQuotesFromString.test.ts
+++ b/packages/twenty-front/src/utils/string/__tests__/stripSimpleQuotesFromString.test.ts
@@ -1,4 +1,4 @@
-import { stripSimpleQuotesFromString } from '../stripSimpleQuotesFromString';
+import { stripSimpleQuotesFromString } from '~/utils/string/stripSimpleQuotesFromString';
 
 describe('stripSimpleQuotesFromString', () => {
   it('removes surrounding single quotes from a string', () => {
diff --git a/packages/twenty-front/src/utils/string/__tests__/turnIntoEmptyStringIfWhitespacesOnly.test.ts b/packages/twenty-front/src/utils/string/__tests__/turnIntoEmptyStringIfWhitespacesOnly.test.ts
index 84a8179ef0..d60e5b32bd 100644
--- a/packages/twenty-front/src/utils/string/__tests__/turnIntoEmptyStringIfWhitespacesOnly.test.ts
+++ b/packages/twenty-front/src/utils/string/__tests__/turnIntoEmptyStringIfWhitespacesOnly.test.ts
@@ -1,4 +1,4 @@
-import { turnIntoEmptyStringIfWhitespacesOnly } from '../turnIntoEmptyStringIfWhitespacesOnly';
+import { turnIntoEmptyStringIfWhitespacesOnly } from '~/utils/string/turnIntoEmptyStringIfWhitespacesOnly';
 
 describe('turnIntoEmptyStringIfWhitespacesOnly', () => {
   it('should return an empty string for whitespace-only input', () => {
diff --git a/packages/twenty-front/src/utils/string/__tests__/turnIntoUndefinedIfWhitespacesOnly.test.ts b/packages/twenty-front/src/utils/string/__tests__/turnIntoUndefinedIfWhitespacesOnly.test.ts
index fd1a2e105e..3c43b4f596 100644
--- a/packages/twenty-front/src/utils/string/__tests__/turnIntoUndefinedIfWhitespacesOnly.test.ts
+++ b/packages/twenty-front/src/utils/string/__tests__/turnIntoUndefinedIfWhitespacesOnly.test.ts
@@ -1,4 +1,4 @@
-import { turnIntoUndefinedIfWhitespacesOnly } from '../turnIntoUndefinedIfWhitespacesOnly';
+import { turnIntoUndefinedIfWhitespacesOnly } from '~/utils/string/turnIntoUndefinedIfWhitespacesOnly';
 
 describe('turnIntoUndefinedIfWhitespacesOnly', () => {
   it('should return undefined for whitespace-only input', () => {
diff --git a/packages/twenty-front/src/utils/validation-schemas/__tests__/camelCaseStringSchema.test.ts b/packages/twenty-front/src/utils/validation-schemas/__tests__/camelCaseStringSchema.test.ts
index edc3857d9b..e31229534f 100644
--- a/packages/twenty-front/src/utils/validation-schemas/__tests__/camelCaseStringSchema.test.ts
+++ b/packages/twenty-front/src/utils/validation-schemas/__tests__/camelCaseStringSchema.test.ts
@@ -1,6 +1,6 @@
 import { type ZodSafeParseError } from 'zod';
 
-import { camelCaseStringSchema } from '../camelCaseStringSchema';
+import { camelCaseStringSchema } from '~/utils/validation-schemas/camelCaseStringSchema';
 
 describe('camelCaseStringSchema', () => {
   it('validates a camel case string', () => {
diff --git a/packages/twenty-front/src/utils/validation-schemas/__tests__/simpleQuotesStringSchema.test.ts b/packages/twenty-front/src/utils/validation-schemas/__tests__/simpleQuotesStringSchema.test.ts
index 90adcfba9c..eaa9fb569d 100644
--- a/packages/twenty-front/src/utils/validation-schemas/__tests__/simpleQuotesStringSchema.test.ts
+++ b/packages/twenty-front/src/utils/validation-schemas/__tests__/simpleQuotesStringSchema.test.ts
@@ -1,6 +1,6 @@
 import { type ZodSafeParseError } from 'zod';
 
-import { simpleQuotesStringSchema } from '../simpleQuotesStringSchema';
+import { simpleQuotesStringSchema } from '~/utils/validation-schemas/simpleQuotesStringSchema';
 
 describe('simpleQuotesStringSchema', () => {
   it('validates a string with simple quotes', () => {
diff --git a/packages/twenty-front/src/utils/validation/__tests__/isListValue.test.ts b/packages/twenty-front/src/utils/validation/__tests__/isListValue.test.ts
index 476cf42778..54777a922b 100644
--- a/packages/twenty-front/src/utils/validation/__tests__/isListValue.test.ts
+++ b/packages/twenty-front/src/utils/validation/__tests__/isListValue.test.ts
@@ -1,4 +1,4 @@
-import { isListValue } from '../isListValue';
+import { isListValue } from '~/utils/validation/isListValue';
 
 describe('isListValue', () => {
   it('should detect list values', () => {
diff --git a/packages/twenty-front/src/utils/validation/__tests__/isNumericRange.test.ts b/packages/twenty-front/src/utils/validation/__tests__/isNumericRange.test.ts
index 9381efb565..e7fc9a3d8c 100644
--- a/packages/twenty-front/src/utils/validation/__tests__/isNumericRange.test.ts
+++ b/packages/twenty-front/src/utils/validation/__tests__/isNumericRange.test.ts
@@ -1,4 +1,4 @@
-import { isNumericRange } from '../isNumericRange';
+import { isNumericRange } from '~/utils/validation/isNumericRange';
 
 describe('isNumericRange', () => {
   it('should detect numeric ranges', () => {
diff --git a/packages/twenty-front/src/utils/validation/__tests__/isStepValue.test.ts b/packages/twenty-front/src/utils/validation/__tests__/isStepValue.test.ts
index 158c4cdd1e..108041ee76 100644
--- a/packages/twenty-front/src/utils/validation/__tests__/isStepValue.test.ts
+++ b/packages/twenty-front/src/utils/validation/__tests__/isStepValue.test.ts
@@ -1,4 +1,4 @@
-import { isStepValue } from '../isStepValue';
+import { isStepValue } from '~/utils/validation/isStepValue';
 
 describe('isStepValue', () => {
   it('should detect step values', () => {
diff --git a/packages/twenty-server/eslint.config.mjs b/packages/twenty-server/eslint.config.mjs
index 17acbcb0fc..431e0e1d5a 100644
--- a/packages/twenty-server/eslint.config.mjs
+++ b/packages/twenty-server/eslint.config.mjs
@@ -54,7 +54,7 @@ export default [
     },
     rules: {
       'prettier/prettier': 'error',
-      
+
       // General rules
       'func-style': ['error', 'declaration', { allowArrowFunctions: true }],
       'no-console': ['warn', { allow: ['group', 'groupCollapsed', 'groupEnd'] }],
@@ -137,7 +137,7 @@ export default [
       '@typescript-eslint/ban-ts-comment': 'error',
       '@typescript-eslint/consistent-type-imports': [
         'error',
-        { 
+        {
           prefer: 'type-imports',
           fixStyle: 'inline-type-imports'
         },
@@ -145,10 +145,10 @@ export default [
       '@typescript-eslint/explicit-function-return-type': 'off',
       '@typescript-eslint/explicit-module-boundary-types': 'off',
       '@typescript-eslint/interface-name-prefix': 'off',
-      '@typescript-eslint/no-empty-interface': [
+      '@typescript-eslint/no-empty-object-type': [
         'error',
         {
-          allowSingleExtends: true,
+          allowInterfaces: 'with-single-extends',
         },
       ],
       '@typescript-eslint/no-explicit-any': 'error', // Stricter for server
diff --git a/packages/twenty-shared/eslint.config.mjs b/packages/twenty-shared/eslint.config.mjs
index 5bc29c579e..81a3740067 100644
--- a/packages/twenty-shared/eslint.config.mjs
+++ b/packages/twenty-shared/eslint.config.mjs
@@ -128,7 +128,7 @@ export default [
       '@typescript-eslint/ban-ts-comment': 'error',
       '@typescript-eslint/consistent-type-imports': [
         'error',
-        { 
+        {
           prefer: 'type-imports',
           fixStyle: 'inline-type-imports'
         },
@@ -136,10 +136,10 @@ export default [
       '@typescript-eslint/explicit-function-return-type': 'off',
       '@typescript-eslint/explicit-module-boundary-types': 'off',
       '@typescript-eslint/interface-name-prefix': 'off',
-      '@typescript-eslint/no-empty-interface': [
+      '@typescript-eslint/no-empty-object-type': [
         'error',
         {
-          allowSingleExtends: true,
+          allowInterfaces: 'with-single-extends',
         },
       ],
       '@typescript-eslint/no-explicit-any': 'off',
diff --git a/packages/twenty-website/eslint.config.mjs b/packages/twenty-website/eslint.config.mjs
index 7da4a71aee..1341e29d9d 100644
--- a/packages/twenty-website/eslint.config.mjs
+++ b/packages/twenty-website/eslint.config.mjs
@@ -41,7 +41,7 @@ export default [
 
       // Lingui rules
       'lingui/no-single-variables-to-translate': 'off',
-      
+
       // General rules
       'func-style': ['error', 'declaration', { allowArrowFunctions: true }],
       'no-console': 'off', // Allow console in website
@@ -119,7 +119,7 @@ export default [
       '@typescript-eslint/ban-ts-comment': 'error',
       '@typescript-eslint/consistent-type-imports': [
         'error',
-        { 
+        {
           prefer: 'type-imports',
           fixStyle: 'inline-type-imports'
         },
@@ -127,10 +127,10 @@ export default [
       '@typescript-eslint/explicit-function-return-type': 'off',
       '@typescript-eslint/explicit-module-boundary-types': 'off',
       '@typescript-eslint/interface-name-prefix': 'off',
-      '@typescript-eslint/no-empty-interface': [
+      '@typescript-eslint/no-empty-object-type': [
         'error',
         {
-          allowSingleExtends: true,
+          allowInterfaces: 'with-single-extends',
         },
       ],
       '@typescript-eslint/no-explicit-any': 'off',