diff --git a/index.html b/index.html
index f45f10d6c..fb5c184ff 100644
--- a/index.html
+++ b/index.html
@@ -56,18 +56,18 @@
         <script src='js/id/renderer/background.js'></script>
         <script src='js/id/renderer/background_source.js'></script>
         <script src='js/id/renderer/features.js'></script>
-        <script src='js/id/renderer/gpx_layer.js'></script>
-        <script src='js/id/renderer/tile_layer.js'></script>
         <script src='js/id/renderer/map.js'></script>
-        <script src='js/id/renderer/mapillary_image_layer.js'></script>
-        <script src='js/id/renderer/mapillary_sign_layer.js'></script>
+        <script src='js/id/renderer/tile_layer.js'></script>
 
         <script src="js/id/svg.js"></script>
         <script src="js/id/svg/areas.js"></script>
         <script src="js/id/svg/defs.js"></script>
+        <script src='js/id/svg/gpx.js'></script>
         <script src="js/id/svg/icon.js"></script>
         <script src="js/id/svg/labels.js"></script>
         <script src="js/id/svg/lines.js"></script>
+        <script src='js/id/svg/mapillary_images.js'></script>
+        <script src='js/id/svg/mapillary_signs.js'></script>
         <script src="js/id/svg/midpoints.js"></script>
         <script src="js/id/svg/points.js"></script>
         <script src="js/id/svg/surface.js"></script>
diff --git a/js/id/renderer/background.js b/js/id/renderer/background.js
index cfc8d37e0..305ab66e0 100644
--- a/js/id/renderer/background.js
+++ b/js/id/renderer/background.js
@@ -2,7 +2,7 @@ iD.Background = function(context) {
     var dispatch = d3.dispatch('change'),
         baseLayer = iD.TileLayer()
             .projection(context.projection),
-        gpxLayer = iD.GpxLayer(context, dispatch)
+        gpxLayer = iD.svg.Gpx(context, dispatch)
             .projection(context.projection),
         mapillaryImageLayer,
         mapillarySignLayer,
@@ -98,7 +98,7 @@ iD.Background = function(context) {
             .attr('class', 'layer-layer layer-mapillary-images');
 
         if (supportsMapillaryImages) {
-            if (!mapillaryImageLayer) { mapillaryImageLayer = iD.MapillaryImageLayer(context); }
+            if (!mapillaryImageLayer) { mapillaryImageLayer = iD.svg.MapillaryImages(context); }
             mapillaryImages.call(mapillaryImageLayer);
         } else {
             mapillaryImageLayer = null;
@@ -115,7 +115,7 @@ iD.Background = function(context) {
             .attr('class', 'layer-layer layer-mapillary-signs');
 
         if (supportsMapillarySigns) {
-            if (!mapillarySignLayer) { mapillarySignLayer = iD.MapillarySignLayer(context); }
+            if (!mapillarySignLayer) { mapillarySignLayer = iD.svg.MapillarySigns(context); }
             mapillarySigns.call(mapillarySignLayer);
         } else {
             mapillarySignLayer = null;
diff --git a/js/id/renderer/gpx_layer.js b/js/id/svg/gpx.js
similarity index 98%
rename from js/id/renderer/gpx_layer.js
rename to js/id/svg/gpx.js
index 9557aa1a4..c12326a1e 100644
--- a/js/id/renderer/gpx_layer.js
+++ b/js/id/svg/gpx.js
@@ -1,4 +1,4 @@
-iD.GpxLayer = function(context) {
+iD.svg.Gpx = function(context) {
     var projection,
         gj = {},
         enable = true,
diff --git a/js/id/renderer/mapillary_image_layer.js b/js/id/svg/mapillary_images.js
similarity index 99%
rename from js/id/renderer/mapillary_image_layer.js
rename to js/id/svg/mapillary_images.js
index 544ef011b..6f061cd8b 100644
--- a/js/id/renderer/mapillary_image_layer.js
+++ b/js/id/svg/mapillary_images.js
@@ -1,4 +1,4 @@
-iD.MapillaryImageLayer = function(context) {
+iD.svg.MapillaryImages = function(context) {
     var debouncedRedraw = _.debounce(function () { context.pan([0,0]); }, 1000),
         enabled = false,
         minZoom = 12,
diff --git a/js/id/renderer/mapillary_sign_layer.js b/js/id/svg/mapillary_signs.js
similarity index 99%
rename from js/id/renderer/mapillary_sign_layer.js
rename to js/id/svg/mapillary_signs.js
index 88dea7292..56375bd42 100644
--- a/js/id/renderer/mapillary_sign_layer.js
+++ b/js/id/svg/mapillary_signs.js
@@ -1,4 +1,4 @@
-iD.MapillarySignLayer = function(context) {
+iD.svg.MapillarySigns = function(context) {
     var debouncedRedraw = _.debounce(function () { context.pan([0,0]); }, 1000),
         enabled = false,
         minZoom = 12,
diff --git a/js/id/ui/map_in_map.js b/js/id/ui/map_in_map.js
index d57026aa3..58a08874b 100644
--- a/js/id/ui/map_in_map.js
+++ b/js/id/ui/map_in_map.js
@@ -2,11 +2,10 @@ iD.ui.MapInMap = function(context) {
     var key = '/';
 
     function map_in_map(selection) {
-
         var backgroundLayer = iD.TileLayer(),
             overlayLayers = {},
             dispatch = d3.dispatch('change'),
-            gpxLayer = iD.GpxLayer(context, dispatch),
+            gpxLayer = iD.svg.Gpx(context, dispatch),
             projection = iD.geo.RawMercator(),
             zoom = d3.behavior.zoom()
                 .scaleExtent([ztok(0.5), ztok(24)])
diff --git a/test/index.html b/test/index.html
index 83f8b99fc..febd5a40a 100644
--- a/test/index.html
+++ b/test/index.html
@@ -62,17 +62,17 @@
     <script src='../js/id/renderer/background_source.js'></script>
     <script src='../js/id/renderer/features.js'></script>
     <script src='../js/id/renderer/map.js'></script>
-    <script src='../js/id/renderer/gpx_layer.js'></script>
     <script src='../js/id/renderer/tile_layer.js'></script>
-    <script src='../js/id/renderer/mapillary_image_layer.js'></script>
-    <script src='../js/id/renderer/mapillary_sign_layer.js'></script>
 
     <script src="../js/id/svg.js"></script>
     <script src="../js/id/svg/areas.js"></script>
     <script src="../js/id/svg/defs.js"></script>
+    <script src='../js/id/svg/gpx.js'></script>
     <script src="../js/id/svg/icon.js"></script>
     <script src="../js/id/svg/labels.js"></script>
     <script src="../js/id/svg/lines.js"></script>
+    <script src='../js/id/svg/mapillary_images.js'></script>
+    <script src='../js/id/svg/mapillary_signs.js'></script>
     <script src="../js/id/svg/midpoints.js"></script>
     <script src="../js/id/svg/points.js"></script>
     <script src="../js/id/svg/surface.js"></script>