diff --git a/.github/workflows/auto-create-tags.yml b/.github/workflows/auto-create-tags.yml
index fb0c9fa2e..120679627 100644
--- a/.github/workflows/auto-create-tags.yml
+++ b/.github/workflows/auto-create-tags.yml
@@ -25,11 +25,11 @@ jobs:
       - name: 'Create js tag'
         uses: Klemensas/action-autotag@stable
         with:
-          package_root: '/packages/js'
+          package_root: '/packages/embeds/js'
           tag_prefix: 'js-v'
 
       - name: 'Create react tag'
         uses: Klemensas/action-autotag@stable
         with:
-          package_root: '/packages/react'
+          package_root: '/packages/embeds/react'
           tag_prefix: 'react-v'
diff --git a/.github/workflows/publish-typebot-js.yml b/.github/workflows/publish-typebot-js.yml
index d41dc16ac..b3f7904d8 100644
--- a/.github/workflows/publish-typebot-js.yml
+++ b/.github/workflows/publish-typebot-js.yml
@@ -15,4 +15,4 @@ jobs:
       - uses: pnpm/action-setup@v2.2.2
       - run: pnpm i --frozen-lockfile
       - run: pnpm turbo build --filter=@typebot.io/js...
-      - run: cd packages/js && pnpm publish --no-git-checks --access public
+      - run: cd packages/embeds/js && pnpm publish --no-git-checks --access public
diff --git a/.github/workflows/publish-typebot-react.yml b/.github/workflows/publish-typebot-react.yml
index 0ea2a969b..8f6858d03 100644
--- a/.github/workflows/publish-typebot-react.yml
+++ b/.github/workflows/publish-typebot-react.yml
@@ -15,4 +15,4 @@ jobs:
       - uses: pnpm/action-setup@v2.2.2
       - run: pnpm i --frozen-lockfile
       - run: pnpm turbo build --filter=@typebot.io/react...
-      - run: cd packages/react && pnpm publish --no-git-checks --access public
+      - run: cd packages/embeds/react && pnpm publish --no-git-checks --access public
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 cdbdc99e1..a80af49ef 100644
--- a/apps/builder/src/features/blocks/inputs/buttons/components/ButtonsBlockNode.tsx
+++ b/apps/builder/src/features/blocks/inputs/buttons/components/ButtonsBlockNode.tsx
@@ -3,7 +3,7 @@ import React from 'react'
 import { Stack, Tag, Text, Wrap } from '@chakra-ui/react'
 import { useTypebot } from '@/features/editor/providers/TypebotProvider'
 import { SetVariableLabel } from '@/components/SetVariableLabel'
-import { ItemNodesList } from '@/features/graph/components/nodes/item/ItemNodesList'
+import { ItemNodesList } from '@/features/graph/components/nodes-tmp/item/ItemNodesList'
 
 type Props = {
   block: ChoiceInputBlock
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 a2c42757f..d8bd5f28c 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/block/WithVariableContent'
+import { WithVariableContent } from '@/features/graph/components/nodes-tmp/block/WithVariableContent'
 
 type Props = {
   variableId?: string
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 e360a3915..8c70317fa 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/block/WithVariableContent'
+import { WithVariableContent } from '@/features/graph/components/nodes-tmp/block/WithVariableContent'
 
 type Props = {
   variableId?: string
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 85515beb5..6d4cadc35 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/block/WithVariableContent'
+import { WithVariableContent } from '@/features/graph/components/nodes-tmp/block/WithVariableContent'
 import { Text } from '@chakra-ui/react'
 import { FileInputOptions } from '@typebot.io/schemas'
 
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 87cc45b74..82341b4ba 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/block/WithVariableContent'
+import { WithVariableContent } from '@/features/graph/components/nodes-tmp/block/WithVariableContent'
 
 type Props = {
   variableId?: 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 f93f4cca6..22097cbd5 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/block/WithVariableContent'
+import { WithVariableContent } from '@/features/graph/components/nodes-tmp/block/WithVariableContent'
 
 type Props = {
   variableId?: string
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 af6276260..83e9989fe 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/block/WithVariableContent'
+import { WithVariableContent } from '@/features/graph/components/nodes-tmp/block/WithVariableContent'
 import { Text } from '@chakra-ui/react'
 import { RatingInputBlock } from '@typebot.io/schemas'
 
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 7a8d2c221..f920f6c81 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/block/WithVariableContent'
+import { WithVariableContent } from '@/features/graph/components/nodes-tmp/block/WithVariableContent'
 
 type Props = {
   placeholder: TextInputOptions['labels']['placeholder']
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 6d5ceffb5..a59bd300b 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/block/WithVariableContent'
+import { WithVariableContent } from '@/features/graph/components/nodes-tmp/block/WithVariableContent'
 
 type Props = {
   variableId?: string
diff --git a/apps/builder/src/features/graph/components/GraphElements.tsx b/apps/builder/src/features/graph/components/GraphElements.tsx
index ee31c5110..b966317c0 100644
--- a/apps/builder/src/features/graph/components/GraphElements.tsx
+++ b/apps/builder/src/features/graph/components/GraphElements.tsx
@@ -2,8 +2,8 @@ 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/Edges'
-import { GroupNode } from './nodes/group'
+import { Edges } from './edges-tmp/Edges'
+import { GroupNode } from './nodes-tmp/group'
 
 type Props = {
   edges: Edge[]
diff --git a/apps/builder/src/features/graph/components/Edges/DrawingEdge.tsx b/apps/builder/src/features/graph/components/edges-tmp/DrawingEdge.tsx
similarity index 100%
rename from apps/builder/src/features/graph/components/Edges/DrawingEdge.tsx
rename to apps/builder/src/features/graph/components/edges-tmp/DrawingEdge.tsx
diff --git a/apps/builder/src/features/graph/components/Edges/DropOffEdge.tsx b/apps/builder/src/features/graph/components/edges-tmp/DropOffEdge.tsx
similarity index 100%
rename from apps/builder/src/features/graph/components/Edges/DropOffEdge.tsx
rename to apps/builder/src/features/graph/components/edges-tmp/DropOffEdge.tsx
diff --git a/apps/builder/src/features/graph/components/Edges/Edge.tsx b/apps/builder/src/features/graph/components/edges-tmp/Edge.tsx
similarity index 100%
rename from apps/builder/src/features/graph/components/Edges/Edge.tsx
rename to apps/builder/src/features/graph/components/edges-tmp/Edge.tsx
diff --git a/apps/builder/src/features/graph/components/Edges/EdgeMenu.tsx b/apps/builder/src/features/graph/components/edges-tmp/EdgeMenu.tsx
similarity index 100%
rename from apps/builder/src/features/graph/components/Edges/EdgeMenu.tsx
rename to apps/builder/src/features/graph/components/edges-tmp/EdgeMenu.tsx
diff --git a/apps/builder/src/features/graph/components/Edges/Edges.tsx b/apps/builder/src/features/graph/components/edges-tmp/Edges.tsx
similarity index 100%
rename from apps/builder/src/features/graph/components/Edges/Edges.tsx
rename to apps/builder/src/features/graph/components/edges-tmp/Edges.tsx
diff --git a/apps/builder/src/features/graph/components/Endpoints/SourceEndpoint.tsx b/apps/builder/src/features/graph/components/endpoints-tmp/SourceEndpoint.tsx
similarity index 100%
rename from apps/builder/src/features/graph/components/Endpoints/SourceEndpoint.tsx
rename to apps/builder/src/features/graph/components/endpoints-tmp/SourceEndpoint.tsx
diff --git a/apps/builder/src/features/graph/components/Endpoints/TargetEndpoint.tsx b/apps/builder/src/features/graph/components/endpoints-tmp/TargetEndpoint.tsx
similarity index 100%
rename from apps/builder/src/features/graph/components/Endpoints/TargetEndpoint.tsx
rename to apps/builder/src/features/graph/components/endpoints-tmp/TargetEndpoint.tsx
diff --git a/apps/builder/src/features/graph/components/Nodes/PlaceholderNode.tsx b/apps/builder/src/features/graph/components/nodes-tmp/PlaceholderNode.tsx
similarity index 100%
rename from apps/builder/src/features/graph/components/Nodes/PlaceholderNode.tsx
rename to apps/builder/src/features/graph/components/nodes-tmp/PlaceholderNode.tsx
diff --git a/apps/builder/src/features/graph/components/Nodes/block/BlockNode.tsx b/apps/builder/src/features/graph/components/nodes-tmp/block/BlockNode.tsx
similarity index 98%
rename from apps/builder/src/features/graph/components/Nodes/block/BlockNode.tsx
rename to apps/builder/src/features/graph/components/nodes-tmp/block/BlockNode.tsx
index 0a8d45a81..0fa77e07b 100644
--- a/apps/builder/src/features/graph/components/Nodes/block/BlockNode.tsx
+++ b/apps/builder/src/features/graph/components/nodes-tmp/block/BlockNode.tsx
@@ -21,7 +21,7 @@ import { isBubbleBlock, isDefined, isTextBubbleBlock } from '@typebot.io/lib'
 import { BlockNodeContent } from './BlockNodeContent'
 import { BlockSettings, SettingsPopoverContent } from './SettingsPopoverContent'
 import { BlockNodeContextMenu } from './BlockNodeContextMenu'
-import { SourceEndpoint } from '../../endpoints/SourceEndpoint'
+import { SourceEndpoint } from '../../endpoints-tmp/SourceEndpoint'
 import { useRouter } from 'next/router'
 import { MediaBubblePopoverContent } from './MediaBubblePopoverContent'
 import { ContextMenu } from '@/components/ContextMenu'
@@ -37,7 +37,7 @@ 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 { TargetEndpoint } from '../../endpoints-tmp/TargetEndpoint'
 import { SettingsModal } from './SettingsModal'
 
 export const BlockNode = ({
diff --git a/apps/builder/src/features/graph/components/Nodes/block/BlockNodeContent.tsx b/apps/builder/src/features/graph/components/nodes-tmp/block/BlockNodeContent.tsx
similarity index 100%
rename from apps/builder/src/features/graph/components/Nodes/block/BlockNodeContent.tsx
rename to apps/builder/src/features/graph/components/nodes-tmp/block/BlockNodeContent.tsx
diff --git a/apps/builder/src/features/graph/components/Nodes/block/BlockNodeContextMenu.tsx b/apps/builder/src/features/graph/components/nodes-tmp/block/BlockNodeContextMenu.tsx
similarity index 100%
rename from apps/builder/src/features/graph/components/Nodes/block/BlockNodeContextMenu.tsx
rename to apps/builder/src/features/graph/components/nodes-tmp/block/BlockNodeContextMenu.tsx
diff --git a/apps/builder/src/features/graph/components/Nodes/block/BlockNodeOverlay.tsx b/apps/builder/src/features/graph/components/nodes-tmp/block/BlockNodeOverlay.tsx
similarity index 100%
rename from apps/builder/src/features/graph/components/Nodes/block/BlockNodeOverlay.tsx
rename to apps/builder/src/features/graph/components/nodes-tmp/block/BlockNodeOverlay.tsx
diff --git a/apps/builder/src/features/graph/components/Nodes/block/BlockNodesList.tsx b/apps/builder/src/features/graph/components/nodes-tmp/block/BlockNodesList.tsx
similarity index 100%
rename from apps/builder/src/features/graph/components/Nodes/block/BlockNodesList.tsx
rename to apps/builder/src/features/graph/components/nodes-tmp/block/BlockNodesList.tsx
diff --git a/apps/builder/src/features/graph/components/Nodes/block/HelpDocButton.tsx b/apps/builder/src/features/graph/components/nodes-tmp/block/HelpDocButton.tsx
similarity index 100%
rename from apps/builder/src/features/graph/components/Nodes/block/HelpDocButton.tsx
rename to apps/builder/src/features/graph/components/nodes-tmp/block/HelpDocButton.tsx
diff --git a/apps/builder/src/features/graph/components/Nodes/block/MediaBubblePopoverContent.tsx b/apps/builder/src/features/graph/components/nodes-tmp/block/MediaBubblePopoverContent.tsx
similarity index 100%
rename from apps/builder/src/features/graph/components/Nodes/block/MediaBubblePopoverContent.tsx
rename to apps/builder/src/features/graph/components/nodes-tmp/block/MediaBubblePopoverContent.tsx
diff --git a/apps/builder/src/features/graph/components/Nodes/block/SettingsModal.tsx b/apps/builder/src/features/graph/components/nodes-tmp/block/SettingsModal.tsx
similarity index 100%
rename from apps/builder/src/features/graph/components/Nodes/block/SettingsModal.tsx
rename to apps/builder/src/features/graph/components/nodes-tmp/block/SettingsModal.tsx
diff --git a/apps/builder/src/features/graph/components/Nodes/block/SettingsPopoverContent.tsx b/apps/builder/src/features/graph/components/nodes-tmp/block/SettingsPopoverContent.tsx
similarity index 100%
rename from apps/builder/src/features/graph/components/Nodes/block/SettingsPopoverContent.tsx
rename to apps/builder/src/features/graph/components/nodes-tmp/block/SettingsPopoverContent.tsx
diff --git a/apps/builder/src/features/graph/components/Nodes/block/WithVariableContent.tsx b/apps/builder/src/features/graph/components/nodes-tmp/block/WithVariableContent.tsx
similarity index 100%
rename from apps/builder/src/features/graph/components/Nodes/block/WithVariableContent.tsx
rename to apps/builder/src/features/graph/components/nodes-tmp/block/WithVariableContent.tsx
diff --git a/apps/builder/src/features/graph/components/Nodes/group/GroupFocusToolbar.tsx b/apps/builder/src/features/graph/components/nodes-tmp/group/GroupFocusToolbar.tsx
similarity index 100%
rename from apps/builder/src/features/graph/components/Nodes/group/GroupFocusToolbar.tsx
rename to apps/builder/src/features/graph/components/nodes-tmp/group/GroupFocusToolbar.tsx
diff --git a/apps/builder/src/features/graph/components/Nodes/group/GroupNode.tsx b/apps/builder/src/features/graph/components/nodes-tmp/group/GroupNode.tsx
similarity index 100%
rename from apps/builder/src/features/graph/components/Nodes/group/GroupNode.tsx
rename to apps/builder/src/features/graph/components/nodes-tmp/group/GroupNode.tsx
diff --git a/apps/builder/src/features/graph/components/Nodes/group/GroupNodeContextMenu.tsx b/apps/builder/src/features/graph/components/nodes-tmp/group/GroupNodeContextMenu.tsx
similarity index 100%
rename from apps/builder/src/features/graph/components/Nodes/group/GroupNodeContextMenu.tsx
rename to apps/builder/src/features/graph/components/nodes-tmp/group/GroupNodeContextMenu.tsx
diff --git a/apps/builder/src/features/graph/components/Nodes/group/index.tsx b/apps/builder/src/features/graph/components/nodes-tmp/group/index.tsx
similarity index 100%
rename from apps/builder/src/features/graph/components/Nodes/group/index.tsx
rename to apps/builder/src/features/graph/components/nodes-tmp/group/index.tsx
diff --git a/apps/builder/src/features/graph/components/Nodes/item/ItemNode.tsx b/apps/builder/src/features/graph/components/nodes-tmp/item/ItemNode.tsx
similarity index 98%
rename from apps/builder/src/features/graph/components/Nodes/item/ItemNode.tsx
rename to apps/builder/src/features/graph/components/nodes-tmp/item/ItemNode.tsx
index 615f7e85f..348d85c06 100644
--- a/apps/builder/src/features/graph/components/Nodes/item/ItemNode.tsx
+++ b/apps/builder/src/features/graph/components/nodes-tmp/item/ItemNode.tsx
@@ -2,7 +2,7 @@ import { Flex, useColorModeValue } from '@chakra-ui/react'
 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-tmp/SourceEndpoint'
 import { ItemNodeContent } from './ItemNodeContent'
 import { ItemNodeContextMenu } from './ItemNodeContextMenu'
 import { ContextMenu } from '@/components/ContextMenu'
diff --git a/apps/builder/src/features/graph/components/Nodes/item/ItemNodeContent.tsx b/apps/builder/src/features/graph/components/nodes-tmp/item/ItemNodeContent.tsx
similarity index 100%
rename from apps/builder/src/features/graph/components/Nodes/item/ItemNodeContent.tsx
rename to apps/builder/src/features/graph/components/nodes-tmp/item/ItemNodeContent.tsx
diff --git a/apps/builder/src/features/graph/components/Nodes/item/ItemNodeContextMenu.tsx b/apps/builder/src/features/graph/components/nodes-tmp/item/ItemNodeContextMenu.tsx
similarity index 100%
rename from apps/builder/src/features/graph/components/Nodes/item/ItemNodeContextMenu.tsx
rename to apps/builder/src/features/graph/components/nodes-tmp/item/ItemNodeContextMenu.tsx
diff --git a/apps/builder/src/features/graph/components/Nodes/item/ItemNodesList.tsx b/apps/builder/src/features/graph/components/nodes-tmp/item/ItemNodesList.tsx
similarity index 98%
rename from apps/builder/src/features/graph/components/Nodes/item/ItemNodesList.tsx
rename to apps/builder/src/features/graph/components/nodes-tmp/item/ItemNodesList.tsx
index 43f9eebb0..6c87e2f95 100644
--- a/apps/builder/src/features/graph/components/Nodes/item/ItemNodesList.tsx
+++ b/apps/builder/src/features/graph/components/nodes-tmp/item/ItemNodesList.tsx
@@ -23,7 +23,7 @@ import {
 } from '@/features/graph/providers/GraphDndProvider'
 import { useGraph } from '@/features/graph/providers/GraphProvider'
 import { Coordinates } from '@dnd-kit/utilities'
-import { SourceEndpoint } from '../../endpoints/SourceEndpoint'
+import { SourceEndpoint } from '../../endpoints-tmp/SourceEndpoint'
 
 type Props = {
   block: BlockWithItems