diff --git a/packages/react/src/components/Nodes/NodeWrapper.tsx b/packages/react/src/components/NodeWrapper/NodeWrapper.tsx
similarity index 97%
rename from packages/react/src/components/Nodes/NodeWrapper.tsx
rename to packages/react/src/components/NodeWrapper/NodeWrapper.tsx
index 22dddceb..479e0afe 100644
--- a/packages/react/src/components/Nodes/NodeWrapper.tsx
+++ b/packages/react/src/components/NodeWrapper/NodeWrapper.tsx
@@ -8,7 +8,6 @@ import {
   internalsSymbol,
   isInputDOMNode,
   NodeProps,
-  type XYPosition,
 } from '@xyflow/system';
 
 import { useStore, useStoreApi } from '../../hooks/useStore';
@@ -16,15 +15,9 @@ import { Provider } from '../../contexts/NodeIdContext';
 import { ARIA_NODE_DESC_KEY } from '../A11yDescriptions';
 import useDrag from '../../hooks/useDrag';
 import useUpdateNodePositions from '../../hooks/useUpdateNodePositions';
-import { handleNodeClick } from './utils';
+import { handleNodeClick } from '../Nodes/utils';
 import type { NodeWrapperProps } from '../../types';
-
-export const arrowKeyDiffs: Record<string, XYPosition> = {
-  ArrowUp: { x: 0, y: -1 },
-  ArrowDown: { x: 0, y: 1 },
-  ArrowLeft: { x: -1, y: 0 },
-  ArrowRight: { x: 1, y: 0 },
-};
+import { arrowKeyDiffs } from './utils';
 
 const NodeWrapper = ({
   id,
diff --git a/packages/react/src/components/NodeWrapper/utils.tsx b/packages/react/src/components/NodeWrapper/utils.tsx
new file mode 100644
index 00000000..77842972
--- /dev/null
+++ b/packages/react/src/components/NodeWrapper/utils.tsx
@@ -0,0 +1,8 @@
+import { XYPosition } from '@xyflow/system';
+
+export const arrowKeyDiffs: Record<string, XYPosition> = {
+  ArrowUp: { x: 0, y: -1 },
+  ArrowDown: { x: 0, y: 1 },
+  ArrowLeft: { x: -1, y: 0 },
+  ArrowRight: { x: 1, y: 0 },
+};
diff --git a/packages/react/src/components/NodesSelection/index.tsx b/packages/react/src/components/NodesSelection/index.tsx
index ec88fccd..e79ed782 100644
--- a/packages/react/src/components/NodesSelection/index.tsx
+++ b/packages/react/src/components/NodesSelection/index.tsx
@@ -10,9 +10,9 @@ import { getNodesBounds } from '@xyflow/system';
 
 import { useStore, useStoreApi } from '../../hooks/useStore';
 import useDrag from '../../hooks/useDrag';
-import { arrowKeyDiffs } from '../Nodes/wrapNode';
 import useUpdateNodePositions from '../../hooks/useUpdateNodePositions';
 import type { Node, ReactFlowState } from '../../types';
+import { arrowKeyDiffs } from '../NodeWrapper/utils';
 
 export type NodesSelectionProps = {
   onSelectionContextMenu?: (event: MouseEvent, nodes: Node[]) => void;
diff --git a/packages/react/src/container/NodeRenderer/index.tsx b/packages/react/src/container/NodeRenderer/index.tsx
index 8a7b71f4..83ff6b54 100644
--- a/packages/react/src/container/NodeRenderer/index.tsx
+++ b/packages/react/src/container/NodeRenderer/index.tsx
@@ -7,7 +7,7 @@ import { containerStyle } from '../../styles/utils';
 import { GraphViewProps } from '../GraphView';
 import type { ReactFlowState } from '../../types';
 import useResizeObserver from './useResizeObserver';
-import NodeWrapper from '../../components/Nodes/NodeWrapper';
+import NodeWrapper from '../../components/NodeWrapper/NodeWrapper';
 
 export type NodeRendererProps = Pick<
   GraphViewProps,