diff --git a/src/Plugins/MiniMap/index.js b/src/Plugins/MiniMap/index.js
index a1b824c2..cac73678 100644
--- a/src/Plugins/MiniMap/index.js
+++ b/src/Plugins/MiniMap/index.js
@@ -3,7 +3,7 @@ import { useStoreState } from 'easy-peasy';
 import classnames from 'classnames';
 
 import { isFunction } from '../../utils'
-import { getNodesInside } from '../../graph-utils';
+import { getNodesInside } from '../../utils/graph';
 
 const baseStyle = {
   position: 'absolute',
diff --git a/src/actions.js b/src/actions.js
index 8853702d..25eef0da 100644
--- a/src/actions.js
+++ b/src/actions.js
@@ -1,7 +1,7 @@
 import { action } from 'easy-peasy';
 import isEqual from 'fast-deep-equal';
 
-import { getBoundingBox, getNodesInside, getConnectedEdges } from './graph-utils';
+import { getBoundingBox, getNodesInside, getConnectedEdges } from './utils/graph';
 
 export default {
   setOnConnect: action((state, onConnect) => {
diff --git a/src/components/NodesSelection/index.js b/src/components/NodesSelection/index.js
index 4142fa34..4720360d 100644
--- a/src/components/NodesSelection/index.js
+++ b/src/components/NodesSelection/index.js
@@ -2,7 +2,7 @@ import React, { useState, memo } from 'react';
 import ReactDraggable from 'react-draggable';
 import { useStoreState, useStoreActions } from 'easy-peasy';
 
-import { isNode } from '../../graph-utils';
+import { isNode } from '../../utils/graph';
 
 function getStartPositions(elements) {
   return elements
diff --git a/src/container/EdgeRenderer/index.js b/src/container/EdgeRenderer/index.js
index 0d790b37..1e457170 100644
--- a/src/container/EdgeRenderer/index.js
+++ b/src/container/EdgeRenderer/index.js
@@ -2,7 +2,7 @@ import React, { memo } from 'react';
 import { useStoreState } from 'easy-peasy';
 
 import ConnectionLine from '../../components/ConnectionLine';
-import { isEdge } from '../../graph-utils';
+import { isEdge } from '../../utils/graph';
 
 function getHandlePosition(position, node, handle = null) {
   if (!handle) {
diff --git a/src/container/GraphView/index.js b/src/container/GraphView/index.js
index a5932bf5..debc50e8 100644
--- a/src/container/GraphView/index.js
+++ b/src/container/GraphView/index.js
@@ -10,7 +10,7 @@ import useD3Zoom from '../../hooks/useD3Zoom';
 import useGlobalKeyHandler from '../../hooks/useGlobalKeyHandler';
 import useElementUpdater from '../../hooks/useElementUpdater'
 import { getDimensions } from '../../utils';
-import { fitView, zoomIn, zoomOut } from '../../graph-utils';
+import { fitView, zoomIn, zoomOut } from '../../utils/graph';
 
 const GraphView = memo(({
   nodeTypes, edgeTypes, onMove, onLoad,
diff --git a/src/container/NodeRenderer/index.js b/src/container/NodeRenderer/index.js
index 1dc52b56..4c4639a9 100644
--- a/src/container/NodeRenderer/index.js
+++ b/src/container/NodeRenderer/index.js
@@ -1,7 +1,7 @@
 import React, { memo } from 'react';
 import { useStoreState } from 'easy-peasy';
 
-import { isNode } from '../../graph-utils';
+import { isNode } from '../../utils/graph';
 
 function renderNode(d, props, state) {
   const nodeType = d.type || 'default';
diff --git a/src/hooks/useElementUpdater.js b/src/hooks/useElementUpdater.js
index 618946b0..663595f7 100644
--- a/src/hooks/useElementUpdater.js
+++ b/src/hooks/useElementUpdater.js
@@ -2,7 +2,7 @@ import { useEffect } from 'react';
 import { useStoreState, useStoreActions } from 'easy-peasy';
 import isEqual from 'fast-deep-equal';
 
-import { parseElement, isNode, isEdge } from '../graph-utils';
+import { parseElement, isNode, isEdge } from '../utils/graph';
 
 const useElementUpdater = ({ elements }) => {
   const state = useStoreState(s => ({
diff --git a/src/hooks/useGlobalKeyHandler.js b/src/hooks/useGlobalKeyHandler.js
index 265bdfb1..2ec81e4e 100644
--- a/src/hooks/useGlobalKeyHandler.js
+++ b/src/hooks/useGlobalKeyHandler.js
@@ -2,7 +2,7 @@ import { useEffect } from 'react';
 import { useStoreState, useStoreActions } from 'easy-peasy';
 
 import useKeyPress from './useKeyPress';
-import { isEdge, getConnectedEdges } from '../graph-utils';
+import { isEdge, getConnectedEdges } from '../utils/graph';
 
 export default ({ deleteKeyCode, onElementsRemove }) => {
   const state = useStoreState(s => ({ selectedElements: s.selectedElements, edges: s.edges }))
diff --git a/src/index.js b/src/index.js
index 8d773897..c7e153af 100644
--- a/src/index.js
+++ b/src/index.js
@@ -10,4 +10,4 @@ export {
   isEdge,
   removeElements,
   getOutgoers
-} from './graph-utils';
+} from './utils/graph';
diff --git a/src/graph-utils.js b/src/utils/graph.js
similarity index 99%
rename from src/graph-utils.js
rename to src/utils/graph.js
index 821c5698..7a587374 100644
--- a/src/graph-utils.js
+++ b/src/utils/graph.js
@@ -1,5 +1,5 @@
 import { zoomIdentity } from 'd3-zoom';
-import store from './store';
+import store from '../store';
 
 export const isEdge = element => element.source && element.target;
 
diff --git a/src/utils.js b/src/utils/index.js
similarity index 100%
rename from src/utils.js
rename to src/utils/index.js