diff --git a/packages/core/src/auto-imports.d.ts b/packages/core/src/auto-imports.d.ts
index 41c919ad..b36313eb 100644
--- a/packages/core/src/auto-imports.d.ts
+++ b/packages/core/src/auto-imports.d.ts
@@ -16,7 +16,6 @@ declare global {
   const Slots: typeof import('./context/index')['Slots']
   const Storage: typeof import('./composables/useVueFlow')['Storage']
   const VueFlow: typeof import('./context/index')['VueFlow']
-  const actions: typeof import('./store/actions')['default']
   const addEdge: typeof import('./utils/graph')['addEdge']
   const addEdgeToStore: typeof import('./utils/store')['addEdgeToStore']
   const applyChanges: typeof import('./utils/changes')['applyChanges']
@@ -87,13 +86,11 @@ declare global {
   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']
   const graphPosToZoomedPos: typeof import('./utils/graph')['graphPosToZoomedPos']
   const groupEdgesByZLevel: typeof import('./utils/edge')['groupEdgesByZLevel']
   const h: typeof import('vue')['h']
   const handleNodeClick: typeof import('./utils/node')['handleNodeClick']
   const hasSelector: typeof import('./utils/drag')['hasSelector']
-  const hooks: typeof import('./store/hooks')['default']
   const ignorableWatch: typeof import('@vueuse/core')['ignorableWatch']
   const inject: typeof import('vue')['inject']
   const isDef: typeof import('./utils/store')['isDef']
@@ -109,9 +106,6 @@ declare global {
   const isReadonly: typeof import('vue')['isReadonly']
   const isRect: typeof import('./utils/graph')['isRect']
   const isRef: typeof import('vue')['isRef']
-  const logicAnd: typeof import('@vueuse/core')['logicAnd']
-  const logicNot: typeof import('@vueuse/core')['logicNot']
-  const logicOr: typeof import('@vueuse/core')['logicOr']
   const makeDestructurable: typeof import('@vueuse/core')['makeDestructurable']
   const markRaw: typeof import('vue')['markRaw']
   const nextTick: typeof import('vue')['nextTick']
@@ -159,7 +153,6 @@ declare global {
   const shallowReactive: typeof import('vue')['shallowReactive']
   const shallowReadonly: typeof import('vue')['shallowReadonly']
   const shallowRef: typeof import('vue')['shallowRef']
-  const state: typeof import('./store/state')['default']
   const syncRef: typeof import('@vueuse/core')['syncRef']
   const syncRefs: typeof import('@vueuse/core')['syncRefs']
   const templateRef: typeof import('@vueuse/core')['templateRef']
@@ -181,8 +174,16 @@ declare global {
   const updateEdge: typeof import('./utils/graph')['updateEdge']
   const updateEdgeAction: typeof import('./utils/store')['updateEdgeAction']
   const updatePosition: typeof import('./utils/drag')['updatePosition']
-  const useActions: typeof import('./store/index')['useActions']
+  const useActions: typeof import('./store/actions')['useActions']
   const useActiveElement: typeof import('@vueuse/core')['useActiveElement']
+  const useArrayEvery: typeof import('@vueuse/core')['useArrayEvery']
+  const useArrayFilter: typeof import('@vueuse/core')['useArrayFilter']
+  const useArrayFind: typeof import('@vueuse/core')['useArrayFind']
+  const useArrayFindIndex: typeof import('@vueuse/core')['useArrayFindIndex']
+  const useArrayJoin: typeof import('@vueuse/core')['useArrayJoin']
+  const useArrayMap: typeof import('@vueuse/core')['useArrayMap']
+  const useArrayReduce: typeof import('@vueuse/core')['useArrayReduce']
+  const useArraySome: typeof import('@vueuse/core')['useArraySome']
   const useAsyncQueue: typeof import('@vueuse/core')['useAsyncQueue']
   const useAsyncState: typeof import('@vueuse/core')['useAsyncState']
   const useAttrs: typeof import('vue')['useAttrs']
@@ -193,8 +194,8 @@ declare global {
   const useBroadcastChannel: typeof import('@vueuse/core')['useBroadcastChannel']
   const useBrowserLocation: typeof import('@vueuse/core')['useBrowserLocation']
   const useCached: typeof import('@vueuse/core')['useCached']
-  const useClamp: typeof import('@vueuse/core')['useClamp']
   const useClipboard: typeof import('@vueuse/core')['useClipboard']
+  const useCloned: typeof import('@vueuse/core')['useCloned']
   const useColorMode: typeof import('@vueuse/core')['useColorMode']
   const useConfirmDialog: typeof import('@vueuse/core')['useConfirmDialog']
   const useCounter: typeof import('@vueuse/core')['useCounter']
@@ -238,9 +239,9 @@ declare global {
   const useFullscreen: typeof import('@vueuse/core')['useFullscreen']
   const useGamepad: typeof import('@vueuse/core')['useGamepad']
   const useGeolocation: typeof import('@vueuse/core')['useGeolocation']
-  const useGetters: typeof import('./store/index')['useGetters']
+  const useGetters: typeof import('./store/getters')['useGetters']
   const useHandle: typeof import('./composables/useHandle')['default']
-  const useHooks: typeof import('./store/index')['useHooks']
+  const useHooks: typeof import('./store/hooks')['useHooks']
   const useIdle: typeof import('@vueuse/core')['useIdle']
   const useImage: typeof import('@vueuse/core')['useImage']
   const useInfiniteScroll: typeof import('@vueuse/core')['useInfiniteScroll']
@@ -276,8 +277,10 @@ declare global {
   const usePointer: typeof import('@vueuse/core')['usePointer']
   const usePointerSwipe: typeof import('@vueuse/core')['usePointerSwipe']
   const usePreferredColorScheme: typeof import('@vueuse/core')['usePreferredColorScheme']
+  const usePreferredContrast: typeof import('@vueuse/core')['usePreferredContrast']
   const usePreferredDark: typeof import('@vueuse/core')['usePreferredDark']
   const usePreferredLanguages: typeof import('@vueuse/core')['usePreferredLanguages']
+  const usePreferredReducedMotion: typeof import('@vueuse/core')['usePreferredReducedMotion']
   const useRafFn: typeof import('@vueuse/core')['useRafFn']
   const useRefHistory: typeof import('@vueuse/core')['useRefHistory']
   const useResizeObserver: typeof import('@vueuse/core')['useResizeObserver']
@@ -289,15 +292,18 @@ declare global {
   const useSessionStorage: typeof import('@vueuse/core')['useSessionStorage']
   const useShare: typeof import('@vueuse/core')['useShare']
   const useSlots: typeof import('vue')['useSlots']
+  const useSorted: typeof import('@vueuse/core')['useSorted']
   const useSpeechRecognition: typeof import('@vueuse/core')['useSpeechRecognition']
   const useSpeechSynthesis: typeof import('@vueuse/core')['useSpeechSynthesis']
-  const useState: typeof import('./store/index')['useState']
+  const useState: typeof import('./store/state')['useState']
   const useStepper: typeof import('@vueuse/core')['useStepper']
   const useStorage: typeof import('@vueuse/core')['useStorage']
   const useStorageAsync: typeof import('@vueuse/core')['useStorageAsync']
   const useStyleTag: typeof import('@vueuse/core')['useStyleTag']
+  const useSupported: typeof import('@vueuse/core')['useSupported']
   const useSwipe: typeof import('@vueuse/core')['useSwipe']
   const useTemplateRefsList: typeof import('@vueuse/core')['useTemplateRefsList']
+  const useTextDirection: typeof import('@vueuse/core')['useTextDirection']
   const useTextSelection: typeof import('@vueuse/core')['useTextSelection']
   const useTextareaAutosize: typeof import('@vueuse/core')['useTextareaAutosize']
   const useThrottle: typeof import('@vueuse/core')['useThrottle']
@@ -309,6 +315,8 @@ declare global {
   const useTimeoutPoll: typeof import('@vueuse/core')['useTimeoutPoll']
   const useTimestamp: typeof import('@vueuse/core')['useTimestamp']
   const useTitle: typeof import('@vueuse/core')['useTitle']
+  const useToNumber: typeof import('@vueuse/core')['useToNumber']
+  const useToString: typeof import('@vueuse/core')['useToString']
   const useToggle: typeof import('@vueuse/core')['useToggle']
   const useTransition: typeof import('@vueuse/core')['useTransition']
   const useUrlSearchParams: typeof import('@vueuse/core')['useUrlSearchParams']
diff --git a/packages/core/src/components/ConnectionLine/ConnectionLine.vue b/packages/core/src/components/ConnectionLine/ConnectionLine.vue
index 21bff7c5..b5866590 100644
--- a/packages/core/src/components/ConnectionLine/ConnectionLine.vue
+++ b/packages/core/src/components/ConnectionLine/ConnectionLine.vue
@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 import type { GraphNode } from '../../types'
 import { ConnectionLineType, ConnectionMode, Position } from '../../types'
-import { getMarkerId } from '../../utils'
+import { getMarkerId } from '../../utils/graph'
 
 const { sourceNode } = defineProps<{
   sourceNode: GraphNode
diff --git a/packages/core/src/composables/index.ts b/packages/core/src/composables/index.ts
deleted file mode 100644
index bc0d8339..00000000
--- a/packages/core/src/composables/index.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-export { default as useHandle } from './useHandle'
-export { default as useKeyPress } from './useKeyPress'
-export { default as useZoomPanHelper } from './useZoomPanHelper'
-export { default as useWindow } from './useWindow'
-export { default as useVueFlow } from './useVueFlow'
-export { default as useDrag } from './useDrag'
-export { default as useNodeHooks } from './useNodeHooks'
-export { default as useEdgeHooks } from './useEdgeHooks'
-export { default as useEdge } from './useEdge'
-export { default as useNode } from './useNode'
diff --git a/packages/core/src/container/Viewport/Viewport.vue b/packages/core/src/container/Viewport/Viewport.vue
index 8c9dbade..5279238d 100644
--- a/packages/core/src/container/Viewport/Viewport.vue
+++ b/packages/core/src/container/Viewport/Viewport.vue
@@ -4,8 +4,6 @@ import { zoom, zoomIdentity } from 'd3-zoom'
 import { pointer, select } from 'd3-selection'
 import type { ViewpaneTransform } from '../../types'
 import { PanOnScrollMode } from '../../types'
-import { useKeyPress, useVueFlow, useWindow } from '../../composables'
-import { clamp, clampPosition, getDimensions } from '../../utils'
 import SelectionPane from '../SelectionPane/SelectionPane.vue'
 import Transform from './Transform.vue'
 
diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
index e18b9201..60448a52 100644
--- a/packages/core/src/index.ts
+++ b/packages/core/src/index.ts
@@ -43,7 +43,7 @@ export {
  */
 export { applyChanges, applyEdgeChanges, applyNodeChanges } from './utils/changes'
 
-export { defaultEdgeTypes, defaultNodeTypes } from './store'
+export { defaultEdgeTypes, defaultNodeTypes } from './store/state'
 
 export { VueFlow as VueFlowInjection, NodeId as NodeIdInjection } from './context'
 
diff --git a/packages/core/src/store/actions.ts b/packages/core/src/store/actions.ts
index dd09a53b..665c4070 100644
--- a/packages/core/src/store/actions.ts
+++ b/packages/core/src/store/actions.ts
@@ -1,4 +1,3 @@
-import useState from './state'
 import type {
   Actions,
   ComputedGetters,
@@ -20,7 +19,7 @@ import type {
   State,
 } from '~/types'
 
-export default (state: State, getters: ComputedGetters): Actions => {
+export function useActions(state: State, getters: ComputedGetters): Actions {
   const updateNodeInternals: Actions['updateNodeInternals'] = (ids) => {
     state.hooks.updateNodeInternals.trigger(ids)
   }
diff --git a/packages/core/src/store/getters.ts b/packages/core/src/store/getters.ts
index 64017648..7390c03e 100644
--- a/packages/core/src/store/getters.ts
+++ b/packages/core/src/store/getters.ts
@@ -1,8 +1,7 @@
 import { defaultEdgeTypes, defaultNodeTypes } from './state'
 import type { ComputedGetters, GraphEdge, GraphNode, State } from '~/types'
-import { getNodesInside, isEdgeVisible, warn } from '~/utils'
 
-export default (state: State): ComputedGetters => {
+export function useGetters(state: State): ComputedGetters {
   const nodeIds = computed(() => state.nodes.map((n) => n.id))
   const edgeIds = computed(() => state.edges.map((e) => e.id))
 
diff --git a/packages/core/src/store/hooks.ts b/packages/core/src/store/hooks.ts
index 18c4ccdf..fc26d2bb 100644
--- a/packages/core/src/store/hooks.ts
+++ b/packages/core/src/store/hooks.ts
@@ -49,7 +49,7 @@ export const createHooks = (): FlowHooks => ({
   updateNodeInternals: createEventHook(),
 })
 
-export default (emit: Emits, hooks: Ref<FlowHooks>) => {
+export function useHooks(emit: Emits, hooks: Ref<FlowHooks>) {
   onBeforeMount(() => {
     for (const [key, value] of Object.entries(hooks.value)) {
       const listener = (data: any) => {
diff --git a/packages/core/src/store/index.ts b/packages/core/src/store/index.ts
deleted file mode 100644
index 454d7f97..00000000
--- a/packages/core/src/store/index.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export { default as useHooks, createHooks } from './hooks'
-export { default as useActions } from './actions'
-export { default as useState, defaultEdgeTypes, defaultNodeTypes } from './state'
-export { default as useGetters } from './getters'
diff --git a/packages/core/src/store/state.ts b/packages/core/src/store/state.ts
index 52e11b25..ff77a90f 100644
--- a/packages/core/src/store/state.ts
+++ b/packages/core/src/store/state.ts
@@ -121,7 +121,7 @@ const defaultState = (): State => ({
   vueFlowVersion: typeof __VUE_FLOW_VERSION__ !== 'undefined' ? __VUE_FLOW_VERSION__ : '-',
 })
 
-export default (opts?: FlowOptions): State => {
+export function useState(opts?: FlowOptions): State {
   const state = defaultState()
   if (opts) {
     Object.keys(opts).forEach((o) => {
diff --git a/packages/core/src/utils/index.ts b/packages/core/src/utils/index.ts
deleted file mode 100644
index 98f1a276..00000000
--- a/packages/core/src/utils/index.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-export * from './edge'
-export * from './graph'
-export * from './node'
-export * from './changes'
-export * from './store'
-export * from './log'