diff --git a/Makefile b/Makefile
index 30c179741..826337109 100644
--- a/Makefile
+++ b/Makefile
@@ -44,7 +44,7 @@ all: \
 	js/id/modes/*.js \
 	js/id/operations.js \
 	js/id/operations/*.js \
-	js/id/graph/*.js \
+	js/id/core/*.js \
 	js/id/renderer/*.js \
 	js/id/svg.js \
 	js/id/svg/*.js \
diff --git a/combobox.html b/combobox.html
index 92949ecfa..63a2c9757 100644
--- a/combobox.html
+++ b/combobox.html
@@ -114,12 +114,12 @@
         <script src='js/id/operations/split.js'></script>
         <script src='js/id/operations/unjoin.js'></script>
 
-        <script src='js/id/graph/entity.js'></script>
-        <script src='js/id/graph/graph.js'></script>
-        <script src='js/id/graph/history.js'></script>
-        <script src='js/id/graph/node.js'></script>
-        <script src='js/id/graph/relation.js'></script>
-        <script src='js/id/graph/way.js'></script>
+        <script src='js/id/core/entity.js'></script>
+        <script src='js/id/core/graph.js'></script>
+        <script src='js/id/core/history.js'></script>
+        <script src='js/id/core/node.js'></script>
+        <script src='js/id/core/relation.js'></script>
+        <script src='js/id/core/way.js'></script>
 
         <script src='js/id/controller.js'></script>
         <script src='js/id/validate.js'></script>
diff --git a/index.html b/index.html
index 0701835f3..40a424899 100644
--- a/index.html
+++ b/index.html
@@ -130,13 +130,13 @@
         <script src='js/id/operations/reverse.js'></script>
         <script src='js/id/operations/split.js'></script>
 
-        <script src='js/id/graph/difference.js'></script>
-        <script src='js/id/graph/entity.js'></script>
-        <script src='js/id/graph/graph.js'></script>
-        <script src='js/id/graph/history.js'></script>
-        <script src='js/id/graph/node.js'></script>
-        <script src='js/id/graph/relation.js'></script>
-        <script src='js/id/graph/way.js'></script>
+        <script src='js/id/core/difference.js'></script>
+        <script src='js/id/core/entity.js'></script>
+        <script src='js/id/core/graph.js'></script>
+        <script src='js/id/core/history.js'></script>
+        <script src='js/id/core/node.js'></script>
+        <script src='js/id/core/relation.js'></script>
+        <script src='js/id/core/way.js'></script>
 
         <script src='js/id/connection.js'></script>
         <script src='js/id/validate.js'></script>
diff --git a/js/id/graph/difference.js b/js/id/core/difference.js
similarity index 100%
rename from js/id/graph/difference.js
rename to js/id/core/difference.js
diff --git a/js/id/graph/entity.js b/js/id/core/entity.js
similarity index 100%
rename from js/id/graph/entity.js
rename to js/id/core/entity.js
diff --git a/js/id/graph/graph.js b/js/id/core/graph.js
similarity index 100%
rename from js/id/graph/graph.js
rename to js/id/core/graph.js
diff --git a/js/id/graph/history.js b/js/id/core/history.js
similarity index 100%
rename from js/id/graph/history.js
rename to js/id/core/history.js
diff --git a/js/id/graph/node.js b/js/id/core/node.js
similarity index 100%
rename from js/id/graph/node.js
rename to js/id/core/node.js
diff --git a/js/id/graph/relation.js b/js/id/core/relation.js
similarity index 100%
rename from js/id/graph/relation.js
rename to js/id/core/relation.js
diff --git a/js/id/graph/way.js b/js/id/core/way.js
similarity index 100%
rename from js/id/graph/way.js
rename to js/id/core/way.js
diff --git a/test/index.html b/test/index.html
index ca610d714..52e13f03d 100644
--- a/test/index.html
+++ b/test/index.html
@@ -124,13 +124,13 @@
     <script src='../js/id/operations/reverse.js'></script>
     <script src='../js/id/operations/split.js'></script>
 
-    <script src='../js/id/graph/difference.js'></script>
-    <script src='../js/id/graph/entity.js'></script>
-    <script src='../js/id/graph/graph.js'></script>
-    <script src='../js/id/graph/history.js'></script>
-    <script src='../js/id/graph/node.js'></script>
-    <script src='../js/id/graph/relation.js'></script>
-    <script src='../js/id/graph/way.js'></script>
+    <script src='../js/id/core/difference.js'></script>
+    <script src='../js/id/core/entity.js'></script>
+    <script src='../js/id/core/graph.js'></script>
+    <script src='../js/id/core/history.js'></script>
+    <script src='../js/id/core/node.js'></script>
+    <script src='../js/id/core/relation.js'></script>
+    <script src='../js/id/core/way.js'></script>
 
     <script src='../js/id/connection.js'></script>
 
@@ -163,13 +163,13 @@
 
     <script src="spec/geo/extent.js"></script>
 
-    <script src="spec/graph/graph.js"></script>
-    <script src="spec/graph/entity.js"></script>
-    <script src="spec/graph/node.js"></script>
-    <script src="spec/graph/way.js"></script>
-    <script src="spec/graph/relation.js"></script>
-    <script src="spec/graph/history.js"></script>
-    <script src="spec/graph/difference.js"></script>
+    <script src="spec/core/graph.js"></script>
+    <script src="spec/core/entity.js"></script>
+    <script src="spec/core/node.js"></script>
+    <script src="spec/core/way.js"></script>
+    <script src="spec/core/relation.js"></script>
+    <script src="spec/core/history.js"></script>
+    <script src="spec/core/difference.js"></script>
 
     <script src="spec/renderer/background.js"></script>
     <script src="spec/renderer/map.js"></script>
diff --git a/test/index_packaged.html b/test/index_packaged.html
index 1102336d9..cd3451357 100644
--- a/test/index_packaged.html
+++ b/test/index_packaged.html
@@ -43,13 +43,13 @@
 
     <script src="spec/geo/extent.js"></script>
 
-    <script src="spec/graph/graph.js"></script>
-    <script src="spec/graph/entity.js"></script>
-    <script src="spec/graph/node.js"></script>
-    <script src="spec/graph/way.js"></script>
-    <script src="spec/graph/relation.js"></script>
-    <script src="spec/graph/history.js"></script>
-    <script src="spec/graph/difference.js"></script>
+    <script src="spec/core/graph.js"></script>
+    <script src="spec/core/entity.js"></script>
+    <script src="spec/core/node.js"></script>
+    <script src="spec/core/way.js"></script>
+    <script src="spec/core/relation.js"></script>
+    <script src="spec/core/history.js"></script>
+    <script src="spec/core/difference.js"></script>
 
     <script src="spec/renderer/background.js"></script>
     <script src="spec/renderer/map.js"></script>
diff --git a/test/rendering.html b/test/rendering.html
index ff624305a..cd75a848b 100644
--- a/test/rendering.html
+++ b/test/rendering.html
@@ -26,12 +26,12 @@
     <script src="../js/id/svg/tag_classes.js"></script>
     <script src="../js/id/svg/vertices.js"></script>
 
-    <script src='../js/id/graph/entity.js'></script>
-    <script src='../js/id/graph/graph.js'></script>
-    <script src='../js/id/graph/history.js'></script>
-    <script src='../js/id/graph/node.js'></script>
-    <script src='../js/id/graph/relation.js'></script>
-    <script src='../js/id/graph/way.js'></script>
+    <script src='../js/id/core/entity.js'></script>
+    <script src='../js/id/core/graph.js'></script>
+    <script src='../js/id/core/history.js'></script>
+    <script src='../js/id/core/node.js'></script>
+    <script src='../js/id/core/relation.js'></script>
+    <script src='../js/id/core/way.js'></script>
 
     <form style="position: fixed; right: 10px; bottom: 10px">
         <input id="background-color" type="range" min="0" max="255" value="255">
diff --git a/test/spec/graph/difference.js b/test/spec/core/difference.js
similarity index 100%
rename from test/spec/graph/difference.js
rename to test/spec/core/difference.js
diff --git a/test/spec/graph/entity.js b/test/spec/core/entity.js
similarity index 100%
rename from test/spec/graph/entity.js
rename to test/spec/core/entity.js
diff --git a/test/spec/graph/graph.js b/test/spec/core/graph.js
similarity index 100%
rename from test/spec/graph/graph.js
rename to test/spec/core/graph.js
diff --git a/test/spec/graph/history.js b/test/spec/core/history.js
similarity index 100%
rename from test/spec/graph/history.js
rename to test/spec/core/history.js
diff --git a/test/spec/graph/node.js b/test/spec/core/node.js
similarity index 100%
rename from test/spec/graph/node.js
rename to test/spec/core/node.js
diff --git a/test/spec/graph/relation.js b/test/spec/core/relation.js
similarity index 100%
rename from test/spec/graph/relation.js
rename to test/spec/core/relation.js
diff --git a/test/spec/graph/way.js b/test/spec/core/way.js
similarity index 100%
rename from test/spec/graph/way.js
rename to test/spec/core/way.js