diff --git a/examples/vite/src/Basic/Basic.vue b/examples/vite/src/Basic/Basic.vue
index cba779d4..32503317 100644
--- a/examples/vite/src/Basic/Basic.vue
+++ b/examples/vite/src/Basic/Basic.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import { Background, Controls, MiniMap } from '@vue-flow/additional-components'
 import type { Elements } from '@vue-flow/core'
-import { VueFlow, isNode, useVueFlow } from '~/index'
+import { VueFlow, isNode, useVueFlow } from '@vue-flow/core'
 
 const elements = ref<Elements>([
   { id: '1', type: 'input', label: 'Node 1', position: { x: 250, y: 5 }, class: 'light' },
diff --git a/packages/core/src/auto-imports.d.ts b/packages/core/src/auto-imports.d.ts
index 45e8b84b..126ce898 100644
--- a/packages/core/src/auto-imports.d.ts
+++ b/packages/core/src/auto-imports.d.ts
@@ -42,7 +42,7 @@ declare global {
   const createEventHook: typeof import('@vueuse/core')['createEventHook']
   const createGlobalState: typeof import('@vueuse/core')['createGlobalState']
   const createGraphNodes: typeof import('./utils/store')['createGraphNodes']
-  const createHooks: typeof import('./store/hooks')['createHooks']
+  const createHooks: typeof import('./store/index')['createHooks']
   const createInjectionState: typeof import('@vueuse/core')['createInjectionState']
   const createReactiveFn: typeof import('@vueuse/core')['createReactiveFn']
   const createRemoveChange: typeof import('./utils/changes')['createRemoveChange']
@@ -59,6 +59,8 @@ declare global {
   const eagerComputed: typeof import('@vueuse/core')['eagerComputed']
   const effectScope: typeof import('vue')['effectScope']
   const extendRef: typeof import('@vueuse/core')['extendRef']
+  const getBezierEdgeCenter: typeof import('./components/Edges/utils/general')['getBezierEdgeCenter']
+  const getBezierPath: typeof import('./components/Edges/utils/bezier')['getBezierPath']
   const getBoundsofRects: typeof import('./utils/graph')['getBoundsofRects']
   const getConnectedEdges: typeof import('./utils/graph')['getConnectedEdges']
   const getCurrentInstance: typeof import('vue')['getCurrentInstance']
@@ -79,6 +81,10 @@ declare global {
   const getOverlappingArea: typeof import('./utils/graph')['getOverlappingArea']
   const getRectOfNodes: typeof import('./utils/graph')['getRectOfNodes']
   const getSelectionChanges: typeof import('./utils/changes')['getSelectionChanges']
+  const getSimpleBezierPath: typeof import('./components/Edges/utils/simple-bezier')['getSimpleBezierPath']
+  const getSimpleEdgeCenter: typeof import('./components/Edges/utils/general')['getSimpleEdgeCenter']
+  const getSmoothStepPath: typeof import('./components/Edges/utils/smoothstep')['getSmoothStepPath']
+  const getStraightPath: typeof import('./components/Edges/utils/straight')['getStraightPath']
   const getTransformForBounds: typeof import('./utils/graph')['getTransformForBounds']
   const getXYZPos: typeof import('./utils/graph')['getXYZPos']
   const getters: typeof import('./store/getters')['default']
diff --git a/packages/core/src/components/ConnectionLine/ConnectionLine.vue b/packages/core/src/components/ConnectionLine/ConnectionLine.vue
index cc29fbde..321f0ad9 100644
--- a/packages/core/src/components/ConnectionLine/ConnectionLine.vue
+++ b/packages/core/src/components/ConnectionLine/ConnectionLine.vue
@@ -1,9 +1,6 @@
 <script lang="ts" setup>
-import { getBezierPath, getSimpleBezierPath, getSmoothStepPath } from '../Edges/utils'
 import type { GraphNode, HandleElement } from '../../types'
 import { ConnectionLineType, Position } from '../../types'
-import { useVueFlow } from '../../composables'
-import { Slots } from '../../context'
 import { getMarkerId } from '../../utils'
 
 const { sourceNode } = defineProps<{
diff --git a/packages/core/src/components/Edges/BezierEdge.ts b/packages/core/src/components/Edges/BezierEdge.ts
index e7c0c780..32ff2f05 100644
--- a/packages/core/src/components/Edges/BezierEdge.ts
+++ b/packages/core/src/components/Edges/BezierEdge.ts
@@ -1,5 +1,4 @@
 import type { FunctionalComponent } from 'vue'
-import { getBezierPath } from './utils'
 import BaseEdge from './BaseEdge'
 import { Position } from '~/types'
 import type { EdgeProps } from '~/types'
diff --git a/packages/core/src/components/Edges/EdgeLabelRenderer.vue b/packages/core/src/components/Edges/EdgeLabelRenderer.vue
index 3de7b419..bc0f3153 100644
--- a/packages/core/src/components/Edges/EdgeLabelRenderer.vue
+++ b/packages/core/src/components/Edges/EdgeLabelRenderer.vue
@@ -1,9 +1,7 @@
 <script lang="ts" setup>
-import { useVueFlow } from '../../composables'
-
 const { viewportRef } = useVueFlow()
 
-const teleportTarget = $computed(() => viewportRef.value?.getElementsByClassName('vue-flow__edge-labels')[0])
+const teleportTarget = computed(() => viewportRef.value?.getElementsByClassName('vue-flow__edge-labels')[0])
 </script>
 
 <script lang="ts">
diff --git a/packages/core/src/components/Edges/SimpleBezierEdge.ts b/packages/core/src/components/Edges/SimpleBezierEdge.ts
index 8f93e49f..03ce114e 100644
--- a/packages/core/src/components/Edges/SimpleBezierEdge.ts
+++ b/packages/core/src/components/Edges/SimpleBezierEdge.ts
@@ -1,5 +1,4 @@
 import type { FunctionalComponent } from 'vue'
-import { getSimpleBezierPath } from './utils'
 import BaseEdge from './BaseEdge'
 import { Position } from '~/types'
 import type { EdgeProps } from '~/types'
diff --git a/packages/core/src/components/Edges/SmoothStepEdge.ts b/packages/core/src/components/Edges/SmoothStepEdge.ts
index 6f69745f..16adb08d 100644
--- a/packages/core/src/components/Edges/SmoothStepEdge.ts
+++ b/packages/core/src/components/Edges/SmoothStepEdge.ts
@@ -1,5 +1,4 @@
 import type { FunctionalComponent } from 'vue'
-import { getSmoothStepPath } from './utils'
 import BaseEdge from './BaseEdge'
 import type { SmoothStepEdgeProps } from '~/types'
 import { Position } from '~/types'
diff --git a/packages/core/src/components/Edges/StraightEdge.ts b/packages/core/src/components/Edges/StraightEdge.ts
index eda16b22..0aa4d73c 100644
--- a/packages/core/src/components/Edges/StraightEdge.ts
+++ b/packages/core/src/components/Edges/StraightEdge.ts
@@ -1,6 +1,5 @@
 import type { FunctionalComponent } from 'vue'
 import BaseEdge from './BaseEdge'
-import { getStraightPath } from './utils'
 import type { EdgeProps } from '~/types'
 
 const StraightEdge: FunctionalComponent<EdgeProps> = function ({
diff --git a/packages/core/src/components/Edges/Wrapper.ts b/packages/core/src/components/Edges/Wrapper.ts
index 30227a43..08be1182 100644
--- a/packages/core/src/components/Edges/Wrapper.ts
+++ b/packages/core/src/components/Edges/Wrapper.ts
@@ -1,9 +1,6 @@
 import EdgeAnchor from './EdgeAnchor'
 import type { Connection, EdgeComponent, EdgeUpdatable, GraphEdge, GraphNode, HandleType } from '~/types'
 import { ConnectionMode, Position } from '~/types'
-import { connectionExists, getEdgePositions, getHandle, getMarkerId } from '~/utils'
-import { EdgeId, EdgeRef } from '~/context'
-import { useEdgeHooks, useHandle, useVueFlow } from '~/composables'
 
 interface Props {
   id: string
diff --git a/packages/core/src/components/Handle/Handle.vue b/packages/core/src/components/Handle/Handle.vue
index 3d5ae82b..aff01a19 100644
--- a/packages/core/src/components/Handle/Handle.vue
+++ b/packages/core/src/components/Handle/Handle.vue
@@ -1,9 +1,7 @@
 <script lang="ts" setup>
 import { isFunction, isString } from '@vueuse/core'
-import { useHandle, useNode, useVueFlow } from '../../composables'
 import type { Position } from '../../types'
 import type { HandleProps } from '../../types/handle'
-import { getDimensions } from '../../utils'
 
 const { position = 'top' as Position, connectable, id, isValidConnection, ...props } = defineProps<HandleProps>()
 
diff --git a/packages/core/src/components/Nodes/NodeWrapper.vue b/packages/core/src/components/Nodes/NodeWrapper.vue
index b990c43c..a9fb6173 100644
--- a/packages/core/src/components/Nodes/NodeWrapper.vue
+++ b/packages/core/src/components/Nodes/NodeWrapper.vue
@@ -1,9 +1,5 @@
 <script lang="ts" setup>
-import { useVModel } from '@vueuse/core'
-import { useDrag, useNodeHooks, useVueFlow } from '../../composables'
 import type { GraphNode, HandleConnectable, NodeComponent, SnapGrid, XYZPosition } from '../../types'
-import { NodeId, NodeRef } from '../../context'
-import { getConnectedEdges, getXYZPos, handleNodeClick } from '../../utils'
 
 const { id, type, name, draggable, selectable, connectable, ...props } = defineProps<{
   id: string
diff --git a/packages/core/src/components/NodesSelection/NodesSelection.vue b/packages/core/src/components/NodesSelection/NodesSelection.vue
index d148f8a1..e5ffb4b8 100644
--- a/packages/core/src/components/NodesSelection/NodesSelection.vue
+++ b/packages/core/src/components/NodesSelection/NodesSelection.vue
@@ -1,7 +1,4 @@
 <script lang="ts" setup>
-import { useDrag, useVueFlow } from '../../composables'
-import { getRectOfNodes } from '../../utils'
-
 const { emits, setState, viewport, getSelectedNodes, snapToGrid, snapGrid, noPanClassName } = $(useVueFlow())
 
 const el = ref()
diff --git a/packages/core/src/components/UserSelection/UserSelection.vue b/packages/core/src/components/UserSelection/UserSelection.vue
index e50f6fb3..97495735 100644
--- a/packages/core/src/components/UserSelection/UserSelection.vue
+++ b/packages/core/src/components/UserSelection/UserSelection.vue
@@ -1,7 +1,5 @@
 <script lang="ts" setup>
-import { useVueFlow } from '../../composables'
 import type { SelectionRect as Rect } from '../../types'
-import { getConnectedEdges, getNodesInside } from '../../utils'
 import SelectionRect from './SelectionRect.vue'
 import { getMousePosition } from './utils'
 
diff --git a/packages/core/src/container/EdgeRenderer/EdgeRenderer.vue b/packages/core/src/container/EdgeRenderer/EdgeRenderer.vue
index 2c035e49..c9053fc0 100644
--- a/packages/core/src/container/EdgeRenderer/EdgeRenderer.vue
+++ b/packages/core/src/container/EdgeRenderer/EdgeRenderer.vue
@@ -1,11 +1,8 @@
 <script lang="ts" setup>
-import type { CSSProperties, EffectScope } from 'vue'
+import type { EffectScope } from 'vue'
 import EdgeWrapper from '../../components/Edges/Wrapper'
 import ConnectionLine from '../../components/ConnectionLine/ConnectionLine.vue'
-import { useVueFlow } from '../../composables'
-import { groupEdgesByZLevel, warn } from '../../utils'
 import type { EdgeComponent, EdgeUpdatable, GraphEdge } from '../../types'
-import { Slots } from '../../context'
 import MarkerDefinitions from './MarkerDefinitions.vue'
 
 const slots = inject(Slots)
diff --git a/packages/core/src/container/EdgeRenderer/MarkerDefinitions.vue b/packages/core/src/container/EdgeRenderer/MarkerDefinitions.vue
index be266eff..41542088 100644
--- a/packages/core/src/container/EdgeRenderer/MarkerDefinitions.vue
+++ b/packages/core/src/container/EdgeRenderer/MarkerDefinitions.vue
@@ -1,7 +1,5 @@
 <script lang="ts" setup>
-import { useVueFlow } from '../../composables'
 import type { EdgeMarkerType, MarkerProps, MarkerType } from '../../types/edge'
-import { getMarkerId } from '../../utils'
 import Marker from './Marker.vue'
 
 const { edges, connectionLineOptions, defaultMarkerColor: defaultColor } = $(useVueFlow())
diff --git a/packages/core/src/container/NodeRenderer/NodeRenderer.vue b/packages/core/src/container/NodeRenderer/NodeRenderer.vue
index f06011a2..dd7c4047 100644
--- a/packages/core/src/container/NodeRenderer/NodeRenderer.vue
+++ b/packages/core/src/container/NodeRenderer/NodeRenderer.vue
@@ -1,9 +1,6 @@
 <script lang="ts" setup>
 import { NodeWrapper } from '../../components'
 import type { GraphNode, HandleConnectable, NodeComponent } from '../../types'
-import { useVueFlow } from '../../composables'
-import { Slots } from '../../context'
-import { warn } from '../../utils'
 
 const slots = inject(Slots)
 
diff --git a/packages/core/src/container/SelectionPane/SelectionPane.vue b/packages/core/src/container/SelectionPane/SelectionPane.vue
index 6c9b5913..5fdaeaca 100644
--- a/packages/core/src/container/SelectionPane/SelectionPane.vue
+++ b/packages/core/src/container/SelectionPane/SelectionPane.vue
@@ -1,6 +1,5 @@
 <script lang="ts" setup>
 import type { GraphNode } from '../../types'
-import { useKeyPress, useVueFlow } from '../../composables'
 import { NodesSelection, UserSelection } from '../../components'
 
 const {
diff --git a/packages/core/src/container/Viewport/Transform.vue b/packages/core/src/container/Viewport/Transform.vue
index 666aba73..e32966d2 100644
--- a/packages/core/src/container/Viewport/Transform.vue
+++ b/packages/core/src/container/Viewport/Transform.vue
@@ -1,7 +1,6 @@
 <script lang="ts" setup>
 import NodeRenderer from '../NodeRenderer/NodeRenderer.vue'
 import EdgeRenderer from '../EdgeRenderer/EdgeRenderer.vue'
-import { useVueFlow, useWindow } from '../../composables'
 import type { Dimensions } from '../../types'
 
 const { id, viewport, dimensions, fitViewOnInit, emits, fitView, ...rest } = useVueFlow()
diff --git a/packages/core/src/container/VueFlow/VueFlow.vue b/packages/core/src/container/VueFlow/VueFlow.vue
index e9a34c9c..99739fc2 100644
--- a/packages/core/src/container/VueFlow/VueFlow.vue
+++ b/packages/core/src/container/VueFlow/VueFlow.vue
@@ -38,6 +38,7 @@ const props = withDefaults(defineProps<FlowProps>(), {
   autoConnect: undefined,
   elevateEdgesOnSelect: undefined,
 })
+
 const emit = defineEmits<{
   (event: 'nodesChange', changes: NodeChange[]): void
   (event: 'edgesChange', changes: EdgeChange[]): void
@@ -94,7 +95,7 @@ const emit = defineEmits<{
   (event: 'update:nodes', value: GraphNode[]): void
   (event: 'update:edges', value: GraphEdge[]): void
 }>()
-console.log('flubarg')
+
 const modelValue = useVModel(props, 'modelValue', emit)
 const modelNodes = useVModel(props, 'nodes', emit)
 const modelEdges = useVModel(props, 'edges', emit)
diff --git a/packages/core/vite.config.ts b/packages/core/vite.config.ts
index 6f6eb46f..8bce162f 100644
--- a/packages/core/vite.config.ts
+++ b/packages/core/vite.config.ts
@@ -47,7 +47,7 @@ export default defineConfig({
     vueTypes(),
     AutoImport({
       imports: ['vue', '@vueuse/core', 'vue/macros'],
-      dirs: ['./src/utils/**', './src/composables/**', './src/context/**', './src/store/**'],
+      dirs: ['./src/utils/**', './src/composables/**', './src/context/**', './src/store/**', './src/components/Edges/utils/**'],
       dts: 'src/auto-imports.d.ts',
     }),
     replace({