diff --git a/packages/svelte/src/lib/actions/zoom/index.ts b/packages/svelte/src/lib/actions/zoom/index.ts
index e553008e..ce579788 100644
--- a/packages/svelte/src/lib/actions/zoom/index.ts
+++ b/packages/svelte/src/lib/actions/zoom/index.ts
@@ -1,13 +1,13 @@
 import type { Writable } from 'svelte/store';
-import type {
-  CoordinateExtent,
-  OnPanZoom,
+import {
   PanOnScrollMode,
-  PanZoomInstance,
-  Transform,
-  Viewport
+  XYPanZoom,
+  type CoordinateExtent,
+  type OnPanZoom,
+  type PanZoomInstance,
+  type Transform,
+  type Viewport
 } from '@xyflow/system';
-import { XYPanZoom } from '@xyflow/system';
 
 type ZoomParams = {
   transform: Writable<Transform>;
diff --git a/packages/svelte/src/lib/components/EdgeWrapper/EdgeWrapper.svelte b/packages/svelte/src/lib/components/EdgeWrapper/EdgeWrapper.svelte
index 05835b06..07b98061 100644
--- a/packages/svelte/src/lib/components/EdgeWrapper/EdgeWrapper.svelte
+++ b/packages/svelte/src/lib/components/EdgeWrapper/EdgeWrapper.svelte
@@ -1,7 +1,6 @@
 <script lang="ts">
   import { createEventDispatcher, type SvelteComponentTyped } from 'svelte';
-  import { Position } from '@xyflow/system';
-  import { getMarkerId } from '@xyflow/system';
+  import { Position, getMarkerId } from '@xyflow/system';
 
   import { useStore } from '$lib/store';
   import BezierEdge from '$lib/components/edges/BezierEdge.svelte';
diff --git a/packages/svelte/src/lib/components/Handle/Handle.svelte b/packages/svelte/src/lib/components/Handle/Handle.svelte
index 19de10c9..1eceb858 100644
--- a/packages/svelte/src/lib/components/Handle/Handle.svelte
+++ b/packages/svelte/src/lib/components/Handle/Handle.svelte
@@ -1,8 +1,7 @@
 <script lang="ts">
   import { getContext, createEventDispatcher } from 'svelte';
   import cc from 'classcat';
-  import { Position, type Connection } from '@xyflow/system';
-  import { XYHandle, isMouseEvent } from '@xyflow/system';
+  import { Position, type Connection, XYHandle, isMouseEvent } from '@xyflow/system';
 
   import { useStore } from '$lib/store';
   import type { HandleComponentProps } from '$lib/types';
diff --git a/packages/svelte/src/lib/container/NodeRenderer/NodeRenderer.svelte b/packages/svelte/src/lib/container/NodeRenderer/NodeRenderer.svelte
index 32094783..eee0573e 100644
--- a/packages/svelte/src/lib/container/NodeRenderer/NodeRenderer.svelte
+++ b/packages/svelte/src/lib/container/NodeRenderer/NodeRenderer.svelte
@@ -1,7 +1,6 @@
 <script lang="ts">
   import { onDestroy } from 'svelte';
-  import { internalsSymbol } from '@xyflow/system';
-  import { getPositionWithOrigin } from '@xyflow/system';
+  import { internalsSymbol, getPositionWithOrigin } from '@xyflow/system';
 
   import { NodeWrapper } from '$lib/components/NodeWrapper';
   import { useStore } from '$lib/store';
diff --git a/packages/svelte/src/lib/container/Pane/Pane.svelte b/packages/svelte/src/lib/container/Pane/Pane.svelte
index 1fd1896c..5c33adc7 100644
--- a/packages/svelte/src/lib/container/Pane/Pane.svelte
+++ b/packages/svelte/src/lib/container/Pane/Pane.svelte
@@ -30,8 +30,7 @@
 
 <script lang="ts">
   import { createEventDispatcher } from 'svelte';
-  import { SelectionMode } from '@xyflow/system';
-  import { getEventPosition, getNodesInside } from '@xyflow/system';
+  import { SelectionMode, getEventPosition, getNodesInside  } from '@xyflow/system';
   
   import { useStore } from '$lib/store';
   import { getConnectedEdges } from '$lib/utils';
diff --git a/packages/svelte/src/lib/container/SvelteFlow/SvelteFlow.svelte b/packages/svelte/src/lib/container/SvelteFlow/SvelteFlow.svelte
index 4c56d2f3..72bd0e2c 100644
--- a/packages/svelte/src/lib/container/SvelteFlow/SvelteFlow.svelte
+++ b/packages/svelte/src/lib/container/SvelteFlow/SvelteFlow.svelte
@@ -15,7 +15,7 @@
   import { Attribution } from '$lib/components/Attribution';
   import { useStore } from '$lib/store';
   import type { SvelteFlowProps } from './types';
-    import type { EdgeTypes, NodeTypes } from '$lib/types';
+  import type { EdgeTypes, NodeTypes } from '$lib/types';
 
   type $$Props = SvelteFlowProps;
 
diff --git a/packages/svelte/src/lib/hooks/useSvelteFlow.ts b/packages/svelte/src/lib/hooks/useSvelteFlow.ts
index cba667eb..a0dc8cb8 100644
--- a/packages/svelte/src/lib/hooks/useSvelteFlow.ts
+++ b/packages/svelte/src/lib/hooks/useSvelteFlow.ts
@@ -1,13 +1,13 @@
 import { get, writable, type Writable } from 'svelte/store';
-import type {
-  Project,
-  SetCenterOptions,
-  Viewport,
-  ViewportHelperFunctionOptions,
-  XYPosition,
-  ZoomInOut
+import {
+  pointToRendererPoint,
+  type Project,
+  type SetCenterOptions,
+  type Viewport,
+  type ViewportHelperFunctionOptions,
+  type XYPosition,
+  type ZoomInOut
 } from '@xyflow/system';
-import { pointToRendererPoint } from '@xyflow/system';
 
 import { useStore } from '$lib/store';
 import type { FitViewOptions } from '$lib/types';
diff --git a/packages/svelte/src/lib/index.ts b/packages/svelte/src/lib/index.ts
index d731e42e..df6a59e1 100644
--- a/packages/svelte/src/lib/index.ts
+++ b/packages/svelte/src/lib/index.ts
@@ -17,8 +17,6 @@ export * from '$lib/utils';
 
 export * from '$lib/hooks/useSvelteFlow';
 
-export * from '@xyflow/system';
-export * from '@xyflow/system';
 export * from '@xyflow/system';
 
 export default SvelteFlow;
diff --git a/packages/svelte/src/lib/store/connection-path.ts b/packages/svelte/src/lib/store/connection-path.ts
index 02de63f1..aea51c3f 100644
--- a/packages/svelte/src/lib/store/connection-path.ts
+++ b/packages/svelte/src/lib/store/connection-path.ts
@@ -1,6 +1,13 @@
 import { derived } from 'svelte/store';
-import { getBezierPath, getSmoothStepPath, getStraightPath } from '@xyflow/system';
-import { ConnectionLineType, ConnectionMode, Position, internalsSymbol } from '@xyflow/system';
+import {
+  getBezierPath,
+  getSmoothStepPath,
+  getStraightPath,
+  ConnectionLineType,
+  ConnectionMode,
+  Position,
+  internalsSymbol
+} from '@xyflow/system';
 
 import type { SvelteFlowStoreState } from './types';
 
diff --git a/packages/svelte/src/lib/store/edges-layouted.ts b/packages/svelte/src/lib/store/edges-layouted.ts
index d477875e..03aa97d7 100644
--- a/packages/svelte/src/lib/store/edges-layouted.ts
+++ b/packages/svelte/src/lib/store/edges-layouted.ts
@@ -1,6 +1,5 @@
 import { derived } from 'svelte/store';
-import { Position } from '@xyflow/system';
-import { getHandle } from '@xyflow/system';
+import { Position, getHandle } from '@xyflow/system';
 
 import { getEdgePositions, getNodeData } from '$lib/container/EdgeRenderer/utils';
 import type { EdgeLayouted } from '$lib/types';
diff --git a/packages/svelte/src/lib/store/index.ts b/packages/svelte/src/lib/store/index.ts
index 74dda961..d0b16fd0 100644
--- a/packages/svelte/src/lib/store/index.ts
+++ b/packages/svelte/src/lib/store/index.ts
@@ -1,26 +1,24 @@
 import { getContext } from 'svelte';
 import { derived, get } from 'svelte/store';
 import {
+  internalsSymbol,
+  createMarkerIds,
+  fitView as fitViewUtil,
+  getDimensions,
+  getElementsToRemove,
+  getHandleBounds,
+  infiniteExtent,
   type UpdateNodePositions,
   type NodeDimensionUpdate,
-  internalsSymbol,
   type ViewportHelperFunctionOptions,
   type Connection,
   type XYPosition,
   type CoordinateExtent,
   type UpdateConnection
 } from '@xyflow/system';
-import {
-  createMarkerIds,
-  fitView as fitViewUtil,
-  getDimensions,
-  getElementsToRemove,
-  getHandleBounds,
-  infiniteExtent
-} from '@xyflow/system';
 
 import { addEdge as addEdgeUtil } from '$lib/utils';
-import type { EdgeTypes, NodeTypes, Node, Edge, ConnectionData, FitViewOptions } from '$lib/types';
+import type { EdgeTypes, NodeTypes, Node, Edge, FitViewOptions } from '$lib/types';
 import { getEdgesLayouted } from './edges-layouted';
 import { getConnectionPath } from './connection-path';
 import {
diff --git a/packages/svelte/src/lib/store/initial-store.ts b/packages/svelte/src/lib/store/initial-store.ts
index d3016740..574de978 100644
--- a/packages/svelte/src/lib/store/initial-store.ts
+++ b/packages/svelte/src/lib/store/initial-store.ts
@@ -1,5 +1,6 @@
 import { readable, writable } from 'svelte/store';
 import {
+  infiniteExtent,
   SelectionMode,
   ConnectionMode,
   ConnectionLineType,
@@ -20,7 +21,6 @@ import StraightEdge from '$lib/components/edges/StraightEdge.svelte';
 import SmoothStepEdge from '$lib/components/edges/SmoothStepEdge.svelte';
 import StepEdge from '$lib/components/edges/StepEdge.svelte';
 import type { ConnectionData, NodeTypes, EdgeTypes, EdgeLayouted, Edge, Node } from '$lib/types';
-import { infiniteExtent } from '@xyflow/system';
 
 export const initConnectionData = {
   connectionStartHandle: null,
diff --git a/packages/svelte/src/lib/store/types.ts b/packages/svelte/src/lib/store/types.ts
index 2a82300c..66735702 100644
--- a/packages/svelte/src/lib/store/types.ts
+++ b/packages/svelte/src/lib/store/types.ts
@@ -1,3 +1,4 @@
+import type { Writable } from 'svelte/store';
 import type {
   NodeDimensionUpdate,
   XYPosition,
@@ -10,7 +11,6 @@ import type {
 
 import type { initialStoreState } from './initial-store';
 import type { Node, Edge, NodeTypes, EdgeTypes, FitViewOptions } from '$lib/types';
-import type { Writable } from 'svelte/store';
 
 export type SvelteFlowStoreActions = {
   setNodeTypes: (nodeTypes: NodeTypes) => void;
diff --git a/packages/svelte/src/lib/utils/index.ts b/packages/svelte/src/lib/utils/index.ts
index 4f34ad24..4f5d9a8a 100644
--- a/packages/svelte/src/lib/utils/index.ts
+++ b/packages/svelte/src/lib/utils/index.ts
@@ -8,9 +8,11 @@ import {
   updateEdgeBase,
   getConnectedEdgesBase,
   isNumeric,
-  getNodePositionWithOrigin
+  getNodePositionWithOrigin,
+  internalsSymbol,
+  type XYZPosition
 } from '@xyflow/system';
-import { internalsSymbol, type XYZPosition } from '@xyflow/system';
+
 import type { DefaultEdgeOptions, DefaultNodeOptions, Edge, Node } from '$lib/types';
 
 export const isNode = isNodeBase<Node, Edge>;