diff --git a/test/index.html b/test/index.html
index 657c9c9a1..68645b217 100644
--- a/test/index.html
+++ b/test/index.html
@@ -37,28 +37,22 @@
 
     <script src='../js/id/id.js'></script>
     <script src='../js/lib/id/index.js'></script>
-
     <script src='../js/lib/locale.js'></script>
 
     <script src='../data/data_dev.js'></script>
 
     <script src='spec/spec_helpers.js'></script>
 
-    <!-- include spec files here... -->
-    <script src='spec/lib/d3.combobox.js'></script>
-    <script src='spec/lib/d3.keybinding.js'></script>
-    <!-- <script src='spec/lib/diff3.js'></script> -->
-    <script src='spec/lib/locale.js'></script>
+    <!-- include spec files below... -->
+    <script src='spec/id.js'></script>
 
+    <script src='spec/actions/add_entity.js'></script>
     <script src='spec/actions/add_member.js'></script>
     <script src='spec/actions/add_midpoint.js'></script>
-    <script src='spec/actions/add_entity.js'></script>
     <script src='spec/actions/change_member.js'></script>
     <script src='spec/actions/change_preset.js'></script>
     <script src='spec/actions/change_tags.js'></script>
     <script src='spec/actions/circularize.js'></script>
-    <script src='spec/actions/orthogonalize.js'></script>
-    <script src='spec/actions/straighten.js'></script>
     <script src='spec/actions/connect.js'></script>
     <script src='spec/actions/copy_entities.js'></script>
     <script src='spec/actions/delete_member.js'></script>
@@ -72,75 +66,81 @@
     <script src='spec/actions/merge.js'></script>
     <script src='spec/actions/merge_polygon.js'></script>
     <script src='spec/actions/merge_remote_changes.js'></script>
-    <script src='spec/actions/move_node.js'></script>
     <script src='spec/actions/move.js'></script>
+    <script src='spec/actions/move_node.js'></script>
     <script src='spec/actions/noop.js'></script>
+    <script src='spec/actions/orthogonalize.js'></script>
     <script src='spec/actions/restrict_turn.js'></script>
     <script src='spec/actions/reverse.js'></script>
     <script src='spec/actions/revert.js'></script>
     <script src='spec/actions/split.js'></script>
+    <script src='spec/actions/straighten.js'></script>
     <script src='spec/actions/unrestrict_turn.js'></script>
 
-    <script src='spec/geo.js'></script>
-    <script src='spec/geo/extent.js'></script>
-    <script src='spec/geo/intersection.js'></script>
-    <script src='spec/geo/multipolygon.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>
-    <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/core/tree.js'></script>
-
-    <script src='spec/renderer/tile_layer.js'></script>
-    <script src='spec/renderer/background_source.js'></script>
-    <script src='spec/renderer/features.js'></script>
-    <script src='spec/renderer/map.js'></script>
-
-    <script src='spec/svg.js'></script>
-    <script src='spec/svg/areas.js'></script>
-    <script src='spec/svg/icon.js'></script>
-    <script src='spec/svg/lines.js'></script>
-    <script src='spec/svg/midpoints.js'></script>
-    <script src='spec/svg/points.js'></script>
-    <script src='spec/svg/vertices.js'></script>
-    <script src='spec/svg/tag_classes.js'></script>
-
-    <script src='spec/ui/inspector.js'></script>
-    <script src='spec/ui/raw_tag_editor.js'></script>
-    <script src='spec/ui/modal.js'></script>
-    <script src='spec/ui/flash.js'></script>
-    <script src='spec/ui/confirm.js'></script>
-    <script src='spec/ui/cmd.js'></script>
-
-    <script src='spec/ui/fields/access.js'></script>
-    <script src='spec/ui/fields/localized.js'></script>
-    <script src='spec/ui/fields/wikipedia.js'></script>
-
-    <script src='spec/services/mapillary.js'></script>
-    <script src='spec/services/nominatim.js'></script>
-    <script src='spec/services/taginfo.js'></script>
-
-    <script src='spec/util.js'></script>
-    <script src='spec/util/session_mutex.js'></script>
-    <script src='spec/util/suggest_names.js'></script>
-
     <script src='spec/behavior/hash.js'></script>
     <script src='spec/behavior/hover.js'></script>
     <script src='spec/behavior/select.js'></script>
     <script src='spec/behavior/lasso.js'></script>
 
+    <script src='spec/core/connection.js'></script>
+    <script src='spec/core/difference.js'></script>
+    <script src='spec/core/entity.js'></script>
+    <script src='spec/core/graph.js'></script>
+    <script src='spec/core/history.js'></script>
+    <script src='spec/core/node.js'></script>
+    <script src='spec/core/relation.js'></script>
+    <script src='spec/core/tree.js'></script>
+    <script src='spec/core/way.js'></script>
+
+    <script src='spec/geo/extent.js'></script>
+    <script src='spec/geo/geo.js'></script>
+    <script src='spec/geo/intersection.js'></script>
+    <script src='spec/geo/multipolygon.js'></script>
+
+    <script src='spec/lib/d3.combobox.js'></script>
+    <script src='spec/lib/d3.keybinding.js'></script>
+    <!-- <script src='spec/lib/diff3.js'></script> -->
+    <script src='spec/lib/locale.js'></script>
+
     <script src='spec/modes/add_point.js'></script>
 
-    <script src='spec/presets.js'></script>
-    <script src='spec/presets/preset.js'></script>
-    <script src='spec/presets/collection.js'></script>
     <script src='spec/presets/category.js'></script>
-    <script src='spec/id.js'></script>
+    <script src='spec/presets/collection.js'></script>
+    <script src='spec/presets/preset.js'></script>
+    <script src='spec/presets/presets.js'></script>
+
+    <script src='spec/renderer/background_source.js'></script>
+    <script src='spec/renderer/features.js'></script>
+    <script src='spec/renderer/map.js'></script>
+    <script src='spec/renderer/tile_layer.js'></script>
+
+    <script src='spec/services/mapillary.js'></script>
+    <script src='spec/services/nominatim.js'></script>
+    <script src='spec/services/taginfo.js'></script>
+
+    <script src='spec/svg/areas.js'></script>
+    <script src='spec/svg/icon.js'></script>
+    <script src='spec/svg/lines.js'></script>
+    <script src='spec/svg/midpoints.js'></script>
+    <script src='spec/svg/points.js'></script>
+    <script src='spec/svg/svg.js'></script>
+    <script src='spec/svg/tag_classes.js'></script>
+    <script src='spec/svg/vertices.js'></script>
+
+    <script src='spec/ui/cmd.js'></script>
+    <script src='spec/ui/confirm.js'></script>
+    <script src='spec/ui/flash.js'></script>
+    <script src='spec/ui/inspector.js'></script>
+    <script src='spec/ui/modal.js'></script>
+    <script src='spec/ui/raw_tag_editor.js'></script>
+
+    <script src='spec/ui/fields/access.js'></script>
+    <script src='spec/ui/fields/localized.js'></script>
+    <script src='spec/ui/fields/wikipedia.js'></script>
+
+    <script src='spec/util/session_mutex.js'></script>
+    <script src='spec/util/suggest_names.js'></script>
+    <script src='spec/util/util.js'></script>
 
     <script>
         iD.data.load('../', function() {
diff --git a/test/index_packaged.html b/test/index_packaged.html
index 4c612aeeb..5ca305189 100644
--- a/test/index_packaged.html
+++ b/test/index_packaged.html
@@ -28,9 +28,8 @@
 
     <script src='spec/spec_helpers.js'></script>
 
-    <!-- include spec files here... -->
-    <script src='spec/lib/d3.keybinding.js'></script>
-    <script src='spec/lib/locale.js'></script>
+    <!-- include spec files below... -->
+    <script src='spec/id.js'></script>
 
     <script src='spec/actions/add_entity.js'></script>
     <script src='spec/actions/add_member.js'></script>
@@ -63,66 +62,70 @@
     <script src='spec/actions/straighten.js'></script>
     <script src='spec/actions/unrestrict_turn.js'></script>
 
-    <script src='spec/geo.js'></script>
-    <script src='spec/geo/extent.js'></script>
-    <script src='spec/geo/intersection.js'></script>
-    <script src='spec/geo/multipolygon.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>
-    <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/core/tree.js'></script>
-
-    <script src='spec/renderer/tile_layer.js'></script>
-    <script src='spec/renderer/background_source.js'></script>
-    <script src='spec/renderer/features.js'></script>
-    <script src='spec/renderer/map.js'></script>
-
-    <script src='spec/svg.js'></script>
-    <script src='spec/svg/areas.js'></script>
-    <script src='spec/svg/icon.js'></script>
-    <script src='spec/svg/lines.js'></script>
-    <script src='spec/svg/midpoints.js'></script>
-    <script src='spec/svg/points.js'></script>
-    <script src='spec/svg/vertices.js'></script>
-    <script src='spec/svg/tag_classes.js'></script>
-
-    <script src='spec/ui/inspector.js'></script>
-    <script src='spec/ui/raw_tag_editor.js'></script>
-    <script src='spec/ui/modal.js'></script>
-    <script src='spec/ui/flash.js'></script>
-    <script src='spec/ui/confirm.js'></script>
-    <script src='spec/ui/cmd.js'></script>
-
-    <script src='spec/ui/preset/access.js'></script>
-    <script src='spec/ui/preset/localized.js'></script>
-    <script src='spec/ui/preset/wikipedia.js'></script>
-
-    <script src='spec/services/mapillary.js'></script>
-    <script src='spec/services/nominatim.js'></script>
-    <script src='spec/services/taginfo.js'></script>
-
-    <script src='spec/util.js'></script>
-    <script src='spec/util/session_mutex.js'></script>
-    <script src='spec/util/suggest_names.js'></script>
-
     <script src='spec/behavior/hash.js'></script>
     <script src='spec/behavior/hover.js'></script>
     <script src='spec/behavior/select.js'></script>
     <script src='spec/behavior/lasso.js'></script>
 
+    <script src='spec/core/connection.js'></script>
+    <script src='spec/core/difference.js'></script>
+    <script src='spec/core/entity.js'></script>
+    <script src='spec/core/graph.js'></script>
+    <script src='spec/core/history.js'></script>
+    <script src='spec/core/node.js'></script>
+    <script src='spec/core/relation.js'></script>
+    <script src='spec/core/tree.js'></script>
+    <script src='spec/core/way.js'></script>
+
+    <script src='spec/geo/extent.js'></script>
+    <script src='spec/geo/geo.js'></script>
+    <script src='spec/geo/intersection.js'></script>
+    <script src='spec/geo/multipolygon.js'></script>
+
+    <script src='spec/lib/d3.combobox.js'></script>
+    <script src='spec/lib/d3.keybinding.js'></script>
+    <!-- <script src='spec/lib/diff3.js'></script> -->
+    <script src='spec/lib/locale.js'></script>
+
     <script src='spec/modes/add_point.js'></script>
 
-    <script src='spec/presets.js'></script>
-    <script src='spec/presets/preset.js'></script>
-    <script src='spec/presets/collection.js'></script>
     <script src='spec/presets/category.js'></script>
-    <script src='spec/id.js'></script>
+    <script src='spec/presets/collection.js'></script>
+    <script src='spec/presets/preset.js'></script>
+    <script src='spec/presets/presets.js'></script>
+
+    <script src='spec/renderer/background_source.js'></script>
+    <script src='spec/renderer/features.js'></script>
+    <script src='spec/renderer/map.js'></script>
+    <script src='spec/renderer/tile_layer.js'></script>
+
+    <script src='spec/services/mapillary.js'></script>
+    <script src='spec/services/nominatim.js'></script>
+    <script src='spec/services/taginfo.js'></script>
+
+    <script src='spec/svg/areas.js'></script>
+    <script src='spec/svg/icon.js'></script>
+    <script src='spec/svg/lines.js'></script>
+    <script src='spec/svg/midpoints.js'></script>
+    <script src='spec/svg/points.js'></script>
+    <script src='spec/svg/svg.js'></script>
+    <script src='spec/svg/tag_classes.js'></script>
+    <script src='spec/svg/vertices.js'></script>
+
+    <script src='spec/ui/cmd.js'></script>
+    <script src='spec/ui/confirm.js'></script>
+    <script src='spec/ui/flash.js'></script>
+    <script src='spec/ui/inspector.js'></script>
+    <script src='spec/ui/modal.js'></script>
+    <script src='spec/ui/raw_tag_editor.js'></script>
+
+    <script src='spec/ui/fields/access.js'></script>
+    <script src='spec/ui/fields/localized.js'></script>
+    <script src='spec/ui/fields/wikipedia.js'></script>
+
+    <script src='spec/util/session_mutex.js'></script>
+    <script src='spec/util/suggest_names.js'></script>
+    <script src='spec/util/util.js'></script>
 
     <script>
         window.mocha.run();
diff --git a/test/spec/geo.js b/test/spec/geo/geo.js
similarity index 100%
rename from test/spec/geo.js
rename to test/spec/geo/geo.js
diff --git a/test/spec/presets.js b/test/spec/presets/presets.js
similarity index 100%
rename from test/spec/presets.js
rename to test/spec/presets/presets.js
diff --git a/test/spec/svg.js b/test/spec/svg/svg.js
similarity index 100%
rename from test/spec/svg.js
rename to test/spec/svg/svg.js
diff --git a/test/spec/util.js b/test/spec/util/util.js
similarity index 100%
rename from test/spec/util.js
rename to test/spec/util/util.js