Skip to content

The open alternative to Salesforce, designed for AI.

Fix inverted front module dependencies (#27433)

Félix Malfait186587917bf5
diff --git a/packages/twenty-companion/src/main/services/TwentyClient.ts b/packages/twenty-companion/src/main/services/TwentyClient.ts
index fbda502d880..29304fc765a 100644
--- a/packages/twenty-companion/src/main/services/TwentyClient.ts
+++ b/packages/twenty-companion/src/main/services/TwentyClient.ts
@@ -1,4 +1,4 @@
-import { getFunctionsBaseUrl } from '../../../../twenty-front/src/modules/settings/logic-functions/utils/getLogicFunctionHttpUrl';
+import { getFunctionsBaseUrl } from '../../../../twenty-front/src/modules/logic-functions/utils/getLogicFunctionHttpUrl';
import { type SecureStore } from './SecureStore';
import { type Credentials } from '../types/Credentials';
import { refreshCredentials } from '../utils/refreshCredentials';
diff --git a/packages/twenty-front/src/modules/activities/calendar/components/CalendarEventComposerFields.tsx b/packages/twenty-front/src/modules/activities/calendar/components/CalendarEventComposerFields.tsx
index e034cb86bdc..f153e14b439 100644
--- a/packages/twenty-front/src/modules/activities/calendar/components/CalendarEventComposerFields.tsx
+++ b/packages/twenty-front/src/modules/activities/calendar/components/CalendarEventComposerFields.tsx
@@ -12,7 +12,7 @@ import { getEmailRecipientKey } from '@/activities/emails/recipients/utils/getEm
import { type EmailRecipientsByFieldId } from '@/activities/emails/recipients/utils/moveEmailRecipientsBetweenFields';
import { FormDateFieldInput } from '@/object-record/record-field/ui/form-types/components/FormDateFieldInput';
import { FormDateTimeFieldInput } from '@/object-record/record-field/ui/form-types/components/FormDateTimeFieldInput';
-import { AVAILABLE_TIMEZONE_OPTIONS } from '@/settings/experience/constants/AvailableTimezoneOptions';
+import { AVAILABLE_TIMEZONE_OPTIONS } from '@/localization/constants/AvailableTimezoneOptions';
import { Select } from '@/ui/input/components/Select';
import { TextArea } from '@/ui/input/components/TextArea';
import { DND_KIT_PROVIDER_PLUGINS_WITHOUT_DROP_ANIMATION } from '@/ui/utilities/drag-and-drop/constants/DndKitProviderPluginsWithoutDropAnimation';
diff --git a/packages/twenty-front/src/modules/activities/calendar/components/CalendarEventsCardContent.tsx b/packages/twenty-front/src/modules/activities/calendar/components/CalendarEventsCardContent.tsx
index 51d13b6ab61..598ca5a8688 100644
--- a/packages/twenty-front/src/modules/activities/calendar/components/CalendarEventsCardContent.tsx
+++ b/packages/twenty-front/src/modules/activities/calendar/components/CalendarEventsCardContent.tsx
@@ -15,7 +15,7 @@ import { Section } from 'twenty-ui/components/layout';
import { Heading } from 'twenty-ui/primitives/typography';
import { themeCssVariables } from 'twenty-ui/theme';
import { type TimelineCalendarEvent } from '~/generated/graphql';
-import { dateLocaleState } from '~/localization/states/dateLocaleState';
+import { dateLocaleState } from '@/localization/states/dateLocaleState';
const StyledContainer = styled(StyledWidgetScrollContainer)`
gap: ${themeCssVariables.spacing[8]};
diff --git a/packages/twenty-front/src/modules/activities/emails/components/CampaignSentEnvelope.tsx b/packages/twenty-front/src/modules/activities/emails/components/CampaignSentEnvelope.tsx
index f3b8be6c78e..96ab1af2f44 100644
--- a/packages/twenty-front/src/modules/activities/emails/components/CampaignSentEnvelope.tsx
+++ b/packages/twenty-front/src/modules/activities/emails/components/CampaignSentEnvelope.tsx
@@ -19,7 +19,7 @@ import { useDateTimeFormat } from '@/localization/hooks/useDateTimeFormat';
import { RecordChip } from '@/object-record/components/RecordChip';
import { useFindOneRecord } from '@/object-record/hooks/useFindOneRecord';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
-import { dateLocaleState } from '~/localization/states/dateLocaleState';
+import { dateLocaleState } from '@/localization/states/dateLocaleState';
const StyledValue = styled.span`
color: ${themeCssVariables.font.color.primary};
diff --git a/packages/twenty-front/src/modules/activities/emails/components/EmailThreadMessageSender.tsx b/packages/twenty-front/src/modules/activities/emails/components/EmailThreadMessageSender.tsx
index 55575393fec..7c76b5f9570 100644
--- a/packages/twenty-front/src/modules/activities/emails/components/EmailThreadMessageSender.tsx
+++ b/packages/twenty-front/src/modules/activities/emails/components/EmailThreadMessageSender.tsx
@@ -7,7 +7,7 @@ import { TooltipDelay } from '@/ui/layout/tooltip/constants/TooltipDelay';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { Tooltip } from 'twenty-ui/primitives/surfaces';
import { themeCssVariables } from 'twenty-ui/theme';
-import { dateLocaleState } from '~/localization/states/dateLocaleState';
+import { dateLocaleState } from '@/localization/states/dateLocaleState';
import {
beautifyPastDateRelativeToNow,
formatToHumanReadableDate,
diff --git a/packages/twenty-front/src/modules/activities/emails/hooks/useSendMessageCampaign.ts b/packages/twenty-front/src/modules/activities/emails/hooks/useSendMessageCampaign.ts
index 58f25e5de63..065cebed412 100644
--- a/packages/twenty-front/src/modules/activities/emails/hooks/useSendMessageCampaign.ts
+++ b/packages/twenty-front/src/modules/activities/emails/hooks/useSendMessageCampaign.ts
@@ -16,7 +16,7 @@ import {
type SendMessageCampaignMutation,
type SendMessageCampaignMutationVariables,
} from '~/generated-metadata/graphql';
-import { dateLocaleState } from '~/localization/states/dateLocaleState';
+import { dateLocaleState } from '@/localization/states/dateLocaleState';
type SendMessageCampaignParams = {
campaignId: string;
diff --git a/packages/twenty-front/src/modules/activities/emails/utils/__tests__/buildExcludedRecipientReasons.test.ts b/packages/twenty-front/src/modules/activities/emails/utils/__tests__/buildExcludedRecipientReasons.test.ts
index afb76bfb719..535032b6a39 100644
--- a/packages/twenty-front/src/modules/activities/emails/utils/__tests__/buildExcludedRecipientReasons.test.ts
+++ b/packages/twenty-front/src/modules/activities/emails/utils/__tests__/buildExcludedRecipientReasons.test.ts
@@ -1,5 +1,5 @@
import { buildExcludedRecipientReasons } from '@/activities/emails/utils/buildExcludedRecipientReasons';
-import { formatNumber } from '~/utils/format/formatNumber';
+import { formatNumber } from '@/localization/utils/formatNumber';
const NO_EXCLUSIONS = {
withoutEmail: 0,
diff --git a/packages/twenty-front/src/modules/activities/emails/utils/formatCampaignSendTime.ts b/packages/twenty-front/src/modules/activities/emails/utils/formatCampaignSendTime.ts
index d7122c03772..41a6edf6803 100644
--- a/packages/twenty-front/src/modules/activities/emails/utils/formatCampaignSendTime.ts
+++ b/packages/twenty-front/src/modules/activities/emails/utils/formatCampaignSendTime.ts
@@ -4,7 +4,7 @@ import { formatInTimeZone } from 'date-fns-tz';
import { type DateFormat } from '@/localization/constants/DateFormat';
import { type TimeFormat } from '@/localization/constants/TimeFormat';
-import { formatDateTimeString } from '~/utils/string/formatDateTimeString';
+import { formatDateTimeString } from '@/object-record/record-field/ui/utils/formatDateTimeString';
const TIME_ZONE_ABBREVIATION_FORMAT = 'zzz';
diff --git a/packages/twenty-front/src/modules/activities/timeline-activities/rows/components/EventRowDate.tsx b/packages/twenty-front/src/modules/activities/timeline-activities/rows/components/EventRowDate.tsx
index 407a626528a..dea868bfab6 100644
--- a/packages/twenty-front/src/modules/activities/timeline-activities/rows/components/EventRowDate.tsx
+++ b/packages/twenty-front/src/modules/activities/timeline-activities/rows/components/EventRowDate.tsx
@@ -7,9 +7,9 @@ import { TooltipDelay } from '@/ui/layout/tooltip/constants/TooltipDelay';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { Tooltip } from 'twenty-ui/primitives/surfaces';
import { MOBILE_VIEWPORT, themeCssVariables } from 'twenty-ui/theme';
-import { dateLocaleState } from '~/localization/states/dateLocaleState';
+import { dateLocaleState } from '@/localization/states/dateLocaleState';
import { beautifyPastDateRelativeToNow } from '~/utils/date-utils';
-import { formatDateTimeString } from '~/utils/string/formatDateTimeString';
+import { formatDateTimeString } from '@/object-record/record-field/ui/utils/formatDateTimeString';
const StyledEventRowDate = styled.div`
@media (max-width: ${MOBILE_VIEWPORT}px) {
diff --git a/packages/twenty-front/src/modules/ai/components/AiChatMessage.tsx b/packages/twenty-front/src/modules/ai/components/AiChatMessage.tsx
index 2e07841e41b..64742a0175a 100644
--- a/packages/twenty-front/src/modules/ai/components/AiChatMessage.tsx
+++ b/packages/twenty-front/src/modules/ai/components/AiChatMessage.tsx
@@ -24,7 +24,7 @@ import { isExtendedFileUIPart } from 'twenty-shared/ai';
import { isDefined } from 'twenty-shared/utils';
import { themeCssVariables } from 'twenty-ui/theme';
import { LabeledDivider } from '@/ui/layout/line/components/LabeledDivider';
-import { dateLocaleState } from '~/localization/states/dateLocaleState';
+import { dateLocaleState } from '@/localization/states/dateLocaleState';
import { beautifyPastDateRelativeToNow } from '~/utils/date-utils';
const StyledMessageBubble = styled.div<{ isUser?: boolean }>`
diff --git a/packages/twenty-front/src/modules/ai/components/AiModelPicker.tsx b/packages/twenty-front/src/modules/ai/components/AiModelPicker.tsx
index 47bf60b4c58..9bbca83652b 100644
--- a/packages/twenty-front/src/modules/ai/components/AiModelPicker.tsx
+++ b/packages/twenty-front/src/modules/ai/components/AiModelPicker.tsx
@@ -15,7 +15,7 @@ import { useWorkspaceAiModelTiers } from '@/ai/hooks/useWorkspaceAiModelTiers';
import { getAiModelTierForAgentModelId } from '@/ai/utils/getAiModelTierForAgentModelId';
import { getNearestAiModelTier } from '@/ai/utils/getNearestAiModelTier';
import { aiModelsState } from '@/client-config/states/aiModelsState';
-import { AiModelPinSelect } from '@/settings/ai/components/AiModelPinSelect';
+import { AiModelPinSelect } from '@/ai/components/AiModelPinSelect';
import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
diff --git a/packages/twenty-front/src/modules/settings/ai/components/AiModelPinSelect.tsx b/packages/twenty-front/src/modules/ai/components/AiModelPinSelect.tsx
similarity index 94%
rename from packages/twenty-front/src/modules/settings/ai/components/AiModelPinSelect.tsx
rename to packages/twenty-front/src/modules/ai/components/AiModelPinSelect.tsx
index 24e91b0b923..d810db8a463 100644
--- a/packages/twenty-front/src/modules/settings/ai/components/AiModelPinSelect.tsx
+++ b/packages/twenty-front/src/modules/ai/components/AiModelPinSelect.tsx
@@ -6,10 +6,10 @@ import { isDefined } from 'twenty-shared/utils';
import { IconWand } from 'twenty-ui/icon';
import { themeCssVariables } from 'twenty-ui/theme';
-import { AUTOMATIC_MODEL_PIN } from '@/settings/ai/constants/AutomaticModelPin';
+import { AUTOMATIC_MODEL_PIN } from '@/ai/constants/AutomaticModelPin';
import { getAiModelEffortLabel } from '@/ai/utils/getAiModelEffortLabel';
-import { type PinnableAiModel } from '@/settings/ai/types/PinnableAiModel';
-import { getAiModelPinOptions } from '@/settings/ai/utils/getAiModelPinOptions';
+import { type PinnableAiModel } from '@/ai/types/PinnableAiModel';
+import { getAiModelPinOptions } from '@/ai/utils/getAiModelPinOptions';
import { Select } from '@/ui/input/components/Select';
import { GenericDropdownContentWidth } from '@/ui/layout/dropdown/constants/GenericDropdownContentWidth';
diff --git a/packages/twenty-front/src/modules/ai/components/AiModelTierInformationButton.tsx b/packages/twenty-front/src/modules/ai/components/AiModelTierInformationButton.tsx
index fd65b993e11..34d090f8b0a 100644
--- a/packages/twenty-front/src/modules/ai/components/AiModelTierInformationButton.tsx
+++ b/packages/twenty-front/src/modules/ai/components/AiModelTierInformationButton.tsx
@@ -22,9 +22,9 @@ import {
import { useAiChatHoverCard } from '@/ai/hooks/useAiChatHoverCard';
import { type ResolvedAiModelTier } from '@/ai/types/ResolvedAiModelTier';
import { getAiModelEffortLabel } from '@/ai/utils/getAiModelEffortLabel';
-import { getAiModelModeDescription } from '@/settings/ai/utils/getAiModelModeDescription';
+import { getAiModelModeDescription } from '@/ai/utils/getAiModelModeDescription';
import { StyledInformationCard } from '@/ui/layout/information-card/components/StyledInformationCard';
-import { formatNumber } from '~/utils/format/formatNumber';
+import { formatNumber } from '@/localization/utils/formatNumber';
const StyledTrigger = styled.button`
align-items: center;
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/ai/components/ModelsDevProviderLogo.tsx b/packages/twenty-front/src/modules/ai/components/ModelsDevProviderLogo.tsx
similarity index 100%
rename from packages/twenty-front/src/modules/settings/admin-panel/ai/components/ModelsDevProviderLogo.tsx
rename to packages/twenty-front/src/modules/ai/components/ModelsDevProviderLogo.tsx
diff --git a/packages/twenty-front/src/modules/ai/components/internal/AiChatContextUsageButton.tsx b/packages/twenty-front/src/modules/ai/components/internal/AiChatContextUsageButton.tsx
index 9646c856fe4..13e7210a9dc 100644
--- a/packages/twenty-front/src/modules/ai/components/internal/AiChatContextUsageButton.tsx
+++ b/packages/twenty-front/src/modules/ai/components/internal/AiChatContextUsageButton.tsx
@@ -27,7 +27,7 @@ import { computeUsageLimitProgress } from '@/settings/billing/utils/computeUsage
import { StyledInformationCard } from '@/ui/layout/information-card/components/StyledInformationCard';
import { useAtomComponentFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyStateValue';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
-import { formatNumber } from '~/utils/format/formatNumber';
+import { formatNumber } from '@/localization/utils/formatNumber';
const StyledTrigger = styled.button`
align-items: center;
diff --git a/packages/twenty-front/src/modules/ai/components/internal/AiChatContextUsageDetails.tsx b/packages/twenty-front/src/modules/ai/components/internal/AiChatContextUsageDetails.tsx
index 5e2cfe068ea..0f00ec86b9c 100644
--- a/packages/twenty-front/src/modules/ai/components/internal/AiChatContextUsageDetails.tsx
+++ b/packages/twenty-front/src/modules/ai/components/internal/AiChatContextUsageDetails.tsx
@@ -16,7 +16,7 @@ import { agentChatUsageComponentFamilyState } from '@/ai/states/agentChatUsageCo
import { currentAiChatThreadState } from '@/ai/states/currentAiChatThreadState';
import { useAtomComponentFamilyStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentFamilyStateValue';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
-import { formatNumber } from '~/utils/format/formatNumber';
+import { formatNumber } from '@/localization/utils/formatNumber';
const StyledSection = styled.div`
display: flex;
diff --git a/packages/twenty-front/src/modules/settings/ai/constants/AutomaticModelPin.ts b/packages/twenty-front/src/modules/ai/constants/AutomaticModelPin.ts
similarity index 100%
rename from packages/twenty-front/src/modules/settings/ai/constants/AutomaticModelPin.ts
rename to packages/twenty-front/src/modules/ai/constants/AutomaticModelPin.ts
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/ai/constants/DataResidencyConfig.ts b/packages/twenty-front/src/modules/ai/constants/DataResidencyConfig.ts
similarity index 100%
rename from packages/twenty-front/src/modules/settings/admin-panel/ai/constants/DataResidencyConfig.ts
rename to packages/twenty-front/src/modules/ai/constants/DataResidencyConfig.ts
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/ai/constants/ModelIconConfig.ts b/packages/twenty-front/src/modules/ai/constants/ModelIconConfig.ts
similarity index 89%
rename from packages/twenty-front/src/modules/settings/admin-panel/ai/constants/ModelIconConfig.ts
rename to packages/twenty-front/src/modules/ai/constants/ModelIconConfig.ts
index bb97a194eb1..93a9cb5820c 100644
--- a/packages/twenty-front/src/modules/settings/admin-panel/ai/constants/ModelIconConfig.ts
+++ b/packages/twenty-front/src/modules/ai/constants/ModelIconConfig.ts
@@ -8,7 +8,7 @@ import {
type IconComponent,
} from 'twenty-ui/icon';
-import { ModelFamily } from '~/generated-admin/graphql';
+import { ModelFamily } from '~/generated-metadata/graphql';
export type ModelIconConfigKey = ModelFamily | 'FALLBACK';
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/ai/constants/ProviderConfig.ts b/packages/twenty-front/src/modules/ai/constants/ProviderIconConfig.ts
similarity index 100%
rename from packages/twenty-front/src/modules/settings/admin-panel/ai/constants/ProviderConfig.ts
rename to packages/twenty-front/src/modules/ai/constants/ProviderIconConfig.ts
diff --git a/packages/twenty-front/src/modules/ai/hooks/useAiModelTiers.ts b/packages/twenty-front/src/modules/ai/hooks/useAiModelTiers.ts
index 95d08a31f56..7046a4dc445 100644
--- a/packages/twenty-front/src/modules/ai/hooks/useAiModelTiers.ts
+++ b/packages/twenty-front/src/modules/ai/hooks/useAiModelTiers.ts
@@ -9,7 +9,7 @@ import { hasCostPerTaskForEveryModel } from '@/ai/utils/hasCostPerTaskForEveryMo
import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState';
import { aiModelTiersState } from '@/client-config/states/aiModelTiersState';
import { aiModelsState } from '@/client-config/states/aiModelsState';
-import { getAiModelBlendedCostPerMillionTokens } from '@/settings/ai/utils/getAiModelBlendedCostPerMillionTokens';
+import { getAiModelBlendedCostPerMillionTokens } from '@/ai/utils/getAiModelBlendedCostPerMillionTokens';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { type ClientAiModelConfig } from '~/generated-metadata/graphql';
diff --git a/packages/twenty-front/src/modules/ai/hooks/useFormatAgentChatThreadDate.ts b/packages/twenty-front/src/modules/ai/hooks/useFormatAgentChatThreadDate.ts
index c6aef042c5c..2ddbdd32e7b 100644
--- a/packages/twenty-front/src/modules/ai/hooks/useFormatAgentChatThreadDate.ts
+++ b/packages/twenty-front/src/modules/ai/hooks/useFormatAgentChatThreadDate.ts
@@ -5,7 +5,7 @@ import { useDateTimeFormat } from '@/localization/hooks/useDateTimeFormat';
import { formatDateISOStringToDate } from '@/localization/utils/formatDateISOStringToDate';
import { formatDateISOStringToDateTime } from '@/localization/utils/formatDateISOStringToDateTime';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
-import { dateLocaleState } from '~/localization/states/dateLocaleState';
+import { dateLocaleState } from '@/localization/states/dateLocaleState';
// Today reads as its time alone, other days in the member's date format
export const useFormatAgentChatThreadDate = () => {
diff --git a/packages/twenty-front/src/modules/settings/ai/types/PinnableAiModel.ts b/packages/twenty-front/src/modules/ai/types/PinnableAiModel.ts
similarity index 100%
rename from packages/twenty-front/src/modules/settings/ai/types/PinnableAiModel.ts
rename to packages/twenty-front/src/modules/ai/types/PinnableAiModel.ts
diff --git a/packages/twenty-front/src/modules/settings/ai/utils/__tests__/getAiModelBlendedCostPerMillionTokens.test.ts b/packages/twenty-front/src/modules/ai/utils/__tests__/getAiModelBlendedCostPerMillionTokens.test.ts
similarity index 91%
rename from packages/twenty-front/src/modules/settings/ai/utils/__tests__/getAiModelBlendedCostPerMillionTokens.test.ts
rename to packages/twenty-front/src/modules/ai/utils/__tests__/getAiModelBlendedCostPerMillionTokens.test.ts
index f8f776d9316..6f7744b8869 100644
--- a/packages/twenty-front/src/modules/settings/ai/utils/__tests__/getAiModelBlendedCostPerMillionTokens.test.ts
+++ b/packages/twenty-front/src/modules/ai/utils/__tests__/getAiModelBlendedCostPerMillionTokens.test.ts
@@ -1,4 +1,4 @@
-import { getAiModelBlendedCostPerMillionTokens } from '@/settings/ai/utils/getAiModelBlendedCostPerMillionTokens';
+import { getAiModelBlendedCostPerMillionTokens } from '@/ai/utils/getAiModelBlendedCostPerMillionTokens';
describe('getAiModelBlendedCostPerMillionTokens', () => {
it('weights input three to one against output', () => {
diff --git a/packages/twenty-front/src/modules/settings/ai/utils/__tests__/getAiModelModeDescription.test.ts b/packages/twenty-front/src/modules/ai/utils/__tests__/getAiModelModeDescription.test.ts
similarity index 95%
rename from packages/twenty-front/src/modules/settings/ai/utils/__tests__/getAiModelModeDescription.test.ts
rename to packages/twenty-front/src/modules/ai/utils/__tests__/getAiModelModeDescription.test.ts
index 3f2e8a3e756..3773530f304 100644
--- a/packages/twenty-front/src/modules/settings/ai/utils/__tests__/getAiModelModeDescription.test.ts
+++ b/packages/twenty-front/src/modules/ai/utils/__tests__/getAiModelModeDescription.test.ts
@@ -1,4 +1,4 @@
-import { getAiModelModeDescription } from '@/settings/ai/utils/getAiModelModeDescription';
+import { getAiModelModeDescription } from '@/ai/utils/getAiModelModeDescription';
const model = {
modelId: 'openai/astra@high',
diff --git a/packages/twenty-front/src/modules/ai/utils/formatAiChatTokens.ts b/packages/twenty-front/src/modules/ai/utils/formatAiChatTokens.ts
index 5c70530cf13..d3920006ff8 100644
--- a/packages/twenty-front/src/modules/ai/utils/formatAiChatTokens.ts
+++ b/packages/twenty-front/src/modules/ai/utils/formatAiChatTokens.ts
@@ -1,4 +1,4 @@
-import { formatNumber } from '~/utils/format/formatNumber';
+import { formatNumber } from '@/localization/utils/formatNumber';
export const formatAiChatTokens = (tokens: number) =>
formatNumber(tokens, { abbreviate: true, decimals: 1 });
diff --git a/packages/twenty-front/src/modules/ai/utils/getAiChatUsageLabel.ts b/packages/twenty-front/src/modules/ai/utils/getAiChatUsageLabel.ts
index 2461a337b85..3a0f86ac28a 100644
--- a/packages/twenty-front/src/modules/ai/utils/getAiChatUsageLabel.ts
+++ b/packages/twenty-front/src/modules/ai/utils/getAiChatUsageLabel.ts
@@ -1,6 +1,6 @@
import { plural, t } from '@lingui/core/macro';
import { isDefined } from 'twenty-shared/utils';
-import { formatNumber } from '~/utils/format/formatNumber';
+import { formatNumber } from '@/localization/utils/formatNumber';
export const getAiChatUsageLabel = ({
loading,
diff --git a/packages/twenty-front/src/modules/settings/ai/utils/getAiModelBlendedCostPerMillionTokens.ts b/packages/twenty-front/src/modules/ai/utils/getAiModelBlendedCostPerMillionTokens.ts
similarity index 99%
rename from packages/twenty-front/src/modules/settings/ai/utils/getAiModelBlendedCostPerMillionTokens.ts
rename to packages/twenty-front/src/modules/ai/utils/getAiModelBlendedCostPerMillionTokens.ts
index ed48199ec57..d602d7aa9b2 100644
--- a/packages/twenty-front/src/modules/settings/ai/utils/getAiModelBlendedCostPerMillionTokens.ts
+++ b/packages/twenty-front/src/modules/ai/utils/getAiModelBlendedCostPerMillionTokens.ts
@@ -1,5 +1,4 @@
import { isDefined } from 'twenty-shared/utils';
-
import { type ClientAiModelConfig } from '~/generated-metadata/graphql';
// Artificial Analysis's 3:1 input/output blend, so the number matches their site.
diff --git a/packages/twenty-front/src/modules/settings/ai/utils/getAiModelModeDescription.ts b/packages/twenty-front/src/modules/ai/utils/getAiModelModeDescription.ts
similarity index 100%
rename from packages/twenty-front/src/modules/settings/ai/utils/getAiModelModeDescription.ts
rename to packages/twenty-front/src/modules/ai/utils/getAiModelModeDescription.ts
diff --git a/packages/twenty-front/src/modules/settings/ai/utils/getAiModelPinOptions.ts b/packages/twenty-front/src/modules/ai/utils/getAiModelPinOptions.ts
similarity index 81%
rename from packages/twenty-front/src/modules/settings/ai/utils/getAiModelPinOptions.ts
rename to packages/twenty-front/src/modules/ai/utils/getAiModelPinOptions.ts
index c4c92a903a5..f206a84520f 100644
--- a/packages/twenty-front/src/modules/settings/ai/utils/getAiModelPinOptions.ts
+++ b/packages/twenty-front/src/modules/ai/utils/getAiModelPinOptions.ts
@@ -1,9 +1,9 @@
import { t } from '@lingui/core/macro';
import { isDefined } from 'twenty-shared/utils';
-import { type PinnableAiModel } from '@/settings/ai/types/PinnableAiModel';
-import { getDataResidencyDisplay } from '@/settings/ai/utils/getDataResidencyDisplay';
-import { getModelIcon } from '@/settings/ai/utils/getModelIcon';
+import { type PinnableAiModel } from '@/ai/types/PinnableAiModel';
+import { getDataResidencyDisplay } from '@/ai/utils/getDataResidencyDisplay';
+import { getModelIcon } from '@/ai/utils/getModelIcon';
// Effort variants are picked via their base model; a deprecated current pin stays listed.
export const getAiModelPinOptions = ({
diff --git a/packages/twenty-front/src/modules/settings/ai/utils/getDataResidencyDisplay.ts b/packages/twenty-front/src/modules/ai/utils/getDataResidencyDisplay.ts
similarity index 75%
rename from packages/twenty-front/src/modules/settings/ai/utils/getDataResidencyDisplay.ts
rename to packages/twenty-front/src/modules/ai/utils/getDataResidencyDisplay.ts
index 0d55f5929d2..442e314c490 100644
--- a/packages/twenty-front/src/modules/settings/ai/utils/getDataResidencyDisplay.ts
+++ b/packages/twenty-front/src/modules/ai/utils/getDataResidencyDisplay.ts
@@ -1,6 +1,5 @@
import { isDataResidency } from 'twenty-shared/ai';
-
-import { DATA_RESIDENCY_CONFIG } from '@/settings/admin-panel/ai/constants/DataResidencyConfig';
+import { DATA_RESIDENCY_CONFIG } from '@/ai/constants/DataResidencyConfig';
export const getDataResidencyDisplay = (residency: string): string => {
if (isDataResidency(residency)) {
diff --git a/packages/twenty-front/src/modules/settings/ai/utils/getModelIcon.ts b/packages/twenty-front/src/modules/ai/utils/getModelIcon.ts
similarity index 64%
rename from packages/twenty-front/src/modules/settings/ai/utils/getModelIcon.ts
rename to packages/twenty-front/src/modules/ai/utils/getModelIcon.ts
index 142940490d3..9faceaa4a5e 100644
--- a/packages/twenty-front/src/modules/settings/ai/utils/getModelIcon.ts
+++ b/packages/twenty-front/src/modules/ai/utils/getModelIcon.ts
@@ -1,9 +1,8 @@
import { type IconComponent } from 'twenty-ui/icon';
-import { MODEL_ICON_CONFIG } from '@/settings/admin-panel/ai/constants/ModelIconConfig';
-import { getProviderIcon } from '@/settings/admin-panel/ai/utils/getProviderIcon';
-import { isModelIconKey } from '@/settings/admin-panel/ai/utils/isModelIconKey';
-
+import { MODEL_ICON_CONFIG } from '@/ai/constants/ModelIconConfig';
+import { getProviderIcon } from '@/ai/utils/getProviderIcon';
+import { isModelIconKey } from '@/ai/utils/isModelIconKey';
import { type ModelFamily } from '~/generated-metadata/graphql';
export const getModelIcon = (
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/ai/utils/getModelsDevLogoIcon.tsx b/packages/twenty-front/src/modules/ai/utils/getModelsDevLogoIcon.tsx
similarity index 88%
rename from packages/twenty-front/src/modules/settings/admin-panel/ai/utils/getModelsDevLogoIcon.tsx
rename to packages/twenty-front/src/modules/ai/utils/getModelsDevLogoIcon.tsx
index e72b42eba80..8d28729b7ca 100644
--- a/packages/twenty-front/src/modules/settings/admin-panel/ai/utils/getModelsDevLogoIcon.tsx
+++ b/packages/twenty-front/src/modules/ai/utils/getModelsDevLogoIcon.tsx
@@ -1,6 +1,6 @@
import { type IconComponent, type IconComponentProps } from 'twenty-ui/icon';
-import { ModelsDevProviderLogo } from '@/settings/admin-panel/ai/components/ModelsDevProviderLogo';
+import { ModelsDevProviderLogo } from '@/ai/components/ModelsDevProviderLogo';
const MODELS_DEV_LOGO_BASE = 'https://models.dev/logos';
diff --git a/packages/twenty-front/src/modules/ai/utils/getProviderIcon.ts b/packages/twenty-front/src/modules/ai/utils/getProviderIcon.ts
new file mode 100644
index 00000000000..e3fe36a0bca
--- /dev/null
+++ b/packages/twenty-front/src/modules/ai/utils/getProviderIcon.ts
@@ -0,0 +1,10 @@
+import { type IconComponent } from 'twenty-ui/icon';
+
+import { PROVIDER_ICON_CONFIG } from '@/ai/constants/ProviderIconConfig';
+import { isKnownProviderId } from '@/ai/utils/isKnownProviderId';
+import { getModelsDevLogoIcon } from '@/ai/utils/getModelsDevLogoIcon';
+
+export const getProviderIcon = (providerType: string): IconComponent =>
+ isKnownProviderId(providerType)
+ ? PROVIDER_ICON_CONFIG[providerType].Icon
+ : getModelsDevLogoIcon(providerType);
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/ai/utils/isKnownProviderId.ts b/packages/twenty-front/src/modules/ai/utils/isKnownProviderId.ts
similarity index 65%
rename from packages/twenty-front/src/modules/settings/admin-panel/ai/utils/isKnownProviderId.ts
rename to packages/twenty-front/src/modules/ai/utils/isKnownProviderId.ts
index 5e6a51d9abd..c1bc1c80efe 100644
--- a/packages/twenty-front/src/modules/settings/admin-panel/ai/utils/isKnownProviderId.ts
+++ b/packages/twenty-front/src/modules/ai/utils/isKnownProviderId.ts
@@ -1,4 +1,4 @@
-import { PROVIDER_ICON_CONFIG } from '@/settings/admin-panel/ai/constants/ProviderConfig';
+import { PROVIDER_ICON_CONFIG } from '@/ai/constants/ProviderIconConfig';
export type KnownProviderId = keyof typeof PROVIDER_ICON_CONFIG;
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/ai/utils/isModelIconKey.ts b/packages/twenty-front/src/modules/ai/utils/isModelIconKey.ts
similarity index 72%
rename from packages/twenty-front/src/modules/settings/admin-panel/ai/utils/isModelIconKey.ts
rename to packages/twenty-front/src/modules/ai/utils/isModelIconKey.ts
index 4cf49b6e826..502926c9303 100644
--- a/packages/twenty-front/src/modules/settings/admin-panel/ai/utils/isModelIconKey.ts
+++ b/packages/twenty-front/src/modules/ai/utils/isModelIconKey.ts
@@ -1,7 +1,7 @@
import {
MODEL_ICON_CONFIG,
type ModelIconConfigKey,
-} from '@/settings/admin-panel/ai/constants/ModelIconConfig';
+} from '@/ai/constants/ModelIconConfig';
export const isModelIconKey = (key: string): key is ModelIconConfigKey =>
key in MODEL_ICON_CONFIG;
diff --git a/packages/twenty-front/src/modules/app/effect-components/PageChangeEffect.tsx b/packages/twenty-front/src/modules/app/effect-components/PageChangeEffect.tsx
index 10d91f4bed0..72d5a4f8206 100644
--- a/packages/twenty-front/src/modules/app/effect-components/PageChangeEffect.tsx
+++ b/packages/twenty-front/src/modules/app/effect-components/PageChangeEffect.tsx
@@ -1,6 +1,6 @@
import { useExecuteTasksOnAnyLocationChange } from '@/app/hooks/useExecuteTasksOnAnyLocationChange';
import { useWorkspaceRouteObjects } from '@/app/routing/components/WorkspaceRouteObjectsProvider';
-import { isAppEffectRedirectEnabledState } from '@/app/states/isAppEffectRedirectEnabledState';
+import { isAppEffectRedirectEnabledState } from '@/auth/states/isAppEffectRedirectEnabledState';
import { useReturnToPath } from '@/auth/hooks/useReturnToPath';
import { useIsOnAuthOrOnboardingPage } from '@/auth/hooks/useIsOnAuthOrOnboardingPage';
import { isLogConsoleFullScreenState } from '@/log-console/states/isLogConsoleFullScreenState';
@@ -35,7 +35,7 @@ import { useEffect, useState } from 'react';
import { matchPath, useLocation, useNavigate } from 'react-router-dom';
import { AppBasePath, AppPath, SidePanelPages } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
-import { usePageChangeEffectNavigateLocation } from '~/hooks/usePageChangeEffectNavigateLocation';
+import { usePageChangeEffectNavigateLocation } from '@/app/hooks/usePageChangeEffectNavigateLocation';
import { getPageLayoutIdForLocation } from '@/app/utils/getPageLayoutIdForLocation';
import { isMatchingLocation } from '~/utils/isMatchingLocation';
diff --git a/packages/twenty-front/src/hooks/__tests__/usePageChangeEffectNavigateLocation.test.ts b/packages/twenty-front/src/modules/app/hooks/__tests__/usePageChangeEffectNavigateLocation.test.ts
similarity index 99%
rename from packages/twenty-front/src/hooks/__tests__/usePageChangeEffectNavigateLocation.test.ts
rename to packages/twenty-front/src/modules/app/hooks/__tests__/usePageChangeEffectNavigateLocation.test.ts
index c19884cf1f2..df52df80b70 100644
--- a/packages/twenty-front/src/hooks/__tests__/usePageChangeEffectNavigateLocation.test.ts
+++ b/packages/twenty-front/src/modules/app/hooks/__tests__/usePageChangeEffectNavigateLocation.test.ts
@@ -7,11 +7,10 @@ import { useLocation } from 'react-router-dom';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { AppPath, SettingsPath } from 'twenty-shared/types';
import { getAppPath, getSettingsPath } from 'twenty-shared/utils';
-
import { OnboardingStatus, PageLayoutType } from '~/generated-metadata/graphql';
import { useIsCurrentLocationOnAWorkspace } from '@/domain-manager/hooks/useIsCurrentLocationOnAWorkspace';
-import { usePageChangeEffectNavigateLocation } from '~/hooks/usePageChangeEffectNavigateLocation';
+import { usePageChangeEffectNavigateLocation } from '@/app/hooks/usePageChangeEffectNavigateLocation';
import { UNTESTED_APP_PATHS } from '~/testing/constants/UntestedAppPaths';
import { isMatchingLocation } from '~/utils/isMatchingLocation';
diff --git a/packages/twenty-front/src/hooks/usePageChangeEffectNavigateLocation.ts b/packages/twenty-front/src/modules/app/hooks/usePageChangeEffectNavigateLocation.ts
similarity index 98%
rename from packages/twenty-front/src/hooks/usePageChangeEffectNavigateLocation.ts
rename to packages/twenty-front/src/modules/app/hooks/usePageChangeEffectNavigateLocation.ts
index 20d455fae6c..3fcc20c4107 100644
--- a/packages/twenty-front/src/hooks/usePageChangeEffectNavigateLocation.ts
+++ b/packages/twenty-front/src/modules/app/hooks/usePageChangeEffectNavigateLocation.ts
@@ -1,4 +1,4 @@
-import { verifyEmailRedirectPathState } from '@/app/states/verifyEmailRedirectPathState';
+import { verifyEmailRedirectPathState } from '@/auth/states/verifyEmailRedirectPathState';
import { ONBOARDING_PATHS } from '@/auth/constants/OnboardingPaths';
import { ONGOING_USER_CREATION_PATHS } from '@/auth/constants/OngoingUserCreationPaths';
import { useIsLogged } from '@/auth/hooks/useIsLogged';
diff --git a/packages/twenty-front/src/modules/auth/components/VerifyEmailEffect.tsx b/packages/twenty-front/src/modules/auth/components/VerifyEmailEffect.tsx
index d8e87fe8d18..6fc70aaf502 100644
--- a/packages/twenty-front/src/modules/auth/components/VerifyEmailEffect.tsx
+++ b/packages/twenty-front/src/modules/auth/components/VerifyEmailEffect.tsx
@@ -1,4 +1,4 @@
-import { verifyEmailRedirectPathState } from '@/app/states/verifyEmailRedirectPathState';
+import { verifyEmailRedirectPathState } from '@/auth/states/verifyEmailRedirectPathState';
import { useAuth } from '@/auth/hooks/useAuth';
import { useVerifyLogin } from '@/auth/hooks/useVerifyLogin';
import { clientConfigApiStatusState } from '@/client-config/states/clientConfigApiStatusState';
diff --git a/packages/twenty-front/src/modules/auth/hooks/__tests__/useRedeemSsoExchangeToken.test.ts b/packages/twenty-front/src/modules/auth/hooks/__tests__/useRedeemSsoExchangeToken.test.ts
index 3ee49f64246..c20130fbbe1 100644
--- a/packages/twenty-front/src/modules/auth/hooks/__tests__/useRedeemSsoExchangeToken.test.ts
+++ b/packages/twenty-front/src/modules/auth/hooks/__tests__/useRedeemSsoExchangeToken.test.ts
@@ -1,7 +1,7 @@
import { renderHook } from '@testing-library/react';
import { Provider as JotaiProvider } from 'jotai';
-import { isAppEffectRedirectEnabledState } from '@/app/states/isAppEffectRedirectEnabledState';
+import { isAppEffectRedirectEnabledState } from '@/auth/states/isAppEffectRedirectEnabledState';
import { useRedeemSsoExchangeToken } from '@/auth/hooks/useRedeemSsoExchangeToken';
import { isCookieAuthActiveState } from '@/auth/states/isCookieAuthActiveState';
import { clearSessionGeneration } from '@/auth/utils/clearSessionGeneration';
diff --git a/packages/twenty-front/src/modules/auth/hooks/useAuth.ts b/packages/twenty-front/src/modules/auth/hooks/useAuth.ts
index d460985db4b..ea44261332a 100644
--- a/packages/twenty-front/src/modules/auth/hooks/useAuth.ts
+++ b/packages/twenty-front/src/modules/auth/hooks/useAuth.ts
@@ -39,7 +39,7 @@ import { isNonEmptyString } from '@sniptt/guards';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';
-import { isAppEffectRedirectEnabledState } from '@/app/states/isAppEffectRedirectEnabledState';
+import { isAppEffectRedirectEnabledState } from '@/auth/states/isAppEffectRedirectEnabledState';
import { loginTokenState } from '@/auth/states/loginTokenState';
import {
SignInUpStep,
diff --git a/packages/twenty-front/src/modules/auth/hooks/useRedeemSsoExchangeToken.ts b/packages/twenty-front/src/modules/auth/hooks/useRedeemSsoExchangeToken.ts
index 6b6ee00e010..19cef15180b 100644
--- a/packages/twenty-front/src/modules/auth/hooks/useRedeemSsoExchangeToken.ts
+++ b/packages/twenty-front/src/modules/auth/hooks/useRedeemSsoExchangeToken.ts
@@ -1,4 +1,4 @@
-import { isAppEffectRedirectEnabledState } from '@/app/states/isAppEffectRedirectEnabledState';
+import { isAppEffectRedirectEnabledState } from '@/auth/states/isAppEffectRedirectEnabledState';
import { useMarkSessionActive } from '@/auth/hooks/useMarkSessionActive';
import { getToastOptionsFromError } from '@/error-handler/utils/getToastOptionsFromError';
import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';
diff --git a/packages/twenty-front/src/modules/auth/hooks/useVerifyLogin.ts b/packages/twenty-front/src/modules/auth/hooks/useVerifyLogin.ts
index d5461f9102c..178473c9a89 100644
--- a/packages/twenty-front/src/modules/auth/hooks/useVerifyLogin.ts
+++ b/packages/twenty-front/src/modules/auth/hooks/useVerifyLogin.ts
@@ -1,4 +1,4 @@
-import { isAppEffectRedirectEnabledState } from '@/app/states/isAppEffectRedirectEnabledState';
+import { isAppEffectRedirectEnabledState } from '@/auth/states/isAppEffectRedirectEnabledState';
import { useAuth } from '@/auth/hooks/useAuth';
import { getToastOptionsFromError } from '@/error-handler/utils/getToastOptionsFromError';
import { useSetAtomState } from '@/ui/utilities/state/jotai/hooks/useSetAtomState';
diff --git a/packages/twenty-front/src/modules/app/states/isAppEffectRedirectEnabledState.ts b/packages/twenty-front/src/modules/auth/states/isAppEffectRedirectEnabledState.ts
similarity index 100%
rename from packages/twenty-front/src/modules/app/states/isAppEffectRedirectEnabledState.ts
rename to packages/twenty-front/src/modules/auth/states/isAppEffectRedirectEnabledState.ts
diff --git a/packages/twenty-front/src/modules/app/states/verifyEmailRedirectPathState.ts b/packages/twenty-front/src/modules/auth/states/verifyEmailRedirectPathState.ts
similarity index 100%
rename from packages/twenty-front/src/modules/app/states/verifyEmailRedirectPathState.ts
rename to packages/twenty-front/src/modules/auth/states/verifyEmailRedirectPathState.ts
diff --git a/packages/twenty-front/src/modules/front-components/components/FrontComponentRenderer.tsx b/packages/twenty-front/src/modules/front-components/components/FrontComponentRenderer.tsx
index e421f85ce39..d3248a16b9d 100644
--- a/packages/twenty-front/src/modules/front-components/components/FrontComponentRenderer.tsx
+++ b/packages/twenty-front/src/modules/front-components/components/FrontComponentRenderer.tsx
@@ -10,7 +10,7 @@ import { FrontComponentMediaPermissionModal } from '@/front-components/media-ses
import { useFrontComponentMediaSession } from '@/front-components/media-session/hooks/useFrontComponentMediaSession';
import { getFingerprintedRestUrl } from '@/front-components/utils/getFingerprintedRestUrl';
import { getSdkClientUrls } from '@/front-components/utils/getSdkClientUrls';
-import { useGetLogicFunctionHttpUrl } from '@/settings/logic-functions/hooks/useGetLogicFunctionHttpUrl';
+import { useGetLogicFunctionHttpUrl } from '@/logic-functions/hooks/useGetLogicFunctionHttpUrl';
import { useQuery } from '@apollo/client/react';
import { t } from '@lingui/core/macro';
import { type ReactNode, useCallback, useMemo, useState } from 'react';
diff --git a/packages/twenty-front/src/modules/settings/experience/constants/AvailableTimezoneOptions.ts b/packages/twenty-front/src/modules/localization/constants/AvailableTimezoneOptions.ts
similarity index 83%
rename from packages/twenty-front/src/modules/settings/experience/constants/AvailableTimezoneOptions.ts
rename to packages/twenty-front/src/modules/localization/constants/AvailableTimezoneOptions.ts
index 78d3cb0c09a..4e13a4ddc51 100644
--- a/packages/twenty-front/src/modules/settings/experience/constants/AvailableTimezoneOptions.ts
+++ b/packages/twenty-front/src/modules/localization/constants/AvailableTimezoneOptions.ts
@@ -1,6 +1,5 @@
import { getTimezoneOffset } from 'date-fns-tz';
-
-import { AVAILABLE_TIME_ZONE_OPTIONS_BY_LABEL } from '@/settings/experience/constants/AvailableTimezoneOptionsByLabel';
+import { AVAILABLE_TIME_ZONE_OPTIONS_BY_LABEL } from '@/localization/constants/AvailableTimezoneOptionsByLabel';
const { AVAILABLE_TIMEZONE_OPTIONS } = {
AVAILABLE_TIMEZONE_OPTIONS: Object.values(
diff --git a/packages/twenty-front/src/modules/settings/experience/constants/AvailableTimezoneOptionsByLabel.ts b/packages/twenty-front/src/modules/localization/constants/AvailableTimezoneOptionsByLabel.ts
similarity index 100%
rename from packages/twenty-front/src/modules/settings/experience/constants/AvailableTimezoneOptionsByLabel.ts
rename to packages/twenty-front/src/modules/localization/constants/AvailableTimezoneOptionsByLabel.ts
diff --git a/packages/twenty-front/src/modules/localization/hooks/__tests__/useNumberFormat.test.tsx b/packages/twenty-front/src/modules/localization/hooks/__tests__/useNumberFormat.test.tsx
index c433aa5ebf0..0ccc8d9f03f 100644
--- a/packages/twenty-front/src/modules/localization/hooks/__tests__/useNumberFormat.test.tsx
+++ b/packages/twenty-front/src/modules/localization/hooks/__tests__/useNumberFormat.test.tsx
@@ -4,9 +4,9 @@ import { type ReactNode } from 'react';
import { useNumberFormat } from '@/localization/hooks/useNumberFormat';
import { workspaceMemberFormatPreferencesState } from '@/localization/states/workspaceMemberFormatPreferencesState';
import { jotaiStore } from '@/ui/utilities/state/jotai/jotaiStore';
-import { formatNumber as utilFormatNumber } from '~/utils/format/formatNumber';
+import { formatNumber as utilFormatNumber } from '@/localization/utils/formatNumber';
-jest.mock('~/utils/format/formatNumber');
+jest.mock('@/localization/utils/formatNumber');
const mockUtilFormatNumber = utilFormatNumber as jest.MockedFunction<
typeof utilFormatNumber
diff --git a/packages/twenty-front/src/localization/hooks/useLocaleOptions.ts b/packages/twenty-front/src/modules/localization/hooks/useLocaleOptions.ts
similarity index 100%
rename from packages/twenty-front/src/localization/hooks/useLocaleOptions.ts
rename to packages/twenty-front/src/modules/localization/hooks/useLocaleOptions.ts
diff --git a/packages/twenty-front/src/modules/localization/hooks/useNumberFormat.ts b/packages/twenty-front/src/modules/localization/hooks/useNumberFormat.ts
index cf4f600bf99..70acfb8694d 100644
--- a/packages/twenty-front/src/modules/localization/hooks/useNumberFormat.ts
+++ b/packages/twenty-front/src/modules/localization/hooks/useNumberFormat.ts
@@ -5,7 +5,7 @@ import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomState
import {
formatNumber as utilFormatNumber,
type FormatNumberOptions,
-} from '~/utils/format/formatNumber';
+} from '@/localization/utils/formatNumber';
export const useNumberFormat = () => {
const workspaceMemberFormatPreferences = useAtomStateValue(
diff --git a/packages/twenty-front/src/localization/states/dateLocaleState.ts b/packages/twenty-front/src/modules/localization/states/dateLocaleState.ts
similarity index 99%
rename from packages/twenty-front/src/localization/states/dateLocaleState.ts
rename to packages/twenty-front/src/modules/localization/states/dateLocaleState.ts
index f531263c177..d7b758041c5 100644
--- a/packages/twenty-front/src/localization/states/dateLocaleState.ts
+++ b/packages/twenty-front/src/modules/localization/states/dateLocaleState.ts
@@ -1,7 +1,6 @@
import { type Locale } from 'date-fns';
import { enUS } from 'date-fns/locale';
import { type APP_LOCALES } from 'twenty-shared/translations';
-
import { createAtomState } from '@/ui/utilities/state/jotai/utils/createAtomState';
type DateLocaleState = {
diff --git a/packages/twenty-front/src/utils/format/__tests__/formatNumber.test.ts b/packages/twenty-front/src/modules/localization/utils/__tests__/formatNumber.test.ts
similarity index 98%
rename from packages/twenty-front/src/utils/format/__tests__/formatNumber.test.ts
rename to packages/twenty-front/src/modules/localization/utils/__tests__/formatNumber.test.ts
index 17aef1a28c6..4980536a0bf 100644
--- a/packages/twenty-front/src/utils/format/__tests__/formatNumber.test.ts
+++ b/packages/twenty-front/src/modules/localization/utils/__tests__/formatNumber.test.ts
@@ -1,4 +1,4 @@
-import { formatNumber } from '~/utils/format/formatNumber';
+import { formatNumber } from '@/localization/utils/formatNumber';
import { NumberFormat } from '@/localization/constants/NumberFormat';
describe('formatNumber', () => {
diff --git a/packages/twenty-front/src/utils/format/__tests__/getSeparatorsForNumberFormat.test.ts b/packages/twenty-front/src/modules/localization/utils/__tests__/getSeparatorsForNumberFormat.test.ts
similarity index 95%
rename from packages/twenty-front/src/utils/format/__tests__/getSeparatorsForNumberFormat.test.ts
rename to packages/twenty-front/src/modules/localization/utils/__tests__/getSeparatorsForNumberFormat.test.ts
index 07278ad9750..0335bd916e3 100644
--- a/packages/twenty-front/src/utils/format/__tests__/getSeparatorsForNumberFormat.test.ts
+++ b/packages/twenty-front/src/modules/localization/utils/__tests__/getSeparatorsForNumberFormat.test.ts
@@ -2,7 +2,7 @@ import { NumberFormat } from '@/localization/constants/NumberFormat';
import {
getSeparatorsForNumberFormat,
type NumberFormatSeparators,
-} from '~/utils/format/getSeparatorsForNumberFormat';
+} from '@/localization/utils/getSeparatorsForNumberFormat';
const expectSeparators = (
format: NumberFormat,
diff --git a/packages/twenty-front/src/modules/localization/utils/findAvailableTimeZoneOption.ts b/packages/twenty-front/src/modules/localization/utils/findAvailableTimeZoneOption.ts
index dc083b80ce7..d1336c3aaff 100644
--- a/packages/twenty-front/src/modules/localization/utils/findAvailableTimeZoneOption.ts
+++ b/packages/twenty-front/src/modules/localization/utils/findAvailableTimeZoneOption.ts
@@ -1,5 +1,5 @@
import { formatTimeZoneLabel } from '@/localization/utils/formatTimeZoneLabel';
-import { AVAILABLE_TIME_ZONE_OPTIONS_BY_LABEL } from '@/settings/experience/constants/AvailableTimezoneOptionsByLabel';
+import { AVAILABLE_TIME_ZONE_OPTIONS_BY_LABEL } from '@/localization/constants/AvailableTimezoneOptionsByLabel';
export const findAvailableTimeZoneOption = (value: string) =>
AVAILABLE_TIME_ZONE_OPTIONS_BY_LABEL[formatTimeZoneLabel(value)];
diff --git a/packages/twenty-front/src/utils/format/formatNumber.ts b/packages/twenty-front/src/modules/localization/utils/formatNumber.ts
similarity index 100%
rename from packages/twenty-front/src/utils/format/formatNumber.ts
rename to packages/twenty-front/src/modules/localization/utils/formatNumber.ts
diff --git a/packages/twenty-front/src/utils/dates/formatZonedDateTimeDatePart.ts b/packages/twenty-front/src/modules/localization/utils/formatZonedDateTimeDatePart.ts
similarity index 100%
rename from packages/twenty-front/src/utils/dates/formatZonedDateTimeDatePart.ts
rename to packages/twenty-front/src/modules/localization/utils/formatZonedDateTimeDatePart.ts
diff --git a/packages/twenty-front/src/utils/dates/formatZonedDateTimeTimePart.ts b/packages/twenty-front/src/modules/localization/utils/formatZonedDateTimeTimePart.ts
similarity index 100%
rename from packages/twenty-front/src/utils/dates/formatZonedDateTimeTimePart.ts
rename to packages/twenty-front/src/modules/localization/utils/formatZonedDateTimeTimePart.ts
diff --git a/packages/twenty-front/src/utils/format/getSeparatorsForNumberFormat.ts b/packages/twenty-front/src/modules/localization/utils/getSeparatorsForNumberFormat.ts
similarity index 100%
rename from packages/twenty-front/src/utils/format/getSeparatorsForNumberFormat.ts
rename to packages/twenty-front/src/modules/localization/utils/getSeparatorsForNumberFormat.ts
diff --git a/packages/twenty-front/src/modules/log-console/components/LogConsoleDetailPanel.tsx b/packages/twenty-front/src/modules/log-console/components/LogConsoleDetailPanel.tsx
index fe95346d5b9..f4611878e20 100644
--- a/packages/twenty-front/src/modules/log-console/components/LogConsoleDetailPanel.tsx
+++ b/packages/twenty-front/src/modules/log-console/components/LogConsoleDetailPanel.tsx
@@ -34,7 +34,7 @@ import { useAtomState } from '@/ui/utilities/state/jotai/hooks/useAtomState';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { type EventLogRecord } from '~/generated-metadata/graphql';
import { useCopyToClipboard } from '~/hooks/useCopyToClipboard';
-import { dateLocaleState } from '~/localization/states/dateLocaleState';
+import { dateLocaleState } from '@/localization/states/dateLocaleState';
import { getAbsoluteImageUrl } from '~/utils/image/getAbsoluteImageUrl';
const COLLAPSED_MESSAGE_STACK_LINE_COUNT = 1;
diff --git a/packages/twenty-front/src/modules/log-console/components/LogConsoleTimeCell.tsx b/packages/twenty-front/src/modules/log-console/components/LogConsoleTimeCell.tsx
index 8e1d8000699..78c5a106ae0 100644
--- a/packages/twenty-front/src/modules/log-console/components/LogConsoleTimeCell.tsx
+++ b/packages/twenty-front/src/modules/log-console/components/LogConsoleTimeCell.tsx
@@ -12,7 +12,7 @@ import { SettingsNameCellSecondaryLabel } from '@/settings/components/SettingsNa
import { StyledNameTableCell } from '@/settings/data-model/object-details/components/SettingsObjectItemTableRowStyledComponents';
import { TooltipDelay } from '@/ui/layout/tooltip/constants/TooltipDelay';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
-import { dateLocaleState } from '~/localization/states/dateLocaleState';
+import { dateLocaleState } from '@/localization/states/dateLocaleState';
import { beautifyPastDateRelativeToNow } from '~/utils/date-utils';
const StyledTimeAndDate = styled.span`
diff --git a/packages/twenty-front/src/modules/log-console/constants/LogConsoleSources.tsx b/packages/twenty-front/src/modules/log-console/constants/LogConsoleSources.tsx
index a87c0012995..a8474a03af6 100644
--- a/packages/twenty-front/src/modules/log-console/constants/LogConsoleSources.tsx
+++ b/packages/twenty-front/src/modules/log-console/constants/LogConsoleSources.tsx
@@ -55,7 +55,7 @@ import {
EventLogFilterOperand,
EventLogTable,
} from '~/generated-metadata/graphql';
-import { formatNumber } from '~/utils/format/formatNumber';
+import { formatNumber } from '@/localization/utils/formatNumber';
const TIME_DETAIL_FIELD: LogConsoleDetailField = {
label: msg`Time`,
diff --git a/packages/twenty-front/src/modules/log-console/constants/LogConsoleUsageEventColumns.tsx b/packages/twenty-front/src/modules/log-console/constants/LogConsoleUsageEventColumns.tsx
index 33737eadbf3..be5a900ad0f 100644
--- a/packages/twenty-front/src/modules/log-console/constants/LogConsoleUsageEventColumns.tsx
+++ b/packages/twenty-front/src/modules/log-console/constants/LogConsoleUsageEventColumns.tsx
@@ -6,7 +6,7 @@ import { LOG_CONSOLE_TIME_COLUMN } from '@/log-console/constants/LogConsoleTimeC
import { LOG_CONSOLE_USAGE_OPERATION_COLUMN } from '@/log-console/constants/LogConsoleUsageOperationColumn';
import { type LogConsoleColumn } from '@/log-console/types/LogConsoleColumn';
import { SettingsTableTextCell } from '@/settings/components/SettingsTableTextCell';
-import { formatNumber } from '~/utils/format/formatNumber';
+import { formatNumber } from '@/localization/utils/formatNumber';
export const LOG_CONSOLE_USAGE_EVENT_COLUMNS: LogConsoleColumn[] = [
LOG_CONSOLE_TIME_COLUMN,
diff --git a/packages/twenty-front/src/modules/settings/logic-functions/hooks/useGetLogicFunctionHttpUrl.ts b/packages/twenty-front/src/modules/logic-functions/hooks/useGetLogicFunctionHttpUrl.ts
similarity index 94%
rename from packages/twenty-front/src/modules/settings/logic-functions/hooks/useGetLogicFunctionHttpUrl.ts
rename to packages/twenty-front/src/modules/logic-functions/hooks/useGetLogicFunctionHttpUrl.ts
index 84e2679bd3a..86a86431c7e 100644
--- a/packages/twenty-front/src/modules/settings/logic-functions/hooks/useGetLogicFunctionHttpUrl.ts
+++ b/packages/twenty-front/src/modules/logic-functions/hooks/useGetLogicFunctionHttpUrl.ts
@@ -5,7 +5,7 @@ import { domainConfigurationState } from '@/domain-manager/states/domainConfigur
import {
getFunctionsBaseUrl,
getLogicFunctionHttpUrl,
-} from '@/settings/logic-functions/utils/getLogicFunctionHttpUrl';
+} from '@/logic-functions/utils/getLogicFunctionHttpUrl';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { REACT_APP_SERVER_BASE_URL } from '~/config';
diff --git a/packages/twenty-front/src/modules/settings/logic-functions/utils/__tests__/getLogicFunctionHttpUrl.test.ts b/packages/twenty-front/src/modules/logic-functions/utils/__tests__/getLogicFunctionHttpUrl.test.ts
similarity index 97%
rename from packages/twenty-front/src/modules/settings/logic-functions/utils/__tests__/getLogicFunctionHttpUrl.test.ts
rename to packages/twenty-front/src/modules/logic-functions/utils/__tests__/getLogicFunctionHttpUrl.test.ts
index b93f1c42320..a9e0fb97806 100644
--- a/packages/twenty-front/src/modules/settings/logic-functions/utils/__tests__/getLogicFunctionHttpUrl.test.ts
+++ b/packages/twenty-front/src/modules/logic-functions/utils/__tests__/getLogicFunctionHttpUrl.test.ts
@@ -1,7 +1,7 @@
import {
getFunctionsBaseUrl,
getLogicFunctionHttpUrl,
-} from '@/settings/logic-functions/utils/getLogicFunctionHttpUrl';
+} from '@/logic-functions/utils/getLogicFunctionHttpUrl';
describe('getFunctionsBaseUrl', () => {
it('builds the isolated base from subdomain + public domain', () => {
diff --git a/packages/twenty-front/src/modules/settings/logic-functions/utils/getLogicFunctionHttpUrl.ts b/packages/twenty-front/src/modules/logic-functions/utils/getLogicFunctionHttpUrl.ts
similarity index 100%
rename from packages/twenty-front/src/modules/settings/logic-functions/utils/getLogicFunctionHttpUrl.ts
rename to packages/twenty-front/src/modules/logic-functions/utils/getLogicFunctionHttpUrl.ts
diff --git a/packages/twenty-front/src/modules/metadata-store/effect-components/UserMetadataProviderInitialEffect.tsx b/packages/twenty-front/src/modules/metadata-store/effect-components/UserMetadataProviderInitialEffect.tsx
index edbdc763911..8ecca83398f 100644
--- a/packages/twenty-front/src/modules/metadata-store/effect-components/UserMetadataProviderInitialEffect.tsx
+++ b/packages/twenty-front/src/modules/metadata-store/effect-components/UserMetadataProviderInitialEffect.tsx
@@ -22,7 +22,7 @@ import {
type WorkspaceMember,
GetCurrentUserDocument,
} from '~/generated-metadata/graphql';
-import { dateLocaleState } from '~/localization/states/dateLocaleState';
+import { dateLocaleState } from '@/localization/states/dateLocaleState';
import { dynamicActivate } from '~/utils/i18n/dynamicActivate';
import { type ColorScheme } from '@/ui/theme/types/ColorScheme';
import { type UiScale } from '@/ui/theme/types/UiScale';
diff --git a/packages/twenty-front/src/modules/object-core/agents/components/CoreAgentRunConversation.tsx b/packages/twenty-front/src/modules/object-core/agents/components/CoreAgentRunConversation.tsx
index 411535e87a8..28d72cdd29c 100644
--- a/packages/twenty-front/src/modules/object-core/agents/components/CoreAgentRunConversation.tsx
+++ b/packages/twenty-front/src/modules/object-core/agents/components/CoreAgentRunConversation.tsx
@@ -12,7 +12,7 @@ import { handleCoreAgentRunToggleKeyDown } from '@/object-core/agents/utils/hand
import { TableCell } from '@/ui/layout/table/components/TableCell';
import { TableRow } from '@/ui/layout/table/components/TableRow';
import { beautifyPastDateRelativeToNow } from '~/utils/date-utils';
-import { formatNumber } from '~/utils/format/formatNumber';
+import { formatNumber } from '@/localization/utils/formatNumber';
type CoreAgentRunConversationProps = {
title: string | null;
diff --git a/packages/twenty-front/src/modules/object-core/agents/components/CoreAgentRunRow.tsx b/packages/twenty-front/src/modules/object-core/agents/components/CoreAgentRunRow.tsx
index 245b70eda9b..f5443609056 100644
--- a/packages/twenty-front/src/modules/object-core/agents/components/CoreAgentRunRow.tsx
+++ b/packages/twenty-front/src/modules/object-core/agents/components/CoreAgentRunRow.tsx
@@ -13,7 +13,7 @@ import { TableCell } from '@/ui/layout/table/components/TableCell';
import { TableRow } from '@/ui/layout/table/components/TableRow';
import { formatDuration } from '~/utils/format/formatDuration';
import { beautifyPastDateRelativeToNow } from '~/utils/date-utils';
-import { formatNumber } from '~/utils/format/formatNumber';
+import { formatNumber } from '@/localization/utils/formatNumber';
type CoreAgentRunRowProps = {
run: CoreAgentRun;
diff --git a/packages/twenty-front/src/modules/object-core/workflows/components/CoreWorkflowEditor.tsx b/packages/twenty-front/src/modules/object-core/workflows/components/CoreWorkflowEditor.tsx
index abaa6f8045b..7b882556809 100644
--- a/packages/twenty-front/src/modules/object-core/workflows/components/CoreWorkflowEditor.tsx
+++ b/packages/twenty-front/src/modules/object-core/workflows/components/CoreWorkflowEditor.tsx
@@ -1,7 +1,7 @@
import { t } from '@lingui/core/macro';
import { isDefined } from 'twenty-shared/utils';
-import { WorkspaceRouteUnavailable } from '@/app/routing/components/WorkspaceRouteUnavailable';
+import { WorkspaceRouteUnavailable } from '@/ui/layout/page/components/WorkspaceRouteUnavailable';
import { useListenToCoreWorkflowEvents } from '@/object-core/workflows/hooks/useListenToCoreWorkflowEvents';
import { useCoreWorkflowVersion } from '@/object-core/workflows/versions/hooks/useCoreWorkflowVersion';
import { CoreWorkflowVersionCard } from '@/object-core/workflows/versions/components/CoreWorkflowVersionCard';
diff --git a/packages/twenty-front/src/modules/object-core/workflows/components/CoreWorkflowToWorkspaceRedirect.tsx b/packages/twenty-front/src/modules/object-core/workflows/components/CoreWorkflowToWorkspaceRedirect.tsx
index faf71457293..149b4574a39 100644
--- a/packages/twenty-front/src/modules/object-core/workflows/components/CoreWorkflowToWorkspaceRedirect.tsx
+++ b/packages/twenty-front/src/modules/object-core/workflows/components/CoreWorkflowToWorkspaceRedirect.tsx
@@ -3,7 +3,7 @@ import { AppPath, CoreObjectNameSingular } from 'twenty-shared/types';
import { getAppPath, isDefined } from 'twenty-shared/utils';
import { Loader } from 'twenty-ui/primitives/feedback';
-import { WorkspaceRouteUnavailable } from '@/app/routing/components/WorkspaceRouteUnavailable';
+import { WorkspaceRouteUnavailable } from '@/ui/layout/page/components/WorkspaceRouteUnavailable';
import { useFindManyRecords } from '@/object-record/hooks/useFindManyRecords';
import { type Workflow } from '@/workflow/types/Workflow';
diff --git a/packages/twenty-front/src/modules/object-core/workflows/components/WorkspaceWorkflowRedirect.tsx b/packages/twenty-front/src/modules/object-core/workflows/components/WorkspaceWorkflowRedirect.tsx
index 2ca9f8bf55b..15a83485486 100644
--- a/packages/twenty-front/src/modules/object-core/workflows/components/WorkspaceWorkflowRedirect.tsx
+++ b/packages/twenty-front/src/modules/object-core/workflows/components/WorkspaceWorkflowRedirect.tsx
@@ -4,7 +4,7 @@ import { AppPath } from 'twenty-shared/types';
import { getAppPath, isDefined } from 'twenty-shared/utils';
import { Loader } from 'twenty-ui/primitives/feedback';
-import { WorkspaceRouteUnavailable } from '@/app/routing/components/WorkspaceRouteUnavailable';
+import { WorkspaceRouteUnavailable } from '@/ui/layout/page/components/WorkspaceRouteUnavailable';
import { useApolloCoreClient } from '@/object-metadata/hooks/useApolloCoreClient';
import { GetCoreWorkflowLegacyMappingDocument } from '~/generated/graphql';
diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/forms/utils/errorMessages.ts b/packages/twenty-front/src/modules/object-metadata/utils/metadataLabelErrorMessages.ts
similarity index 100%
rename from packages/twenty-front/src/modules/settings/data-model/fields/forms/utils/errorMessages.ts
rename to packages/twenty-front/src/modules/object-metadata/utils/metadataLabelErrorMessages.ts
diff --git a/packages/twenty-front/src/modules/object-metadata/validation-schemas/metadataLabelSchema.ts b/packages/twenty-front/src/modules/object-metadata/validation-schemas/metadataLabelSchema.ts
index eddbe48684d..00a93392dc5 100644
--- a/packages/twenty-front/src/modules/object-metadata/validation-schemas/metadataLabelSchema.ts
+++ b/packages/twenty-front/src/modules/object-metadata/validation-schemas/metadataLabelSchema.ts
@@ -1,4 +1,4 @@
-import { errors } from '@/settings/data-model/fields/forms/utils/errorMessages';
+import { errors } from '@/object-metadata/utils/metadataLabelErrorMessages';
import { z } from 'zod';
import { computeMetadataNameFromLabel } from '@/object-metadata/utils/computeMetadataNameFromLabel';
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownDateInput.tsx b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownDateInput.tsx
index 94634361852..902892c1e06 100644
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownDateInput.tsx
+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownDateInput.tsx
@@ -18,8 +18,8 @@ import {
type RelativeDateFilter,
resolveDateFilter,
} from 'twenty-shared/utils';
-import { dateLocaleState } from '~/localization/states/dateLocaleState';
-import { formatDateString } from '~/utils/string/formatDateString';
+import { dateLocaleState } from '@/localization/states/dateLocaleState';
+import { formatDateString } from '@/object-record/record-field/ui/utils/formatDateString';
export const ObjectFilterDropdownDateInput = () => {
const { dateFormat, timeZone } = useContext(UserContext);
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownDateTimeInput.tsx b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownDateTimeInput.tsx
index be621d98742..1e7322b7c5f 100644
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownDateTimeInput.tsx
+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/components/ObjectFilterDropdownDateTimeInput.tsx
@@ -21,8 +21,8 @@ import {
import { useUserTimezone } from '@/ui/input/components/internal/date/hooks/useUserTimezone';
import { isNonEmptyString } from '@sniptt/guards';
import { Temporal } from 'temporal-polyfill';
-import { dateLocaleState } from '~/localization/states/dateLocaleState';
-import { formatDateTimeString } from '~/utils/string/formatDateTimeString';
+import { dateLocaleState } from '@/localization/states/dateLocaleState';
+import { formatDateTimeString } from '@/object-record/record-field/ui/utils/formatDateTimeString';
export const ObjectFilterDropdownDateTimeInput = () => {
const { dateFormat, timeFormat, timeZone } = useContext(UserContext);
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/hooks/useGetDateFilterDisplayValue.ts b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/hooks/useGetDateFilterDisplayValue.ts
index da83a2b7bdc..79a9f09e82a 100644
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/hooks/useGetDateFilterDisplayValue.ts
+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/hooks/useGetDateFilterDisplayValue.ts
@@ -1,6 +1,6 @@
import { useUserDateFormat } from '@/ui/input/components/internal/date/hooks/useUserDateFormat';
import { type Temporal } from 'temporal-polyfill';
-import { formatZonedDateTimeDatePart } from '~/utils/dates/formatZonedDateTimeDatePart';
+import { formatZonedDateTimeDatePart } from '@/localization/utils/formatZonedDateTimeDatePart';
export const useGetDateFilterDisplayValue = () => {
const { userDateFormat } = useUserDateFormat();
diff --git a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/hooks/useGetDateTimeFilterDisplayValue.ts b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/hooks/useGetDateTimeFilterDisplayValue.ts
index 3d831b1e947..2dac947262c 100644
--- a/packages/twenty-front/src/modules/object-record/object-filter-dropdown/hooks/useGetDateTimeFilterDisplayValue.ts
+++ b/packages/twenty-front/src/modules/object-record/object-filter-dropdown/hooks/useGetDateTimeFilterDisplayValue.ts
@@ -3,8 +3,8 @@ import { useUserTimeFormat } from '@/ui/input/components/internal/date/hooks/use
import { useUserTimezone } from '@/ui/input/components/internal/date/hooks/useUserTimezone';
import { getTimezoneAbbreviationForZonedDateTime } from '@/ui/input/components/internal/date/utils/getTimeZoneAbbreviationForZonedDateTime';
import { type Temporal } from 'temporal-polyfill';
-import { formatZonedDateTimeDatePart } from '~/utils/dates/formatZonedDateTimeDatePart';
-import { formatZonedDateTimeTimePart } from '~/utils/dates/formatZonedDateTimeTimePart';
+import { formatZonedDateTimeDatePart } from '@/localization/utils/formatZonedDateTimeDatePart';
+import { formatZonedDateTimeTimePart } from '@/localization/utils/formatZonedDateTimeTimePart';
export const useGetDateTimeFilterDisplayValue = () => {
const { isSystemTimezone } = useUserTimezone();
diff --git a/packages/twenty-front/src/modules/object-record/record-aggregate/utils/transformAggregateRawValueIntoAggregateDisplayValue.ts b/packages/twenty-front/src/modules/object-record/record-aggregate/utils/transformAggregateRawValueIntoAggregateDisplayValue.ts
index eb42164b52e..d856465080f 100644
--- a/packages/twenty-front/src/modules/object-record/record-aggregate/utils/transformAggregateRawValueIntoAggregateDisplayValue.ts
+++ b/packages/twenty-front/src/modules/object-record/record-aggregate/utils/transformAggregateRawValueIntoAggregateDisplayValue.ts
@@ -14,9 +14,9 @@ import {
type AggregateOperations,
ChartNumberFormat,
} from '~/generated-metadata/graphql';
-import { formatNumber } from '~/utils/format/formatNumber';
-import { formatDateString } from '~/utils/string/formatDateString';
-import { formatDateTimeString } from '~/utils/string/formatDateTimeString';
+import { formatNumber } from '@/localization/utils/formatNumber';
+import { formatDateString } from '@/object-record/record-field/ui/utils/formatDateString';
+import { formatDateTimeString } from '@/object-record/record-field/ui/utils/formatDateTimeString';
export const transformAggregateRawValueIntoAggregateDisplayValue = ({
aggregateFieldMetadataItem,
diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/components/RecordCalendarTopBar.tsx b/packages/twenty-front/src/modules/object-record/record-calendar/components/RecordCalendarTopBar.tsx
index d002409c1ca..0597b302580 100644
--- a/packages/twenty-front/src/modules/object-record/record-calendar/components/RecordCalendarTopBar.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-calendar/components/RecordCalendarTopBar.tsx
@@ -33,7 +33,7 @@ import { IconChevronLeft, IconChevronRight } from 'twenty-ui/icon';
import { Button } from 'twenty-ui/primitives/input';
import { themeCssVariables } from 'twenty-ui/theme';
import { ViewCalendarLayout } from '~/generated-metadata/graphql';
-import { dateLocaleState } from '~/localization/states/dateLocaleState';
+import { dateLocaleState } from '@/localization/states/dateLocaleState';
const StyledContainer = styled.div`
align-items: center;
diff --git a/packages/twenty-front/src/modules/object-record/record-calendar/hooks/useRecordCalendarDaysRange.ts b/packages/twenty-front/src/modules/object-record/record-calendar/hooks/useRecordCalendarDaysRange.ts
index 6ca440cd365..55ad7ebdd91 100644
--- a/packages/twenty-front/src/modules/object-record/record-calendar/hooks/useRecordCalendarDaysRange.ts
+++ b/packages/twenty-front/src/modules/object-record/record-calendar/hooks/useRecordCalendarDaysRange.ts
@@ -7,7 +7,7 @@ import { type Temporal } from 'temporal-polyfill';
import { CalendarStartDay } from 'twenty-shared/constants';
import { turnPlainDateToShiftedDateInSystemTimeZone } from 'twenty-shared/utils';
import { type ViewCalendarLayout } from '~/generated-metadata/graphql';
-import { dateLocaleState } from '~/localization/states/dateLocaleState';
+import { dateLocaleState } from '@/localization/states/dateLocaleState';
export const useRecordCalendarDaysRange = (
selectedDate: Temporal.PlainDate,
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormAddressFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormAddressFieldInput.tsx
index 21aba16c06d..60f2ee495e6 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormAddressFieldInput.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/form-types/components/FormAddressFieldInput.tsx
@@ -7,7 +7,7 @@ import { type FieldAddressDraftValue } from '@/object-record/record-field/ui/typ
import { type FieldAddressValue } from '@/object-record/record-field/ui/types/FieldMetadata';
import { Field } from 'twenty-ui/primitives/input';
import { t } from '@lingui/core/macro';
-import { normalizeAddressFieldValueForPersist } from '~/utils/normalize-address-field-value-for-persist';
+import { normalizeAddressFieldValueForPersist } from '@/object-record/record-field/ui/utils/normalizeAddressFieldValueForPersist';
type FormAddressFieldInputProps = {
label?: string;
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/display/components/AddressFieldDisplay.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/display/components/AddressFieldDisplay.tsx
index 6262ea48981..685671ca0d0 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/display/components/AddressFieldDisplay.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/display/components/AddressFieldDisplay.tsx
@@ -1,6 +1,6 @@
import { useAddressFieldDisplay } from '@/object-record/record-field/ui/meta-types/hooks/useAddressFieldDisplay';
import { TextDisplay } from '@/ui/field/display/components/TextDisplay/TextDisplay';
-import { formatAddressDisplay } from '~/utils/formatAddressDisplay';
+import { formatAddressDisplay } from '@/object-record/record-field/ui/utils/formatAddressDisplay';
export const AddressFieldDisplay = () => {
const { fieldValue, fieldDefinition } = useAddressFieldDisplay();
diff --git a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/AddressFieldInput.tsx b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/AddressFieldInput.tsx
index a8fca03d2e0..8aa971e86f2 100644
--- a/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/AddressFieldInput.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/meta-types/input/components/AddressFieldInput.tsx
@@ -1,14 +1,13 @@
import { useAddressField } from '@/object-record/record-field/ui/meta-types/hooks/useAddressField';
import { type FieldAddressDraftValue } from '@/object-record/record-field/ui/types/FieldInputDraftValue';
import { AddressInput } from '@/ui/field/input/components/AddressInput';
-
import { RecordFieldComponentInstanceContext } from '@/object-record/record-field/ui/states/contexts/RecordFieldComponentInstanceContext';
import { FieldInputEventContext } from '@/object-record/record-field/ui/contexts/FieldInputEventContext';
import { useAvailableComponentInstanceIdOrThrow } from '@/ui/utilities/state/component-state/hooks/useAvailableComponentInstanceIdOrThrow';
import { useContext } from 'react';
import { castAsNumberOrNull } from '~/utils/cast-as-number-or-null';
-import { normalizeAddressFieldValueForPersist } from '~/utils/normalize-address-field-value-for-persist';
+import { normalizeAddressFieldValueForPersist } from '@/object-record/record-field/ui/utils/normalizeAddressFieldValueForPersist';
export const AddressFieldInput = () => {
const { draftValue, setDraftValue, fieldDefinition } = useAddressField();
diff --git a/packages/twenty-front/src/utils/__tests__/formatAddressDisplay.test.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/utils/__tests__/formatAddressDisplay.test.ts
similarity index 96%
rename from packages/twenty-front/src/utils/__tests__/formatAddressDisplay.test.ts
rename to packages/twenty-front/src/modules/object-record/record-field/ui/utils/__tests__/formatAddressDisplay.test.ts
index 223360bc7fc..23f1c4f8d4f 100644
--- a/packages/twenty-front/src/utils/__tests__/formatAddressDisplay.test.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/utils/__tests__/formatAddressDisplay.test.ts
@@ -1,5 +1,5 @@
import { type FieldAddressValue } from '@/object-record/record-field/ui/types/FieldMetadata';
-import { formatAddressDisplay } from '~/utils/formatAddressDisplay';
+import { formatAddressDisplay } from '@/object-record/record-field/ui/utils/formatAddressDisplay';
describe('formatAddressDisplay', () => {
const mockAddressValue: FieldAddressValue = {
diff --git a/packages/twenty-front/src/utils/string/__tests__/formatDateString.test.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/utils/__tests__/formatDateString.test.ts
similarity index 98%
rename from packages/twenty-front/src/utils/string/__tests__/formatDateString.test.ts
rename to packages/twenty-front/src/modules/object-record/record-field/ui/utils/__tests__/formatDateString.test.ts
index 738e6c11816..4bf5230ef1c 100644
--- a/packages/twenty-front/src/utils/string/__tests__/formatDateString.test.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/utils/__tests__/formatDateString.test.ts
@@ -2,7 +2,7 @@ import { DateFormat } from '@/localization/constants/DateFormat';
import { FieldDateDisplayFormat } from '@/object-record/record-field/ui/types/FieldMetadata';
import { subDays } from 'date-fns';
import { enUS } from 'date-fns/locale';
-import { formatDateString } from '~/utils/string/formatDateString';
+import { formatDateString } from '@/object-record/record-field/ui/utils/formatDateString';
describe('formatDateString', () => {
const defaultParams = {
diff --git a/packages/twenty-front/src/utils/string/__tests__/formatDateTimeString.test.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/utils/__tests__/formatDateTimeString.test.ts
similarity index 97%
rename from packages/twenty-front/src/utils/string/__tests__/formatDateTimeString.test.ts
rename to packages/twenty-front/src/modules/object-record/record-field/ui/utils/__tests__/formatDateTimeString.test.ts
index 50ee5340f16..988bff18b85 100644
--- a/packages/twenty-front/src/utils/string/__tests__/formatDateTimeString.test.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/utils/__tests__/formatDateTimeString.test.ts
@@ -3,7 +3,7 @@ import { TimeFormat } from '@/localization/constants/TimeFormat';
import { FieldDateDisplayFormat } from '@/object-record/record-field/ui/types/FieldMetadata';
import { subDays } from 'date-fns';
import { enUS } from 'date-fns/locale';
-import { formatDateTimeString } from '~/utils/string/formatDateTimeString';
+import { formatDateTimeString } from '@/object-record/record-field/ui/utils/formatDateTimeString';
describe('formatDateTimeString', () => {
const defaultParams = {
diff --git a/packages/twenty-front/src/utils/__tests__/joinAddressFieldValues.test.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/utils/__tests__/joinAddressFieldValues.test.ts
similarity index 96%
rename from packages/twenty-front/src/utils/__tests__/joinAddressFieldValues.test.ts
rename to packages/twenty-front/src/modules/object-record/record-field/ui/utils/__tests__/joinAddressFieldValues.test.ts
index 509bd244e9f..bc8548f6f32 100644
--- a/packages/twenty-front/src/utils/__tests__/joinAddressFieldValues.test.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/utils/__tests__/joinAddressFieldValues.test.ts
@@ -1,5 +1,5 @@
import { type FieldAddressValue } from '@/object-record/record-field/ui/types/FieldMetadata';
-import { joinAddressFieldValues } from '~/utils/joinAddressFieldValues';
+import { joinAddressFieldValues } from '@/object-record/record-field/ui/utils/joinAddressFieldValues';
describe('joinAddressFieldValues', () => {
const mockAddressValue: FieldAddressValue = {
diff --git a/packages/twenty-front/src/utils/__tests__/normalize-address-field-value-for-persist.test.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/utils/__tests__/normalizeAddressFieldValueForPersist.test.ts
similarity index 89%
rename from packages/twenty-front/src/utils/__tests__/normalize-address-field-value-for-persist.test.ts
rename to packages/twenty-front/src/modules/object-record/record-field/ui/utils/__tests__/normalizeAddressFieldValueForPersist.test.ts
index 193f7fe6ced..26784fbf247 100644
--- a/packages/twenty-front/src/utils/__tests__/normalize-address-field-value-for-persist.test.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/utils/__tests__/normalizeAddressFieldValueForPersist.test.ts
@@ -1,5 +1,5 @@
import { type FieldAddressValue } from '@/object-record/record-field/ui/types/FieldMetadata';
-import { normalizeAddressFieldValueForPersist } from '~/utils/normalize-address-field-value-for-persist';
+import { normalizeAddressFieldValueForPersist } from '@/object-record/record-field/ui/utils/normalizeAddressFieldValueForPersist';
describe('normalizeAddressFieldValueForPersist', () => {
it('should set coordinates to null when all text subfields are empty', () => {
diff --git a/packages/twenty-front/src/utils/formatAddressDisplay.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/utils/formatAddressDisplay.ts
similarity index 85%
rename from packages/twenty-front/src/utils/formatAddressDisplay.ts
rename to packages/twenty-front/src/modules/object-record/record-field/ui/utils/formatAddressDisplay.ts
index 19a6b561388..182e28001a9 100644
--- a/packages/twenty-front/src/utils/formatAddressDisplay.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/utils/formatAddressDisplay.ts
@@ -4,7 +4,7 @@ import {
type AllowedAddressSubField,
} from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
-import { joinAddressFieldValues } from '~/utils/joinAddressFieldValues';
+import { joinAddressFieldValues } from '@/object-record/record-field/ui/utils/joinAddressFieldValues';
export const formatAddressDisplay = (
fieldValue: FieldAddressValue | undefined,
diff --git a/packages/twenty-front/src/utils/string/formatDateString.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/utils/formatDateString.ts
similarity index 100%
rename from packages/twenty-front/src/utils/string/formatDateString.ts
rename to packages/twenty-front/src/modules/object-record/record-field/ui/utils/formatDateString.ts
diff --git a/packages/twenty-front/src/utils/string/formatDateTimeString.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/utils/formatDateTimeString.ts
similarity index 100%
rename from packages/twenty-front/src/utils/string/formatDateTimeString.ts
rename to packages/twenty-front/src/modules/object-record/record-field/ui/utils/formatDateTimeString.ts
diff --git a/packages/twenty-front/src/utils/joinAddressFieldValues.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/utils/joinAddressFieldValues.ts
similarity index 100%
rename from packages/twenty-front/src/utils/joinAddressFieldValues.ts
rename to packages/twenty-front/src/modules/object-record/record-field/ui/utils/joinAddressFieldValues.ts
diff --git a/packages/twenty-front/src/utils/normalize-address-field-value-for-persist.ts b/packages/twenty-front/src/modules/object-record/record-field/ui/utils/normalizeAddressFieldValueForPersist.ts
similarity index 99%
rename from packages/twenty-front/src/utils/normalize-address-field-value-for-persist.ts
rename to packages/twenty-front/src/modules/object-record/record-field/ui/utils/normalizeAddressFieldValueForPersist.ts
index 38e041d4021..d322170e91a 100644
--- a/packages/twenty-front/src/utils/normalize-address-field-value-for-persist.ts
+++ b/packages/twenty-front/src/modules/object-record/record-field/ui/utils/normalizeAddressFieldValueForPersist.ts
@@ -1,5 +1,4 @@
import { isNonEmptyString } from '@sniptt/guards';
-
import { type FieldAddressValue } from '@/object-record/record-field/ui/types/FieldMetadata';
// When every user-editable text part of the address is empty, clear coordinates
diff --git a/packages/twenty-front/src/modules/object-record/record-index/hooks/useSetRecordIndexAggregateDisplayValueForRecordGroupValue.ts b/packages/twenty-front/src/modules/object-record/record-index/hooks/useSetRecordIndexAggregateDisplayValueForRecordGroupValue.ts
index 880a985f312..4e1daf1a3df 100644
--- a/packages/twenty-front/src/modules/object-record/record-index/hooks/useSetRecordIndexAggregateDisplayValueForRecordGroupValue.ts
+++ b/packages/twenty-front/src/modules/object-record/record-index/hooks/useSetRecordIndexAggregateDisplayValueForRecordGroupValue.ts
@@ -9,7 +9,7 @@ import { UserContext } from '@/users/contexts/UserContext';
import { useStore } from 'jotai';
import { useCallback, useContext } from 'react';
import { type Nullable } from 'twenty-shared/types';
-import { dateLocaleState } from '~/localization/states/dateLocaleState';
+import { dateLocaleState } from '@/localization/states/dateLocaleState';
export const useSetRecordIndexAggregateDisplayValueForRecordGroupValue = () => {
const { dateFormat, timeFormat, timeZone } = useContext(UserContext);
diff --git a/packages/twenty-front/src/modules/object-record/record-show/components/RecordIdentifierBarCreatedAt.tsx b/packages/twenty-front/src/modules/object-record/record-show/components/RecordIdentifierBarCreatedAt.tsx
index 79c038d4b0d..61914556218 100644
--- a/packages/twenty-front/src/modules/object-record/record-show/components/RecordIdentifierBarCreatedAt.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-show/components/RecordIdentifierBarCreatedAt.tsx
@@ -8,7 +8,7 @@ import { Trans } from '@lingui/react/macro';
import { isNonEmptyString } from '@sniptt/guards';
import { useId } from 'react';
import { Tooltip } from 'twenty-ui/primitives/surfaces';
-import { dateLocaleState } from '~/localization/states/dateLocaleState';
+import { dateLocaleState } from '@/localization/states/dateLocaleState';
import {
beautifyExactDateTime,
beautifyPastDateRelativeToNow,
diff --git a/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/hooks/useAggregateRecordsForRecordTableColumnFooter.tsx b/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/hooks/useAggregateRecordsForRecordTableColumnFooter.tsx
index b02cb833af1..f29f3289853 100644
--- a/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/hooks/useAggregateRecordsForRecordTableColumnFooter.tsx
+++ b/packages/twenty-front/src/modules/object-record/record-table/record-table-footer/hooks/useAggregateRecordsForRecordTableColumnFooter.tsx
@@ -29,7 +29,7 @@ import {
isFieldMetadataDateKind,
turnAnyFieldFilterIntoRecordGqlFilter,
} from 'twenty-shared/utils';
-import { dateLocaleState } from '~/localization/states/dateLocaleState';
+import { dateLocaleState } from '@/localization/states/dateLocaleState';
export const useAggregateRecordsForRecordTableColumnFooter = (
aggregateFieldMetadataId: string,
diff --git a/packages/twenty-front/src/modules/onboarding/utils/formatOnboardingCredits.ts b/packages/twenty-front/src/modules/onboarding/utils/formatOnboardingCredits.ts
index 7d7131d6648..95909b0f890 100644
--- a/packages/twenty-front/src/modules/onboarding/utils/formatOnboardingCredits.ts
+++ b/packages/twenty-front/src/modules/onboarding/utils/formatOnboardingCredits.ts
@@ -1,5 +1,5 @@
import { type NumberFormat } from '@/localization/constants/NumberFormat';
-import { formatNumber } from '~/utils/format/formatNumber';
+import { formatNumber } from '@/localization/utils/formatNumber';
export const formatOnboardingCredits = (
credits: number,
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/graph/graph-widget-pie-chart/hooks/usePieChartCenterMetricData.ts b/packages/twenty-front/src/modules/page-layout/widgets/graph/graph-widget-pie-chart/hooks/usePieChartCenterMetricData.ts
index ac513b5dd33..abbfaf18a0b 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/graph/graph-widget-pie-chart/hooks/usePieChartCenterMetricData.ts
+++ b/packages/twenty-front/src/modules/page-layout/widgets/graph/graph-widget-pie-chart/hooks/usePieChartCenterMetricData.ts
@@ -14,7 +14,7 @@ import { useContext, useMemo } from 'react';
import { FIELD_FOR_TOTAL_COUNT_AGGREGATE_OPERATION } from 'twenty-shared/constants';
import { findById, isDefined } from 'twenty-shared/utils';
import { type PieChartConfiguration } from '~/generated-metadata/graphql';
-import { dateLocaleState } from '~/localization/states/dateLocaleState';
+import { dateLocaleState } from '@/localization/states/dateLocaleState';
type UsePieChartCenterMetricDataProps = {
objectMetadataItemId: string;
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/graph/hooks/useGraphWidgetAggregateQuery.ts b/packages/twenty-front/src/modules/page-layout/widgets/graph/hooks/useGraphWidgetAggregateQuery.ts
index b4bd666d3b8..852a462425e 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/graph/hooks/useGraphWidgetAggregateQuery.ts
+++ b/packages/twenty-front/src/modules/page-layout/widgets/graph/hooks/useGraphWidgetAggregateQuery.ts
@@ -16,7 +16,7 @@ import { useContext } from 'react';
import { FIELD_FOR_TOTAL_COUNT_AGGREGATE_OPERATION } from 'twenty-shared/constants';
import { findById, isDefined } from 'twenty-shared/utils';
import { type AggregateChartConfiguration } from '~/generated-metadata/graphql';
-import { dateLocaleState } from '~/localization/states/dateLocaleState';
+import { dateLocaleState } from '@/localization/states/dateLocaleState';
export const useGraphWidgetAggregateQuery = ({
objectMetadataItemId,
diff --git a/packages/twenty-front/src/modules/page-layout/widgets/graph/utils/graphFormatters.ts b/packages/twenty-front/src/modules/page-layout/widgets/graph/utils/graphFormatters.ts
index d6df8975d06..7b179c14744 100644
--- a/packages/twenty-front/src/modules/page-layout/widgets/graph/utils/graphFormatters.ts
+++ b/packages/twenty-front/src/modules/page-layout/widgets/graph/utils/graphFormatters.ts
@@ -2,7 +2,7 @@ import { formatToShortNumber, isDefined } from 'twenty-shared/utils';
import {
formatNumber as utilFormatNumber,
type FormatNumberOptions,
-} from '~/utils/format/formatNumber';
+} from '@/localization/utils/formatNumber';
export type GraphValueFormatOptions = {
displayType?: 'percentage' | 'number' | 'shortNumber' | 'currency' | 'custom';
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/ai/components/SettingsAdminAI.tsx b/packages/twenty-front/src/modules/settings/admin-panel/ai/components/SettingsAdminAI.tsx
index e4a131f92d4..5672f24997d 100644
--- a/packages/twenty-front/src/modules/settings/admin-panel/ai/components/SettingsAdminAI.tsx
+++ b/packages/twenty-front/src/modules/settings/admin-panel/ai/components/SettingsAdminAI.tsx
@@ -26,7 +26,7 @@ import { useCustomAiProviderAccess } from '@/settings/admin-panel/ai/hooks/useCu
import { type GetAiProvidersResult } from '@/settings/admin-panel/ai/types/GetAiProvidersResult';
import { parseProviderItems } from '@/settings/admin-panel/ai/utils/parseProviderItems';
import { useApolloAdminClient } from '@/settings/admin-panel/apollo/hooks/useApolloAdminClient';
-import { AiModelPinSelect } from '@/settings/ai/components/AiModelPinSelect';
+import { AiModelPinSelect } from '@/ai/components/AiModelPinSelect';
import { SettingsEnterpriseFeatureGateCard } from '@/settings/components/SettingsEnterpriseFeatureGateCard';
import { SettingsOptionCardContentSelect } from '@/settings/components/SettingsOptions/SettingsOptionCardContentSelect';
import { StyledSettingsSelectGroup } from '@/settings/components/SettingsOptions/StyledSettingsSelectGroup';
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/ai/components/SettingsAdminAiProviderListCard.tsx b/packages/twenty-front/src/modules/settings/admin-panel/ai/components/SettingsAdminAiProviderListCard.tsx
index 5a0f7cb242b..ebac34cf2f1 100644
--- a/packages/twenty-front/src/modules/settings/admin-panel/ai/components/SettingsAdminAiProviderListCard.tsx
+++ b/packages/twenty-front/src/modules/settings/admin-panel/ai/components/SettingsAdminAiProviderListCard.tsx
@@ -9,7 +9,7 @@ import { IconPlug } from 'twenty-ui/icon';
import { themeCssVariables } from 'twenty-ui/theme';
import { type AiProviderItem } from '@/settings/admin-panel/ai/types/AiProviderItem';
-import { getProviderIcon } from '@/settings/admin-panel/ai/utils/getProviderIcon';
+import { getProviderIcon } from '@/ai/utils/getProviderIcon';
import { SettingsCard } from '@/settings/components/SettingsCard';
import { SettingsListCard } from '@/settings/components/SettingsListCard';
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/ai/constants/DataResidencyOptions.ts b/packages/twenty-front/src/modules/settings/admin-panel/ai/constants/DataResidencyOptions.ts
index e99cb1a9f2f..612b6c35332 100644
--- a/packages/twenty-front/src/modules/settings/admin-panel/ai/constants/DataResidencyOptions.ts
+++ b/packages/twenty-front/src/modules/settings/admin-panel/ai/constants/DataResidencyOptions.ts
@@ -1,6 +1,6 @@
import { type DataResidency } from 'twenty-shared/ai';
-import { DATA_RESIDENCY_CONFIG } from '@/settings/admin-panel/ai/constants/DataResidencyConfig';
+import { DATA_RESIDENCY_CONFIG } from '@/ai/constants/DataResidencyConfig';
export const DATA_RESIDENCY_OPTIONS = (
Object.keys(DATA_RESIDENCY_CONFIG) as DataResidency[]
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/ai/utils/getProviderIcon.ts b/packages/twenty-front/src/modules/settings/admin-panel/ai/utils/getProviderIcon.ts
deleted file mode 100644
index aeda00b7d20..00000000000
--- a/packages/twenty-front/src/modules/settings/admin-panel/ai/utils/getProviderIcon.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { type IconComponent } from 'twenty-ui/icon';
-
-import { PROVIDER_ICON_CONFIG } from '@/settings/admin-panel/ai/constants/ProviderConfig';
-import { isKnownProviderId } from '@/settings/admin-panel/ai/utils/isKnownProviderId';
-import { getModelsDevLogoIcon } from '@/settings/admin-panel/ai/utils/getModelsDevLogoIcon';
-
-export const getProviderIcon = (providerType: string): IconComponent =>
- isKnownProviderId(providerType)
- ? PROVIDER_ICON_CONFIG[providerType].Icon
- : getModelsDevLogoIcon(providerType);
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminWorkspaceContent.tsx b/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminWorkspaceContent.tsx
index 8b723567406..8d14ca3aaa7 100644
--- a/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminWorkspaceContent.tsx
+++ b/packages/twenty-front/src/modules/settings/admin-panel/components/SettingsAdminWorkspaceContent.tsx
@@ -31,9 +31,9 @@ import {
import { Status } from 'twenty-ui/primitives/data-display';
import { themeCssVariables } from 'twenty-ui/theme';
import { type GetUpgradeStatusQuery } from '~/generated-admin/graphql';
-import { dateLocaleState } from '~/localization/states/dateLocaleState';
+import { dateLocaleState } from '@/localization/states/dateLocaleState';
import { getAbsoluteImageUrl } from '~/utils/image/getAbsoluteImageUrl';
-import { formatDateTimeString } from '~/utils/string/formatDateTimeString';
+import { formatDateTimeString } from '@/object-record/record-field/ui/utils/formatDateTimeString';
import { getWorkspaceUrl } from '~/utils/getWorkspaceUrl';
type SettingsAdminWorkspaceContentProps = {
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/health-status/components/SettingsAdminWorkspacesStatusSummaryCard.tsx b/packages/twenty-front/src/modules/settings/admin-panel/health-status/components/SettingsAdminWorkspacesStatusSummaryCard.tsx
index b3f42232aca..aa327cdca54 100644
--- a/packages/twenty-front/src/modules/settings/admin-panel/health-status/components/SettingsAdminWorkspacesStatusSummaryCard.tsx
+++ b/packages/twenty-front/src/modules/settings/admin-panel/health-status/components/SettingsAdminWorkspacesStatusSummaryCard.tsx
@@ -13,8 +13,8 @@ import {
IconStatusChange,
IconX,
} from 'twenty-ui/icon';
-import { dateLocaleState } from '~/localization/states/dateLocaleState';
-import { formatDateTimeString } from '~/utils/string/formatDateTimeString';
+import { dateLocaleState } from '@/localization/states/dateLocaleState';
+import { formatDateTimeString } from '@/object-record/record-field/ui/utils/formatDateTimeString';
type SettingsAdminWorkspacesStatusSummaryCardProps = {
behindCount: number;
diff --git a/packages/twenty-front/src/modules/settings/admin-panel/utils/formatSubscriptionItemValue.ts b/packages/twenty-front/src/modules/settings/admin-panel/utils/formatSubscriptionItemValue.ts
index ac92ed2dbf6..75c0f86ba18 100644
--- a/packages/twenty-front/src/modules/settings/admin-panel/utils/formatSubscriptionItemValue.ts
+++ b/packages/twenty-front/src/modules/settings/admin-panel/utils/formatSubscriptionItemValue.ts
@@ -1,7 +1,7 @@
import { plural } from '@lingui/core/macro';
import { isDefined } from 'twenty-shared/utils';
-import { type FormatNumberOptions } from '~/utils/format/formatNumber';
+import { type FormatNumberOptions } from '@/localization/utils/formatNumber';
import { BillingProductKey } from '~/generated-metadata/graphql';
const EM_DASH = '—';
diff --git a/packages/twenty-front/src/modules/settings/ai/components/SettingsAiModelHoverCard.tsx b/packages/twenty-front/src/modules/settings/ai/components/SettingsAiModelHoverCard.tsx
index efe78153f1c..cda2e963277 100644
--- a/packages/twenty-front/src/modules/settings/ai/components/SettingsAiModelHoverCard.tsx
+++ b/packages/twenty-front/src/modules/settings/ai/components/SettingsAiModelHoverCard.tsx
@@ -13,11 +13,11 @@ import {
import { useTheme, themeCssVariables } from 'twenty-ui/theme';
import { type AiModelSummary } from '@/settings/ai/types/AiModelSummary';
-import { getDataResidencyDisplay } from '@/settings/ai/utils/getDataResidencyDisplay';
-import { getModelIcon } from '@/settings/ai/utils/getModelIcon';
+import { getDataResidencyDisplay } from '@/ai/utils/getDataResidencyDisplay';
+import { getModelIcon } from '@/ai/utils/getModelIcon';
import { SettingsTableCard } from '@/settings/components/SettingsTableCard';
import { isDefined } from 'twenty-shared/utils';
-import { formatNumber } from '~/utils/format/formatNumber';
+import { formatNumber } from '@/localization/utils/formatNumber';
const StyledHoverCardWrapper = styled.div`
border-radius: ${themeCssVariables.border.radius.md};
diff --git a/packages/twenty-front/src/modules/settings/ai/components/SettingsAiModelsTable.tsx b/packages/twenty-front/src/modules/settings/ai/components/SettingsAiModelsTable.tsx
index aab11580d41..b3f5aca779b 100644
--- a/packages/twenty-front/src/modules/settings/ai/components/SettingsAiModelsTable.tsx
+++ b/packages/twenty-front/src/modules/settings/ai/components/SettingsAiModelsTable.tsx
@@ -13,7 +13,7 @@ import { useTheme, themeCssVariables } from 'twenty-ui/theme';
import { SettingsAiModelHoverCard } from '@/settings/ai/components/SettingsAiModelHoverCard';
import { type AiModelSummary } from '@/settings/ai/types/AiModelSummary';
-import { getModelIcon } from '@/settings/ai/utils/getModelIcon';
+import { getModelIcon } from '@/ai/utils/getModelIcon';
import { Table } from '@/ui/layout/table/components/Table';
import { TableBody } from '@/ui/layout/table/components/TableBody';
import { TableCell } from '@/ui/layout/table/components/TableCell';
diff --git a/packages/twenty-front/src/modules/settings/components/SettingsProtectedRouteWrapper.tsx b/packages/twenty-front/src/modules/settings/components/SettingsProtectedRouteWrapper.tsx
index 5e40901139a..5a063251127 100644
--- a/packages/twenty-front/src/modules/settings/components/SettingsProtectedRouteWrapper.tsx
+++ b/packages/twenty-front/src/modules/settings/components/SettingsProtectedRouteWrapper.tsx
@@ -1,4 +1,4 @@
-import { WorkspaceRouteUnavailable } from '@/app/routing/components/WorkspaceRouteUnavailable';
+import { WorkspaceRouteUnavailable } from '@/ui/layout/page/components/WorkspaceRouteUnavailable';
import { useIsLogged } from '@/auth/hooks/useIsLogged';
import { useHasPermissionFlag } from '@/settings/roles/hooks/useHasPermissionFlag';
import { useWorkspaceSurface } from '@/ui/layout/hooks/useWorkspaceSurface';
diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldIconLabelForm.tsx b/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldIconLabelForm.tsx
index d72a0d147f5..96a6108d8c9 100644
--- a/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldIconLabelForm.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/fields/forms/components/SettingsDataModelFieldIconLabelForm.tsx
@@ -9,7 +9,7 @@ import { AdvancedSettingsContentWrapperWithDot } from '@/settings/components/Adv
import { AdvancedSettingsWrapper } from '@/settings/components/AdvancedSettingsWrapper';
import { SettingsOptionCardContentSwitch } from '@/settings/components/SettingsOptions/SettingsOptionCardContentSwitch';
import { IDENTIFIER_MAX_CHAR_LENGTH } from 'twenty-shared/metadata';
-import { getErrorMessageFromError } from '@/settings/data-model/fields/forms/utils/errorMessages';
+import { getErrorMessageFromError } from '@/object-metadata/utils/metadataLabelErrorMessages';
import { IconPicker } from '@/ui/input/components/IconPicker';
import { SettingsTextInput } from '@/ui/input/components/SettingsTextInput';
import { TooltipDelay } from '@/ui/layout/tooltip/constants/TooltipDelay';
diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/forms/currency/components/SettingsDataModelFieldCurrencyForm.tsx b/packages/twenty-front/src/modules/settings/data-model/fields/forms/currency/components/SettingsDataModelFieldCurrencyForm.tsx
index 0afaaa3cd4b..9d0ebd37109 100644
--- a/packages/twenty-front/src/modules/settings/data-model/fields/forms/currency/components/SettingsDataModelFieldCurrencyForm.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/fields/forms/currency/components/SettingsDataModelFieldCurrencyForm.tsx
@@ -16,7 +16,7 @@ import { Select } from '@/ui/input/components/Select';
import { plural } from '@lingui/core/macro';
import { useLingui } from '@lingui/react/macro';
import { IconCheckbox, IconCurrencyDollar, IconDecimal } from 'twenty-ui/icon';
-import { DEFAULT_DECIMAL_VALUE } from '~/utils/format/formatNumber';
+import { DEFAULT_DECIMAL_VALUE } from '@/localization/utils/formatNumber';
import { applySimpleQuotesToString } from '~/utils/string/applySimpleQuotesToString';
export const settingsDataModelFieldCurrencyFormSchema = z.object({
diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/forms/currency/hooks/useCurrencySettingsFormInitialValues.ts b/packages/twenty-front/src/modules/settings/data-model/fields/forms/currency/hooks/useCurrencySettingsFormInitialValues.ts
index 880b649aa7b..7abc46933d0 100644
--- a/packages/twenty-front/src/modules/settings/data-model/fields/forms/currency/hooks/useCurrencySettingsFormInitialValues.ts
+++ b/packages/twenty-front/src/modules/settings/data-model/fields/forms/currency/hooks/useCurrencySettingsFormInitialValues.ts
@@ -4,7 +4,7 @@ import { useFieldMetadataItemById } from '@/object-metadata/hooks/useFieldMetada
import { type SettingsDataModelFieldCurrencyFormValues } from '@/settings/data-model/fields/forms/currency/components/SettingsDataModelFieldCurrencyForm';
import { CurrencyCode } from 'twenty-shared/constants';
import { getFieldMetadataItemInitialValues } from '@/settings/data-model/fields/forms/utils/getFieldMetadataItemInitialValues';
-import { DEFAULT_DECIMAL_VALUE } from '~/utils/format/formatNumber';
+import { DEFAULT_DECIMAL_VALUE } from '@/localization/utils/formatNumber';
import { applySimpleQuotesToString } from '~/utils/string/applySimpleQuotesToString';
type UseCurrencySettingsFormInitialValuesArgs = {
diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/forms/number/components/SettingsDataModelFieldNumberForm.tsx b/packages/twenty-front/src/modules/settings/data-model/fields/forms/number/components/SettingsDataModelFieldNumberForm.tsx
index c944a99efa9..89da8ef304f 100644
--- a/packages/twenty-front/src/modules/settings/data-model/fields/forms/number/components/SettingsDataModelFieldNumberForm.tsx
+++ b/packages/twenty-front/src/modules/settings/data-model/fields/forms/number/components/SettingsDataModelFieldNumberForm.tsx
@@ -11,7 +11,7 @@ import { Select } from '@/ui/input/components/Select';
import { plural } from '@lingui/core/macro';
import { useLingui } from '@lingui/react/macro';
import { IconDecimal, IconEye } from 'twenty-ui/icon';
-import { DEFAULT_DECIMAL_VALUE } from '~/utils/format/formatNumber';
+import { DEFAULT_DECIMAL_VALUE } from '@/localization/utils/formatNumber';
export const settingsDataModelFieldNumberFormSchema = z.object({
settings: numberFieldDefaultValueSchema,
diff --git a/packages/twenty-front/src/modules/settings/data-model/fields/forms/utils/getFieldMetadataItemInitialValues.ts b/packages/twenty-front/src/modules/settings/data-model/fields/forms/utils/getFieldMetadataItemInitialValues.ts
index 7747a19f737..34208035899 100644
--- a/packages/twenty-front/src/modules/settings/data-model/fields/forms/utils/getFieldMetadataItemInitialValues.ts
+++ b/packages/twenty-front/src/modules/settings/data-model/fields/forms/utils/getFieldMetadataItemInitialValues.ts
@@ -2,7 +2,7 @@ import { type FieldMetadataItem } from '@/object-metadata/types/FieldMetadataIte
import { isNonEmptyString } from '@sniptt/guards';
import { CurrencyCode } from 'twenty-shared/constants';
import { FieldMetadataType } from '~/generated-metadata/graphql';
-import { DEFAULT_DECIMAL_VALUE } from '~/utils/format/formatNumber';
+import { DEFAULT_DECIMAL_VALUE } from '@/localization/utils/formatNumber';
import { applySimpleQuotesToString } from '~/utils/string/applySimpleQuotesToString';
export const getFieldMetadataItemInitialValues = (
diff --git a/packages/twenty-front/src/modules/settings/data-model/object-details/hooks/useSaveUpdateDataModelObjectAboutForm.ts b/packages/twenty-front/src/modules/settings/data-model/object-details/hooks/useSaveUpdateDataModelObjectAboutForm.ts
index cc2f99aa586..0d1d19c2244 100644
--- a/packages/twenty-front/src/modules/settings/data-model/object-details/hooks/useSaveUpdateDataModelObjectAboutForm.ts
+++ b/packages/twenty-front/src/modules/settings/data-model/object-details/hooks/useSaveUpdateDataModelObjectAboutForm.ts
@@ -16,7 +16,7 @@ import { SOURCE_LOCALE } from 'twenty-shared/translations';
import { SettingsPath } from 'twenty-shared/types';
import { isDefined } from 'twenty-shared/utils';
import { getObjectColorWithFallback } from '@/object-metadata/utils/getObjectColorWithFallback';
-import { useLocaleOptions } from '~/localization/hooks/useLocaleOptions';
+import { useLocaleOptions } from '@/localization/hooks/useLocaleOptions';
import { MetadataTranslationsDocument } from '~/generated-metadata/graphql';
import { useNavigateSettings } from '~/hooks/useNavigateSettings';
import { updatedObjectNamePluralState } from '@/settings/data-model/object-details/states/updatedObjectNamePluralState';
diff --git a/packages/twenty-front/src/modules/settings/experience/components/DateTimeSettingsTimeZoneSelect.tsx b/packages/twenty-front/src/modules/settings/experience/components/DateTimeSettingsTimeZoneSelect.tsx
index bc217b5a08f..3ab7a5537bf 100644
--- a/packages/twenty-front/src/modules/settings/experience/components/DateTimeSettingsTimeZoneSelect.tsx
+++ b/packages/twenty-front/src/modules/settings/experience/components/DateTimeSettingsTimeZoneSelect.tsx
@@ -1,6 +1,6 @@
import { detectTimeZone } from '@/localization/utils/detection/detectTimeZone';
import { findAvailableTimeZoneOption } from '@/localization/utils/findAvailableTimeZoneOption';
-import { AVAILABLE_TIMEZONE_OPTIONS } from '@/settings/experience/constants/AvailableTimezoneOptions';
+import { AVAILABLE_TIMEZONE_OPTIONS } from '@/localization/constants/AvailableTimezoneOptions';
import { Select } from '@/ui/input/components/Select';
import { t } from '@lingui/core/macro';
import { type SelectOption } from 'twenty-ui/primitives/input';
diff --git a/packages/twenty-front/src/modules/settings/experience/components/NumberFormatSelect.tsx b/packages/twenty-front/src/modules/settings/experience/components/NumberFormatSelect.tsx
index b5011c8e52b..838ccacdb73 100644
--- a/packages/twenty-front/src/modules/settings/experience/components/NumberFormatSelect.tsx
+++ b/packages/twenty-front/src/modules/settings/experience/components/NumberFormatSelect.tsx
@@ -2,7 +2,7 @@ import { NumberFormat } from '@/localization/constants/NumberFormat';
import { detectNumberFormat } from '@/localization/utils/detection/detectNumberFormat';
import { Select } from '@/ui/input/components/Select';
import { useLingui } from '@lingui/react/macro';
-import { formatNumber as utilFormatNumber } from '~/utils/format/formatNumber';
+import { formatNumber as utilFormatNumber } from '@/localization/utils/formatNumber';
type NumberFormatSelectProps = {
value: NumberFormat;
diff --git a/packages/twenty-front/src/modules/settings/hooks/useGetAddedRelativeDateDescription.ts b/packages/twenty-front/src/modules/settings/hooks/useGetAddedRelativeDateDescription.ts
index 3327caaf0c6..6dd1eeb6ca8 100644
--- a/packages/twenty-front/src/modules/settings/hooks/useGetAddedRelativeDateDescription.ts
+++ b/packages/twenty-front/src/modules/settings/hooks/useGetAddedRelativeDateDescription.ts
@@ -1,6 +1,6 @@
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { useLingui } from '@lingui/react/macro';
-import { dateLocaleState } from '~/localization/states/dateLocaleState';
+import { dateLocaleState } from '@/localization/states/dateLocaleState';
import { beautifyPastDateRelativeToNow } from '~/utils/date-utils';
export const useGetAddedRelativeDateDescription = () => {
diff --git a/packages/twenty-front/src/modules/settings/logic-functions/components/triggers/SettingsLogicFunctionHttpTriggerSection.tsx b/packages/twenty-front/src/modules/settings/logic-functions/components/triggers/SettingsLogicFunctionHttpTriggerSection.tsx
index f51ff9778f2..e5d9bfb175b 100644
--- a/packages/twenty-front/src/modules/settings/logic-functions/components/triggers/SettingsLogicFunctionHttpTriggerSection.tsx
+++ b/packages/twenty-front/src/modules/settings/logic-functions/components/triggers/SettingsLogicFunctionHttpTriggerSection.tsx
@@ -20,7 +20,7 @@ import {
} from 'twenty-ui/icon';
import { Switch } from 'twenty-ui/primitives/input';
import { themeCssVariables } from 'twenty-ui/theme';
-import { useGetLogicFunctionHttpUrl } from '@/settings/logic-functions/hooks/useGetLogicFunctionHttpUrl';
+import { useGetLogicFunctionHttpUrl } from '@/logic-functions/hooks/useGetLogicFunctionHttpUrl';
import { useCopyToClipboard } from '~/hooks/useCopyToClipboard';
const HTTP_METHOD_OPTIONS: Array<{
diff --git a/packages/twenty-front/src/modules/settings/profile/devices/components/SettingsProfileDevicesSection.tsx b/packages/twenty-front/src/modules/settings/profile/devices/components/SettingsProfileDevicesSection.tsx
index 61252f02b83..703184e525d 100644
--- a/packages/twenty-front/src/modules/settings/profile/devices/components/SettingsProfileDevicesSection.tsx
+++ b/packages/twenty-front/src/modules/settings/profile/devices/components/SettingsProfileDevicesSection.tsx
@@ -18,7 +18,7 @@ import {
type CurrentUserSessionsQuery,
RevokeAllOtherUserSessionsDocument,
} from '~/generated-metadata/graphql';
-import { dateLocaleState } from '~/localization/states/dateLocaleState';
+import { dateLocaleState } from '@/localization/states/dateLocaleState';
import { beautifyPastDateRelativeToNow } from '~/utils/date-utils';
type UserSessionListItem =
diff --git a/packages/twenty-front/src/modules/settings/roles/components/SettingsRoleRouteGuard.tsx b/packages/twenty-front/src/modules/settings/roles/components/SettingsRoleRouteGuard.tsx
index 8aebcc2f5db..0db1edfd1f2 100644
--- a/packages/twenty-front/src/modules/settings/roles/components/SettingsRoleRouteGuard.tsx
+++ b/packages/twenty-front/src/modules/settings/roles/components/SettingsRoleRouteGuard.tsx
@@ -1,6 +1,6 @@
import { type ReactNode } from 'react';
-import { WorkspaceRouteUnavailable } from '@/app/routing/components/WorkspaceRouteUnavailable';
+import { WorkspaceRouteUnavailable } from '@/ui/layout/page/components/WorkspaceRouteUnavailable';
import { SettingsSkeletonLoader } from '@/settings/components/SettingsSkeletonLoader';
import { SettingsRolesQueryEffect } from '@/settings/roles/components/SettingsRolesQueryEffect';
import { settingsDraftRoleFamilyState } from '@/settings/roles/states/settingsDraftRoleFamilyState';
diff --git a/packages/twenty-front/src/modules/settings/roles/components/__tests__/SettingsRoleRouteGuard.test.tsx b/packages/twenty-front/src/modules/settings/roles/components/__tests__/SettingsRoleRouteGuard.test.tsx
index f655ad80ea0..45f773bafad 100644
--- a/packages/twenty-front/src/modules/settings/roles/components/__tests__/SettingsRoleRouteGuard.test.tsx
+++ b/packages/twenty-front/src/modules/settings/roles/components/__tests__/SettingsRoleRouteGuard.test.tsx
@@ -18,7 +18,7 @@ jest.mock('@/settings/roles/components/SettingsRolesQueryEffect', () => ({
SettingsRolesQueryEffect: () => null,
}));
-jest.mock('@/app/routing/components/WorkspaceRouteUnavailable', () => ({
+jest.mock('@/ui/layout/page/components/WorkspaceRouteUnavailable', () => ({
WorkspaceRouteUnavailable: () => <div data-testid="route-unavailable" />,
}));
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 b8e8b193674..0f5633f85b8 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
@@ -12,9 +12,9 @@ import { IconKey, useIcons } from 'twenty-ui/icon';
import { Avatar } from 'twenty-ui/primitives/data-display';
import { useTheme, themeCssVariables } from 'twenty-ui/theme';
import { type Agent, type ApiKeyForRole } from '~/generated-metadata/graphql';
-import { dateLocaleState } from '~/localization/states/dateLocaleState';
+import { dateLocaleState } from '@/localization/states/dateLocaleState';
import { getAbsoluteImageUrl } from '~/utils/image/getAbsoluteImageUrl';
-import { formatDateString } from '~/utils/string/formatDateString';
+import { formatDateString } from '@/object-record/record-field/ui/utils/formatDateString';
const StyledIconWrapper = styled.div`
align-items: center;
diff --git a/packages/twenty-front/src/modules/settings/roles/role/components/__tests__/SettingsRole.test.tsx b/packages/twenty-front/src/modules/settings/roles/role/components/__tests__/SettingsRole.test.tsx
index cdf5be63ec2..68cae973c62 100644
--- a/packages/twenty-front/src/modules/settings/roles/role/components/__tests__/SettingsRole.test.tsx
+++ b/packages/twenty-front/src/modules/settings/roles/role/components/__tests__/SettingsRole.test.tsx
@@ -24,7 +24,7 @@ jest.mock('@/settings/roles/components/SettingsRolesQueryEffect', () => ({
SettingsRolesQueryEffect: () => null,
}));
-jest.mock('@/app/routing/components/WorkspaceRouteUnavailable', () => ({
+jest.mock('@/ui/layout/page/components/WorkspaceRouteUnavailable', () => ({
WorkspaceRouteUnavailable: () => <div>Role unavailable</div>,
}));
diff --git a/packages/twenty-front/src/modules/settings/translations/components/SettingsMetadataTranslationsSection.tsx b/packages/twenty-front/src/modules/settings/translations/components/SettingsMetadataTranslationsSection.tsx
index 230701901cd..71a18b8d83c 100644
--- a/packages/twenty-front/src/modules/settings/translations/components/SettingsMetadataTranslationsSection.tsx
+++ b/packages/twenty-front/src/modules/settings/translations/components/SettingsMetadataTranslationsSection.tsx
@@ -9,7 +9,7 @@ import { Section } from 'twenty-ui/components/layout';
import { IconSearch } from 'twenty-ui/icon';
import { themeCssVariables } from 'twenty-ui/theme';
import { type MetadataTranslationsInput } from '~/generated-metadata/graphql';
-import { useLocaleOptions } from '~/localization/hooks/useLocaleOptions';
+import { useLocaleOptions } from '@/localization/hooks/useLocaleOptions';
import { normalizeSearchText } from 'twenty-ui/utilities';
const StyledSearchInputContainer = styled.div`
diff --git a/packages/twenty-front/src/modules/settings/translations/utils/__tests__/buildMetadataTranslationsTable.test.ts b/packages/twenty-front/src/modules/settings/translations/utils/__tests__/buildMetadataTranslationsTable.test.ts
index 426ae360f28..3af0d956139 100644
--- a/packages/twenty-front/src/modules/settings/translations/utils/__tests__/buildMetadataTranslationsTable.test.ts
+++ b/packages/twenty-front/src/modules/settings/translations/utils/__tests__/buildMetadataTranslationsTable.test.ts
@@ -1,7 +1,7 @@
import { type MetadataTranslationRow } from '@/settings/translations/hooks/useMetadataTranslations';
import { buildMetadataTranslationsTable } from '@/settings/translations/utils/buildMetadataTranslationsTable';
import { MetadataTranslationProvenance } from '~/generated-metadata/graphql';
-import { type LocaleOption } from '~/localization/hooks/useLocaleOptions';
+import { type LocaleOption } from '@/localization/hooks/useLocaleOptions';
const buildTranslation = ({
property,
diff --git a/packages/twenty-front/src/modules/settings/translations/utils/buildMetadataTranslationsTable.ts b/packages/twenty-front/src/modules/settings/translations/utils/buildMetadataTranslationsTable.ts
index 9e994c772d9..82427ae1148 100644
--- a/packages/twenty-front/src/modules/settings/translations/utils/buildMetadataTranslationsTable.ts
+++ b/packages/twenty-front/src/modules/settings/translations/utils/buildMetadataTranslationsTable.ts
@@ -1,7 +1,7 @@
import { type MetadataTranslationRow } from '@/settings/translations/hooks/useMetadataTranslations';
import { type MetadataTranslationLanguageRow } from '@/settings/translations/types/MetadataTranslationLanguageRow';
import { isDefined } from 'twenty-shared/utils';
-import { type LocaleOption } from '~/localization/hooks/useLocaleOptions';
+import { type LocaleOption } from '@/localization/hooks/useLocaleOptions';
const DESCRIPTION_PROPERTY = 'description';
diff --git a/packages/twenty-front/src/modules/side-panel/pages/send-campaign/components/SendCampaignForm.tsx b/packages/twenty-front/src/modules/side-panel/pages/send-campaign/components/SendCampaignForm.tsx
index 623347bf793..1335cd91794 100644
--- a/packages/twenty-front/src/modules/side-panel/pages/send-campaign/components/SendCampaignForm.tsx
+++ b/packages/twenty-front/src/modules/side-panel/pages/send-campaign/components/SendCampaignForm.tsx
@@ -30,7 +30,7 @@ import { buildCampaignSendButtonTitle } from '@/side-panel/pages/send-campaign/u
import { Select } from '@/ui/input/components/Select';
import { SidePanelFooter } from '@/ui/layout/side-panel/components/SidePanelFooter';
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
-import { dateLocaleState } from '~/localization/states/dateLocaleState';
+import { dateLocaleState } from '@/localization/states/dateLocaleState';
const StyledContainer = styled.div`
display: flex;
diff --git a/packages/twenty-front/src/modules/side-panel/routing/components/SidePanelRoutedPage.tsx b/packages/twenty-front/src/modules/side-panel/routing/components/SidePanelRoutedPage.tsx
index 8865ec0b45a..de4739c223d 100644
--- a/packages/twenty-front/src/modules/side-panel/routing/components/SidePanelRoutedPage.tsx
+++ b/packages/twenty-front/src/modules/side-panel/routing/components/SidePanelRoutedPage.tsx
@@ -3,7 +3,7 @@ import { isDefined } from 'twenty-shared/utils';
import { Trans } from '@lingui/react/macro';
import { WorkspaceRoutes } from '@/app/routing/components/WorkspaceRoutes';
-import { WorkspaceRouteUnavailable } from '@/app/routing/components/WorkspaceRouteUnavailable';
+import { WorkspaceRouteUnavailable } from '@/ui/layout/page/components/WorkspaceRouteUnavailable';
import { ContextStoreComponentInstanceContext } from '@/context-store/states/contexts/ContextStoreComponentInstanceContext';
import { AppErrorBoundary } from '@/error-handler/components/AppErrorBoundary';
import { SidePanelRouteNavigatorProvider } from '@/side-panel/routing/components/SidePanelRouteNavigatorProvider';
diff --git a/packages/twenty-front/src/modules/side-panel/routing/components/__tests__/SidePanelPathRestore.test.tsx b/packages/twenty-front/src/modules/side-panel/routing/components/__tests__/SidePanelPathRestore.test.tsx
index c1d454a34e9..8a30bedd19c 100644
--- a/packages/twenty-front/src/modules/side-panel/routing/components/__tests__/SidePanelPathRestore.test.tsx
+++ b/packages/twenty-front/src/modules/side-panel/routing/components/__tests__/SidePanelPathRestore.test.tsx
@@ -21,7 +21,7 @@ import { getJestMetadataAndApolloMocksWrapper } from '~/testing/jest/getJestMeta
import { getMockFieldMetadataItemOrThrow } from '~/testing/utils/getMockFieldMetadataItemOrThrow';
import { getMockObjectMetadataItemOrThrow } from '~/testing/utils/getMockObjectMetadataItemOrThrow';
-jest.mock('~/hooks/usePageChangeEffectNavigateLocation', () => ({
+jest.mock('@/app/hooks/usePageChangeEffectNavigateLocation', () => ({
usePageChangeEffectNavigateLocation: () => undefined,
}));
diff --git a/packages/twenty-front/src/modules/side-panel/routing/components/__tests__/SidePanelRoutedPage.test.tsx b/packages/twenty-front/src/modules/side-panel/routing/components/__tests__/SidePanelRoutedPage.test.tsx
index cc634aa8a78..5946b85ebe4 100644
--- a/packages/twenty-front/src/modules/side-panel/routing/components/__tests__/SidePanelRoutedPage.test.tsx
+++ b/packages/twenty-front/src/modules/side-panel/routing/components/__tests__/SidePanelRoutedPage.test.tsx
@@ -1,6 +1,5 @@
import { render, screen } from '@testing-library/react';
import { type FallbackProps } from 'react-error-boundary';
-
import { SidePanelRoutedPage } from '@/side-panel/routing/components/SidePanelRoutedPage';
let mockLocation = {
@@ -44,7 +43,7 @@ jest.mock('@/app/routing/components/WorkspaceRoutes', () => ({
},
}));
-jest.mock('@/app/routing/components/WorkspaceRouteUnavailable', () => ({
+jest.mock('@/ui/layout/page/components/WorkspaceRouteUnavailable', () => ({
WorkspaceRouteUnavailable: () => <div data-testid="route-unavailable" />,
}));
diff --git a/packages/twenty-front/src/modules/ui/field/display/components/CurrencyDisplay.tsx b/packages/twenty-front/src/modules/ui/field/display/components/CurrencyDisplay.tsx
index 0e817a2839f..ef159c0c923 100644
--- a/packages/twenty-front/src/modules/ui/field/display/components/CurrencyDisplay.tsx
+++ b/packages/twenty-front/src/modules/ui/field/display/components/CurrencyDisplay.tsx
@@ -13,7 +13,7 @@ import { CURRENCY_CODE_LABELS } from 'twenty-shared/constants';
import { CURRENCY_CODE_ICONS } from '@/ui/input/components/internal/currency/constants/CurrencyCodeIcons';
import { EllipsisDisplay } from '@/ui/field/display/components/internal/EllipsisDisplay/EllipsisDisplay';
import { TooltipDelay } from '@/ui/layout/tooltip/constants/TooltipDelay';
-import { DEFAULT_DECIMAL_VALUE } from '~/utils/format/formatNumber';
+import { DEFAULT_DECIMAL_VALUE } from '@/localization/utils/formatNumber';
const StyledCurrencyIconContainer = styled.span`
align-items: center;
diff --git a/packages/twenty-front/src/modules/ui/field/display/components/DateDisplay.tsx b/packages/twenty-front/src/modules/ui/field/display/components/DateDisplay.tsx
index f77ddf2f1ca..a3e9386e67c 100644
--- a/packages/twenty-front/src/modules/ui/field/display/components/DateDisplay.tsx
+++ b/packages/twenty-front/src/modules/ui/field/display/components/DateDisplay.tsx
@@ -3,8 +3,8 @@ import { EllipsisDisplay } from '@/ui/field/display/components/internal/Ellipsis
import { useAtomStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomStateValue';
import { UserContext } from '@/users/contexts/UserContext';
import { useContext } from 'react';
-import { dateLocaleState } from '~/localization/states/dateLocaleState';
-import { formatDateString } from '~/utils/string/formatDateString';
+import { dateLocaleState } from '@/localization/states/dateLocaleState';
+import { formatDateString } from '@/object-record/record-field/ui/utils/formatDateString';
type DateDisplayProps = {
value: string | null | undefined;
diff --git a/packages/twenty-front/src/modules/ui/field/display/components/DateTimeDisplay.tsx b/packages/twenty-front/src/modules/ui/field/display/components/DateTimeDisplay.tsx
index 3ff8b9aad01..afa2c0b9716 100644
--- a/packages/twenty-front/src/modules/ui/field/display/components/DateTimeDisplay.tsx
+++ b/packages/twenty-front/src/modules/ui/field/display/components/DateTimeDisplay.tsx
@@ -8,8 +8,8 @@ import { isNonEmptyString } from '@sniptt/guards';
import { useContext } from 'react';
import { Temporal } from 'temporal-polyfill';
import { themeCssVariables } from 'twenty-ui/theme';
-import { dateLocaleState } from '~/localization/states/dateLocaleState';
-import { formatDateTimeString } from '~/utils/string/formatDateTimeString';
+import { dateLocaleState } from '@/localization/states/dateLocaleState';
+import { formatDateTimeString } from '@/object-record/record-field/ui/utils/formatDateTimeString';
const StyledTimeZoneSpacer = styled.span`
min-width: ${themeCssVariables.spacing[1]};
diff --git a/packages/twenty-front/src/modules/ui/field/display/components/LinkDisplay.tsx b/packages/twenty-front/src/modules/ui/field/display/components/LinkDisplay.tsx
index 136c0a8475e..66e5269c519 100644
--- a/packages/twenty-front/src/modules/ui/field/display/components/LinkDisplay.tsx
+++ b/packages/twenty-front/src/modules/ui/field/display/components/LinkDisplay.tsx
@@ -2,8 +2,8 @@ import { SocialLink } from '@/ui/field/display/components/SocialLink/SocialLink'
import { isNonEmptyString } from '@sniptt/guards';
import { getSafeUrl } from 'twenty-shared/utils';
import { RoundedLink } from '@/ui/navigation/link/components/RoundedLink/RoundedLink';
-import { checkUrlType } from '~/utils/checkUrlType';
-import { isSocialLinkType } from '~/utils/isSocialLinkType';
+import { checkUrlType } from '@/ui/field/display/utils/checkUrlType';
+import { isSocialLinkType } from '@/ui/field/display/utils/isSocialLinkType';
type LinkDisplayProps = {
value: { url: string; label?: string | null };
diff --git a/packages/twenty-front/src/modules/ui/field/display/components/LinksDisplay.tsx b/packages/twenty-front/src/modules/ui/field/display/components/LinksDisplay.tsx
index 5027017a4cc..7ed46d918ac 100644
--- a/packages/twenty-front/src/modules/ui/field/display/components/LinksDisplay.tsx
+++ b/packages/twenty-front/src/modules/ui/field/display/components/LinksDisplay.tsx
@@ -11,8 +11,8 @@ import {
isDefined,
} from 'twenty-shared/utils';
import { RoundedLink } from '@/ui/navigation/link/components/RoundedLink/RoundedLink';
-import { checkUrlType } from '~/utils/checkUrlType';
-import { isSocialLinkType } from '~/utils/isSocialLinkType';
+import { checkUrlType } from '@/ui/field/display/utils/checkUrlType';
+import { isSocialLinkType } from '@/ui/field/display/utils/isSocialLinkType';
type LinksDisplayProps = {
value?: FieldLinksValue;
diff --git a/packages/twenty-front/src/utils/__tests__/checkUrlType.test.ts b/packages/twenty-front/src/modules/ui/field/display/utils/__tests__/checkUrlType.test.ts
similarity index 96%
rename from packages/twenty-front/src/utils/__tests__/checkUrlType.test.ts
rename to packages/twenty-front/src/modules/ui/field/display/utils/__tests__/checkUrlType.test.ts
index 70a297239a5..211612373e0 100644
--- a/packages/twenty-front/src/utils/__tests__/checkUrlType.test.ts
+++ b/packages/twenty-front/src/modules/ui/field/display/utils/__tests__/checkUrlType.test.ts
@@ -1,5 +1,5 @@
import { LinkType } from '@/ui/field/display/components/SocialLink/LinkType';
-import { checkUrlType } from '~/utils/checkUrlType';
+import { checkUrlType } from '@/ui/field/display/utils/checkUrlType';
describe('checkUrlType', () => {
it('should detect LinkedIn urls', () => {
diff --git a/packages/twenty-front/src/utils/__tests__/isSocialLinkType.test.ts b/packages/twenty-front/src/modules/ui/field/display/utils/__tests__/isSocialLinkType.test.ts
similarity index 89%
rename from packages/twenty-front/src/utils/__tests__/isSocialLinkType.test.ts
rename to packages/twenty-front/src/modules/ui/field/display/utils/__tests__/isSocialLinkType.test.ts
index 3cff93fbb4d..8d1984a5920 100644
--- a/packages/twenty-front/src/utils/__tests__/isSocialLinkType.test.ts
+++ b/packages/twenty-front/src/modules/ui/field/display/utils/__tests__/isSocialLinkType.test.ts
@@ -1,5 +1,5 @@
import { LinkType } from '@/ui/field/display/components/SocialLink/LinkType';
-import { isSocialLinkType } from '~/utils/isSocialLinkType';
+import { isSocialLinkType } from '@/ui/field/display/utils/isSocialLinkType';
describe('isSocialLinkType', () => {
it('should return true for social link types', () => {
diff --git a/packages/twenty-front/src/utils/checkUrlType.ts b/packages/twenty-front/src/modules/ui/field/display/utils/checkUrlType.ts
similarity index 100%
rename from packages/twenty-front/src/utils/checkUrlType.ts
rename to packages/twenty-front/src/modules/ui/field/display/utils/checkUrlType.ts
diff --git a/packages/twenty-front/src/utils/isSocialLinkType.ts b/packages/twenty-front/src/modules/ui/field/display/utils/isSocialLinkType.ts
similarity index 100%
rename from packages/twenty-front/src/utils/isSocialLinkType.ts
rename to packages/twenty-front/src/modules/ui/field/display/utils/isSocialLinkType.ts
diff --git a/packages/twenty-front/src/modules/ui/field/input/components/CurrencyInput.tsx b/packages/twenty-front/src/modules/ui/field/input/components/CurrencyInput.tsx
index b39a0258972..e95adcc9385 100644
--- a/packages/twenty-front/src/modules/ui/field/input/components/CurrencyInput.tsx
+++ b/packages/twenty-front/src/modules/ui/field/input/components/CurrencyInput.tsx
@@ -9,7 +9,7 @@ import { CurrencyPickerDropdownButton } from '@/ui/input/components/internal/cur
import { CURRENCY_MICROS_DECIMAL_PLACES } from '@/ui/field/input/constants/CurrencyMicrosDecimalPlaces';
import { IMaskInput } from 'react-imask';
import { useTheme, themeCssVariables } from 'twenty-ui/theme';
-import { getSeparatorsForNumberFormat } from '~/utils/format/getSeparatorsForNumberFormat';
+import { getSeparatorsForNumberFormat } from '@/localization/utils/getSeparatorsForNumberFormat';
export const StyledIMaskInput = styled.div`
display: contents;
diff --git a/packages/twenty-front/src/modules/app/routing/components/WorkspaceRouteUnavailable.tsx b/packages/twenty-front/src/modules/ui/layout/page/components/WorkspaceRouteUnavailable.tsx
similarity index 100%
rename from packages/twenty-front/src/modules/app/routing/components/WorkspaceRouteUnavailable.tsx
rename to packages/twenty-front/src/modules/ui/layout/page/components/WorkspaceRouteUnavailable.tsx
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/ai-agent-action/components/WorkflowRunStepLogsAiAgentDetail.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/ai-agent-action/components/WorkflowRunStepLogsAiAgentDetail.tsx
index 3d80207b9d3..b9b2bc74c38 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/ai-agent-action/components/WorkflowRunStepLogsAiAgentDetail.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/ai-agent-action/components/WorkflowRunStepLogsAiAgentDetail.tsx
@@ -29,7 +29,7 @@ import {
StyledTitle,
} from '@/workflow/workflow-steps/workflow-actions/components/workflowRunStepLogsStyles';
import { WorkflowRunStepLogsToolCallRow } from '@/workflow/workflow-steps/workflow-actions/ai-agent-action/components/WorkflowRunStepLogsToolCallRow';
-import { formatNumber } from '~/utils/format/formatNumber';
+import { formatNumber } from '@/localization/utils/formatNumber';
const StyledModelBadge = styled.span`
background: ${themeCssVariables.background.transparent.light};
diff --git a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionCreateCalendarEvent.tsx b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionCreateCalendarEvent.tsx
index 67cb5063c25..9dee217fb0c 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionCreateCalendarEvent.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-steps/workflow-actions/components/WorkflowEditActionCreateCalendarEvent.tsx
@@ -7,7 +7,7 @@ import { FormSelectFieldInput } from '@/object-record/record-field/ui/form-types
import { FormTextFieldInput } from '@/object-record/record-field/ui/form-types/components/FormTextFieldInput';
import { useMyConnectedAccounts } from '@/settings/accounts/hooks/useMyConnectedAccounts';
import { useTriggerApisOAuth } from '@/settings/accounts/hooks/useTriggerApiOAuth';
-import { AVAILABLE_TIMEZONE_OPTIONS } from '@/settings/experience/constants/AvailableTimezoneOptions';
+import { AVAILABLE_TIMEZONE_OPTIONS } from '@/localization/constants/AvailableTimezoneOptions';
import { useHasPermissionFlag } from '@/settings/roles/hooks/useHasPermissionFlag';
import { useSidePanelMenu } from '@/side-panel/hooks/useSidePanelMenu';
import { useAtomComponentStateValue } from '@/ui/utilities/state/jotai/hooks/useAtomComponentStateValue';
diff --git a/packages/twenty-front/src/modules/workflow/workflow-trigger/components/CronExpressionHelper.tsx b/packages/twenty-front/src/modules/workflow/workflow-trigger/components/CronExpressionHelper.tsx
index 0da89ebb0f0..0c8b9fcca02 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-trigger/components/CronExpressionHelper.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-trigger/components/CronExpressionHelper.tsx
@@ -10,8 +10,8 @@ import { styled } from '@linaria/react';
import { t } from '@lingui/core/macro';
import { CronExpressionParser } from 'cron-parser';
import { themeCssVariables } from 'twenty-ui/theme';
-import { dateLocaleState } from '~/localization/states/dateLocaleState';
-import { formatDateTimeString } from '~/utils/string/formatDateTimeString';
+import { dateLocaleState } from '@/localization/states/dateLocaleState';
+import { formatDateTimeString } from '@/object-record/record-field/ui/utils/formatDateTimeString';
const getNextExecutions = (
cronExpression: string,
diff --git a/packages/twenty-front/src/modules/workflow/workflow-trigger/components/WorkflowEditTriggerCronForm.tsx b/packages/twenty-front/src/modules/workflow/workflow-trigger/components/WorkflowEditTriggerCronForm.tsx
index 7b855eb4a3d..571ac06a5b0 100644
--- a/packages/twenty-front/src/modules/workflow/workflow-trigger/components/WorkflowEditTriggerCronForm.tsx
+++ b/packages/twenty-front/src/modules/workflow/workflow-trigger/components/WorkflowEditTriggerCronForm.tsx
@@ -17,7 +17,7 @@ import { isNumber } from '@sniptt/guards';
import { useState } from 'react';
import { isDefined } from 'twenty-shared/utils';
import { TRIGGER_STEP_ID } from 'twenty-shared/workflow';
-import { dateLocaleState } from '~/localization/states/dateLocaleState';
+import { dateLocaleState } from '@/localization/states/dateLocaleState';
type WorkflowEditTriggerCronFormProps = {
trigger: WorkflowCronTrigger;
diff --git a/packages/twenty-front/src/pages/object-core/WorkflowCoreShowPage.tsx b/packages/twenty-front/src/pages/object-core/WorkflowCoreShowPage.tsx
index c6b38ee6ff6..5b83eec3e9c 100644
--- a/packages/twenty-front/src/pages/object-core/WorkflowCoreShowPage.tsx
+++ b/packages/twenty-front/src/pages/object-core/WorkflowCoreShowPage.tsx
@@ -14,7 +14,7 @@ import { getAppPath, isDefined } from 'twenty-shared/utils';
import { Button } from 'twenty-ui/primitives/input';
import { themeCssVariables } from 'twenty-ui/theme';
-import { WorkspaceRouteUnavailable } from '@/app/routing/components/WorkspaceRouteUnavailable';
+import { WorkspaceRouteUnavailable } from '@/ui/layout/page/components/WorkspaceRouteUnavailable';
import { RecordShowCommandMenu } from '@/command-menu-item/components/RecordShowCommandMenu';
import { CommandMenuComponentInstanceContext } from '@/command-menu/states/contexts/CommandMenuComponentInstanceContext';
import { useCoreWorkflowShowPageResource } from '@/object-core/workflows/hooks/useCoreWorkflowShowPageResource';
diff --git a/packages/twenty-front/src/pages/object-record/RecordIndexPage.tsx b/packages/twenty-front/src/pages/object-record/RecordIndexPage.tsx
index cbec90bebb2..e84790298b5 100644
--- a/packages/twenty-front/src/pages/object-record/RecordIndexPage.tsx
+++ b/packages/twenty-front/src/pages/object-record/RecordIndexPage.tsx
@@ -1,4 +1,4 @@
-import { WorkspaceRouteUnavailable } from '@/app/routing/components/WorkspaceRouteUnavailable';
+import { WorkspaceRouteUnavailable } from '@/ui/layout/page/components/WorkspaceRouteUnavailable';
import { contextStoreCurrentObjectMetadataItemIdComponentState } from '@/context-store/states/contextStoreCurrentObjectMetadataItemIdComponentState';
import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';
import { RecordIndexContainerGater } from '@/object-record/record-index/components/RecordIndexContainerGater';
diff --git a/packages/twenty-front/src/pages/object-record/RecordShowPage.tsx b/packages/twenty-front/src/pages/object-record/RecordShowPage.tsx
index 6b11c9bb795..5f27d9bc7f2 100644
--- a/packages/twenty-front/src/pages/object-record/RecordShowPage.tsx
+++ b/packages/twenty-front/src/pages/object-record/RecordShowPage.tsx
@@ -6,7 +6,7 @@ import {
} from 'twenty-shared/types';
import { getAppPath, isDefined } from 'twenty-shared/utils';
-import { WorkspaceRouteUnavailable } from '@/app/routing/components/WorkspaceRouteUnavailable';
+import { WorkspaceRouteUnavailable } from '@/ui/layout/page/components/WorkspaceRouteUnavailable';
import { findCoreObjectShowPage } from '@/object-core/utils/findCoreObjectShowPage';
import { isWorkspaceWorkflowVersionRouteHidden } from '@/object-core/workflows/utils/isWorkspaceWorkflowVersionRouteHidden';
import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';
diff --git a/packages/twenty-front/src/pages/object-record/RecordShowPageShell.tsx b/packages/twenty-front/src/pages/object-record/RecordShowPageShell.tsx
index 68740dbf3da..7599b99ffcc 100644
--- a/packages/twenty-front/src/pages/object-record/RecordShowPageShell.tsx
+++ b/packages/twenty-front/src/pages/object-record/RecordShowPageShell.tsx
@@ -3,7 +3,7 @@ import { type ReactNode } from 'react';
import { isDefined } from 'twenty-shared/utils';
import { TimelineActivityContext } from '@/activities/timeline-activities/contexts/TimelineActivityContext';
-import { WorkspaceRouteUnavailable } from '@/app/routing/components/WorkspaceRouteUnavailable';
+import { WorkspaceRouteUnavailable } from '@/ui/layout/page/components/WorkspaceRouteUnavailable';
import { RecordShowCommandMenu } from '@/command-menu-item/components/RecordShowCommandMenu';
import { CommandMenuComponentInstanceContext } from '@/command-menu/states/contexts/CommandMenuComponentInstanceContext';
import { isLayoutCustomizationModeEnabledState } from '@/layout-customization/states/isLayoutCustomizationModeEnabledState';
diff --git a/packages/twenty-front/src/pages/object-record/__tests__/RecordIndexPage.surface.test.tsx b/packages/twenty-front/src/pages/object-record/__tests__/RecordIndexPage.surface.test.tsx
index f123549694f..4bc933af68e 100644
--- a/packages/twenty-front/src/pages/object-record/__tests__/RecordIndexPage.surface.test.tsx
+++ b/packages/twenty-front/src/pages/object-record/__tests__/RecordIndexPage.surface.test.tsx
@@ -54,7 +54,7 @@ jest.mock('@/ui/layout/page/components/PageContainer', () => ({
),
}));
-jest.mock('@/app/routing/components/WorkspaceRouteUnavailable', () => ({
+jest.mock('@/ui/layout/page/components/WorkspaceRouteUnavailable', () => ({
WorkspaceRouteUnavailable: () => <div data-testid="route-unavailable" />,
}));
diff --git a/packages/twenty-front/src/pages/object-record/__tests__/RecordShowPage.surface.test.tsx b/packages/twenty-front/src/pages/object-record/__tests__/RecordShowPage.surface.test.tsx
index 7334855bfdc..9cee684640d 100644
--- a/packages/twenty-front/src/pages/object-record/__tests__/RecordShowPage.surface.test.tsx
+++ b/packages/twenty-front/src/pages/object-record/__tests__/RecordShowPage.surface.test.tsx
@@ -57,7 +57,7 @@ jest.mock('@/object-metadata/hooks/useObjectMetadataItems', () => ({
}),
}));
-jest.mock('@/app/routing/components/WorkspaceRouteUnavailable', () => ({
+jest.mock('@/ui/layout/page/components/WorkspaceRouteUnavailable', () => ({
WorkspaceRouteUnavailable: () => <div data-testid="route-unavailable" />,
}));
diff --git a/packages/twenty-front/src/pages/onboarding/UpgradeFreeTrial.tsx b/packages/twenty-front/src/pages/onboarding/UpgradeFreeTrial.tsx
index baa6d5cee9f..004f03c6f6b 100644
--- a/packages/twenty-front/src/pages/onboarding/UpgradeFreeTrial.tsx
+++ b/packages/twenty-front/src/pages/onboarding/UpgradeFreeTrial.tsx
@@ -1,4 +1,4 @@
-import { verifyEmailRedirectPathState } from '@/app/states/verifyEmailRedirectPathState';
+import { verifyEmailRedirectPathState } from '@/auth/states/verifyEmailRedirectPathState';
import { useAuth } from '@/auth/hooks/useAuth';
import { billingCheckoutSessionState } from '@/auth/states/billingCheckoutSessionState';
import { currentUserState } from '@/auth/states/currentUserState';
diff --git a/packages/twenty-front/src/pages/onboarding/WorkspaceActivation.tsx b/packages/twenty-front/src/pages/onboarding/WorkspaceActivation.tsx
index 67800f60488..68e90a81f53 100644
--- a/packages/twenty-front/src/pages/onboarding/WorkspaceActivation.tsx
+++ b/packages/twenty-front/src/pages/onboarding/WorkspaceActivation.tsx
@@ -1,4 +1,4 @@
-import { isAppEffectRedirectEnabledState } from '@/app/states/isAppEffectRedirectEnabledState';
+import { isAppEffectRedirectEnabledState } from '@/auth/states/isAppEffectRedirectEnabledState';
import { Logo } from '@/auth/components/Logo';
import { SubTitle } from '@/auth/components/SubTitle';
import { Title } from '@/auth/components/Title';
@@ -22,7 +22,6 @@ import { useToast } from 'twenty-ui/components/feedback';
import { MainButton } from 'twenty-ui/components/input';
import { themeCssVariables } from 'twenty-ui/theme';
import { ActivateWorkspaceDocument } from '~/generated-metadata/graphql';
-
import { getToastOptionsFromError } from '@/error-handler/utils/getToastOptionsFromError';
const StyledContainer = styled.div`
diff --git a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminAiProviderDetail.tsx b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminAiProviderDetail.tsx
index 3fb71b5b0be..e2bbe6a69c7 100644
--- a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminAiProviderDetail.tsx
+++ b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminAiProviderDetail.tsx
@@ -9,7 +9,7 @@ import { GET_AI_PROVIDERS } from '@/settings/admin-panel/ai/graphql/queries/getA
import { type GetAiProvidersResult } from '@/settings/admin-panel/ai/types/GetAiProvidersResult';
import { useApolloAdminClient } from '@/settings/admin-panel/apollo/hooks/useApolloAdminClient';
import { SettingsAiModelsTable } from '@/settings/ai/components/SettingsAiModelsTable';
-import { getDataResidencyDisplay } from '@/settings/ai/utils/getDataResidencyDisplay';
+import { getDataResidencyDisplay } from '@/ai/utils/getDataResidencyDisplay';
import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
import { SettingsSkeletonLoader } from '@/settings/components/SettingsSkeletonLoader';
import { SettingsTableCard } from '@/settings/components/SettingsTableCard';
diff --git a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminInstanceStatus.tsx b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminInstanceStatus.tsx
index f4e48174b9a..f08240b18a7 100644
--- a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminInstanceStatus.tsx
+++ b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminInstanceStatus.tsx
@@ -27,8 +27,8 @@ import {
GetInstanceAndAllWorkspacesUpgradeStatusDocument,
RefreshUpgradeStatusDocument,
} from '~/generated-admin/graphql';
-import { dateLocaleState } from '~/localization/states/dateLocaleState';
-import { formatDateTimeString } from '~/utils/string/formatDateTimeString';
+import { dateLocaleState } from '@/localization/states/dateLocaleState';
+import { formatDateTimeString } from '@/object-record/record-field/ui/utils/formatDateTimeString';
const StyledRefreshButtonContainer = styled.div`
display: flex;
diff --git a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminNewAiProvider.tsx b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminNewAiProvider.tsx
index 4147802f6c9..81aaa50590e 100644
--- a/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminNewAiProvider.tsx
+++ b/packages/twenty-front/src/pages/settings/admin-panel/SettingsAdminNewAiProvider.tsx
@@ -6,7 +6,7 @@ import { GET_AI_PROVIDERS } from '@/settings/admin-panel/ai/graphql/queries/getA
import { GET_MODELS_DEV_PROVIDERS } from '@/settings/admin-panel/ai/graphql/queries/getModelsDevProviders';
import { useCustomAiProviderAccess } from '@/settings/admin-panel/ai/hooks/useCustomAiProviderAccess';
import { type RawAiProviderConfig } from '@/settings/admin-panel/ai/types/RawAiProviderConfig';
-import { getProviderIcon } from '@/settings/admin-panel/ai/utils/getProviderIcon';
+import { getProviderIcon } from '@/ai/utils/getProviderIcon';
import { useApolloAdminClient } from '@/settings/admin-panel/apollo/hooks/useApolloAdminClient';
import { SaveAndCancelButtons } from '@/settings/components/SaveAndCancelButtons/SaveAndCancelButtons';
import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
diff --git a/packages/twenty-front/src/pages/settings/ai/SettingsAiPrompts.tsx b/packages/twenty-front/src/pages/settings/ai/SettingsAiPrompts.tsx
index b2d25a0d743..2c95c53c300 100644
--- a/packages/twenty-front/src/pages/settings/ai/SettingsAiPrompts.tsx
+++ b/packages/twenty-front/src/pages/settings/ai/SettingsAiPrompts.tsx
@@ -17,7 +17,7 @@ import {
import { Section } from 'twenty-ui/components/layout';
import { themeCssVariables } from 'twenty-ui/theme';
import { GetAiSystemPromptPreviewDocument } from '~/generated-metadata/graphql';
-import { formatNumber } from '~/utils/format/formatNumber';
+import { formatNumber } from '@/localization/utils/formatNumber';
const StyledSectionHeader = styled(Section.Header)`
margin-block-end: 0;
diff --git a/packages/twenty-front/src/pages/settings/ai/components/SettingsAiModelTiersPreview.tsx b/packages/twenty-front/src/pages/settings/ai/components/SettingsAiModelTiersPreview.tsx
index 44cded00efa..86f6b307e58 100644
--- a/packages/twenty-front/src/pages/settings/ai/components/SettingsAiModelTiersPreview.tsx
+++ b/packages/twenty-front/src/pages/settings/ai/components/SettingsAiModelTiersPreview.tsx
@@ -8,14 +8,14 @@ import { themeCssVariables } from 'twenty-ui/theme';
import { AiModelTierIndicator } from '@/ai/components/AiModelTierIndicator';
import { useAiModelTiers } from '@/ai/hooks/useAiModelTiers';
import { type ResolvedAiModelTier } from '@/ai/types/ResolvedAiModelTier';
-import { getAiModelModeDescription } from '@/settings/ai/utils/getAiModelModeDescription';
-import { getModelIcon } from '@/settings/ai/utils/getModelIcon';
+import { getAiModelModeDescription } from '@/ai/utils/getAiModelModeDescription';
+import { getModelIcon } from '@/ai/utils/getModelIcon';
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 { TooltipDelay } from '@/ui/layout/tooltip/constants/TooltipDelay';
-import { formatNumber } from '~/utils/format/formatNumber';
+import { formatNumber } from '@/localization/utils/formatNumber';
const GRID_TEMPLATE_COLUMNS = '1fr 1fr 1fr 1fr';
const EMPTY_VALUE = '–';
diff --git a/packages/twenty-front/src/pages/settings/ai/components/SettingsAiModelsTab.tsx b/packages/twenty-front/src/pages/settings/ai/components/SettingsAiModelsTab.tsx
index 829a7c8c976..8e62cfc2680 100644
--- a/packages/twenty-front/src/pages/settings/ai/components/SettingsAiModelsTab.tsx
+++ b/packages/twenty-front/src/pages/settings/ai/components/SettingsAiModelsTab.tsx
@@ -11,8 +11,8 @@ import { useWorkspaceAiModelTiers } from '@/ai/hooks/useWorkspaceAiModelTiers';
import { getAiModelTierLabel } from '@/ai/utils/getAiModelTierLabel';
import { currentWorkspaceState } from '@/auth/states/currentWorkspaceState';
import { aiModelsState } from '@/client-config/states/aiModelsState';
-import { AiModelPinSelect } from '@/settings/ai/components/AiModelPinSelect';
-import { getAiModelModeDescription } from '@/settings/ai/utils/getAiModelModeDescription';
+import { AiModelPinSelect } from '@/ai/components/AiModelPinSelect';
+import { getAiModelModeDescription } from '@/ai/utils/getAiModelModeDescription';
import { NestedSettingsRow } from '@/settings/components/SettingsOptions/NestedSettingsRow';
import { SettingsOptionCardContentSelect } from '@/settings/components/SettingsOptions/SettingsOptionCardContentSelect';
import { SettingsOptionCardContentSwitch } from '@/settings/components/SettingsOptions/SettingsOptionCardContentSwitch';
diff --git a/packages/twenty-front/src/pages/settings/ai/components/SettingsAiSystemPromptsSection.tsx b/packages/twenty-front/src/pages/settings/ai/components/SettingsAiSystemPromptsSection.tsx
index a9401d3fe06..f5cc83984ef 100644
--- a/packages/twenty-front/src/pages/settings/ai/components/SettingsAiSystemPromptsSection.tsx
+++ b/packages/twenty-front/src/pages/settings/ai/components/SettingsAiSystemPromptsSection.tsx
@@ -8,7 +8,7 @@ import { Section } from 'twenty-ui/components/layout';
import { IconPrompt } from 'twenty-ui/icon';
import { useTheme } from 'twenty-ui/theme';
import { GetAiSystemPromptPreviewDocument } from '~/generated-metadata/graphql';
-import { formatNumber } from '~/utils/format/formatNumber';
+import { formatNumber } from '@/localization/utils/formatNumber';
export const SettingsAiSystemPromptsSection = () => {
const theme = useTheme();
diff --git a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationFunctionDomainSection.tsx b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationFunctionDomainSection.tsx
index a4b9c7cc965..85112f47e82 100644
--- a/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationFunctionDomainSection.tsx
+++ b/packages/twenty-front/src/pages/settings/applications/tabs/SettingsApplicationFunctionDomainSection.tsx
@@ -2,7 +2,7 @@ import { styled } from '@linaria/react';
import { useLingui } from '@lingui/react/macro';
import { SettingsPublicDomainsListCard } from '@/settings/domains/components/SettingsPublicDomainsListCard';
-import { useGetLogicFunctionHttpUrl } from '@/settings/logic-functions/hooks/useGetLogicFunctionHttpUrl';
+import { useGetLogicFunctionHttpUrl } from '@/logic-functions/hooks/useGetLogicFunctionHttpUrl';
import { SettingsTextInput } from '@/ui/input/components/SettingsTextInput';
import { Section } from 'twenty-ui/components/layout';
import { IconCopy } from 'twenty-ui/icon';
diff --git a/packages/twenty-front/src/pages/settings/data-model/SettingsObjectDetailPage.tsx b/packages/twenty-front/src/pages/settings/data-model/SettingsObjectDetailPage.tsx
index 6024cddec95..3cd5cd10a7e 100644
--- a/packages/twenty-front/src/pages/settings/data-model/SettingsObjectDetailPage.tsx
+++ b/packages/twenty-front/src/pages/settings/data-model/SettingsObjectDetailPage.tsx
@@ -2,7 +2,7 @@ import { NavigationButton } from '@/ui/input/components/NavigationButton';
import { useEffect, useState } from 'react';
import { useParams } from 'react-router-dom';
-import { WorkspaceRouteUnavailable } from '@/app/routing/components/WorkspaceRouteUnavailable';
+import { WorkspaceRouteUnavailable } from '@/ui/layout/page/components/WorkspaceRouteUnavailable';
import { ObjectMetadataIcon } from '@/object-metadata/components/ObjectMetadataIcon';
import { useFilteredObjectMetadataItems } from '@/object-metadata/hooks/useFilteredObjectMetadataItems';
import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
diff --git a/packages/twenty-front/src/pages/settings/data-model/SettingsObjectFieldEdit.tsx b/packages/twenty-front/src/pages/settings/data-model/SettingsObjectFieldEdit.tsx
index 6dde4256200..7d3611c37d8 100644
--- a/packages/twenty-front/src/pages/settings/data-model/SettingsObjectFieldEdit.tsx
+++ b/packages/twenty-front/src/pages/settings/data-model/SettingsObjectFieldEdit.tsx
@@ -1,4 +1,4 @@
-import { WorkspaceRouteUnavailable } from '@/app/routing/components/WorkspaceRouteUnavailable';
+import { WorkspaceRouteUnavailable } from '@/ui/layout/page/components/WorkspaceRouteUnavailable';
import { isValidReturnToPath } from '@/auth/utils/isValidReturnToPath';
import { isDDLLockedState } from '@/client-config/states/isDDLLockedState';
import { useFieldMetadataItem } from '@/object-metadata/hooks/useFieldMetadataItem';
diff --git a/packages/twenty-front/src/pages/settings/data-model/new-field/SettingsObjectNewFieldConfigure.tsx b/packages/twenty-front/src/pages/settings/data-model/new-field/SettingsObjectNewFieldConfigure.tsx
index 4233874be2e..d1acb4b01c0 100644
--- a/packages/twenty-front/src/pages/settings/data-model/new-field/SettingsObjectNewFieldConfigure.tsx
+++ b/packages/twenty-front/src/pages/settings/data-model/new-field/SettingsObjectNewFieldConfigure.tsx
@@ -1,4 +1,4 @@
-import { WorkspaceRouteUnavailable } from '@/app/routing/components/WorkspaceRouteUnavailable';
+import { WorkspaceRouteUnavailable } from '@/ui/layout/page/components/WorkspaceRouteUnavailable';
import { isDDLLockedState } from '@/client-config/states/isDDLLockedState';
import { useFieldMetadataItem } from '@/object-metadata/hooks/useFieldMetadataItem';
import { useFilteredObjectMetadataItems } from '@/object-metadata/hooks/useFilteredObjectMetadataItems';
diff --git a/packages/twenty-front/src/pages/settings/data-model/new-field/SettingsObjectNewFieldSelect.tsx b/packages/twenty-front/src/pages/settings/data-model/new-field/SettingsObjectNewFieldSelect.tsx
index f55553e29f4..76acfe24e8d 100644
--- a/packages/twenty-front/src/pages/settings/data-model/new-field/SettingsObjectNewFieldSelect.tsx
+++ b/packages/twenty-front/src/pages/settings/data-model/new-field/SettingsObjectNewFieldSelect.tsx
@@ -1,4 +1,4 @@
-import { WorkspaceRouteUnavailable } from '@/app/routing/components/WorkspaceRouteUnavailable';
+import { WorkspaceRouteUnavailable } from '@/ui/layout/page/components/WorkspaceRouteUnavailable';
import { useFilteredObjectMetadataItems } from '@/object-metadata/hooks/useFilteredObjectMetadataItems';
import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer';
import { SettingsPageLayout } from '@/settings/components/layout/SettingsPageLayout';
diff --git a/packages/twenty-front/src/pages/settings/data-model/new-index/SettingsObjectNewIndex.tsx b/packages/twenty-front/src/pages/settings/data-model/new-index/SettingsObjectNewIndex.tsx
index afa50b0c325..2543b156903 100644
--- a/packages/twenty-front/src/pages/settings/data-model/new-index/SettingsObjectNewIndex.tsx
+++ b/packages/twenty-front/src/pages/settings/data-model/new-index/SettingsObjectNewIndex.tsx
@@ -1,4 +1,4 @@
-import { WorkspaceRouteUnavailable } from '@/app/routing/components/WorkspaceRouteUnavailable';
+import { WorkspaceRouteUnavailable } from '@/ui/layout/page/components/WorkspaceRouteUnavailable';
import { isDDLLockedState } from '@/client-config/states/isDDLLockedState';
import { useCreateOneIndexMetadataItem } from '@/object-metadata/hooks/useCreateOneIndexMetadataItem';
import { useFilteredObjectMetadataItems } from '@/object-metadata/hooks/useFilteredObjectMetadataItems';
diff --git a/packages/twenty-front/src/pages/settings/members/roles/SettingsRoleObjectLevel.tsx b/packages/twenty-front/src/pages/settings/members/roles/SettingsRoleObjectLevel.tsx
index 2989bb4daa0..2ac64aebd0c 100644
--- a/packages/twenty-front/src/pages/settings/members/roles/SettingsRoleObjectLevel.tsx
+++ b/packages/twenty-front/src/pages/settings/members/roles/SettingsRoleObjectLevel.tsx
@@ -1,4 +1,4 @@
-import { WorkspaceRouteUnavailable } from '@/app/routing/components/WorkspaceRouteUnavailable';
+import { WorkspaceRouteUnavailable } from '@/ui/layout/page/components/WorkspaceRouteUnavailable';
import { useObjectMetadataItems } from '@/object-metadata/hooks/useObjectMetadataItems';
import { SettingsRoleRouteGuard } from '@/settings/roles/components/SettingsRoleRouteGuard';
import { SettingsRolePermissionsObjectLevelObjectForm } from '@/settings/roles/role-permissions/object-level-permissions/object-form/components/SettingsRolePermissionsObjectLevelObjectForm';
diff --git a/packages/twenty-front/src/pages/settings/members/tabs/SettingsWorkspaceMembersInviteTab.tsx b/packages/twenty-front/src/pages/settings/members/tabs/SettingsWorkspaceMembersInviteTab.tsx
index 30d17d8aa27..109a990e3b3 100644
--- a/packages/twenty-front/src/pages/settings/members/tabs/SettingsWorkspaceMembersInviteTab.tsx
+++ b/packages/twenty-front/src/pages/settings/members/tabs/SettingsWorkspaceMembersInviteTab.tsx
@@ -28,7 +28,7 @@ import { Status } from 'twenty-ui/primitives/data-display';
import { Tooltip } from 'twenty-ui/primitives/surfaces';
import { useTheme, themeCssVariables } from 'twenty-ui/theme';
import { GetWorkspaceInvitationsDocument } from '~/generated-metadata/graphql';
-import { dateLocaleState } from '~/localization/states/dateLocaleState';
+import { dateLocaleState } from '@/localization/states/dateLocaleState';
const StyledButtonContainer = styled.div`
align-items: center;
diff --git a/packages/twenty-front/src/pages/settings/profile/appearance/components/LocalePicker.tsx b/packages/twenty-front/src/pages/settings/profile/appearance/components/LocalePicker.tsx
index 1f79bd1576f..8cbf64adc40 100644
--- a/packages/twenty-front/src/pages/settings/profile/appearance/components/LocalePicker.tsx
+++ b/packages/twenty-front/src/pages/settings/profile/appearance/components/LocalePicker.tsx
@@ -12,8 +12,8 @@ import { useLingui } from '@lingui/react/macro';
import { enUS } from 'date-fns/locale';
import { type APP_LOCALES } from 'twenty-shared/translations';
import { isDefined } from 'twenty-shared/utils';
-import { useLocaleOptions } from '~/localization/hooks/useLocaleOptions';
-import { dateLocaleState } from '~/localization/states/dateLocaleState';
+import { useLocaleOptions } from '@/localization/hooks/useLocaleOptions';
+import { dateLocaleState } from '@/localization/states/dateLocaleState';
import { themeCssVariables } from 'twenty-ui/theme';
import { dynamicActivate } from '~/utils/i18n/dynamicActivate';
import { logError } from '~/utils/logError';