diff --git a/apps/builder/src/assets/styles/submissionsTable.css b/apps/builder/src/assets/styles/resultsTable.css
similarity index 100%
rename from apps/builder/src/assets/styles/submissionsTable.css
rename to apps/builder/src/assets/styles/resultsTable.css
diff --git a/apps/builder/src/components/ImageUploadContent/UploadButton.tsx b/apps/builder/src/components/ImageUploadContent/UploadButton.tsx
index ccb234107..05bb3d977 100644
--- a/apps/builder/src/components/ImageUploadContent/UploadButton.tsx
+++ b/apps/builder/src/components/ImageUploadContent/UploadButton.tsx
@@ -1,8 +1,8 @@
 import { useToast } from '@/hooks/useToast'
-import { compressFile } from '@/utils/helpers'
 import { Button, ButtonProps, chakra } from '@chakra-ui/react'
 import { ChangeEvent, useState } from 'react'
 import { uploadFiles } from '@typebot.io/lib'
+import { compressFile } from '@/helpers/compressFile'
 
 type UploadButtonProps = {
   fileType: 'image' | 'audio'
diff --git a/apps/builder/src/components/NewVersionPopup.tsx b/apps/builder/src/components/NewVersionPopup.tsx
index d1123a575..0a4580dc6 100644
--- a/apps/builder/src/components/NewVersionPopup.tsx
+++ b/apps/builder/src/components/NewVersionPopup.tsx
@@ -1,4 +1,4 @@
-import { useTypebot } from '@/features/editor'
+import { useTypebot } from '@/features/editor/providers/TypebotProvider'
 import { trpc } from '@/lib/trpc'
 import {
   Button,
diff --git a/apps/builder/src/components/SupportBubble.tsx b/apps/builder/src/components/SupportBubble.tsx
index faa2b8f2a..5d0138be5 100644
--- a/apps/builder/src/components/SupportBubble.tsx
+++ b/apps/builder/src/components/SupportBubble.tsx
@@ -1,10 +1,10 @@
-import { useTypebot } from '@/features/editor'
-import { useUser } from '@/features/account'
-import { useWorkspace } from '@/features/workspace'
+import { useTypebot } from '@/features/editor/providers/TypebotProvider'
+import { useUser } from '@/features/account/hooks/useUser'
+import { useWorkspace } from '@/features/workspace/WorkspaceProvider'
 import React from 'react'
 import { Bubble } from '@typebot.io/react'
-import { planToReadable } from '@/features/billing'
-import { isCloudProdInstance } from '@/utils/helpers'
+import { isCloudProdInstance } from '@/helpers/isCloudProdInstance'
+import { planToReadable } from '@/features/billing/helpers/planToReadable'
 
 export const SupportBubble = () => {
   const { typebot } = useTypebot()
diff --git a/apps/builder/src/components/UnlockPlanAlertInfo.tsx b/apps/builder/src/components/UnlockPlanAlertInfo.tsx
index b7d7f7ae7..f3240e533 100644
--- a/apps/builder/src/components/UnlockPlanAlertInfo.tsx
+++ b/apps/builder/src/components/UnlockPlanAlertInfo.tsx
@@ -8,7 +8,8 @@ import {
   useDisclosure,
 } from '@chakra-ui/react'
 import React from 'react'
-import { ChangePlanModal, LimitReached } from '@/features/billing'
+import { ChangePlanModal } from '@/features/billing/components/ChangePlanModal'
+import { LimitReached } from '@/features/billing/types'
 
 export const UnlockPlanAlertInfo = ({
   contentLabel,
diff --git a/apps/builder/src/components/inputs/AutocompleteInput.tsx b/apps/builder/src/components/inputs/AutocompleteInput.tsx
index f41ac3300..6c3093c09 100644
--- a/apps/builder/src/components/inputs/AutocompleteInput.tsx
+++ b/apps/builder/src/components/inputs/AutocompleteInput.tsx
@@ -16,10 +16,10 @@ import { useDebouncedCallback } from 'use-debounce'
 import { env, isDefined } from '@typebot.io/lib'
 import { useOutsideClick } from '@/hooks/useOutsideClick'
 import { useParentModal } from '@/features/graph/providers/ParentModalProvider'
-import { VariablesButton } from '@/features/variables'
+import { VariablesButton } from '@/features/variables/components/VariablesButton'
 import { Variable } from '@typebot.io/schemas'
-import { injectVariableInText } from '@/features/variables/utils/injectVariableInTextInput'
-import { focusInput } from '@/utils/focusInput'
+import { injectVariableInText } from '@/features/variables/helpers/injectVariableInTextInput'
+import { focusInput } from '@/helpers/focusInput'
 import { MoreInfoTooltip } from '../MoreInfoTooltip'
 
 type Props = {
diff --git a/apps/builder/src/components/inputs/CodeEditor.tsx b/apps/builder/src/components/inputs/CodeEditor.tsx
index 810a50226..ee13eaf4a 100644
--- a/apps/builder/src/components/inputs/CodeEditor.tsx
+++ b/apps/builder/src/components/inputs/CodeEditor.tsx
@@ -7,7 +7,7 @@ import {
 } from '@chakra-ui/react'
 import { useEffect, useRef, useState } from 'react'
 import { useDebouncedCallback } from 'use-debounce'
-import { VariablesButton } from '@/features/variables'
+import { VariablesButton } from '@/features/variables/components/VariablesButton'
 import { Variable } from '@typebot.io/schemas'
 import { env } from '@typebot.io/lib'
 import CodeMirror, { ReactCodeMirrorRef } from '@uiw/react-codemirror'
diff --git a/apps/builder/src/components/inputs/NumberInput.tsx b/apps/builder/src/components/inputs/NumberInput.tsx
index a34c10bdf..2b26d91a6 100644
--- a/apps/builder/src/components/inputs/NumberInput.tsx
+++ b/apps/builder/src/components/inputs/NumberInput.tsx
@@ -1,4 +1,4 @@
-import { VariablesButton } from '@/features/variables'
+import { VariablesButton } from '@/features/variables/components/VariablesButton'
 import {
   NumberInputProps,
   NumberInput as ChakraNumberInput,
diff --git a/apps/builder/src/components/inputs/TextInput.tsx b/apps/builder/src/components/inputs/TextInput.tsx
index e0c36f341..1a49c206c 100644
--- a/apps/builder/src/components/inputs/TextInput.tsx
+++ b/apps/builder/src/components/inputs/TextInput.tsx
@@ -1,6 +1,6 @@
-import { VariablesButton } from '@/features/variables'
-import { injectVariableInText } from '@/features/variables/utils/injectVariableInTextInput'
-import { focusInput } from '@/utils/focusInput'
+import { VariablesButton } from '@/features/variables/components/VariablesButton'
+import { injectVariableInText } from '@/features/variables/helpers/injectVariableInTextInput'
+import { focusInput } from '@/helpers/focusInput'
 import {
   FormControl,
   FormHelperText,
diff --git a/apps/builder/src/components/inputs/Textarea.tsx b/apps/builder/src/components/inputs/Textarea.tsx
index c70eef447..61bc32d56 100644
--- a/apps/builder/src/components/inputs/Textarea.tsx
+++ b/apps/builder/src/components/inputs/Textarea.tsx
@@ -1,6 +1,6 @@
-import { VariablesButton } from '@/features/variables'
-import { injectVariableInText } from '@/features/variables/utils/injectVariableInTextInput'
-import { focusInput } from '@/utils/focusInput'
+import { VariablesButton } from '@/features/variables/components/VariablesButton'
+import { injectVariableInText } from '@/features/variables/helpers/injectVariableInTextInput'
+import { focusInput } from '@/helpers/focusInput'
 import {
   FormControl,
   FormLabel,
diff --git a/apps/builder/src/components/inputs/VariableSearchInput.tsx b/apps/builder/src/components/inputs/VariableSearchInput.tsx
index 42fc31607..d76213213 100644
--- a/apps/builder/src/components/inputs/VariableSearchInput.tsx
+++ b/apps/builder/src/components/inputs/VariableSearchInput.tsx
@@ -15,7 +15,7 @@ import {
   Text,
 } from '@chakra-ui/react'
 import { EditIcon, PlusIcon, TrashIcon } from '@/components/icons'
-import { useTypebot } from '@/features/editor/providers/TypebotProvider/TypebotProvider'
+import { useTypebot } from '@/features/editor/providers/TypebotProvider'
 import { createId } from '@paralleldrive/cuid2'
 import { Variable } from '@typebot.io/schemas'
 import React, { useState, useRef, ChangeEvent, useEffect } from 'react'
diff --git a/apps/builder/src/features/auth/components/logos/AzureAdLogo.tsx b/apps/builder/src/components/logos/AzureAdLogo.tsx
similarity index 100%
rename from apps/builder/src/features/auth/components/logos/AzureAdLogo.tsx
rename to apps/builder/src/components/logos/AzureAdLogo.tsx
diff --git a/apps/builder/src/features/auth/components/logos/FacebookLogo.tsx b/apps/builder/src/components/logos/FacebookLogo.tsx
similarity index 100%
rename from apps/builder/src/features/auth/components/logos/FacebookLogo.tsx
rename to apps/builder/src/components/logos/FacebookLogo.tsx
diff --git a/apps/builder/src/features/auth/components/logos/GitlabLogo.tsx b/apps/builder/src/components/logos/GitlabLogo.tsx
similarity index 100%
rename from apps/builder/src/features/auth/components/logos/GitlabLogo.tsx
rename to apps/builder/src/components/logos/GitlabLogo.tsx
diff --git a/apps/builder/src/features/account/UserProvider.tsx b/apps/builder/src/features/account/UserProvider.tsx
index 68b66f39d..9e0ff495e 100644
--- a/apps/builder/src/features/account/UserProvider.tsx
+++ b/apps/builder/src/features/account/UserProvider.tsx
@@ -1,12 +1,6 @@
 import { useSession } from 'next-auth/react'
 import { useRouter } from 'next/router'
-import {
-  createContext,
-  ReactNode,
-  useContext,
-  useEffect,
-  useState,
-} from 'react'
+import { createContext, ReactNode, useEffect, useState } from 'react'
 import { env, isDefined, isNotDefined } from '@typebot.io/lib'
 import { User } from '@typebot.io/prisma'
 import { setUser as setSentryUser } from '@sentry/nextjs'
@@ -14,7 +8,7 @@ import { useToast } from '@/hooks/useToast'
 import { updateUserQuery } from './queries/updateUserQuery'
 import { useDebouncedCallback } from 'use-debounce'
 
-const userContext = createContext<{
+export const userContext = createContext<{
   user?: User
   isLoading: boolean
   currentWorkspaceId?: string
@@ -110,5 +104,3 @@ const reloadSession = () => {
   const event = new Event('visibilitychange')
   document.dispatchEvent(event)
 }
-
-export const useUser = () => useContext(userContext)
diff --git a/apps/builder/src/features/account/components/MyAccountForm/ApiTokensList/ApiTokensList.tsx b/apps/builder/src/features/account/components/ApiTokensList.tsx
similarity index 92%
rename from apps/builder/src/features/account/components/MyAccountForm/ApiTokensList/ApiTokensList.tsx
rename to apps/builder/src/features/account/components/ApiTokensList.tsx
index 5af0712f1..3e554b3cd 100644
--- a/apps/builder/src/features/account/components/MyAccountForm/ApiTokensList/ApiTokensList.tsx
+++ b/apps/builder/src/features/account/components/ApiTokensList.tsx
@@ -21,10 +21,10 @@ import { User } from '@typebot.io/prisma'
 import React, { useState } from 'react'
 import { byId, isDefined } from '@typebot.io/lib'
 import { CreateTokenModal } from './CreateTokenModal'
-import { useApiTokens } from '../../../hooks/useApiTokens'
-import { ApiTokenFromServer } from '../../../types'
-import { timeSince } from '@/utils/helpers'
-import { deleteApiTokenQuery } from '../../../queries/deleteApiTokenQuery'
+import { useApiTokens } from '../hooks/useApiTokens'
+import { ApiTokenFromServer } from '../types'
+import { parseTimeSince } from '@/helpers/parseTimeSince'
+import { deleteApiTokenQuery } from '../queries/deleteApiTokenQuery'
 
 type Props = { user: User }
 
@@ -83,7 +83,7 @@ export const ApiTokensList = ({ user }: Props) => {
             {apiTokens?.map((token) => (
               <Tr key={token.id}>
                 <Td>{token.name}</Td>
-                <Td>{timeSince(token.createdAt)} ago</Td>
+                <Td>{parseTimeSince(token.createdAt)} ago</Td>
                 <Td>
                   <Button
                     size="xs"
diff --git a/apps/builder/src/features/account/components/UserPreferenceForm/AppearanceRadioGroup.tsx b/apps/builder/src/features/account/components/AppearanceRadioGroup.tsx
similarity index 100%
rename from apps/builder/src/features/account/components/UserPreferenceForm/AppearanceRadioGroup.tsx
rename to apps/builder/src/features/account/components/AppearanceRadioGroup.tsx
diff --git a/apps/builder/src/features/account/components/MyAccountForm/ApiTokensList/CreateTokenModal.tsx b/apps/builder/src/features/account/components/CreateTokenModal.tsx
similarity index 95%
rename from apps/builder/src/features/account/components/MyAccountForm/ApiTokensList/CreateTokenModal.tsx
rename to apps/builder/src/features/account/components/CreateTokenModal.tsx
index 5810655ca..3f1ef6b05 100644
--- a/apps/builder/src/features/account/components/MyAccountForm/ApiTokensList/CreateTokenModal.tsx
+++ b/apps/builder/src/features/account/components/CreateTokenModal.tsx
@@ -1,6 +1,4 @@
 import { CopyButton } from '@/components/CopyButton'
-import { createApiTokenQuery } from '../../../queries/createApiTokenQuery'
-import { ApiTokenFromServer } from '../../../types'
 import {
   Modal,
   ModalOverlay,
@@ -17,6 +15,8 @@ import {
   InputRightElement,
 } from '@chakra-ui/react'
 import React, { FormEvent, useState } from 'react'
+import { createApiTokenQuery } from '../queries/createApiTokenQuery'
+import { ApiTokenFromServer } from '../types'
 
 type Props = {
   userId: string
diff --git a/apps/builder/src/features/account/components/UserPreferenceForm/GraphNavigationRadioGroup.tsx b/apps/builder/src/features/account/components/GraphNavigationRadioGroup.tsx
similarity index 100%
rename from apps/builder/src/features/account/components/UserPreferenceForm/GraphNavigationRadioGroup.tsx
rename to apps/builder/src/features/account/components/GraphNavigationRadioGroup.tsx
diff --git a/apps/builder/src/features/account/components/MyAccountForm/MyAccountForm.tsx b/apps/builder/src/features/account/components/MyAccountForm.tsx
similarity index 97%
rename from apps/builder/src/features/account/components/MyAccountForm/MyAccountForm.tsx
rename to apps/builder/src/features/account/components/MyAccountForm.tsx
index d871122cd..88b38e625 100644
--- a/apps/builder/src/features/account/components/MyAccountForm/MyAccountForm.tsx
+++ b/apps/builder/src/features/account/components/MyAccountForm.tsx
@@ -3,7 +3,7 @@ import { UploadIcon } from '@/components/icons'
 import React, { useState } from 'react'
 import { ApiTokensList } from './ApiTokensList'
 import { UploadButton } from '@/components/ImageUploadContent/UploadButton'
-import { useUser } from '@/features/account'
+import { useUser } from '../hooks/useUser'
 import { TextInput } from '@/components/inputs/TextInput'
 
 export const MyAccountForm = () => {
diff --git a/apps/builder/src/features/account/components/MyAccountForm/ApiTokensList/index.tsx b/apps/builder/src/features/account/components/MyAccountForm/ApiTokensList/index.tsx
deleted file mode 100644
index c353a99b7..000000000
--- a/apps/builder/src/features/account/components/MyAccountForm/ApiTokensList/index.tsx
+++ /dev/null
@@ -1 +0,0 @@
-export { ApiTokensList } from './ApiTokensList'
diff --git a/apps/builder/src/features/account/components/MyAccountForm/index.tsx b/apps/builder/src/features/account/components/MyAccountForm/index.tsx
deleted file mode 100644
index de4449735..000000000
--- a/apps/builder/src/features/account/components/MyAccountForm/index.tsx
+++ /dev/null
@@ -1 +0,0 @@
-export { MyAccountForm } from './MyAccountForm'
diff --git a/apps/builder/src/features/account/components/UserPreferenceForm/UserPreferencesForm.tsx b/apps/builder/src/features/account/components/UserPreferencesForm.tsx
similarity index 97%
rename from apps/builder/src/features/account/components/UserPreferenceForm/UserPreferencesForm.tsx
rename to apps/builder/src/features/account/components/UserPreferencesForm.tsx
index df9b56f19..abe90c5ce 100644
--- a/apps/builder/src/features/account/components/UserPreferenceForm/UserPreferencesForm.tsx
+++ b/apps/builder/src/features/account/components/UserPreferencesForm.tsx
@@ -1,9 +1,9 @@
 import { Stack, Heading, useColorMode } from '@chakra-ui/react'
-import { useUser } from '@/features/account'
 import { GraphNavigation } from '@typebot.io/prisma'
 import React, { useEffect } from 'react'
 import { GraphNavigationRadioGroup } from './GraphNavigationRadioGroup'
 import { AppearanceRadioGroup } from './AppearanceRadioGroup'
+import { useUser } from '../hooks/useUser'
 
 export const UserPreferencesForm = () => {
   const { colorMode, setColorMode } = useColorMode()
diff --git a/apps/builder/src/features/account/components/index.ts b/apps/builder/src/features/account/components/index.ts
deleted file mode 100644
index 1ac04e484..000000000
--- a/apps/builder/src/features/account/components/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from './MyAccountForm'
-export * from './UserPreferenceForm/UserPreferencesForm'
diff --git a/apps/builder/src/features/account/hooks/useApiTokens.ts b/apps/builder/src/features/account/hooks/useApiTokens.ts
index 27ad97799..c45d8f6c0 100644
--- a/apps/builder/src/features/account/hooks/useApiTokens.ts
+++ b/apps/builder/src/features/account/hooks/useApiTokens.ts
@@ -1,4 +1,4 @@
-import { fetcher } from '@/utils/helpers'
+import { fetcher } from '@/helpers/fetcher'
 import useSWR from 'swr'
 import { env } from '@typebot.io/lib'
 import { ApiTokenFromServer } from '../types'
diff --git a/apps/builder/src/features/account/hooks/useUser.ts b/apps/builder/src/features/account/hooks/useUser.ts
new file mode 100644
index 000000000..c48456972
--- /dev/null
+++ b/apps/builder/src/features/account/hooks/useUser.ts
@@ -0,0 +1,4 @@
+import { useContext } from 'react'
+import { userContext } from '../UserProvider'
+
+export const useUser = () => useContext(userContext)
diff --git a/apps/builder/src/features/account/index.ts b/apps/builder/src/features/account/index.ts
deleted file mode 100644
index 9c50f21b0..000000000
--- a/apps/builder/src/features/account/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export { UserProvider, useUser } from './UserProvider'
-export type { ApiTokenFromServer } from './types'
-export * from './components'
diff --git a/apps/builder/src/features/analytics/components/AnalyticsGraphContainer.tsx b/apps/builder/src/features/analytics/components/AnalyticsGraphContainer.tsx
index b45db6df4..13a0367f8 100644
--- a/apps/builder/src/features/analytics/components/AnalyticsGraphContainer.tsx
+++ b/apps/builder/src/features/analytics/components/AnalyticsGraphContainer.tsx
@@ -5,17 +5,16 @@ import {
   useDisclosure,
 } from '@chakra-ui/react'
 import { useToast } from '@/hooks/useToast'
-import { useTypebot } from '@/features/editor'
+import { useTypebot } from '@/features/editor/providers/TypebotProvider'
 import { Stats } from '@typebot.io/schemas'
 import React from 'react'
 import { useAnswersCount } from '../hooks/useAnswersCount'
-import {
-  Graph,
-  GraphProvider,
-  GroupsCoordinatesProvider,
-} from '@/features/graph'
-import { ChangePlanModal, LimitReached } from '@/features/billing'
 import { StatsCards } from './StatsCards'
+import { ChangePlanModal } from '@/features/billing/components/ChangePlanModal'
+import { LimitReached } from '@/features/billing/types'
+import { Graph } from '@/features/graph/components/Graph'
+import { GraphProvider } from '@/features/graph/providers/GraphProvider'
+import { GroupsCoordinatesProvider } from '@/features/graph/providers/GroupsCoordinateProvider'
 
 export const AnalyticsGraphContainer = ({ stats }: { stats?: Stats }) => {
   const { isOpen, onOpen, onClose } = useDisclosure()
diff --git a/apps/builder/src/features/analytics/hooks/useAnswersCount.ts b/apps/builder/src/features/analytics/hooks/useAnswersCount.ts
index d22dfb884..c28c7e804 100644
--- a/apps/builder/src/features/analytics/hooks/useAnswersCount.ts
+++ b/apps/builder/src/features/analytics/hooks/useAnswersCount.ts
@@ -1,4 +1,4 @@
-import { fetcher } from '@/utils/helpers'
+import { fetcher } from '@/helpers/fetcher'
 import useSWR from 'swr'
 import { AnswersCount } from '../types'
 
diff --git a/apps/builder/src/features/analytics/index.ts b/apps/builder/src/features/analytics/index.ts
deleted file mode 100644
index 7187a9b0c..000000000
--- a/apps/builder/src/features/analytics/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export { AnalyticsGraphContainer } from './components/AnalyticsGraphContainer'
-export type { AnswersCount } from './types'
diff --git a/apps/builder/src/features/auth/api/index.ts b/apps/builder/src/features/auth/api/index.ts
deleted file mode 100644
index b49f99510..000000000
--- a/apps/builder/src/features/auth/api/index.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export * from './convertInvitationsToCollaborations'
-export * from './getAuthenticatedUser'
-export * from './getNewUserInvitations'
-export * from './joinWorkspaces'
diff --git a/apps/builder/src/features/auth/components/SocialLoginButtons.tsx b/apps/builder/src/features/auth/components/SocialLoginButtons.tsx
index 1c6062614..757d93e0c 100644
--- a/apps/builder/src/features/auth/components/SocialLoginButtons.tsx
+++ b/apps/builder/src/features/auth/components/SocialLoginButtons.tsx
@@ -11,8 +11,10 @@ import React, { useState } from 'react'
 import { stringify } from 'qs'
 import { BuiltInProviderType } from 'next-auth/providers'
 import { GoogleLogo } from '@/components/GoogleLogo'
-import { AzureAdLogo, FacebookLogo, GitlabLogo } from './logos'
 import { omit } from '@typebot.io/lib'
+import { AzureAdLogo } from '@/components/logos/AzureAdLogo'
+import { FacebookLogo } from '@/components/logos/FacebookLogo'
+import { GitlabLogo } from '@/components/logos/GitlabLogo'
 
 type Props = {
   providers:
diff --git a/apps/builder/src/features/auth/components/logos/index.ts b/apps/builder/src/features/auth/components/logos/index.ts
deleted file mode 100644
index a81268a9d..000000000
--- a/apps/builder/src/features/auth/components/logos/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export { AzureAdLogo } from './AzureAdLogo'
-export { GitlabLogo } from './GitlabLogo'
-export { FacebookLogo } from './FacebookLogo'
diff --git a/apps/builder/src/features/auth/api/convertInvitationsToCollaborations.ts b/apps/builder/src/features/auth/helpers/convertInvitationsToCollaborations.ts
similarity index 100%
rename from apps/builder/src/features/auth/api/convertInvitationsToCollaborations.ts
rename to apps/builder/src/features/auth/helpers/convertInvitationsToCollaborations.ts
diff --git a/apps/builder/src/features/auth/api/getAuthenticatedUser.ts b/apps/builder/src/features/auth/helpers/getAuthenticatedUser.ts
similarity index 100%
rename from apps/builder/src/features/auth/api/getAuthenticatedUser.ts
rename to apps/builder/src/features/auth/helpers/getAuthenticatedUser.ts
diff --git a/apps/builder/src/features/auth/api/getNewUserInvitations.ts b/apps/builder/src/features/auth/helpers/getNewUserInvitations.ts
similarity index 100%
rename from apps/builder/src/features/auth/api/getNewUserInvitations.ts
rename to apps/builder/src/features/auth/helpers/getNewUserInvitations.ts
diff --git a/apps/builder/src/features/auth/api/joinWorkspaces.ts b/apps/builder/src/features/auth/helpers/joinWorkspaces.ts
similarity index 100%
rename from apps/builder/src/features/auth/api/joinWorkspaces.ts
rename to apps/builder/src/features/auth/helpers/joinWorkspaces.ts
diff --git a/apps/builder/src/features/auth/index.ts b/apps/builder/src/features/auth/index.ts
deleted file mode 100644
index c7fb3d80f..000000000
--- a/apps/builder/src/features/auth/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export { SignInPage } from './components/SignInPage'
-export { mockedUser } from './constants'
diff --git a/apps/builder/src/features/auth/constants.ts b/apps/builder/src/features/auth/mockedUser.ts
similarity index 100%
rename from apps/builder/src/features/auth/constants.ts
rename to apps/builder/src/features/auth/mockedUser.ts
diff --git a/apps/builder/src/features/billing/api/procedures/cancelSubscription.ts b/apps/builder/src/features/billing/api/cancelSubscription.ts
similarity index 96%
rename from apps/builder/src/features/billing/api/procedures/cancelSubscription.ts
rename to apps/builder/src/features/billing/api/cancelSubscription.ts
index 1518315ca..64c3376eb 100644
--- a/apps/builder/src/features/billing/api/procedures/cancelSubscription.ts
+++ b/apps/builder/src/features/billing/api/cancelSubscription.ts
@@ -1,5 +1,5 @@
 import prisma from '@/lib/prisma'
-import { authenticatedProcedure } from '@/utils/server/trpc'
+import { authenticatedProcedure } from '@/helpers/server/trpc'
 import { TRPCError } from '@trpc/server'
 import { Plan, WorkspaceRole } from '@typebot.io/prisma'
 import Stripe from 'stripe'
diff --git a/apps/builder/src/features/billing/api/procedures/createCheckoutSession.ts b/apps/builder/src/features/billing/api/createCheckoutSession.ts
similarity index 96%
rename from apps/builder/src/features/billing/api/procedures/createCheckoutSession.ts
rename to apps/builder/src/features/billing/api/createCheckoutSession.ts
index 24b51db7c..413f41edf 100644
--- a/apps/builder/src/features/billing/api/procedures/createCheckoutSession.ts
+++ b/apps/builder/src/features/billing/api/createCheckoutSession.ts
@@ -1,10 +1,10 @@
 import prisma from '@/lib/prisma'
-import { authenticatedProcedure } from '@/utils/server/trpc'
+import { authenticatedProcedure } from '@/helpers/server/trpc'
 import { TRPCError } from '@trpc/server'
 import { Plan, WorkspaceRole } from '@typebot.io/prisma'
 import Stripe from 'stripe'
 import { z } from 'zod'
-import { parseSubscriptionItems } from '../utils/parseSubscriptionItems'
+import { parseSubscriptionItems } from '../helpers/parseSubscriptionItems'
 
 export const createCheckoutSession = authenticatedProcedure
   .meta({
diff --git a/apps/builder/src/features/billing/api/procedures/getBillingPortalUrl.ts b/apps/builder/src/features/billing/api/getBillingPortalUrl.ts
similarity index 96%
rename from apps/builder/src/features/billing/api/procedures/getBillingPortalUrl.ts
rename to apps/builder/src/features/billing/api/getBillingPortalUrl.ts
index 1f9fb1dca..bcdef0941 100644
--- a/apps/builder/src/features/billing/api/procedures/getBillingPortalUrl.ts
+++ b/apps/builder/src/features/billing/api/getBillingPortalUrl.ts
@@ -1,5 +1,5 @@
 import prisma from '@/lib/prisma'
-import { authenticatedProcedure } from '@/utils/server/trpc'
+import { authenticatedProcedure } from '@/helpers/server/trpc'
 import { TRPCError } from '@trpc/server'
 import { WorkspaceRole } from '@typebot.io/prisma'
 import Stripe from 'stripe'
diff --git a/apps/builder/src/features/billing/api/procedures/getSubscription.ts b/apps/builder/src/features/billing/api/getSubscription.ts
similarity index 97%
rename from apps/builder/src/features/billing/api/procedures/getSubscription.ts
rename to apps/builder/src/features/billing/api/getSubscription.ts
index bedb74187..530690bcd 100644
--- a/apps/builder/src/features/billing/api/procedures/getSubscription.ts
+++ b/apps/builder/src/features/billing/api/getSubscription.ts
@@ -1,5 +1,5 @@
 import prisma from '@/lib/prisma'
-import { authenticatedProcedure } from '@/utils/server/trpc'
+import { authenticatedProcedure } from '@/helpers/server/trpc'
 import { TRPCError } from '@trpc/server'
 import { WorkspaceRole } from '@typebot.io/prisma'
 import Stripe from 'stripe'
diff --git a/apps/builder/src/features/billing/api/procedures/getUsage.ts b/apps/builder/src/features/billing/api/getUsage.ts
similarity index 96%
rename from apps/builder/src/features/billing/api/procedures/getUsage.ts
rename to apps/builder/src/features/billing/api/getUsage.ts
index bcdfc0637..0b652f4f5 100644
--- a/apps/builder/src/features/billing/api/procedures/getUsage.ts
+++ b/apps/builder/src/features/billing/api/getUsage.ts
@@ -1,5 +1,5 @@
 import prisma from '@/lib/prisma'
-import { authenticatedProcedure } from '@/utils/server/trpc'
+import { authenticatedProcedure } from '@/helpers/server/trpc'
 import { TRPCError } from '@trpc/server'
 import { z } from 'zod'
 
diff --git a/apps/builder/src/features/billing/api/procedures/listInvoices.ts b/apps/builder/src/features/billing/api/listInvoices.ts
similarity index 96%
rename from apps/builder/src/features/billing/api/procedures/listInvoices.ts
rename to apps/builder/src/features/billing/api/listInvoices.ts
index dd8dc0433..8f3b4830e 100644
--- a/apps/builder/src/features/billing/api/procedures/listInvoices.ts
+++ b/apps/builder/src/features/billing/api/listInvoices.ts
@@ -1,5 +1,5 @@
 import prisma from '@/lib/prisma'
-import { authenticatedProcedure } from '@/utils/server/trpc'
+import { authenticatedProcedure } from '@/helpers/server/trpc'
 import { TRPCError } from '@trpc/server'
 import { WorkspaceRole } from '@typebot.io/prisma'
 import Stripe from 'stripe'
diff --git a/apps/builder/src/features/billing/api/router.ts b/apps/builder/src/features/billing/api/router.ts
index 0c300a8b7..ebf943f3c 100644
--- a/apps/builder/src/features/billing/api/router.ts
+++ b/apps/builder/src/features/billing/api/router.ts
@@ -1,11 +1,11 @@
-import { router } from '@/utils/server/trpc'
-import { getBillingPortalUrl } from './procedures/getBillingPortalUrl'
-import { listInvoices } from './procedures/listInvoices'
-import { cancelSubscription } from './procedures/cancelSubscription'
-import { createCheckoutSession } from './procedures/createCheckoutSession'
-import { updateSubscription } from './procedures/updateSubscription'
-import { getSubscription } from './procedures/getSubscription'
-import { getUsage } from './procedures/getUsage'
+import { router } from '@/helpers/server/trpc'
+import { cancelSubscription } from './cancelSubscription'
+import { createCheckoutSession } from './createCheckoutSession'
+import { getBillingPortalUrl } from './getBillingPortalUrl'
+import { getSubscription } from './getSubscription'
+import { getUsage } from './getUsage'
+import { listInvoices } from './listInvoices'
+import { updateSubscription } from './updateSubscription'
 
 export const billingRouter = router({
   getBillingPortalUrl,
diff --git a/apps/builder/src/features/billing/api/procedures/updateSubscription.ts b/apps/builder/src/features/billing/api/updateSubscription.ts
similarity index 98%
rename from apps/builder/src/features/billing/api/procedures/updateSubscription.ts
rename to apps/builder/src/features/billing/api/updateSubscription.ts
index 2a4b299e2..2b366220c 100644
--- a/apps/builder/src/features/billing/api/procedures/updateSubscription.ts
+++ b/apps/builder/src/features/billing/api/updateSubscription.ts
@@ -1,6 +1,6 @@
 import { sendTelemetryEvents } from '@typebot.io/lib/telemetry/sendTelemetryEvent'
 import prisma from '@/lib/prisma'
-import { authenticatedProcedure } from '@/utils/server/trpc'
+import { authenticatedProcedure } from '@/helpers/server/trpc'
 import { TRPCError } from '@trpc/server'
 import { Plan, WorkspaceRole } from '@typebot.io/prisma'
 import { workspaceSchema } from '@typebot.io/schemas'
diff --git a/apps/builder/src/features/billing/components/BillingContent/UsageContent/index.ts b/apps/builder/src/features/billing/components/BillingContent/UsageContent/index.ts
deleted file mode 100644
index 2ce5fe4a6..000000000
--- a/apps/builder/src/features/billing/components/BillingContent/UsageContent/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { UsageContent } from './UsageContent'
diff --git a/apps/builder/src/features/billing/components/BillingContent/index.ts b/apps/builder/src/features/billing/components/BillingContent/index.ts
deleted file mode 100644
index 27b9ed527..000000000
--- a/apps/builder/src/features/billing/components/BillingContent/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { BillingContent } from './BillingContent'
diff --git a/apps/builder/src/features/billing/components/BillingContent/queries/cancelSubscriptionQuery.ts b/apps/builder/src/features/billing/components/BillingContent/queries/cancelSubscriptionQuery.ts
deleted file mode 100644
index 3147d4d18..000000000
--- a/apps/builder/src/features/billing/components/BillingContent/queries/cancelSubscriptionQuery.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { sendRequest } from '@typebot.io/lib'
-
-export const cancelSubscriptionQuery = (stripeId: string) =>
-  sendRequest({
-    url: `api/stripe/subscription?stripeId=${stripeId}`,
-    method: 'DELETE',
-  })
diff --git a/apps/builder/src/features/billing/components/BillingContent/BillingPortalButton.tsx b/apps/builder/src/features/billing/components/BillingPortalButton.tsx
similarity index 100%
rename from apps/builder/src/features/billing/components/BillingContent/BillingPortalButton.tsx
rename to apps/builder/src/features/billing/components/BillingPortalButton.tsx
diff --git a/apps/builder/src/features/billing/components/BillingContent/BillingContent.tsx b/apps/builder/src/features/billing/components/BillingSettingsLayout.tsx
similarity index 74%
rename from apps/builder/src/features/billing/components/BillingContent/BillingContent.tsx
rename to apps/builder/src/features/billing/components/BillingSettingsLayout.tsx
index 1764ea85b..157d7540d 100644
--- a/apps/builder/src/features/billing/components/BillingContent/BillingContent.tsx
+++ b/apps/builder/src/features/billing/components/BillingSettingsLayout.tsx
@@ -1,23 +1,23 @@
 import { HStack, Stack, Text } from '@chakra-ui/react'
-import { useWorkspace } from '@/features/workspace'
+import { useWorkspace } from '@/features/workspace/WorkspaceProvider'
 import { Plan } from '@typebot.io/prisma'
 import React from 'react'
-import { CurrentSubscriptionContent } from './CurrentSubscriptionContent'
 import { InvoicesList } from './InvoicesList'
-import { UsageContent } from './UsageContent/UsageContent'
-import { StripeClimateLogo } from '../StripeClimateLogo'
+import { StripeClimateLogo } from './StripeClimateLogo'
 import { TextLink } from '@/components/TextLink'
-import { ChangePlanForm } from '../ChangePlanForm'
+import { ChangePlanForm } from './ChangePlanForm'
+import { UsageProgressBars } from './UsageProgressBars'
+import { CurrentSubscriptionSummary } from './CurrentSubscriptionSummary'
 
-export const BillingContent = () => {
+export const BillingSettingsLayout = () => {
   const { workspace, refreshWorkspace } = useWorkspace()
 
   if (!workspace) return null
   return (
     <Stack spacing="10" w="full">
-      <UsageContent workspace={workspace} />
+      <UsageProgressBars workspace={workspace} />
       <Stack spacing="4">
-        <CurrentSubscriptionContent
+        <CurrentSubscriptionSummary
           workspace={workspace}
           onCancelSuccess={refreshWorkspace}
         />
diff --git a/apps/builder/src/features/billing/components/ChangePlanForm/ChangePlanForm.tsx b/apps/builder/src/features/billing/components/ChangePlanForm.tsx
similarity index 92%
rename from apps/builder/src/features/billing/components/ChangePlanForm/ChangePlanForm.tsx
rename to apps/builder/src/features/billing/components/ChangePlanForm.tsx
index 4861eb500..9331707a0 100644
--- a/apps/builder/src/features/billing/components/ChangePlanForm/ChangePlanForm.tsx
+++ b/apps/builder/src/features/billing/components/ChangePlanForm.tsx
@@ -1,16 +1,16 @@
 import { Stack, HStack, Text } from '@chakra-ui/react'
-import { useUser } from '@/features/account'
 import { Plan } from '@typebot.io/prisma'
-import { ProPlanContent } from './ProPlanContent'
-import { StarterPlanContent } from './StarterPlanContent'
 import { TextLink } from '@/components/TextLink'
 import { useToast } from '@/hooks/useToast'
 import { trpc } from '@/lib/trpc'
 import { guessIfUserIsEuropean } from '@typebot.io/lib/pricing'
 import { Workspace } from '@typebot.io/schemas'
-import { PreCheckoutModal, PreCheckoutModalProps } from '../PreCheckoutModal'
+import { PreCheckoutModal, PreCheckoutModalProps } from './PreCheckoutModal'
 import { useState } from 'react'
 import { ParentModalProvider } from '@/features/graph/providers/ParentModalProvider'
+import { useUser } from '@/features/account/hooks/useUser'
+import { StarterPlanPricingCard } from './StarterPlanPricingCard'
+import { ProPlanPricingCard } from './ProPlanPricingCard'
 
 type Props = {
   workspace: Pick<Workspace, 'id' | 'stripeId' | 'plan'>
@@ -88,7 +88,7 @@ export const ChangePlanForm = ({ workspace, onUpgradeSuccess }: Props) => {
         </ParentModalProvider>
       )}
       <HStack alignItems="stretch" spacing="4" w="full">
-        <StarterPlanContent
+        <StarterPlanPricingCard
           initialChatsLimitIndex={
             workspace?.plan === Plan.STARTER
               ? data?.subscription.additionalChatsIndex
@@ -106,7 +106,7 @@ export const ChangePlanForm = ({ workspace, onUpgradeSuccess }: Props) => {
           currency={data?.subscription.currency}
         />
 
-        <ProPlanContent
+        <ProPlanPricingCard
           initialChatsLimitIndex={
             workspace?.plan === Plan.PRO
               ? data?.subscription.additionalChatsIndex
diff --git a/apps/builder/src/features/billing/components/ChangePlanForm/index.ts b/apps/builder/src/features/billing/components/ChangePlanForm/index.ts
deleted file mode 100644
index 6d5a90447..000000000
--- a/apps/builder/src/features/billing/components/ChangePlanForm/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { ChangePlanForm } from './ChangePlanForm'
diff --git a/apps/builder/src/features/billing/components/ChangePlanModal.tsx b/apps/builder/src/features/billing/components/ChangePlanModal.tsx
index 1b09d0d89..217ba7738 100644
--- a/apps/builder/src/features/billing/components/ChangePlanModal.tsx
+++ b/apps/builder/src/features/billing/components/ChangePlanModal.tsx
@@ -1,5 +1,5 @@
 import { AlertInfo } from '@/components/AlertInfo'
-import { useWorkspace } from '@/features/workspace'
+import { useWorkspace } from '@/features/workspace/WorkspaceProvider'
 import {
   Modal,
   ModalBody,
@@ -10,16 +10,9 @@ import {
   Button,
   HStack,
 } from '@chakra-ui/react'
+import { LimitReached } from '../types'
 import { ChangePlanForm } from './ChangePlanForm'
 
-export enum LimitReached {
-  BRAND = 'remove branding',
-  CUSTOM_DOMAIN = 'add custom domains',
-  FOLDER = 'create folders',
-  FILE_INPUT = 'use file input blocks',
-  ANALYTICS = 'unlock in-depth analytics',
-}
-
 type ChangePlanModalProps = {
   type?: LimitReached
   isOpen: boolean
diff --git a/apps/builder/src/features/billing/components/BillingContent/CurrentSubscriptionContent.tsx b/apps/builder/src/features/billing/components/CurrentSubscriptionSummary.tsx
similarity index 92%
rename from apps/builder/src/features/billing/components/BillingContent/CurrentSubscriptionContent.tsx
rename to apps/builder/src/features/billing/components/CurrentSubscriptionSummary.tsx
index e7d1dddd5..4e88c48aa 100644
--- a/apps/builder/src/features/billing/components/BillingContent/CurrentSubscriptionContent.tsx
+++ b/apps/builder/src/features/billing/components/CurrentSubscriptionSummary.tsx
@@ -2,20 +2,20 @@ import { Text, HStack, Link, Spinner, Stack, Heading } from '@chakra-ui/react'
 import { useToast } from '@/hooks/useToast'
 import { Plan } from '@typebot.io/prisma'
 import React from 'react'
-import { PlanTag } from '../PlanTag'
+import { PlanTag } from './PlanTag'
 import { BillingPortalButton } from './BillingPortalButton'
 import { trpc } from '@/lib/trpc'
 import { Workspace } from '@typebot.io/schemas'
 
-type CurrentSubscriptionContentProps = {
+type Props = {
   workspace: Pick<Workspace, 'id' | 'plan' | 'stripeId'>
   onCancelSuccess: () => void
 }
 
-export const CurrentSubscriptionContent = ({
+export const CurrentSubscriptionSummary = ({
   workspace,
   onCancelSuccess,
-}: CurrentSubscriptionContentProps) => {
+}: Props) => {
   const { showToast } = useToast()
 
   const { mutate: cancelSubscription, isLoading: isCancelling } =
diff --git a/apps/builder/src/features/billing/components/ChangePlanForm/components/FeaturesList.tsx b/apps/builder/src/features/billing/components/FeaturesList.tsx
similarity index 100%
rename from apps/builder/src/features/billing/components/ChangePlanForm/components/FeaturesList.tsx
rename to apps/builder/src/features/billing/components/FeaturesList.tsx
diff --git a/apps/builder/src/features/billing/components/BillingContent/InvoicesList.tsx b/apps/builder/src/features/billing/components/InvoicesList.tsx
similarity index 100%
rename from apps/builder/src/features/billing/components/BillingContent/InvoicesList.tsx
rename to apps/builder/src/features/billing/components/InvoicesList.tsx
diff --git a/apps/builder/src/features/billing/components/PreCheckoutModal.tsx b/apps/builder/src/features/billing/components/PreCheckoutModal.tsx
index 2dd802b58..8d9143120 100644
--- a/apps/builder/src/features/billing/components/PreCheckoutModal.tsx
+++ b/apps/builder/src/features/billing/components/PreCheckoutModal.tsx
@@ -1,6 +1,6 @@
 import { TextInput } from '@/components/inputs'
 import { Select } from '@/components/inputs/Select'
-import { useParentModal } from '@/features/graph'
+import { useParentModal } from '@/features/graph/providers/ParentModalProvider'
 import { useToast } from '@/hooks/useToast'
 import { trpc } from '@/lib/trpc'
 import {
diff --git a/apps/builder/src/features/billing/components/ChangePlanForm/ProPlanContent.tsx b/apps/builder/src/features/billing/components/ProPlanPricingCard.tsx
similarity index 98%
rename from apps/builder/src/features/billing/components/ChangePlanForm/ProPlanContent.tsx
rename to apps/builder/src/features/billing/components/ProPlanPricingCard.tsx
index 39a88bbac..18c212068 100644
--- a/apps/builder/src/features/billing/components/ChangePlanForm/ProPlanContent.tsx
+++ b/apps/builder/src/features/billing/components/ProPlanPricingCard.tsx
@@ -15,7 +15,7 @@ import {
   useColorModeValue,
 } from '@chakra-ui/react'
 import { ChevronLeftIcon } from '@/components/icons'
-import { useWorkspace } from '@/features/workspace'
+import { useWorkspace } from '@/features/workspace/WorkspaceProvider'
 import { Plan } from '@typebot.io/prisma'
 import { useEffect, useState } from 'react'
 import { parseNumberWithCommas } from '@typebot.io/lib'
@@ -27,10 +27,10 @@ import {
   getStorageLimit,
   storageLimit,
 } from '@typebot.io/lib/pricing'
-import { FeaturesList } from './components/FeaturesList'
+import { FeaturesList } from './FeaturesList'
 import { MoreInfoTooltip } from '@/components/MoreInfoTooltip'
 
-type ProPlanContentProps = {
+type Props = {
   initialChatsLimitIndex?: number
   initialStorageLimitIndex?: number
   currency?: 'usd' | 'eur'
@@ -41,13 +41,13 @@ type ProPlanContentProps = {
   }) => void
 }
 
-export const ProPlanContent = ({
+export const ProPlanPricingCard = ({
   initialChatsLimitIndex,
   initialStorageLimitIndex,
   currency,
   isLoading,
   onPayClick,
-}: ProPlanContentProps) => {
+}: Props) => {
   const { workspace } = useWorkspace()
   const [selectedChatsLimitIndex, setSelectedChatsLimitIndex] =
     useState<number>()
diff --git a/apps/builder/src/features/billing/components/ChangePlanForm/StarterPlanContent.tsx b/apps/builder/src/features/billing/components/StarterPlanPricingCard.tsx
similarity index 97%
rename from apps/builder/src/features/billing/components/ChangePlanForm/StarterPlanContent.tsx
rename to apps/builder/src/features/billing/components/StarterPlanPricingCard.tsx
index 8ca1b2e2b..964d30429 100644
--- a/apps/builder/src/features/billing/components/ChangePlanForm/StarterPlanContent.tsx
+++ b/apps/builder/src/features/billing/components/StarterPlanPricingCard.tsx
@@ -11,7 +11,7 @@ import {
   Text,
 } from '@chakra-ui/react'
 import { ChevronLeftIcon } from '@/components/icons'
-import { useWorkspace } from '@/features/workspace'
+import { useWorkspace } from '@/features/workspace/WorkspaceProvider'
 import { Plan } from '@typebot.io/prisma'
 import { useEffect, useState } from 'react'
 import { parseNumberWithCommas } from '@typebot.io/lib'
@@ -23,10 +23,10 @@ import {
   getStorageLimit,
   storageLimit,
 } from '@typebot.io/lib/pricing'
-import { FeaturesList } from './components/FeaturesList'
+import { FeaturesList } from './FeaturesList'
 import { MoreInfoTooltip } from '@/components/MoreInfoTooltip'
 
-type StarterPlanContentProps = {
+type Props = {
   initialChatsLimitIndex?: number
   initialStorageLimitIndex?: number
   currency?: 'eur' | 'usd'
@@ -37,13 +37,13 @@ type StarterPlanContentProps = {
   }) => void
 }
 
-export const StarterPlanContent = ({
+export const StarterPlanPricingCard = ({
   initialChatsLimitIndex,
   initialStorageLimitIndex,
   isLoading,
   currency,
   onPayClick,
-}: StarterPlanContentProps) => {
+}: Props) => {
   const { workspace } = useWorkspace()
   const [selectedChatsLimitIndex, setSelectedChatsLimitIndex] =
     useState<number>()
diff --git a/apps/builder/src/features/billing/components/UpgradeButton.tsx b/apps/builder/src/features/billing/components/UpgradeButton.tsx
index debacf61e..7b34752cd 100644
--- a/apps/builder/src/features/billing/components/UpgradeButton.tsx
+++ b/apps/builder/src/features/billing/components/UpgradeButton.tsx
@@ -1,9 +1,9 @@
 import { Button, ButtonProps, useDisclosure } from '@chakra-ui/react'
-import { useWorkspace } from '@/features/workspace'
+import { useWorkspace } from '@/features/workspace/WorkspaceProvider'
 import React from 'react'
 import { isNotDefined } from '@typebot.io/lib'
 import { ChangePlanModal } from './ChangePlanModal'
-import { LimitReached } from './ChangePlanModal'
+import { LimitReached } from '../types'
 
 type Props = { limitReachedType?: LimitReached } & ButtonProps
 
diff --git a/apps/builder/src/features/billing/components/BillingContent/UsageContent/UsageContent.tsx b/apps/builder/src/features/billing/components/UsageProgressBars.tsx
similarity index 97%
rename from apps/builder/src/features/billing/components/BillingContent/UsageContent/UsageContent.tsx
rename to apps/builder/src/features/billing/components/UsageProgressBars.tsx
index 6836e0b2c..290d8e687 100644
--- a/apps/builder/src/features/billing/components/BillingContent/UsageContent/UsageContent.tsx
+++ b/apps/builder/src/features/billing/components/UsageProgressBars.tsx
@@ -13,14 +13,14 @@ import { Plan, Workspace } from '@typebot.io/prisma'
 import React from 'react'
 import { parseNumberWithCommas } from '@typebot.io/lib'
 import { getChatsLimit, getStorageLimit } from '@typebot.io/lib/pricing'
-import { storageToReadable } from './helpers'
 import { trpc } from '@/lib/trpc'
+import { storageToReadable } from '../helpers/storageToReadable'
 
 type Props = {
   workspace: Workspace
 }
 
-export const UsageContent = ({ workspace }: Props) => {
+export const UsageProgressBars = ({ workspace }: Props) => {
   const { data, isLoading } = trpc.billing.getUsage.useQuery({
     workspaceId: workspace.id,
   })
diff --git a/apps/builder/src/features/billing/helpers/isFreePlan.ts b/apps/builder/src/features/billing/helpers/isFreePlan.ts
new file mode 100644
index 000000000..ba632f558
--- /dev/null
+++ b/apps/builder/src/features/billing/helpers/isFreePlan.ts
@@ -0,0 +1,5 @@
+import { isNotDefined } from '@typebot.io/lib'
+import { Workspace, Plan } from '@typebot.io/prisma'
+
+export const isFreePlan = (workspace?: Pick<Workspace, 'plan'>) =>
+  isNotDefined(workspace) || workspace?.plan === Plan.FREE
diff --git a/apps/builder/src/features/billing/helpers/isProPlan.ts b/apps/builder/src/features/billing/helpers/isProPlan.ts
new file mode 100644
index 000000000..6752191a0
--- /dev/null
+++ b/apps/builder/src/features/billing/helpers/isProPlan.ts
@@ -0,0 +1,9 @@
+import { isDefined } from '@typebot.io/lib'
+import { Workspace, Plan } from '@typebot.io/prisma'
+
+export const isProPlan = (workspace?: Pick<Workspace, 'plan'>) =>
+  isDefined(workspace) &&
+  (workspace.plan === Plan.PRO ||
+    workspace.plan === Plan.LIFETIME ||
+    workspace.plan === Plan.CUSTOM ||
+    workspace.plan === Plan.UNLIMITED)
diff --git a/apps/builder/src/features/billing/api/utils/parseSubscriptionItems.ts b/apps/builder/src/features/billing/helpers/parseSubscriptionItems.ts
similarity index 100%
rename from apps/builder/src/features/billing/api/utils/parseSubscriptionItems.ts
rename to apps/builder/src/features/billing/helpers/parseSubscriptionItems.ts
diff --git a/apps/builder/src/features/billing/helpers/planToReadable.ts b/apps/builder/src/features/billing/helpers/planToReadable.ts
new file mode 100644
index 000000000..b48bc18e1
--- /dev/null
+++ b/apps/builder/src/features/billing/helpers/planToReadable.ts
@@ -0,0 +1,17 @@
+import { Plan } from '@typebot.io/prisma'
+
+export const planToReadable = (plan?: Plan) => {
+  if (!plan) return
+  switch (plan) {
+    case Plan.FREE:
+      return 'Free'
+    case Plan.LIFETIME:
+      return 'Lifetime'
+    case Plan.OFFERED:
+      return 'Offered'
+    case Plan.PRO:
+      return 'Pro'
+    case Plan.UNLIMITED:
+      return 'Unlimited'
+  }
+}
diff --git a/apps/builder/src/features/billing/components/BillingContent/UsageContent/helpers.ts b/apps/builder/src/features/billing/helpers/storageToReadable.ts
similarity index 100%
rename from apps/builder/src/features/billing/components/BillingContent/UsageContent/helpers.ts
rename to apps/builder/src/features/billing/helpers/storageToReadable.ts
diff --git a/apps/builder/src/features/billing/index.ts b/apps/builder/src/features/billing/index.ts
deleted file mode 100644
index 2665d9091..000000000
--- a/apps/builder/src/features/billing/index.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export { ChangePlanModal, LimitReached } from './components/ChangePlanModal'
-export { planToReadable, isFreePlan, isProPlan } from './utils'
-export { BillingContent } from './components/BillingContent'
-export { LockTag } from './components/LockTag'
-export { UpgradeButton } from './components/UpgradeButton'
-export { PlanTag } from './components/PlanTag'
diff --git a/apps/builder/src/features/billing/types.ts b/apps/builder/src/features/billing/types.ts
new file mode 100644
index 000000000..5472f0d50
--- /dev/null
+++ b/apps/builder/src/features/billing/types.ts
@@ -0,0 +1,7 @@
+export enum LimitReached {
+  BRAND = 'remove branding',
+  CUSTOM_DOMAIN = 'add custom domains',
+  FOLDER = 'create folders',
+  FILE_INPUT = 'use file input blocks',
+  ANALYTICS = 'unlock in-depth analytics',
+}
diff --git a/apps/builder/src/features/billing/utils.ts b/apps/builder/src/features/billing/utils.ts
deleted file mode 100644
index d400a6029..000000000
--- a/apps/builder/src/features/billing/utils.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import { Plan, Workspace } from '@typebot.io/prisma'
-import { isDefined, isNotDefined } from '@typebot.io/lib'
-
-export const planToReadable = (plan?: Plan) => {
-  if (!plan) return
-  switch (plan) {
-    case Plan.FREE:
-      return 'Free'
-    case Plan.LIFETIME:
-      return 'Lifetime'
-    case Plan.OFFERED:
-      return 'Offered'
-    case Plan.PRO:
-      return 'Pro'
-    case Plan.UNLIMITED:
-      return 'Unlimited'
-  }
-}
-
-export const isFreePlan = (workspace?: Pick<Workspace, 'plan'>) =>
-  isNotDefined(workspace) || workspace?.plan === Plan.FREE
-
-export const isProPlan = (workspace?: Pick<Workspace, 'plan'>) =>
-  isDefined(workspace) &&
-  (workspace.plan === Plan.PRO ||
-    workspace.plan === Plan.LIFETIME ||
-    workspace.plan === Plan.CUSTOM ||
-    workspace.plan === Plan.UNLIMITED)
diff --git a/apps/builder/src/features/blocks/bubbles/audio/components/index.ts b/apps/builder/src/features/blocks/bubbles/audio/components/index.ts
deleted file mode 100644
index 02caa5cb7..000000000
--- a/apps/builder/src/features/blocks/bubbles/audio/components/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from './AudioBubbleNode'
-export * from './AudioBubbleIcon'
diff --git a/apps/builder/src/features/blocks/bubbles/audio/index.ts b/apps/builder/src/features/blocks/bubbles/audio/index.ts
deleted file mode 100644
index cb64ac1b5..000000000
--- a/apps/builder/src/features/blocks/bubbles/audio/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './components'
diff --git a/apps/builder/src/features/blocks/bubbles/embed/index.ts b/apps/builder/src/features/blocks/bubbles/embed/index.ts
deleted file mode 100644
index 134f877dc..000000000
--- a/apps/builder/src/features/blocks/bubbles/embed/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export { EmbedBubbleContent } from './components/EmbedBubbleContent'
-export { EmbedUploadContent } from './components/EmbedUploadContent'
-export { EmbedBubbleIcon } from './components/EmbedBubbleIcon'
diff --git a/apps/builder/src/features/blocks/bubbles/image/index.ts b/apps/builder/src/features/blocks/bubbles/image/index.ts
deleted file mode 100644
index d7683eccd..000000000
--- a/apps/builder/src/features/blocks/bubbles/image/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export { ImageBubbleContent } from './components/ImageBubbleContent'
-export { ImageBubbleIcon } from './components/ImageBubbleIcon'
diff --git a/apps/builder/src/features/blocks/bubbles/textBubble/components/TextBubbleContent.tsx b/apps/builder/src/features/blocks/bubbles/textBubble/components/TextBubbleContent.tsx
index b91ae548d..80e4294aa 100644
--- a/apps/builder/src/features/blocks/bubbles/textBubble/components/TextBubbleContent.tsx
+++ b/apps/builder/src/features/blocks/bubbles/textBubble/components/TextBubbleContent.tsx
@@ -1,9 +1,9 @@
 import { Flex } from '@chakra-ui/react'
-import { useTypebot } from '@/features/editor'
+import { useTypebot } from '@/features/editor/providers/TypebotProvider'
 import { TextBubbleBlock } from '@typebot.io/schemas'
 import React from 'react'
-import { parseVariableHighlight } from '@/utils/helpers'
 import { isEmpty } from '@typebot.io/lib'
+import { parseVariableHtmlTags } from '@/features/variables/helpers/parseVariableHtmlTags'
 
 type Props = {
   block: TextBubbleBlock
@@ -11,7 +11,6 @@ type Props = {
 
 export const TextBubbleContent = ({ block }: Props) => {
   const { typebot } = useTypebot()
-  if (!typebot) return <></>
   return (
     <Flex
       w="90%"
@@ -22,7 +21,7 @@ export const TextBubbleContent = ({ block }: Props) => {
       dangerouslySetInnerHTML={{
         __html: isEmpty(block.content.plainText)
           ? `<p>Click to edit...</p>`
-          : parseVariableHighlight(block.content.html, typebot),
+          : parseVariableHtmlTags(block.content.html, typebot?.variables ?? []),
       }}
     />
   )
diff --git a/apps/builder/src/features/blocks/bubbles/textBubble/components/TextBubbleEditor/TextBubbleEditor.tsx b/apps/builder/src/features/blocks/bubbles/textBubble/components/TextBubbleEditor.tsx
similarity index 96%
rename from apps/builder/src/features/blocks/bubbles/textBubble/components/TextBubbleEditor/TextBubbleEditor.tsx
rename to apps/builder/src/features/blocks/bubbles/textBubble/components/TextBubbleEditor.tsx
index 7f0ea4e26..6b1300e36 100644
--- a/apps/builder/src/features/blocks/bubbles/textBubble/components/TextBubbleEditor/TextBubbleEditor.tsx
+++ b/apps/builder/src/features/blocks/bubbles/textBubble/components/TextBubbleEditor.tsx
@@ -8,7 +8,6 @@ import React, { useEffect, useRef, useState } from 'react'
 import { Plate, PlateProvider, usePlateEditorRef } from '@udecode/plate-core'
 import { editorStyle, platePlugins } from '@/lib/plate'
 import { BaseEditor, BaseSelection, Transforms } from 'slate'
-import { ToolBar } from './ToolBar'
 import {
   defaultTextBubbleContent,
   TextBubbleContent,
@@ -16,11 +15,12 @@ import {
 } from '@typebot.io/schemas'
 import { ReactEditor } from 'slate-react'
 import { serializeHtml } from '@udecode/plate-serializer-html'
-import { parseHtmlStringToPlainText } from '../../utils'
+import { parseHtmlStringToPlainText } from '../utils'
 import { VariableSearchInput } from '@/components/inputs/VariableSearchInput'
 import { colors } from '@/lib/theme'
 import { useOutsideClick } from '@/hooks/useOutsideClick'
 import { selectEditor, TElement } from '@udecode/plate-common'
+import { TextEditorToolBar } from './TextEditorToolBar'
 
 type TextBubbleEditorContentProps = {
   id: string
@@ -130,7 +130,9 @@ const TextBubbleEditorContent = ({
         },
       }}
     >
-      <ToolBar onVariablesButtonClick={() => setIsVariableDropdownOpen(true)} />
+      <TextEditorToolBar
+        onVariablesButtonClick={() => setIsVariableDropdownOpen(true)}
+      />
       <Plate
         id={id}
         editableProps={{
diff --git a/apps/builder/src/features/blocks/bubbles/textBubble/components/TextBubbleEditor/index.tsx b/apps/builder/src/features/blocks/bubbles/textBubble/components/TextBubbleEditor/index.tsx
deleted file mode 100644
index b62e6dd38..000000000
--- a/apps/builder/src/features/blocks/bubbles/textBubble/components/TextBubbleEditor/index.tsx
+++ /dev/null
@@ -1 +0,0 @@
-export { TextBubbleEditor } from './TextBubbleEditor'
diff --git a/apps/builder/src/features/blocks/bubbles/textBubble/components/TextBubbleEditor/ToolBar.tsx b/apps/builder/src/features/blocks/bubbles/textBubble/components/TextEditorToolBar.tsx
similarity index 95%
rename from apps/builder/src/features/blocks/bubbles/textBubble/components/TextBubbleEditor/ToolBar.tsx
rename to apps/builder/src/features/blocks/bubbles/textBubble/components/TextEditorToolBar.tsx
index cd9966377..7be35d2ec 100644
--- a/apps/builder/src/features/blocks/bubbles/textBubble/components/TextBubbleEditor/ToolBar.tsx
+++ b/apps/builder/src/features/blocks/bubbles/textBubble/components/TextEditorToolBar.tsx
@@ -24,7 +24,10 @@ type Props = {
   onVariablesButtonClick: () => void
 } & StackProps
 
-export const ToolBar = ({ onVariablesButtonClick, ...props }: Props) => {
+export const TextEditorToolBar = ({
+  onVariablesButtonClick,
+  ...props
+}: Props) => {
   const editor = usePlateEditorRef()
   const handleVariablesButtonMouseDown = (e: React.MouseEvent) => {
     e.stopPropagation()
diff --git a/apps/builder/src/features/blocks/bubbles/textBubble/index.ts b/apps/builder/src/features/blocks/bubbles/textBubble/index.ts
deleted file mode 100644
index 331718396..000000000
--- a/apps/builder/src/features/blocks/bubbles/textBubble/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export { TextBubbleEditor } from './components/TextBubbleEditor'
-export { TextBubbleContent } from './components/TextBubbleContent'
-export { TextBubbleIcon } from './components/TextBubbleIcon'
diff --git a/apps/builder/src/features/blocks/bubbles/video/index.ts b/apps/builder/src/features/blocks/bubbles/video/index.ts
deleted file mode 100644
index 7e16883fc..000000000
--- a/apps/builder/src/features/blocks/bubbles/video/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export { VideoUploadContent } from './components/VideoUploadContent'
-export { VideoBubbleContent } from './components/VideoBubbleContent'
-export { VideoBubbleIcon } from './components/VideoBubbleIcon'
diff --git a/apps/builder/src/features/blocks/inputs/buttons/components/ButtonsBlockNode.tsx b/apps/builder/src/features/blocks/inputs/buttons/components/ButtonsBlockNode.tsx
index c24003684..cdbdc99e1 100644
--- a/apps/builder/src/features/blocks/inputs/buttons/components/ButtonsBlockNode.tsx
+++ b/apps/builder/src/features/blocks/inputs/buttons/components/ButtonsBlockNode.tsx
@@ -1,9 +1,9 @@
 import { BlockIndices, ChoiceInputBlock } from '@typebot.io/schemas'
 import React from 'react'
-import { ItemNodesList } from '@/features/graph/components/Nodes/ItemNode'
 import { Stack, Tag, Text, Wrap } from '@chakra-ui/react'
-import { useTypebot } from '@/features/editor'
+import { useTypebot } from '@/features/editor/providers/TypebotProvider'
 import { SetVariableLabel } from '@/components/SetVariableLabel'
+import { ItemNodesList } from '@/features/graph/components/nodes/item/ItemNodesList'
 
 type Props = {
   block: ChoiceInputBlock
diff --git a/apps/builder/src/features/blocks/inputs/buttons/components/ButtonsItemNode.tsx b/apps/builder/src/features/blocks/inputs/buttons/components/ButtonsItemNode.tsx
index e27cc6930..af8e0ca55 100644
--- a/apps/builder/src/features/blocks/inputs/buttons/components/ButtonsItemNode.tsx
+++ b/apps/builder/src/features/blocks/inputs/buttons/components/ButtonsItemNode.tsx
@@ -7,7 +7,7 @@ import {
   Flex,
 } from '@chakra-ui/react'
 import { PlusIcon } from '@/components/icons'
-import { useTypebot } from '@/features/editor'
+import { useTypebot } from '@/features/editor/providers/TypebotProvider'
 import { ButtonItem, ItemIndices, ItemType } from '@typebot.io/schemas'
 import React, { useRef, useState } from 'react'
 import { isNotDefined } from '@typebot.io/lib'
diff --git a/apps/builder/src/features/blocks/inputs/buttons/components/index.ts b/apps/builder/src/features/blocks/inputs/buttons/components/index.ts
deleted file mode 100644
index aac9624e9..000000000
--- a/apps/builder/src/features/blocks/inputs/buttons/components/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export * from './ButtonsItemNode'
-export * from './ButtonsIcon'
-export * from './ButtonsBlockSettings'
diff --git a/apps/builder/src/features/blocks/inputs/buttons/index.ts b/apps/builder/src/features/blocks/inputs/buttons/index.ts
deleted file mode 100644
index cb64ac1b5..000000000
--- a/apps/builder/src/features/blocks/inputs/buttons/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './components'
diff --git a/apps/builder/src/features/blocks/inputs/date/components/DateInputSettingsBody.tsx b/apps/builder/src/features/blocks/inputs/date/components/DateInputSettings.tsx
similarity index 93%
rename from apps/builder/src/features/blocks/inputs/date/components/DateInputSettingsBody.tsx
rename to apps/builder/src/features/blocks/inputs/date/components/DateInputSettings.tsx
index 7a4d3e994..983d2d3a1 100644
--- a/apps/builder/src/features/blocks/inputs/date/components/DateInputSettingsBody.tsx
+++ b/apps/builder/src/features/blocks/inputs/date/components/DateInputSettings.tsx
@@ -5,15 +5,12 @@ import { FormLabel, Stack } from '@chakra-ui/react'
 import { DateInputOptions, Variable } from '@typebot.io/schemas'
 import React from 'react'
 
-type DateInputSettingsBodyProps = {
+type Props = {
   options: DateInputOptions
   onOptionsChange: (options: DateInputOptions) => void
 }
 
-export const DateInputSettingsBody = ({
-  options,
-  onOptionsChange,
-}: DateInputSettingsBodyProps) => {
+export const DateInputSettings = ({ options, onOptionsChange }: Props) => {
   const handleFromChange = (from: string) =>
     onOptionsChange({ ...options, labels: { ...options?.labels, from } })
   const handleToChange = (to: string) =>
diff --git a/apps/builder/src/features/blocks/inputs/date/components/DateNodeContent.tsx b/apps/builder/src/features/blocks/inputs/date/components/DateNodeContent.tsx
index fd5ab108d..a2c42757f 100644
--- a/apps/builder/src/features/blocks/inputs/date/components/DateNodeContent.tsx
+++ b/apps/builder/src/features/blocks/inputs/date/components/DateNodeContent.tsx
@@ -1,6 +1,6 @@
 import React from 'react'
 import { Text } from '@chakra-ui/react'
-import { WithVariableContent } from '@/features/graph/components/Nodes/BlockNode/BlockNodeContent/WithVariableContent'
+import { WithVariableContent } from '@/features/graph/components/nodes/block/WithVariableContent'
 
 type Props = {
   variableId?: string
diff --git a/apps/builder/src/features/blocks/inputs/date/index.ts b/apps/builder/src/features/blocks/inputs/date/index.ts
deleted file mode 100644
index 7c5ddaa0e..000000000
--- a/apps/builder/src/features/blocks/inputs/date/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export { DateInputSettingsBody } from './components/DateInputSettingsBody'
-export { DateNodeContent } from './components/DateNodeContent'
-export { DateInputIcon } from './components/DateInputIcon'
diff --git a/apps/builder/src/features/blocks/inputs/emailInput/components/EmailInputNodeContent.tsx b/apps/builder/src/features/blocks/inputs/emailInput/components/EmailInputNodeContent.tsx
index 7e9aa4164..e360a3915 100644
--- a/apps/builder/src/features/blocks/inputs/emailInput/components/EmailInputNodeContent.tsx
+++ b/apps/builder/src/features/blocks/inputs/emailInput/components/EmailInputNodeContent.tsx
@@ -1,7 +1,7 @@
 import React from 'react'
 import { Text } from '@chakra-ui/react'
 import { EmailInputBlock } from '@typebot.io/schemas'
-import { WithVariableContent } from '@/features/graph/components/Nodes/BlockNode/BlockNodeContent/WithVariableContent'
+import { WithVariableContent } from '@/features/graph/components/nodes/block/WithVariableContent'
 
 type Props = {
   variableId?: string
diff --git a/apps/builder/src/features/blocks/inputs/emailInput/components/EmailInputSettingsBody.tsx b/apps/builder/src/features/blocks/inputs/emailInput/components/EmailInputSettings.tsx
similarity index 91%
rename from apps/builder/src/features/blocks/inputs/emailInput/components/EmailInputSettingsBody.tsx
rename to apps/builder/src/features/blocks/inputs/emailInput/components/EmailInputSettings.tsx
index a36b0c731..130ef7364 100644
--- a/apps/builder/src/features/blocks/inputs/emailInput/components/EmailInputSettingsBody.tsx
+++ b/apps/builder/src/features/blocks/inputs/emailInput/components/EmailInputSettings.tsx
@@ -4,15 +4,12 @@ import { FormLabel, Stack } from '@chakra-ui/react'
 import { EmailInputOptions, Variable } from '@typebot.io/schemas'
 import React from 'react'
 
-type EmailInputSettingsBodyProps = {
+type Props = {
   options: EmailInputOptions
   onOptionsChange: (options: EmailInputOptions) => void
 }
 
-export const EmailInputSettingsBody = ({
-  options,
-  onOptionsChange,
-}: EmailInputSettingsBodyProps) => {
+export const EmailInputSettings = ({ options, onOptionsChange }: Props) => {
   const handlePlaceholderChange = (placeholder: string) =>
     onOptionsChange({ ...options, labels: { ...options.labels, placeholder } })
   const handleButtonLabelChange = (button: string) =>
diff --git a/apps/builder/src/features/blocks/inputs/emailInput/index.ts b/apps/builder/src/features/blocks/inputs/emailInput/index.ts
deleted file mode 100644
index e4a9a8ca6..000000000
--- a/apps/builder/src/features/blocks/inputs/emailInput/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export { EmailInputSettingsBody } from './components/EmailInputSettingsBody'
-export { EmailInputNodeContent } from './components/EmailInputNodeContent'
-export { EmailInputIcon } from './components/EmailInputIcon'
diff --git a/apps/builder/src/features/blocks/inputs/fileUpload/components/FileInputContent.tsx b/apps/builder/src/features/blocks/inputs/fileUpload/components/FileInputContent.tsx
index e0cb84b14..85515beb5 100644
--- a/apps/builder/src/features/blocks/inputs/fileUpload/components/FileInputContent.tsx
+++ b/apps/builder/src/features/blocks/inputs/fileUpload/components/FileInputContent.tsx
@@ -1,4 +1,4 @@
-import { WithVariableContent } from '@/features/graph/components/Nodes/BlockNode/BlockNodeContent/WithVariableContent'
+import { WithVariableContent } from '@/features/graph/components/nodes/block/WithVariableContent'
 import { Text } from '@chakra-ui/react'
 import { FileInputOptions } from '@typebot.io/schemas'
 
diff --git a/apps/builder/src/features/blocks/inputs/fileUpload/index.ts b/apps/builder/src/features/blocks/inputs/fileUpload/index.ts
deleted file mode 100644
index f06846061..000000000
--- a/apps/builder/src/features/blocks/inputs/fileUpload/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export { FileInputSettings } from './components/FileInputSettings'
-export { FileInputContent } from './components/FileInputContent'
-export { FileInputIcon } from './components/FileInputIcon'
diff --git a/apps/builder/src/features/blocks/inputs/number/components/NumberInputSettingsBody.tsx b/apps/builder/src/features/blocks/inputs/number/components/NumberInputSettings.tsx
similarity index 76%
rename from apps/builder/src/features/blocks/inputs/number/components/NumberInputSettingsBody.tsx
rename to apps/builder/src/features/blocks/inputs/number/components/NumberInputSettings.tsx
index 62216d8fe..80b90e1b1 100644
--- a/apps/builder/src/features/blocks/inputs/number/components/NumberInputSettingsBody.tsx
+++ b/apps/builder/src/features/blocks/inputs/number/components/NumberInputSettings.tsx
@@ -1,29 +1,23 @@
 import { TextInput, NumberInput } from '@/components/inputs'
 import { VariableSearchInput } from '@/components/inputs/VariableSearchInput'
-import { removeUndefinedFields } from '@/utils/helpers'
 import { FormLabel, Stack } from '@chakra-ui/react'
 import { NumberInputOptions, Variable } from '@typebot.io/schemas'
 import React from 'react'
 
-type NumberInputSettingsBodyProps = {
+type Props = {
   options: NumberInputOptions
   onOptionsChange: (options: NumberInputOptions) => void
 }
 
-export const NumberInputSettingsBody = ({
-  options,
-  onOptionsChange,
-}: NumberInputSettingsBodyProps) => {
+export const NumberInputSettings = ({ options, onOptionsChange }: Props) => {
   const handlePlaceholderChange = (placeholder: string) =>
     onOptionsChange({ ...options, labels: { ...options.labels, placeholder } })
   const handleButtonLabelChange = (button: string) =>
     onOptionsChange({ ...options, labels: { ...options.labels, button } })
-  const handleMinChange = (min?: number) =>
-    onOptionsChange(removeUndefinedFields({ ...options, min }))
-  const handleMaxChange = (max?: number) =>
-    onOptionsChange(removeUndefinedFields({ ...options, max }))
-  const handleBlockChange = (block?: number) =>
-    onOptionsChange(removeUndefinedFields({ ...options, block }))
+  const handleMinChange = (min?: number) => onOptionsChange({ ...options, min })
+  const handleMaxChange = (max?: number) => onOptionsChange({ ...options, max })
+  const handleStepChange = (step?: number) =>
+    onOptionsChange({ ...options, step })
   const handleVariableChange = (variable?: Variable) => {
     onOptionsChange({ ...options, variableId: variable?.id })
   }
@@ -55,7 +49,7 @@ export const NumberInputSettingsBody = ({
       <NumberInput
         label="Step:"
         defaultValue={options.step}
-        onValueChange={handleBlockChange}
+        onValueChange={handleStepChange}
         withVariableButton={false}
       />
       <Stack>
diff --git a/apps/builder/src/features/blocks/inputs/number/components/NumberNodeContent.tsx b/apps/builder/src/features/blocks/inputs/number/components/NumberNodeContent.tsx
index 689fcfbc7..87cc45b74 100644
--- a/apps/builder/src/features/blocks/inputs/number/components/NumberNodeContent.tsx
+++ b/apps/builder/src/features/blocks/inputs/number/components/NumberNodeContent.tsx
@@ -1,7 +1,7 @@
 import React from 'react'
 import { Text } from '@chakra-ui/react'
 import { NumberInputBlock } from '@typebot.io/schemas'
-import { WithVariableContent } from '@/features/graph/components/Nodes/BlockNode/BlockNodeContent/WithVariableContent'
+import { WithVariableContent } from '@/features/graph/components/nodes/block/WithVariableContent'
 
 type Props = {
   variableId?: string
diff --git a/apps/builder/src/features/blocks/inputs/number/index.ts b/apps/builder/src/features/blocks/inputs/number/index.ts
deleted file mode 100644
index 6787f676d..000000000
--- a/apps/builder/src/features/blocks/inputs/number/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export { NumberInputSettingsBody } from './components/NumberInputSettingsBody'
-export { NumberNodeContent } from './components/NumberNodeContent'
-export { NumberInputIcon } from './components/NumberInputIcon'
diff --git a/apps/builder/src/features/blocks/inputs/payment/components/PaymentSettings/PaymentSettings.tsx b/apps/builder/src/features/blocks/inputs/payment/components/PaymentSettings.tsx
similarity index 97%
rename from apps/builder/src/features/blocks/inputs/payment/components/PaymentSettings/PaymentSettings.tsx
rename to apps/builder/src/features/blocks/inputs/payment/components/PaymentSettings.tsx
index ee3553873..1c4b0c56f 100644
--- a/apps/builder/src/features/blocks/inputs/payment/components/PaymentSettings/PaymentSettings.tsx
+++ b/apps/builder/src/features/blocks/inputs/payment/components/PaymentSettings.tsx
@@ -13,9 +13,9 @@ import {
 import { DropdownList } from '@/components/DropdownList'
 import { PaymentInputOptions, PaymentProvider } from '@typebot.io/schemas'
 import React, { ChangeEvent } from 'react'
-import { currencies } from './currencies'
+import { currencies } from '../currencies'
 import { StripeConfigModal } from './StripeConfigModal'
-import { CredentialsDropdown } from '@/features/credentials'
+import { CredentialsDropdown } from '@/features/credentials/components/CredentialsDropdown'
 import { TextInput } from '@/components/inputs'
 import { useWorkspace } from '@/features/workspace/WorkspaceProvider'
 
diff --git a/apps/builder/src/features/blocks/inputs/payment/components/PaymentSettings/index.ts b/apps/builder/src/features/blocks/inputs/payment/components/PaymentSettings/index.ts
deleted file mode 100644
index ad8a713a6..000000000
--- a/apps/builder/src/features/blocks/inputs/payment/components/PaymentSettings/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { PaymentSettings } from './PaymentSettings'
diff --git a/apps/builder/src/features/blocks/inputs/payment/components/PaymentSettings/StripeConfigModal.tsx b/apps/builder/src/features/blocks/inputs/payment/components/StripeConfigModal.tsx
similarity index 97%
rename from apps/builder/src/features/blocks/inputs/payment/components/PaymentSettings/StripeConfigModal.tsx
rename to apps/builder/src/features/blocks/inputs/payment/components/StripeConfigModal.tsx
index deca49821..5028d4bf4 100644
--- a/apps/builder/src/features/blocks/inputs/payment/components/PaymentSettings/StripeConfigModal.tsx
+++ b/apps/builder/src/features/blocks/inputs/payment/components/StripeConfigModal.tsx
@@ -13,9 +13,8 @@ import {
   Text,
   HStack,
 } from '@chakra-ui/react'
-import { useUser } from '@/features/account'
 import React, { useState } from 'react'
-import { useWorkspace } from '@/features/workspace'
+import { useWorkspace } from '@/features/workspace/WorkspaceProvider'
 import { useToast } from '@/hooks/useToast'
 import { TextInput } from '@/components/inputs'
 import { MoreInfoTooltip } from '@/components/MoreInfoTooltip'
@@ -23,6 +22,7 @@ import { TextLink } from '@/components/TextLink'
 import { StripeCredentials } from '@typebot.io/schemas'
 import { trpc } from '@/lib/trpc'
 import { isNotEmpty } from '@typebot.io/lib'
+import { useUser } from '@/features/account/hooks/useUser'
 
 type Props = {
   isOpen: boolean
diff --git a/apps/builder/src/features/blocks/inputs/payment/components/PaymentSettings/currencies.tsx b/apps/builder/src/features/blocks/inputs/payment/currencies.tsx
similarity index 100%
rename from apps/builder/src/features/blocks/inputs/payment/components/PaymentSettings/currencies.tsx
rename to apps/builder/src/features/blocks/inputs/payment/currencies.tsx
diff --git a/apps/builder/src/features/blocks/inputs/payment/index.ts b/apps/builder/src/features/blocks/inputs/payment/index.ts
deleted file mode 100644
index 94486e938..000000000
--- a/apps/builder/src/features/blocks/inputs/payment/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export { PaymentSettings } from './components/PaymentSettings'
-export { PaymentInputContent } from './components/PaymentInputContent'
-export { PaymentInputIcon } from './components/PaymentInputIcon'
diff --git a/apps/builder/src/features/blocks/inputs/phone/components/PhoneNumberSettingsBody/CountryCodeSelect.tsx b/apps/builder/src/features/blocks/inputs/phone/components/CountryCodeSelect.tsx
similarity index 100%
rename from apps/builder/src/features/blocks/inputs/phone/components/PhoneNumberSettingsBody/CountryCodeSelect.tsx
rename to apps/builder/src/features/blocks/inputs/phone/components/CountryCodeSelect.tsx
diff --git a/apps/builder/src/features/blocks/inputs/phone/components/PhoneNumberSettingsBody/PhoneNumberSettingsBody.tsx b/apps/builder/src/features/blocks/inputs/phone/components/PhoneInputSettings.tsx
similarity index 93%
rename from apps/builder/src/features/blocks/inputs/phone/components/PhoneNumberSettingsBody/PhoneNumberSettingsBody.tsx
rename to apps/builder/src/features/blocks/inputs/phone/components/PhoneInputSettings.tsx
index 27d9e9a3a..2e1f66d43 100644
--- a/apps/builder/src/features/blocks/inputs/phone/components/PhoneNumberSettingsBody/PhoneNumberSettingsBody.tsx
+++ b/apps/builder/src/features/blocks/inputs/phone/components/PhoneInputSettings.tsx
@@ -5,15 +5,12 @@ import { PhoneNumberInputOptions, Variable } from '@typebot.io/schemas'
 import React from 'react'
 import { CountryCodeSelect } from './CountryCodeSelect'
 
-type PhoneNumberSettingsBodyProps = {
+type Props = {
   options: PhoneNumberInputOptions
   onOptionsChange: (options: PhoneNumberInputOptions) => void
 }
 
-export const PhoneNumberSettingsBody = ({
-  options,
-  onOptionsChange,
-}: PhoneNumberSettingsBodyProps) => {
+export const PhoneInputSettings = ({ options, onOptionsChange }: Props) => {
   const handlePlaceholderChange = (placeholder: string) =>
     onOptionsChange({ ...options, labels: { ...options.labels, placeholder } })
   const handleButtonLabelChange = (button: string) =>
diff --git a/apps/builder/src/features/blocks/inputs/phone/components/PhoneNodeContent.tsx b/apps/builder/src/features/blocks/inputs/phone/components/PhoneNodeContent.tsx
index ae61cb894..f93f4cca6 100644
--- a/apps/builder/src/features/blocks/inputs/phone/components/PhoneNodeContent.tsx
+++ b/apps/builder/src/features/blocks/inputs/phone/components/PhoneNodeContent.tsx
@@ -1,7 +1,7 @@
 import React from 'react'
 import { Text } from '@chakra-ui/react'
 import { PhoneNumberInputOptions } from '@typebot.io/schemas'
-import { WithVariableContent } from '@/features/graph/components/Nodes/BlockNode/BlockNodeContent/WithVariableContent'
+import { WithVariableContent } from '@/features/graph/components/nodes/block/WithVariableContent'
 
 type Props = {
   variableId?: string
diff --git a/apps/builder/src/features/blocks/inputs/phone/components/PhoneNumberSettingsBody/index.tsx b/apps/builder/src/features/blocks/inputs/phone/components/PhoneNumberSettingsBody/index.tsx
deleted file mode 100644
index c5b326936..000000000
--- a/apps/builder/src/features/blocks/inputs/phone/components/PhoneNumberSettingsBody/index.tsx
+++ /dev/null
@@ -1 +0,0 @@
-export { PhoneNumberSettingsBody } from './PhoneNumberSettingsBody'
diff --git a/apps/builder/src/features/blocks/inputs/phone/index.ts b/apps/builder/src/features/blocks/inputs/phone/index.ts
deleted file mode 100644
index 4e035ec55..000000000
--- a/apps/builder/src/features/blocks/inputs/phone/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export { PhoneNumberSettingsBody } from './components/PhoneNumberSettingsBody'
-export { PhoneNodeContent } from './components/PhoneNodeContent'
-export { PhoneInputIcon } from './components/PhoneInputIcon'
diff --git a/apps/builder/src/features/blocks/inputs/rating/components/RatingInputContent.tsx b/apps/builder/src/features/blocks/inputs/rating/components/RatingInputContent.tsx
index a0674f087..af6276260 100644
--- a/apps/builder/src/features/blocks/inputs/rating/components/RatingInputContent.tsx
+++ b/apps/builder/src/features/blocks/inputs/rating/components/RatingInputContent.tsx
@@ -1,4 +1,4 @@
-import { WithVariableContent } from '@/features/graph/components/Nodes/BlockNode/BlockNodeContent/WithVariableContent'
+import { WithVariableContent } from '@/features/graph/components/nodes/block/WithVariableContent'
 import { Text } from '@chakra-ui/react'
 import { RatingInputBlock } from '@typebot.io/schemas'
 
diff --git a/apps/builder/src/features/blocks/inputs/rating/components/RatingInputSettings.tsx b/apps/builder/src/features/blocks/inputs/rating/components/RatingInputSettings.tsx
index a7d1b5b31..0c9d9f876 100644
--- a/apps/builder/src/features/blocks/inputs/rating/components/RatingInputSettings.tsx
+++ b/apps/builder/src/features/blocks/inputs/rating/components/RatingInputSettings.tsx
@@ -6,15 +6,12 @@ import { SwitchWithLabel } from '@/components/inputs/SwitchWithLabel'
 import { TextInput } from '@/components/inputs'
 import { VariableSearchInput } from '@/components/inputs/VariableSearchInput'
 
-type RatingInputSettingsProps = {
+type Props = {
   options: RatingInputOptions
   onOptionsChange: (options: RatingInputOptions) => void
 }
 
-export const RatingInputSettings = ({
-  options,
-  onOptionsChange,
-}: RatingInputSettingsProps) => {
+export const RatingInputSettings = ({ options, onOptionsChange }: Props) => {
   const handleLengthChange = (length: number) =>
     onOptionsChange({ ...options, length })
 
diff --git a/apps/builder/src/features/blocks/inputs/rating/index.ts b/apps/builder/src/features/blocks/inputs/rating/index.ts
deleted file mode 100644
index dba9d8df9..000000000
--- a/apps/builder/src/features/blocks/inputs/rating/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export { RatingInputSettings } from './components/RatingInputSettings'
-export { RatingInputContent } from './components/RatingInputContent'
-export { RatingInputIcon } from './components/RatingInputIcon'
diff --git a/apps/builder/src/features/blocks/inputs/textInput/components/TextInputNodeContent.tsx b/apps/builder/src/features/blocks/inputs/textInput/components/TextInputNodeContent.tsx
index bd4fb21aa..7a8d2c221 100644
--- a/apps/builder/src/features/blocks/inputs/textInput/components/TextInputNodeContent.tsx
+++ b/apps/builder/src/features/blocks/inputs/textInput/components/TextInputNodeContent.tsx
@@ -1,7 +1,7 @@
 import React from 'react'
 import { Text } from '@chakra-ui/react'
 import { TextInputOptions } from '@typebot.io/schemas'
-import { WithVariableContent } from '@/features/graph/components/Nodes/BlockNode/BlockNodeContent/WithVariableContent'
+import { WithVariableContent } from '@/features/graph/components/nodes/block/WithVariableContent'
 
 type Props = {
   placeholder: TextInputOptions['labels']['placeholder']
diff --git a/apps/builder/src/features/blocks/inputs/textInput/components/TextInputSettingsBody.tsx b/apps/builder/src/features/blocks/inputs/textInput/components/TextInputSettings.tsx
similarity index 92%
rename from apps/builder/src/features/blocks/inputs/textInput/components/TextInputSettingsBody.tsx
rename to apps/builder/src/features/blocks/inputs/textInput/components/TextInputSettings.tsx
index 357be96be..87dd6d19b 100644
--- a/apps/builder/src/features/blocks/inputs/textInput/components/TextInputSettingsBody.tsx
+++ b/apps/builder/src/features/blocks/inputs/textInput/components/TextInputSettings.tsx
@@ -5,15 +5,12 @@ import { FormLabel, Stack } from '@chakra-ui/react'
 import { TextInputOptions, Variable } from '@typebot.io/schemas'
 import React from 'react'
 
-type TextInputSettingsBodyProps = {
+type Props = {
   options: TextInputOptions
   onOptionsChange: (options: TextInputOptions) => void
 }
 
-export const TextInputSettingsBody = ({
-  options,
-  onOptionsChange,
-}: TextInputSettingsBodyProps) => {
+export const TextInputSettings = ({ options, onOptionsChange }: Props) => {
   const handlePlaceholderChange = (placeholder: string) =>
     onOptionsChange({ ...options, labels: { ...options.labels, placeholder } })
   const handleButtonLabelChange = (button: string) =>
diff --git a/apps/builder/src/features/blocks/inputs/textInput/index.ts b/apps/builder/src/features/blocks/inputs/textInput/index.ts
deleted file mode 100644
index c9895ce42..000000000
--- a/apps/builder/src/features/blocks/inputs/textInput/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export { TextInputSettingsBody } from './components/TextInputSettingsBody'
-export { TextInputNodeContent } from './components/TextInputNodeContent'
-export { TextInputIcon } from './components/TextInputIcon'
diff --git a/apps/builder/src/features/blocks/inputs/url/components/UrlInputSettingsBody.tsx b/apps/builder/src/features/blocks/inputs/url/components/UrlInputSettings.tsx
similarity index 92%
rename from apps/builder/src/features/blocks/inputs/url/components/UrlInputSettingsBody.tsx
rename to apps/builder/src/features/blocks/inputs/url/components/UrlInputSettings.tsx
index 9d844aac9..b11936f40 100644
--- a/apps/builder/src/features/blocks/inputs/url/components/UrlInputSettingsBody.tsx
+++ b/apps/builder/src/features/blocks/inputs/url/components/UrlInputSettings.tsx
@@ -4,15 +4,12 @@ import { FormLabel, Stack } from '@chakra-ui/react'
 import { UrlInputOptions, Variable } from '@typebot.io/schemas'
 import React from 'react'
 
-type UrlInputSettingsBodyProps = {
+type Props = {
   options: UrlInputOptions
   onOptionsChange: (options: UrlInputOptions) => void
 }
 
-export const UrlInputSettingsBody = ({
-  options,
-  onOptionsChange,
-}: UrlInputSettingsBodyProps) => {
+export const UrlInputSettings = ({ options, onOptionsChange }: Props) => {
   const handlePlaceholderChange = (placeholder: string) =>
     onOptionsChange({ ...options, labels: { ...options.labels, placeholder } })
   const handleButtonLabelChange = (button: string) =>
diff --git a/apps/builder/src/features/blocks/inputs/url/components/UrlNodeContent.tsx b/apps/builder/src/features/blocks/inputs/url/components/UrlNodeContent.tsx
index a49abd6cd..6d5ceffb5 100644
--- a/apps/builder/src/features/blocks/inputs/url/components/UrlNodeContent.tsx
+++ b/apps/builder/src/features/blocks/inputs/url/components/UrlNodeContent.tsx
@@ -1,7 +1,7 @@
 import React from 'react'
 import { Text } from '@chakra-ui/react'
 import { UrlInputOptions } from '@typebot.io/schemas'
-import { WithVariableContent } from '@/features/graph/components/Nodes/BlockNode/BlockNodeContent/WithVariableContent'
+import { WithVariableContent } from '@/features/graph/components/nodes/block/WithVariableContent'
 
 type Props = {
   variableId?: string
diff --git a/apps/builder/src/features/blocks/inputs/url/index.ts b/apps/builder/src/features/blocks/inputs/url/index.ts
deleted file mode 100644
index 634912061..000000000
--- a/apps/builder/src/features/blocks/inputs/url/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export { UrlInputSettingsBody } from './components/UrlInputSettingsBody'
-export { UrlNodeContent } from './components/UrlNodeContent'
-export { UrlInputIcon } from './components/UrlInputIcon'
diff --git a/apps/builder/src/features/blocks/integrations/chatwoot/components/ChatwootBlockNodeLabel.tsx b/apps/builder/src/features/blocks/integrations/chatwoot/components/ChatwootNodeBody.tsx
similarity index 85%
rename from apps/builder/src/features/blocks/integrations/chatwoot/components/ChatwootBlockNodeLabel.tsx
rename to apps/builder/src/features/blocks/integrations/chatwoot/components/ChatwootNodeBody.tsx
index 10c1a9bd8..cffe67e5e 100644
--- a/apps/builder/src/features/blocks/integrations/chatwoot/components/ChatwootBlockNodeLabel.tsx
+++ b/apps/builder/src/features/blocks/integrations/chatwoot/components/ChatwootNodeBody.tsx
@@ -5,7 +5,7 @@ type Props = {
   block: ChatwootBlock
 }
 
-export const ChatwootBlockNodeLabel = ({ block }: Props) =>
+export const ChatwootNodeBody = ({ block }: Props) =>
   block.options.task === 'Close widget' ? (
     <Text>Close Chatwoot</Text>
   ) : block.options.websiteToken.length === 0 ? (
diff --git a/apps/builder/src/features/blocks/integrations/chatwoot/components/ChatwootSettingsForm.tsx b/apps/builder/src/features/blocks/integrations/chatwoot/components/ChatwootSettings.tsx
similarity index 97%
rename from apps/builder/src/features/blocks/integrations/chatwoot/components/ChatwootSettingsForm.tsx
rename to apps/builder/src/features/blocks/integrations/chatwoot/components/ChatwootSettings.tsx
index be98c91e9..c161ef58b 100644
--- a/apps/builder/src/features/blocks/integrations/chatwoot/components/ChatwootSettingsForm.tsx
+++ b/apps/builder/src/features/blocks/integrations/chatwoot/components/ChatwootSettings.tsx
@@ -16,7 +16,7 @@ type Props = {
   onOptionsChange: (options: ChatwootOptions) => void
 }
 
-export const ChatwootSettingsForm = ({ options, onOptionsChange }: Props) => {
+export const ChatwootSettings = ({ options, onOptionsChange }: Props) => {
   const updateTask = (task: (typeof chatwootTasks)[number]) => {
     onOptionsChange({ ...options, task })
   }
diff --git a/apps/builder/src/features/blocks/integrations/chatwoot/index.ts b/apps/builder/src/features/blocks/integrations/chatwoot/index.ts
deleted file mode 100644
index 258010d00..000000000
--- a/apps/builder/src/features/blocks/integrations/chatwoot/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export { ChatwootLogo } from './components/ChatwootLogo'
-export { ChatwootBlockNodeLabel } from './components/ChatwootBlockNodeLabel'
-export { ChatwootSettingsForm } from './components/ChatwootSettingsForm'
diff --git a/apps/builder/src/features/blocks/integrations/googleAnalytics/components/GoogleAnalyticsNodeContent.tsx b/apps/builder/src/features/blocks/integrations/googleAnalytics/components/GoogleAnalyticsNodeBody.tsx
similarity index 82%
rename from apps/builder/src/features/blocks/integrations/googleAnalytics/components/GoogleAnalyticsNodeContent.tsx
rename to apps/builder/src/features/blocks/integrations/googleAnalytics/components/GoogleAnalyticsNodeBody.tsx
index 8b8c0a89b..c7ed435fa 100644
--- a/apps/builder/src/features/blocks/integrations/googleAnalytics/components/GoogleAnalyticsNodeContent.tsx
+++ b/apps/builder/src/features/blocks/integrations/googleAnalytics/components/GoogleAnalyticsNodeBody.tsx
@@ -6,7 +6,7 @@ type Props = {
   action: GoogleAnalyticsOptions['action']
 }
 
-export const GoogleAnalyticsNodeContent = ({ action }: Props) => (
+export const GoogleAnalyticsNodeBody = ({ action }: Props) => (
   <Text color={action ? 'currentcolor' : 'gray.500'} noOfLines={1}>
     {action ? `Track "${action}"` : 'Configure...'}
   </Text>
diff --git a/apps/builder/src/features/blocks/integrations/googleAnalytics/index.ts b/apps/builder/src/features/blocks/integrations/googleAnalytics/index.ts
deleted file mode 100644
index 4249875bf..000000000
--- a/apps/builder/src/features/blocks/integrations/googleAnalytics/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export { GoogleAnalyticsSettings } from './components/GoogleAnalyticsSettings'
-export { GoogleAnalyticsLogo } from './components/GoogleAnalyticsLogo'
diff --git a/apps/builder/src/features/blocks/integrations/googleSheets/components/GoogleSheetsSettingsBody/CellWithValueStack.tsx b/apps/builder/src/features/blocks/integrations/googleSheets/components/CellWithValueStack.tsx
similarity index 100%
rename from apps/builder/src/features/blocks/integrations/googleSheets/components/GoogleSheetsSettingsBody/CellWithValueStack.tsx
rename to apps/builder/src/features/blocks/integrations/googleSheets/components/CellWithValueStack.tsx
diff --git a/apps/builder/src/features/blocks/integrations/googleSheets/components/GoogleSheetsSettingsBody/CellWithVariableIdStack.tsx b/apps/builder/src/features/blocks/integrations/googleSheets/components/CellWithVariableIdStack.tsx
similarity index 100%
rename from apps/builder/src/features/blocks/integrations/googleSheets/components/GoogleSheetsSettingsBody/CellWithVariableIdStack.tsx
rename to apps/builder/src/features/blocks/integrations/googleSheets/components/CellWithVariableIdStack.tsx
diff --git a/apps/builder/src/features/blocks/integrations/googleSheets/components/GoogleSheetsSettingsBody/GoogleSheetsConnectModal.tsx b/apps/builder/src/features/blocks/integrations/googleSheets/components/GoogleSheetsConnectModal.tsx
similarity index 91%
rename from apps/builder/src/features/blocks/integrations/googleSheets/components/GoogleSheetsSettingsBody/GoogleSheetsConnectModal.tsx
rename to apps/builder/src/features/blocks/integrations/googleSheets/components/GoogleSheetsConnectModal.tsx
index 780189a4e..7d4f1c1c6 100644
--- a/apps/builder/src/features/blocks/integrations/googleSheets/components/GoogleSheetsSettingsBody/GoogleSheetsConnectModal.tsx
+++ b/apps/builder/src/features/blocks/integrations/googleSheets/components/GoogleSheetsConnectModal.tsx
@@ -12,12 +12,12 @@ import {
   ModalFooter,
   Flex,
 } from '@chakra-ui/react'
-import { useWorkspace } from '@/features/workspace'
+import { useWorkspace } from '@/features/workspace/WorkspaceProvider'
 import Link from 'next/link'
 import React from 'react'
 import { AlertInfo } from '@/components/AlertInfo'
 import { GoogleLogo } from '@/components/GoogleLogo'
-import { getGoogleSheetsConsentScreenUrlQuery } from '../../queries/getGoogleSheetsConsentScreenUrlQuery'
+import { getGoogleSheetsConsentScreenUrlQuery } from '../queries/getGoogleSheetsConsentScreenUrlQuery'
 
 type Props = {
   isOpen: boolean
diff --git a/apps/builder/src/features/blocks/integrations/googleSheets/components/GoogleSheetsSettingsBody/GoogleSheetsSettingsBody.tsx b/apps/builder/src/features/blocks/integrations/googleSheets/components/GoogleSheetsSettings.tsx
similarity index 95%
rename from apps/builder/src/features/blocks/integrations/googleSheets/components/GoogleSheetsSettingsBody/GoogleSheetsSettingsBody.tsx
rename to apps/builder/src/features/blocks/integrations/googleSheets/components/GoogleSheetsSettings.tsx
index 452b738a2..b93533ae2 100644
--- a/apps/builder/src/features/blocks/integrations/googleSheets/components/GoogleSheetsSettingsBody/GoogleSheetsSettingsBody.tsx
+++ b/apps/builder/src/features/blocks/integrations/googleSheets/components/GoogleSheetsSettings.tsx
@@ -1,6 +1,6 @@
 import { Divider, Stack, Text, useDisclosure } from '@chakra-ui/react'
 import { DropdownList } from '@/components/DropdownList'
-import { useTypebot } from '@/features/editor'
+import { useTypebot } from '@/features/editor/providers/TypebotProvider'
 import {
   Cell,
   defaultGoogleSheetsGetOptions,
@@ -21,12 +21,12 @@ import { CellWithValueStack } from './CellWithValueStack'
 import { CellWithVariableIdStack } from './CellWithVariableIdStack'
 import { GoogleSheetConnectModal } from './GoogleSheetsConnectModal'
 import { TableListItemProps, TableList } from '@/components/TableList'
-import { CredentialsDropdown } from '@/features/credentials'
-import { useSheets } from '../../hooks/useSheets'
-import { Sheet } from '../../types'
+import { CredentialsDropdown } from '@/features/credentials/components/CredentialsDropdown'
 import { RowsFilterTableList } from './RowsFilterTableList'
 import { createId } from '@paralleldrive/cuid2'
-import { useWorkspace } from '@/features/workspace'
+import { useWorkspace } from '@/features/workspace/WorkspaceProvider'
+import { useSheets } from '../hooks/useSheets'
+import { Sheet } from '../types'
 
 type Props = {
   options: GoogleSheetsOptions
@@ -34,7 +34,7 @@ type Props = {
   blockId: string
 }
 
-export const GoogleSheetsSettingsBody = ({
+export const GoogleSheetsSettings = ({
   options,
   onOptionsChange,
   blockId,
diff --git a/apps/builder/src/features/blocks/integrations/googleSheets/components/GoogleSheetsSettingsBody/RowsFilterTableList/index.ts b/apps/builder/src/features/blocks/integrations/googleSheets/components/GoogleSheetsSettingsBody/RowsFilterTableList/index.ts
deleted file mode 100644
index 73e9e5076..000000000
--- a/apps/builder/src/features/blocks/integrations/googleSheets/components/GoogleSheetsSettingsBody/RowsFilterTableList/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from './RowsFilterComparisonItem'
-export * from './RowsFilterTableList'
diff --git a/apps/builder/src/features/blocks/integrations/googleSheets/components/GoogleSheetsSettingsBody/index.tsx b/apps/builder/src/features/blocks/integrations/googleSheets/components/GoogleSheetsSettingsBody/index.tsx
deleted file mode 100644
index be18aaedf..000000000
--- a/apps/builder/src/features/blocks/integrations/googleSheets/components/GoogleSheetsSettingsBody/index.tsx
+++ /dev/null
@@ -1 +0,0 @@
-export { GoogleSheetsSettingsBody } from './GoogleSheetsSettingsBody'
diff --git a/apps/builder/src/features/blocks/integrations/googleSheets/components/GoogleSheetsSettingsBody/RowsFilterTableList/RowsFilterComparisonItem.tsx b/apps/builder/src/features/blocks/integrations/googleSheets/components/RowsFilterComparisonItem.tsx
similarity index 100%
rename from apps/builder/src/features/blocks/integrations/googleSheets/components/GoogleSheetsSettingsBody/RowsFilterTableList/RowsFilterComparisonItem.tsx
rename to apps/builder/src/features/blocks/integrations/googleSheets/components/RowsFilterComparisonItem.tsx
diff --git a/apps/builder/src/features/blocks/integrations/googleSheets/components/GoogleSheetsSettingsBody/RowsFilterTableList/RowsFilterTableList.tsx b/apps/builder/src/features/blocks/integrations/googleSheets/components/RowsFilterTableList.tsx
similarity index 100%
rename from apps/builder/src/features/blocks/integrations/googleSheets/components/GoogleSheetsSettingsBody/RowsFilterTableList/RowsFilterTableList.tsx
rename to apps/builder/src/features/blocks/integrations/googleSheets/components/RowsFilterTableList.tsx
diff --git a/apps/builder/src/features/blocks/integrations/googleSheets/components/GoogleSheetsSettingsBody/SheetsDropdown.tsx b/apps/builder/src/features/blocks/integrations/googleSheets/components/SheetsDropdown.tsx
similarity index 96%
rename from apps/builder/src/features/blocks/integrations/googleSheets/components/GoogleSheetsSettingsBody/SheetsDropdown.tsx
rename to apps/builder/src/features/blocks/integrations/googleSheets/components/SheetsDropdown.tsx
index d36aaddd1..b0c98c979 100644
--- a/apps/builder/src/features/blocks/integrations/googleSheets/components/GoogleSheetsSettingsBody/SheetsDropdown.tsx
+++ b/apps/builder/src/features/blocks/integrations/googleSheets/components/SheetsDropdown.tsx
@@ -1,7 +1,7 @@
 import { MoreInfoTooltip } from '@/components/MoreInfoTooltip'
 import { Select } from '@/components/inputs/Select'
 import { HStack, Input } from '@chakra-ui/react'
-import { Sheet } from '../../types'
+import { Sheet } from '../types'
 
 type Props = {
   sheets: Sheet[]
diff --git a/apps/builder/src/features/blocks/integrations/googleSheets/components/GoogleSheetsSettingsBody/SpreadsheetDropdown.tsx b/apps/builder/src/features/blocks/integrations/googleSheets/components/SpreadsheetDropdown.tsx
similarity index 94%
rename from apps/builder/src/features/blocks/integrations/googleSheets/components/GoogleSheetsSettingsBody/SpreadsheetDropdown.tsx
rename to apps/builder/src/features/blocks/integrations/googleSheets/components/SpreadsheetDropdown.tsx
index 497f89ed0..744229d42 100644
--- a/apps/builder/src/features/blocks/integrations/googleSheets/components/GoogleSheetsSettingsBody/SpreadsheetDropdown.tsx
+++ b/apps/builder/src/features/blocks/integrations/googleSheets/components/SpreadsheetDropdown.tsx
@@ -1,6 +1,6 @@
 import { Select } from '@/components/inputs/Select'
 import { Input, Tooltip } from '@chakra-ui/react'
-import { useSpreadsheets } from '../../hooks/useSpreadsheets'
+import { useSpreadsheets } from '../hooks/useSpreadsheets'
 
 type Props = {
   credentialsId: string
diff --git a/apps/builder/src/features/blocks/integrations/googleSheets/hooks/useSheets.ts b/apps/builder/src/features/blocks/integrations/googleSheets/hooks/useSheets.ts
index aa5ccf1c1..762853921 100644
--- a/apps/builder/src/features/blocks/integrations/googleSheets/hooks/useSheets.ts
+++ b/apps/builder/src/features/blocks/integrations/googleSheets/hooks/useSheets.ts
@@ -1,5 +1,5 @@
 import { stringify } from 'qs'
-import { fetcher } from '@/utils/helpers'
+import { fetcher } from '@/helpers/fetcher'
 import useSWR from 'swr'
 import { Sheet } from '../types'
 
diff --git a/apps/builder/src/features/blocks/integrations/googleSheets/hooks/useSpreadsheets.ts b/apps/builder/src/features/blocks/integrations/googleSheets/hooks/useSpreadsheets.ts
index 4ccf21f7f..d34106457 100644
--- a/apps/builder/src/features/blocks/integrations/googleSheets/hooks/useSpreadsheets.ts
+++ b/apps/builder/src/features/blocks/integrations/googleSheets/hooks/useSpreadsheets.ts
@@ -1,5 +1,5 @@
 import { stringify } from 'qs'
-import { fetcher } from '@/utils/helpers'
+import { fetcher } from '@/helpers/fetcher'
 import useSWR from 'swr'
 import { Spreadsheet } from '../types'
 
diff --git a/apps/builder/src/features/blocks/integrations/googleSheets/index.ts b/apps/builder/src/features/blocks/integrations/googleSheets/index.ts
deleted file mode 100644
index a1f0e406f..000000000
--- a/apps/builder/src/features/blocks/integrations/googleSheets/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export { GoogleSheetsSettingsBody } from './components/GoogleSheetsSettingsBody'
-export { GoogleSheetsNodeContent } from './components/GoogleSheetsNodeContent'
-export { GoogleSheetsLogo } from './components/GoogleSheetsLogo'
diff --git a/apps/builder/src/features/blocks/integrations/makeCom/components/MakeComContent.tsx b/apps/builder/src/features/blocks/integrations/makeCom/components/MakeComContent.tsx
index 035becff3..8a674a28d 100644
--- a/apps/builder/src/features/blocks/integrations/makeCom/components/MakeComContent.tsx
+++ b/apps/builder/src/features/blocks/integrations/makeCom/components/MakeComContent.tsx
@@ -1,5 +1,5 @@
 import { Text } from '@chakra-ui/react'
-import { useTypebot } from '@/features/editor'
+import { useTypebot } from '@/features/editor/providers/TypebotProvider'
 import { MakeComBlock } from '@typebot.io/schemas'
 import { byId, isNotDefined } from '@typebot.io/lib'
 
diff --git a/apps/builder/src/features/blocks/integrations/makeCom/components/MakeComSettings.tsx b/apps/builder/src/features/blocks/integrations/makeCom/components/MakeComSettings.tsx
index ff4284432..4af1844f3 100644
--- a/apps/builder/src/features/blocks/integrations/makeCom/components/MakeComSettings.tsx
+++ b/apps/builder/src/features/blocks/integrations/makeCom/components/MakeComSettings.tsx
@@ -1,6 +1,6 @@
 import { Alert, AlertIcon, Button, Link, Stack, Text } from '@chakra-ui/react'
 import { ExternalLinkIcon } from '@/components/icons'
-import { useTypebot } from '@/features/editor'
+import { useTypebot } from '@/features/editor/providers/TypebotProvider'
 import { MakeComBlock, Webhook, WebhookOptions } from '@typebot.io/schemas'
 import React, { useCallback, useEffect, useState } from 'react'
 import { byId } from '@typebot.io/lib'
diff --git a/apps/builder/src/features/blocks/integrations/makeCom/components/index.ts b/apps/builder/src/features/blocks/integrations/makeCom/components/index.ts
deleted file mode 100644
index a8050acfe..000000000
--- a/apps/builder/src/features/blocks/integrations/makeCom/components/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export * from './MakeComLogo'
-export * from './MakeComContent'
-export * from './MakeComSettings'
diff --git a/apps/builder/src/features/blocks/integrations/makeCom/index.ts b/apps/builder/src/features/blocks/integrations/makeCom/index.ts
deleted file mode 100644
index cb64ac1b5..000000000
--- a/apps/builder/src/features/blocks/integrations/makeCom/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './components'
diff --git a/apps/builder/src/features/blocks/integrations/openai/components/OpenAICredentialsModal.tsx b/apps/builder/src/features/blocks/integrations/openai/components/OpenAICredentialsModal.tsx
index 6c9bd34e6..b5eebdc99 100644
--- a/apps/builder/src/features/blocks/integrations/openai/components/OpenAICredentialsModal.tsx
+++ b/apps/builder/src/features/blocks/integrations/openai/components/OpenAICredentialsModal.tsx
@@ -1,6 +1,6 @@
 import { TextInput } from '@/components/inputs/TextInput'
 import { TextLink } from '@/components/TextLink'
-import { useWorkspace } from '@/features/workspace'
+import { useWorkspace } from '@/features/workspace/WorkspaceProvider'
 import { useToast } from '@/hooks/useToast'
 import { trpc } from '@/lib/trpc'
 import {
diff --git a/apps/builder/src/features/blocks/integrations/openai/components/OpenAINodeBody.tsx b/apps/builder/src/features/blocks/integrations/openai/components/OpenAINodeBody.tsx
index fa151a5f9..380f47b65 100644
--- a/apps/builder/src/features/blocks/integrations/openai/components/OpenAINodeBody.tsx
+++ b/apps/builder/src/features/blocks/integrations/openai/components/OpenAINodeBody.tsx
@@ -1,5 +1,5 @@
 import { SetVariableLabel } from '@/components/SetVariableLabel'
-import { useTypebot } from '@/features/editor'
+import { useTypebot } from '@/features/editor/providers/TypebotProvider'
 import { Stack, Text } from '@chakra-ui/react'
 import {
   ChatCompletionOpenAIOptions,
diff --git a/apps/builder/src/features/blocks/integrations/openai/components/OpenAISettings.tsx b/apps/builder/src/features/blocks/integrations/openai/components/OpenAISettings.tsx
index 224fc5128..c46e1442b 100644
--- a/apps/builder/src/features/blocks/integrations/openai/components/OpenAISettings.tsx
+++ b/apps/builder/src/features/blocks/integrations/openai/components/OpenAISettings.tsx
@@ -1,6 +1,6 @@
 import { Stack, useDisclosure } from '@chakra-ui/react'
 import React from 'react'
-import { CredentialsDropdown } from '@/features/credentials'
+import { CredentialsDropdown } from '@/features/credentials/components/CredentialsDropdown'
 import {
   ChatCompletionOpenAIOptions,
   CreateImageOpenAIOptions,
diff --git a/apps/builder/src/features/blocks/integrations/pabbly/components/PabblyConnectContent.tsx b/apps/builder/src/features/blocks/integrations/pabbly/components/PabblyConnectContent.tsx
index 0e8fc5a15..a7c4f2d4b 100644
--- a/apps/builder/src/features/blocks/integrations/pabbly/components/PabblyConnectContent.tsx
+++ b/apps/builder/src/features/blocks/integrations/pabbly/components/PabblyConnectContent.tsx
@@ -1,5 +1,5 @@
 import { Text } from '@chakra-ui/react'
-import { useTypebot } from '@/features/editor'
+import { useTypebot } from '@/features/editor/providers/TypebotProvider'
 import { PabblyConnectBlock } from '@typebot.io/schemas'
 import { byId, isNotDefined } from '@typebot.io/lib'
 
diff --git a/apps/builder/src/features/blocks/integrations/pabbly/components/PabblyConnectSettings.tsx b/apps/builder/src/features/blocks/integrations/pabbly/components/PabblyConnectSettings.tsx
index ee19c6b78..c7f1601b3 100644
--- a/apps/builder/src/features/blocks/integrations/pabbly/components/PabblyConnectSettings.tsx
+++ b/apps/builder/src/features/blocks/integrations/pabbly/components/PabblyConnectSettings.tsx
@@ -1,6 +1,6 @@
 import { Alert, AlertIcon, Button, Link, Stack, Text } from '@chakra-ui/react'
 import { ExternalLinkIcon } from '@/components/icons'
-import { useTypebot } from '@/features/editor'
+import { useTypebot } from '@/features/editor/providers/TypebotProvider'
 import {
   PabblyConnectBlock,
   Webhook,
diff --git a/apps/builder/src/features/blocks/integrations/pabbly/components/index.ts b/apps/builder/src/features/blocks/integrations/pabbly/components/index.ts
deleted file mode 100644
index da0f85f62..000000000
--- a/apps/builder/src/features/blocks/integrations/pabbly/components/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from './PabblyConnectContent'
-export * from './PabblyConnectLogo'
diff --git a/apps/builder/src/features/blocks/integrations/pabbly/index.ts b/apps/builder/src/features/blocks/integrations/pabbly/index.ts
deleted file mode 100644
index cb64ac1b5..000000000
--- a/apps/builder/src/features/blocks/integrations/pabbly/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './components'
diff --git a/apps/builder/src/features/blocks/integrations/sendEmail/components/SendEmailSettings/SendEmailSettings.tsx b/apps/builder/src/features/blocks/integrations/sendEmail/components/SendEmailSettings.tsx
similarity index 98%
rename from apps/builder/src/features/blocks/integrations/sendEmail/components/SendEmailSettings/SendEmailSettings.tsx
rename to apps/builder/src/features/blocks/integrations/sendEmail/components/SendEmailSettings.tsx
index 490d5ddc9..f0fe84b61 100644
--- a/apps/builder/src/features/blocks/integrations/sendEmail/components/SendEmailSettings/SendEmailSettings.tsx
+++ b/apps/builder/src/features/blocks/integrations/sendEmail/components/SendEmailSettings.tsx
@@ -14,7 +14,7 @@ import { env, isNotEmpty } from '@typebot.io/lib'
 import { SmtpConfigModal } from './SmtpConfigModal'
 import { SwitchWithLabel } from '@/components/inputs/SwitchWithLabel'
 import { VariableSearchInput } from '@/components/inputs/VariableSearchInput'
-import { CredentialsDropdown } from '@/features/credentials'
+import { CredentialsDropdown } from '@/features/credentials/components/CredentialsDropdown'
 import { TextInput, Textarea } from '@/components/inputs'
 import { useWorkspace } from '@/features/workspace/WorkspaceProvider'
 
diff --git a/apps/builder/src/features/blocks/integrations/sendEmail/components/SendEmailSettings/index.ts b/apps/builder/src/features/blocks/integrations/sendEmail/components/SendEmailSettings/index.ts
deleted file mode 100644
index a343988e0..000000000
--- a/apps/builder/src/features/blocks/integrations/sendEmail/components/SendEmailSettings/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { SendEmailSettings } from './SendEmailSettings'
diff --git a/apps/builder/src/features/blocks/integrations/sendEmail/components/SendEmailSettings/SmtpConfigForm.tsx b/apps/builder/src/features/blocks/integrations/sendEmail/components/SmtpConfigForm.tsx
similarity index 100%
rename from apps/builder/src/features/blocks/integrations/sendEmail/components/SendEmailSettings/SmtpConfigForm.tsx
rename to apps/builder/src/features/blocks/integrations/sendEmail/components/SmtpConfigForm.tsx
diff --git a/apps/builder/src/features/blocks/integrations/sendEmail/components/SendEmailSettings/SmtpConfigModal.tsx b/apps/builder/src/features/blocks/integrations/sendEmail/components/SmtpConfigModal.tsx
similarity index 93%
rename from apps/builder/src/features/blocks/integrations/sendEmail/components/SendEmailSettings/SmtpConfigModal.tsx
rename to apps/builder/src/features/blocks/integrations/sendEmail/components/SmtpConfigModal.tsx
index a2d4525c6..48d3b8e69 100644
--- a/apps/builder/src/features/blocks/integrations/sendEmail/components/SendEmailSettings/SmtpConfigModal.tsx
+++ b/apps/builder/src/features/blocks/integrations/sendEmail/components/SmtpConfigModal.tsx
@@ -8,13 +8,13 @@ import {
   ModalFooter,
   Button,
 } from '@chakra-ui/react'
-import { useUser } from '@/features/account'
+import { useUser } from '@/features/account/hooks/useUser'
 import React, { useState } from 'react'
 import { isNotDefined } from '@typebot.io/lib'
 import { SmtpConfigForm } from './SmtpConfigForm'
-import { useWorkspace } from '@/features/workspace'
+import { useWorkspace } from '@/features/workspace/WorkspaceProvider'
 import { useToast } from '@/hooks/useToast'
-import { testSmtpConfig } from '../../queries/testSmtpConfigQuery'
+import { testSmtpConfig } from '../queries/testSmtpConfigQuery'
 import { SmtpCredentials } from '@typebot.io/schemas'
 import { trpc } from '@/lib/trpc'
 
diff --git a/apps/builder/src/features/blocks/integrations/sendEmail/index.ts b/apps/builder/src/features/blocks/integrations/sendEmail/index.ts
deleted file mode 100644
index 6786c7a04..000000000
--- a/apps/builder/src/features/blocks/integrations/sendEmail/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export { SendEmailSettings } from './components/SendEmailSettings'
-export { SendEmailContent } from './components/SendEmailContent'
-export { SendEmailIcon } from './components/SendEmailIcon'
diff --git a/apps/builder/src/features/blocks/integrations/sendEmail/queries/sendEmail.spec.ts b/apps/builder/src/features/blocks/integrations/sendEmail/sendEmail.spec.ts
similarity index 100%
rename from apps/builder/src/features/blocks/integrations/sendEmail/queries/sendEmail.spec.ts
rename to apps/builder/src/features/blocks/integrations/sendEmail/sendEmail.spec.ts
diff --git a/apps/builder/src/features/blocks/integrations/webhook/api/procedures/getResultExampleProcedure.ts b/apps/builder/src/features/blocks/integrations/webhook/api/getResultExample.ts
similarity index 87%
rename from apps/builder/src/features/blocks/integrations/webhook/api/procedures/getResultExampleProcedure.ts
rename to apps/builder/src/features/blocks/integrations/webhook/api/getResultExample.ts
index d26b070f5..7b190965b 100644
--- a/apps/builder/src/features/blocks/integrations/webhook/api/procedures/getResultExampleProcedure.ts
+++ b/apps/builder/src/features/blocks/integrations/webhook/api/getResultExample.ts
@@ -1,13 +1,13 @@
-import { getLinkedTypebots } from '@/features/blocks/logic/typebotLink/api'
 import prisma from '@/lib/prisma'
-import { canReadTypebots } from '@/utils/api/dbRules'
-import { authenticatedProcedure } from '@/utils/server/trpc'
+import { canReadTypebots } from '@/helpers/databaseRules'
+import { authenticatedProcedure } from '@/helpers/server/trpc'
 import { TRPCError } from '@trpc/server'
 import { Typebot, Webhook } from '@typebot.io/schemas'
 import { z } from 'zod'
-import { parseResultExample } from '../utils'
+import { getLinkedTypebots } from '@/features/blocks/logic/typebotLink/helpers/getLinkedTypebots'
+import { parseResultExample } from '../helpers/parseResultExample'
 
-export const getResultExampleProcedure = authenticatedProcedure
+export const getResultExample = authenticatedProcedure
   .meta({
     openapi: {
       method: 'GET',
diff --git a/apps/builder/src/features/blocks/integrations/webhook/api/index.ts b/apps/builder/src/features/blocks/integrations/webhook/api/index.ts
deleted file mode 100644
index 398cae734..000000000
--- a/apps/builder/src/features/blocks/integrations/webhook/api/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './router'
diff --git a/apps/builder/src/features/blocks/integrations/webhook/api/procedures/listWebhookBlocksProcedure.ts b/apps/builder/src/features/blocks/integrations/webhook/api/listWebhookBlocks.ts
similarity index 90%
rename from apps/builder/src/features/blocks/integrations/webhook/api/procedures/listWebhookBlocksProcedure.ts
rename to apps/builder/src/features/blocks/integrations/webhook/api/listWebhookBlocks.ts
index 4c39e2d62..9d5ead8a2 100644
--- a/apps/builder/src/features/blocks/integrations/webhook/api/procedures/listWebhookBlocksProcedure.ts
+++ b/apps/builder/src/features/blocks/integrations/webhook/api/listWebhookBlocks.ts
@@ -1,12 +1,12 @@
 import prisma from '@/lib/prisma'
-import { canReadTypebots } from '@/utils/api/dbRules'
-import { authenticatedProcedure } from '@/utils/server/trpc'
+import { canReadTypebots } from '@/helpers/databaseRules'
+import { authenticatedProcedure } from '@/helpers/server/trpc'
 import { TRPCError } from '@trpc/server'
 import { Group, Typebot, Webhook, WebhookBlock } from '@typebot.io/schemas'
 import { byId, isWebhookBlock, parseGroupTitle } from '@typebot.io/lib'
 import { z } from 'zod'
 
-export const listWebhookBlocksProcedure = authenticatedProcedure
+export const listWebhookBlocks = authenticatedProcedure
   .meta({
     openapi: {
       method: 'GET',
diff --git a/apps/builder/src/features/blocks/integrations/webhook/api/procedures/index.ts b/apps/builder/src/features/blocks/integrations/webhook/api/procedures/index.ts
deleted file mode 100644
index 7828fec54..000000000
--- a/apps/builder/src/features/blocks/integrations/webhook/api/procedures/index.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export * from './getResultExampleProcedure'
-export * from './listWebhookBlocksProcedure'
-export * from './subscribeWebhookProcedure'
-export * from './unsubscribeWebhookProcedure'
diff --git a/apps/builder/src/features/blocks/integrations/webhook/api/router.ts b/apps/builder/src/features/blocks/integrations/webhook/api/router.ts
index 6bfdf3f7b..e5fc0204b 100644
--- a/apps/builder/src/features/blocks/integrations/webhook/api/router.ts
+++ b/apps/builder/src/features/blocks/integrations/webhook/api/router.ts
@@ -1,14 +1,12 @@
-import { router } from '@/utils/server/trpc'
-import {
-  listWebhookBlocksProcedure,
-  subscribeWebhookProcedure,
-  unsubscribeWebhookProcedure,
-  getResultExampleProcedure,
-} from './procedures'
+import { router } from '@/helpers/server/trpc'
+import { getResultExample } from './getResultExample'
+import { listWebhookBlocks } from './listWebhookBlocks'
+import { subscribeWebhook } from './subscribeWebhook'
+import { unsubscribeWebhook } from './unsubscribeWebhook'
 
 export const webhookRouter = router({
-  listWebhookBlocks: listWebhookBlocksProcedure,
-  getResultExample: getResultExampleProcedure,
-  subscribeWebhook: subscribeWebhookProcedure,
-  unsubscribeWebhook: unsubscribeWebhookProcedure,
+  listWebhookBlocks,
+  getResultExample,
+  subscribeWebhook,
+  unsubscribeWebhook,
 })
diff --git a/apps/builder/src/features/blocks/integrations/webhook/api/procedures/subscribeWebhookProcedure.ts b/apps/builder/src/features/blocks/integrations/webhook/api/subscribeWebhook.ts
similarity index 90%
rename from apps/builder/src/features/blocks/integrations/webhook/api/procedures/subscribeWebhookProcedure.ts
rename to apps/builder/src/features/blocks/integrations/webhook/api/subscribeWebhook.ts
index d3695e208..560c208f2 100644
--- a/apps/builder/src/features/blocks/integrations/webhook/api/procedures/subscribeWebhookProcedure.ts
+++ b/apps/builder/src/features/blocks/integrations/webhook/api/subscribeWebhook.ts
@@ -1,12 +1,12 @@
 import prisma from '@/lib/prisma'
-import { canWriteTypebots } from '@/utils/api/dbRules'
-import { authenticatedProcedure } from '@/utils/server/trpc'
+import { canWriteTypebots } from '@/helpers/databaseRules'
+import { authenticatedProcedure } from '@/helpers/server/trpc'
 import { TRPCError } from '@trpc/server'
 import { Typebot, Webhook, WebhookBlock } from '@typebot.io/schemas'
 import { byId, isWebhookBlock } from '@typebot.io/lib'
 import { z } from 'zod'
 
-export const subscribeWebhookProcedure = authenticatedProcedure
+export const subscribeWebhook = authenticatedProcedure
   .meta({
     openapi: {
       method: 'POST',
diff --git a/apps/builder/src/features/blocks/integrations/webhook/api/procedures/unsubscribeWebhookProcedure.ts b/apps/builder/src/features/blocks/integrations/webhook/api/unsubscribeWebhook.ts
similarity index 89%
rename from apps/builder/src/features/blocks/integrations/webhook/api/procedures/unsubscribeWebhookProcedure.ts
rename to apps/builder/src/features/blocks/integrations/webhook/api/unsubscribeWebhook.ts
index 96442176b..b4bf1b45c 100644
--- a/apps/builder/src/features/blocks/integrations/webhook/api/procedures/unsubscribeWebhookProcedure.ts
+++ b/apps/builder/src/features/blocks/integrations/webhook/api/unsubscribeWebhook.ts
@@ -1,12 +1,12 @@
 import prisma from '@/lib/prisma'
-import { canWriteTypebots } from '@/utils/api/dbRules'
-import { authenticatedProcedure } from '@/utils/server/trpc'
+import { canWriteTypebots } from '@/helpers/databaseRules'
+import { authenticatedProcedure } from '@/helpers/server/trpc'
 import { TRPCError } from '@trpc/server'
 import { Typebot, Webhook, WebhookBlock } from '@typebot.io/schemas'
 import { byId, isWebhookBlock } from '@typebot.io/lib'
 import { z } from 'zod'
 
-export const unsubscribeWebhookProcedure = authenticatedProcedure
+export const unsubscribeWebhook = authenticatedProcedure
   .meta({
     openapi: {
       method: 'POST',
diff --git a/apps/builder/src/features/blocks/integrations/webhook/api/utils/index.ts b/apps/builder/src/features/blocks/integrations/webhook/api/utils/index.ts
deleted file mode 100644
index 43662fd0b..000000000
--- a/apps/builder/src/features/blocks/integrations/webhook/api/utils/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './parseResultExample'
diff --git a/apps/builder/src/features/blocks/integrations/webhook/components/WebhookSettings/KeyValueInputs.tsx b/apps/builder/src/features/blocks/integrations/webhook/components/KeyValueInputs.tsx
similarity index 100%
rename from apps/builder/src/features/blocks/integrations/webhook/components/WebhookSettings/KeyValueInputs.tsx
rename to apps/builder/src/features/blocks/integrations/webhook/components/KeyValueInputs.tsx
diff --git a/apps/builder/src/features/blocks/integrations/webhook/components/WebhookSettings/ResponseMappingInputs.tsx b/apps/builder/src/features/blocks/integrations/webhook/components/ResponseMappingInputs.tsx
similarity index 100%
rename from apps/builder/src/features/blocks/integrations/webhook/components/WebhookSettings/ResponseMappingInputs.tsx
rename to apps/builder/src/features/blocks/integrations/webhook/components/ResponseMappingInputs.tsx
diff --git a/apps/builder/src/features/blocks/integrations/webhook/components/WebhookSettings/VariableForTestInputs.tsx b/apps/builder/src/features/blocks/integrations/webhook/components/VariableForTestInputs.tsx
similarity index 100%
rename from apps/builder/src/features/blocks/integrations/webhook/components/WebhookSettings/VariableForTestInputs.tsx
rename to apps/builder/src/features/blocks/integrations/webhook/components/VariableForTestInputs.tsx
diff --git a/apps/builder/src/features/blocks/integrations/webhook/components/WebhookAdvancedConfigForm.tsx b/apps/builder/src/features/blocks/integrations/webhook/components/WebhookAdvancedConfigForm.tsx
index a902e766b..6b01e9636 100644
--- a/apps/builder/src/features/blocks/integrations/webhook/components/WebhookAdvancedConfigForm.tsx
+++ b/apps/builder/src/features/blocks/integrations/webhook/components/WebhookAdvancedConfigForm.tsx
@@ -2,7 +2,7 @@ import { DropdownList } from '@/components/DropdownList'
 import { CodeEditor } from '@/components/inputs/CodeEditor'
 import { SwitchWithLabel } from '@/components/inputs/SwitchWithLabel'
 import { TableList, TableListItemProps } from '@/components/TableList'
-import { useTypebot } from '@/features/editor'
+import { useTypebot } from '@/features/editor/providers/TypebotProvider'
 import { useToast } from '@/hooks/useToast'
 import {
   Stack,
@@ -25,14 +25,11 @@ import {
 } from '@typebot.io/schemas'
 import { useState, useMemo } from 'react'
 import { executeWebhook } from '../queries/executeWebhookQuery'
-import { convertVariablesForTestToVariables } from '../utils/convertVariablesForTestToVariables'
-import { getDeepKeys } from '../utils/getDeepKeys'
-import {
-  QueryParamsInputs,
-  HeadersInputs,
-} from './WebhookSettings/KeyValueInputs'
-import { DataVariableInputs } from './WebhookSettings/ResponseMappingInputs'
-import { VariableForTestInputs } from './WebhookSettings/VariableForTestInputs'
+import { convertVariablesForTestToVariables } from '../helpers/convertVariablesForTestToVariables'
+import { getDeepKeys } from '../helpers/getDeepKeys'
+import { QueryParamsInputs, HeadersInputs } from './KeyValueInputs'
+import { DataVariableInputs } from './ResponseMappingInputs'
+import { VariableForTestInputs } from './VariableForTestInputs'
 
 type Props = {
   blockId: string
diff --git a/apps/builder/src/features/blocks/integrations/webhook/components/WebhookContent.tsx b/apps/builder/src/features/blocks/integrations/webhook/components/WebhookContent.tsx
index 8b271947a..773c4d3ae 100644
--- a/apps/builder/src/features/blocks/integrations/webhook/components/WebhookContent.tsx
+++ b/apps/builder/src/features/blocks/integrations/webhook/components/WebhookContent.tsx
@@ -1,5 +1,5 @@
 import { Stack, Text } from '@chakra-ui/react'
-import { useTypebot } from '@/features/editor'
+import { useTypebot } from '@/features/editor/providers/TypebotProvider'
 import { WebhookBlock } from '@typebot.io/schemas'
 import { byId } from '@typebot.io/lib'
 import { SetVariableLabel } from '@/components/SetVariableLabel'
diff --git a/apps/builder/src/features/blocks/integrations/webhook/components/WebhookSettings/WebhookSettings.tsx b/apps/builder/src/features/blocks/integrations/webhook/components/WebhookSettings.tsx
similarity index 90%
rename from apps/builder/src/features/blocks/integrations/webhook/components/WebhookSettings/WebhookSettings.tsx
rename to apps/builder/src/features/blocks/integrations/webhook/components/WebhookSettings.tsx
index 9663d3a00..4386de7eb 100644
--- a/apps/builder/src/features/blocks/integrations/webhook/components/WebhookSettings/WebhookSettings.tsx
+++ b/apps/builder/src/features/blocks/integrations/webhook/components/WebhookSettings.tsx
@@ -1,10 +1,10 @@
 import React, { useState } from 'react'
 import { Spinner, Stack } from '@chakra-ui/react'
-import { useTypebot } from '@/features/editor'
+import { useTypebot } from '@/features/editor/providers/TypebotProvider'
 import { WebhookOptions, Webhook, WebhookBlock } from '@typebot.io/schemas'
 import { byId } from '@typebot.io/lib'
 import { TextInput } from '@/components/inputs'
-import { WebhookAdvancedConfigForm } from '../WebhookAdvancedConfigForm'
+import { WebhookAdvancedConfigForm } from './WebhookAdvancedConfigForm'
 
 type Props = {
   block: WebhookBlock
diff --git a/apps/builder/src/features/blocks/integrations/webhook/components/WebhookSettings/index.tsx b/apps/builder/src/features/blocks/integrations/webhook/components/WebhookSettings/index.tsx
deleted file mode 100644
index 0a2775b8f..000000000
--- a/apps/builder/src/features/blocks/integrations/webhook/components/WebhookSettings/index.tsx
+++ /dev/null
@@ -1 +0,0 @@
-export { WebhookSettings } from './WebhookSettings'
diff --git a/apps/builder/src/features/blocks/integrations/webhook/utils/convertVariablesForTestToVariables.ts b/apps/builder/src/features/blocks/integrations/webhook/helpers/convertVariablesForTestToVariables.ts
similarity index 100%
rename from apps/builder/src/features/blocks/integrations/webhook/utils/convertVariablesForTestToVariables.ts
rename to apps/builder/src/features/blocks/integrations/webhook/helpers/convertVariablesForTestToVariables.ts
diff --git a/apps/builder/src/features/blocks/integrations/webhook/utils/getDeepKeys.ts b/apps/builder/src/features/blocks/integrations/webhook/helpers/getDeepKeys.ts
similarity index 100%
rename from apps/builder/src/features/blocks/integrations/webhook/utils/getDeepKeys.ts
rename to apps/builder/src/features/blocks/integrations/webhook/helpers/getDeepKeys.ts
diff --git a/apps/builder/src/features/blocks/integrations/webhook/api/utils/parseResultExample.ts b/apps/builder/src/features/blocks/integrations/webhook/helpers/parseResultExample.ts
similarity index 100%
rename from apps/builder/src/features/blocks/integrations/webhook/api/utils/parseResultExample.ts
rename to apps/builder/src/features/blocks/integrations/webhook/helpers/parseResultExample.ts
diff --git a/apps/builder/src/features/blocks/integrations/webhook/index.ts b/apps/builder/src/features/blocks/integrations/webhook/index.ts
deleted file mode 100644
index 1964cacab..000000000
--- a/apps/builder/src/features/blocks/integrations/webhook/index.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export { duplicateWebhookQuery } from './queries/duplicateWebhookQuery'
-export { WebhookSettings } from './components/WebhookSettings'
-export { WebhookContent } from './components/WebhookContent'
-export { WebhookIcon } from './components/WebhookIcon'
diff --git a/apps/builder/src/features/blocks/integrations/zapier/components/ZapierContent.tsx b/apps/builder/src/features/blocks/integrations/zapier/components/ZapierContent.tsx
index 013730ebb..f13ad83e2 100644
--- a/apps/builder/src/features/blocks/integrations/zapier/components/ZapierContent.tsx
+++ b/apps/builder/src/features/blocks/integrations/zapier/components/ZapierContent.tsx
@@ -1,5 +1,5 @@
 import { Text } from '@chakra-ui/react'
-import { useTypebot } from '@/features/editor'
+import { useTypebot } from '@/features/editor/providers/TypebotProvider'
 import { ZapierBlock } from '@typebot.io/schemas'
 import { byId, isNotDefined } from '@typebot.io/lib'
 
diff --git a/apps/builder/src/features/blocks/integrations/zapier/components/ZapierSettings.tsx b/apps/builder/src/features/blocks/integrations/zapier/components/ZapierSettings.tsx
index 9f464cdee..e4a3b3757 100644
--- a/apps/builder/src/features/blocks/integrations/zapier/components/ZapierSettings.tsx
+++ b/apps/builder/src/features/blocks/integrations/zapier/components/ZapierSettings.tsx
@@ -1,6 +1,6 @@
 import { Alert, AlertIcon, Button, Link, Stack, Text } from '@chakra-ui/react'
 import { ExternalLinkIcon } from '@/components/icons'
-import { useTypebot } from '@/features/editor'
+import { useTypebot } from '@/features/editor/providers/TypebotProvider'
 import { Webhook, WebhookOptions, ZapierBlock } from '@typebot.io/schemas'
 import React, { useCallback, useEffect, useState } from 'react'
 import { byId } from '@typebot.io/lib'
diff --git a/apps/builder/src/features/blocks/integrations/zapier/index.ts b/apps/builder/src/features/blocks/integrations/zapier/index.ts
deleted file mode 100644
index a3d4c9f50..000000000
--- a/apps/builder/src/features/blocks/integrations/zapier/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export { ZapierSettings } from './components/ZapierSettings'
-export { ZapierContent } from './components/ZapierContent'
-export { ZapierLogo } from './components/ZapierLogo'
diff --git a/apps/builder/src/features/blocks/logic/condition/components/ConditionItemForm/ComparisonItem.tsx b/apps/builder/src/features/blocks/logic/condition/components/ComparisonItem.tsx
similarity index 100%
rename from apps/builder/src/features/blocks/logic/condition/components/ConditionItemForm/ComparisonItem.tsx
rename to apps/builder/src/features/blocks/logic/condition/components/ComparisonItem.tsx
diff --git a/apps/builder/src/features/blocks/logic/condition/components/ConditionItemForm/ConditionItemForm.tsx b/apps/builder/src/features/blocks/logic/condition/components/ConditionItemForm.tsx
similarity index 100%
rename from apps/builder/src/features/blocks/logic/condition/components/ConditionItemForm/ConditionItemForm.tsx
rename to apps/builder/src/features/blocks/logic/condition/components/ConditionItemForm.tsx
diff --git a/apps/builder/src/features/blocks/logic/condition/components/ConditionItemForm/index.tsx b/apps/builder/src/features/blocks/logic/condition/components/ConditionItemForm/index.tsx
deleted file mode 100644
index 768d58624..000000000
--- a/apps/builder/src/features/blocks/logic/condition/components/ConditionItemForm/index.tsx
+++ /dev/null
@@ -1 +0,0 @@
-export * from './ConditionItemForm'
diff --git a/apps/builder/src/features/blocks/logic/condition/components/ConditionItemNode.tsx b/apps/builder/src/features/blocks/logic/condition/components/ConditionItemNode.tsx
index d61bc20f6..331a9a5cd 100644
--- a/apps/builder/src/features/blocks/logic/condition/components/ConditionItemNode.tsx
+++ b/apps/builder/src/features/blocks/logic/condition/components/ConditionItemNode.tsx
@@ -15,7 +15,7 @@ import {
   useEventListener,
   useColorModeValue,
 } from '@chakra-ui/react'
-import { useTypebot } from '@/features/editor'
+import { useTypebot } from '@/features/editor/providers/TypebotProvider'
 import {
   Comparison,
   ConditionItem,
@@ -27,7 +27,7 @@ import React, { useRef } from 'react'
 import { byId, isNotDefined } from '@typebot.io/lib'
 import { PlusIcon } from '@/components/icons'
 import { ConditionItemForm } from './ConditionItemForm'
-import { useGraph } from '@/features/graph'
+import { useGraph } from '@/features/graph/providers/GraphProvider'
 import { createId } from '@paralleldrive/cuid2'
 
 type Props = {
diff --git a/apps/builder/src/features/blocks/logic/condition/index.ts b/apps/builder/src/features/blocks/logic/condition/index.ts
deleted file mode 100644
index 42ee1370d..000000000
--- a/apps/builder/src/features/blocks/logic/condition/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from './components/ConditionItemNode'
-export * from './components/ConditionIcon'
diff --git a/apps/builder/src/features/blocks/logic/jump/components/JumpNodeBody.tsx b/apps/builder/src/features/blocks/logic/jump/components/JumpNodeBody.tsx
index 95fc7b2e2..4bc79ea4d 100644
--- a/apps/builder/src/features/blocks/logic/jump/components/JumpNodeBody.tsx
+++ b/apps/builder/src/features/blocks/logic/jump/components/JumpNodeBody.tsx
@@ -1,6 +1,6 @@
 import React from 'react'
 import { Tag, Text } from '@chakra-ui/react'
-import { useTypebot } from '@/features/editor'
+import { useTypebot } from '@/features/editor/providers/TypebotProvider'
 import { byId, isDefined, parseGroupTitle } from '@typebot.io/lib'
 import { JumpBlock } from '@typebot.io/schemas/features/blocks/logic/jump'
 
diff --git a/apps/builder/src/features/blocks/logic/jump/components/JumpSettings.tsx b/apps/builder/src/features/blocks/logic/jump/components/JumpSettings.tsx
index 37212b487..589910d42 100644
--- a/apps/builder/src/features/blocks/logic/jump/components/JumpSettings.tsx
+++ b/apps/builder/src/features/blocks/logic/jump/components/JumpSettings.tsx
@@ -1,5 +1,5 @@
 import { Select } from '@/components/inputs/Select'
-import { useTypebot } from '@/features/editor'
+import { useTypebot } from '@/features/editor/providers/TypebotProvider'
 import { Stack } from '@chakra-ui/react'
 import { JumpBlock } from '@typebot.io/schemas/features/blocks/logic/jump'
 import React from 'react'
diff --git a/apps/builder/src/features/blocks/logic/redirect/index.ts b/apps/builder/src/features/blocks/logic/redirect/index.ts
deleted file mode 100644
index 7f979aefd..000000000
--- a/apps/builder/src/features/blocks/logic/redirect/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export { RedirectSettings } from './components/RedirectSettings'
-export { RedirectNodeContent } from './components/RedirectNodeContent'
-export { RedirectIcon } from './components/RedirectIcon'
diff --git a/apps/builder/src/features/blocks/logic/script/index.ts b/apps/builder/src/features/blocks/logic/script/index.ts
deleted file mode 100644
index 96b97ebb5..000000000
--- a/apps/builder/src/features/blocks/logic/script/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export { ScriptSettings } from './components/ScriptSettings'
-export { ScriptNodeContent } from './components/ScriptNodeContent'
-export { ScriptIcon } from './components/ScriptIcon'
diff --git a/apps/builder/src/features/blocks/logic/setVariable/components/SetVariableContent.tsx b/apps/builder/src/features/blocks/logic/setVariable/components/SetVariableContent.tsx
index 5aafba32c..892ee9945 100644
--- a/apps/builder/src/features/blocks/logic/setVariable/components/SetVariableContent.tsx
+++ b/apps/builder/src/features/blocks/logic/setVariable/components/SetVariableContent.tsx
@@ -1,5 +1,5 @@
 import { Text } from '@chakra-ui/react'
-import { useTypebot } from '@/features/editor'
+import { useTypebot } from '@/features/editor/providers/TypebotProvider'
 import { SetVariableBlock } from '@typebot.io/schemas'
 import { byId } from '@typebot.io/lib'
 
diff --git a/apps/builder/src/features/blocks/logic/setVariable/index.ts b/apps/builder/src/features/blocks/logic/setVariable/index.ts
deleted file mode 100644
index 8041e713d..000000000
--- a/apps/builder/src/features/blocks/logic/setVariable/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export { SetVariableSettings } from './components/SetVariableSettings'
-export { SetVariableContent } from './components/SetVariableContent'
-export { SetVariableIcon } from './components/SetVariableIcon'
diff --git a/apps/builder/src/features/blocks/logic/typebotLink/api/index.ts b/apps/builder/src/features/blocks/logic/typebotLink/api/index.ts
deleted file mode 100644
index 9c56149ef..000000000
--- a/apps/builder/src/features/blocks/logic/typebotLink/api/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './utils'
diff --git a/apps/builder/src/features/blocks/logic/typebotLink/api/utils/index.ts b/apps/builder/src/features/blocks/logic/typebotLink/api/utils/index.ts
deleted file mode 100644
index d64ba2009..000000000
--- a/apps/builder/src/features/blocks/logic/typebotLink/api/utils/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './getLinkedTypebots'
diff --git a/apps/builder/src/features/blocks/logic/typebotLink/components/TypebotLinkForm/GroupsDropdown.tsx b/apps/builder/src/features/blocks/logic/typebotLink/components/GroupsDropdown.tsx
similarity index 100%
rename from apps/builder/src/features/blocks/logic/typebotLink/components/TypebotLinkForm/GroupsDropdown.tsx
rename to apps/builder/src/features/blocks/logic/typebotLink/components/GroupsDropdown.tsx
diff --git a/apps/builder/src/features/blocks/logic/typebotLink/components/TypebotLinkForm/TypebotLinkForm.tsx b/apps/builder/src/features/blocks/logic/typebotLink/components/TypebotLinkForm.tsx
similarity index 95%
rename from apps/builder/src/features/blocks/logic/typebotLink/components/TypebotLinkForm/TypebotLinkForm.tsx
rename to apps/builder/src/features/blocks/logic/typebotLink/components/TypebotLinkForm.tsx
index 8a19d14c3..4fa1ecdc0 100644
--- a/apps/builder/src/features/blocks/logic/typebotLink/components/TypebotLinkForm/TypebotLinkForm.tsx
+++ b/apps/builder/src/features/blocks/logic/typebotLink/components/TypebotLinkForm.tsx
@@ -1,5 +1,5 @@
 import { Stack } from '@chakra-ui/react'
-import { useTypebot } from '@/features/editor'
+import { useTypebot } from '@/features/editor/providers/TypebotProvider'
 import { TypebotLinkOptions } from '@typebot.io/schemas'
 import { byId } from '@typebot.io/lib'
 import { GroupsDropdown } from './GroupsDropdown'
diff --git a/apps/builder/src/features/blocks/logic/typebotLink/components/TypebotLinkForm/index.tsx b/apps/builder/src/features/blocks/logic/typebotLink/components/TypebotLinkForm/index.tsx
deleted file mode 100644
index c8184363a..000000000
--- a/apps/builder/src/features/blocks/logic/typebotLink/components/TypebotLinkForm/index.tsx
+++ /dev/null
@@ -1 +0,0 @@
-export { TypebotLinkForm } from './TypebotLinkForm'
diff --git a/apps/builder/src/features/blocks/logic/typebotLink/components/TypebotLinkNode.tsx b/apps/builder/src/features/blocks/logic/typebotLink/components/TypebotLinkNode.tsx
index 56e8b8df3..47dad2de7 100644
--- a/apps/builder/src/features/blocks/logic/typebotLink/components/TypebotLinkNode.tsx
+++ b/apps/builder/src/features/blocks/logic/typebotLink/components/TypebotLinkNode.tsx
@@ -1,7 +1,7 @@
 import { TypebotLinkBlock } from '@typebot.io/schemas'
 import React from 'react'
 import { Tag, Text } from '@chakra-ui/react'
-import { useTypebot } from '@/features/editor'
+import { useTypebot } from '@/features/editor/providers/TypebotProvider'
 import { byId } from '@typebot.io/lib'
 
 type Props = {
diff --git a/apps/builder/src/features/blocks/logic/typebotLink/components/TypebotLinkForm/TypebotsDropdown.tsx b/apps/builder/src/features/blocks/logic/typebotLink/components/TypebotsDropdown.tsx
similarity index 96%
rename from apps/builder/src/features/blocks/logic/typebotLink/components/TypebotLinkForm/TypebotsDropdown.tsx
rename to apps/builder/src/features/blocks/logic/typebotLink/components/TypebotsDropdown.tsx
index 9e5cec9e0..0267268cd 100644
--- a/apps/builder/src/features/blocks/logic/typebotLink/components/TypebotLinkForm/TypebotsDropdown.tsx
+++ b/apps/builder/src/features/blocks/logic/typebotLink/components/TypebotsDropdown.tsx
@@ -3,9 +3,9 @@ import { ExternalLinkIcon } from '@/components/icons'
 import { useToast } from '@/hooks/useToast'
 import Link from 'next/link'
 import { useRouter } from 'next/router'
-import { useTypebots } from '@/features/dashboard'
 import { Select } from '@/components/inputs/Select'
 import { EmojiOrImageIcon } from '@/components/EmojiOrImageIcon'
+import { useTypebots } from '@/features/dashboard/hooks/useTypebots'
 
 type Props = {
   idsToExclude: string[]
diff --git a/apps/builder/src/features/blocks/logic/typebotLink/components/index.ts b/apps/builder/src/features/blocks/logic/typebotLink/components/index.ts
deleted file mode 100644
index a6e900091..000000000
--- a/apps/builder/src/features/blocks/logic/typebotLink/components/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export * from './TypebotLinkNode'
-export * from './TypebotLinkIcon'
-export * from './TypebotLinkForm'
diff --git a/apps/builder/src/features/blocks/logic/typebotLink/api/utils/getLinkedTypebots.ts b/apps/builder/src/features/blocks/logic/typebotLink/helpers/getLinkedTypebots.ts
similarity index 95%
rename from apps/builder/src/features/blocks/logic/typebotLink/api/utils/getLinkedTypebots.ts
rename to apps/builder/src/features/blocks/logic/typebotLink/helpers/getLinkedTypebots.ts
index b53de1802..7c3e9efb5 100644
--- a/apps/builder/src/features/blocks/logic/typebotLink/api/utils/getLinkedTypebots.ts
+++ b/apps/builder/src/features/blocks/logic/typebotLink/helpers/getLinkedTypebots.ts
@@ -1,5 +1,5 @@
 import prisma from '@/lib/prisma'
-import { canReadTypebots } from '@/utils/api/dbRules'
+import { canReadTypebots } from '@/helpers/databaseRules'
 import { User } from '@typebot.io/prisma'
 import {
   LogicBlockType,
diff --git a/apps/builder/src/features/blocks/logic/typebotLink/index.ts b/apps/builder/src/features/blocks/logic/typebotLink/index.ts
deleted file mode 100644
index cb64ac1b5..000000000
--- a/apps/builder/src/features/blocks/logic/typebotLink/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './components'
diff --git a/apps/builder/src/features/collaboration/components/CollaborationMenuButton/CollaborationList.tsx b/apps/builder/src/features/collaboration/components/CollaborationList.tsx
similarity index 92%
rename from apps/builder/src/features/collaboration/components/CollaborationMenuButton/CollaborationList.tsx
rename to apps/builder/src/features/collaboration/components/CollaborationList.tsx
index 8081b0437..a2e6ca362 100644
--- a/apps/builder/src/features/collaboration/components/CollaborationMenuButton/CollaborationList.tsx
+++ b/apps/builder/src/features/collaboration/components/CollaborationList.tsx
@@ -15,19 +15,19 @@ import {
 } from '@chakra-ui/react'
 import { ChevronLeftIcon } from '@/components/icons'
 import { useToast } from '@/hooks/useToast'
-import { useTypebot } from '@/features/editor'
-import { useWorkspace } from '@/features/workspace'
+import { useTypebot } from '@/features/editor/providers/TypebotProvider'
+import { useWorkspace } from '@/features/workspace/WorkspaceProvider'
 import { CollaborationType, WorkspaceRole } from '@typebot.io/prisma'
 import React, { FormEvent, useState } from 'react'
 import { CollaboratorItem } from './CollaboratorButton'
 import { EmojiOrImageIcon } from '@/components/EmojiOrImageIcon'
-import { useCollaborators } from '../../hooks/useCollaborators'
-import { useInvitations } from '../../hooks/useInvitations'
-import { updateInvitationQuery } from '../../queries/updateInvitationQuery'
-import { deleteInvitationQuery } from '../../queries/deleteInvitationQuery'
-import { updateCollaboratorQuery } from '../../queries/updateCollaboratorQuery'
-import { deleteCollaboratorQuery } from '../../queries/deleteCollaboratorQuery'
-import { sendInvitationQuery } from '../../queries/sendInvitationQuery'
+import { useCollaborators } from '../hooks/useCollaborators'
+import { useInvitations } from '../hooks/useInvitations'
+import { updateInvitationQuery } from '../queries/updateInvitationQuery'
+import { deleteInvitationQuery } from '../queries/deleteInvitationQuery'
+import { updateCollaboratorQuery } from '../queries/updateCollaboratorQuery'
+import { deleteCollaboratorQuery } from '../queries/deleteCollaboratorQuery'
+import { sendInvitationQuery } from '../queries/sendInvitationQuery'
 
 export const CollaborationList = () => {
   const { currentRole, workspace } = useWorkspace()
diff --git a/apps/builder/src/features/collaboration/components/CollaborationMenuButton/CollaborationMenuButton.tsx b/apps/builder/src/features/collaboration/components/CollaborationMenuButton.tsx
similarity index 100%
rename from apps/builder/src/features/collaboration/components/CollaborationMenuButton/CollaborationMenuButton.tsx
rename to apps/builder/src/features/collaboration/components/CollaborationMenuButton.tsx
diff --git a/apps/builder/src/features/collaboration/components/CollaborationMenuButton/index.tsx b/apps/builder/src/features/collaboration/components/CollaborationMenuButton/index.tsx
deleted file mode 100644
index 0616972eb..000000000
--- a/apps/builder/src/features/collaboration/components/CollaborationMenuButton/index.tsx
+++ /dev/null
@@ -1 +0,0 @@
-export * from './CollaborationMenuButton'
diff --git a/apps/builder/src/features/collaboration/components/CollaborationMenuButton/CollaboratorButton.tsx b/apps/builder/src/features/collaboration/components/CollaboratorButton.tsx
similarity index 100%
rename from apps/builder/src/features/collaboration/components/CollaborationMenuButton/CollaboratorButton.tsx
rename to apps/builder/src/features/collaboration/components/CollaboratorButton.tsx
diff --git a/apps/builder/src/features/collaboration/hooks/useCollaborators.ts b/apps/builder/src/features/collaboration/hooks/useCollaborators.ts
index 966524f0c..f41cdec9d 100644
--- a/apps/builder/src/features/collaboration/hooks/useCollaborators.ts
+++ b/apps/builder/src/features/collaboration/hooks/useCollaborators.ts
@@ -1,4 +1,4 @@
-import { fetcher } from '@/utils/helpers'
+import { fetcher } from '@/helpers/fetcher'
 import useSWR from 'swr'
 import { Collaborator } from '../types'
 
diff --git a/apps/builder/src/features/collaboration/hooks/useInvitations.ts b/apps/builder/src/features/collaboration/hooks/useInvitations.ts
index 5a4b164a2..37c1540e0 100644
--- a/apps/builder/src/features/collaboration/hooks/useInvitations.ts
+++ b/apps/builder/src/features/collaboration/hooks/useInvitations.ts
@@ -1,4 +1,4 @@
-import { fetcher } from '@/utils/helpers'
+import { fetcher } from '@/helpers/fetcher'
 import { Invitation } from '@typebot.io/prisma'
 import useSWR from 'swr'
 import { env } from '@typebot.io/lib'
diff --git a/apps/builder/src/features/collaboration/index.ts b/apps/builder/src/features/collaboration/index.ts
deleted file mode 100644
index 11fe07b34..000000000
--- a/apps/builder/src/features/collaboration/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { CollaborationMenuButton } from './components/CollaborationMenuButton'
diff --git a/apps/builder/src/features/credentials/api/createCredentials.ts b/apps/builder/src/features/credentials/api/createCredentials.ts
index 535f3ace1..86138f74d 100644
--- a/apps/builder/src/features/credentials/api/createCredentials.ts
+++ b/apps/builder/src/features/credentials/api/createCredentials.ts
@@ -1,5 +1,5 @@
 import prisma from '@/lib/prisma'
-import { authenticatedProcedure } from '@/utils/server/trpc'
+import { authenticatedProcedure } from '@/helpers/server/trpc'
 import { TRPCError } from '@trpc/server'
 import { stripeCredentialsSchema } from '@typebot.io/schemas/features/blocks/inputs/payment/schemas'
 import { googleSheetsCredentialsSchema } from '@typebot.io/schemas/features/blocks/integrations/googleSheets/schemas'
diff --git a/apps/builder/src/features/credentials/api/deleteCredentials.ts b/apps/builder/src/features/credentials/api/deleteCredentials.ts
index 957fdcf75..c3e0fcded 100644
--- a/apps/builder/src/features/credentials/api/deleteCredentials.ts
+++ b/apps/builder/src/features/credentials/api/deleteCredentials.ts
@@ -1,5 +1,5 @@
 import prisma from '@/lib/prisma'
-import { authenticatedProcedure } from '@/utils/server/trpc'
+import { authenticatedProcedure } from '@/helpers/server/trpc'
 import { TRPCError } from '@trpc/server'
 import { z } from 'zod'
 
diff --git a/apps/builder/src/features/credentials/api/listCredentials.ts b/apps/builder/src/features/credentials/api/listCredentials.ts
index 9bb8fa464..3a551577a 100644
--- a/apps/builder/src/features/credentials/api/listCredentials.ts
+++ b/apps/builder/src/features/credentials/api/listCredentials.ts
@@ -1,5 +1,5 @@
 import prisma from '@/lib/prisma'
-import { authenticatedProcedure } from '@/utils/server/trpc'
+import { authenticatedProcedure } from '@/helpers/server/trpc'
 import { TRPCError } from '@trpc/server'
 import { stripeCredentialsSchema } from '@typebot.io/schemas/features/blocks/inputs/payment/schemas'
 import { googleSheetsCredentialsSchema } from '@typebot.io/schemas/features/blocks/integrations/googleSheets/schemas'
diff --git a/apps/builder/src/features/credentials/api/router.ts b/apps/builder/src/features/credentials/api/router.ts
index bc218b548..e52fced93 100644
--- a/apps/builder/src/features/credentials/api/router.ts
+++ b/apps/builder/src/features/credentials/api/router.ts
@@ -1,4 +1,4 @@
-import { router } from '@/utils/server/trpc'
+import { router } from '@/helpers/server/trpc'
 import { createCredentials } from './createCredentials'
 import { deleteCredentials } from './deleteCredentials'
 import { listCredentials } from './listCredentials'
diff --git a/apps/builder/src/features/credentials/index.ts b/apps/builder/src/features/credentials/index.ts
deleted file mode 100644
index 5d95740a0..000000000
--- a/apps/builder/src/features/credentials/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { CredentialsDropdown } from './components/CredentialsDropdown'
diff --git a/apps/builder/src/features/customDomains/components/CustomDomainsDropdown.tsx b/apps/builder/src/features/customDomains/components/CustomDomainsDropdown.tsx
index 53c6cc14e..9a7ffe361 100644
--- a/apps/builder/src/features/customDomains/components/CustomDomainsDropdown.tsx
+++ b/apps/builder/src/features/customDomains/components/CustomDomainsDropdown.tsx
@@ -13,7 +13,7 @@ import {
 import { ChevronLeftIcon, PlusIcon, TrashIcon } from '@/components/icons'
 import React, { useState } from 'react'
 import { CustomDomainModal } from './CustomDomainModal'
-import { useWorkspace } from '@/features/workspace'
+import { useWorkspace } from '@/features/workspace/WorkspaceProvider'
 import { useToast } from '@/hooks/useToast'
 import { useCustomDomains } from '../hooks/useCustomDomains'
 import { deleteCustomDomainQuery } from '../queries/deleteCustomDomainQuery'
diff --git a/apps/builder/src/features/customDomains/hooks/useCustomDomains.ts b/apps/builder/src/features/customDomains/hooks/useCustomDomains.ts
index 0d1133298..916b0a41f 100644
--- a/apps/builder/src/features/customDomains/hooks/useCustomDomains.ts
+++ b/apps/builder/src/features/customDomains/hooks/useCustomDomains.ts
@@ -1,6 +1,6 @@
 import { CustomDomain } from '@typebot.io/prisma'
 import { stringify } from 'qs'
-import { fetcher } from '@/utils/helpers'
+import { fetcher } from '@/helpers/fetcher'
 import useSWR from 'swr'
 
 export const useCustomDomains = ({
diff --git a/apps/builder/src/features/customDomains/index.ts b/apps/builder/src/features/customDomains/index.ts
deleted file mode 100644
index 915a10eff..000000000
--- a/apps/builder/src/features/customDomains/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { CustomDomainsDropdown } from './components/CustomDomainsDropdown'
diff --git a/apps/builder/src/features/dashboard/api/getAppVersionProcedure.ts b/apps/builder/src/features/dashboard/api/getAppVersionProcedure.ts
index 21f460e8a..2371190ca 100644
--- a/apps/builder/src/features/dashboard/api/getAppVersionProcedure.ts
+++ b/apps/builder/src/features/dashboard/api/getAppVersionProcedure.ts
@@ -1,4 +1,4 @@
-import { publicProcedure } from '@/utils/server/trpc'
+import { publicProcedure } from '@/helpers/server/trpc'
 
 export const getAppVersionProcedure = publicProcedure.query(async () => {
   return { commitSha: process.env.VERCEL_GIT_COMMIT_SHA }
diff --git a/apps/builder/src/features/dashboard/components/DashboardHeader.tsx b/apps/builder/src/features/dashboard/components/DashboardHeader.tsx
index f7bc9039a..daf21a6ea 100644
--- a/apps/builder/src/features/dashboard/components/DashboardHeader.tsx
+++ b/apps/builder/src/features/dashboard/components/DashboardHeader.tsx
@@ -2,13 +2,14 @@ import React from 'react'
 import { HStack, Flex, Button, useDisclosure } from '@chakra-ui/react'
 import { HardDriveIcon, SettingsIcon } from '@/components/icons'
 import { signOut } from 'next-auth/react'
-import { useUser } from '@/features/account'
-import { useWorkspace, WorkspaceDropdown } from '@/features/workspace'
+import { useUser } from '@/features/account/hooks/useUser'
 import { isNotDefined } from '@typebot.io/lib'
 import Link from 'next/link'
-import { WorkspaceSettingsModal } from '@/features/workspace'
 import { EmojiOrImageIcon } from '@/components/EmojiOrImageIcon'
 import { useScopedI18n } from '@/locales'
+import { useWorkspace } from '@/features/workspace/WorkspaceProvider'
+import { WorkspaceDropdown } from '@/features/workspace/components/WorkspaceDropdown'
+import { WorkspaceSettingsModal } from '@/features/workspace/components/WorkspaceSettingsModal'
 
 export const DashboardHeader = () => {
   const scopedT = useScopedI18n('dashboard.header')
diff --git a/apps/builder/src/features/dashboard/components/DashboardPage.tsx b/apps/builder/src/features/dashboard/components/DashboardPage.tsx
index da35fd274..7d5ef40ad 100644
--- a/apps/builder/src/features/dashboard/components/DashboardPage.tsx
+++ b/apps/builder/src/features/dashboard/components/DashboardPage.tsx
@@ -1,12 +1,10 @@
 import { Seo } from '@/components/Seo'
-import { useUser } from '@/features/account'
+import { useUser } from '@/features/account/hooks/useUser'
 import {
   PreCheckoutModal,
   PreCheckoutModalProps,
 } from '@/features/billing/components/PreCheckoutModal'
-import { TypebotDndProvider, FolderContent } from '@/features/folders'
-import { ParentModalProvider } from '@/features/graph'
-import { useWorkspace } from '@/features/workspace'
+import { useWorkspace } from '@/features/workspace/WorkspaceProvider'
 import { useScopedI18n } from '@/locales'
 import { Stack, VStack, Spinner, Text } from '@chakra-ui/react'
 import { Plan } from '@typebot.io/prisma'
@@ -14,6 +12,9 @@ import { useRouter } from 'next/router'
 import { useState, useEffect } from 'react'
 import { guessIfUserIsEuropean } from '@typebot.io/lib/pricing'
 import { DashboardHeader } from './DashboardHeader'
+import { FolderContent } from '@/features/folders/components/FolderContent'
+import { TypebotDndProvider } from '@/features/folders/TypebotDndProvider'
+import { ParentModalProvider } from '@/features/graph/providers/ParentModalProvider'
 
 export const DashboardPage = () => {
   const scopedT = useScopedI18n('dashboard')
diff --git a/apps/builder/src/features/dashboard/components/OnboardingModal.tsx b/apps/builder/src/features/dashboard/components/OnboardingModal.tsx
index f1670604d..fd834608a 100644
--- a/apps/builder/src/features/dashboard/components/OnboardingModal.tsx
+++ b/apps/builder/src/features/dashboard/components/OnboardingModal.tsx
@@ -1,6 +1,6 @@
 import { chakra, useColorModeValue } from '@chakra-ui/react'
 import { Popup } from '@typebot.io/react'
-import { useUser } from '@/features/account'
+import { useUser } from '@/features/account/hooks/useUser'
 import { Typebot } from '@typebot.io/schemas'
 import React, { useEffect, useRef, useState } from 'react'
 import { sendRequest } from '@typebot.io/lib'
diff --git a/apps/builder/src/features/dashboard/index.ts b/apps/builder/src/features/dashboard/index.ts
deleted file mode 100644
index 81b0c242c..000000000
--- a/apps/builder/src/features/dashboard/index.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-export { DashboardPage } from './components/DashboardPage'
-export { DashboardHeader } from './components/DashboardHeader'
-export { parseNewTypebot } from './api/parseNewTypebot'
-export {
-  createTypebotQuery,
-  importTypebotQuery,
-  getTypebotQuery,
-  deleteTypebotQuery,
-} from './queries'
-export type { TypebotInDashboard } from './types'
-export { useTypebots } from './hooks/useTypebots'
diff --git a/apps/builder/src/features/dashboard/queries/importTypebotQuery.ts b/apps/builder/src/features/dashboard/queries/importTypebotQuery.ts
index a67aa8378..b16640977 100644
--- a/apps/builder/src/features/dashboard/queries/importTypebotQuery.ts
+++ b/apps/builder/src/features/dashboard/queries/importTypebotQuery.ts
@@ -1,4 +1,3 @@
-import { duplicateWebhookQuery } from '@/features/blocks/integrations/webhook'
 import { createId } from '@paralleldrive/cuid2'
 import { Plan, Prisma } from '@typebot.io/prisma'
 import {
@@ -14,6 +13,7 @@ import {
   isWebhookBlock,
   sendRequest,
 } from '@typebot.io/lib'
+import { duplicateWebhookQuery } from '@/features/blocks/integrations/webhook/queries/duplicateWebhookQuery'
 
 export const importTypebotQuery = async (typebot: Typebot, userPlan: Plan) => {
   const { typebot: newTypebot, webhookIdsMapping } = duplicateTypebot(
diff --git a/apps/builder/src/features/dashboard/queries/index.ts b/apps/builder/src/features/dashboard/queries/index.ts
deleted file mode 100644
index 76ecdb215..000000000
--- a/apps/builder/src/features/dashboard/queries/index.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export * from './createTypebotQuery'
-export * from './deleteTypebotQuery'
-export * from './getTypebotQuery'
-export * from './importTypebotQuery'
diff --git a/apps/builder/src/features/editor/components/BlocksSideBar/BlockCard.tsx b/apps/builder/src/features/editor/components/BlockCard.tsx
similarity index 93%
rename from apps/builder/src/features/editor/components/BlocksSideBar/BlockCard.tsx
rename to apps/builder/src/features/editor/components/BlockCard.tsx
index 7f521f106..d742b0bd5 100644
--- a/apps/builder/src/features/editor/components/BlocksSideBar/BlockCard.tsx
+++ b/apps/builder/src/features/editor/components/BlockCard.tsx
@@ -6,13 +6,14 @@ import {
   IntegrationBlockType,
   LogicBlockType,
 } from '@typebot.io/schemas'
-import { useBlockDnd } from '@/features/graph'
+import { useBlockDnd } from '@/features/graph/providers/GraphDndProvider'
 import React, { useEffect, useState } from 'react'
 import { BlockIcon } from './BlockIcon'
-import { isFreePlan, LockTag } from '@/features/billing'
+import { isFreePlan } from '@/features/billing/helpers/isFreePlan'
 import { Plan } from '@typebot.io/prisma'
-import { useWorkspace } from '@/features/workspace'
+import { useWorkspace } from '@/features/workspace/WorkspaceProvider'
 import { BlockLabel } from './BlockLabel'
+import { LockTag } from '@/features/billing/components/LockTag'
 
 type Props = {
   type: DraggableBlockType
diff --git a/apps/builder/src/features/editor/components/BlocksSideBar/BlockCardOverlay.tsx b/apps/builder/src/features/editor/components/BlockCardOverlay.tsx
similarity index 100%
rename from apps/builder/src/features/editor/components/BlocksSideBar/BlockCardOverlay.tsx
rename to apps/builder/src/features/editor/components/BlockCardOverlay.tsx
diff --git a/apps/builder/src/features/editor/components/BlocksSideBar/BlockIcon.tsx b/apps/builder/src/features/editor/components/BlockIcon.tsx
similarity index 82%
rename from apps/builder/src/features/editor/components/BlocksSideBar/BlockIcon.tsx
rename to apps/builder/src/features/editor/components/BlockIcon.tsx
index 1f1c3773a..cea9c5d4e 100644
--- a/apps/builder/src/features/editor/components/BlocksSideBar/BlockIcon.tsx
+++ b/apps/builder/src/features/editor/components/BlockIcon.tsx
@@ -7,38 +7,36 @@ import {
   BlockType,
 } from '@typebot.io/schemas'
 import React from 'react'
-import { TextBubbleIcon } from '@/features/blocks/bubbles/textBubble'
-import { ImageBubbleIcon } from '@/features/blocks/bubbles/image'
-import { VideoBubbleIcon } from '@/features/blocks/bubbles/video'
-import { ChatwootLogo } from '@/features/blocks/integrations/chatwoot'
-import { FlagIcon } from '@/components/icons'
-import { SendEmailIcon } from '@/features/blocks/integrations/sendEmail'
-import { PabblyConnectLogo } from '@/features/blocks/integrations/pabbly'
-import { MakeComLogo } from '@/features/blocks/integrations/makeCom'
-import { ZapierLogo } from '@/features/blocks/integrations/zapier'
-import { WebhookIcon } from '@/features/blocks/integrations/webhook'
-import { GoogleSheetsLogo } from '@/features/blocks/integrations/googleSheets'
-import { TypebotLinkIcon } from '@/features/blocks/logic/typebotLink'
-import { RedirectIcon } from '@/features/blocks/logic/redirect'
-import { ConditionIcon } from '@/features/blocks/logic/condition'
-import { SetVariableIcon } from '@/features/blocks/logic/setVariable'
-import { FileInputIcon } from '@/features/blocks/inputs/fileUpload'
-import { RatingInputIcon } from '@/features/blocks/inputs/rating'
-import { PaymentInputIcon } from '@/features/blocks/inputs/payment'
-import { ButtonsInputIcon } from '@/features/blocks/inputs/buttons'
-import { PhoneInputIcon } from '@/features/blocks/inputs/phone'
-import { DateInputIcon } from '@/features/blocks/inputs/date'
-import { UrlInputIcon } from '@/features/blocks/inputs/url'
-import { EmailInputIcon } from '@/features/blocks/inputs/emailInput'
-import { NumberInputIcon } from '@/features/blocks/inputs/number'
-import { TextInputIcon } from '@/features/blocks/inputs/textInput'
-import { EmbedBubbleIcon } from '@/features/blocks/bubbles/embed'
-import { GoogleAnalyticsLogo } from '@/features/blocks/integrations/googleAnalytics'
-import { AudioBubbleIcon } from '@/features/blocks/bubbles/audio'
+import { FlagIcon, SendEmailIcon, WebhookIcon } from '@/components/icons'
 import { WaitIcon } from '@/features/blocks/logic/wait/components/WaitIcon'
 import { ScriptIcon } from '@/features/blocks/logic/script/components/ScriptIcon'
 import { JumpIcon } from '@/features/blocks/logic/jump/components/JumpIcon'
 import { OpenAILogo } from '@/features/blocks/integrations/openai/components/OpenAILogo'
+import { AudioBubbleIcon } from '@/features/blocks/bubbles/audio/components/AudioBubbleIcon'
+import { EmbedBubbleIcon } from '@/features/blocks/bubbles/embed/components/EmbedBubbleIcon'
+import { ImageBubbleIcon } from '@/features/blocks/bubbles/image/components/ImageBubbleIcon'
+import { TextBubbleIcon } from '@/features/blocks/bubbles/textBubble/components/TextBubbleIcon'
+import { VideoBubbleIcon } from '@/features/blocks/bubbles/video/components/VideoBubbleIcon'
+import { ButtonsInputIcon } from '@/features/blocks/inputs/buttons/components/ButtonsIcon'
+import { DateInputIcon } from '@/features/blocks/inputs/date/components/DateInputIcon'
+import { EmailInputIcon } from '@/features/blocks/inputs/emailInput/components/EmailInputIcon'
+import { FileInputIcon } from '@/features/blocks/inputs/fileUpload/components/FileInputIcon'
+import { NumberInputIcon } from '@/features/blocks/inputs/number/components/NumberInputIcon'
+import { PaymentInputIcon } from '@/features/blocks/inputs/payment/components/PaymentInputIcon'
+import { PhoneInputIcon } from '@/features/blocks/inputs/phone/components/PhoneInputIcon'
+import { RatingInputIcon } from '@/features/blocks/inputs/rating/components/RatingInputIcon'
+import { TextInputIcon } from '@/features/blocks/inputs/textInput/components/TextInputIcon'
+import { UrlInputIcon } from '@/features/blocks/inputs/url/components/UrlInputIcon'
+import { ChatwootLogo } from '@/features/blocks/integrations/chatwoot/components/ChatwootLogo'
+import { GoogleAnalyticsLogo } from '@/features/blocks/integrations/googleAnalytics/components/GoogleAnalyticsLogo'
+import { GoogleSheetsLogo } from '@/features/blocks/integrations/googleSheets/components/GoogleSheetsLogo'
+import { MakeComLogo } from '@/features/blocks/integrations/makeCom/components/MakeComLogo'
+import { PabblyConnectLogo } from '@/features/blocks/integrations/pabbly/components/PabblyConnectLogo'
+import { ZapierLogo } from '@/features/blocks/integrations/zapier/components/ZapierLogo'
+import { ConditionIcon } from '@/features/blocks/logic/condition/components/ConditionIcon'
+import { RedirectIcon } from '@/features/blocks/logic/redirect/components/RedirectIcon'
+import { SetVariableIcon } from '@/features/blocks/logic/setVariable/components/SetVariableIcon'
+import { TypebotLinkIcon } from '@/features/blocks/logic/typebotLink/components/TypebotLinkIcon'
 
 type BlockIconProps = { type: BlockType } & IconProps
 
diff --git a/apps/builder/src/features/editor/components/BlocksSideBar/BlockLabel.tsx b/apps/builder/src/features/editor/components/BlockLabel.tsx
similarity index 100%
rename from apps/builder/src/features/editor/components/BlocksSideBar/BlockLabel.tsx
rename to apps/builder/src/features/editor/components/BlockLabel.tsx
diff --git a/apps/builder/src/features/editor/components/BlocksSideBar/BlocksSideBar.tsx b/apps/builder/src/features/editor/components/BlocksSideBar.tsx
similarity index 97%
rename from apps/builder/src/features/editor/components/BlocksSideBar/BlocksSideBar.tsx
rename to apps/builder/src/features/editor/components/BlocksSideBar.tsx
index cacc106ec..ad87d155c 100644
--- a/apps/builder/src/features/editor/components/BlocksSideBar/BlocksSideBar.tsx
+++ b/apps/builder/src/features/editor/components/BlocksSideBar.tsx
@@ -17,12 +17,12 @@ import {
   IntegrationBlockType,
   LogicBlockType,
 } from '@typebot.io/schemas'
-import { useBlockDnd } from '@/features/graph'
+import { useBlockDnd } from '@/features/graph/providers/GraphDndProvider'
 import React, { useState } from 'react'
 import { BlockCard } from './BlockCard'
 import { LockedIcon, UnlockedIcon } from '@/components/icons'
-import { headerHeight } from '../../constants'
 import { BlockCardOverlay } from './BlockCardOverlay'
+import { headerHeight } from '../constants'
 
 export const BlocksSideBar = () => {
   const { setDraggedBlockType, draggedBlockType } = useBlockDnd()
diff --git a/apps/builder/src/features/editor/components/BlocksSideBar/index.tsx b/apps/builder/src/features/editor/components/BlocksSideBar/index.tsx
deleted file mode 100644
index 1d894a431..000000000
--- a/apps/builder/src/features/editor/components/BlocksSideBar/index.tsx
+++ /dev/null
@@ -1 +0,0 @@
-export { BlocksSideBar } from './BlocksSideBar'
diff --git a/apps/builder/src/features/editor/components/BoardMenuButton.tsx b/apps/builder/src/features/editor/components/BoardMenuButton.tsx
index d4b2a69dd..379137a2e 100644
--- a/apps/builder/src/features/editor/components/BoardMenuButton.tsx
+++ b/apps/builder/src/features/editor/components/BoardMenuButton.tsx
@@ -16,12 +16,12 @@ import {
   SettingsIcon,
 } from '@/components/icons'
 import { useTypebot } from '../providers/TypebotProvider'
-import { useUser } from '@/features/account'
+import { useUser } from '@/features/account/hooks/useUser'
 import { useRouter } from 'next/router'
 import React, { useEffect, useState } from 'react'
 import { isNotDefined } from '@typebot.io/lib'
 import { EditorSettingsModal } from './EditorSettingsModal'
-import { parseDefaultPublicId } from '@/features/publish'
+import { parseDefaultPublicId } from '@/features/publish/helpers/parseDefaultPublicId'
 
 export const BoardMenuButton = (props: FlexProps) => {
   const { query } = useRouter()
diff --git a/apps/builder/src/features/editor/components/TypebotHeader/EditableTypebotName.tsx b/apps/builder/src/features/editor/components/EditableTypebotName.tsx
similarity index 100%
rename from apps/builder/src/features/editor/components/TypebotHeader/EditableTypebotName.tsx
rename to apps/builder/src/features/editor/components/EditableTypebotName.tsx
diff --git a/apps/builder/src/features/editor/components/EditorPage.tsx b/apps/builder/src/features/editor/components/EditorPage.tsx
index 67e7cb3ad..5408f684f 100644
--- a/apps/builder/src/features/editor/components/EditorPage.tsx
+++ b/apps/builder/src/features/editor/components/EditorPage.tsx
@@ -1,10 +1,4 @@
 import { Seo } from '@/components/Seo'
-import {
-  Graph,
-  GraphDndProvider,
-  GraphProvider,
-  GroupsCoordinatesProvider,
-} from '@/features/graph'
 import { Flex, Spinner, useColorModeValue } from '@chakra-ui/react'
 import {
   EditorProvider,
@@ -17,6 +11,10 @@ import { BoardMenuButton } from './BoardMenuButton'
 import { GettingStartedModal } from './GettingStartedModal'
 import { PreviewDrawer } from '@/features/preview/components/PreviewDrawer'
 import { TypebotHeader } from './TypebotHeader'
+import { Graph } from '@/features/graph/components/Graph'
+import { GraphDndProvider } from '@/features/graph/providers/GraphDndProvider'
+import { GraphProvider } from '@/features/graph/providers/GraphProvider'
+import { GroupsCoordinatesProvider } from '@/features/graph/providers/GroupsCoordinateProvider'
 
 export const EditorPage = () => {
   const { typebot, isReadOnly } = useTypebot()
diff --git a/apps/builder/src/features/editor/components/EditorSettingsModal.tsx b/apps/builder/src/features/editor/components/EditorSettingsModal.tsx
index dccfbbdd6..eb0165262 100644
--- a/apps/builder/src/features/editor/components/EditorSettingsModal.tsx
+++ b/apps/builder/src/features/editor/components/EditorSettingsModal.tsx
@@ -1,4 +1,4 @@
-import { UserPreferencesForm } from '@/features/account'
+import { UserPreferencesForm } from '@/features/account/components/UserPreferencesForm'
 import {
   Modal,
   ModalBody,
diff --git a/apps/builder/src/features/editor/components/TypebotHeader/TypebotHeader.tsx b/apps/builder/src/features/editor/components/TypebotHeader.tsx
similarity index 95%
rename from apps/builder/src/features/editor/components/TypebotHeader/TypebotHeader.tsx
rename to apps/builder/src/features/editor/components/TypebotHeader.tsx
index a46c9bad2..205a5b993 100644
--- a/apps/builder/src/features/editor/components/TypebotHeader/TypebotHeader.tsx
+++ b/apps/builder/src/features/editor/components/TypebotHeader.tsx
@@ -14,21 +14,21 @@ import {
   RedoIcon,
   UndoIcon,
 } from '@/components/icons'
-import { RightPanel, useEditor } from '../../providers/EditorProvider'
-import { useTypebot } from '../../providers/TypebotProvider'
 import { useRouter } from 'next/router'
 import React, { useState } from 'react'
 import { isDefined, isNotDefined } from '@typebot.io/lib'
 import { EditableTypebotName } from './EditableTypebotName'
 import { open as openSupportBubble } from '@typebot.io/js'
 import Link from 'next/link'
-import { isCloudProdInstance } from '@/utils/helpers'
-import { headerHeight } from '../../constants'
+import { isCloudProdInstance } from '@/helpers/isCloudProdInstance'
 import { EditableEmojiOrImageIcon } from '@/components/EditableEmojiOrImageIcon'
-import { PublishButton } from '@/features/publish'
-import { CollaborationMenuButton } from '@/features/collaboration'
 import { useUndoShortcut } from '@/hooks/useUndoShortcut'
 import { useDebouncedCallback } from 'use-debounce'
+import { CollaborationMenuButton } from '@/features/collaboration/components/CollaborationMenuButton'
+import { PublishButton } from '@/features/publish/components/PublishButton'
+import { headerHeight } from '../constants'
+import { RightPanel, useEditor } from '../providers/EditorProvider'
+import { useTypebot } from '../providers/TypebotProvider'
 
 export const TypebotHeader = () => {
   const router = useRouter()
diff --git a/apps/builder/src/features/editor/components/TypebotHeader/index.tsx b/apps/builder/src/features/editor/components/TypebotHeader/index.tsx
deleted file mode 100644
index e9406b986..000000000
--- a/apps/builder/src/features/editor/components/TypebotHeader/index.tsx
+++ /dev/null
@@ -1 +0,0 @@
-export * from './TypebotHeader'
diff --git a/apps/builder/src/features/editor/index.ts b/apps/builder/src/features/editor/index.ts
deleted file mode 100644
index 330c30bf2..000000000
--- a/apps/builder/src/features/editor/index.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export { TypebotProvider, useTypebot } from './providers/TypebotProvider'
-export { TypebotHeader } from './components/TypebotHeader'
-export { EditorPage } from './components/EditorPage'
-export { headerHeight } from './constants'
-export { BlockIcon } from './components/BlocksSideBar/BlockIcon'
-export { RightPanel, useEditor } from './providers/EditorProvider'
diff --git a/apps/builder/src/features/editor/providers/TypebotProvider/TypebotProvider.tsx b/apps/builder/src/features/editor/providers/TypebotProvider.tsx
similarity index 86%
rename from apps/builder/src/features/editor/providers/TypebotProvider/TypebotProvider.tsx
rename to apps/builder/src/features/editor/providers/TypebotProvider.tsx
index cc88494fd..53f37b8c2 100644
--- a/apps/builder/src/features/editor/providers/TypebotProvider/TypebotProvider.tsx
+++ b/apps/builder/src/features/editor/providers/TypebotProvider.tsx
@@ -18,34 +18,30 @@ import {
   useState,
 } from 'react'
 import { isDefined, omit } from '@typebot.io/lib'
-import { edgesAction, EdgesActions } from './actions/edges'
-import { itemsAction, ItemsActions } from './actions/items'
-import { GroupsActions, groupsActions } from './actions/groups'
-import { blocksAction, BlocksActions } from './actions/blocks'
-import { variablesAction, VariablesActions } from './actions/variables'
+import { edgesAction, EdgesActions } from './typebotActions/edges'
+import { itemsAction, ItemsActions } from './typebotActions/items'
+import { GroupsActions, groupsActions } from './typebotActions/groups'
+import { blocksAction, BlocksActions } from './typebotActions/blocks'
+import { variablesAction, VariablesActions } from './typebotActions/variables'
 import { dequal } from 'dequal'
 import { useToast } from '@/hooks/useToast'
 import { useTypebotQuery } from '@/hooks/useTypebotQuery'
-import { useUndo } from '../../hooks/useUndo'
+import { useUndo } from '../hooks/useUndo'
 import { useLinkedTypebots } from '@/hooks/useLinkedTypebots'
-import { updateTypebotQuery } from '../../queries/updateTypebotQuery'
-import { preventUserFromRefreshing } from '@/utils/helpers'
-import {
-  createPublishedTypebotQuery,
-  updatePublishedTypebotQuery,
-  deletePublishedTypebotQuery,
-} from '@/features/publish/queries'
+import { updateTypebotQuery } from '../queries/updateTypebotQuery'
 import { updateWebhookQuery } from '@/features/blocks/integrations/webhook/queries/updateWebhookQuery'
-import {
-  checkIfTypebotsAreEqual,
-  checkIfPublished,
-  parseTypebotToPublicTypebot,
-  parseDefaultPublicId,
-  parsePublicTypebotToTypebot,
-} from '@/features/publish/utils'
 import { useAutoSave } from '@/hooks/useAutoSave'
 import { createWebhookQuery } from '@/features/blocks/integrations/webhook/queries/createWebhookQuery'
 import { duplicateWebhookQuery } from '@/features/blocks/integrations/webhook/queries/duplicateWebhookQuery'
+import { parseDefaultPublicId } from '@/features/publish/helpers/parseDefaultPublicId'
+import { createPublishedTypebotQuery } from '@/features/publish/queries/createPublishedTypebotQuery'
+import { deletePublishedTypebotQuery } from '@/features/publish/queries/deletePublishedTypebotQuery'
+import { updatePublishedTypebotQuery } from '@/features/publish/queries/updatePublishedTypebotQuery'
+import { preventUserFromRefreshing } from '@/helpers/preventUserFromRefreshing'
+import { areTypebotsEqual } from '@/features/publish/helpers/areTypebotsEqual'
+import { isPublished as isPublishedHelper } from '@/features/publish/helpers/isPublished'
+import { convertTypebotToPublicTypebot } from '@/features/publish/helpers/convertTypebotToPublicTypebot'
+import { convertPublicTypebotToTypebot } from '@/features/publish/helpers/convertPublicTypebotToTypebot'
 
 const autoSaveTimeout = 10000
 
@@ -251,13 +247,13 @@ export const TypebotProvider = ({
     () =>
       isDefined(localTypebot) &&
       isDefined(publishedTypebot) &&
-      checkIfPublished(localTypebot, publishedTypebot),
+      isPublishedHelper(localTypebot, publishedTypebot),
     [localTypebot, publishedTypebot]
   )
 
   useEffect(() => {
     if (!localTypebot || !typebot) return
-    if (!checkIfTypebotsAreEqual(localTypebot, typebot)) {
+    if (!areTypebotsEqual(localTypebot, typebot)) {
       window.addEventListener('beforeunload', preventUserFromRefreshing)
     }
 
@@ -281,14 +277,14 @@ export const TypebotProvider = ({
     }
     if (publishedTypebot) {
       await savePublishedTypebot({
-        ...parseTypebotToPublicTypebot(newLocalTypebot),
+        ...convertTypebotToPublicTypebot(newLocalTypebot),
         id: publishedTypebot.id,
       })
     } else {
       setIsPublishing(true)
       const { data, error } = await createPublishedTypebotQuery(
         {
-          ...omit(parseTypebotToPublicTypebot(newLocalTypebot), 'id'),
+          ...omit(convertTypebotToPublicTypebot(newLocalTypebot), 'id'),
         },
         localTypebot.workspaceId
       )
@@ -320,7 +316,9 @@ export const TypebotProvider = ({
 
   const restorePublishedTypebot = () => {
     if (!publishedTypebot || !localTypebot) return
-    setLocalTypebot(parsePublicTypebotToTypebot(publishedTypebot, localTypebot))
+    setLocalTypebot(
+      convertPublicTypebotToTypebot(publishedTypebot, localTypebot)
+    )
     return saveTypebot()
   }
 
diff --git a/apps/builder/src/features/editor/providers/TypebotProvider/index.ts b/apps/builder/src/features/editor/providers/TypebotProvider/index.ts
deleted file mode 100644
index cd494174a..000000000
--- a/apps/builder/src/features/editor/providers/TypebotProvider/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { TypebotProvider, useTypebot } from './TypebotProvider'
diff --git a/apps/builder/src/features/editor/providers/TypebotProvider/actions/blocks.ts b/apps/builder/src/features/editor/providers/typebotActions/blocks.ts
similarity index 98%
rename from apps/builder/src/features/editor/providers/TypebotProvider/actions/blocks.ts
rename to apps/builder/src/features/editor/providers/typebotActions/blocks.ts
index edb022d03..14f5469a5 100644
--- a/apps/builder/src/features/editor/providers/TypebotProvider/actions/blocks.ts
+++ b/apps/builder/src/features/editor/providers/typebotActions/blocks.ts
@@ -13,7 +13,7 @@ import { cleanUpEdgeDraft, deleteEdgeDraft } from './edges'
 import { createId } from '@paralleldrive/cuid2'
 import { byId, isWebhookBlock, blockHasItems } from '@typebot.io/lib'
 import { duplicateItemDraft } from './items'
-import { parseNewBlock } from '@/features/graph/utils'
+import { parseNewBlock } from '@/features/typebot/helpers/parseNewBlock'
 
 export type BlocksActions = {
   createBlock: (
diff --git a/apps/builder/src/features/editor/providers/TypebotProvider/actions/edges.ts b/apps/builder/src/features/editor/providers/typebotActions/edges.ts
similarity index 100%
rename from apps/builder/src/features/editor/providers/TypebotProvider/actions/edges.ts
rename to apps/builder/src/features/editor/providers/typebotActions/edges.ts
diff --git a/apps/builder/src/features/editor/providers/TypebotProvider/actions/groups.ts b/apps/builder/src/features/editor/providers/typebotActions/groups.ts
similarity index 98%
rename from apps/builder/src/features/editor/providers/TypebotProvider/actions/groups.ts
rename to apps/builder/src/features/editor/providers/typebotActions/groups.ts
index 70cedbf81..9deb16a37 100644
--- a/apps/builder/src/features/editor/providers/TypebotProvider/actions/groups.ts
+++ b/apps/builder/src/features/editor/providers/typebotActions/groups.ts
@@ -13,8 +13,8 @@ import {
   duplicateBlockDraft,
   WebhookCallBacks,
 } from './blocks'
-import { Coordinates } from '@/features/graph'
 import { parseGroupTitle } from '@typebot.io/lib'
+import { Coordinates } from '@/features/graph/types'
 
 export type GroupsActions = {
   createGroup: (
diff --git a/apps/builder/src/features/editor/providers/TypebotProvider/actions/items.ts b/apps/builder/src/features/editor/providers/typebotActions/items.ts
similarity index 100%
rename from apps/builder/src/features/editor/providers/TypebotProvider/actions/items.ts
rename to apps/builder/src/features/editor/providers/typebotActions/items.ts
diff --git a/apps/builder/src/features/editor/providers/TypebotProvider/actions/variables.ts b/apps/builder/src/features/editor/providers/typebotActions/variables.ts
similarity index 100%
rename from apps/builder/src/features/editor/providers/TypebotProvider/actions/variables.ts
rename to apps/builder/src/features/editor/providers/typebotActions/variables.ts
diff --git a/apps/builder/src/features/folders/TypebotDndProvider.tsx b/apps/builder/src/features/folders/TypebotDndProvider.tsx
index 353dafe8e..c987aaf56 100644
--- a/apps/builder/src/features/folders/TypebotDndProvider.tsx
+++ b/apps/builder/src/features/folders/TypebotDndProvider.tsx
@@ -7,7 +7,7 @@ import {
   useEffect,
   useState,
 } from 'react'
-import { TypebotInDashboard } from '@/features/dashboard'
+import { TypebotInDashboard } from '../dashboard/types'
 
 const typebotDndContext = createContext<{
   draggedTypebot?: TypebotInDashboard
diff --git a/apps/builder/src/features/folders/components/CreateFolderButton.tsx b/apps/builder/src/features/folders/components/CreateFolderButton.tsx
index 2ccedf7ba..59951ea96 100644
--- a/apps/builder/src/features/folders/components/CreateFolderButton.tsx
+++ b/apps/builder/src/features/folders/components/CreateFolderButton.tsx
@@ -1,15 +1,13 @@
 import { Button, HStack, useDisclosure, Text } from '@chakra-ui/react'
 import { FolderPlusIcon } from '@/components/icons'
-import {
-  LimitReached,
-  ChangePlanModal,
-  LockTag,
-  isFreePlan,
-} from '@/features/billing'
-import { useWorkspace } from '@/features/workspace'
+import { useWorkspace } from '@/features/workspace/WorkspaceProvider'
 import { Plan } from '@typebot.io/prisma'
 import React from 'react'
 import { useScopedI18n } from '@/locales'
+import { ChangePlanModal } from '@/features/billing/components/ChangePlanModal'
+import { LockTag } from '@/features/billing/components/LockTag'
+import { isFreePlan } from '@/features/billing/helpers/isFreePlan'
+import { LimitReached } from '@/features/billing/types'
 
 type Props = { isLoading: boolean; onClick: () => void }
 
diff --git a/apps/builder/src/features/folders/components/FolderContent.tsx b/apps/builder/src/features/folders/components/FolderContent.tsx
index 99970931d..9c73c5be2 100644
--- a/apps/builder/src/features/folders/components/FolderContent.tsx
+++ b/apps/builder/src/features/folders/components/FolderContent.tsx
@@ -13,9 +13,8 @@ import { useTypebotDnd } from '../TypebotDndProvider'
 import React, { useState } from 'react'
 import { BackButton } from './BackButton'
 import { OnboardingModal } from '../../dashboard/components/OnboardingModal'
-import { useWorkspace } from '@/features/workspace'
+import { useWorkspace } from '@/features/workspace/WorkspaceProvider'
 import { useToast } from '@/hooks/useToast'
-import { TypebotInDashboard, useTypebots } from '@/features/dashboard'
 import { useFolders } from '../hooks/useFolders'
 import { patchTypebotQuery } from '../queries/patchTypebotQuery'
 import { createFolderQuery } from '../queries/createFolderQuery'
@@ -25,6 +24,8 @@ import { ButtonSkeleton, FolderButton } from './FolderButton'
 import { TypebotButton } from './TypebotButton'
 import { TypebotCardOverlay } from './TypebotButtonOverlay'
 import { useI18n } from '@/locales'
+import { useTypebots } from '@/features/dashboard/hooks/useTypebots'
+import { TypebotInDashboard } from '@/features/dashboard/types'
 
 type Props = { folder: DashboardFolder | null }
 
diff --git a/apps/builder/src/features/folders/components/FolderPage.tsx b/apps/builder/src/features/folders/components/FolderPage.tsx
index a070eafe7..4f4c01581 100644
--- a/apps/builder/src/features/folders/components/FolderPage.tsx
+++ b/apps/builder/src/features/folders/components/FolderPage.tsx
@@ -1,5 +1,5 @@
 import { Seo } from '@/components/Seo'
-import { DashboardHeader } from '@/features/dashboard'
+import { DashboardHeader } from '@/features/dashboard/components/DashboardHeader'
 import { useToast } from '@/hooks/useToast'
 import { useI18n } from '@/locales'
 import { Stack, Flex, Spinner } from '@chakra-ui/react'
diff --git a/apps/builder/src/features/folders/components/TypebotButton.tsx b/apps/builder/src/features/folders/components/TypebotButton.tsx
index f5878952b..248aeb6b4 100644
--- a/apps/builder/src/features/folders/components/TypebotButton.tsx
+++ b/apps/builder/src/features/folders/components/TypebotButton.tsx
@@ -19,19 +19,17 @@ import { GripIcon } from '@/components/icons'
 import { useTypebotDnd } from '../TypebotDndProvider'
 import { useDebounce } from 'use-debounce'
 import { Plan } from '@typebot.io/prisma'
-import { useWorkspace } from '@/features/workspace'
+import { useWorkspace } from '@/features/workspace/WorkspaceProvider'
 import { useToast } from '@/hooks/useToast'
-import { isMobile } from '@/utils/helpers'
-import {
-  getTypebotQuery,
-  deleteTypebotQuery,
-  importTypebotQuery,
-  TypebotInDashboard,
-} from '@/features/dashboard'
 import { MoreButton } from './MoreButton'
 import { EmojiOrImageIcon } from '@/components/EmojiOrImageIcon'
 import { deletePublishedTypebotQuery } from '@/features/publish/queries/deletePublishedTypebotQuery'
 import { useScopedI18n } from '@/locales'
+import { deleteTypebotQuery } from '@/features/dashboard/queries/deleteTypebotQuery'
+import { getTypebotQuery } from '@/features/dashboard/queries/getTypebotQuery'
+import { importTypebotQuery } from '@/features/dashboard/queries/importTypebotQuery'
+import { TypebotInDashboard } from '@/features/dashboard/types'
+import { isMobile } from '@/helpers/isMobile'
 
 type Props = {
   typebot: TypebotInDashboard
diff --git a/apps/builder/src/features/folders/components/TypebotButtonOverlay.tsx b/apps/builder/src/features/folders/components/TypebotButtonOverlay.tsx
index 29f1d4ee4..4d1555149 100644
--- a/apps/builder/src/features/folders/components/TypebotButtonOverlay.tsx
+++ b/apps/builder/src/features/folders/components/TypebotButtonOverlay.tsx
@@ -6,8 +6,8 @@ import {
   useColorModeValue,
   VStack,
 } from '@chakra-ui/react'
-import { TypebotInDashboard } from '@/features/dashboard'
 import { EmojiOrImageIcon } from '@/components/EmojiOrImageIcon'
+import { TypebotInDashboard } from '@/features/dashboard/types'
 
 type Props = {
   typebot: TypebotInDashboard
diff --git a/apps/builder/src/features/folders/hooks/useFolder.ts b/apps/builder/src/features/folders/hooks/useFolder.ts
index 991021106..04d20e829 100644
--- a/apps/builder/src/features/folders/hooks/useFolder.ts
+++ b/apps/builder/src/features/folders/hooks/useFolder.ts
@@ -1,4 +1,4 @@
-import { fetcher } from '@/utils/helpers'
+import { fetcher } from '@/helpers/fetcher'
 import { DashboardFolder } from '@typebot.io/prisma'
 import useSWR from 'swr'
 
diff --git a/apps/builder/src/features/folders/hooks/useFolders.ts b/apps/builder/src/features/folders/hooks/useFolders.ts
index b45e06a07..a19b0958c 100644
--- a/apps/builder/src/features/folders/hooks/useFolders.ts
+++ b/apps/builder/src/features/folders/hooks/useFolders.ts
@@ -1,4 +1,4 @@
-import { fetcher } from '@/utils/helpers'
+import { fetcher } from '@/helpers/fetcher'
 import { DashboardFolder } from '@typebot.io/prisma'
 import { stringify } from 'qs'
 import useSWR from 'swr'
diff --git a/apps/builder/src/features/folders/index.ts b/apps/builder/src/features/folders/index.ts
deleted file mode 100644
index c629d86e3..000000000
--- a/apps/builder/src/features/folders/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export { FolderContent } from './components/FolderContent'
-export { TypebotDndProvider } from './TypebotDndProvider'
-export { FolderPage } from './components/FolderPage'
diff --git a/apps/builder/src/features/graph/components/Edges/DrawingEdge.tsx b/apps/builder/src/features/graph/components/Edges/DrawingEdge.tsx
index 5bf45df70..c26566fe4 100644
--- a/apps/builder/src/features/graph/components/Edges/DrawingEdge.tsx
+++ b/apps/builder/src/features/graph/components/Edges/DrawingEdge.tsx
@@ -1,16 +1,15 @@
 import { useEventListener } from '@chakra-ui/react'
 import assert from 'assert'
-import {
-  useGraph,
-  ConnectingIds,
-  Coordinates,
-  useGroupsCoordinates,
-} from '../../providers'
-import { useTypebot } from '@/features/editor'
+import { useTypebot } from '@/features/editor/providers/TypebotProvider'
 import { colors } from '@/lib/theme'
 import React, { useMemo, useState } from 'react'
-import { computeConnectingEdgePath, computeEdgePathToMouse } from '../../utils'
 import { useEndpoints } from '../../providers/EndpointsProvider'
+import { Coordinates } from '@dnd-kit/utilities'
+import { computeConnectingEdgePath } from '../../helpers/computeConnectingEdgePath'
+import { computeEdgePathToMouse } from '../../helpers/computeEdgePathToMouth'
+import { useGraph } from '../../providers/GraphProvider'
+import { useGroupsCoordinates } from '../../providers/GroupsCoordinateProvider'
+import { ConnectingIds } from '../../types'
 
 export const DrawingEdge = () => {
   const { graphPosition, setConnectingIds, connectingIds } = useGraph()
diff --git a/apps/builder/src/features/graph/components/Edges/DropOffEdge.tsx b/apps/builder/src/features/graph/components/Edges/DropOffEdge.tsx
index db2d21b22..c6e7c9085 100644
--- a/apps/builder/src/features/graph/components/Edges/DropOffEdge.tsx
+++ b/apps/builder/src/features/graph/components/Edges/DropOffEdge.tsx
@@ -6,15 +6,16 @@ import {
   useColorModeValue,
   theme,
 } from '@chakra-ui/react'
-import { useGroupsCoordinates } from '../../providers'
-import { useTypebot } from '@/features/editor'
-import { useWorkspace } from '@/features/workspace'
+import { useTypebot } from '@/features/editor/providers/TypebotProvider'
+import { useWorkspace } from '@/features/workspace/WorkspaceProvider'
 import React, { useMemo } from 'react'
 import { byId, isDefined } from '@typebot.io/lib'
-import { isProPlan } from '@/features/billing'
-import { AnswersCount } from '@/features/analytics'
-import { computeSourceCoordinates, computeDropOffPath } from '../../utils'
 import { useEndpoints } from '../../providers/EndpointsProvider'
+import { useGroupsCoordinates } from '../../providers/GroupsCoordinateProvider'
+import { AnswersCount } from '@/features/analytics/types'
+import { isProPlan } from '@/features/billing/helpers/isProPlan'
+import { computeDropOffPath } from '../../helpers/computeDropOffPath'
+import { computeSourceCoordinates } from '../../helpers/computeSourceCoordinates'
 
 type Props = {
   groupId: string
diff --git a/apps/builder/src/features/graph/components/Edges/Edge.tsx b/apps/builder/src/features/graph/components/Edges/Edge.tsx
index 877a1abfa..82b78a9f5 100644
--- a/apps/builder/src/features/graph/components/Edges/Edge.tsx
+++ b/apps/builder/src/features/graph/components/Edges/Edge.tsx
@@ -1,19 +1,14 @@
-import { Coordinates, useGraph, useGroupsCoordinates } from '../../providers'
 import React, { useMemo, useState } from 'react'
 import { Edge as EdgeProps } from '@typebot.io/schemas'
 import { Portal, useColorMode, useDisclosure } from '@chakra-ui/react'
-import { useTypebot } from '@/features/editor'
-import { EdgeMenu } from './EdgeMenu'
+import { useTypebot } from '@/features/editor/providers/TypebotProvider'
 import { colors } from '@/lib/theme'
-import { getAnchorsPosition, computeEdgePath } from '../../utils'
 import { useEndpoints } from '../../providers/EndpointsProvider'
-
-export type AnchorsPositionProps = {
-  sourcePosition: Coordinates
-  targetPosition: Coordinates
-  sourceType: 'right' | 'left'
-  totalSegments: number
-}
+import { computeEdgePath } from '../../helpers/computeEdgePath'
+import { getAnchorsPosition } from '../../helpers/getAnchorsPosition'
+import { useGraph } from '../../providers/GraphProvider'
+import { useGroupsCoordinates } from '../../providers/GroupsCoordinateProvider'
+import { EdgeMenu } from './EdgeMenu'
 
 type Props = {
   edge: EdgeProps
diff --git a/apps/builder/src/features/graph/components/Edges/Edges.tsx b/apps/builder/src/features/graph/components/Edges/Edges.tsx
index 59f5d7e50..d3b004066 100644
--- a/apps/builder/src/features/graph/components/Edges/Edges.tsx
+++ b/apps/builder/src/features/graph/components/Edges/Edges.tsx
@@ -2,10 +2,10 @@ import { chakra, useColorMode } from '@chakra-ui/react'
 import { colors } from '@/lib/theme'
 import { Edge as EdgeProps } from '@typebot.io/schemas'
 import React from 'react'
+import { AnswersCount } from '@/features/analytics/types'
 import { DrawingEdge } from './DrawingEdge'
 import { DropOffEdge } from './DropOffEdge'
 import { Edge } from './Edge'
-import { AnswersCount } from '@/features/analytics'
 
 type Props = {
   edges: EdgeProps[]
diff --git a/apps/builder/src/features/graph/components/Edges/index.tsx b/apps/builder/src/features/graph/components/Edges/index.tsx
deleted file mode 100644
index 1f83b5a43..000000000
--- a/apps/builder/src/features/graph/components/Edges/index.tsx
+++ /dev/null
@@ -1 +0,0 @@
-export { Edges } from './Edges'
diff --git a/apps/builder/src/features/graph/components/Endpoints/SourceEndpoint.tsx b/apps/builder/src/features/graph/components/Endpoints/SourceEndpoint.tsx
index f9c6efd6a..0bd1c29ed 100644
--- a/apps/builder/src/features/graph/components/Endpoints/SourceEndpoint.tsx
+++ b/apps/builder/src/features/graph/components/Endpoints/SourceEndpoint.tsx
@@ -4,7 +4,6 @@ import {
   useColorModeValue,
   useEventListener,
 } from '@chakra-ui/react'
-import { useGraph, useGroupsCoordinates } from '../../providers'
 import { Source } from '@typebot.io/schemas'
 import React, {
   useEffect,
@@ -14,6 +13,8 @@ import React, {
   useState,
 } from 'react'
 import { useEndpoints } from '../../providers/EndpointsProvider'
+import { useGraph } from '../../providers/GraphProvider'
+import { useGroupsCoordinates } from '../../providers/GroupsCoordinateProvider'
 
 const endpointHeight = 32
 
diff --git a/apps/builder/src/features/graph/components/Endpoints/TargetEndpoint.tsx b/apps/builder/src/features/graph/components/Endpoints/TargetEndpoint.tsx
index 304a20322..44135dda8 100644
--- a/apps/builder/src/features/graph/components/Endpoints/TargetEndpoint.tsx
+++ b/apps/builder/src/features/graph/components/Endpoints/TargetEndpoint.tsx
@@ -6,8 +6,8 @@ import React, {
   useRef,
   useState,
 } from 'react'
-import { useGraph } from '../../providers'
 import { useEndpoints } from '../../providers/EndpointsProvider'
+import { useGraph } from '../../providers/GraphProvider'
 
 const endpointHeight = 20
 
diff --git a/apps/builder/src/features/graph/components/Endpoints/index.tsx b/apps/builder/src/features/graph/components/Endpoints/index.tsx
deleted file mode 100644
index 76fb38573..000000000
--- a/apps/builder/src/features/graph/components/Endpoints/index.tsx
+++ /dev/null
@@ -1,2 +0,0 @@
-export { SourceEndpoint } from './SourceEndpoint'
-export { TargetEndpoint } from './TargetEndpoint'
diff --git a/apps/builder/src/features/graph/components/Graph.tsx b/apps/builder/src/features/graph/components/Graph.tsx
index 7e95cc98f..bdea0f157 100644
--- a/apps/builder/src/features/graph/components/Graph.tsx
+++ b/apps/builder/src/features/graph/components/Graph.tsx
@@ -1,24 +1,21 @@
 import { Flex, FlexProps, useEventListener } from '@chakra-ui/react'
 import React, { useRef, useMemo, useEffect, useState } from 'react'
-import {
-  blockWidth,
-  Coordinates,
-  graphPositionDefaultValue,
-  useGraph,
-  useGroupsCoordinates,
-  useBlockDnd,
-} from '../providers'
-import { useTypebot } from '@/features/editor'
+import { useTypebot } from '@/features/editor/providers/TypebotProvider'
 import { DraggableBlockType, PublicTypebot, Typebot } from '@typebot.io/schemas'
 import { useDebounce } from 'use-debounce'
 import GraphElements from './GraphElements'
 import { createId } from '@paralleldrive/cuid2'
-import { useUser } from '@/features/account'
+import { useUser } from '@/features/account/hooks/useUser'
 import { ZoomButtons } from './ZoomButtons'
-import { AnswersCount } from '@/features/analytics'
-import { headerHeight } from '@/features/editor'
 import { useGesture } from '@use-gesture/react'
 import { GraphNavigation } from '@typebot.io/prisma'
+import { AnswersCount } from '@/features/analytics/types'
+import { headerHeight } from '@/features/editor/constants'
+import { graphPositionDefaultValue, blockWidth } from '../constants'
+import { useBlockDnd } from '../providers/GraphDndProvider'
+import { useGraph } from '../providers/GraphProvider'
+import { useGroupsCoordinates } from '../providers/GroupsCoordinateProvider'
+import { Coordinates } from '../types'
 
 const maxScale = 2
 const minScale = 0.3
diff --git a/apps/builder/src/features/graph/components/GraphElements.tsx b/apps/builder/src/features/graph/components/GraphElements.tsx
index 0130d21b4..ee31c5110 100644
--- a/apps/builder/src/features/graph/components/GraphElements.tsx
+++ b/apps/builder/src/features/graph/components/GraphElements.tsx
@@ -1,9 +1,9 @@
-import { AnswersCount } from '@/features/analytics'
+import { AnswersCount } from '@/features/analytics/types'
 import { Edge, Group } from '@typebot.io/schemas'
 import React, { memo } from 'react'
 import { EndpointsProvider } from '../providers/EndpointsProvider'
-import { Edges } from './Edges'
-import { GroupNode } from './Nodes/GroupNode'
+import { Edges } from './edges/Edges'
+import { GroupNode } from './nodes/group'
 
 type Props = {
   edges: Edge[]
diff --git a/apps/builder/src/features/graph/components/Nodes/BlockNode/BlockNodeContent/index.tsx b/apps/builder/src/features/graph/components/Nodes/BlockNode/BlockNodeContent/index.tsx
deleted file mode 100644
index 9f7f21c7e..000000000
--- a/apps/builder/src/features/graph/components/Nodes/BlockNode/BlockNodeContent/index.tsx
+++ /dev/null
@@ -1 +0,0 @@
-export { BlockNodeContent } from './BlockNodeContent'
diff --git a/apps/builder/src/features/graph/components/Nodes/BlockNode/SettingsPopoverContent/index.ts b/apps/builder/src/features/graph/components/Nodes/BlockNode/SettingsPopoverContent/index.ts
deleted file mode 100644
index 1820f3b5b..000000000
--- a/apps/builder/src/features/graph/components/Nodes/BlockNode/SettingsPopoverContent/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { SettingsPopoverContent } from './SettingsPopoverContent'
diff --git a/apps/builder/src/features/graph/components/Nodes/BlockNode/index.tsx b/apps/builder/src/features/graph/components/Nodes/BlockNode/index.tsx
deleted file mode 100644
index f5ee37922..000000000
--- a/apps/builder/src/features/graph/components/Nodes/BlockNode/index.tsx
+++ /dev/null
@@ -1 +0,0 @@
-export { BlockNodesList } from './BlockNodesList'
diff --git a/apps/builder/src/features/graph/components/Nodes/ItemNode/ItemNodeContent/index.tsx b/apps/builder/src/features/graph/components/Nodes/ItemNode/ItemNodeContent/index.tsx
deleted file mode 100644
index 676a3af81..000000000
--- a/apps/builder/src/features/graph/components/Nodes/ItemNode/ItemNodeContent/index.tsx
+++ /dev/null
@@ -1 +0,0 @@
-export { ItemNodeContent } from './ItemNodeContent'
diff --git a/apps/builder/src/features/graph/components/Nodes/ItemNode/index.tsx b/apps/builder/src/features/graph/components/Nodes/ItemNode/index.tsx
deleted file mode 100644
index b2d18396c..000000000
--- a/apps/builder/src/features/graph/components/Nodes/ItemNode/index.tsx
+++ /dev/null
@@ -1 +0,0 @@
-export { ItemNodesList } from './ItemNodesList'
diff --git a/apps/builder/src/features/graph/components/Nodes/BlockNode/BlockNode.tsx b/apps/builder/src/features/graph/components/Nodes/block/BlockNode.tsx
similarity index 90%
rename from apps/builder/src/features/graph/components/Nodes/BlockNode/BlockNode.tsx
rename to apps/builder/src/features/graph/components/Nodes/block/BlockNode.tsx
index eb8f46d05..0a8d45a81 100644
--- a/apps/builder/src/features/graph/components/Nodes/BlockNode/BlockNode.tsx
+++ b/apps/builder/src/features/graph/components/Nodes/block/BlockNode.tsx
@@ -18,27 +18,27 @@ import {
   LogicBlockType,
 } from '@typebot.io/schemas'
 import { isBubbleBlock, isDefined, isTextBubbleBlock } from '@typebot.io/lib'
-import { BlockNodeContent } from './BlockNodeContent/BlockNodeContent'
-import { BlockIcon, useTypebot } from '@/features/editor'
-import { SettingsPopoverContent } from './SettingsPopoverContent'
+import { BlockNodeContent } from './BlockNodeContent'
+import { BlockSettings, SettingsPopoverContent } from './SettingsPopoverContent'
 import { BlockNodeContextMenu } from './BlockNodeContextMenu'
-import { SourceEndpoint } from '../../Endpoints/SourceEndpoint'
+import { SourceEndpoint } from '../../endpoints/SourceEndpoint'
 import { useRouter } from 'next/router'
-import { SettingsModal } from './SettingsPopoverContent/SettingsModal'
-import { BlockSettings } from './SettingsPopoverContent/SettingsPopoverContent'
-import { TargetEndpoint } from '../../Endpoints'
 import { MediaBubblePopoverContent } from './MediaBubblePopoverContent'
 import { ContextMenu } from '@/components/ContextMenu'
-import { TextBubbleEditor } from '@/features/blocks/bubbles/textBubble'
+import { TextBubbleEditor } from '@/features/blocks/bubbles/textBubble/components/TextBubbleEditor'
+import { BlockIcon } from '@/features/editor/components/BlockIcon'
+import { useTypebot } from '@/features/editor/providers/TypebotProvider'
 import {
   NodePosition,
-  useGraph,
   useBlockDnd,
   useDragDistance,
-  ParentModalProvider,
-} from '../../../providers'
-import { hasDefaultConnector } from '../../../utils'
-import { setMultipleRefs } from '@/utils/helpers'
+} from '@/features/graph/providers/GraphDndProvider'
+import { useGraph } from '@/features/graph/providers/GraphProvider'
+import { ParentModalProvider } from '@/features/graph/providers/ParentModalProvider'
+import { hasDefaultConnector } from '@/features/typebot/helpers/hasDefaultConnector'
+import { setMultipleRefs } from '@/helpers/setMultipleRefs'
+import { TargetEndpoint } from '../../endpoints/TargetEndpoint'
+import { SettingsModal } from './SettingsModal'
 
 export const BlockNode = ({
   block,
diff --git a/apps/builder/src/features/graph/components/Nodes/BlockNode/BlockNodeContent/BlockNodeContent.tsx b/apps/builder/src/features/graph/components/Nodes/block/BlockNodeContent.tsx
similarity index 82%
rename from apps/builder/src/features/graph/components/Nodes/BlockNode/BlockNodeContent/BlockNodeContent.tsx
rename to apps/builder/src/features/graph/components/Nodes/block/BlockNodeContent.tsx
index eb6711fe6..7b4fbc6a1 100644
--- a/apps/builder/src/features/graph/components/Nodes/BlockNode/BlockNodeContent/BlockNodeContent.tsx
+++ b/apps/builder/src/features/graph/components/Nodes/block/BlockNodeContent.tsx
@@ -8,37 +8,37 @@ import {
   IntegrationBlockType,
   BlockIndices,
 } from '@typebot.io/schemas'
-import { ItemNodesList } from '../../ItemNode'
-import { TextBubbleContent } from '@/features/blocks/bubbles/textBubble'
-import { ImageBubbleContent } from '@/features/blocks/bubbles/image'
-import { VideoBubbleContent } from '@/features/blocks/bubbles/video'
-import { EmbedBubbleContent } from '@/features/blocks/bubbles/embed'
-import { TextInputNodeContent } from '@/features/blocks/inputs/textInput'
-import { NumberNodeContent } from '@/features/blocks/inputs/number'
-import { EmailInputNodeContent } from '@/features/blocks/inputs/emailInput'
-import { UrlNodeContent } from '@/features/blocks/inputs/url'
-import { PhoneNodeContent } from '@/features/blocks/inputs/phone'
-import { DateNodeContent } from '@/features/blocks/inputs/date'
-import { SetVariableContent } from '@/features/blocks/logic/setVariable'
-import { WebhookContent } from '@/features/blocks/integrations/webhook'
-import { ChatwootBlockNodeLabel } from '@/features/blocks/integrations/chatwoot'
-import { RedirectNodeContent } from '@/features/blocks/logic/redirect'
-import { PabblyConnectContent } from '@/features/blocks/integrations/pabbly'
-import { PaymentInputContent } from '@/features/blocks/inputs/payment'
-import { RatingInputContent } from '@/features/blocks/inputs/rating'
-import { FileInputContent } from '@/features/blocks/inputs/fileUpload'
-import { TypebotLinkNode } from '@/features/blocks/logic/typebotLink'
-import { GoogleSheetsNodeContent } from '@/features/blocks/integrations/googleSheets'
-import { GoogleAnalyticsNodeContent } from '@/features/blocks/integrations/googleAnalytics/components/GoogleAnalyticsNodeContent'
-import { ZapierContent } from '@/features/blocks/integrations/zapier'
-import { SendEmailContent } from '@/features/blocks/integrations/sendEmail'
-import { MakeComContent } from '@/features/blocks/integrations/makeCom'
-import { AudioBubbleNode } from '@/features/blocks/bubbles/audio'
 import { WaitNodeContent } from '@/features/blocks/logic/wait/components/WaitNodeContent'
 import { ScriptNodeContent } from '@/features/blocks/logic/script/components/ScriptNodeContent'
 import { ButtonsBlockNode } from '@/features/blocks/inputs/buttons/components/ButtonsBlockNode'
 import { JumpNodeBody } from '@/features/blocks/logic/jump/components/JumpNodeBody'
 import { OpenAINodeBody } from '@/features/blocks/integrations/openai/components/OpenAINodeBody'
+import { AudioBubbleNode } from '@/features/blocks/bubbles/audio/components/AudioBubbleNode'
+import { EmbedBubbleContent } from '@/features/blocks/bubbles/embed/components/EmbedBubbleContent'
+import { ImageBubbleContent } from '@/features/blocks/bubbles/image/components/ImageBubbleContent'
+import { TextBubbleContent } from '@/features/blocks/bubbles/textBubble/components/TextBubbleContent'
+import { VideoBubbleContent } from '@/features/blocks/bubbles/video/components/VideoBubbleContent'
+import { DateNodeContent } from '@/features/blocks/inputs/date/components/DateNodeContent'
+import { EmailInputNodeContent } from '@/features/blocks/inputs/emailInput/components/EmailInputNodeContent'
+import { FileInputContent } from '@/features/blocks/inputs/fileUpload/components/FileInputContent'
+import { NumberNodeContent } from '@/features/blocks/inputs/number/components/NumberNodeContent'
+import { PaymentInputContent } from '@/features/blocks/inputs/payment/components/PaymentInputContent'
+import { PhoneNodeContent } from '@/features/blocks/inputs/phone/components/PhoneNodeContent'
+import { RatingInputContent } from '@/features/blocks/inputs/rating/components/RatingInputContent'
+import { TextInputNodeContent } from '@/features/blocks/inputs/textInput/components/TextInputNodeContent'
+import { UrlNodeContent } from '@/features/blocks/inputs/url/components/UrlNodeContent'
+import { GoogleSheetsNodeContent } from '@/features/blocks/integrations/googleSheets/components/GoogleSheetsNodeContent'
+import { MakeComContent } from '@/features/blocks/integrations/makeCom/components/MakeComContent'
+import { PabblyConnectContent } from '@/features/blocks/integrations/pabbly/components/PabblyConnectContent'
+import { SendEmailContent } from '@/features/blocks/integrations/sendEmail/components/SendEmailContent'
+import { WebhookContent } from '@/features/blocks/integrations/webhook/components/WebhookContent'
+import { ZapierContent } from '@/features/blocks/integrations/zapier/components/ZapierContent'
+import { RedirectNodeContent } from '@/features/blocks/logic/redirect/components/RedirectNodeContent'
+import { SetVariableContent } from '@/features/blocks/logic/setVariable/components/SetVariableContent'
+import { TypebotLinkNode } from '@/features/blocks/logic/typebotLink/components/TypebotLinkNode'
+import { ItemNodesList } from '../item/ItemNodesList'
+import { GoogleAnalyticsNodeBody } from '@/features/blocks/integrations/googleAnalytics/components/GoogleAnalyticsNodeBody'
+import { ChatwootNodeBody } from '@/features/blocks/integrations/chatwoot/components/ChatwootNodeBody'
 
 type Props = {
   block: Block | StartBlock
@@ -155,7 +155,7 @@ export const BlockNodeContent = ({ block, indices }: Props): JSX.Element => {
     }
     case IntegrationBlockType.GOOGLE_ANALYTICS: {
       return (
-        <GoogleAnalyticsNodeContent
+        <GoogleAnalyticsNodeBody
           action={
             block.options?.action
               ? `Track "${block.options?.action}" `
@@ -180,7 +180,7 @@ export const BlockNodeContent = ({ block, indices }: Props): JSX.Element => {
       return <SendEmailContent block={block} />
     }
     case IntegrationBlockType.CHATWOOT: {
-      return <ChatwootBlockNodeLabel block={block} />
+      return <ChatwootNodeBody block={block} />
     }
     case IntegrationBlockType.OPEN_AI: {
       return (
diff --git a/apps/builder/src/features/graph/components/Nodes/BlockNode/BlockNodeContextMenu.tsx b/apps/builder/src/features/graph/components/Nodes/block/BlockNodeContextMenu.tsx
similarity index 90%
rename from apps/builder/src/features/graph/components/Nodes/BlockNode/BlockNodeContextMenu.tsx
rename to apps/builder/src/features/graph/components/Nodes/block/BlockNodeContextMenu.tsx
index 52eda26c1..06a7896ec 100644
--- a/apps/builder/src/features/graph/components/Nodes/BlockNode/BlockNodeContextMenu.tsx
+++ b/apps/builder/src/features/graph/components/Nodes/block/BlockNodeContextMenu.tsx
@@ -1,6 +1,6 @@
 import { MenuList, MenuItem } from '@chakra-ui/react'
 import { CopyIcon, TrashIcon } from '@/components/icons'
-import { useTypebot } from '@/features/editor'
+import { useTypebot } from '@/features/editor/providers/TypebotProvider'
 import { BlockIndices } from '@typebot.io/schemas'
 
 type Props = { indices: BlockIndices }
diff --git a/apps/builder/src/features/graph/components/Nodes/BlockNode/BlockNodeOverlay.tsx b/apps/builder/src/features/graph/components/Nodes/block/BlockNodeOverlay.tsx
similarity index 85%
rename from apps/builder/src/features/graph/components/Nodes/BlockNode/BlockNodeOverlay.tsx
rename to apps/builder/src/features/graph/components/Nodes/block/BlockNodeOverlay.tsx
index 9d1ef099b..16910546e 100644
--- a/apps/builder/src/features/graph/components/Nodes/BlockNode/BlockNodeOverlay.tsx
+++ b/apps/builder/src/features/graph/components/Nodes/block/BlockNodeOverlay.tsx
@@ -1,7 +1,7 @@
-import { BlockIcon } from '@/features/editor'
+import { BlockIcon } from '@/features/editor/components/BlockIcon'
 import { StackProps, HStack, useColorModeValue } from '@chakra-ui/react'
 import { StartBlock, Block, BlockIndices } from '@typebot.io/schemas'
-import { BlockNodeContent } from './BlockNodeContent/BlockNodeContent'
+import { BlockNodeContent } from './BlockNodeContent'
 
 export const BlockNodeOverlay = ({
   block,
diff --git a/apps/builder/src/features/graph/components/Nodes/BlockNode/BlockNodesList.tsx b/apps/builder/src/features/graph/components/Nodes/block/BlockNodesList.tsx
similarity index 95%
rename from apps/builder/src/features/graph/components/Nodes/BlockNode/BlockNodesList.tsx
rename to apps/builder/src/features/graph/components/Nodes/block/BlockNodesList.tsx
index b03c82234..686f42e42 100644
--- a/apps/builder/src/features/graph/components/Nodes/BlockNode/BlockNodesList.tsx
+++ b/apps/builder/src/features/graph/components/Nodes/block/BlockNodesList.tsx
@@ -1,17 +1,17 @@
 import { useEventListener, Stack, Portal } from '@chakra-ui/react'
 import { DraggableBlock, DraggableBlockType, Block } from '@typebot.io/schemas'
-import {
-  computeNearestPlaceholderIndex,
-  useBlockDnd,
-  Coordinates,
-  useGraph,
-} from '../../../providers'
 import { useEffect, useRef, useState } from 'react'
-import { useTypebot } from '@/features/editor'
+import { useTypebot } from '@/features/editor/providers/TypebotProvider'
 import { BlockNode } from './BlockNode'
 import { BlockNodeOverlay } from './BlockNodeOverlay'
 import { PlaceholderNode } from '../PlaceholderNode'
 import { isDefined } from '@typebot.io/lib'
+import {
+  useBlockDnd,
+  computeNearestPlaceholderIndex,
+} from '@/features/graph/providers/GraphDndProvider'
+import { useGraph } from '@/features/graph/providers/GraphProvider'
+import { Coordinates } from '@dnd-kit/utilities'
 
 type Props = {
   groupId: string
diff --git a/apps/builder/src/features/graph/components/Nodes/BlockNode/SettingsPopoverContent/HelpDocButton.tsx b/apps/builder/src/features/graph/components/Nodes/block/HelpDocButton.tsx
similarity index 100%
rename from apps/builder/src/features/graph/components/Nodes/BlockNode/SettingsPopoverContent/HelpDocButton.tsx
rename to apps/builder/src/features/graph/components/Nodes/block/HelpDocButton.tsx
diff --git a/apps/builder/src/features/graph/components/Nodes/BlockNode/MediaBubblePopoverContent.tsx b/apps/builder/src/features/graph/components/Nodes/block/MediaBubblePopoverContent.tsx
similarity index 96%
rename from apps/builder/src/features/graph/components/Nodes/BlockNode/MediaBubblePopoverContent.tsx
rename to apps/builder/src/features/graph/components/Nodes/block/MediaBubblePopoverContent.tsx
index d670a665c..4bbbb8c6f 100644
--- a/apps/builder/src/features/graph/components/Nodes/BlockNode/MediaBubblePopoverContent.tsx
+++ b/apps/builder/src/features/graph/components/Nodes/block/MediaBubblePopoverContent.tsx
@@ -1,7 +1,7 @@
 import { ImageUploadContent } from '@/components/ImageUploadContent'
 import { AudioBubbleForm } from '@/features/blocks/bubbles/audio/components/AudioBubbleForm'
-import { EmbedUploadContent } from '@/features/blocks/bubbles/embed'
-import { VideoUploadContent } from '@/features/blocks/bubbles/video'
+import { EmbedUploadContent } from '@/features/blocks/bubbles/embed/components/EmbedUploadContent'
+import { VideoUploadContent } from '@/features/blocks/bubbles/video/components/VideoUploadContent'
 import {
   Portal,
   PopoverContent,
diff --git a/apps/builder/src/features/graph/components/Nodes/BlockNode/SettingsPopoverContent/SettingsModal.tsx b/apps/builder/src/features/graph/components/Nodes/block/SettingsModal.tsx
similarity index 91%
rename from apps/builder/src/features/graph/components/Nodes/BlockNode/SettingsPopoverContent/SettingsModal.tsx
rename to apps/builder/src/features/graph/components/Nodes/block/SettingsModal.tsx
index 3334ab0a0..03b203b96 100644
--- a/apps/builder/src/features/graph/components/Nodes/BlockNode/SettingsPopoverContent/SettingsModal.tsx
+++ b/apps/builder/src/features/graph/components/Nodes/block/SettingsModal.tsx
@@ -1,4 +1,4 @@
-import { useParentModal } from '@/features/graph'
+import { useParentModal } from '@/features/graph/providers/ParentModalProvider'
 import {
   Modal,
   ModalOverlay,
diff --git a/apps/builder/src/features/graph/components/Nodes/BlockNode/SettingsPopoverContent/SettingsPopoverContent.tsx b/apps/builder/src/features/graph/components/Nodes/block/SettingsPopoverContent.tsx
similarity index 83%
rename from apps/builder/src/features/graph/components/Nodes/BlockNode/SettingsPopoverContent/SettingsPopoverContent.tsx
rename to apps/builder/src/features/graph/components/Nodes/block/SettingsPopoverContent.tsx
index 98a35b2d0..d80d1c22b 100644
--- a/apps/builder/src/features/graph/components/Nodes/BlockNode/SettingsPopoverContent/SettingsPopoverContent.tsx
+++ b/apps/builder/src/features/graph/components/Nodes/block/SettingsPopoverContent.tsx
@@ -19,25 +19,6 @@ import {
   BlockWithOptions,
 } from '@typebot.io/schemas'
 import { useRef } from 'react'
-import { DateInputSettingsBody } from '@/features/blocks/inputs/date'
-import { EmailInputSettingsBody } from '@/features/blocks/inputs/emailInput'
-import { FileInputSettings } from '@/features/blocks/inputs/fileUpload'
-import { NumberInputSettingsBody } from '@/features/blocks/inputs/number'
-import { PaymentSettings } from '@/features/blocks/inputs/payment'
-import { PhoneNumberSettingsBody } from '@/features/blocks/inputs/phone'
-import { RatingInputSettings } from '@/features/blocks/inputs/rating'
-import { TextInputSettingsBody } from '@/features/blocks/inputs/textInput'
-import { UrlInputSettingsBody } from '@/features/blocks/inputs/url'
-import { GoogleAnalyticsSettings } from '@/features/blocks/integrations/googleAnalytics'
-import { GoogleSheetsSettingsBody } from '@/features/blocks/integrations/googleSheets'
-import { SendEmailSettings } from '@/features/blocks/integrations/sendEmail'
-import { WebhookSettings } from '@/features/blocks/integrations/webhook'
-import { ZapierSettings } from '@/features/blocks/integrations/zapier'
-import { RedirectSettings } from '@/features/blocks/logic/redirect'
-import { SetVariableSettings } from '@/features/blocks/logic/setVariable'
-import { TypebotLinkForm } from '@/features/blocks/logic/typebotLink'
-import { ButtonsBlockSettings } from '@/features/blocks/inputs/buttons'
-import { ChatwootSettingsForm } from '@/features/blocks/integrations/chatwoot'
 import { HelpDocButton } from './HelpDocButton'
 import { WaitSettings } from '@/features/blocks/logic/wait/components/WaitSettings'
 import { ScriptSettings } from '@/features/blocks/logic/script/components/ScriptSettings'
@@ -45,6 +26,25 @@ import { JumpSettings } from '@/features/blocks/logic/jump/components/JumpSettin
 import { MakeComSettings } from '@/features/blocks/integrations/makeCom/components/MakeComSettings'
 import { PabblyConnectSettings } from '@/features/blocks/integrations/pabbly/components/PabblyConnectSettings'
 import { OpenAISettings } from '@/features/blocks/integrations/openai/components/OpenAISettings'
+import { ButtonsBlockSettings } from '@/features/blocks/inputs/buttons/components/ButtonsBlockSettings'
+import { FileInputSettings } from '@/features/blocks/inputs/fileUpload/components/FileInputSettings'
+import { PaymentSettings } from '@/features/blocks/inputs/payment/components/PaymentSettings'
+import { RatingInputSettings } from '@/features/blocks/inputs/rating/components/RatingInputSettings'
+import { TextInputSettings } from '@/features/blocks/inputs/textInput/components/TextInputSettings'
+import { GoogleAnalyticsSettings } from '@/features/blocks/integrations/googleAnalytics/components/GoogleAnalyticsSettings'
+import { SendEmailSettings } from '@/features/blocks/integrations/sendEmail/components/SendEmailSettings'
+import { WebhookSettings } from '@/features/blocks/integrations/webhook/components/WebhookSettings'
+import { ZapierSettings } from '@/features/blocks/integrations/zapier/components/ZapierSettings'
+import { RedirectSettings } from '@/features/blocks/logic/redirect/components/RedirectSettings'
+import { SetVariableSettings } from '@/features/blocks/logic/setVariable/components/SetVariableSettings'
+import { TypebotLinkForm } from '@/features/blocks/logic/typebotLink/components/TypebotLinkForm'
+import { NumberInputSettings } from '@/features/blocks/inputs/number/components/NumberInputSettings'
+import { EmailInputSettings } from '@/features/blocks/inputs/emailInput/components/EmailInputSettings'
+import { UrlInputSettings } from '@/features/blocks/inputs/url/components/UrlInputSettings'
+import { DateInputSettings } from '@/features/blocks/inputs/date/components/DateInputSettings'
+import { PhoneInputSettings } from '@/features/blocks/inputs/phone/components/PhoneInputSettings'
+import { GoogleSheetsSettings } from '@/features/blocks/integrations/googleSheets/components/GoogleSheetsSettings'
+import { ChatwootSettings } from '@/features/blocks/integrations/chatwoot/components/ChatwootSettings'
 
 type Props = {
   block: BlockWithOptions
@@ -105,7 +105,7 @@ export const BlockSettings = ({
   switch (block.type) {
     case InputBlockType.TEXT: {
       return (
-        <TextInputSettingsBody
+        <TextInputSettings
           options={block.options}
           onOptionsChange={updateOptions}
         />
@@ -113,7 +113,7 @@ export const BlockSettings = ({
     }
     case InputBlockType.NUMBER: {
       return (
-        <NumberInputSettingsBody
+        <NumberInputSettings
           options={block.options}
           onOptionsChange={updateOptions}
         />
@@ -121,7 +121,7 @@ export const BlockSettings = ({
     }
     case InputBlockType.EMAIL: {
       return (
-        <EmailInputSettingsBody
+        <EmailInputSettings
           options={block.options}
           onOptionsChange={updateOptions}
         />
@@ -129,7 +129,7 @@ export const BlockSettings = ({
     }
     case InputBlockType.URL: {
       return (
-        <UrlInputSettingsBody
+        <UrlInputSettings
           options={block.options}
           onOptionsChange={updateOptions}
         />
@@ -137,7 +137,7 @@ export const BlockSettings = ({
     }
     case InputBlockType.DATE: {
       return (
-        <DateInputSettingsBody
+        <DateInputSettings
           options={block.options}
           onOptionsChange={updateOptions}
         />
@@ -145,7 +145,7 @@ export const BlockSettings = ({
     }
     case InputBlockType.PHONE: {
       return (
-        <PhoneNumberSettingsBody
+        <PhoneInputSettings
           options={block.options}
           onOptionsChange={updateOptions}
         />
@@ -231,7 +231,7 @@ export const BlockSettings = ({
     }
     case IntegrationBlockType.GOOGLE_SHEETS: {
       return (
-        <GoogleSheetsSettingsBody
+        <GoogleSheetsSettings
           options={block.options}
           onOptionsChange={updateOptions}
           blockId={block.id}
@@ -270,7 +270,7 @@ export const BlockSettings = ({
     }
     case IntegrationBlockType.CHATWOOT: {
       return (
-        <ChatwootSettingsForm
+        <ChatwootSettings
           options={block.options}
           onOptionsChange={updateOptions}
         />
diff --git a/apps/builder/src/features/graph/components/Nodes/BlockNode/BlockNodeContent/WithVariableContent.tsx b/apps/builder/src/features/graph/components/Nodes/block/WithVariableContent.tsx
similarity index 89%
rename from apps/builder/src/features/graph/components/Nodes/BlockNode/BlockNodeContent/WithVariableContent.tsx
rename to apps/builder/src/features/graph/components/Nodes/block/WithVariableContent.tsx
index 153c3ffa4..6384dd4ad 100644
--- a/apps/builder/src/features/graph/components/Nodes/BlockNode/BlockNodeContent/WithVariableContent.tsx
+++ b/apps/builder/src/features/graph/components/Nodes/block/WithVariableContent.tsx
@@ -1,6 +1,6 @@
 import { chakra, Text, TextProps } from '@chakra-ui/react'
 import React from 'react'
-import { useTypebot } from '@/features/editor'
+import { useTypebot } from '@/features/editor/providers/TypebotProvider'
 import { byId } from '@typebot.io/lib'
 
 type Props = {
diff --git a/apps/builder/src/features/graph/components/Nodes/GroupNode/GroupFocusToolbar.tsx b/apps/builder/src/features/graph/components/Nodes/group/GroupFocusToolbar.tsx
similarity index 100%
rename from apps/builder/src/features/graph/components/Nodes/GroupNode/GroupFocusToolbar.tsx
rename to apps/builder/src/features/graph/components/Nodes/group/GroupFocusToolbar.tsx
diff --git a/apps/builder/src/features/graph/components/Nodes/GroupNode/GroupNode.tsx b/apps/builder/src/features/graph/components/Nodes/group/GroupNode.tsx
similarity index 93%
rename from apps/builder/src/features/graph/components/Nodes/GroupNode/GroupNode.tsx
rename to apps/builder/src/features/graph/components/Nodes/group/GroupNode.tsx
index c5c10acb4..74ab358e0 100644
--- a/apps/builder/src/features/graph/components/Nodes/GroupNode/GroupNode.tsx
+++ b/apps/builder/src/features/graph/components/Nodes/group/GroupNode.tsx
@@ -8,22 +8,24 @@ import {
 } from '@chakra-ui/react'
 import React, { memo, useCallback, useEffect, useRef, useState } from 'react'
 import { Group } from '@typebot.io/schemas'
-import {
-  Coordinates,
-  useGraph,
-  useGroupsCoordinates,
-  useBlockDnd,
-} from '../../../providers'
-import { BlockNodesList } from '../BlockNode/BlockNodesList'
+import { BlockNodesList } from '../block/BlockNodesList'
 import { isDefined, isEmpty, isNotDefined } from '@typebot.io/lib'
-import { useTypebot, RightPanel, useEditor } from '@/features/editor'
 import { GroupNodeContextMenu } from './GroupNodeContextMenu'
 import { useDebounce } from 'use-debounce'
 import { ContextMenu } from '@/components/ContextMenu'
-import { setMultipleRefs } from '@/utils/helpers'
 import { useDrag } from '@use-gesture/react'
 import { GroupFocusToolbar } from './GroupFocusToolbar'
 import { useOutsideClick } from '@/hooks/useOutsideClick'
+import {
+  RightPanel,
+  useEditor,
+} from '@/features/editor/providers/EditorProvider'
+import { useTypebot } from '@/features/editor/providers/TypebotProvider'
+import { useBlockDnd } from '@/features/graph/providers/GraphDndProvider'
+import { useGraph } from '@/features/graph/providers/GraphProvider'
+import { useGroupsCoordinates } from '@/features/graph/providers/GroupsCoordinateProvider'
+import { setMultipleRefs } from '@/helpers/setMultipleRefs'
+import { Coordinates } from '@/features/graph/types'
 
 type Props = {
   group: Group
diff --git a/apps/builder/src/features/graph/components/Nodes/GroupNode/GroupNodeContextMenu.tsx b/apps/builder/src/features/graph/components/Nodes/group/GroupNodeContextMenu.tsx
similarity index 89%
rename from apps/builder/src/features/graph/components/Nodes/GroupNode/GroupNodeContextMenu.tsx
rename to apps/builder/src/features/graph/components/Nodes/group/GroupNodeContextMenu.tsx
index 1f11a063e..fb8745aa3 100644
--- a/apps/builder/src/features/graph/components/Nodes/GroupNode/GroupNodeContextMenu.tsx
+++ b/apps/builder/src/features/graph/components/Nodes/group/GroupNodeContextMenu.tsx
@@ -1,6 +1,6 @@
 import { MenuList, MenuItem } from '@chakra-ui/react'
 import { CopyIcon, TrashIcon } from '@/components/icons'
-import { useTypebot } from '@/features/editor'
+import { useTypebot } from '@/features/editor/providers/TypebotProvider'
 
 export const GroupNodeContextMenu = ({
   groupIndex,
diff --git a/apps/builder/src/features/graph/components/Nodes/GroupNode/index.tsx b/apps/builder/src/features/graph/components/Nodes/group/index.tsx
similarity index 100%
rename from apps/builder/src/features/graph/components/Nodes/GroupNode/index.tsx
rename to apps/builder/src/features/graph/components/Nodes/group/index.tsx
diff --git a/apps/builder/src/features/graph/components/Nodes/ItemNode/ItemNode.tsx b/apps/builder/src/features/graph/components/Nodes/item/ItemNode.tsx
similarity index 89%
rename from apps/builder/src/features/graph/components/Nodes/ItemNode/ItemNode.tsx
rename to apps/builder/src/features/graph/components/Nodes/item/ItemNode.tsx
index a956be4e3..615f7e85f 100644
--- a/apps/builder/src/features/graph/components/Nodes/ItemNode/ItemNode.tsx
+++ b/apps/builder/src/features/graph/components/Nodes/item/ItemNode.tsx
@@ -1,19 +1,19 @@
 import { Flex, useColorModeValue } from '@chakra-ui/react'
-import {
-  Coordinates,
-  useGraph,
-  NodePosition,
-  useDragDistance,
-} from '../../../providers'
-import { useTypebot } from '@/features/editor'
+import { useTypebot } from '@/features/editor/providers/TypebotProvider'
 import { ChoiceInputBlock, Item, ItemIndices } from '@typebot.io/schemas'
 import React, { useRef, useState } from 'react'
-import { SourceEndpoint } from '../../Endpoints/SourceEndpoint'
+import { SourceEndpoint } from '../../endpoints/SourceEndpoint'
 import { ItemNodeContent } from './ItemNodeContent'
 import { ItemNodeContextMenu } from './ItemNodeContextMenu'
 import { ContextMenu } from '@/components/ContextMenu'
-import { setMultipleRefs } from '@/utils/helpers'
 import { isDefined } from '@typebot.io/lib'
+import { Coordinates } from '@/features/graph/types'
+import {
+  NodePosition,
+  useDragDistance,
+} from '@/features/graph/providers/GraphDndProvider'
+import { useGraph } from '@/features/graph/providers/GraphProvider'
+import { setMultipleRefs } from '@/helpers/setMultipleRefs'
 
 type Props = {
   item: Item
diff --git a/apps/builder/src/features/graph/components/Nodes/ItemNode/ItemNodeContent/ItemNodeContent.tsx b/apps/builder/src/features/graph/components/Nodes/item/ItemNodeContent.tsx
similarity index 92%
rename from apps/builder/src/features/graph/components/Nodes/ItemNode/ItemNodeContent/ItemNodeContent.tsx
rename to apps/builder/src/features/graph/components/Nodes/item/ItemNodeContent.tsx
index 16eccdffc..6001b9a87 100644
--- a/apps/builder/src/features/graph/components/Nodes/ItemNode/ItemNodeContent/ItemNodeContent.tsx
+++ b/apps/builder/src/features/graph/components/Nodes/item/ItemNodeContent.tsx
@@ -1,5 +1,5 @@
-import { ButtonsItemNode } from '@/features/blocks/inputs/buttons'
-import { ConditionItemNode } from '@/features/blocks/logic/condition'
+import { ButtonsItemNode } from '@/features/blocks/inputs/buttons/components/ButtonsItemNode'
+import { ConditionItemNode } from '@/features/blocks/logic/condition/components/ConditionItemNode'
 import { Item, ItemIndices, ItemType } from '@typebot.io/schemas'
 import React from 'react'
 
diff --git a/apps/builder/src/features/graph/components/Nodes/ItemNode/ItemNodeContextMenu.tsx b/apps/builder/src/features/graph/components/Nodes/item/ItemNodeContextMenu.tsx
similarity index 87%
rename from apps/builder/src/features/graph/components/Nodes/ItemNode/ItemNodeContextMenu.tsx
rename to apps/builder/src/features/graph/components/Nodes/item/ItemNodeContextMenu.tsx
index 89952079e..61237eadb 100644
--- a/apps/builder/src/features/graph/components/Nodes/ItemNode/ItemNodeContextMenu.tsx
+++ b/apps/builder/src/features/graph/components/Nodes/item/ItemNodeContextMenu.tsx
@@ -1,6 +1,6 @@
 import { MenuList, MenuItem } from '@chakra-ui/react'
 import { TrashIcon } from '@/components/icons'
-import { useTypebot } from '@/features/editor'
+import { useTypebot } from '@/features/editor/providers/TypebotProvider'
 import { ItemIndices } from '@typebot.io/schemas'
 
 type Props = {
diff --git a/apps/builder/src/features/graph/components/Nodes/ItemNode/ItemNodesList.tsx b/apps/builder/src/features/graph/components/Nodes/item/ItemNodesList.tsx
similarity index 94%
rename from apps/builder/src/features/graph/components/Nodes/ItemNode/ItemNodesList.tsx
rename to apps/builder/src/features/graph/components/Nodes/item/ItemNodesList.tsx
index f5d41d5b8..43f9eebb0 100644
--- a/apps/builder/src/features/graph/components/Nodes/ItemNode/ItemNodesList.tsx
+++ b/apps/builder/src/features/graph/components/Nodes/item/ItemNodesList.tsx
@@ -6,13 +6,7 @@ import {
   useColorModeValue,
   useEventListener,
 } from '@chakra-ui/react'
-import {
-  computeNearestPlaceholderIndex,
-  useBlockDnd,
-  Coordinates,
-  useGraph,
-} from '../../../providers'
-import { useTypebot } from '@/features/editor'
+import { useTypebot } from '@/features/editor/providers/TypebotProvider'
 import {
   BlockIndices,
   BlockWithItems,
@@ -21,9 +15,15 @@ import {
 } from '@typebot.io/schemas'
 import React, { useEffect, useRef, useState } from 'react'
 import { ItemNode } from './ItemNode'
-import { SourceEndpoint } from '../../Endpoints'
 import { PlaceholderNode } from '../PlaceholderNode'
 import { isDefined } from '@typebot.io/lib'
+import {
+  useBlockDnd,
+  computeNearestPlaceholderIndex,
+} from '@/features/graph/providers/GraphDndProvider'
+import { useGraph } from '@/features/graph/providers/GraphProvider'
+import { Coordinates } from '@dnd-kit/utilities'
+import { SourceEndpoint } from '../../endpoints/SourceEndpoint'
 
 type Props = {
   block: BlockWithItems
diff --git a/apps/builder/src/features/graph/components/ZoomButtons.tsx b/apps/builder/src/features/graph/components/ZoomButtons.tsx
index 41f75d9db..4c035f1b2 100644
--- a/apps/builder/src/features/graph/components/ZoomButtons.tsx
+++ b/apps/builder/src/features/graph/components/ZoomButtons.tsx
@@ -1,6 +1,6 @@
 import { Stack, IconButton, useColorModeValue } from '@chakra-ui/react'
 import { PlusIcon, MinusIcon } from '@/components/icons'
-import { headerHeight } from '@/features/editor'
+import { headerHeight } from '@/features/editor/constants'
 
 type Props = {
   onZoomInClick: () => void
diff --git a/apps/builder/src/features/graph/components/index.tsx b/apps/builder/src/features/graph/components/index.tsx
deleted file mode 100644
index 8c2482439..000000000
--- a/apps/builder/src/features/graph/components/index.tsx
+++ /dev/null
@@ -1 +0,0 @@
-export { Graph } from './Graph'
diff --git a/apps/builder/src/features/graph/constants.ts b/apps/builder/src/features/graph/constants.ts
new file mode 100644
index 000000000..a71d07396
--- /dev/null
+++ b/apps/builder/src/features/graph/constants.ts
@@ -0,0 +1,28 @@
+import { Coordinates } from './types'
+
+export const stubLength = 20
+export const blockWidth = 300
+export const blockAnchorsOffset = {
+  left: {
+    x: 0,
+    y: 20,
+  },
+  top: {
+    x: blockWidth / 2,
+    y: 0,
+  },
+  right: {
+    x: blockWidth,
+    y: 20,
+  },
+}
+
+export const graphPositionDefaultValue = (
+  firstGroupCoordinates: Coordinates
+) => ({
+  x: 400 - firstGroupCoordinates.x,
+  y: 100 - firstGroupCoordinates.y,
+  scale: 1,
+})
+
+export const pathRadius = 20
diff --git a/apps/builder/src/features/graph/helpers/computeConnectingEdgePath.ts b/apps/builder/src/features/graph/helpers/computeConnectingEdgePath.ts
new file mode 100644
index 000000000..ebb52d08b
--- /dev/null
+++ b/apps/builder/src/features/graph/helpers/computeConnectingEdgePath.ts
@@ -0,0 +1,22 @@
+import { computeEdgePath } from './computeEdgePath'
+import {
+  getAnchorsPosition,
+  GetAnchorsPositionProps,
+} from './getAnchorsPosition'
+
+export const computeConnectingEdgePath = ({
+  sourceGroupCoordinates,
+  targetGroupCoordinates,
+  sourceTop,
+  targetTop,
+  graphScale,
+}: GetAnchorsPositionProps) => {
+  const anchorsPosition = getAnchorsPosition({
+    sourceGroupCoordinates,
+    targetGroupCoordinates,
+    sourceTop,
+    targetTop,
+    graphScale,
+  })
+  return computeEdgePath(anchorsPosition)
+}
diff --git a/apps/builder/src/features/graph/helpers/computeDropOffPath.ts b/apps/builder/src/features/graph/helpers/computeDropOffPath.ts
new file mode 100644
index 000000000..d756ae99d
--- /dev/null
+++ b/apps/builder/src/features/graph/helpers/computeDropOffPath.ts
@@ -0,0 +1,20 @@
+import { roundCorners } from 'svg-round-corners'
+import { pathRadius } from '../constants'
+import { Coordinates } from '../types'
+import { computeSourceCoordinates } from './computeSourceCoordinates'
+import { computeTwoSegments } from './segments'
+
+export const computeDropOffPath = (
+  sourcePosition: Coordinates,
+  sourceTop: number
+) => {
+  const sourceCoord = computeSourceCoordinates(sourcePosition, sourceTop)
+  const segments = computeTwoSegments(sourceCoord, {
+    x: sourceCoord.x + 20,
+    y: sourceCoord.y + 80,
+  })
+  return roundCorners(
+    `M${sourceCoord.x},${sourceCoord.y} ${segments}`,
+    pathRadius
+  ).path
+}
diff --git a/apps/builder/src/features/graph/helpers/computeEdgePath.ts b/apps/builder/src/features/graph/helpers/computeEdgePath.ts
new file mode 100644
index 000000000..ffafb287b
--- /dev/null
+++ b/apps/builder/src/features/graph/helpers/computeEdgePath.ts
@@ -0,0 +1,22 @@
+import { roundCorners } from 'svg-round-corners'
+import { pathRadius } from '../constants'
+import { AnchorsPositionProps } from '../types'
+import { getSegments } from './segments'
+
+export const computeEdgePath = ({
+  sourcePosition,
+  targetPosition,
+  sourceType,
+  totalSegments,
+}: AnchorsPositionProps) => {
+  const segments = getSegments({
+    sourcePosition,
+    targetPosition,
+    sourceType,
+    totalSegments,
+  })
+  return roundCorners(
+    `M${sourcePosition.x},${sourcePosition.y} ${segments}`,
+    pathRadius
+  ).path
+}
diff --git a/apps/builder/src/features/graph/helpers/computeEdgePathToMouth.ts b/apps/builder/src/features/graph/helpers/computeEdgePathToMouth.ts
new file mode 100644
index 000000000..84bb890c5
--- /dev/null
+++ b/apps/builder/src/features/graph/helpers/computeEdgePathToMouth.ts
@@ -0,0 +1,35 @@
+import { roundCorners } from 'svg-round-corners'
+import { blockWidth, pathRadius } from '../constants'
+import { Coordinates } from '../types'
+import { computeThreeSegments } from './segments'
+
+export const computeEdgePathToMouse = ({
+  sourceGroupCoordinates,
+  mousePosition,
+  sourceTop,
+}: {
+  sourceGroupCoordinates: Coordinates
+  mousePosition: Coordinates
+  sourceTop: number
+}): string => {
+  const sourcePosition = {
+    x:
+      mousePosition.x - sourceGroupCoordinates.x > blockWidth / 2
+        ? sourceGroupCoordinates.x + blockWidth
+        : sourceGroupCoordinates.x,
+    y: sourceTop,
+  }
+  const sourceType =
+    mousePosition.x - sourceGroupCoordinates.x > blockWidth / 2
+      ? 'right'
+      : 'left'
+  const segments = computeThreeSegments(
+    sourcePosition,
+    mousePosition,
+    sourceType
+  )
+  return roundCorners(
+    `M${sourcePosition.x},${sourcePosition.y} ${segments}`,
+    pathRadius
+  ).path
+}
diff --git a/apps/builder/src/features/graph/helpers/computeSourceCoordinates.ts b/apps/builder/src/features/graph/helpers/computeSourceCoordinates.ts
new file mode 100644
index 000000000..ff5695c71
--- /dev/null
+++ b/apps/builder/src/features/graph/helpers/computeSourceCoordinates.ts
@@ -0,0 +1,10 @@
+import { blockWidth } from '../constants'
+import { Coordinates } from '../types'
+
+export const computeSourceCoordinates = (
+  sourcePosition: Coordinates,
+  sourceTop: number
+) => ({
+  x: sourcePosition.x + blockWidth,
+  y: sourceTop,
+})
diff --git a/apps/builder/src/features/graph/helpers/getAnchorsPosition.ts b/apps/builder/src/features/graph/helpers/getAnchorsPosition.ts
new file mode 100644
index 000000000..5afd0e98b
--- /dev/null
+++ b/apps/builder/src/features/graph/helpers/getAnchorsPosition.ts
@@ -0,0 +1,94 @@
+import { blockAnchorsOffset, blockWidth, stubLength } from '../constants'
+import { AnchorsPositionProps, Coordinates } from '../types'
+import { computeSourceCoordinates } from './computeSourceCoordinates'
+
+export type GetAnchorsPositionProps = {
+  sourceGroupCoordinates: Coordinates
+  targetGroupCoordinates: Coordinates
+  sourceTop: number
+  targetTop?: number
+  graphScale: number
+}
+
+export const getAnchorsPosition = ({
+  sourceGroupCoordinates,
+  targetGroupCoordinates,
+  sourceTop,
+  targetTop,
+}: GetAnchorsPositionProps): AnchorsPositionProps => {
+  const sourcePosition = computeSourceCoordinates(
+    sourceGroupCoordinates,
+    sourceTop
+  )
+  let sourceType: 'right' | 'left' = 'right'
+  if (sourceGroupCoordinates.x > targetGroupCoordinates.x) {
+    sourcePosition.x = sourceGroupCoordinates.x
+    sourceType = 'left'
+  }
+
+  const { targetPosition, totalSegments } = computeGroupTargetPosition(
+    sourceGroupCoordinates,
+    targetGroupCoordinates,
+    sourcePosition.y,
+    targetTop
+  )
+  return { sourcePosition, targetPosition, sourceType, totalSegments }
+}
+
+const computeGroupTargetPosition = (
+  sourceGroupPosition: Coordinates,
+  targetGroupPosition: Coordinates,
+  sourceOffsetY: number,
+  targetOffsetY?: number
+): { targetPosition: Coordinates; totalSegments: number } => {
+  const isTargetGroupBelow =
+    targetGroupPosition.y > sourceOffsetY &&
+    targetGroupPosition.x < sourceGroupPosition.x + blockWidth + stubLength &&
+    targetGroupPosition.x > sourceGroupPosition.x - blockWidth - stubLength
+  const isTargetGroupToTheRight = targetGroupPosition.x < sourceGroupPosition.x
+  const isTargettingGroup = !targetOffsetY
+
+  if (isTargetGroupBelow && isTargettingGroup) {
+    const isExterior =
+      targetGroupPosition.x <
+        sourceGroupPosition.x - blockWidth / 2 - stubLength ||
+      targetGroupPosition.x >
+        sourceGroupPosition.x + blockWidth / 2 + stubLength
+    const targetPosition = parseGroupAnchorPosition(targetGroupPosition, 'top')
+    return { totalSegments: isExterior ? 2 : 4, targetPosition }
+  } else {
+    const isExterior =
+      targetGroupPosition.x < sourceGroupPosition.x - blockWidth ||
+      targetGroupPosition.x > sourceGroupPosition.x + blockWidth
+    const targetPosition = parseGroupAnchorPosition(
+      targetGroupPosition,
+      isTargetGroupToTheRight ? 'right' : 'left',
+      targetOffsetY
+    )
+    return { totalSegments: isExterior ? 3 : 5, targetPosition }
+  }
+}
+
+const parseGroupAnchorPosition = (
+  blockPosition: Coordinates,
+  anchor: 'left' | 'top' | 'right',
+  targetOffsetY?: number
+): Coordinates => {
+  switch (anchor) {
+    case 'left':
+      return {
+        x: blockPosition.x + blockAnchorsOffset.left.x,
+        y: targetOffsetY ?? blockPosition.y + blockAnchorsOffset.left.y,
+      }
+    case 'top':
+      return {
+        x: blockPosition.x + blockAnchorsOffset.top.x,
+        y: blockPosition.y + blockAnchorsOffset.top.y,
+      }
+    case 'right':
+      return {
+        x: blockPosition.x + blockAnchorsOffset.right.x,
+        y: targetOffsetY ?? blockPosition.y + blockAnchorsOffset.right.y,
+      }
+  }
+}
diff --git a/apps/builder/src/features/graph/helpers/segments.ts b/apps/builder/src/features/graph/helpers/segments.ts
new file mode 100644
index 000000000..2b0127f43
--- /dev/null
+++ b/apps/builder/src/features/graph/helpers/segments.ts
@@ -0,0 +1,92 @@
+import { stubLength } from '../constants'
+import { AnchorsPositionProps, Coordinates } from '../types'
+
+export const getSegments = ({
+  sourcePosition,
+  targetPosition,
+  sourceType,
+  totalSegments,
+}: AnchorsPositionProps) => {
+  switch (totalSegments) {
+    case 2:
+      return computeTwoSegments(sourcePosition, targetPosition)
+    case 3:
+      return computeThreeSegments(sourcePosition, targetPosition, sourceType)
+    case 4:
+      return computeFourSegments(sourcePosition, targetPosition, sourceType)
+    default:
+      return computeFiveSegments(sourcePosition, targetPosition, sourceType)
+  }
+}
+
+export const computeTwoSegments = (
+  sourcePosition: Coordinates,
+  targetPosition: Coordinates
+) => {
+  const segments = []
+  segments.push(`L${targetPosition.x},${sourcePosition.y}`)
+  segments.push(`L${targetPosition.x},${targetPosition.y}`)
+  return segments.join(' ')
+}
+
+export const computeThreeSegments = (
+  sourcePosition: Coordinates,
+  targetPosition: Coordinates,
+  sourceType: 'right' | 'left'
+) => {
+  const segments = []
+  const firstSegmentX =
+    sourceType === 'right'
+      ? sourcePosition.x + (targetPosition.x - sourcePosition.x) / 2
+      : sourcePosition.x - (sourcePosition.x - targetPosition.x) / 2
+  segments.push(`L${firstSegmentX},${sourcePosition.y}`)
+  segments.push(`L${firstSegmentX},${targetPosition.y}`)
+  segments.push(`L${targetPosition.x},${targetPosition.y}`)
+  return segments.join(' ')
+}
+
+export const computeFourSegments = (
+  sourcePosition: Coordinates,
+  targetPosition: Coordinates,
+  sourceType: 'right' | 'left'
+) => {
+  const segments = []
+  const firstSegmentX =
+    sourcePosition.x + (sourceType === 'right' ? stubLength : -stubLength)
+  segments.push(`L${firstSegmentX},${sourcePosition.y}`)
+  const secondSegmentY =
+    sourcePosition.y + (targetPosition.y - sourcePosition.y) - stubLength
+  segments.push(`L${firstSegmentX},${secondSegmentY}`)
+
+  segments.push(`L${targetPosition.x},${secondSegmentY}`)
+
+  segments.push(`L${targetPosition.x},${targetPosition.y}`)
+  return segments.join(' ')
+}
+
+export const computeFiveSegments = (
+  sourcePosition: Coordinates,
+  targetPosition: Coordinates,
+  sourceType: 'right' | 'left'
+) => {
+  const segments = []
+  const firstSegmentX =
+    sourcePosition.x + (sourceType === 'right' ? stubLength : -stubLength)
+  segments.push(`L${firstSegmentX},${sourcePosition.y}`)
+  const firstSegmentY =
+    sourcePosition.y + (targetPosition.y - sourcePosition.y) / 2
+  segments.push(
+    `L${
+      sourcePosition.x + (sourceType === 'right' ? stubLength : -stubLength)
+    },${firstSegmentY}`
+  )
+
+  const secondSegmentX =
+    targetPosition.x - (sourceType === 'right' ? stubLength : -stubLength)
+  segments.push(`L${secondSegmentX},${firstSegmentY}`)
+
+  segments.push(`L${secondSegmentX},${targetPosition.y}`)
+
+  segments.push(`L${targetPosition.x},${targetPosition.y}`)
+  return segments.join(' ')
+}
diff --git a/apps/builder/src/features/graph/index.ts b/apps/builder/src/features/graph/index.ts
deleted file mode 100644
index 56c976f7d..000000000
--- a/apps/builder/src/features/graph/index.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-export { Graph } from './components/Graph'
-export {
-  ParentModalProvider,
-  GraphProvider,
-  GroupsCoordinatesProvider,
-  GraphDndProvider,
-  type Coordinates,
-  useGraph,
-  useBlockDnd,
-  useParentModal,
-} from './providers'
-export { parseNewBlock } from './utils'
diff --git a/apps/builder/src/features/graph/providers/EndpointsProvider.tsx b/apps/builder/src/features/graph/providers/EndpointsProvider.tsx
index 0bafd0727..4632c31ae 100644
--- a/apps/builder/src/features/graph/providers/EndpointsProvider.tsx
+++ b/apps/builder/src/features/graph/providers/EndpointsProvider.tsx
@@ -5,11 +5,7 @@ import {
   useContext,
   useState,
 } from 'react'
-
-export type Endpoint = {
-  id: string
-  y: number
-}
+import { Endpoint } from '../types'
 
 export const endpointsContext = createContext<{
   sourceEndpointYOffsets: Map<string, Endpoint>
diff --git a/apps/builder/src/features/graph/providers/GraphDndProvider.tsx b/apps/builder/src/features/graph/providers/GraphDndProvider.tsx
index 0c8e43ffb..f8ea9e855 100644
--- a/apps/builder/src/features/graph/providers/GraphDndProvider.tsx
+++ b/apps/builder/src/features/graph/providers/GraphDndProvider.tsx
@@ -11,7 +11,7 @@ import {
   useRef,
   useState,
 } from 'react'
-import { Coordinates } from './GraphProvider'
+import { Coordinates } from '../types'
 
 type NodeElement = {
   id: string
diff --git a/apps/builder/src/features/graph/providers/GraphProvider.tsx b/apps/builder/src/features/graph/providers/GraphProvider.tsx
index a597cc051..9067ddf60 100644
--- a/apps/builder/src/features/graph/providers/GraphProvider.tsx
+++ b/apps/builder/src/features/graph/providers/GraphProvider.tsx
@@ -1,4 +1,5 @@
-import { Group, Edge, IdMap, Source, Block, Target } from '@typebot.io/schemas'
+import { Coordinates } from '@dnd-kit/utilities'
+import { Edge } from '@typebot.io/schemas'
 import {
   createContext,
   Dispatch,
@@ -7,53 +8,11 @@ import {
   useContext,
   useState,
 } from 'react'
-
-export const stubLength = 20
-export const blockWidth = 300
-export const blockAnchorsOffset = {
-  left: {
-    x: 0,
-    y: 20,
-  },
-  top: {
-    x: blockWidth / 2,
-    y: 0,
-  },
-  right: {
-    x: blockWidth,
-    y: 20,
-  },
-}
-
-export type Coordinates = { x: number; y: number }
+import { graphPositionDefaultValue } from '../constants'
+import { ConnectingIds } from '../types'
 
 type Position = Coordinates & { scale: number }
 
-export type Anchor = {
-  coordinates: Coordinates
-}
-
-export type Node = Omit<Group, 'blocks'> & {
-  blocks: (Block & {
-    sourceAnchorsPosition: { left: Coordinates; right: Coordinates }
-  })[]
-}
-
-export const graphPositionDefaultValue = (
-  firstGroupCoordinates: Coordinates
-) => ({
-  x: 400 - firstGroupCoordinates.x,
-  y: 100 - firstGroupCoordinates.y,
-  scale: 1,
-})
-
-export type ConnectingIds = {
-  source: Source
-  target?: Target
-}
-
-export type GroupsCoordinates = IdMap<Coordinates>
-
 type PreviewingBlock = {
   id: string
   groupId: string
diff --git a/apps/builder/src/features/graph/providers/GroupsCoordinateProvider.tsx b/apps/builder/src/features/graph/providers/GroupsCoordinateProvider.tsx
index 1b54af610..9b17803c4 100644
--- a/apps/builder/src/features/graph/providers/GroupsCoordinateProvider.tsx
+++ b/apps/builder/src/features/graph/providers/GroupsCoordinateProvider.tsx
@@ -7,7 +7,7 @@ import {
   createContext,
   useCallback,
 } from 'react'
-import { GroupsCoordinates, Coordinates } from './GraphProvider'
+import { Coordinates, GroupsCoordinates } from '../types'
 
 const groupsCoordinatesContext = createContext<{
   groupsCoordinates: GroupsCoordinates
diff --git a/apps/builder/src/features/graph/providers/index.ts b/apps/builder/src/features/graph/providers/index.ts
deleted file mode 100644
index 152b1c58a..000000000
--- a/apps/builder/src/features/graph/providers/index.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export * from './GraphDndProvider'
-export * from './GraphProvider'
-export * from './GroupsCoordinateProvider'
-export * from './ParentModalProvider'
diff --git a/apps/builder/src/features/graph/types.ts b/apps/builder/src/features/graph/types.ts
new file mode 100644
index 000000000..606cc91f8
--- /dev/null
+++ b/apps/builder/src/features/graph/types.ts
@@ -0,0 +1,32 @@
+import { Group, Block, Source, IdMap, Target } from '@typebot.io/schemas'
+
+export type Coordinates = { x: number; y: number }
+
+export type Anchor = {
+  coordinates: Coordinates
+}
+
+export type Node = Omit<Group, 'blocks'> & {
+  blocks: (Block & {
+    sourceAnchorsPosition: { left: Coordinates; right: Coordinates }
+  })[]
+}
+
+export type ConnectingIds = {
+  source: Source
+  target?: Target
+}
+
+export type GroupsCoordinates = IdMap<Coordinates>
+
+export type AnchorsPositionProps = {
+  sourcePosition: Coordinates
+  targetPosition: Coordinates
+  sourceType: 'right' | 'left'
+  totalSegments: number
+}
+
+export type Endpoint = {
+  id: string
+  y: number
+}
diff --git a/apps/builder/src/features/graph/utils.ts b/apps/builder/src/features/graph/utils.ts
deleted file mode 100644
index fe650ea3b..000000000
--- a/apps/builder/src/features/graph/utils.ts
+++ /dev/null
@@ -1,437 +0,0 @@
-import {
-  Block,
-  BlockOptions,
-  BlockWithOptionsType,
-  BubbleBlockContent,
-  BubbleBlockType,
-  defaultChatwootOptions,
-  defaultChoiceInputOptions,
-  defaultConditionContent,
-  defaultDateInputOptions,
-  defaultEmailInputOptions,
-  defaultEmbedBubbleContent,
-  defaultFileInputOptions,
-  defaultGoogleAnalyticsOptions,
-  defaultGoogleSheetsOptions,
-  defaultImageBubbleContent,
-  defaultAudioBubbleContent,
-  defaultNumberInputOptions,
-  defaultPaymentInputOptions,
-  defaultPhoneInputOptions,
-  defaultRatingInputOptions,
-  defaultRedirectOptions,
-  defaultSendEmailOptions,
-  defaultSetVariablesOptions,
-  defaultTextBubbleContent,
-  defaultTextInputOptions,
-  defaultUrlInputOptions,
-  defaultVideoBubbleContent,
-  defaultWebhookOptions,
-  DraggableBlock,
-  DraggableBlockType,
-  InputBlockType,
-  IntegrationBlockType,
-  Item,
-  ItemType,
-  LogicBlockType,
-  defaultWaitOptions,
-  defaultScriptOptions,
-} from '@typebot.io/schemas'
-import {
-  stubLength,
-  blockWidth,
-  blockAnchorsOffset,
-  Coordinates,
-} from './providers'
-import { roundCorners } from 'svg-round-corners'
-import { AnchorsPositionProps } from './components/Edges/Edge'
-import { createId } from '@paralleldrive/cuid2'
-import {
-  isBubbleBlockType,
-  blockTypeHasOption,
-  blockTypeHasWebhook,
-  blockTypeHasItems,
-  isChoiceInput,
-  isConditionBlock,
-  isDefined,
-} from '@typebot.io/lib'
-
-const roundSize = 20
-
-export const computeDropOffPath = (
-  sourcePosition: Coordinates,
-  sourceTop: number
-) => {
-  const sourceCoord = computeSourceCoordinates(sourcePosition, sourceTop)
-  const segments = computeTwoSegments(sourceCoord, {
-    x: sourceCoord.x + 20,
-    y: sourceCoord.y + 80,
-  })
-  return roundCorners(
-    `M${sourceCoord.x},${sourceCoord.y} ${segments}`,
-    roundSize
-  ).path
-}
-
-export const computeSourceCoordinates = (
-  sourcePosition: Coordinates,
-  sourceTop: number
-) => ({
-  x: sourcePosition.x + blockWidth,
-  y: sourceTop,
-})
-
-const getSegments = ({
-  sourcePosition,
-  targetPosition,
-  sourceType,
-  totalSegments,
-}: AnchorsPositionProps) => {
-  switch (totalSegments) {
-    case 2:
-      return computeTwoSegments(sourcePosition, targetPosition)
-    case 3:
-      return computeThreeSegments(sourcePosition, targetPosition, sourceType)
-    case 4:
-      return computeFourSegments(sourcePosition, targetPosition, sourceType)
-    default:
-      return computeFiveSegments(sourcePosition, targetPosition, sourceType)
-  }
-}
-
-const computeTwoSegments = (
-  sourcePosition: Coordinates,
-  targetPosition: Coordinates
-) => {
-  const segments = []
-  segments.push(`L${targetPosition.x},${sourcePosition.y}`)
-  segments.push(`L${targetPosition.x},${targetPosition.y}`)
-  return segments.join(' ')
-}
-
-const computeThreeSegments = (
-  sourcePosition: Coordinates,
-  targetPosition: Coordinates,
-  sourceType: 'right' | 'left'
-) => {
-  const segments = []
-  const firstSegmentX =
-    sourceType === 'right'
-      ? sourcePosition.x + (targetPosition.x - sourcePosition.x) / 2
-      : sourcePosition.x - (sourcePosition.x - targetPosition.x) / 2
-  segments.push(`L${firstSegmentX},${sourcePosition.y}`)
-  segments.push(`L${firstSegmentX},${targetPosition.y}`)
-  segments.push(`L${targetPosition.x},${targetPosition.y}`)
-  return segments.join(' ')
-}
-
-const computeFourSegments = (
-  sourcePosition: Coordinates,
-  targetPosition: Coordinates,
-  sourceType: 'right' | 'left'
-) => {
-  const segments = []
-  const firstSegmentX =
-    sourcePosition.x + (sourceType === 'right' ? stubLength : -stubLength)
-  segments.push(`L${firstSegmentX},${sourcePosition.y}`)
-  const secondSegmentY =
-    sourcePosition.y + (targetPosition.y - sourcePosition.y) - stubLength
-  segments.push(`L${firstSegmentX},${secondSegmentY}`)
-
-  segments.push(`L${targetPosition.x},${secondSegmentY}`)
-
-  segments.push(`L${targetPosition.x},${targetPosition.y}`)
-  return segments.join(' ')
-}
-
-const computeFiveSegments = (
-  sourcePosition: Coordinates,
-  targetPosition: Coordinates,
-  sourceType: 'right' | 'left'
-) => {
-  const segments = []
-  const firstSegmentX =
-    sourcePosition.x + (sourceType === 'right' ? stubLength : -stubLength)
-  segments.push(`L${firstSegmentX},${sourcePosition.y}`)
-  const firstSegmentY =
-    sourcePosition.y + (targetPosition.y - sourcePosition.y) / 2
-  segments.push(
-    `L${
-      sourcePosition.x + (sourceType === 'right' ? stubLength : -stubLength)
-    },${firstSegmentY}`
-  )
-
-  const secondSegmentX =
-    targetPosition.x - (sourceType === 'right' ? stubLength : -stubLength)
-  segments.push(`L${secondSegmentX},${firstSegmentY}`)
-
-  segments.push(`L${secondSegmentX},${targetPosition.y}`)
-
-  segments.push(`L${targetPosition.x},${targetPosition.y}`)
-  return segments.join(' ')
-}
-
-type GetAnchorsPositionParams = {
-  sourceGroupCoordinates: Coordinates
-  targetGroupCoordinates: Coordinates
-  sourceTop: number
-  targetTop?: number
-  graphScale: number
-}
-export const getAnchorsPosition = ({
-  sourceGroupCoordinates,
-  targetGroupCoordinates,
-  sourceTop,
-  targetTop,
-}: GetAnchorsPositionParams): AnchorsPositionProps => {
-  const sourcePosition = computeSourceCoordinates(
-    sourceGroupCoordinates,
-    sourceTop
-  )
-  let sourceType: 'right' | 'left' = 'right'
-  if (sourceGroupCoordinates.x > targetGroupCoordinates.x) {
-    sourcePosition.x = sourceGroupCoordinates.x
-    sourceType = 'left'
-  }
-
-  const { targetPosition, totalSegments } = computeGroupTargetPosition(
-    sourceGroupCoordinates,
-    targetGroupCoordinates,
-    sourcePosition.y,
-    targetTop
-  )
-  return { sourcePosition, targetPosition, sourceType, totalSegments }
-}
-
-const computeGroupTargetPosition = (
-  sourceGroupPosition: Coordinates,
-  targetGroupPosition: Coordinates,
-  sourceOffsetY: number,
-  targetOffsetY?: number
-): { targetPosition: Coordinates; totalSegments: number } => {
-  const isTargetGroupBelow =
-    targetGroupPosition.y > sourceOffsetY &&
-    targetGroupPosition.x < sourceGroupPosition.x + blockWidth + stubLength &&
-    targetGroupPosition.x > sourceGroupPosition.x - blockWidth - stubLength
-  const isTargetGroupToTheRight = targetGroupPosition.x < sourceGroupPosition.x
-  const isTargettingGroup = !targetOffsetY
-
-  if (isTargetGroupBelow && isTargettingGroup) {
-    const isExterior =
-      targetGroupPosition.x <
-        sourceGroupPosition.x - blockWidth / 2 - stubLength ||
-      targetGroupPosition.x >
-        sourceGroupPosition.x + blockWidth / 2 + stubLength
-    const targetPosition = parseGroupAnchorPosition(targetGroupPosition, 'top')
-    return { totalSegments: isExterior ? 2 : 4, targetPosition }
-  } else {
-    const isExterior =
-      targetGroupPosition.x < sourceGroupPosition.x - blockWidth ||
-      targetGroupPosition.x > sourceGroupPosition.x + blockWidth
-    const targetPosition = parseGroupAnchorPosition(
-      targetGroupPosition,
-      isTargetGroupToTheRight ? 'right' : 'left',
-      targetOffsetY
-    )
-    return { totalSegments: isExterior ? 3 : 5, targetPosition }
-  }
-}
-
-const parseGroupAnchorPosition = (
-  blockPosition: Coordinates,
-  anchor: 'left' | 'top' | 'right',
-  targetOffsetY?: number
-): Coordinates => {
-  switch (anchor) {
-    case 'left':
-      return {
-        x: blockPosition.x + blockAnchorsOffset.left.x,
-        y: targetOffsetY ?? blockPosition.y + blockAnchorsOffset.left.y,
-      }
-    case 'top':
-      return {
-        x: blockPosition.x + blockAnchorsOffset.top.x,
-        y: blockPosition.y + blockAnchorsOffset.top.y,
-      }
-    case 'right':
-      return {
-        x: blockPosition.x + blockAnchorsOffset.right.x,
-        y: targetOffsetY ?? blockPosition.y + blockAnchorsOffset.right.y,
-      }
-  }
-}
-
-export const computeEdgePath = ({
-  sourcePosition,
-  targetPosition,
-  sourceType,
-  totalSegments,
-}: AnchorsPositionProps) => {
-  const segments = getSegments({
-    sourcePosition,
-    targetPosition,
-    sourceType,
-    totalSegments,
-  })
-  return roundCorners(
-    `M${sourcePosition.x},${sourcePosition.y} ${segments}`,
-    roundSize
-  ).path
-}
-
-export const computeConnectingEdgePath = ({
-  sourceGroupCoordinates,
-  targetGroupCoordinates,
-  sourceTop,
-  targetTop,
-  graphScale,
-}: GetAnchorsPositionParams) => {
-  const anchorsPosition = getAnchorsPosition({
-    sourceGroupCoordinates,
-    targetGroupCoordinates,
-    sourceTop,
-    targetTop,
-    graphScale,
-  })
-  return computeEdgePath(anchorsPosition)
-}
-
-export const computeEdgePathToMouse = ({
-  sourceGroupCoordinates,
-  mousePosition,
-  sourceTop,
-}: {
-  sourceGroupCoordinates: Coordinates
-  mousePosition: Coordinates
-  sourceTop: number
-}): string => {
-  const sourcePosition = {
-    x:
-      mousePosition.x - sourceGroupCoordinates.x > blockWidth / 2
-        ? sourceGroupCoordinates.x + blockWidth
-        : sourceGroupCoordinates.x,
-    y: sourceTop,
-  }
-  const sourceType =
-    mousePosition.x - sourceGroupCoordinates.x > blockWidth / 2
-      ? 'right'
-      : 'left'
-  const segments = computeThreeSegments(
-    sourcePosition,
-    mousePosition,
-    sourceType
-  )
-  return roundCorners(
-    `M${sourcePosition.x},${sourcePosition.y} ${segments}`,
-    roundSize
-  ).path
-}
-
-export const parseNewBlock = (
-  type: DraggableBlockType,
-  groupId: string
-): DraggableBlock => {
-  const id = createId()
-  return {
-    id,
-    groupId,
-    type,
-    content: isBubbleBlockType(type) ? parseDefaultContent(type) : undefined,
-    options: blockTypeHasOption(type)
-      ? parseDefaultBlockOptions(type)
-      : undefined,
-    webhookId: blockTypeHasWebhook(type) ? createId() : undefined,
-    items: blockTypeHasItems(type) ? parseDefaultItems(type, id) : undefined,
-  } as DraggableBlock
-}
-
-const parseDefaultItems = (
-  type: LogicBlockType.CONDITION | InputBlockType.CHOICE,
-  blockId: string
-): Item[] => {
-  switch (type) {
-    case InputBlockType.CHOICE:
-      return [{ id: createId(), blockId, type: ItemType.BUTTON }]
-    case LogicBlockType.CONDITION:
-      return [
-        {
-          id: createId(),
-          blockId,
-          type: ItemType.CONDITION,
-          content: defaultConditionContent,
-        },
-      ]
-  }
-}
-
-const parseDefaultContent = (type: BubbleBlockType): BubbleBlockContent => {
-  switch (type) {
-    case BubbleBlockType.TEXT:
-      return defaultTextBubbleContent
-    case BubbleBlockType.IMAGE:
-      return defaultImageBubbleContent
-    case BubbleBlockType.VIDEO:
-      return defaultVideoBubbleContent
-    case BubbleBlockType.EMBED:
-      return defaultEmbedBubbleContent
-    case BubbleBlockType.AUDIO:
-      return defaultAudioBubbleContent
-  }
-}
-
-const parseDefaultBlockOptions = (type: BlockWithOptionsType): BlockOptions => {
-  switch (type) {
-    case InputBlockType.TEXT:
-      return defaultTextInputOptions
-    case InputBlockType.NUMBER:
-      return defaultNumberInputOptions
-    case InputBlockType.EMAIL:
-      return defaultEmailInputOptions
-    case InputBlockType.DATE:
-      return defaultDateInputOptions
-    case InputBlockType.PHONE:
-      return defaultPhoneInputOptions
-    case InputBlockType.URL:
-      return defaultUrlInputOptions
-    case InputBlockType.CHOICE:
-      return defaultChoiceInputOptions
-    case InputBlockType.PAYMENT:
-      return defaultPaymentInputOptions
-    case InputBlockType.RATING:
-      return defaultRatingInputOptions
-    case InputBlockType.FILE:
-      return defaultFileInputOptions
-    case LogicBlockType.SET_VARIABLE:
-      return defaultSetVariablesOptions
-    case LogicBlockType.REDIRECT:
-      return defaultRedirectOptions
-    case LogicBlockType.SCRIPT:
-      return defaultScriptOptions
-    case LogicBlockType.WAIT:
-      return defaultWaitOptions
-    case LogicBlockType.JUMP:
-      return {}
-    case LogicBlockType.TYPEBOT_LINK:
-      return {}
-    case IntegrationBlockType.GOOGLE_SHEETS:
-      return defaultGoogleSheetsOptions
-    case IntegrationBlockType.GOOGLE_ANALYTICS:
-      return defaultGoogleAnalyticsOptions
-    case IntegrationBlockType.ZAPIER:
-    case IntegrationBlockType.PABBLY_CONNECT:
-    case IntegrationBlockType.MAKE_COM:
-    case IntegrationBlockType.WEBHOOK:
-      return defaultWebhookOptions
-    case IntegrationBlockType.EMAIL:
-      return defaultSendEmailOptions
-    case IntegrationBlockType.CHATWOOT:
-      return defaultChatwootOptions
-    case IntegrationBlockType.OPEN_AI:
-      return {}
-  }
-}
-
-export const hasDefaultConnector = (block: Block) =>
-  (!isChoiceInput(block) && !isConditionBlock(block)) ||
-  (block.type === InputBlockType.CHOICE &&
-    isDefined(block.options.dynamicVariableId))
diff --git a/apps/builder/src/features/preview/components/PreviewDrawer.tsx b/apps/builder/src/features/preview/components/PreviewDrawer.tsx
index dffe64443..c1d05aad7 100644
--- a/apps/builder/src/features/preview/components/PreviewDrawer.tsx
+++ b/apps/builder/src/features/preview/components/PreviewDrawer.tsx
@@ -9,7 +9,7 @@ import {
   VStack,
 } from '@chakra-ui/react'
 import { useEditor } from '../../editor/providers/EditorProvider'
-import { useGraph } from '@/features/graph'
+import { useGraph } from '@/features/graph/providers/GraphProvider'
 import { useTypebot } from '../../editor/providers/TypebotProvider'
 import React, { useState } from 'react'
 import { headerHeight } from '../../editor/constants'
diff --git a/apps/builder/src/features/preview/components/WebPreview.tsx b/apps/builder/src/features/preview/components/WebPreview.tsx
index b04dc1b9c..f7886aec3 100644
--- a/apps/builder/src/features/preview/components/WebPreview.tsx
+++ b/apps/builder/src/features/preview/components/WebPreview.tsx
@@ -1,6 +1,6 @@
 import { useEditor } from '@/features/editor/providers/EditorProvider'
 import { useTypebot } from '@/features/editor/providers/TypebotProvider'
-import { useGraph } from '@/features/graph'
+import { useGraph } from '@/features/graph/providers/GraphProvider'
 import { useToast } from '@/hooks/useToast'
 import { UseToastOptions } from '@chakra-ui/react'
 import { Standard } from '@typebot.io/react'
diff --git a/apps/builder/src/features/publish/components/PublishButton.tsx b/apps/builder/src/features/publish/components/PublishButton.tsx
index 912abb472..c59dfd207 100644
--- a/apps/builder/src/features/publish/components/PublishButton.tsx
+++ b/apps/builder/src/features/publish/components/PublishButton.tsx
@@ -19,13 +19,15 @@ import {
   LockedIcon,
   UnlockedIcon,
 } from '@/components/icons'
-import { useTypebot } from '@/features/editor'
-import { useWorkspace } from '@/features/workspace'
+import { useTypebot } from '@/features/editor/providers/TypebotProvider'
+import { useWorkspace } from '@/features/workspace/WorkspaceProvider'
 import { InputBlockType } from '@typebot.io/schemas'
 import { useRouter } from 'next/router'
 import { isNotDefined } from '@typebot.io/lib'
-import { ChangePlanModal, isFreePlan, LimitReached } from '@/features/billing'
-import { timeSince } from '@/utils/helpers'
+import { ChangePlanModal } from '@/features/billing/components/ChangePlanModal'
+import { isFreePlan } from '@/features/billing/helpers/isFreePlan'
+import { LimitReached } from '@/features/billing/types'
+import { parseTimeSince } from '@/helpers/parseTimeSince'
 
 export const PublishButton = (props: ButtonProps) => {
   const warningTextColor = useColorModeValue('red.300', 'red.600')
@@ -87,7 +89,7 @@ export const PublishButton = (props: ButtonProps) => {
             <Text fontStyle="italic">
               Published version from{' '}
               {publishedTypebot &&
-                timeSince(publishedTypebot.updatedAt.toString())}{' '}
+                parseTimeSince(publishedTypebot.updatedAt.toString())}{' '}
               ago
             </Text>
           </Stack>
diff --git a/apps/builder/src/features/publish/components/SharePage.tsx b/apps/builder/src/features/publish/components/SharePage.tsx
index b71fe87ec..658bc9830 100644
--- a/apps/builder/src/features/publish/components/SharePage.tsx
+++ b/apps/builder/src/features/publish/components/SharePage.tsx
@@ -1,16 +1,8 @@
 import { TrashIcon } from '@/components/icons'
 import { Seo } from '@/components/Seo'
-import {
-  isProPlan,
-  LimitReached,
-  LockTag,
-  UpgradeButton,
-} from '@/features/billing'
-import { CustomDomainsDropdown } from '@/features/customDomains'
-import { TypebotHeader, useTypebot } from '@/features/editor'
-import { useWorkspace } from '@/features/workspace'
+import { useWorkspace } from '@/features/workspace/WorkspaceProvider'
 import { useToast } from '@/hooks/useToast'
-import { isCloudProdInstance } from '@/utils/helpers'
+import { isCloudProdInstance } from '@/helpers/isCloudProdInstance'
 import {
   Flex,
   Heading,
@@ -23,9 +15,16 @@ import {
 import { Plan } from '@typebot.io/prisma'
 import { isDefined, getViewerUrl, isNotDefined, env } from '@typebot.io/lib'
 import { isPublicDomainAvailableQuery } from '../queries/isPublicDomainAvailableQuery'
-import { parseDefaultPublicId } from '../utils'
 import { EditableUrl } from './EditableUrl'
 import { integrationsList } from './embeds/EmbedButton'
+import { useTypebot } from '@/features/editor/providers/TypebotProvider'
+import { LockTag } from '@/features/billing/components/LockTag'
+import { UpgradeButton } from '@/features/billing/components/UpgradeButton'
+import { isProPlan } from '@/features/billing/helpers/isProPlan'
+import { LimitReached } from '@/features/billing/types'
+import { CustomDomainsDropdown } from '@/features/customDomains/components/CustomDomainsDropdown'
+import { TypebotHeader } from '@/features/editor/components/TypebotHeader'
+import { parseDefaultPublicId } from '../helpers/parseDefaultPublicId'
 
 export const SharePage = () => {
   const { workspace } = useWorkspace()
diff --git a/apps/builder/src/features/publish/components/embeds/EmbedButton.tsx b/apps/builder/src/features/publish/components/embeds/EmbedButton.tsx
index aee50a9b0..ea62d4296 100644
--- a/apps/builder/src/features/publish/components/embeds/EmbedButton.tsx
+++ b/apps/builder/src/features/publish/components/embeds/EmbedButton.tsx
@@ -31,10 +31,10 @@ import {
   WixModal,
 } from './modals'
 import { OtherModal } from './modals/OtherModal'
-import { ScriptIcon } from '@/features/blocks/logic/script'
 import { ScriptModal } from './modals/Script/ScriptModal'
 import { CodeIcon } from '@/components/icons'
 import { ApiModal } from './modals/ApiModal'
+import { ScriptIcon } from '@/features/blocks/logic/script/components/ScriptIcon'
 
 export type ModalProps = {
   publicId: string
diff --git a/apps/builder/src/features/publish/components/embeds/modals/GtmModal/instructions/GtmBubbleInstructions.tsx b/apps/builder/src/features/publish/components/embeds/modals/GtmModal/instructions/GtmBubbleInstructions.tsx
index 049820867..515b5f42d 100644
--- a/apps/builder/src/features/publish/components/embeds/modals/GtmModal/instructions/GtmBubbleInstructions.tsx
+++ b/apps/builder/src/features/publish/components/embeds/modals/GtmModal/instructions/GtmBubbleInstructions.tsx
@@ -1,4 +1,4 @@
-import { useTypebot } from '@/features/editor'
+import { useTypebot } from '@/features/editor/providers/TypebotProvider'
 import { OrderedList, ListItem, Stack, Text, Code } from '@chakra-ui/react'
 import { BubbleProps } from '@typebot.io/js'
 import { useState } from 'react'
diff --git a/apps/builder/src/features/publish/components/embeds/modals/IframeModal/IframeSnippet.tsx b/apps/builder/src/features/publish/components/embeds/modals/IframeModal/IframeSnippet.tsx
index 4cd4aae93..bdbb1805b 100644
--- a/apps/builder/src/features/publish/components/embeds/modals/IframeModal/IframeSnippet.tsx
+++ b/apps/builder/src/features/publish/components/embeds/modals/IframeModal/IframeSnippet.tsx
@@ -1,5 +1,5 @@
 import { FlexProps } from '@chakra-ui/react'
-import { useTypebot } from '@/features/editor'
+import { useTypebot } from '@/features/editor/providers/TypebotProvider'
 import { env, getViewerUrl } from '@typebot.io/lib'
 import { CodeEditor } from '@/components/inputs/CodeEditor'
 import prettier from 'prettier/standalone'
diff --git a/apps/builder/src/features/publish/components/embeds/modals/Javascript/JavascriptBubbleSnippet.tsx b/apps/builder/src/features/publish/components/embeds/modals/Javascript/JavascriptBubbleSnippet.tsx
index 761084dd4..48e2a7613 100644
--- a/apps/builder/src/features/publish/components/embeds/modals/Javascript/JavascriptBubbleSnippet.tsx
+++ b/apps/builder/src/features/publish/components/embeds/modals/Javascript/JavascriptBubbleSnippet.tsx
@@ -1,11 +1,11 @@
 import prettier from 'prettier/standalone'
 import parserHtml from 'prettier/parser-html'
 import { parseInitBubbleCode, typebotImportCode } from '../../snippetParsers'
-import { useTypebot } from '@/features/editor'
+import { useTypebot } from '@/features/editor/providers/TypebotProvider'
 import { CodeEditor } from '@/components/inputs/CodeEditor'
 import { BubbleProps } from '@typebot.io/js'
-import { isCloudProdInstance } from '@/utils/helpers'
 import { env, getViewerUrl } from '@typebot.io/lib'
+import { isCloudProdInstance } from '@/helpers/isCloudProdInstance'
 
 type Props = Pick<BubbleProps, 'theme' | 'previewMessage'>
 
diff --git a/apps/builder/src/features/publish/components/embeds/modals/Javascript/JavascriptPopupSnippet.tsx b/apps/builder/src/features/publish/components/embeds/modals/Javascript/JavascriptPopupSnippet.tsx
index 6ade2f390..6831bb8bc 100644
--- a/apps/builder/src/features/publish/components/embeds/modals/Javascript/JavascriptPopupSnippet.tsx
+++ b/apps/builder/src/features/publish/components/embeds/modals/Javascript/JavascriptPopupSnippet.tsx
@@ -1,11 +1,11 @@
-import { useTypebot } from '@/features/editor'
+import { useTypebot } from '@/features/editor/providers/TypebotProvider'
 import parserHtml from 'prettier/parser-html'
 import prettier from 'prettier/standalone'
 import { parseInitPopupCode, typebotImportCode } from '../../snippetParsers'
 import { CodeEditor } from '@/components/inputs/CodeEditor'
 import { PopupProps } from '@typebot.io/js'
-import { isCloudProdInstance } from '@/utils/helpers'
 import { env, getViewerUrl } from '@typebot.io/lib'
+import { isCloudProdInstance } from '@/helpers/isCloudProdInstance'
 
 type Props = Pick<PopupProps, 'autoShowDelay'>
 
diff --git a/apps/builder/src/features/publish/components/embeds/modals/Javascript/JavascriptStandardSnippet.tsx b/apps/builder/src/features/publish/components/embeds/modals/Javascript/JavascriptStandardSnippet.tsx
index 49f23cccf..b13ebfdce 100644
--- a/apps/builder/src/features/publish/components/embeds/modals/Javascript/JavascriptStandardSnippet.tsx
+++ b/apps/builder/src/features/publish/components/embeds/modals/Javascript/JavascriptStandardSnippet.tsx
@@ -1,10 +1,10 @@
 import parserHtml from 'prettier/parser-html'
 import prettier from 'prettier/standalone'
 import { parseInitStandardCode, typebotImportCode } from '../../snippetParsers'
-import { useTypebot } from '@/features/editor'
+import { useTypebot } from '@/features/editor/providers/TypebotProvider'
 import { CodeEditor } from '@/components/inputs/CodeEditor'
-import { isCloudProdInstance } from '@/utils/helpers'
 import { env, getViewerUrl } from '@typebot.io/lib'
+import { isCloudProdInstance } from '@/helpers/isCloudProdInstance'
 
 type Props = {
   widthLabel?: string
diff --git a/apps/builder/src/features/publish/components/embeds/modals/Javascript/instructions/JavascriptBubbleInstructions.tsx b/apps/builder/src/features/publish/components/embeds/modals/Javascript/instructions/JavascriptBubbleInstructions.tsx
index 2c7d8871a..cc03e66c5 100644
--- a/apps/builder/src/features/publish/components/embeds/modals/Javascript/instructions/JavascriptBubbleInstructions.tsx
+++ b/apps/builder/src/features/publish/components/embeds/modals/Javascript/instructions/JavascriptBubbleInstructions.tsx
@@ -1,4 +1,4 @@
-import { useTypebot } from '@/features/editor'
+import { useTypebot } from '@/features/editor/providers/TypebotProvider'
 import { Stack, Code, Text } from '@chakra-ui/react'
 import { BubbleProps } from '@typebot.io/js'
 import { Typebot } from '@typebot.io/schemas'
diff --git a/apps/builder/src/features/publish/components/embeds/modals/React/ReactBubbleSnippet.tsx b/apps/builder/src/features/publish/components/embeds/modals/React/ReactBubbleSnippet.tsx
index 39dfd014c..91c844499 100644
--- a/apps/builder/src/features/publish/components/embeds/modals/React/ReactBubbleSnippet.tsx
+++ b/apps/builder/src/features/publish/components/embeds/modals/React/ReactBubbleSnippet.tsx
@@ -1,5 +1,5 @@
 import { CodeEditor } from '@/components/inputs/CodeEditor'
-import { useTypebot } from '@/features/editor'
+import { useTypebot } from '@/features/editor/providers/TypebotProvider'
 import { BubbleProps } from '@typebot.io/js'
 import parserBabel from 'prettier/parser-babel'
 import prettier from 'prettier/standalone'
diff --git a/apps/builder/src/features/publish/components/embeds/modals/React/ReactPopupSnippet.tsx b/apps/builder/src/features/publish/components/embeds/modals/React/ReactPopupSnippet.tsx
index 7a1aecb89..76ca72eb7 100644
--- a/apps/builder/src/features/publish/components/embeds/modals/React/ReactPopupSnippet.tsx
+++ b/apps/builder/src/features/publish/components/embeds/modals/React/ReactPopupSnippet.tsx
@@ -1,5 +1,5 @@
 import { CodeEditor } from '@/components/inputs/CodeEditor'
-import { useTypebot } from '@/features/editor'
+import { useTypebot } from '@/features/editor/providers/TypebotProvider'
 import { PopupProps } from '@typebot.io/js'
 import parserBabel from 'prettier/parser-babel'
 import prettier from 'prettier/standalone'
diff --git a/apps/builder/src/features/publish/components/embeds/modals/React/ReactStandardSnippet.tsx b/apps/builder/src/features/publish/components/embeds/modals/React/ReactStandardSnippet.tsx
index ac7b1e446..19eab4826 100644
--- a/apps/builder/src/features/publish/components/embeds/modals/React/ReactStandardSnippet.tsx
+++ b/apps/builder/src/features/publish/components/embeds/modals/React/ReactStandardSnippet.tsx
@@ -1,5 +1,5 @@
 import { CodeEditor } from '@/components/inputs/CodeEditor'
-import { useTypebot } from '@/features/editor'
+import { useTypebot } from '@/features/editor/providers/TypebotProvider'
 import parserBabel from 'prettier/parser-babel'
 import prettier from 'prettier/standalone'
 import { parseReactBotProps } from '../../snippetParsers'
diff --git a/apps/builder/src/features/publish/components/embeds/modals/React/instructions/ReactBubbleInstructions.tsx b/apps/builder/src/features/publish/components/embeds/modals/React/instructions/ReactBubbleInstructions.tsx
index e554a9e35..f51354a59 100644
--- a/apps/builder/src/features/publish/components/embeds/modals/React/instructions/ReactBubbleInstructions.tsx
+++ b/apps/builder/src/features/publish/components/embeds/modals/React/instructions/ReactBubbleInstructions.tsx
@@ -1,4 +1,4 @@
-import { useTypebot } from '@/features/editor'
+import { useTypebot } from '@/features/editor/providers/TypebotProvider'
 import { ListItem, OrderedList, Stack, Text } from '@chakra-ui/react'
 import { BubbleProps } from '@typebot.io/js'
 import { useState } from 'react'
diff --git a/apps/builder/src/features/publish/components/embeds/modals/Script/instructions/ScriptBubbleInstructions.tsx b/apps/builder/src/features/publish/components/embeds/modals/Script/instructions/ScriptBubbleInstructions.tsx
index 3ee868c03..18d108176 100644
--- a/apps/builder/src/features/publish/components/embeds/modals/Script/instructions/ScriptBubbleInstructions.tsx
+++ b/apps/builder/src/features/publish/components/embeds/modals/Script/instructions/ScriptBubbleInstructions.tsx
@@ -1,6 +1,5 @@
 import { CodeEditor } from '@/components/inputs/CodeEditor'
-import { useTypebot } from '@/features/editor'
-import { isCloudProdInstance } from '@/utils/helpers'
+import { useTypebot } from '@/features/editor/providers/TypebotProvider'
 import { Stack, Text } from '@chakra-ui/react'
 import { BubbleProps } from '@typebot.io/js'
 import { Typebot } from '@typebot.io/schemas'
@@ -12,6 +11,7 @@ import {
   parseInitBubbleCode,
   typebotImportCode,
 } from '../../../snippetParsers'
+import { isCloudProdInstance } from '@/helpers/isCloudProdInstance'
 
 export const parseDefaultBubbleTheme = (typebot?: Typebot) => ({
   button: {
diff --git a/apps/builder/src/features/publish/components/embeds/modals/Script/instructions/ScriptPopupInstructions.tsx b/apps/builder/src/features/publish/components/embeds/modals/Script/instructions/ScriptPopupInstructions.tsx
index 3481cb638..769b6fc67 100644
--- a/apps/builder/src/features/publish/components/embeds/modals/Script/instructions/ScriptPopupInstructions.tsx
+++ b/apps/builder/src/features/publish/components/embeds/modals/Script/instructions/ScriptPopupInstructions.tsx
@@ -1,6 +1,6 @@
 import { CodeEditor } from '@/components/inputs/CodeEditor'
-import { useTypebot } from '@/features/editor'
-import { isCloudProdInstance } from '@/utils/helpers'
+import { useTypebot } from '@/features/editor/providers/TypebotProvider'
+import { isCloudProdInstance } from '@/helpers/isCloudProdInstance'
 import { Stack, Text } from '@chakra-ui/react'
 import { useState } from 'react'
 import { env, getViewerUrl } from '@typebot.io/lib'
diff --git a/apps/builder/src/features/publish/components/embeds/modals/Script/instructions/ScriptStandardInstructions.tsx b/apps/builder/src/features/publish/components/embeds/modals/Script/instructions/ScriptStandardInstructions.tsx
index b70dc1746..156430ea2 100644
--- a/apps/builder/src/features/publish/components/embeds/modals/Script/instructions/ScriptStandardInstructions.tsx
+++ b/apps/builder/src/features/publish/components/embeds/modals/Script/instructions/ScriptStandardInstructions.tsx
@@ -1,6 +1,6 @@
 import { CodeEditor } from '@/components/inputs/CodeEditor'
-import { useTypebot } from '@/features/editor'
-import { isCloudProdInstance } from '@/utils/helpers'
+import { useTypebot } from '@/features/editor/providers/TypebotProvider'
+import { isCloudProdInstance } from '@/helpers/isCloudProdInstance'
 import { Stack, Code, Text } from '@chakra-ui/react'
 import { useState } from 'react'
 import { env, getViewerUrl } from '@typebot.io/lib'
diff --git a/apps/builder/src/features/publish/components/embeds/modals/ShopifyModal/instructions/ShopifyBubbleInstructions.tsx b/apps/builder/src/features/publish/components/embeds/modals/ShopifyModal/instructions/ShopifyBubbleInstructions.tsx
index f6ef3187a..04613543a 100644
--- a/apps/builder/src/features/publish/components/embeds/modals/ShopifyModal/instructions/ShopifyBubbleInstructions.tsx
+++ b/apps/builder/src/features/publish/components/embeds/modals/ShopifyModal/instructions/ShopifyBubbleInstructions.tsx
@@ -1,4 +1,4 @@
-import { useTypebot } from '@/features/editor'
+import { useTypebot } from '@/features/editor/providers/TypebotProvider'
 import { OrderedList, ListItem, Stack, Text, Code } from '@chakra-ui/react'
 import { BubbleProps } from '@typebot.io/js'
 import { useState } from 'react'
diff --git a/apps/builder/src/features/publish/components/embeds/modals/WebflowModal/instructions/WebflowBubbleInstructions.tsx b/apps/builder/src/features/publish/components/embeds/modals/WebflowModal/instructions/WebflowBubbleInstructions.tsx
index e6da812c7..e36f33186 100644
--- a/apps/builder/src/features/publish/components/embeds/modals/WebflowModal/instructions/WebflowBubbleInstructions.tsx
+++ b/apps/builder/src/features/publish/components/embeds/modals/WebflowModal/instructions/WebflowBubbleInstructions.tsx
@@ -1,4 +1,4 @@
-import { useTypebot } from '@/features/editor'
+import { useTypebot } from '@/features/editor/providers/TypebotProvider'
 import { OrderedList, ListItem, Code, Stack, Text } from '@chakra-ui/react'
 import { BubbleProps } from '@typebot.io/js'
 import { useState } from 'react'
diff --git a/apps/builder/src/features/publish/components/embeds/modals/WixModal/instructions/WixBubbleInstructions.tsx b/apps/builder/src/features/publish/components/embeds/modals/WixModal/instructions/WixBubbleInstructions.tsx
index bbc6e3d61..567986592 100644
--- a/apps/builder/src/features/publish/components/embeds/modals/WixModal/instructions/WixBubbleInstructions.tsx
+++ b/apps/builder/src/features/publish/components/embeds/modals/WixModal/instructions/WixBubbleInstructions.tsx
@@ -1,4 +1,4 @@
-import { useTypebot } from '@/features/editor'
+import { useTypebot } from '@/features/editor/providers/TypebotProvider'
 import { OrderedList, ListItem, Code, Stack, Text } from '@chakra-ui/react'
 import { BubbleProps } from '@typebot.io/js'
 import { useState } from 'react'
diff --git a/apps/builder/src/features/publish/components/embeds/modals/WordpressModal/instructions/WordpressBubbleInstructions.tsx b/apps/builder/src/features/publish/components/embeds/modals/WordpressModal/instructions/WordpressBubbleInstructions.tsx
index 14421810e..76a2f3404 100644
--- a/apps/builder/src/features/publish/components/embeds/modals/WordpressModal/instructions/WordpressBubbleInstructions.tsx
+++ b/apps/builder/src/features/publish/components/embeds/modals/WordpressModal/instructions/WordpressBubbleInstructions.tsx
@@ -1,6 +1,6 @@
 import { CodeEditor } from '@/components/inputs/CodeEditor'
 import { ExternalLinkIcon } from '@/components/icons'
-import { useTypebot } from '@/features/editor'
+import { useTypebot } from '@/features/editor/providers/TypebotProvider'
 import {
   OrderedList,
   ListItem,
@@ -14,7 +14,7 @@ import { useState } from 'react'
 import { BubbleSettings } from '../../../settings/BubbleSettings/BubbleSettings'
 import { parseInitBubbleCode } from '../../../snippetParsers'
 import { parseDefaultBubbleTheme } from '../../Javascript/instructions/JavascriptBubbleInstructions'
-import { isCloudProdInstance } from '@/utils/helpers'
+import { isCloudProdInstance } from '@/helpers/isCloudProdInstance'
 import { env, getViewerUrl } from '@typebot.io/lib'
 
 type Props = {
diff --git a/apps/builder/src/features/publish/components/embeds/modals/WordpressModal/instructions/WordpressPopupInstructions.tsx b/apps/builder/src/features/publish/components/embeds/modals/WordpressModal/instructions/WordpressPopupInstructions.tsx
index 6fa1d82ff..53bfac867 100644
--- a/apps/builder/src/features/publish/components/embeds/modals/WordpressModal/instructions/WordpressPopupInstructions.tsx
+++ b/apps/builder/src/features/publish/components/embeds/modals/WordpressModal/instructions/WordpressPopupInstructions.tsx
@@ -11,7 +11,7 @@ import {
 import { useState } from 'react'
 import { PopupSettings } from '../../../settings/PopupSettings'
 import { parseInitPopupCode } from '../../../snippetParsers/popup'
-import { isCloudProdInstance } from '@/utils/helpers'
+import { isCloudProdInstance } from '@/helpers/isCloudProdInstance'
 import { env, getViewerUrl } from '@typebot.io/lib'
 
 type Props = {
diff --git a/apps/builder/src/features/publish/components/embeds/modals/WordpressModal/instructions/WordpressStandardInstructions.tsx b/apps/builder/src/features/publish/components/embeds/modals/WordpressModal/instructions/WordpressStandardInstructions.tsx
index 4b0151606..697a530dd 100644
--- a/apps/builder/src/features/publish/components/embeds/modals/WordpressModal/instructions/WordpressStandardInstructions.tsx
+++ b/apps/builder/src/features/publish/components/embeds/modals/WordpressModal/instructions/WordpressStandardInstructions.tsx
@@ -11,7 +11,7 @@ import {
 } from '@chakra-ui/react'
 import { useState } from 'react'
 import { StandardSettings } from '../../../settings/StandardSettings'
-import { isCloudProdInstance } from '@/utils/helpers'
+import { isCloudProdInstance } from '@/helpers/isCloudProdInstance'
 import { env, getViewerUrl } from '@typebot.io/lib'
 
 type Props = {
diff --git a/apps/builder/src/features/publish/helpers/areTypebotsEqual.ts b/apps/builder/src/features/publish/helpers/areTypebotsEqual.ts
new file mode 100644
index 000000000..9f21a244a
--- /dev/null
+++ b/apps/builder/src/features/publish/helpers/areTypebotsEqual.ts
@@ -0,0 +1,9 @@
+import { omit } from '@typebot.io/lib'
+import { Typebot } from '@typebot.io/schemas'
+import { dequal } from 'dequal'
+
+export const areTypebotsEqual = (typebotA: Typebot, typebotB: Typebot) =>
+  dequal(
+    JSON.parse(JSON.stringify(omit(typebotA, 'updatedAt'))),
+    JSON.parse(JSON.stringify(omit(typebotB, 'updatedAt')))
+  )
diff --git a/apps/builder/src/features/publish/helpers/convertPublicTypebotToTypebot.ts b/apps/builder/src/features/publish/helpers/convertPublicTypebotToTypebot.ts
new file mode 100644
index 000000000..c27fd837f
--- /dev/null
+++ b/apps/builder/src/features/publish/helpers/convertPublicTypebotToTypebot.ts
@@ -0,0 +1,25 @@
+import { PublicTypebot, Typebot } from '@typebot.io/schemas'
+
+export const convertPublicTypebotToTypebot = (
+  typebot: PublicTypebot,
+  existingTypebot: Typebot
+): Typebot => ({
+  id: typebot.typebotId,
+  version: typebot.version,
+  groups: typebot.groups,
+  edges: typebot.edges,
+  name: existingTypebot.name,
+  publicId: existingTypebot.publicId,
+  settings: typebot.settings,
+  theme: typebot.theme,
+  variables: typebot.variables,
+  customDomain: existingTypebot.customDomain,
+  createdAt: existingTypebot.createdAt,
+  updatedAt: existingTypebot.updatedAt,
+  folderId: existingTypebot.folderId,
+  icon: existingTypebot.icon,
+  workspaceId: existingTypebot.workspaceId,
+  isArchived: existingTypebot.isArchived,
+  isClosed: existingTypebot.isClosed,
+  resultsTablePreferences: existingTypebot.resultsTablePreferences,
+})
diff --git a/apps/builder/src/features/publish/helpers/convertTypebotToPublicTypebot.ts b/apps/builder/src/features/publish/helpers/convertTypebotToPublicTypebot.ts
new file mode 100644
index 000000000..95912e596
--- /dev/null
+++ b/apps/builder/src/features/publish/helpers/convertTypebotToPublicTypebot.ts
@@ -0,0 +1,17 @@
+import { createId } from '@paralleldrive/cuid2'
+import { PublicTypebot, Typebot } from '@typebot.io/schemas'
+
+export const convertTypebotToPublicTypebot = (
+  typebot: Typebot
+): PublicTypebot => ({
+  id: createId(),
+  version: typebot.version,
+  typebotId: typebot.id,
+  groups: typebot.groups,
+  edges: typebot.edges,
+  settings: typebot.settings,
+  theme: typebot.theme,
+  variables: typebot.variables,
+  createdAt: new Date(),
+  updatedAt: new Date(),
+})
diff --git a/apps/builder/src/features/publish/helpers/isPublished.ts b/apps/builder/src/features/publish/helpers/isPublished.ts
new file mode 100644
index 000000000..40d076f0a
--- /dev/null
+++ b/apps/builder/src/features/publish/helpers/isPublished.ts
@@ -0,0 +1,35 @@
+import { Typebot, PublicTypebot } from '@typebot.io/schemas'
+import { diff } from 'deep-object-diff'
+import { dequal } from 'dequal'
+
+export const isPublished = (
+  typebot: Typebot,
+  publicTypebot: PublicTypebot,
+  debug?: boolean
+) => {
+  if (debug)
+    console.log(
+      diff(
+        JSON.parse(JSON.stringify(typebot.groups)),
+        JSON.parse(JSON.stringify(publicTypebot.groups))
+      )
+    )
+  return (
+    dequal(
+      JSON.parse(JSON.stringify(typebot.groups)),
+      JSON.parse(JSON.stringify(publicTypebot.groups))
+    ) &&
+    dequal(
+      JSON.parse(JSON.stringify(typebot.settings)),
+      JSON.parse(JSON.stringify(publicTypebot.settings))
+    ) &&
+    dequal(
+      JSON.parse(JSON.stringify(typebot.theme)),
+      JSON.parse(JSON.stringify(publicTypebot.theme))
+    ) &&
+    dequal(
+      JSON.parse(JSON.stringify(typebot.variables)),
+      JSON.parse(JSON.stringify(publicTypebot.variables))
+    )
+  )
+}
diff --git a/apps/builder/src/features/publish/helpers/parseDefaultPublicId.ts b/apps/builder/src/features/publish/helpers/parseDefaultPublicId.ts
new file mode 100644
index 000000000..a65fdfed1
--- /dev/null
+++ b/apps/builder/src/features/publish/helpers/parseDefaultPublicId.ts
@@ -0,0 +1,4 @@
+import { toKebabCase } from '@/helpers/toKebabCase'
+
+export const parseDefaultPublicId = (name: string, id: string) =>
+  toKebabCase(name) + `-${id?.slice(-7)}`
diff --git a/apps/builder/src/features/publish/index.ts b/apps/builder/src/features/publish/index.ts
deleted file mode 100644
index 2b941d0ae..000000000
--- a/apps/builder/src/features/publish/index.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-export { SharePage } from './components/SharePage'
-export * from './utils'
-export {
-  createPublishedTypebotQuery,
-  deletePublishedTypebotQuery,
-  updatePublishedTypebotQuery,
-} from './queries'
-export { PublishButton } from './components/PublishButton'
diff --git a/apps/builder/src/features/publish/queries/index.ts b/apps/builder/src/features/publish/queries/index.ts
deleted file mode 100644
index 06b486acf..000000000
--- a/apps/builder/src/features/publish/queries/index.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export * from './createPublishedTypebotQuery'
-export * from './deletePublishedTypebotQuery'
-export * from './isPublicDomainAvailableQuery'
-export * from './updatePublishedTypebotQuery'
diff --git a/apps/builder/src/features/publish/utils.ts b/apps/builder/src/features/publish/utils.ts
deleted file mode 100644
index 9b4b7f8b1..000000000
--- a/apps/builder/src/features/publish/utils.ts
+++ /dev/null
@@ -1,86 +0,0 @@
-import { createId } from '@paralleldrive/cuid2'
-import { PublicTypebot, Typebot } from '@typebot.io/schemas'
-import { dequal } from 'dequal'
-import { omit } from '@typebot.io/lib'
-import { diff } from 'deep-object-diff'
-import { toKebabCase } from '@/utils/helpers'
-
-export const parsePublicTypebotToTypebot = (
-  typebot: PublicTypebot,
-  existingTypebot: Typebot
-): Typebot => ({
-  id: typebot.typebotId,
-  version: typebot.version,
-  groups: typebot.groups,
-  edges: typebot.edges,
-  name: existingTypebot.name,
-  publicId: existingTypebot.publicId,
-  settings: typebot.settings,
-  theme: typebot.theme,
-  variables: typebot.variables,
-  customDomain: existingTypebot.customDomain,
-  createdAt: existingTypebot.createdAt,
-  updatedAt: existingTypebot.updatedAt,
-  folderId: existingTypebot.folderId,
-  icon: existingTypebot.icon,
-  workspaceId: existingTypebot.workspaceId,
-  isArchived: existingTypebot.isArchived,
-  isClosed: existingTypebot.isClosed,
-  resultsTablePreferences: existingTypebot.resultsTablePreferences,
-})
-
-export const parseTypebotToPublicTypebot = (
-  typebot: Typebot
-): PublicTypebot => ({
-  id: createId(),
-  version: typebot.version,
-  typebotId: typebot.id,
-  groups: typebot.groups,
-  edges: typebot.edges,
-  settings: typebot.settings,
-  theme: typebot.theme,
-  variables: typebot.variables,
-  createdAt: new Date(),
-  updatedAt: new Date(),
-})
-
-export const checkIfTypebotsAreEqual = (typebotA: Typebot, typebotB: Typebot) =>
-  dequal(
-    JSON.parse(JSON.stringify(omit(typebotA, 'updatedAt'))),
-    JSON.parse(JSON.stringify(omit(typebotB, 'updatedAt')))
-  )
-
-export const checkIfPublished = (
-  typebot: Typebot,
-  publicTypebot: PublicTypebot,
-  debug?: boolean
-) => {
-  if (debug)
-    console.log(
-      diff(
-        JSON.parse(JSON.stringify(typebot.groups)),
-        JSON.parse(JSON.stringify(publicTypebot.groups))
-      )
-    )
-  return (
-    dequal(
-      JSON.parse(JSON.stringify(typebot.groups)),
-      JSON.parse(JSON.stringify(publicTypebot.groups))
-    ) &&
-    dequal(
-      JSON.parse(JSON.stringify(typebot.settings)),
-      JSON.parse(JSON.stringify(publicTypebot.settings))
-    ) &&
-    dequal(
-      JSON.parse(JSON.stringify(typebot.theme)),
-      JSON.parse(JSON.stringify(publicTypebot.theme))
-    ) &&
-    dequal(
-      JSON.parse(JSON.stringify(typebot.variables)),
-      JSON.parse(JSON.stringify(publicTypebot.variables))
-    )
-  )
-}
-
-export const parseDefaultPublicId = (name: string, id: string) =>
-  toKebabCase(name) + `-${id?.slice(-7)}`
diff --git a/apps/builder/src/features/results/ResultsProvider.tsx b/apps/builder/src/features/results/ResultsProvider.tsx
index d19eb29a0..2b1e3d05a 100644
--- a/apps/builder/src/features/results/ResultsProvider.tsx
+++ b/apps/builder/src/features/results/ResultsProvider.tsx
@@ -5,7 +5,7 @@ import { parseResultHeader } from '@typebot.io/lib/results'
 import { useTypebot } from '../editor/providers/TypebotProvider'
 import { useResultsQuery } from './hooks/useResultsQuery'
 import { TableData } from './types'
-import { convertResultsToTableData } from './utils'
+import { convertResultsToTableData } from './helpers/convertResultsToTableData'
 
 const resultsContext = createContext<{
   resultsList: { results: ResultWithAnswers[] }[] | undefined
diff --git a/apps/builder/src/features/results/api/procedures/deleteResultsProcedure.ts b/apps/builder/src/features/results/api/deleteResults.ts
similarity index 84%
rename from apps/builder/src/features/results/api/procedures/deleteResultsProcedure.ts
rename to apps/builder/src/features/results/api/deleteResults.ts
index 6e9fac0c0..ae4b4eee9 100644
--- a/apps/builder/src/features/results/api/procedures/deleteResultsProcedure.ts
+++ b/apps/builder/src/features/results/api/deleteResults.ts
@@ -1,11 +1,11 @@
-import { getTypebot } from '@/features/typebot/api/utils/getTypebot'
-import { authenticatedProcedure } from '@/utils/server/trpc'
+import { getTypebot } from '@/features/typebot/helpers/getTypebot'
+import { authenticatedProcedure } from '@/helpers/server/trpc'
 import { TRPCError } from '@trpc/server'
 import { Typebot } from '@typebot.io/schemas'
 import { z } from 'zod'
-import { archiveResults } from '../archiveResults'
+import { archiveResults } from '../helpers/archiveResults'
 
-export const deleteResultsProcedure = authenticatedProcedure
+export const deleteResults = authenticatedProcedure
   .meta({
     openapi: {
       method: 'DELETE',
diff --git a/apps/builder/src/features/results/api/procedures/getResultLogsProcedure.ts b/apps/builder/src/features/results/api/getResultLogs.ts
similarity index 80%
rename from apps/builder/src/features/results/api/procedures/getResultLogsProcedure.ts
rename to apps/builder/src/features/results/api/getResultLogs.ts
index e8136d37d..322abb776 100644
--- a/apps/builder/src/features/results/api/procedures/getResultLogsProcedure.ts
+++ b/apps/builder/src/features/results/api/getResultLogs.ts
@@ -1,10 +1,10 @@
-import { getTypebot } from '@/features/typebot/api/utils/getTypebot'
+import { getTypebot } from '@/features/typebot/helpers/getTypebot'
 import prisma from '@/lib/prisma'
-import { authenticatedProcedure } from '@/utils/server/trpc'
+import { authenticatedProcedure } from '@/helpers/server/trpc'
 import { logSchema } from '@typebot.io/schemas'
 import { z } from 'zod'
 
-export const getResultLogsProcedure = authenticatedProcedure
+export const getResultLogs = authenticatedProcedure
   .meta({
     openapi: {
       method: 'GET',
diff --git a/apps/builder/src/features/results/api/procedures/getResultsProcedure.ts b/apps/builder/src/features/results/api/getResults.ts
similarity index 90%
rename from apps/builder/src/features/results/api/procedures/getResultsProcedure.ts
rename to apps/builder/src/features/results/api/getResults.ts
index 077b886c6..bbfbec585 100644
--- a/apps/builder/src/features/results/api/procedures/getResultsProcedure.ts
+++ b/apps/builder/src/features/results/api/getResults.ts
@@ -1,13 +1,13 @@
-import { getTypebot } from '@/features/typebot/api/utils/getTypebot'
+import { getTypebot } from '@/features/typebot/helpers/getTypebot'
 import prisma from '@/lib/prisma'
-import { authenticatedProcedure } from '@/utils/server/trpc'
+import { authenticatedProcedure } from '@/helpers/server/trpc'
 import { TRPCError } from '@trpc/server'
 import { ResultWithAnswers, resultWithAnswersSchema } from '@typebot.io/schemas'
 import { z } from 'zod'
 
 const maxLimit = 200
 
-export const getResultsProcedure = authenticatedProcedure
+export const getResults = authenticatedProcedure
   .meta({
     openapi: {
       method: 'GET',
diff --git a/apps/builder/src/features/results/api/index.ts b/apps/builder/src/features/results/api/index.ts
deleted file mode 100644
index 47211bb6e..000000000
--- a/apps/builder/src/features/results/api/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from './archiveResults'
-export * from './router'
diff --git a/apps/builder/src/features/results/api/procedures/index.ts b/apps/builder/src/features/results/api/procedures/index.ts
deleted file mode 100644
index 90b7c198b..000000000
--- a/apps/builder/src/features/results/api/procedures/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export * from './deleteResultsProcedure'
-export * from './getResultLogsProcedure'
-export * from './getResultsProcedure'
diff --git a/apps/builder/src/features/results/api/router.ts b/apps/builder/src/features/results/api/router.ts
index 22ad8e9f1..e49606540 100644
--- a/apps/builder/src/features/results/api/router.ts
+++ b/apps/builder/src/features/results/api/router.ts
@@ -1,12 +1,10 @@
-import { router } from '@/utils/server/trpc'
-import {
-  deleteResultsProcedure,
-  getResultLogsProcedure,
-  getResultsProcedure,
-} from './procedures'
+import { router } from '@/helpers/server/trpc'
+import { deleteResults } from './deleteResults'
+import { getResultLogs } from './getResultLogs'
+import { getResults } from './getResults'
 
 export const resultsRouter = router({
-  getResults: getResultsProcedure,
-  deleteResults: deleteResultsProcedure,
-  getResultLogs: getResultLogsProcedure,
+  getResults,
+  deleteResults,
+  getResultLogs,
 })
diff --git a/apps/builder/src/features/results/components/FileLinks.tsx b/apps/builder/src/features/results/components/FileLinks.tsx
new file mode 100644
index 000000000..6466c57ff
--- /dev/null
+++ b/apps/builder/src/features/results/components/FileLinks.tsx
@@ -0,0 +1,19 @@
+import { FileIcon } from '@/components/icons'
+import { TextLink } from '@/components/TextLink'
+import { Wrap, HStack, WrapItem } from '@chakra-ui/react'
+
+export const FileLinks = ({ fileNamesStr }: { fileNamesStr: string }) => {
+  const fileNames = fileNamesStr.split(', ')
+  return (
+    <Wrap maxW="300px">
+      {fileNames.map((name) => (
+        <HStack as={WrapItem} key={name}>
+          <FileIcon />
+          <TextLink href={name} isExternal>
+            {name.split('/').pop()}
+          </TextLink>
+        </HStack>
+      ))}
+    </Wrap>
+  )
+}
diff --git a/apps/builder/src/features/results/components/HeaderIcon.tsx b/apps/builder/src/features/results/components/HeaderIcon.tsx
new file mode 100644
index 000000000..95e722474
--- /dev/null
+++ b/apps/builder/src/features/results/components/HeaderIcon.tsx
@@ -0,0 +1,12 @@
+import { CodeIcon, CalendarIcon } from '@/components/icons'
+import { BlockIcon } from '@/features/editor/components/BlockIcon'
+import { ResultHeaderCell } from '@typebot.io/schemas'
+
+export const HeaderIcon = ({ header }: { header: ResultHeaderCell }) =>
+  header.blockType ? (
+    <BlockIcon type={header.blockType} />
+  ) : header.variableIds ? (
+    <CodeIcon />
+  ) : (
+    <CalendarIcon />
+  )
diff --git a/apps/builder/src/features/results/components/ResultModal.tsx b/apps/builder/src/features/results/components/ResultModal.tsx
index 5868c12f8..c3792a157 100644
--- a/apps/builder/src/features/results/components/ResultModal.tsx
+++ b/apps/builder/src/features/results/components/ResultModal.tsx
@@ -12,7 +12,7 @@ import {
 import { useResults } from '../ResultsProvider'
 import React from 'react'
 import { isDefined } from '@typebot.io/lib'
-import { HeaderIcon } from '../utils'
+import { HeaderIcon } from './HeaderIcon'
 
 type Props = {
   resultIdx: number | null
diff --git a/apps/builder/src/features/results/components/ResultsPage.tsx b/apps/builder/src/features/results/components/ResultsPage.tsx
index bbf601be2..075bc0cd1 100644
--- a/apps/builder/src/features/results/components/ResultsPage.tsx
+++ b/apps/builder/src/features/results/components/ResultsPage.tsx
@@ -1,7 +1,8 @@
 import { Seo } from '@/components/Seo'
-import { AnalyticsGraphContainer } from '@/features/analytics'
-import { useTypebot, TypebotHeader } from '@/features/editor'
-import { useWorkspace } from '@/features/workspace'
+import { AnalyticsGraphContainer } from '@/features/analytics/components/AnalyticsGraphContainer'
+import { TypebotHeader } from '@/features/editor/components/TypebotHeader'
+import { useTypebot } from '@/features/editor/providers/TypebotProvider'
+import { useWorkspace } from '@/features/workspace/WorkspaceProvider'
 import { useToast } from '@/hooks/useToast'
 import {
   Flex,
diff --git a/apps/builder/src/features/results/components/ResultsTable/index.tsx b/apps/builder/src/features/results/components/ResultsTable/index.tsx
deleted file mode 100644
index e1a3eb1f4..000000000
--- a/apps/builder/src/features/results/components/ResultsTable/index.tsx
+++ /dev/null
@@ -1 +0,0 @@
-export { ResultsTable } from './ResultsTable'
diff --git a/apps/builder/src/features/results/components/ResultsTableContainer.tsx b/apps/builder/src/features/results/components/ResultsTableContainer.tsx
index 22a261d36..1c8fd9a88 100644
--- a/apps/builder/src/features/results/components/ResultsTableContainer.tsx
+++ b/apps/builder/src/features/results/components/ResultsTableContainer.tsx
@@ -1,10 +1,10 @@
 import { Stack } from '@chakra-ui/react'
 import React, { useState } from 'react'
 import { LogsModal } from './LogsModal'
-import { useTypebot } from '@/features/editor'
+import { useTypebot } from '@/features/editor/providers/TypebotProvider'
 import { useResults } from '../ResultsProvider'
 import { ResultModal } from './ResultModal'
-import { ResultsTable } from './ResultsTable'
+import { ResultsTable } from './table/ResultsTable'
 
 export const ResultsTableContainer = () => {
   const {
diff --git a/apps/builder/src/features/results/components/index.ts b/apps/builder/src/features/results/components/index.ts
deleted file mode 100644
index 2303cd4ff..000000000
--- a/apps/builder/src/features/results/components/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './ResultsPage'
diff --git a/apps/builder/src/features/results/components/ResultsTable/Cell.tsx b/apps/builder/src/features/results/components/table/Cell.tsx
similarity index 100%
rename from apps/builder/src/features/results/components/ResultsTable/Cell.tsx
rename to apps/builder/src/features/results/components/table/Cell.tsx
diff --git a/apps/builder/src/features/results/components/ResultsTable/ColumnSettings.tsx b/apps/builder/src/features/results/components/table/ColumnSettings.tsx
similarity index 99%
rename from apps/builder/src/features/results/components/ResultsTable/ColumnSettings.tsx
rename to apps/builder/src/features/results/components/table/ColumnSettings.tsx
index dcdc1bebb..7c42c212d 100644
--- a/apps/builder/src/features/results/components/ResultsTable/ColumnSettings.tsx
+++ b/apps/builder/src/features/results/components/table/ColumnSettings.tsx
@@ -20,9 +20,9 @@ import {
 } from '@dnd-kit/sortable'
 import { Text } from '@chakra-ui/react'
 import { ResultHeaderCell } from '@typebot.io/schemas'
-import { HeaderIcon } from '../../utils'
 import { useState } from 'react'
 import { CSS } from '@dnd-kit/utilities'
+import { HeaderIcon } from '../HeaderIcon'
 
 type Props = {
   resultHeader: ResultHeaderCell[]
diff --git a/apps/builder/src/features/results/components/ResultsTable/ExportAllResultsModal.tsx b/apps/builder/src/features/results/components/table/ExportAllResultsModal.tsx
similarity index 93%
rename from apps/builder/src/features/results/components/ResultsTable/ExportAllResultsModal.tsx
rename to apps/builder/src/features/results/components/table/ExportAllResultsModal.tsx
index be149c86f..c6def732f 100644
--- a/apps/builder/src/features/results/components/ResultsTable/ExportAllResultsModal.tsx
+++ b/apps/builder/src/features/results/components/table/ExportAllResultsModal.tsx
@@ -1,7 +1,7 @@
 import { AlertInfo } from '@/components/AlertInfo'
 import { DownloadIcon } from '@/components/icons'
 import { SwitchWithLabel } from '@/components/inputs/SwitchWithLabel'
-import { useTypebot } from '@/features/editor'
+import { useTypebot } from '@/features/editor/providers/TypebotProvider'
 import { useToast } from '@/hooks/useToast'
 import { trpc } from '@/lib/trpc'
 import {
@@ -20,8 +20,9 @@ import { unparse } from 'papaparse'
 import { useState } from 'react'
 import { parseResultHeader } from '@typebot.io/lib/results'
 import { useResults } from '../../ResultsProvider'
-import { convertResultsToTableData, parseAccessor } from '../../utils'
-import { parseColumnOrder } from '../../utils/parseColumnsOrder'
+import { parseColumnOrder } from '../../helpers/parseColumnsOrder'
+import { convertResultsToTableData } from '../../helpers/convertResultsToTableData'
+import { parseAccessor } from '../../helpers/parseAccessor'
 
 type Props = {
   isOpen: boolean
diff --git a/apps/builder/src/features/results/components/ResultsTable/HeaderRow.tsx b/apps/builder/src/features/results/components/table/HeaderRow.tsx
similarity index 100%
rename from apps/builder/src/features/results/components/ResultsTable/HeaderRow.tsx
rename to apps/builder/src/features/results/components/table/HeaderRow.tsx
diff --git a/apps/builder/src/features/results/components/ResultsTable/IndeterminateCheckbox.tsx b/apps/builder/src/features/results/components/table/IndeterminateCheckbox.tsx
similarity index 100%
rename from apps/builder/src/features/results/components/ResultsTable/IndeterminateCheckbox.tsx
rename to apps/builder/src/features/results/components/table/IndeterminateCheckbox.tsx
diff --git a/apps/builder/src/features/results/components/ResultsTable/LoadingRows.tsx b/apps/builder/src/features/results/components/table/LoadingRows.tsx
similarity index 100%
rename from apps/builder/src/features/results/components/ResultsTable/LoadingRows.tsx
rename to apps/builder/src/features/results/components/table/LoadingRows.tsx
diff --git a/apps/builder/src/features/results/components/ResultsTable/ResultsTable.tsx b/apps/builder/src/features/results/components/table/ResultsTable.tsx
similarity index 97%
rename from apps/builder/src/features/results/components/ResultsTable/ResultsTable.tsx
rename to apps/builder/src/features/results/components/table/ResultsTable.tsx
index b09a42ee9..60edd8aa4 100644
--- a/apps/builder/src/features/results/components/ResultsTable/ResultsTable.tsx
+++ b/apps/builder/src/features/results/components/table/ResultsTable.tsx
@@ -18,15 +18,16 @@ import {
   Updater,
 } from '@tanstack/react-table'
 import { TableSettingsButton } from './TableSettingsButton'
-import { useTypebot } from '@/features/editor'
+import { useTypebot } from '@/features/editor/providers/TypebotProvider'
 import { SelectionToolbar } from './SelectionToolbar'
 import { Row } from './Row'
 import { HeaderRow } from './HeaderRow'
 import { CellValueType, TableData } from '../../types'
-import { HeaderIcon, parseAccessor } from '../../utils'
 import { IndeterminateCheckbox } from './IndeterminateCheckbox'
 import { colors } from '@/lib/theme'
-import { parseColumnOrder } from '../../utils/parseColumnsOrder'
+import { parseColumnOrder } from '../../helpers/parseColumnsOrder'
+import { parseAccessor } from '../../helpers/parseAccessor'
+import { HeaderIcon } from '../HeaderIcon'
 
 type ResultsTableProps = {
   resultHeader: ResultHeaderCell[]
diff --git a/apps/builder/src/features/results/components/ResultsTable/Row.tsx b/apps/builder/src/features/results/components/table/Row.tsx
similarity index 100%
rename from apps/builder/src/features/results/components/ResultsTable/Row.tsx
rename to apps/builder/src/features/results/components/table/Row.tsx
diff --git a/apps/builder/src/features/results/components/ResultsTable/SelectionToolbar.tsx b/apps/builder/src/features/results/components/table/SelectionToolbar.tsx
similarity index 96%
rename from apps/builder/src/features/results/components/ResultsTable/SelectionToolbar.tsx
rename to apps/builder/src/features/results/components/table/SelectionToolbar.tsx
index 073aee24f..06f5d05a6 100644
--- a/apps/builder/src/features/results/components/ResultsTable/SelectionToolbar.tsx
+++ b/apps/builder/src/features/results/components/table/SelectionToolbar.tsx
@@ -8,14 +8,14 @@ import {
 } from '@chakra-ui/react'
 import { DownloadIcon, TrashIcon } from '@/components/icons'
 import { ConfirmModal } from '@/components/ConfirmModal'
-import { useTypebot } from '@/features/editor'
+import { useTypebot } from '@/features/editor/providers/TypebotProvider'
 import { unparse } from 'papaparse'
 import React, { useState } from 'react'
 import { useToast } from '@/hooks/useToast'
-import { parseAccessor } from '../../utils'
 import { useResults } from '../../ResultsProvider'
 import { trpc } from '@/lib/trpc'
-import { parseColumnOrder } from '../../utils/parseColumnsOrder'
+import { parseColumnOrder } from '../../helpers/parseColumnsOrder'
+import { parseAccessor } from '../../helpers/parseAccessor'
 
 type Props = {
   selectedResultsId: string[]
diff --git a/apps/builder/src/features/results/components/ResultsTable/TableSettingsButton.tsx b/apps/builder/src/features/results/components/table/TableSettingsButton.tsx
similarity index 100%
rename from apps/builder/src/features/results/components/ResultsTable/TableSettingsButton.tsx
rename to apps/builder/src/features/results/components/table/TableSettingsButton.tsx
diff --git a/apps/builder/src/features/results/api/archiveResults.ts b/apps/builder/src/features/results/helpers/archiveResults.ts
similarity index 94%
rename from apps/builder/src/features/results/api/archiveResults.ts
rename to apps/builder/src/features/results/helpers/archiveResults.ts
index 99c8fae63..d9bce0da8 100644
--- a/apps/builder/src/features/results/api/archiveResults.ts
+++ b/apps/builder/src/features/results/helpers/archiveResults.ts
@@ -1,5 +1,5 @@
+import { deleteFilesFromBucket } from '@/helpers/deleteFilesFromBucket'
 import prisma from '@/lib/prisma'
-import { deleteFiles } from '@/utils/api/storage'
 import { Prisma } from '@typebot.io/prisma'
 import { InputBlockType, Typebot } from '@typebot.io/schemas'
 
@@ -46,7 +46,7 @@ export const archiveResults = async ({ typebot, resultsFilter }: Props) => {
         },
       })
       if (filesToDelete.length > 0)
-        await deleteFiles({
+        await deleteFilesFromBucket({
           urls: filesToDelete.flatMap((a) => a.content.split(', ')),
         })
     }
diff --git a/apps/builder/src/features/results/helpers/convertDateToReadable.ts b/apps/builder/src/features/results/helpers/convertDateToReadable.ts
new file mode 100644
index 000000000..45f7fe44e
--- /dev/null
+++ b/apps/builder/src/features/results/helpers/convertDateToReadable.ts
@@ -0,0 +1,7 @@
+export const convertDateToReadable = (date: Date): string =>
+  date.toDateString().split(' ').slice(1, 3).join(' ') +
+  ', ' +
+  date.toLocaleTimeString([], {
+    hour: '2-digit',
+    minute: '2-digit',
+  })
diff --git a/apps/builder/src/features/results/utils.tsx b/apps/builder/src/features/results/helpers/convertResultsToTableData.tsx
similarity index 53%
rename from apps/builder/src/features/results/utils.tsx
rename to apps/builder/src/features/results/helpers/convertResultsToTableData.tsx
index cdb897705..925c29c0c 100644
--- a/apps/builder/src/features/results/utils.tsx
+++ b/apps/builder/src/features/results/helpers/convertResultsToTableData.tsx
@@ -1,48 +1,15 @@
+import { isDefined } from '@typebot.io/lib'
+import { Answer } from '@typebot.io/prisma'
 import {
   ResultWithAnswers,
-  VariableWithValue,
   ResultHeaderCell,
+  VariableWithValue,
   InputBlockType,
 } from '@typebot.io/schemas'
-import { Answer } from '@typebot.io/prisma'
-import { isDefined } from '@typebot.io/lib'
-import { HStack, Wrap, WrapItem, Text } from '@chakra-ui/react'
-import { BlockIcon } from '@/features/editor'
-import { HeaderCell, TableData } from './types'
-import { CodeIcon, CalendarIcon, FileIcon } from '@/components/icons'
-import { TextLink } from '@/components/TextLink'
-
-export const parseDateToReadable = (date: Date): string =>
-  date.toDateString().split(' ').slice(1, 3).join(' ') +
-  ', ' +
-  date.toLocaleTimeString([], {
-    hour: '2-digit',
-    minute: '2-digit',
-  })
-
-export const parseAccessor = (label: string) => label.replaceAll('.', '')
-
-export const parseHeaderCells = (
-  resultHeader: ResultHeaderCell[]
-): HeaderCell[] =>
-  resultHeader.map((header) => ({
-    Header: (
-      <HStack minW="150px" maxW="500px">
-        <HeaderIcon header={header} />
-        <Text>{header.label}</Text>
-      </HStack>
-    ),
-    accessor: parseAccessor(header.label),
-  }))
-
-export const HeaderIcon = ({ header }: { header: ResultHeaderCell }) =>
-  header.blockType ? (
-    <BlockIcon type={header.blockType} />
-  ) : header.variableIds ? (
-    <CodeIcon />
-  ) : (
-    <CalendarIcon />
-  )
+import { FileLinks } from '../components/FileLinks'
+import { TableData } from '../types'
+import { convertDateToReadable } from './convertDateToReadable'
+import { parseAccessor } from './parseAccessor'
 
 export const convertResultsToTableData = (
   results: ResultWithAnswers[] | undefined,
@@ -51,7 +18,7 @@ export const convertResultsToTableData = (
   (results ?? []).map((result) => ({
     id: { plainText: result.id },
     'Submitted at': {
-      plainText: parseDateToReadable(result.createdAt),
+      plainText: convertDateToReadable(result.createdAt),
     },
     ...[...result.answers, ...result.variables].reduce<{
       [key: string]: { element?: JSX.Element; plainText: string }
@@ -92,20 +59,6 @@ const parseContent = (
   str: string,
   blockType: InputBlockType
 ): JSX.Element | undefined =>
-  blockType === InputBlockType.FILE ? parseFileContent(str) : undefined
-
-const parseFileContent = (str: string) => {
-  const fileNames = str.split(', ')
-  return (
-    <Wrap maxW="300px">
-      {fileNames.map((name) => (
-        <HStack as={WrapItem} key={name}>
-          <FileIcon />
-          <TextLink href={name} isExternal>
-            {name.split('/').pop()}
-          </TextLink>
-        </HStack>
-      ))}
-    </Wrap>
-  )
-}
+  blockType === InputBlockType.FILE ? (
+    <FileLinks fileNamesStr={str} />
+  ) : undefined
diff --git a/apps/builder/src/features/results/helpers/parseAccessor.ts b/apps/builder/src/features/results/helpers/parseAccessor.ts
new file mode 100644
index 000000000..2e4241905
--- /dev/null
+++ b/apps/builder/src/features/results/helpers/parseAccessor.ts
@@ -0,0 +1 @@
+export const parseAccessor = (label: string) => label.replaceAll('.', '')
diff --git a/apps/builder/src/features/results/utils/parseColumnsOrder.ts b/apps/builder/src/features/results/helpers/parseColumnsOrder.ts
similarity index 100%
rename from apps/builder/src/features/results/utils/parseColumnsOrder.ts
rename to apps/builder/src/features/results/helpers/parseColumnsOrder.ts
diff --git a/apps/builder/src/features/results/helpers/parseHeaderCells.tsx b/apps/builder/src/features/results/helpers/parseHeaderCells.tsx
new file mode 100644
index 000000000..98c8eb23c
--- /dev/null
+++ b/apps/builder/src/features/results/helpers/parseHeaderCells.tsx
@@ -0,0 +1,18 @@
+import { HStack, Text } from '@chakra-ui/react'
+import { ResultHeaderCell } from '@typebot.io/schemas'
+import { HeaderIcon } from '../components/HeaderIcon'
+import { HeaderCell } from '../types'
+import { parseAccessor } from './parseAccessor'
+
+export const parseHeaderCells = (
+  resultHeader: ResultHeaderCell[]
+): HeaderCell[] =>
+  resultHeader.map((header) => ({
+    Header: (
+      <HStack minW="150px" maxW="500px">
+        <HeaderIcon header={header} />
+        <Text>{header.label}</Text>
+      </HStack>
+    ),
+    accessor: parseAccessor(header.label),
+  }))
diff --git a/apps/builder/src/features/results/hooks/useStats.ts b/apps/builder/src/features/results/hooks/useStats.ts
index d46361695..9c57dbe79 100644
--- a/apps/builder/src/features/results/hooks/useStats.ts
+++ b/apps/builder/src/features/results/hooks/useStats.ts
@@ -1,5 +1,5 @@
 import { Stats } from '@typebot.io/schemas'
-import { fetcher } from '@/utils/helpers'
+import { fetcher } from '@/helpers/fetcher'
 import useSWR from 'swr'
 
 export const useStats = ({
diff --git a/apps/builder/src/features/results/index.ts b/apps/builder/src/features/results/index.ts
deleted file mode 100644
index cb64ac1b5..000000000
--- a/apps/builder/src/features/results/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './components'
diff --git a/apps/builder/src/features/settings/components/GeneralSettingsForm.tsx b/apps/builder/src/features/settings/components/GeneralSettingsForm.tsx
index b76bf3db0..978727d63 100644
--- a/apps/builder/src/features/settings/components/GeneralSettingsForm.tsx
+++ b/apps/builder/src/features/settings/components/GeneralSettingsForm.tsx
@@ -1,12 +1,14 @@
 import { Flex, FormLabel, Stack, Switch, useDisclosure } from '@chakra-ui/react'
-import { useWorkspace } from '@/features/workspace'
+import { useWorkspace } from '@/features/workspace/WorkspaceProvider'
 import { Plan } from '@typebot.io/prisma'
 import { GeneralSettings } from '@typebot.io/schemas'
 import React from 'react'
 import { isDefined } from '@typebot.io/lib'
-import { ChangePlanModal, isFreePlan, LimitReached } from '@/features/billing'
 import { SwitchWithLabel } from '@/components/inputs/SwitchWithLabel'
-import { LockTag } from '@/features/billing'
+import { ChangePlanModal } from '@/features/billing/components/ChangePlanModal'
+import { LockTag } from '@/features/billing/components/LockTag'
+import { isFreePlan } from '@/features/billing/helpers/isFreePlan'
+import { LimitReached } from '@/features/billing/types'
 
 type Props = {
   generalSettings: GeneralSettings
diff --git a/apps/builder/src/features/settings/components/SettingsPage.tsx b/apps/builder/src/features/settings/components/SettingsPage.tsx
index fbfe013ef..49b6cda4a 100644
--- a/apps/builder/src/features/settings/components/SettingsPage.tsx
+++ b/apps/builder/src/features/settings/components/SettingsPage.tsx
@@ -1,9 +1,10 @@
 import { Seo } from '@/components/Seo'
-import { TypebotHeader, useTypebot } from '@/features/editor'
 import { Flex } from '@chakra-ui/react'
 import { Standard } from '@typebot.io/react'
 import { getViewerUrl } from '@typebot.io/lib'
 import { SettingsSideMenu } from './SettingsSideMenu'
+import { TypebotHeader } from '@/features/editor/components/TypebotHeader'
+import { useTypebot } from '@/features/editor/providers/TypebotProvider'
 
 export const SettingsPage = () => {
   const { typebot } = useTypebot()
diff --git a/apps/builder/src/features/settings/components/SettingsSideMenu.tsx b/apps/builder/src/features/settings/components/SettingsSideMenu.tsx
index 05e7019a3..6d5d3cd44 100644
--- a/apps/builder/src/features/settings/components/SettingsSideMenu.tsx
+++ b/apps/builder/src/features/settings/components/SettingsSideMenu.tsx
@@ -14,7 +14,8 @@ import React from 'react'
 import { GeneralSettingsForm } from './GeneralSettingsForm'
 import { MetadataForm } from './MetadataForm'
 import { TypingEmulationForm } from './TypingEmulationForm'
-import { headerHeight, useTypebot } from '@/features/editor'
+import { useTypebot } from '@/features/editor/providers/TypebotProvider'
+import { headerHeight } from '@/features/editor/constants'
 
 export const SettingsSideMenu = () => {
   const { typebot, updateTypebot } = useTypebot()
diff --git a/apps/builder/src/features/settings/index.ts b/apps/builder/src/features/settings/index.ts
deleted file mode 100644
index 15dc0a071..000000000
--- a/apps/builder/src/features/settings/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { SettingsPage } from './components/SettingsPage'
diff --git a/apps/builder/src/features/telemetry/api/processTelemetryEvent.ts b/apps/builder/src/features/telemetry/api/processTelemetryEvent.ts
index de4e532fe..4660559a1 100644
--- a/apps/builder/src/features/telemetry/api/processTelemetryEvent.ts
+++ b/apps/builder/src/features/telemetry/api/processTelemetryEvent.ts
@@ -3,7 +3,7 @@ import { z } from 'zod'
 import { PostHog } from 'posthog-node'
 import { TRPCError } from '@trpc/server'
 import got from 'got'
-import { authenticatedProcedure } from '@/utils/server/trpc'
+import { authenticatedProcedure } from '@/helpers/server/trpc'
 
 // Only used for the cloud version of Typebot. It's the way it processes telemetry events and inject it to thrid-party services.
 export const processTelemetryEvent = authenticatedProcedure
diff --git a/apps/builder/src/features/templates/components/CreateNewTypebotButtons.tsx b/apps/builder/src/features/templates/components/CreateNewTypebotButtons.tsx
index 6db5face2..18cbfcaa8 100644
--- a/apps/builder/src/features/templates/components/CreateNewTypebotButtons.tsx
+++ b/apps/builder/src/features/templates/components/CreateNewTypebotButtons.tsx
@@ -12,10 +12,11 @@ import { useRouter } from 'next/router'
 import React, { useState } from 'react'
 import { ImportTypebotFromFileButton } from './ImportTypebotFromFileButton'
 import { TemplatesModal } from './TemplatesModal'
-import { useWorkspace } from '@/features/workspace'
-import { useUser } from '@/features/account'
+import { useWorkspace } from '@/features/workspace/WorkspaceProvider'
+import { useUser } from '@/features/account/hooks/useUser'
 import { useToast } from '@/hooks/useToast'
-import { createTypebotQuery, importTypebotQuery } from '@/features/dashboard'
+import { createTypebotQuery } from '@/features/dashboard/queries/createTypebotQuery'
+import { importTypebotQuery } from '@/features/dashboard/queries/importTypebotQuery'
 
 export const CreateNewTypebotButtons = () => {
   const { workspace } = useWorkspace()
diff --git a/apps/builder/src/features/templates/components/ImportTypebotFromFileButton.tsx b/apps/builder/src/features/templates/components/ImportTypebotFromFileButton.tsx
index 597dda1a4..1dd2b85a7 100644
--- a/apps/builder/src/features/templates/components/ImportTypebotFromFileButton.tsx
+++ b/apps/builder/src/features/templates/components/ImportTypebotFromFileButton.tsx
@@ -1,5 +1,4 @@
 import { useToast } from '@/hooks/useToast'
-import { readFile } from '@/utils/helpers'
 import { Button, ButtonProps, chakra } from '@chakra-ui/react'
 import { groupSchema, Typebot } from '@typebot.io/schemas'
 import React, { ChangeEvent } from 'react'
@@ -46,3 +45,14 @@ export const ImportTypebotFromFileButton = ({
     </>
   )
 }
+
+const readFile = (file: File): Promise<string> => {
+  return new Promise((resolve, reject) => {
+    const fr = new FileReader()
+    fr.onload = () => {
+      fr.result && resolve(fr.result.toString())
+    }
+    fr.onerror = reject
+    fr.readAsText(file)
+  })
+}
diff --git a/apps/builder/src/features/templates/components/TemplatesPage.tsx b/apps/builder/src/features/templates/components/TemplatesPage.tsx
index b78eef6f2..5068245af 100644
--- a/apps/builder/src/features/templates/components/TemplatesPage.tsx
+++ b/apps/builder/src/features/templates/components/TemplatesPage.tsx
@@ -1,5 +1,5 @@
 import { Seo } from '@/components/Seo'
-import { DashboardHeader } from '@/features/dashboard'
+import { DashboardHeader } from '@/features/dashboard/components/DashboardHeader'
 import { VStack } from '@chakra-ui/react'
 import { CreateNewTypebotButtons } from './CreateNewTypebotButtons'
 
diff --git a/apps/builder/src/features/templates/index.ts b/apps/builder/src/features/templates/index.ts
deleted file mode 100644
index 3ce8f55b7..000000000
--- a/apps/builder/src/features/templates/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { TemplatesPage } from './components/TemplatesPage'
diff --git a/apps/builder/src/features/theme/components/ChatSettings/index.tsx b/apps/builder/src/features/theme/components/ChatSettings/index.tsx
deleted file mode 100644
index b5ffa58a0..000000000
--- a/apps/builder/src/features/theme/components/ChatSettings/index.tsx
+++ /dev/null
@@ -1 +0,0 @@
-export { ChatThemeSettings } from './ChatThemeSettings'
diff --git a/apps/builder/src/features/theme/components/CustomCssSettings/CustomCssSettings.tsx b/apps/builder/src/features/theme/components/CustomCssSettings.tsx
similarity index 100%
rename from apps/builder/src/features/theme/components/CustomCssSettings/CustomCssSettings.tsx
rename to apps/builder/src/features/theme/components/CustomCssSettings.tsx
diff --git a/apps/builder/src/features/theme/components/GeneralSettings/BackgroundSelector/index.tsx b/apps/builder/src/features/theme/components/GeneralSettings/BackgroundSelector/index.tsx
deleted file mode 100644
index 8c0134cc7..000000000
--- a/apps/builder/src/features/theme/components/GeneralSettings/BackgroundSelector/index.tsx
+++ /dev/null
@@ -1 +0,0 @@
-export { BackgroundSelector } from './BackgroundSelector'
diff --git a/apps/builder/src/features/theme/components/GeneralSettings/FontSelector/index.tsx b/apps/builder/src/features/theme/components/GeneralSettings/FontSelector/index.tsx
deleted file mode 100644
index 0251a318f..000000000
--- a/apps/builder/src/features/theme/components/GeneralSettings/FontSelector/index.tsx
+++ /dev/null
@@ -1 +0,0 @@
-export { FontSelector } from './FontSelector'
diff --git a/apps/builder/src/features/theme/components/GeneralSettings/index.ts b/apps/builder/src/features/theme/components/GeneralSettings/index.ts
deleted file mode 100644
index a4b17fbd0..000000000
--- a/apps/builder/src/features/theme/components/GeneralSettings/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { GeneralSettings } from './GeneralSettings'
diff --git a/apps/builder/src/features/theme/components/ThemePage.tsx b/apps/builder/src/features/theme/components/ThemePage.tsx
index e9fc760ca..9ac3091ab 100644
--- a/apps/builder/src/features/theme/components/ThemePage.tsx
+++ b/apps/builder/src/features/theme/components/ThemePage.tsx
@@ -1,5 +1,6 @@
 import { Seo } from '@/components/Seo'
-import { TypebotHeader, useTypebot } from '@/features/editor'
+import { TypebotHeader } from '@/features/editor/components/TypebotHeader'
+import { useTypebot } from '@/features/editor/providers/TypebotProvider'
 import { Flex } from '@chakra-ui/react'
 import { Standard } from '@typebot.io/react'
 import { ThemeSideMenu } from './ThemeSideMenu'
diff --git a/apps/builder/src/features/theme/components/ThemeSideMenu.tsx b/apps/builder/src/features/theme/components/ThemeSideMenu.tsx
index ce34e5433..436b7ff24 100644
--- a/apps/builder/src/features/theme/components/ThemeSideMenu.tsx
+++ b/apps/builder/src/features/theme/components/ThemeSideMenu.tsx
@@ -11,10 +11,11 @@ import {
 import { ChatIcon, CodeIcon, PencilIcon } from '@/components/icons'
 import { ChatTheme, GeneralTheme } from '@typebot.io/schemas'
 import React from 'react'
-import { ChatThemeSettings } from './ChatSettings'
-import { CustomCssSettings } from './CustomCssSettings/CustomCssSettings'
-import { GeneralSettings } from './GeneralSettings'
-import { headerHeight, useTypebot } from '@/features/editor'
+import { CustomCssSettings } from './CustomCssSettings'
+import { useTypebot } from '@/features/editor/providers/TypebotProvider'
+import { headerHeight } from '@/features/editor/constants'
+import { ChatThemeSettings } from './chat/ChatThemeSettings'
+import { GeneralSettings } from './general/GeneralSettings'
 
 export const ThemeSideMenu = () => {
   const { typebot, updateTypebot } = useTypebot()
diff --git a/apps/builder/src/features/theme/components/ChatSettings/AvatarForm.tsx b/apps/builder/src/features/theme/components/chat/AvatarForm.tsx
similarity index 100%
rename from apps/builder/src/features/theme/components/ChatSettings/AvatarForm.tsx
rename to apps/builder/src/features/theme/components/chat/AvatarForm.tsx
diff --git a/apps/builder/src/features/theme/components/ChatSettings/ButtonsTheme.tsx b/apps/builder/src/features/theme/components/chat/ButtonsTheme.tsx
similarity index 100%
rename from apps/builder/src/features/theme/components/ChatSettings/ButtonsTheme.tsx
rename to apps/builder/src/features/theme/components/chat/ButtonsTheme.tsx
diff --git a/apps/builder/src/features/theme/components/ChatSettings/ChatThemeSettings.tsx b/apps/builder/src/features/theme/components/chat/ChatThemeSettings.tsx
similarity index 100%
rename from apps/builder/src/features/theme/components/ChatSettings/ChatThemeSettings.tsx
rename to apps/builder/src/features/theme/components/chat/ChatThemeSettings.tsx
diff --git a/apps/builder/src/features/theme/components/ChatSettings/GuestBubbles.tsx b/apps/builder/src/features/theme/components/chat/GuestBubbles.tsx
similarity index 100%
rename from apps/builder/src/features/theme/components/ChatSettings/GuestBubbles.tsx
rename to apps/builder/src/features/theme/components/chat/GuestBubbles.tsx
diff --git a/apps/builder/src/features/theme/components/ChatSettings/HostBubbles.tsx b/apps/builder/src/features/theme/components/chat/HostBubbles.tsx
similarity index 100%
rename from apps/builder/src/features/theme/components/ChatSettings/HostBubbles.tsx
rename to apps/builder/src/features/theme/components/chat/HostBubbles.tsx
diff --git a/apps/builder/src/features/theme/components/ChatSettings/InputsTheme.tsx b/apps/builder/src/features/theme/components/chat/InputsTheme.tsx
similarity index 100%
rename from apps/builder/src/features/theme/components/ChatSettings/InputsTheme.tsx
rename to apps/builder/src/features/theme/components/chat/InputsTheme.tsx
diff --git a/apps/builder/src/features/theme/components/GeneralSettings/BackgroundSelector/BackgroundContent.tsx b/apps/builder/src/features/theme/components/general/BackgroundContent.tsx
similarity index 93%
rename from apps/builder/src/features/theme/components/GeneralSettings/BackgroundSelector/BackgroundContent.tsx
rename to apps/builder/src/features/theme/components/general/BackgroundContent.tsx
index 00ffd0327..84c7aad92 100644
--- a/apps/builder/src/features/theme/components/GeneralSettings/BackgroundSelector/BackgroundContent.tsx
+++ b/apps/builder/src/features/theme/components/general/BackgroundContent.tsx
@@ -1,7 +1,7 @@
 import { Flex, Text } from '@chakra-ui/react'
 import { Background, BackgroundType } from '@typebot.io/schemas'
 import React from 'react'
-import { ColorPicker } from '../../../../../components/ColorPicker'
+import { ColorPicker } from '../../../../components/ColorPicker'
 
 type BackgroundContentProps = {
   background?: Background
diff --git a/apps/builder/src/features/theme/components/GeneralSettings/BackgroundSelector/BackgroundSelector.tsx b/apps/builder/src/features/theme/components/general/BackgroundSelector.tsx
similarity index 100%
rename from apps/builder/src/features/theme/components/GeneralSettings/BackgroundSelector/BackgroundSelector.tsx
rename to apps/builder/src/features/theme/components/general/BackgroundSelector.tsx
diff --git a/apps/builder/src/features/theme/components/GeneralSettings/BackgroundSelector/BackgroundTypeRadioButtons.tsx b/apps/builder/src/features/theme/components/general/BackgroundTypeRadioButtons.tsx
similarity index 100%
rename from apps/builder/src/features/theme/components/GeneralSettings/BackgroundSelector/BackgroundTypeRadioButtons.tsx
rename to apps/builder/src/features/theme/components/general/BackgroundTypeRadioButtons.tsx
diff --git a/apps/builder/src/features/theme/components/GeneralSettings/FontSelector/FontSelector.tsx b/apps/builder/src/features/theme/components/general/FontSelector.tsx
similarity index 100%
rename from apps/builder/src/features/theme/components/GeneralSettings/FontSelector/FontSelector.tsx
rename to apps/builder/src/features/theme/components/general/FontSelector.tsx
diff --git a/apps/builder/src/features/theme/components/GeneralSettings/GeneralSettings.tsx b/apps/builder/src/features/theme/components/general/GeneralSettings.tsx
similarity index 100%
rename from apps/builder/src/features/theme/components/GeneralSettings/GeneralSettings.tsx
rename to apps/builder/src/features/theme/components/general/GeneralSettings.tsx
diff --git a/apps/builder/src/features/theme/index.ts b/apps/builder/src/features/theme/index.ts
deleted file mode 100644
index 132a2e963..000000000
--- a/apps/builder/src/features/theme/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { ThemePage } from './components/ThemePage'
diff --git a/apps/builder/src/features/typebot/api/index.ts b/apps/builder/src/features/typebot/api/index.ts
deleted file mode 100644
index 398cae734..000000000
--- a/apps/builder/src/features/typebot/api/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './router'
diff --git a/apps/builder/src/features/typebot/api/procedures/listTypebotsProcedure.ts b/apps/builder/src/features/typebot/api/listTypebots.ts
similarity index 94%
rename from apps/builder/src/features/typebot/api/procedures/listTypebotsProcedure.ts
rename to apps/builder/src/features/typebot/api/listTypebots.ts
index 4c068073a..c08c7a238 100644
--- a/apps/builder/src/features/typebot/api/procedures/listTypebotsProcedure.ts
+++ b/apps/builder/src/features/typebot/api/listTypebots.ts
@@ -1,12 +1,12 @@
 import prisma from '@/lib/prisma'
-import { authenticatedProcedure } from '@/utils/server/trpc'
+import { authenticatedProcedure } from '@/helpers/server/trpc'
 import { TRPCError } from '@trpc/server'
 import { WorkspaceRole } from '@typebot.io/prisma'
 import { PublicTypebot, Typebot, typebotSchema } from '@typebot.io/schemas'
 import { omit } from '@typebot.io/lib'
 import { z } from 'zod'
 
-export const listTypebotsProcedure = authenticatedProcedure
+export const listTypebots = authenticatedProcedure
   .meta({
     openapi: {
       method: 'GET',
diff --git a/apps/builder/src/features/typebot/api/procedures/index.ts b/apps/builder/src/features/typebot/api/procedures/index.ts
deleted file mode 100644
index 0d566e131..000000000
--- a/apps/builder/src/features/typebot/api/procedures/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './listTypebotsProcedure'
diff --git a/apps/builder/src/features/typebot/api/router.ts b/apps/builder/src/features/typebot/api/router.ts
index c5f47df4f..81c159a01 100644
--- a/apps/builder/src/features/typebot/api/router.ts
+++ b/apps/builder/src/features/typebot/api/router.ts
@@ -1,6 +1,6 @@
-import { router } from '@/utils/server/trpc'
-import { listTypebotsProcedure } from './procedures'
+import { router } from '@/helpers/server/trpc'
+import { listTypebots } from './listTypebots'
 
 export const typebotRouter = router({
-  listTypebots: listTypebotsProcedure,
+  listTypebots,
 })
diff --git a/apps/builder/src/features/typebot/api/utils/getTypebot.ts b/apps/builder/src/features/typebot/helpers/getTypebot.ts
similarity index 100%
rename from apps/builder/src/features/typebot/api/utils/getTypebot.ts
rename to apps/builder/src/features/typebot/helpers/getTypebot.ts
diff --git a/apps/builder/src/features/typebot/helpers/hasDefaultConnector.ts b/apps/builder/src/features/typebot/helpers/hasDefaultConnector.ts
new file mode 100644
index 000000000..2439eb138
--- /dev/null
+++ b/apps/builder/src/features/typebot/helpers/hasDefaultConnector.ts
@@ -0,0 +1,7 @@
+import { isChoiceInput, isConditionBlock, isDefined } from '@typebot.io/lib'
+import { Block, InputBlockType } from '@typebot.io/schemas'
+
+export const hasDefaultConnector = (block: Block) =>
+  (!isChoiceInput(block) && !isConditionBlock(block)) ||
+  (block.type === InputBlockType.CHOICE &&
+    isDefined(block.options.dynamicVariableId))
diff --git a/apps/builder/src/features/typebot/api/utils/isReadTypebotForbidden.ts b/apps/builder/src/features/typebot/helpers/isReadTypebotForbidden.ts
similarity index 100%
rename from apps/builder/src/features/typebot/api/utils/isReadTypebotForbidden.ts
rename to apps/builder/src/features/typebot/helpers/isReadTypebotForbidden.ts
diff --git a/apps/builder/src/features/typebot/api/utils/isWriteTypebotForbidden.ts b/apps/builder/src/features/typebot/helpers/isWriteTypebotForbidden.ts
similarity index 100%
rename from apps/builder/src/features/typebot/api/utils/isWriteTypebotForbidden.ts
rename to apps/builder/src/features/typebot/helpers/isWriteTypebotForbidden.ts
diff --git a/apps/builder/src/features/typebot/helpers/parseNewBlock.ts b/apps/builder/src/features/typebot/helpers/parseNewBlock.ts
new file mode 100644
index 000000000..d5af13b1f
--- /dev/null
+++ b/apps/builder/src/features/typebot/helpers/parseNewBlock.ts
@@ -0,0 +1,149 @@
+import { createId } from '@paralleldrive/cuid2'
+import {
+  isBubbleBlockType,
+  blockTypeHasOption,
+  blockTypeHasWebhook,
+  blockTypeHasItems,
+} from '@typebot.io/lib'
+import {
+  DraggableBlockType,
+  DraggableBlock,
+  BlockOptions,
+  BlockWithOptionsType,
+  BubbleBlockContent,
+  BubbleBlockType,
+  defaultAudioBubbleContent,
+  defaultChatwootOptions,
+  defaultChoiceInputOptions,
+  defaultConditionContent,
+  defaultDateInputOptions,
+  defaultEmailInputOptions,
+  defaultEmbedBubbleContent,
+  defaultFileInputOptions,
+  defaultGoogleAnalyticsOptions,
+  defaultGoogleSheetsOptions,
+  defaultImageBubbleContent,
+  defaultNumberInputOptions,
+  defaultPaymentInputOptions,
+  defaultPhoneInputOptions,
+  defaultRatingInputOptions,
+  defaultRedirectOptions,
+  defaultScriptOptions,
+  defaultSendEmailOptions,
+  defaultSetVariablesOptions,
+  defaultTextBubbleContent,
+  defaultTextInputOptions,
+  defaultUrlInputOptions,
+  defaultVideoBubbleContent,
+  defaultWaitOptions,
+  defaultWebhookOptions,
+  InputBlockType,
+  IntegrationBlockType,
+  Item,
+  ItemType,
+  LogicBlockType,
+} from '@typebot.io/schemas'
+
+const parseDefaultItems = (
+  type: LogicBlockType.CONDITION | InputBlockType.CHOICE,
+  blockId: string
+): Item[] => {
+  switch (type) {
+    case InputBlockType.CHOICE:
+      return [{ id: createId(), blockId, type: ItemType.BUTTON }]
+    case LogicBlockType.CONDITION:
+      return [
+        {
+          id: createId(),
+          blockId,
+          type: ItemType.CONDITION,
+          content: defaultConditionContent,
+        },
+      ]
+  }
+}
+
+const parseDefaultContent = (type: BubbleBlockType): BubbleBlockContent => {
+  switch (type) {
+    case BubbleBlockType.TEXT:
+      return defaultTextBubbleContent
+    case BubbleBlockType.IMAGE:
+      return defaultImageBubbleContent
+    case BubbleBlockType.VIDEO:
+      return defaultVideoBubbleContent
+    case BubbleBlockType.EMBED:
+      return defaultEmbedBubbleContent
+    case BubbleBlockType.AUDIO:
+      return defaultAudioBubbleContent
+  }
+}
+
+const parseDefaultBlockOptions = (type: BlockWithOptionsType): BlockOptions => {
+  switch (type) {
+    case InputBlockType.TEXT:
+      return defaultTextInputOptions
+    case InputBlockType.NUMBER:
+      return defaultNumberInputOptions
+    case InputBlockType.EMAIL:
+      return defaultEmailInputOptions
+    case InputBlockType.DATE:
+      return defaultDateInputOptions
+    case InputBlockType.PHONE:
+      return defaultPhoneInputOptions
+    case InputBlockType.URL:
+      return defaultUrlInputOptions
+    case InputBlockType.CHOICE:
+      return defaultChoiceInputOptions
+    case InputBlockType.PAYMENT:
+      return defaultPaymentInputOptions
+    case InputBlockType.RATING:
+      return defaultRatingInputOptions
+    case InputBlockType.FILE:
+      return defaultFileInputOptions
+    case LogicBlockType.SET_VARIABLE:
+      return defaultSetVariablesOptions
+    case LogicBlockType.REDIRECT:
+      return defaultRedirectOptions
+    case LogicBlockType.SCRIPT:
+      return defaultScriptOptions
+    case LogicBlockType.WAIT:
+      return defaultWaitOptions
+    case LogicBlockType.JUMP:
+      return {}
+    case LogicBlockType.TYPEBOT_LINK:
+      return {}
+    case IntegrationBlockType.GOOGLE_SHEETS:
+      return defaultGoogleSheetsOptions
+    case IntegrationBlockType.GOOGLE_ANALYTICS:
+      return defaultGoogleAnalyticsOptions
+    case IntegrationBlockType.ZAPIER:
+    case IntegrationBlockType.PABBLY_CONNECT:
+    case IntegrationBlockType.MAKE_COM:
+    case IntegrationBlockType.WEBHOOK:
+      return defaultWebhookOptions
+    case IntegrationBlockType.EMAIL:
+      return defaultSendEmailOptions
+    case IntegrationBlockType.CHATWOOT:
+      return defaultChatwootOptions
+    case IntegrationBlockType.OPEN_AI:
+      return {}
+  }
+}
+
+export const parseNewBlock = (
+  type: DraggableBlockType,
+  groupId: string
+): DraggableBlock => {
+  const id = createId()
+  return {
+    id,
+    groupId,
+    type,
+    content: isBubbleBlockType(type) ? parseDefaultContent(type) : undefined,
+    options: blockTypeHasOption(type)
+      ? parseDefaultBlockOptions(type)
+      : undefined,
+    webhookId: blockTypeHasWebhook(type) ? createId() : undefined,
+    items: blockTypeHasItems(type) ? parseDefaultItems(type, id) : undefined,
+  } as DraggableBlock
+}
diff --git a/apps/builder/src/features/typebot/api/utils/removeTypebotOldProperties.ts b/apps/builder/src/features/typebot/helpers/removeTypebotOldProperties.ts
similarity index 100%
rename from apps/builder/src/features/typebot/api/utils/removeTypebotOldProperties.ts
rename to apps/builder/src/features/typebot/helpers/removeTypebotOldProperties.ts
diff --git a/apps/builder/src/features/variables/utils/injectVariableInTextInput.ts b/apps/builder/src/features/variables/helpers/injectVariableInTextInput.ts
similarity index 100%
rename from apps/builder/src/features/variables/utils/injectVariableInTextInput.ts
rename to apps/builder/src/features/variables/helpers/injectVariableInTextInput.ts
diff --git a/apps/builder/src/features/variables/helpers/parseVariableHtmlTags.ts b/apps/builder/src/features/variables/helpers/parseVariableHtmlTags.ts
new file mode 100644
index 000000000..441064306
--- /dev/null
+++ b/apps/builder/src/features/variables/helpers/parseVariableHtmlTags.ts
@@ -0,0 +1,18 @@
+import { Variable } from '@typebot.io/schemas'
+
+export const parseVariableHtmlTags = (
+  content: string,
+  variables: Variable[]
+) => {
+  const varNames = variables.map((variable) => variable.name)
+  return content.replace(/\{\{(.*?)\}\}/g, (fullMatch, foundVar) => {
+    if (content.includes(`href="{{${foundVar}}}"`)) return fullMatch
+    if (varNames.some((val) => foundVar === val)) {
+      return `<span style="background-color:#ff8b1a; color:#ffffff; padding: 0.125rem 0.25rem; border-radius: 0.35rem">${fullMatch.replace(
+        /{{|}}/g,
+        ''
+      )}</span>`
+    }
+    return fullMatch
+  })
+}
diff --git a/apps/builder/src/features/variables/index.ts b/apps/builder/src/features/variables/index.ts
deleted file mode 100644
index dca8a32ab..000000000
--- a/apps/builder/src/features/variables/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { VariablesButton } from './components/VariablesButton'
diff --git a/apps/builder/src/features/workspace/WorkspaceProvider.tsx b/apps/builder/src/features/workspace/WorkspaceProvider.tsx
index eb672aa1c..e22f4d1a3 100644
--- a/apps/builder/src/features/workspace/WorkspaceProvider.tsx
+++ b/apps/builder/src/features/workspace/WorkspaceProvider.tsx
@@ -8,13 +8,14 @@ import {
 } from 'react'
 import { byId } from '@typebot.io/lib'
 import { WorkspaceRole } from '@typebot.io/prisma'
-import { useUser } from '../account/UserProvider'
 import { useRouter } from 'next/router'
 import { trpc } from '@/lib/trpc'
 import { Workspace } from '@typebot.io/schemas'
 import { useToast } from '@/hooks/useToast'
-import { parseNewName, setWorkspaceIdInLocalStorage } from './utils'
-import { useTypebot } from '../editor'
+import { useUser } from '../account/hooks/useUser'
+import { useTypebot } from '../editor/providers/TypebotProvider'
+import { setWorkspaceIdInLocalStorage } from './helpers/setWorkspaceIdInLocalStorage'
+import { parseNewName } from './helpers/parseNewName'
 
 const workspaceContext = createContext<{
   workspaces: Pick<Workspace, 'id' | 'name' | 'icon' | 'plan'>[]
diff --git a/apps/builder/src/features/workspace/api/procedures/createWorkspaceProcedure.ts b/apps/builder/src/features/workspace/api/createWorkspace.ts
similarity index 88%
rename from apps/builder/src/features/workspace/api/procedures/createWorkspaceProcedure.ts
rename to apps/builder/src/features/workspace/api/createWorkspace.ts
index 60455e382..f946f1792 100644
--- a/apps/builder/src/features/workspace/api/procedures/createWorkspaceProcedure.ts
+++ b/apps/builder/src/features/workspace/api/createWorkspace.ts
@@ -1,12 +1,12 @@
 import { sendTelemetryEvents } from '@typebot.io/lib/telemetry/sendTelemetryEvent'
 import prisma from '@/lib/prisma'
-import { authenticatedProcedure } from '@/utils/server/trpc'
+import { authenticatedProcedure } from '@/helpers/server/trpc'
 import { TRPCError } from '@trpc/server'
 import { Workspace, workspaceSchema } from '@typebot.io/schemas'
 import { z } from 'zod'
-import { parseWorkspaceDefaultPlan } from '../../utils'
+import { parseWorkspaceDefaultPlan } from '../helpers/parseWorkspaceDefaultPlan'
 
-export const createWorkspaceProcedure = authenticatedProcedure
+export const createWorkspace = authenticatedProcedure
   .meta({
     openapi: {
       method: 'POST',
diff --git a/apps/builder/src/features/workspace/api/procedures/deleteWorkspaceProcedure.ts b/apps/builder/src/features/workspace/api/deleteWorkspace.ts
similarity index 83%
rename from apps/builder/src/features/workspace/api/procedures/deleteWorkspaceProcedure.ts
rename to apps/builder/src/features/workspace/api/deleteWorkspace.ts
index bd6c0677b..fbd625b7b 100644
--- a/apps/builder/src/features/workspace/api/procedures/deleteWorkspaceProcedure.ts
+++ b/apps/builder/src/features/workspace/api/deleteWorkspace.ts
@@ -1,8 +1,8 @@
 import prisma from '@/lib/prisma'
-import { authenticatedProcedure } from '@/utils/server/trpc'
+import { authenticatedProcedure } from '@/helpers/server/trpc'
 import { z } from 'zod'
 
-export const deleteWorkspaceProcedure = authenticatedProcedure
+export const deleteWorkspace = authenticatedProcedure
   .meta({
     openapi: {
       method: 'DELETE',
diff --git a/apps/builder/src/features/workspace/api/procedures/getWorkspaceProcedure.ts b/apps/builder/src/features/workspace/api/getWorkspace.ts
similarity index 87%
rename from apps/builder/src/features/workspace/api/procedures/getWorkspaceProcedure.ts
rename to apps/builder/src/features/workspace/api/getWorkspace.ts
index 7c2604180..6619a550f 100644
--- a/apps/builder/src/features/workspace/api/procedures/getWorkspaceProcedure.ts
+++ b/apps/builder/src/features/workspace/api/getWorkspace.ts
@@ -1,10 +1,10 @@
 import prisma from '@/lib/prisma'
-import { authenticatedProcedure } from '@/utils/server/trpc'
+import { authenticatedProcedure } from '@/helpers/server/trpc'
 import { TRPCError } from '@trpc/server'
 import { Workspace, workspaceSchema } from '@typebot.io/schemas'
 import { z } from 'zod'
 
-export const getWorkspaceProcedure = authenticatedProcedure
+export const getWorkspace = authenticatedProcedure
   .meta({
     openapi: {
       method: 'GET',
diff --git a/apps/builder/src/features/workspace/api/index.ts b/apps/builder/src/features/workspace/api/index.ts
deleted file mode 100644
index 398cae734..000000000
--- a/apps/builder/src/features/workspace/api/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './router'
diff --git a/apps/builder/src/features/workspace/api/procedures/listInvitationsInWorkspaceProcedure.ts b/apps/builder/src/features/workspace/api/listInvitationsInWorkspace.ts
similarity index 88%
rename from apps/builder/src/features/workspace/api/procedures/listInvitationsInWorkspaceProcedure.ts
rename to apps/builder/src/features/workspace/api/listInvitationsInWorkspace.ts
index 6a0bb7e68..77d02e260 100644
--- a/apps/builder/src/features/workspace/api/procedures/listInvitationsInWorkspaceProcedure.ts
+++ b/apps/builder/src/features/workspace/api/listInvitationsInWorkspace.ts
@@ -1,5 +1,5 @@
 import prisma from '@/lib/prisma'
-import { authenticatedProcedure } from '@/utils/server/trpc'
+import { authenticatedProcedure } from '@/helpers/server/trpc'
 import { TRPCError } from '@trpc/server'
 import {
   WorkspaceInvitation,
@@ -7,7 +7,7 @@ import {
 } from '@typebot.io/schemas'
 import { z } from 'zod'
 
-export const listInvitationsInWorkspaceProcedure = authenticatedProcedure
+export const listInvitationsInWorkspace = authenticatedProcedure
   .meta({
     openapi: {
       method: 'GET',
diff --git a/apps/builder/src/features/workspace/api/procedures/listMembersInWorkspaceProcedure.ts b/apps/builder/src/features/workspace/api/listMembersInWorkspace.ts
similarity index 87%
rename from apps/builder/src/features/workspace/api/procedures/listMembersInWorkspaceProcedure.ts
rename to apps/builder/src/features/workspace/api/listMembersInWorkspace.ts
index 74105b11c..a104d727b 100644
--- a/apps/builder/src/features/workspace/api/procedures/listMembersInWorkspaceProcedure.ts
+++ b/apps/builder/src/features/workspace/api/listMembersInWorkspace.ts
@@ -1,10 +1,10 @@
 import prisma from '@/lib/prisma'
-import { authenticatedProcedure } from '@/utils/server/trpc'
+import { authenticatedProcedure } from '@/helpers/server/trpc'
 import { TRPCError } from '@trpc/server'
 import { WorkspaceMember, workspaceMemberSchema } from '@typebot.io/schemas'
 import { z } from 'zod'
 
-export const listMembersInWorkspaceProcedure = authenticatedProcedure
+export const listMembersInWorkspace = authenticatedProcedure
   .meta({
     openapi: {
       method: 'GET',
diff --git a/apps/builder/src/features/workspace/api/procedures/listWorkspacesProcedure.ts b/apps/builder/src/features/workspace/api/listWorkspaces.ts
similarity index 88%
rename from apps/builder/src/features/workspace/api/procedures/listWorkspacesProcedure.ts
rename to apps/builder/src/features/workspace/api/listWorkspaces.ts
index 491d709ff..e2e3421c2 100644
--- a/apps/builder/src/features/workspace/api/procedures/listWorkspacesProcedure.ts
+++ b/apps/builder/src/features/workspace/api/listWorkspaces.ts
@@ -1,10 +1,10 @@
 import prisma from '@/lib/prisma'
-import { authenticatedProcedure } from '@/utils/server/trpc'
+import { authenticatedProcedure } from '@/helpers/server/trpc'
 import { TRPCError } from '@trpc/server'
 import { Workspace, workspaceSchema } from '@typebot.io/schemas'
 import { z } from 'zod'
 
-export const listWorkspacesProcedure = authenticatedProcedure
+export const listWorkspaces = authenticatedProcedure
   .meta({
     openapi: {
       method: 'GET',
diff --git a/apps/builder/src/features/workspace/api/procedures/index.ts b/apps/builder/src/features/workspace/api/procedures/index.ts
deleted file mode 100644
index 0857e76e9..000000000
--- a/apps/builder/src/features/workspace/api/procedures/index.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-export * from './createWorkspaceProcedure'
-export * from './deleteWorkspaceProcedure'
-export * from './getWorkspaceProcedure'
-export * from './listInvitationsInWorkspaceProcedure'
-export * from './listMembersInWorkspaceProcedure'
-export * from './listWorkspacesProcedure'
-export * from './updateWorkspaceProcedure'
diff --git a/apps/builder/src/features/workspace/api/router.ts b/apps/builder/src/features/workspace/api/router.ts
index ae84b8740..52a17a56a 100644
--- a/apps/builder/src/features/workspace/api/router.ts
+++ b/apps/builder/src/features/workspace/api/router.ts
@@ -1,18 +1,16 @@
-import { router } from '@/utils/server/trpc'
-import {
-  createWorkspaceProcedure,
-  deleteWorkspaceProcedure,
-  getWorkspaceProcedure,
-  listMembersInWorkspaceProcedure,
-  listWorkspacesProcedure,
-  updateWorkspaceProcedure,
-} from './procedures'
+import { router } from '@/helpers/server/trpc'
+import { createWorkspace } from './createWorkspace'
+import { deleteWorkspace } from './deleteWorkspace'
+import { getWorkspace } from './getWorkspace'
+import { listMembersInWorkspace } from './listMembersInWorkspace'
+import { listWorkspaces } from './listWorkspaces'
+import { updateWorkspace } from './updateWorkspace'
 
 export const workspaceRouter = router({
-  listWorkspaces: listWorkspacesProcedure,
-  getWorkspace: getWorkspaceProcedure,
-  listMembersInWorkspace: listMembersInWorkspaceProcedure,
-  createWorkspace: createWorkspaceProcedure,
-  updateWorkspace: updateWorkspaceProcedure,
-  deleteWorkspace: deleteWorkspaceProcedure,
+  listWorkspaces,
+  getWorkspace,
+  listMembersInWorkspace,
+  createWorkspace,
+  updateWorkspace,
+  deleteWorkspace,
 })
diff --git a/apps/builder/src/features/workspace/api/procedures/updateWorkspaceProcedure.ts b/apps/builder/src/features/workspace/api/updateWorkspace.ts
similarity index 89%
rename from apps/builder/src/features/workspace/api/procedures/updateWorkspaceProcedure.ts
rename to apps/builder/src/features/workspace/api/updateWorkspace.ts
index 999285df0..5673196a3 100644
--- a/apps/builder/src/features/workspace/api/procedures/updateWorkspaceProcedure.ts
+++ b/apps/builder/src/features/workspace/api/updateWorkspace.ts
@@ -1,10 +1,10 @@
 import prisma from '@/lib/prisma'
-import { authenticatedProcedure } from '@/utils/server/trpc'
+import { authenticatedProcedure } from '@/helpers/server/trpc'
 import { TRPCError } from '@trpc/server'
 import { Workspace, workspaceSchema } from '@typebot.io/schemas'
 import { z } from 'zod'
 
-export const updateWorkspaceProcedure = authenticatedProcedure
+export const updateWorkspace = authenticatedProcedure
   .meta({
     openapi: {
       method: 'PATCH',
diff --git a/apps/builder/src/features/workspace/components/MembersList/AddMemberForm.tsx b/apps/builder/src/features/workspace/components/AddMemberForm.tsx
similarity index 96%
rename from apps/builder/src/features/workspace/components/MembersList/AddMemberForm.tsx
rename to apps/builder/src/features/workspace/components/AddMemberForm.tsx
index 3b1b563e1..860eadfcc 100644
--- a/apps/builder/src/features/workspace/components/MembersList/AddMemberForm.tsx
+++ b/apps/builder/src/features/workspace/components/AddMemberForm.tsx
@@ -11,8 +11,8 @@ import {
 import { ChevronLeftIcon } from '@/components/icons'
 import { WorkspaceInvitation, WorkspaceRole } from '@typebot.io/prisma'
 import { FormEvent, useState } from 'react'
-import { Member } from '../../types'
-import { sendInvitationQuery } from '../../queries/sendInvitationQuery'
+import { Member } from '../types'
+import { sendInvitationQuery } from '../queries/sendInvitationQuery'
 
 type Props = {
   workspaceId: string
diff --git a/apps/builder/src/features/workspace/components/MembersList/MemberItem.tsx b/apps/builder/src/features/workspace/components/MemberItem.tsx
similarity index 100%
rename from apps/builder/src/features/workspace/components/MembersList/MemberItem.tsx
rename to apps/builder/src/features/workspace/components/MemberItem.tsx
diff --git a/apps/builder/src/features/workspace/components/MembersList/MembersList.tsx b/apps/builder/src/features/workspace/components/MembersList.tsx
similarity index 90%
rename from apps/builder/src/features/workspace/components/MembersList/MembersList.tsx
rename to apps/builder/src/features/workspace/components/MembersList.tsx
index aa63c7542..16b008fe0 100644
--- a/apps/builder/src/features/workspace/components/MembersList/MembersList.tsx
+++ b/apps/builder/src/features/workspace/components/MembersList.tsx
@@ -11,15 +11,15 @@ import React from 'react'
 import { getSeatsLimit, isSeatsLimitReached } from '@typebot.io/lib/pricing'
 import { AddMemberForm } from './AddMemberForm'
 import { MemberItem } from './MemberItem'
-import { useUser } from '@/features/account'
-import { useWorkspace } from '../../WorkspaceProvider'
-import { useMembers } from '../../hooks/useMembers'
-import { deleteMemberQuery } from '../../queries/deleteMemberQuery'
-import { updateMemberQuery } from '../../queries/updateMemberQuery'
-import { deleteInvitationQuery } from '../../queries/deleteInvitationQuery'
-import { updateInvitationQuery } from '../../queries/updateInvitationQuery'
-import { Member } from '../../types'
 import { isDefined } from '@typebot.io/lib'
+import { useUser } from '@/features/account/hooks/useUser'
+import { useMembers } from '../hooks/useMembers'
+import { deleteInvitationQuery } from '../queries/deleteInvitationQuery'
+import { deleteMemberQuery } from '../queries/deleteMemberQuery'
+import { updateInvitationQuery } from '../queries/updateInvitationQuery'
+import { updateMemberQuery } from '../queries/updateMemberQuery'
+import { Member } from '../types'
+import { useWorkspace } from '../WorkspaceProvider'
 
 export const MembersList = () => {
   const { user } = useUser()
diff --git a/apps/builder/src/features/workspace/components/MembersList/index.ts b/apps/builder/src/features/workspace/components/MembersList/index.ts
deleted file mode 100644
index 7ec8f0d5c..000000000
--- a/apps/builder/src/features/workspace/components/MembersList/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export { MembersList } from './MembersList'
diff --git a/apps/builder/src/features/workspace/components/WorkspaceDropdown.tsx b/apps/builder/src/features/workspace/components/WorkspaceDropdown.tsx
index 5697d0683..6c1f29412 100644
--- a/apps/builder/src/features/workspace/components/WorkspaceDropdown.tsx
+++ b/apps/builder/src/features/workspace/components/WorkspaceDropdown.tsx
@@ -5,7 +5,7 @@ import {
   PlusIcon,
   LogOutIcon,
 } from '@/components/icons'
-import { PlanTag } from '@/features/billing'
+import { PlanTag } from '@/features/billing/components/PlanTag'
 import { trpc } from '@/lib/trpc'
 import {
   Menu,
diff --git a/apps/builder/src/features/workspace/components/WorkspaceSettingsModal.tsx b/apps/builder/src/features/workspace/components/WorkspaceSettingsModal.tsx
index 11f21d6a0..bfb702818 100644
--- a/apps/builder/src/features/workspace/components/WorkspaceSettingsModal.tsx
+++ b/apps/builder/src/features/workspace/components/WorkspaceSettingsModal.tsx
@@ -20,9 +20,10 @@ import { useState } from 'react'
 import { MembersList } from './MembersList'
 import { WorkspaceSettingsForm } from './WorkspaceSettingsForm'
 import { useWorkspace } from '../WorkspaceProvider'
-import { MyAccountForm, UserPreferencesForm } from '@/features/account'
-import { BillingContent } from '@/features/billing'
 import packageJson from '../../../../../../package.json'
+import { UserPreferencesForm } from '@/features/account/components/UserPreferencesForm'
+import { MyAccountForm } from '@/features/account/components/MyAccountForm'
+import { BillingSettingsLayout } from '@/features/billing/components/BillingSettingsLayout'
 
 type Props = {
   isOpen: boolean
@@ -175,7 +176,7 @@ const SettingsContent = ({
     case 'members':
       return <MembersList />
     case 'billing':
-      return <BillingContent />
+      return <BillingSettingsLayout />
     default:
       return null
   }
diff --git a/apps/builder/src/features/workspace/components/index.tsx b/apps/builder/src/features/workspace/components/index.tsx
deleted file mode 100644
index 4f2aa615d..000000000
--- a/apps/builder/src/features/workspace/components/index.tsx
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from './WorkspaceSettingsModal'
-export * from './WorkspaceDropdown'
diff --git a/apps/builder/src/features/workspace/utils/parseNewName.ts b/apps/builder/src/features/workspace/helpers/parseNewName.ts
similarity index 100%
rename from apps/builder/src/features/workspace/utils/parseNewName.ts
rename to apps/builder/src/features/workspace/helpers/parseNewName.ts
diff --git a/apps/builder/src/features/workspace/utils/parseWorkspaceDefaultPlan.ts b/apps/builder/src/features/workspace/helpers/parseWorkspaceDefaultPlan.ts
similarity index 100%
rename from apps/builder/src/features/workspace/utils/parseWorkspaceDefaultPlan.ts
rename to apps/builder/src/features/workspace/helpers/parseWorkspaceDefaultPlan.ts
diff --git a/apps/builder/src/features/workspace/utils/setWorkspaceIdInLocalStorage.ts b/apps/builder/src/features/workspace/helpers/setWorkspaceIdInLocalStorage.ts
similarity index 100%
rename from apps/builder/src/features/workspace/utils/setWorkspaceIdInLocalStorage.ts
rename to apps/builder/src/features/workspace/helpers/setWorkspaceIdInLocalStorage.ts
diff --git a/apps/builder/src/features/workspace/hooks/useMembers.ts b/apps/builder/src/features/workspace/hooks/useMembers.ts
index d548f01a9..ddd919064 100644
--- a/apps/builder/src/features/workspace/hooks/useMembers.ts
+++ b/apps/builder/src/features/workspace/hooks/useMembers.ts
@@ -1,5 +1,5 @@
 import { WorkspaceInvitation } from '@typebot.io/prisma'
-import { fetcher } from '@/utils/helpers'
+import { fetcher } from '@/helpers/fetcher'
 import useSWR from 'swr'
 import { env } from '@typebot.io/lib'
 import { Member } from '../types'
diff --git a/apps/builder/src/features/workspace/index.ts b/apps/builder/src/features/workspace/index.ts
deleted file mode 100644
index 45e7c4a3e..000000000
--- a/apps/builder/src/features/workspace/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export { WorkspaceProvider, useWorkspace } from './WorkspaceProvider'
-export * from './components'
-export { parseWorkspaceDefaultPlan } from './utils'
diff --git a/apps/builder/src/features/workspace/utils/index.ts b/apps/builder/src/features/workspace/utils/index.ts
deleted file mode 100644
index cf6554307..000000000
--- a/apps/builder/src/features/workspace/utils/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export * from './parseNewName'
-export * from './parseWorkspaceDefaultPlan'
-export * from './setWorkspaceIdInLocalStorage'
diff --git a/apps/builder/src/helpers/compressFile.ts b/apps/builder/src/helpers/compressFile.ts
new file mode 100644
index 000000000..b9f6496a6
--- /dev/null
+++ b/apps/builder/src/helpers/compressFile.ts
@@ -0,0 +1,11 @@
+import imageCompression from 'browser-image-compression'
+
+export const compressFile = async (file: File) => {
+  const options = {
+    maxSizeMB: 0.5,
+    maxWidthOrHeight: 1600,
+  }
+  return ['image/jpg', 'image/jpeg', 'image/png'].includes(file.type)
+    ? imageCompression(file, options)
+    : file
+}
diff --git a/apps/builder/src/utils/api/dbRules.ts b/apps/builder/src/helpers/databaseRules.ts
similarity index 100%
rename from apps/builder/src/utils/api/dbRules.ts
rename to apps/builder/src/helpers/databaseRules.ts
diff --git a/apps/builder/src/utils/api/storage.ts b/apps/builder/src/helpers/deleteFilesFromBucket.ts
similarity index 95%
rename from apps/builder/src/utils/api/storage.ts
rename to apps/builder/src/helpers/deleteFilesFromBucket.ts
index 94f9da2d8..77b7fb8e1 100644
--- a/apps/builder/src/utils/api/storage.ts
+++ b/apps/builder/src/helpers/deleteFilesFromBucket.ts
@@ -1,6 +1,6 @@
 import { Client } from 'minio'
 
-export const deleteFiles = async ({
+export const deleteFilesFromBucket = async ({
   urls,
 }: {
   urls: string[]
diff --git a/apps/builder/src/helpers/fetcher.ts b/apps/builder/src/helpers/fetcher.ts
new file mode 100644
index 000000000..801861cb0
--- /dev/null
+++ b/apps/builder/src/helpers/fetcher.ts
@@ -0,0 +1,4 @@
+export const fetcher = async (input: RequestInfo, init?: RequestInit) => {
+  const res = await fetch(input, init)
+  return res.json()
+}
diff --git a/apps/builder/src/utils/focusInput.ts b/apps/builder/src/helpers/focusInput.ts
similarity index 100%
rename from apps/builder/src/utils/focusInput.ts
rename to apps/builder/src/helpers/focusInput.ts
diff --git a/apps/builder/src/helpers/isCloudProdInstance.ts b/apps/builder/src/helpers/isCloudProdInstance.ts
new file mode 100644
index 000000000..34be2a1e5
--- /dev/null
+++ b/apps/builder/src/helpers/isCloudProdInstance.ts
@@ -0,0 +1,2 @@
+export const isCloudProdInstance =
+  typeof window !== 'undefined' && window.location.hostname === 'app.typebot.io'
diff --git a/apps/builder/src/helpers/isMobile.ts b/apps/builder/src/helpers/isMobile.ts
new file mode 100644
index 000000000..3e68eca60
--- /dev/null
+++ b/apps/builder/src/helpers/isMobile.ts
@@ -0,0 +1,3 @@
+export const isMobile =
+  typeof window !== 'undefined' &&
+  window.matchMedia('only screen and (max-width: 760px)').matches
diff --git a/apps/builder/src/helpers/parseNumberToStringWithCommas.ts b/apps/builder/src/helpers/parseNumberToStringWithCommas.ts
new file mode 100644
index 000000000..0d2475683
--- /dev/null
+++ b/apps/builder/src/helpers/parseNumberToStringWithCommas.ts
@@ -0,0 +1,2 @@
+export const parseNumberToStringWithCommas = (x: number) =>
+  x.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ',')
diff --git a/apps/builder/src/helpers/parseTimeSince.ts b/apps/builder/src/helpers/parseTimeSince.ts
new file mode 100644
index 000000000..ca5a8aef7
--- /dev/null
+++ b/apps/builder/src/helpers/parseTimeSince.ts
@@ -0,0 +1,28 @@
+export const parseTimeSince = (date: string) => {
+  const seconds = Math.floor(
+    (new Date().getTime() - new Date(date).getTime()) / 1000
+  )
+
+  let interval = seconds / 31536000
+
+  if (interval > 1) {
+    return Math.floor(interval) + ' years'
+  }
+  interval = seconds / 2592000
+  if (interval > 1) {
+    return Math.floor(interval) + ' months'
+  }
+  interval = seconds / 86400
+  if (interval > 1) {
+    return Math.floor(interval) + 'd'
+  }
+  interval = seconds / 3600
+  if (interval > 1) {
+    return Math.floor(interval) + 'h'
+  }
+  interval = seconds / 60
+  if (interval > 1) {
+    return Math.floor(interval) + 'm'
+  }
+  return Math.floor(seconds) + 's'
+}
diff --git a/apps/builder/src/helpers/preventUserFromRefreshing.ts b/apps/builder/src/helpers/preventUserFromRefreshing.ts
new file mode 100644
index 000000000..79c0e644a
--- /dev/null
+++ b/apps/builder/src/helpers/preventUserFromRefreshing.ts
@@ -0,0 +1,4 @@
+export const preventUserFromRefreshing = (e: BeforeUnloadEvent) => {
+  e.preventDefault()
+  e.returnValue = ''
+}
diff --git a/apps/builder/src/utils/server/context.ts b/apps/builder/src/helpers/server/context.ts
similarity index 79%
rename from apps/builder/src/utils/server/context.ts
rename to apps/builder/src/helpers/server/context.ts
index 28852f5bf..90b7bc7f2 100644
--- a/apps/builder/src/utils/server/context.ts
+++ b/apps/builder/src/helpers/server/context.ts
@@ -1,4 +1,4 @@
-import { getAuthenticatedUser } from '@/features/auth/api'
+import { getAuthenticatedUser } from '@/features/auth/helpers/getAuthenticatedUser'
 import { inferAsyncReturnType } from '@trpc/server'
 import * as trpcNext from '@trpc/server/adapters/next'
 
diff --git a/apps/builder/src/utils/server/generateOpenApi.ts b/apps/builder/src/helpers/server/generateOpenApi.ts
similarity index 100%
rename from apps/builder/src/utils/server/generateOpenApi.ts
rename to apps/builder/src/helpers/server/generateOpenApi.ts
diff --git a/apps/builder/src/utils/server/routers/v1/trpcRouter.ts b/apps/builder/src/helpers/server/routers/v1/trpcRouter.ts
similarity index 77%
rename from apps/builder/src/utils/server/routers/v1/trpcRouter.ts
rename to apps/builder/src/helpers/server/routers/v1/trpcRouter.ts
index d3e29ef50..f2970c29d 100644
--- a/apps/builder/src/utils/server/routers/v1/trpcRouter.ts
+++ b/apps/builder/src/helpers/server/routers/v1/trpcRouter.ts
@@ -1,11 +1,11 @@
 import { billingRouter } from '@/features/billing/api/router'
-import { webhookRouter } from '@/features/blocks/integrations/webhook/api'
+import { webhookRouter } from '@/features/blocks/integrations/webhook/api/router'
 import { credentialsRouter } from '@/features/credentials/api/router'
 import { getAppVersionProcedure } from '@/features/dashboard/api/getAppVersionProcedure'
-import { resultsRouter } from '@/features/results/api'
+import { resultsRouter } from '@/features/results/api/router'
 import { processTelemetryEvent } from '@/features/telemetry/api/processTelemetryEvent'
-import { typebotRouter } from '@/features/typebot/api'
-import { workspaceRouter } from '@/features/workspace/api'
+import { typebotRouter } from '@/features/typebot/api/router'
+import { workspaceRouter } from '@/features/workspace/api/router'
 import { router } from '../../trpc'
 
 export const trpcRouter = router({
diff --git a/apps/builder/src/utils/server/trpc.ts b/apps/builder/src/helpers/server/trpc.ts
similarity index 100%
rename from apps/builder/src/utils/server/trpc.ts
rename to apps/builder/src/helpers/server/trpc.ts
diff --git a/apps/builder/src/helpers/setMultipleRefs.ts b/apps/builder/src/helpers/setMultipleRefs.ts
new file mode 100644
index 000000000..d51a62066
--- /dev/null
+++ b/apps/builder/src/helpers/setMultipleRefs.ts
@@ -0,0 +1,4 @@
+export const setMultipleRefs =
+  (refs: React.MutableRefObject<HTMLDivElement | null>[]) =>
+  (elem: HTMLDivElement) =>
+    refs.forEach((ref) => (ref.current = elem))
diff --git a/apps/builder/src/helpers/toKebabCase.ts b/apps/builder/src/helpers/toKebabCase.ts
new file mode 100644
index 000000000..beb5b473d
--- /dev/null
+++ b/apps/builder/src/helpers/toKebabCase.ts
@@ -0,0 +1,7 @@
+export const toKebabCase = (value: string) => {
+  const matched = value.match(
+    /[A-Z]{2,}(?=[A-Z][a-z]+[0-9]*|\b)|[A-Z]?[a-z]+[0-9]*|[A-Z]|[0-9]+/g
+  )
+  if (!matched) return ''
+  return matched.map((x) => x.toLowerCase()).join('-')
+}
diff --git a/apps/builder/src/hooks/useLinkedTypebots.ts b/apps/builder/src/hooks/useLinkedTypebots.ts
index 6397dadc1..de2b6283a 100644
--- a/apps/builder/src/hooks/useLinkedTypebots.ts
+++ b/apps/builder/src/hooks/useLinkedTypebots.ts
@@ -1,4 +1,4 @@
-import { fetcher } from '@/utils/helpers'
+import { fetcher } from '@/helpers/fetcher'
 import { Typebot } from '@typebot.io/schemas'
 import { stringify } from 'qs'
 import useSWR from 'swr'
diff --git a/apps/builder/src/hooks/useTypebotQuery.ts b/apps/builder/src/hooks/useTypebotQuery.ts
index 33feef7d0..84f9d35ca 100644
--- a/apps/builder/src/hooks/useTypebotQuery.ts
+++ b/apps/builder/src/hooks/useTypebotQuery.ts
@@ -1,4 +1,4 @@
-import { fetcher } from '@/utils/helpers'
+import { fetcher } from '@/helpers/fetcher'
 import { PublicTypebot, Typebot, Webhook } from '@typebot.io/schemas'
 import useSWR from 'swr'
 import { env } from '@typebot.io/lib'
diff --git a/apps/builder/src/lib/trpc.ts b/apps/builder/src/lib/trpc.ts
index 11faf5755..3615377cd 100644
--- a/apps/builder/src/lib/trpc.ts
+++ b/apps/builder/src/lib/trpc.ts
@@ -1,6 +1,6 @@
 import { httpBatchLink, loggerLink } from '@trpc/client'
 import { createTRPCNext } from '@trpc/next'
-import type { AppRouter } from '../utils/server/routers/v1/trpcRouter'
+import type { AppRouter } from '../helpers/server/routers/v1/trpcRouter'
 import superjson from 'superjson'
 
 const getBaseUrl = () =>
diff --git a/apps/builder/src/pages/_app.tsx b/apps/builder/src/pages/_app.tsx
index c679369fc..730f8feaf 100644
--- a/apps/builder/src/pages/_app.tsx
+++ b/apps/builder/src/pages/_app.tsx
@@ -6,18 +6,18 @@ import { customTheme } from '@/lib/theme'
 import { useRouterProgressBar } from '@/lib/routerProgressBar'
 import '@/assets/styles/routerProgressBar.css'
 import '@/assets/styles/plate.css'
-import '@/assets/styles/submissionsTable.css'
+import '@/assets/styles/resultsTable.css'
 import '@/assets/styles/custom.css'
-import { UserProvider } from '@/features/account'
-import { TypebotProvider } from '@/features/editor'
+import { UserProvider } from '@/features/account/UserProvider'
 import { useRouter } from 'next/router'
 import { SupportBubble } from '@/components/SupportBubble'
-import { WorkspaceProvider } from '@/features/workspace'
 import { toTitleCase } from '@typebot.io/lib'
 import { Plan } from '@typebot.io/prisma'
 import { trpc } from '@/lib/trpc'
 import { NewVersionPopup } from '@/components/NewVersionPopup'
 import { I18nProvider } from '@/locales'
+import { TypebotProvider } from '@/features/editor/providers/TypebotProvider'
+import { WorkspaceProvider } from '@/features/workspace/WorkspaceProvider'
 
 const { ToastContainer, toast } = createStandaloneToast(customTheme)
 
diff --git a/apps/builder/src/pages/api/auth/[...nextauth].ts b/apps/builder/src/pages/api/auth/[...nextauth].ts
index 95ef5426d..25d3a0fa1 100644
--- a/apps/builder/src/pages/api/auth/[...nextauth].ts
+++ b/apps/builder/src/pages/api/auth/[...nextauth].ts
@@ -11,9 +11,9 @@ import { NextApiRequest, NextApiResponse } from 'next'
 import { CustomAdapter } from './adapter'
 import { User } from '@typebot.io/prisma'
 import { env, getAtPath, isDefined, isNotEmpty } from '@typebot.io/lib'
-import { mockedUser } from '@/features/auth'
-import { getNewUserInvitations } from '@/features/auth/api'
 import { sendVerificationRequest } from './sendVerificationRequest'
+import { mockedUser } from '@/features/auth/mockedUser'
+import { getNewUserInvitations } from '@/features/auth/helpers/getNewUserInvitations'
 
 const providers: Provider[] = []
 
diff --git a/apps/builder/src/pages/api/auth/adapter.ts b/apps/builder/src/pages/api/auth/adapter.ts
index 5eacb6052..40a1713a8 100644
--- a/apps/builder/src/pages/api/auth/adapter.ts
+++ b/apps/builder/src/pages/api/auth/adapter.ts
@@ -8,14 +8,12 @@ import {
 import type { Adapter, AdapterUser } from 'next-auth/adapters'
 import { createId } from '@paralleldrive/cuid2'
 import { generateId } from '@typebot.io/lib'
-import { parseWorkspaceDefaultPlan } from '@/features/workspace'
-import {
-  getNewUserInvitations,
-  convertInvitationsToCollaborations,
-  joinWorkspaces,
-} from '@/features/auth/api'
 import { sendTelemetryEvents } from '@typebot.io/lib/telemetry/sendTelemetryEvent'
 import { TelemetryEvent } from '@typebot.io/schemas/features/telemetry'
+import { convertInvitationsToCollaborations } from '@/features/auth/helpers/convertInvitationsToCollaborations'
+import { getNewUserInvitations } from '@/features/auth/helpers/getNewUserInvitations'
+import { joinWorkspaces } from '@/features/auth/helpers/joinWorkspaces'
+import { parseWorkspaceDefaultPlan } from '@/features/workspace/helpers/parseWorkspaceDefaultPlan'
 
 export function CustomAdapter(p: PrismaClient): Adapter {
   return {
diff --git a/apps/builder/src/pages/api/credentials.ts b/apps/builder/src/pages/api/credentials.ts
index 29b8a6ba4..8d5b001e3 100644
--- a/apps/builder/src/pages/api/credentials.ts
+++ b/apps/builder/src/pages/api/credentials.ts
@@ -1,7 +1,7 @@
 import prisma from '@/lib/prisma'
 import { Credentials } from '@typebot.io/schemas'
 import { NextApiRequest, NextApiResponse } from 'next'
-import { getAuthenticatedUser } from '@/features/auth/api'
+import { getAuthenticatedUser } from '@/features/auth/helpers/getAuthenticatedUser'
 import {
   badRequest,
   forbidden,
diff --git a/apps/builder/src/pages/api/credentials/[credentialsId].ts b/apps/builder/src/pages/api/credentials/[credentialsId].ts
index 5a1ac0ff3..4ba2c0830 100644
--- a/apps/builder/src/pages/api/credentials/[credentialsId].ts
+++ b/apps/builder/src/pages/api/credentials/[credentialsId].ts
@@ -1,11 +1,11 @@
 import prisma from '@/lib/prisma'
 import { NextApiRequest, NextApiResponse } from 'next'
-import { getAuthenticatedUser } from '@/features/auth/api'
 import {
   badRequest,
   methodNotAllowed,
   notAuthenticated,
 } from '@typebot.io/lib/api'
+import { getAuthenticatedUser } from '@/features/auth/helpers/getAuthenticatedUser'
 
 const handler = async (req: NextApiRequest, res: NextApiResponse) => {
   const user = await getAuthenticatedUser(req)
diff --git a/apps/builder/src/pages/api/credentials/google-sheets/callback.ts b/apps/builder/src/pages/api/credentials/google-sheets/callback.ts
index a18e57033..dd9aaa40b 100644
--- a/apps/builder/src/pages/api/credentials/google-sheets/callback.ts
+++ b/apps/builder/src/pages/api/credentials/google-sheets/callback.ts
@@ -5,7 +5,7 @@ import { googleSheetsScopes } from './consent-url'
 import { stringify } from 'querystring'
 import { badRequest, encrypt, notAuthenticated } from '@typebot.io/lib/api'
 import { oauth2Client } from '@/lib/googleSheets'
-import { getAuthenticatedUser } from '@/features/auth/api'
+import { getAuthenticatedUser } from '@/features/auth/helpers/getAuthenticatedUser'
 
 const handler = async (req: NextApiRequest, res: NextApiResponse) => {
   const user = await getAuthenticatedUser(req)
diff --git a/apps/builder/src/pages/api/customDomains.ts b/apps/builder/src/pages/api/customDomains.ts
index 218b9f09c..b8806d4ad 100644
--- a/apps/builder/src/pages/api/customDomains.ts
+++ b/apps/builder/src/pages/api/customDomains.ts
@@ -2,7 +2,7 @@ import { CustomDomain } from '@typebot.io/prisma'
 import { got, HTTPError } from 'got'
 import prisma from '@/lib/prisma'
 import { NextApiRequest, NextApiResponse } from 'next'
-import { getAuthenticatedUser } from '@/features/auth/api'
+import { getAuthenticatedUser } from '@/features/auth/helpers/getAuthenticatedUser'
 import {
   badRequest,
   forbidden,
diff --git a/apps/builder/src/pages/api/customDomains/[domain].ts b/apps/builder/src/pages/api/customDomains/[domain].ts
index e082318cb..770740623 100644
--- a/apps/builder/src/pages/api/customDomains/[domain].ts
+++ b/apps/builder/src/pages/api/customDomains/[domain].ts
@@ -6,7 +6,7 @@ import {
   notAuthenticated,
 } from '@typebot.io/lib/api'
 import { got } from 'got'
-import { getAuthenticatedUser } from '@/features/auth/api'
+import { getAuthenticatedUser } from '@/features/auth/helpers/getAuthenticatedUser'
 
 const handler = async (req: NextApiRequest, res: NextApiResponse) => {
   const user = await getAuthenticatedUser(req)
diff --git a/apps/builder/src/pages/api/folders.ts b/apps/builder/src/pages/api/folders.ts
index d00c952bf..798dfdc15 100644
--- a/apps/builder/src/pages/api/folders.ts
+++ b/apps/builder/src/pages/api/folders.ts
@@ -6,7 +6,7 @@ import {
   methodNotAllowed,
   notAuthenticated,
 } from '@typebot.io/lib/api'
-import { getAuthenticatedUser } from '@/features/auth/api'
+import { getAuthenticatedUser } from '@/features/auth/helpers/getAuthenticatedUser'
 
 const handler = async (req: NextApiRequest, res: NextApiResponse) => {
   const user = await getAuthenticatedUser(req)
diff --git a/apps/builder/src/pages/api/folders/[id].ts b/apps/builder/src/pages/api/folders/[id].ts
index d2aaa7b35..600a1aa1b 100644
--- a/apps/builder/src/pages/api/folders/[id].ts
+++ b/apps/builder/src/pages/api/folders/[id].ts
@@ -1,8 +1,8 @@
 import { DashboardFolder } from '@typebot.io/prisma'
 import prisma from '@/lib/prisma'
 import { NextApiRequest, NextApiResponse } from 'next'
-import { getAuthenticatedUser } from '@/features/auth/api'
 import { methodNotAllowed, notAuthenticated } from '@typebot.io/lib/api'
+import { getAuthenticatedUser } from '@/features/auth/helpers/getAuthenticatedUser'
 
 const handler = async (req: NextApiRequest, res: NextApiResponse) => {
   const user = await getAuthenticatedUser(req)
diff --git a/apps/builder/src/pages/api/integrations/email/test-config.ts b/apps/builder/src/pages/api/integrations/email/test-config.ts
index cfcf22ae4..95aec8bb2 100644
--- a/apps/builder/src/pages/api/integrations/email/test-config.ts
+++ b/apps/builder/src/pages/api/integrations/email/test-config.ts
@@ -1,6 +1,6 @@
 import { NextApiRequest, NextApiResponse } from 'next'
 import { createTransport } from 'nodemailer'
-import { getAuthenticatedUser } from '@/features/auth/api'
+import { getAuthenticatedUser } from '@/features/auth/helpers/getAuthenticatedUser'
 import { notAuthenticated } from '@typebot.io/lib/api'
 import { SmtpCredentials } from '@typebot.io/schemas'
 
diff --git a/apps/builder/src/pages/api/integrations/google-sheets/spreadsheets.ts b/apps/builder/src/pages/api/integrations/google-sheets/spreadsheets.ts
index bd809bd7f..3938f645e 100644
--- a/apps/builder/src/pages/api/integrations/google-sheets/spreadsheets.ts
+++ b/apps/builder/src/pages/api/integrations/google-sheets/spreadsheets.ts
@@ -7,7 +7,7 @@ import {
   notAuthenticated,
 } from '@typebot.io/lib/api'
 import { setUser } from '@sentry/nextjs'
-import { getAuthenticatedUser } from '@/features/auth/api'
+import { getAuthenticatedUser } from '@/features/auth/helpers/getAuthenticatedUser'
 
 const handler = async (req: NextApiRequest, res: NextApiResponse) => {
   const user = await getAuthenticatedUser(req)
diff --git a/apps/builder/src/pages/api/integrations/google-sheets/spreadsheets/[id]/sheets.ts b/apps/builder/src/pages/api/integrations/google-sheets/spreadsheets/[id]/sheets.ts
index ed60fa783..a0c09505c 100644
--- a/apps/builder/src/pages/api/integrations/google-sheets/spreadsheets/[id]/sheets.ts
+++ b/apps/builder/src/pages/api/integrations/google-sheets/spreadsheets/[id]/sheets.ts
@@ -8,7 +8,7 @@ import {
   notAuthenticated,
 } from '@typebot.io/lib/api'
 import { setUser } from '@sentry/nextjs'
-import { getAuthenticatedUser } from '@/features/auth/api'
+import { getAuthenticatedUser } from '@/features/auth/helpers/getAuthenticatedUser'
 
 const handler = async (req: NextApiRequest, res: NextApiResponse) => {
   const user = await getAuthenticatedUser(req)
diff --git a/apps/builder/src/pages/api/publicIdAvailable.ts b/apps/builder/src/pages/api/publicIdAvailable.ts
index a331d7603..4ba129165 100644
--- a/apps/builder/src/pages/api/publicIdAvailable.ts
+++ b/apps/builder/src/pages/api/publicIdAvailable.ts
@@ -1,7 +1,7 @@
 import prisma from '@/lib/prisma'
 import { NextApiRequest, NextApiResponse } from 'next'
 import { methodNotAllowed, notAuthenticated } from '@typebot.io/lib/api'
-import { getAuthenticatedUser } from '@/features/auth/api'
+import { getAuthenticatedUser } from '@/features/auth/helpers/getAuthenticatedUser'
 
 const handler = async (req: NextApiRequest, res: NextApiResponse) => {
   const user = await getAuthenticatedUser(req)
diff --git a/apps/builder/src/pages/api/publicTypebots.ts b/apps/builder/src/pages/api/publicTypebots.ts
index 9c7c9340d..4b4ca7793 100644
--- a/apps/builder/src/pages/api/publicTypebots.ts
+++ b/apps/builder/src/pages/api/publicTypebots.ts
@@ -1,13 +1,13 @@
 import prisma from '@/lib/prisma'
 import { InputBlockType, PublicTypebot } from '@typebot.io/schemas'
 import { NextApiRequest, NextApiResponse } from 'next'
-import { canPublishFileInput } from '@/utils/api/dbRules'
+import { canPublishFileInput } from '@/helpers/databaseRules'
 import {
   badRequest,
   methodNotAllowed,
   notAuthenticated,
 } from '@typebot.io/lib/api'
-import { getAuthenticatedUser } from '@/features/auth/api'
+import { getAuthenticatedUser } from '@/features/auth/helpers/getAuthenticatedUser'
 import { sendTelemetryEvents } from '@typebot.io/lib/telemetry/sendTelemetryEvent'
 
 const handler = async (req: NextApiRequest, res: NextApiResponse) => {
diff --git a/apps/builder/src/pages/api/publicTypebots/[id].ts b/apps/builder/src/pages/api/publicTypebots/[id].ts
index 37af5af20..b818290aa 100644
--- a/apps/builder/src/pages/api/publicTypebots/[id].ts
+++ b/apps/builder/src/pages/api/publicTypebots/[id].ts
@@ -1,8 +1,8 @@
 import prisma from '@/lib/prisma'
 import { InputBlockType, PublicTypebot } from '@typebot.io/schemas'
 import { NextApiRequest, NextApiResponse } from 'next'
-import { canPublishFileInput, canWriteTypebots } from '@/utils/api/dbRules'
-import { getAuthenticatedUser } from '@/features/auth/api'
+import { canPublishFileInput, canWriteTypebots } from '@/helpers/databaseRules'
+import { getAuthenticatedUser } from '@/features/auth/helpers/getAuthenticatedUser'
 import {
   badRequest,
   methodNotAllowed,
diff --git a/apps/builder/src/pages/api/storage/upload-url.ts b/apps/builder/src/pages/api/storage/upload-url.ts
index e8a53adcf..99604c19b 100644
--- a/apps/builder/src/pages/api/storage/upload-url.ts
+++ b/apps/builder/src/pages/api/storage/upload-url.ts
@@ -1,5 +1,5 @@
 import { NextApiRequest, NextApiResponse } from 'next'
-import { getAuthenticatedUser } from '@/features/auth/api'
+import { getAuthenticatedUser } from '@/features/auth/helpers/getAuthenticatedUser'
 import {
   badRequest,
   generatePresignedUrl,
diff --git a/apps/builder/src/pages/api/stripe/billing-portal.ts b/apps/builder/src/pages/api/stripe/billing-portal.ts
index 6ec399d8d..fdd997a6a 100644
--- a/apps/builder/src/pages/api/stripe/billing-portal.ts
+++ b/apps/builder/src/pages/api/stripe/billing-portal.ts
@@ -6,7 +6,7 @@ import {
   notAuthenticated,
 } from '@typebot.io/lib/api'
 import Stripe from 'stripe'
-import { getAuthenticatedUser } from '@/features/auth/api'
+import { getAuthenticatedUser } from '@/features/auth/helpers/getAuthenticatedUser'
 import prisma from '@/lib/prisma'
 import { WorkspaceRole } from '@typebot.io/prisma'
 
diff --git a/apps/builder/src/pages/api/stripe/custom-plan-checkout.ts b/apps/builder/src/pages/api/stripe/custom-plan-checkout.ts
index 391407308..c940b2f65 100644
--- a/apps/builder/src/pages/api/stripe/custom-plan-checkout.ts
+++ b/apps/builder/src/pages/api/stripe/custom-plan-checkout.ts
@@ -1,7 +1,7 @@
 import { Plan } from '@typebot.io/prisma'
 import prisma from '@/lib/prisma'
 import { NextApiRequest, NextApiResponse } from 'next'
-import { getAuthenticatedUser } from '@/features/auth/api'
+import { getAuthenticatedUser } from '@/features/auth/helpers/getAuthenticatedUser'
 import Stripe from 'stripe'
 import { methodNotAllowed, notAuthenticated } from '@typebot.io/lib/api'
 
diff --git a/apps/builder/src/pages/api/stripe/invoices.ts b/apps/builder/src/pages/api/stripe/invoices.ts
index 74f222b70..2894f3ddc 100644
--- a/apps/builder/src/pages/api/stripe/invoices.ts
+++ b/apps/builder/src/pages/api/stripe/invoices.ts
@@ -6,7 +6,7 @@ import {
   notAuthenticated,
 } from '@typebot.io/lib/api'
 import Stripe from 'stripe'
-import { getAuthenticatedUser } from '@/features/auth/api'
+import { getAuthenticatedUser } from '@/features/auth/helpers/getAuthenticatedUser'
 import prisma from '@/lib/prisma'
 import { WorkspaceRole } from '@typebot.io/prisma'
 
diff --git a/apps/builder/src/pages/api/stripe/subscription.ts b/apps/builder/src/pages/api/stripe/subscription.ts
index 76044b19e..9a4e322a8 100644
--- a/apps/builder/src/pages/api/stripe/subscription.ts
+++ b/apps/builder/src/pages/api/stripe/subscription.ts
@@ -7,7 +7,7 @@ import {
   notAuthenticated,
 } from '@typebot.io/lib/api'
 import Stripe from 'stripe'
-import { getAuthenticatedUser } from '@/features/auth/api'
+import { getAuthenticatedUser } from '@/features/auth/helpers/getAuthenticatedUser'
 import prisma from '@/lib/prisma'
 import { Plan, WorkspaceRole } from '@typebot.io/prisma'
 
diff --git a/apps/builder/src/pages/api/trpc/[trpc].ts b/apps/builder/src/pages/api/trpc/[trpc].ts
index 5332602ea..474221e26 100644
--- a/apps/builder/src/pages/api/trpc/[trpc].ts
+++ b/apps/builder/src/pages/api/trpc/[trpc].ts
@@ -1,5 +1,5 @@
-import { createContext } from '@/utils/server/context'
-import { trpcRouter } from '@/utils/server/routers/v1/trpcRouter'
+import { createContext } from '@/helpers/server/context'
+import { trpcRouter } from '@/helpers/server/routers/v1/trpcRouter'
 import { captureException } from '@sentry/nextjs'
 import { createNextApiHandler } from '@trpc/server/adapters/next'
 
diff --git a/apps/builder/src/pages/api/typebots.ts b/apps/builder/src/pages/api/typebots.ts
index 485a58180..6f9554ef8 100644
--- a/apps/builder/src/pages/api/typebots.ts
+++ b/apps/builder/src/pages/api/typebots.ts
@@ -7,9 +7,11 @@ import {
   notAuthenticated,
   notFound,
 } from '@typebot.io/lib/api'
-import { getAuthenticatedUser } from '@/features/auth/api'
-import { parseNewTypebot } from '@/features/dashboard'
-import { NewTypebotProps } from '@/features/dashboard/api/parseNewTypebot'
+import { getAuthenticatedUser } from '@/features/auth/helpers/getAuthenticatedUser'
+import {
+  NewTypebotProps,
+  parseNewTypebot,
+} from '@/features/dashboard/api/parseNewTypebot'
 import { omit } from '@typebot.io/lib'
 import { sendTelemetryEvents } from '@typebot.io/lib/telemetry/sendTelemetryEvent'
 
diff --git a/apps/builder/src/pages/api/typebots/[typebotId].ts b/apps/builder/src/pages/api/typebots/[typebotId].ts
index 0c75ba466..353a21552 100644
--- a/apps/builder/src/pages/api/typebots/[typebotId].ts
+++ b/apps/builder/src/pages/api/typebots/[typebotId].ts
@@ -2,13 +2,13 @@ import { CollaborationType, Prisma } from '@typebot.io/prisma'
 import prisma from '@/lib/prisma'
 import { NextApiRequest, NextApiResponse } from 'next'
 import { methodNotAllowed, notAuthenticated } from '@typebot.io/lib/api'
-import { getAuthenticatedUser } from '@/features/auth/api'
-import { archiveResults } from '@/features/results/api'
+import { getAuthenticatedUser } from '@/features/auth/helpers/getAuthenticatedUser'
 import { Typebot } from '@typebot.io/schemas'
 import { omit } from '@typebot.io/lib'
-import { getTypebot } from '@/features/typebot/api/utils/getTypebot'
-import { isReadTypebotForbidden } from '@/features/typebot/api/utils/isReadTypebotForbidden'
-import { removeTypebotOldProperties } from '@/features/typebot/api/utils/removeTypebotOldProperties'
+import { getTypebot } from '@/features/typebot/helpers/getTypebot'
+import { archiveResults } from '@/features/results/helpers/archiveResults'
+import { isReadTypebotForbidden } from '@/features/typebot/helpers/isReadTypebotForbidden'
+import { removeTypebotOldProperties } from '@/features/typebot/helpers/removeTypebotOldProperties'
 
 const handler = async (req: NextApiRequest, res: NextApiResponse) => {
   const user = await getAuthenticatedUser(req)
diff --git a/apps/builder/src/pages/api/typebots/[typebotId]/analytics/answersCount.ts b/apps/builder/src/pages/api/typebots/[typebotId]/analytics/answersCount.ts
index 92d9b06b5..035118cc0 100644
--- a/apps/builder/src/pages/api/typebots/[typebotId]/analytics/answersCount.ts
+++ b/apps/builder/src/pages/api/typebots/[typebotId]/analytics/answersCount.ts
@@ -2,8 +2,8 @@ import { PublicTypebot } from '@typebot.io/schemas'
 import prisma from '@/lib/prisma'
 import { NextApiRequest, NextApiResponse } from 'next'
 import { methodNotAllowed, notAuthenticated } from '@typebot.io/lib/api'
-import { getAuthenticatedUser } from '@/features/auth/api'
-import { canReadTypebots } from '@/utils/api/dbRules'
+import { getAuthenticatedUser } from '@/features/auth/helpers/getAuthenticatedUser'
+import { canReadTypebots } from '@/helpers/databaseRules'
 
 const handler = async (req: NextApiRequest, res: NextApiResponse) => {
   const user = await getAuthenticatedUser(req)
diff --git a/apps/builder/src/pages/api/typebots/[typebotId]/analytics/stats.ts b/apps/builder/src/pages/api/typebots/[typebotId]/analytics/stats.ts
index ea2b1974c..6ee1f4dd1 100644
--- a/apps/builder/src/pages/api/typebots/[typebotId]/analytics/stats.ts
+++ b/apps/builder/src/pages/api/typebots/[typebotId]/analytics/stats.ts
@@ -1,8 +1,8 @@
 import prisma from '@/lib/prisma'
 import { Stats } from '@typebot.io/schemas'
 import { NextApiRequest, NextApiResponse } from 'next'
-import { canReadTypebots } from '@/utils/api/dbRules'
-import { getAuthenticatedUser } from '@/features/auth/api'
+import { canReadTypebots } from '@/helpers/databaseRules'
+import { getAuthenticatedUser } from '@/features/auth/helpers/getAuthenticatedUser'
 import { methodNotAllowed, notAuthenticated } from '@typebot.io/lib/api'
 
 const handler = async (req: NextApiRequest, res: NextApiResponse) => {
diff --git a/apps/builder/src/pages/api/typebots/[typebotId]/blocks.ts b/apps/builder/src/pages/api/typebots/[typebotId]/blocks.ts
index fac6600c3..76efa83d6 100644
--- a/apps/builder/src/pages/api/typebots/[typebotId]/blocks.ts
+++ b/apps/builder/src/pages/api/typebots/[typebotId]/blocks.ts
@@ -1,7 +1,7 @@
 import prisma from '@/lib/prisma'
 import { NextApiRequest, NextApiResponse } from 'next'
-import { canReadTypebots } from '@/utils/api/dbRules'
-import { getAuthenticatedUser } from '@/features/auth/api'
+import { canReadTypebots } from '@/helpers/databaseRules'
+import { getAuthenticatedUser } from '@/features/auth/helpers/getAuthenticatedUser'
 import {
   methodNotAllowed,
   notAuthenticated,
diff --git a/apps/builder/src/pages/api/typebots/[typebotId]/collaborators.ts b/apps/builder/src/pages/api/typebots/[typebotId]/collaborators.ts
index 08ac7b55e..495f9ccbf 100644
--- a/apps/builder/src/pages/api/typebots/[typebotId]/collaborators.ts
+++ b/apps/builder/src/pages/api/typebots/[typebotId]/collaborators.ts
@@ -1,7 +1,7 @@
 import prisma from '@/lib/prisma'
 import { NextApiRequest, NextApiResponse } from 'next'
-import { canReadTypebots } from '@/utils/api/dbRules'
-import { getAuthenticatedUser } from '@/features/auth/api'
+import { canReadTypebots } from '@/helpers/databaseRules'
+import { getAuthenticatedUser } from '@/features/auth/helpers/getAuthenticatedUser'
 import { methodNotAllowed, notAuthenticated } from '@typebot.io/lib/api'
 
 const handler = async (req: NextApiRequest, res: NextApiResponse) => {
diff --git a/apps/builder/src/pages/api/typebots/[typebotId]/collaborators/[userId].ts b/apps/builder/src/pages/api/typebots/[typebotId]/collaborators/[userId].ts
index 2aaa1e371..7c3cde417 100644
--- a/apps/builder/src/pages/api/typebots/[typebotId]/collaborators/[userId].ts
+++ b/apps/builder/src/pages/api/typebots/[typebotId]/collaborators/[userId].ts
@@ -1,7 +1,7 @@
 import prisma from '@/lib/prisma'
 import { NextApiRequest, NextApiResponse } from 'next'
-import { canEditGuests } from '@/utils/api/dbRules'
-import { getAuthenticatedUser } from '@/features/auth/api'
+import { canEditGuests } from '@/helpers/databaseRules'
+import { getAuthenticatedUser } from '@/features/auth/helpers/getAuthenticatedUser'
 import { methodNotAllowed, notAuthenticated } from '@typebot.io/lib/api'
 
 const handler = async (req: NextApiRequest, res: NextApiResponse) => {
diff --git a/apps/builder/src/pages/api/typebots/[typebotId]/invitations.ts b/apps/builder/src/pages/api/typebots/[typebotId]/invitations.ts
index 7ffb03abb..45b5fb22c 100644
--- a/apps/builder/src/pages/api/typebots/[typebotId]/invitations.ts
+++ b/apps/builder/src/pages/api/typebots/[typebotId]/invitations.ts
@@ -1,14 +1,14 @@
 import { CollaborationType, WorkspaceRole } from '@typebot.io/prisma'
 import prisma from '@/lib/prisma'
 import { NextApiRequest, NextApiResponse } from 'next'
-import { canReadTypebots, canWriteTypebots } from '@/utils/api/dbRules'
+import { canReadTypebots, canWriteTypebots } from '@/helpers/databaseRules'
 import {
   badRequest,
   forbidden,
   methodNotAllowed,
   notAuthenticated,
 } from '@typebot.io/lib/api'
-import { getAuthenticatedUser } from '@/features/auth/api'
+import { getAuthenticatedUser } from '@/features/auth/helpers/getAuthenticatedUser'
 import { env } from '@typebot.io/lib'
 import { sendGuestInvitationEmail } from '@typebot.io/emails'
 
diff --git a/apps/builder/src/pages/api/typebots/[typebotId]/invitations/[email].ts b/apps/builder/src/pages/api/typebots/[typebotId]/invitations/[email].ts
index 7f06f4430..e3feb5fdb 100644
--- a/apps/builder/src/pages/api/typebots/[typebotId]/invitations/[email].ts
+++ b/apps/builder/src/pages/api/typebots/[typebotId]/invitations/[email].ts
@@ -1,8 +1,8 @@
 import { Invitation } from '@typebot.io/prisma'
 import prisma from '@/lib/prisma'
 import { NextApiRequest, NextApiResponse } from 'next'
-import { canEditGuests } from '@/utils/api/dbRules'
-import { getAuthenticatedUser } from '@/features/auth/api'
+import { canEditGuests } from '@/helpers/databaseRules'
+import { getAuthenticatedUser } from '@/features/auth/helpers/getAuthenticatedUser'
 import { methodNotAllowed, notAuthenticated } from '@typebot.io/lib/api'
 
 const handler = async (req: NextApiRequest, res: NextApiResponse) => {
diff --git a/apps/builder/src/pages/api/typebots/[typebotId]/webhooks.ts b/apps/builder/src/pages/api/typebots/[typebotId]/webhooks.ts
index 65d7c88df..b0d2de9a9 100644
--- a/apps/builder/src/pages/api/typebots/[typebotId]/webhooks.ts
+++ b/apps/builder/src/pages/api/typebots/[typebotId]/webhooks.ts
@@ -1,13 +1,13 @@
 import prisma from '@/lib/prisma'
 import { defaultWebhookAttributes, Webhook } from '@typebot.io/schemas'
 import { NextApiRequest, NextApiResponse } from 'next'
-import { getAuthenticatedUser } from '@/features/auth/api'
+import { getAuthenticatedUser } from '@/features/auth/helpers/getAuthenticatedUser'
 import {
   methodNotAllowed,
   notAuthenticated,
   notFound,
 } from '@typebot.io/lib/api'
-import { getTypebot } from '@/features/typebot/api/utils/getTypebot'
+import { getTypebot } from '@/features/typebot/helpers/getTypebot'
 
 const handler = async (req: NextApiRequest, res: NextApiResponse) => {
   const user = await getAuthenticatedUser(req)
diff --git a/apps/builder/src/pages/api/typebots/[typebotId]/webhooks/[webhookId].ts b/apps/builder/src/pages/api/typebots/[typebotId]/webhooks/[webhookId].ts
index 616b5b644..35387387b 100644
--- a/apps/builder/src/pages/api/typebots/[typebotId]/webhooks/[webhookId].ts
+++ b/apps/builder/src/pages/api/typebots/[typebotId]/webhooks/[webhookId].ts
@@ -1,7 +1,7 @@
 import prisma from '@/lib/prisma'
 import { Webhook } from '@typebot.io/schemas'
 import { NextApiRequest, NextApiResponse } from 'next'
-import { getAuthenticatedUser } from '@/features/auth/api'
+import { getAuthenticatedUser } from '@/features/auth/helpers/getAuthenticatedUser'
 import {
   badRequest,
   forbidden,
@@ -9,7 +9,7 @@ import {
   notAuthenticated,
   notFound,
 } from '@typebot.io/lib/api'
-import { getTypebot } from '@/features/typebot/api/utils/getTypebot'
+import { getTypebot } from '@/features/typebot/helpers/getTypebot'
 import { omit } from '@typebot.io/lib'
 
 const handler = async (req: NextApiRequest, res: NextApiResponse) => {
diff --git a/apps/builder/src/pages/api/users/[userId].ts b/apps/builder/src/pages/api/users/[userId].ts
index 2cdd8df5a..fe1e5b619 100644
--- a/apps/builder/src/pages/api/users/[userId].ts
+++ b/apps/builder/src/pages/api/users/[userId].ts
@@ -1,6 +1,6 @@
 import prisma from '@/lib/prisma'
 import { NextApiRequest, NextApiResponse } from 'next'
-import { getAuthenticatedUser } from '@/features/auth/api'
+import { getAuthenticatedUser } from '@/features/auth/helpers/getAuthenticatedUser'
 import { methodNotAllowed, notAuthenticated } from '@typebot.io/lib/api'
 import { User } from '@typebot.io/prisma'
 
diff --git a/apps/builder/src/pages/api/users/[userId]/api-tokens.ts b/apps/builder/src/pages/api/users/[userId]/api-tokens.ts
index 1ff46cfac..6b4ac0932 100644
--- a/apps/builder/src/pages/api/users/[userId]/api-tokens.ts
+++ b/apps/builder/src/pages/api/users/[userId]/api-tokens.ts
@@ -1,6 +1,6 @@
 import prisma from '@/lib/prisma'
 import { NextApiRequest, NextApiResponse } from 'next'
-import { getAuthenticatedUser } from '@/features/auth/api'
+import { getAuthenticatedUser } from '@/features/auth/helpers/getAuthenticatedUser'
 import { generateId } from '@typebot.io/lib'
 import { methodNotAllowed, notAuthenticated } from '@typebot.io/lib/api'
 
diff --git a/apps/builder/src/pages/api/users/[userId]/api-tokens/[tokenId].ts b/apps/builder/src/pages/api/users/[userId]/api-tokens/[tokenId].ts
index db711dff8..98bb8b277 100644
--- a/apps/builder/src/pages/api/users/[userId]/api-tokens/[tokenId].ts
+++ b/apps/builder/src/pages/api/users/[userId]/api-tokens/[tokenId].ts
@@ -1,6 +1,6 @@
 import prisma from '@/lib/prisma'
 import { NextApiRequest, NextApiResponse } from 'next'
-import { getAuthenticatedUser } from '@/features/auth/api'
+import { getAuthenticatedUser } from '@/features/auth/helpers/getAuthenticatedUser'
 import { methodNotAllowed, notAuthenticated } from '@typebot.io/lib/api'
 
 const handler = async (req: NextApiRequest, res: NextApiResponse) => {
diff --git a/apps/builder/src/pages/api/v1/[...trpc].ts b/apps/builder/src/pages/api/v1/[...trpc].ts
index dbe2cbe92..1895c9228 100644
--- a/apps/builder/src/pages/api/v1/[...trpc].ts
+++ b/apps/builder/src/pages/api/v1/[...trpc].ts
@@ -1,5 +1,5 @@
-import { createContext } from '@/utils/server/context'
-import { trpcRouter } from '@/utils/server/routers/v1/trpcRouter'
+import { createContext } from '@/helpers/server/context'
+import { trpcRouter } from '@/helpers/server/routers/v1/trpcRouter'
 import { captureException } from '@sentry/nextjs'
 import { NextApiRequest, NextApiResponse } from 'next'
 import { createOpenApiNextHandler } from 'trpc-openapi'
diff --git a/apps/builder/src/pages/api/workspaces/[workspaceId]/invitations.ts b/apps/builder/src/pages/api/workspaces/[workspaceId]/invitations.ts
index 2843abf70..ce1fe0348 100644
--- a/apps/builder/src/pages/api/workspaces/[workspaceId]/invitations.ts
+++ b/apps/builder/src/pages/api/workspaces/[workspaceId]/invitations.ts
@@ -6,7 +6,7 @@ import {
   methodNotAllowed,
   notAuthenticated,
 } from '@typebot.io/lib/api'
-import { getAuthenticatedUser } from '@/features/auth/api'
+import { getAuthenticatedUser } from '@/features/auth/helpers/getAuthenticatedUser'
 import { sendWorkspaceMemberInvitationEmail } from '@typebot.io/emails'
 import { env } from '@typebot.io/lib'
 import { isSeatsLimitReached } from '@typebot.io/lib/pricing'
diff --git a/apps/builder/src/pages/api/workspaces/[workspaceId]/invitations/[id].ts b/apps/builder/src/pages/api/workspaces/[workspaceId]/invitations/[id].ts
index e613e4c6d..8b4239563 100644
--- a/apps/builder/src/pages/api/workspaces/[workspaceId]/invitations/[id].ts
+++ b/apps/builder/src/pages/api/workspaces/[workspaceId]/invitations/[id].ts
@@ -1,7 +1,7 @@
 import { WorkspaceInvitation, WorkspaceRole } from '@typebot.io/prisma'
 import prisma from '@/lib/prisma'
 import { NextApiRequest, NextApiResponse } from 'next'
-import { getAuthenticatedUser } from '@/features/auth/api'
+import { getAuthenticatedUser } from '@/features/auth/helpers/getAuthenticatedUser'
 import { methodNotAllowed, notAuthenticated } from '@typebot.io/lib/api'
 
 const handler = async (req: NextApiRequest, res: NextApiResponse) => {
diff --git a/apps/builder/src/pages/api/workspaces/[workspaceId]/members.ts b/apps/builder/src/pages/api/workspaces/[workspaceId]/members.ts
index eded4f163..c61bd6845 100644
--- a/apps/builder/src/pages/api/workspaces/[workspaceId]/members.ts
+++ b/apps/builder/src/pages/api/workspaces/[workspaceId]/members.ts
@@ -1,6 +1,6 @@
 import prisma from '@/lib/prisma'
 import { NextApiRequest, NextApiResponse } from 'next'
-import { getAuthenticatedUser } from '@/features/auth/api'
+import { getAuthenticatedUser } from '@/features/auth/helpers/getAuthenticatedUser'
 import {
   methodNotAllowed,
   notAuthenticated,
diff --git a/apps/builder/src/pages/api/workspaces/[workspaceId]/members/[id].ts b/apps/builder/src/pages/api/workspaces/[workspaceId]/members/[id].ts
index 35a659bd9..97005b51d 100644
--- a/apps/builder/src/pages/api/workspaces/[workspaceId]/members/[id].ts
+++ b/apps/builder/src/pages/api/workspaces/[workspaceId]/members/[id].ts
@@ -1,7 +1,7 @@
 import { MemberInWorkspace, WorkspaceRole } from '@typebot.io/prisma'
 import prisma from '@/lib/prisma'
 import { NextApiRequest, NextApiResponse } from 'next'
-import { getAuthenticatedUser } from '@/features/auth/api'
+import { getAuthenticatedUser } from '@/features/auth/helpers/getAuthenticatedUser'
 import { methodNotAllowed, notAuthenticated } from '@typebot.io/lib/api'
 
 const handler = async (req: NextApiRequest, res: NextApiResponse) => {
diff --git a/apps/builder/src/pages/api/workspaces/[workspaceId]/usage.ts b/apps/builder/src/pages/api/workspaces/[workspaceId]/usage.ts
index e03e05108..61b0a1492 100644
--- a/apps/builder/src/pages/api/workspaces/[workspaceId]/usage.ts
+++ b/apps/builder/src/pages/api/workspaces/[workspaceId]/usage.ts
@@ -1,6 +1,6 @@
 import prisma from '@/lib/prisma'
 import { NextApiRequest, NextApiResponse } from 'next'
-import { getAuthenticatedUser } from '@/features/auth/api'
+import { getAuthenticatedUser } from '@/features/auth/helpers/getAuthenticatedUser'
 import { methodNotAllowed, notAuthenticated } from '@typebot.io/lib/api'
 
 // TODO: Delete
diff --git a/apps/builder/src/pages/register.tsx b/apps/builder/src/pages/register.tsx
index e36cd1e9a..fc9201310 100644
--- a/apps/builder/src/pages/register.tsx
+++ b/apps/builder/src/pages/register.tsx
@@ -1,4 +1,4 @@
-import { SignInPage } from '@/features/auth'
+import { SignInPage } from '@/features/auth/components/SignInPage'
 
 export default function Page() {
   return <SignInPage type="signin" />
diff --git a/apps/builder/src/pages/signin.tsx b/apps/builder/src/pages/signin.tsx
index e36cd1e9a..fc9201310 100644
--- a/apps/builder/src/pages/signin.tsx
+++ b/apps/builder/src/pages/signin.tsx
@@ -1,4 +1,4 @@
-import { SignInPage } from '@/features/auth'
+import { SignInPage } from '@/features/auth/components/SignInPage'
 
 export default function Page() {
   return <SignInPage type="signin" />
diff --git a/apps/builder/src/pages/typebots.tsx b/apps/builder/src/pages/typebots.tsx
index f3ca5a438..a388ccfed 100644
--- a/apps/builder/src/pages/typebots.tsx
+++ b/apps/builder/src/pages/typebots.tsx
@@ -1,4 +1,4 @@
-import { DashboardPage } from '@/features/dashboard'
+import { DashboardPage } from '@/features/dashboard/components/DashboardPage'
 import { getLocaleProps } from '@/locales'
 import { GetServerSidePropsContext } from 'next'
 
diff --git a/apps/builder/src/pages/typebots/[typebotId]/edit.tsx b/apps/builder/src/pages/typebots/[typebotId]/edit.tsx
index 59c034eba..a80a431d9 100644
--- a/apps/builder/src/pages/typebots/[typebotId]/edit.tsx
+++ b/apps/builder/src/pages/typebots/[typebotId]/edit.tsx
@@ -1,4 +1,4 @@
-import { EditorPage } from '@/features/editor'
+import { EditorPage } from '@/features/editor/components/EditorPage'
 
 export default function Page() {
   return <EditorPage />
diff --git a/apps/builder/src/pages/typebots/[typebotId]/results.tsx b/apps/builder/src/pages/typebots/[typebotId]/results.tsx
index 8a32f3fa4..c66f1ce78 100644
--- a/apps/builder/src/pages/typebots/[typebotId]/results.tsx
+++ b/apps/builder/src/pages/typebots/[typebotId]/results.tsx
@@ -1,4 +1,4 @@
-import { ResultsPage } from '@/features/results'
+import { ResultsPage } from '@/features/results/components/ResultsPage'
 
 export default function Page() {
   return <ResultsPage />
diff --git a/apps/builder/src/pages/typebots/[typebotId]/settings.tsx b/apps/builder/src/pages/typebots/[typebotId]/settings.tsx
index a6341ba6b..ccc43e66b 100644
--- a/apps/builder/src/pages/typebots/[typebotId]/settings.tsx
+++ b/apps/builder/src/pages/typebots/[typebotId]/settings.tsx
@@ -1,4 +1,4 @@
-import { SettingsPage } from '@/features/settings'
+import { SettingsPage } from '@/features/settings/components/SettingsPage'
 
 export default function Page() {
   return <SettingsPage />
diff --git a/apps/builder/src/pages/typebots/[typebotId]/share.tsx b/apps/builder/src/pages/typebots/[typebotId]/share.tsx
index 94fe432dd..6219c671d 100644
--- a/apps/builder/src/pages/typebots/[typebotId]/share.tsx
+++ b/apps/builder/src/pages/typebots/[typebotId]/share.tsx
@@ -1,4 +1,4 @@
-import { SharePage } from '@/features/publish'
+import { SharePage } from '@/features/publish/components/SharePage'
 
 export default function Page() {
   return <SharePage />
diff --git a/apps/builder/src/pages/typebots/[typebotId]/theme.tsx b/apps/builder/src/pages/typebots/[typebotId]/theme.tsx
index 622b3f5ae..269b8d2b7 100644
--- a/apps/builder/src/pages/typebots/[typebotId]/theme.tsx
+++ b/apps/builder/src/pages/typebots/[typebotId]/theme.tsx
@@ -1,4 +1,4 @@
-import { ThemePage } from '@/features/theme'
+import { ThemePage } from '@/features/theme/components/ThemePage'
 
 export default function Page() {
   return <ThemePage />
diff --git a/apps/builder/src/pages/typebots/create.tsx b/apps/builder/src/pages/typebots/create.tsx
index 6f4b9c01b..2c27b5fba 100644
--- a/apps/builder/src/pages/typebots/create.tsx
+++ b/apps/builder/src/pages/typebots/create.tsx
@@ -1,4 +1,4 @@
-import { TemplatesPage } from '@/features/templates'
+import { TemplatesPage } from '@/features/templates/components/TemplatesPage'
 
 export default function Page() {
   return <TemplatesPage />
diff --git a/apps/builder/src/pages/typebots/folders/[id].tsx b/apps/builder/src/pages/typebots/folders/[id].tsx
index 2fc043109..78efc6be4 100644
--- a/apps/builder/src/pages/typebots/folders/[id].tsx
+++ b/apps/builder/src/pages/typebots/folders/[id].tsx
@@ -1,4 +1,4 @@
-import { FolderPage } from '@/features/folders'
+import { FolderPage } from '@/features/folders/components/FolderPage'
 
 export default function Page() {
   return <FolderPage />
diff --git a/apps/builder/src/utils/helpers.ts b/apps/builder/src/utils/helpers.ts
deleted file mode 100644
index 3c6a2e072..000000000
--- a/apps/builder/src/utils/helpers.ts
+++ /dev/null
@@ -1,112 +0,0 @@
-import imageCompression from 'browser-image-compression'
-import { Block, Typebot } from '@typebot.io/schemas'
-
-export const fetcher = async (input: RequestInfo, init?: RequestInit) => {
-  const res = await fetch(input, init)
-  return res.json()
-}
-
-export const isMobile =
-  typeof window !== 'undefined' &&
-  window.matchMedia('only screen and (max-width: 760px)').matches
-
-export const preventUserFromRefreshing = (e: BeforeUnloadEvent) => {
-  e.preventDefault()
-  e.returnValue = ''
-}
-
-export const toKebabCase = (value: string) => {
-  const matched = value.match(
-    /[A-Z]{2,}(?=[A-Z][a-z]+[0-9]*|\b)|[A-Z]?[a-z]+[0-9]*|[A-Z]|[0-9]+/g
-  )
-  if (!matched) return ''
-  return matched.map((x) => x.toLowerCase()).join('-')
-}
-
-export const compressFile = async (file: File) => {
-  const options = {
-    maxSizeMB: 0.5,
-    maxWidthOrHeight: 1600,
-  }
-  return ['image/jpg', 'image/jpeg', 'image/png'].includes(file.type)
-    ? imageCompression(file, options)
-    : file
-}
-
-export const removeUndefinedFields = <T extends Record<string, unknown>>(
-  obj: T
-): T =>
-  Object.keys(obj).reduce(
-    (acc, key) =>
-      obj[key as keyof T] === undefined
-        ? { ...acc }
-        : { ...acc, [key]: obj[key as keyof T] },
-    {} as T
-  )
-
-export const blockHasOptions = (block: Block) => 'options' in block
-
-export const parseVariableHighlight = (content: string, typebot: Typebot) => {
-  const varNames = typebot.variables.map((v) => v.name)
-  return content.replace(/\{\{(.*?)\}\}/g, (fullMatch, foundVar) => {
-    if (content.includes(`href="{{${foundVar}}}"`)) return fullMatch
-    if (varNames.some((val) => foundVar === val)) {
-      return `<span style="background-color:#ff8b1a; color:#ffffff; padding: 0.125rem 0.25rem; border-radius: 0.35rem">${fullMatch.replace(
-        /{{|}}/g,
-        ''
-      )}</span>`
-    }
-    return fullMatch
-  })
-}
-
-export const setMultipleRefs =
-  (refs: React.MutableRefObject<HTMLDivElement | null>[]) =>
-  (elem: HTMLDivElement) =>
-    refs.forEach((ref) => (ref.current = elem))
-
-export const readFile = (file: File): Promise<string> => {
-  return new Promise((resolve, reject) => {
-    const fr = new FileReader()
-    fr.onload = () => {
-      fr.result && resolve(fr.result.toString())
-    }
-    fr.onerror = reject
-    fr.readAsText(file)
-  })
-}
-
-export const timeSince = (date: string) => {
-  const seconds = Math.floor(
-    (new Date().getTime() - new Date(date).getTime()) / 1000
-  )
-
-  let interval = seconds / 31536000
-
-  if (interval > 1) {
-    return Math.floor(interval) + ' years'
-  }
-  interval = seconds / 2592000
-  if (interval > 1) {
-    return Math.floor(interval) + ' months'
-  }
-  interval = seconds / 86400
-  if (interval > 1) {
-    return Math.floor(interval) + 'd'
-  }
-  interval = seconds / 3600
-  if (interval > 1) {
-    return Math.floor(interval) + 'h'
-  }
-  interval = seconds / 60
-  if (interval > 1) {
-    return Math.floor(interval) + 'm'
-  }
-  return Math.floor(seconds) + 's'
-}
-
-export const isCloudProdInstance =
-  typeof window !== 'undefined' && window.location.hostname === 'app.typebot.io'
-
-export const numberWithCommas = (x: number) =>
-  x.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ',')
diff --git a/apps/docs/package.json b/apps/docs/package.json
index e0fbc7858..4cc9df721 100644
--- a/apps/docs/package.json
+++ b/apps/docs/package.json
@@ -13,7 +13,7 @@
     "write-translations": "docusaurus write-translations",
     "write-heading-ids": "docusaurus write-heading-ids",
     "update-search": "docker run -it --rm --env-file=.env -e \"CONFIG=$(cat docsearch-scrapper-config.json | jq -r tostring)\" algolia/docsearch-scraper",
-    "api:generate": "tsx --tsconfig ../builder/tsconfig.json ../builder/src/utils/server/generateOpenApi.ts && tsx --tsconfig ../viewer/openapi.tsconfig.json ../viewer/src/utils/server/generateOpenApi.ts"
+    "api:generate": "tsx --tsconfig ../builder/tsconfig.json ../builder/src/helpers/server/generateOpenApi.ts && tsx --tsconfig ../viewer/openapi.tsconfig.json ../viewer/src/utils/server/generateOpenApi.ts"
   },
   "dependencies": {
     "@docusaurus/core": "2.3.1",
diff --git a/packages/deprecated/bot-engine/src/components/TypebotViewer.tsx b/packages/deprecated/bot-engine/src/components/TypebotViewer.tsx
index d42c2b863..bc0a19788 100644
--- a/packages/deprecated/bot-engine/src/components/TypebotViewer.tsx
+++ b/packages/deprecated/bot-engine/src/components/TypebotViewer.tsx
@@ -20,7 +20,6 @@ export type TypebotViewerProps = {
   typebot: Omit<PublicTypebot, 'updatedAt' | 'createdAt'>
   isPreview?: boolean
   apiHost?: string
-  style?: CSSProperties
   predefinedVariables?: { [key: string]: string | undefined }
   resultId?: string
   startGroupId?: string
@@ -39,7 +38,6 @@ export const TypebotViewer = ({
   apiHost = getViewerUrl(),
   isPreview = false,
   isLoading = false,
-  style,
   resultId,
   startGroupId,
   predefinedVariables,