diff --git a/Makefile b/Makefile
index 445c8b648..0dc46f02e 100644
--- a/Makefile
+++ b/Makefile
@@ -37,7 +37,6 @@ iD.js: \
 	js/lib/marked.js \
 	js/id/start.js \
 	js/id/id.js \
-	js/id/connection.js \
 	js/id/services/*.js \
 	js/id/util.js \
 	js/id/geo.js \
diff --git a/index.html b/index.html
index 020d806bd..95091618a 100644
--- a/index.html
+++ b/index.html
@@ -170,6 +170,7 @@
         <script src='js/id/operations/reverse.js'></script>
         <script src='js/id/operations/split.js'></script>
 
+        <script src='js/id/core/connection.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>
@@ -185,7 +186,6 @@
         <script src='js/id/presets/collection.js'></script>
         <script src='js/id/presets/field.js'></script>
 
-        <script src='js/id/connection.js'></script>
         <script src='js/id/validate.js'></script>
 
         <script src='js/lib/locale.js'></script>
diff --git a/js/id/connection.js b/js/id/core/connection.js
similarity index 100%
rename from js/id/connection.js
rename to js/id/core/connection.js
diff --git a/test/index.html b/test/index.html
index ec999fbd9..16195f90f 100644
--- a/test/index.html
+++ b/test/index.html
@@ -154,6 +154,7 @@
     <script src='../js/id/operations/reverse.js'></script>
     <script src='../js/id/operations/split.js'></script>
 
+    <script src='../js/id/core/connection.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>
@@ -169,7 +170,6 @@
     <script src='../js/id/presets/collection.js'></script>
     <script src='../js/id/presets/field.js'></script>
 
-    <script src='../js/id/connection.js'></script>
     <script src='../js/id/validate.js'></script>
 
     <script src='../js/lib/locale.js'></script>
@@ -202,6 +202,7 @@
 
     <script src="spec/geo/extent.js"></script>
 
+    <script src="spec/core/connection.js"></script>
     <script src="spec/core/graph.js"></script>
     <script src="spec/core/entity.js"></script>
     <script src="spec/core/node.js"></script>
@@ -233,7 +234,6 @@
 
     <script src="spec/ui/preset/access.js"></script>
 
-    <script src="spec/connection.js"></script>
     <script src="spec/geo.js"></script>
     <script src="spec/taginfo.js"></script>
     <script src="spec/util.js"></script>
diff --git a/test/index_packaged.html b/test/index_packaged.html
index 8a4a6aa88..e2081c380 100644
--- a/test/index_packaged.html
+++ b/test/index_packaged.html
@@ -45,6 +45,7 @@
 
     <script src="spec/geo/extent.js"></script>
 
+    <script src="spec/core/connection.js"></script>
     <script src="spec/core/graph.js"></script>
     <script src="spec/core/entity.js"></script>
     <script src="spec/core/node.js"></script>
@@ -74,7 +75,6 @@
     <script src="spec/ui/confirm.js"></script>
     <script src="spec/ui/cmd.js"></script>
 
-    <script src="spec/connection.js"></script>
     <script src="spec/geo.js"></script>
     <script src="spec/taginfo.js"></script>
     <script src="spec/util.js"></script>
diff --git a/test/spec/connection.js b/test/spec/core/connection.js
similarity index 100%
rename from test/spec/connection.js
rename to test/spec/core/connection.js