diff --git a/Makefile b/Makefile
index 38244edc3..a501d0d20 100644
--- a/Makefile
+++ b/Makefile
@@ -40,7 +40,7 @@ all: \
 	js/id/modes/*.js \
 	js/id/operations.js \
 	js/id/operations/*.js \
-	js/id/controller/*.js \
+	js/id/controller.js \
 	js/id/graph/*.js \
 	js/id/renderer/*.js \
 	js/id/svg.js \
diff --git a/index.html b/index.html
index 3bb3152e4..e5e202c4a 100644
--- a/index.html
+++ b/index.html
@@ -114,16 +114,15 @@
         <script src='js/id/operations/split.js'></script>
         <script src='js/id/operations/unjoin.js'></script>
 
-        <script src='js/id/controller/controller.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/validate.js'></script>
 
+        <script src='js/id/controller.js'></script>
+        <script src='js/id/validate.js'></script>
         <script src='js/id/connection.js'></script>
 
         <script src='locale/locale.js'></script>
diff --git a/js/id/controller/controller.js b/js/id/controller.js
similarity index 100%
rename from js/id/controller/controller.js
rename to js/id/controller.js
diff --git a/test/index.html b/test/index.html
index 90e5bc9fa..52070c414 100644
--- a/test/index.html
+++ b/test/index.html
@@ -109,8 +109,6 @@
     <script src='../js/id/operations/split.js'></script>
     <script src='../js/id/operations/unjoin.js'></script>
 
-    <script src='../js/id/controller/controller.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>
@@ -119,6 +117,7 @@
     <script src='../js/id/graph/way.js'></script>
 
     <script src='../js/id/connection.js'></script>
+    <script src='../js/id/controller.js'></script>
 
     <script src='../locale/locale.js'></script>
     <script src='../locale/en.js'></script>