diff --git a/packages/app-elements/src/hooks/useViewJsonOverlay.tsx b/packages/app-elements/src/hooks/useViewJsonOverlay.tsx
index 386a08334..94bd6f365 100644
--- a/packages/app-elements/src/hooks/useViewJsonOverlay.tsx
+++ b/packages/app-elements/src/hooks/useViewJsonOverlay.tsx
@@ -2,7 +2,7 @@ import { type FC, useCallback } from "react"
 import { useOverlay } from "#hooks/useOverlay"
 import { Icon } from "#ui/atoms/Icon"
 import { Text } from "#ui/atoms/Text"
-import { CodeEditor } from "#ui/forms/CodeEditor/CodeEditorComponent"
+import { CodeEditor } from "#ui/forms/CodeEditor"
 
 interface OverlayProps {
   title: string
diff --git a/packages/app-elements/src/providers/CoreSdkProvider/useCoreApi.tsx b/packages/app-elements/src/providers/CoreSdkProvider/useCoreApi.tsx
index 175ed428c..6ac24523c 100644
--- a/packages/app-elements/src/providers/CoreSdkProvider/useCoreApi.tsx
+++ b/packages/app-elements/src/providers/CoreSdkProvider/useCoreApi.tsx
@@ -6,8 +6,8 @@ import useSWR, {
   type SWRResponse,
 } from "swr"
 import type { ResourceEndpoint } from "#helpers/resources"
-import { useTokenProvider } from "#providers/TokenProvider"
-import { useCoreSdkProvider } from "."
+import { useTokenProvider } from "#providers/TokenProvider/TokenProvider"
+import { useCoreSdkProvider } from "./CoreSdkProvider"
 
 type GenericMethod = (...args: any) => Promise<any>
 
diff --git a/packages/app-elements/src/providers/TokenProvider/MetaTags.tsx b/packages/app-elements/src/providers/TokenProvider/MetaTags.tsx
index 29bb1ac6f..165fa83cb 100644
--- a/packages/app-elements/src/providers/TokenProvider/MetaTags.tsx
+++ b/packages/app-elements/src/providers/TokenProvider/MetaTags.tsx
@@ -2,7 +2,7 @@ import type { ListableResourceType } from "@commercelayer/sdk"
 import { useEffect } from "react"
 import { formatResourceName } from "#helpers/resources"
 import { useCoreApi } from "#providers/CoreSdkProvider"
-import { useTokenProvider } from "./index"
+import { useTokenProvider } from "./TokenProvider"
 
 function MetaTags(): null {
   const {
diff --git a/packages/app-elements/src/providers/TokenProvider/TokenProvider.tsx b/packages/app-elements/src/providers/TokenProvider/TokenProvider.tsx
index bed6e070c..38f418b99 100644
--- a/packages/app-elements/src/providers/TokenProvider/TokenProvider.tsx
+++ b/packages/app-elements/src/providers/TokenProvider/TokenProvider.tsx
@@ -8,7 +8,6 @@ import {
   useEffect,
   useReducer,
 } from "react"
-import type { TokenProviderTokenApplicationKind } from "#providers/TokenProvider"
 import {
   decodeExtras,
   getExtrasFromUrl,
@@ -32,6 +31,7 @@ import type {
   TokenProviderExtras,
   TokenProviderRole,
   TokenProviderRoleActions,
+  TokenProviderTokenApplicationKind,
 } from "./types"
 import { makeDashboardUrl } from "./url"
 import { isTokenExpired, isValidTokenForCurrentApp } from "./validateToken"
diff --git a/packages/app-elements/src/providers/TokenProvider/reducer.ts b/packages/app-elements/src/providers/TokenProvider/reducer.ts
index 0d53fb227..60dce2701 100644
--- a/packages/app-elements/src/providers/TokenProvider/reducer.ts
+++ b/packages/app-elements/src/providers/TokenProvider/reducer.ts
@@ -1,10 +1,8 @@
-import type {
-  TokenProviderClAppSlug,
-  TokenProviderRole,
-} from "#providers/TokenProvider"
 import type {
   TokenProviderAuthSettings,
   TokenProviderAuthUser,
+  TokenProviderClAppSlug,
+  TokenProviderRole,
   TokenProviderRolePermissions,
 } from "./types"
 
diff --git a/packages/app-elements/src/providers/TokenProvider/validateToken.ts b/packages/app-elements/src/providers/TokenProvider/validateToken.ts
index fd7783158..c8291e6f6 100644
--- a/packages/app-elements/src/providers/TokenProvider/validateToken.ts
+++ b/packages/app-elements/src/providers/TokenProvider/validateToken.ts
@@ -3,17 +3,15 @@ import type { ListableResourceType } from "@commercelayer/sdk"
 import fetch from "cross-fetch"
 import isEmpty from "lodash-es/isEmpty"
 import { computeFullname, formatDisplayName } from "#helpers/name"
-import type {
-  TokenProviderRole,
-  TokenProviderTokenApplicationKind,
-} from "#providers/TokenProvider"
 import { getInfoFromJwt, type ParsedScopes } from "./getInfoFromJwt"
 import type {
   Mode,
   TokenProviderAuthUser,
   TokenProviderClAppSlug,
   TokenProviderPermissionItem,
+  TokenProviderRole,
   TokenProviderRolePermissions,
+  TokenProviderTokenApplicationKind,
   TokenProviderTokenInfo,
 } from "./types"
 
diff --git a/packages/app-elements/src/locales/i18n.d.ts b/packages/app-elements/src/types/i18n.d.ts
similarity index 80%
rename from packages/app-elements/src/locales/i18n.d.ts
rename to packages/app-elements/src/types/i18n.d.ts
index c4292aa06..5cfd60854 100644
--- a/packages/app-elements/src/locales/i18n.d.ts
+++ b/packages/app-elements/src/types/i18n.d.ts
@@ -1,4 +1,4 @@
-import type en from "./en"
+import type en from "../locales/en"
 
 declare module "i18next" {
   interface CustomTypeOptions {
diff --git a/packages/app-elements/src/ui/forms/CodeEditor/CodeEditorComponent.tsx b/packages/app-elements/src/ui/forms/CodeEditor/CodeEditorComponent.tsx
index c9aa45d41..2036102c6 100644
--- a/packages/app-elements/src/ui/forms/CodeEditor/CodeEditorComponent.tsx
+++ b/packages/app-elements/src/ui/forms/CodeEditor/CodeEditorComponent.tsx
@@ -8,7 +8,7 @@ import Editor, {
 import type { editor, IDisposable } from "monaco-editor"
 import { forwardRef, type JSX, useEffect, useRef, useState } from "react"
 import type { JsonValue, SetOptional } from "type-fest"
-import { useTokenProvider } from "#providers/TokenProvider"
+import { useTokenProvider } from "#providers/TokenProvider/TokenProvider"
 import {
   InputWrapper,
   type InputWrapperBaseProps,
diff --git a/packages/app-elements/src/ui/forms/RuleEngine/Condition/ConditionValue.tsx b/packages/app-elements/src/ui/forms/RuleEngine/Condition/ConditionValue.tsx
index b9d036453..31302ba16 100644
--- a/packages/app-elements/src/ui/forms/RuleEngine/Condition/ConditionValue.tsx
+++ b/packages/app-elements/src/ui/forms/RuleEngine/Condition/ConditionValue.tsx
@@ -1,7 +1,7 @@
 import { isValid, parseISO } from "date-fns"
 import type React from "react"
 import { useEffect, useState } from "react"
-import { useTokenProvider } from "#providers/TokenProvider"
+import { useTokenProvider } from "#providers/TokenProvider/TokenProvider"
 import { Text } from "#ui/atoms/Text"
 import { Input } from "#ui/forms/Input"
 import { InputDate } from "#ui/forms/InputDate"
diff --git a/packages/app-elements/src/ui/forms/RuleEngine/InputResourceSelector.tsx b/packages/app-elements/src/ui/forms/RuleEngine/InputResourceSelector.tsx
index d1ff1a277..591dac29d 100644
--- a/packages/app-elements/src/ui/forms/RuleEngine/InputResourceSelector.tsx
+++ b/packages/app-elements/src/ui/forms/RuleEngine/InputResourceSelector.tsx
@@ -5,7 +5,8 @@ import type {
 } from "@commercelayer/sdk"
 import { uniqBy } from "lodash-es"
 import type React from "react"
-import { useCoreApi, useCoreSdkProvider } from "#providers/CoreSdkProvider"
+import { useCoreSdkProvider } from "#providers/CoreSdkProvider/CoreSdkProvider"
+import { useCoreApi } from "#providers/CoreSdkProvider/useCoreApi"
 import {
   InputSelect,
   type InputSelectValue,
diff --git a/packages/app-elements/src/ui/forms/RuleEngine/RuleEngineComponent.tsx b/packages/app-elements/src/ui/forms/RuleEngine/RuleEngineComponent.tsx
index 5c111b4c5..72ca23563 100644
--- a/packages/app-elements/src/ui/forms/RuleEngine/RuleEngineComponent.tsx
+++ b/packages/app-elements/src/ui/forms/RuleEngine/RuleEngineComponent.tsx
@@ -4,7 +4,7 @@ import { isEqual } from "lodash-es"
 import type React from "react"
 import { useCallback, useEffect, useRef, useState } from "react"
 import type { SetOptional } from "type-fest"
-import { useTokenProvider } from "#providers/TokenProvider"
+import { useTokenProvider } from "#providers/TokenProvider/TokenProvider"
 import { Button } from "#ui/atoms/Button"
 import { Icon, type IconProps } from "#ui/atoms/Icon"
 import { Dropdown, DropdownDivider, DropdownItem } from "#ui/composite/Dropdown"