diff --git a/Makefile b/Makefile
index 56bc73fb7..0013c4616 100644
--- a/Makefile
+++ b/Makefile
@@ -10,18 +10,8 @@ all: \
 	iD.js \
 	iD.min.js
 
-PRESET_FILES = $(shell find data/presets/presets -type f -name '*.json')
-
-data/presets/presets.json: $(PRESET_FILES)
-	./data/presets/build.sh
-
-# TODO: write a nice node script for this
-data/data.js: \
-	data \
-	data/deprecated.json \
-	data/discarded.json \
-	data/imagery.json \
-	data/keys.json
+DATA_FILES = $(shell find data -type f -name '*.json')
+data/data.js: $(DATA_FILES)
 	node build.js
 
 .INTERMEDIATE iD.js: \
@@ -81,6 +71,3 @@ iD.js: Makefile
 
 clean:
 	rm -f iD*.js
-
-presets:
-	./data/presets/build.sh
diff --git a/build.js b/build.js
index b0fa50056..0ae633dcd 100644
--- a/build.js
+++ b/build.js
@@ -23,6 +23,7 @@ fs.writeFileSync('data/data.js', 'iD.data = ' + JSON.stringify({
     discarded: r('discarded.json'),
     imagery: r('imagery.json'),
     keys: r('keys.json'),
+    imagery: r('imagery.json'),
     presets: {
         presets: rp('presets.json'),
         defaults: rp('defaults.json'),
diff --git a/index.html b/index.html
index b5db2965e..2ecdca4e2 100644
--- a/index.html
+++ b/index.html
@@ -13,209 +13,36 @@
         <meta name='apple-mobile-web-app-capable' content='yes' />
         <meta name='apple-mobile-web-app-status-bar-style' content='black-translucent' />
 
-        <script src='js/lib/lodash.js'></script>
-        <script src='js/lib/d3.v3.js'></script>
-        <script src='js/lib/sha.js'></script>
-        <script src='js/lib/ohauth.js'></script>
-        <script src='js/lib/jxon.js'></script>
-        <script src='js/lib/d3.typeahead.js'></script>
-        <script src='js/lib/d3.combobox.js'></script>
-        <script src='js/lib/d3.rowselect.js'></script>
-        <script src='js/lib/d3.checkselect.js'></script>
-        <script src='js/lib/d3.geo.tile.js'></script>
-        <script src='js/lib/d3.size.js'></script>
-        <script src='js/lib/d3.trigger.js'></script>
-        <script src='js/lib/d3.keybinding.js'></script>
-        <script src='js/lib/d3.one.js'></script>
-        <script src='js/lib/d3-compat.js'></script>
-        <script src='js/lib/bootstrap-tooltip.js'></script>
-        <script src='js/lib/rtree.js'></script>
+        <script src='//d3nslu0hdya83q.cloudfront.net/dist/1.0/raven.min.js'></script>
 
-        <script src='js/id/id.js'></script>
-        <script src='js/id/util.js'></script>
-        <script src='js/id/oauth.js'></script>
-        <script src='js/id/services/taginfo.js'></script>
-
-        <script src='data/data_dev.js'></script>
-
-        <script src="js/id/geo.js"></script>
-        <script src="js/id/geo/extent.js"></script>
-
-        <script src='js/id/renderer/background.js'></script>
-        <script src='js/id/renderer/background_source.js'></script>
-        <script src='js/id/renderer/map.js'></script>
-
-        <script src="js/id/svg.js"></script>
-        <script src="js/id/svg/areas.js"></script>
-        <script src="js/id/svg/lines.js"></script>
-        <script src="js/id/svg/member_classes.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>
-        <script src="js/id/svg/tag_classes.js"></script>
-        <script src="js/id/svg/vertices.js"></script>
-        <script src="js/id/svg/labels.js"></script>
-
-        <script src="js/id/ui.js"></script>
-        <script src='js/id/ui/attribution.js'></script>
-        <script src='js/id/ui/radial_menu.js'></script>
-        <script src='js/id/ui/inspector.js'></script>
-        <script src='js/id/ui/modal.js'></script>
-        <script src='js/id/ui/cmd.js'></script>
-        <script src='js/id/ui/confirm.js'></script>
-        <script src='js/id/ui/commit.js'></script>
-        <script src='js/id/ui/success.js'></script>
-        <script src='js/id/ui/loading.js'></script>
-        <script src='js/id/ui/account.js'></script>
-        <script src='js/id/ui/background.js'></script>
-        <script src='js/id/ui/modes.js'></script>
-        <script src='js/id/ui/contributors.js'></script>
-        <script src='js/id/ui/geocoder.js'></script>
-        <script src='js/id/ui/geolocate.js'></script>
-        <script src='js/id/ui/notice.js'></script>
-        <script src='js/id/ui/flash.js'></script>
-        <script src='js/id/ui/save.js'></script>
-        <script src='js/id/ui/splash.js'></script>
-        <script src='js/id/ui/spinner.js'></script>
-        <script src='js/id/ui/restore.js'></script>
-        <script src='js/id/ui/tag_reference.js'></script>
-        <script src='js/id/ui/key_reference.js'></script>
-        <script src='js/id/ui/preset.js'></script>
-        <script src='js/id/ui/lasso.js'></script>
-        <script src='js/id/ui/source_switch.js'></script>
-        <script src='js/id/ui/toggle.js'></script>
-        <script src='js/id/ui/undo_redo.js'></script>
-        <script src='js/id/ui/zoom.js'></script>
-        <script src='js/id/ui/taglist.js'></script>
-        <script src='js/id/ui/preset_grid.js'></script>
-        <script src='js/id/ui/tag_editor.js'></script>
-        <script src='js/id/ui/tail.js'></script>
-        <script src='js/id/ui/preset/address.js'></script>
-
-        <script src='js/id/actions.js'></script>
-        <script src="js/id/actions/add_midpoint.js"></script>
-        <script src='js/id/actions/add_entity.js'></script>
-        <script src='js/id/actions/add_vertex.js'></script>
-        <script src='js/id/actions/change_tags.js'></script>
-        <script src='js/id/actions/connect.js'></script>
-        <script src='js/id/actions/delete_multiple.js'></script>
-        <script src='js/id/actions/delete_node.js'></script>
-        <script src="js/id/actions/delete_relation.js"></script>
-        <script src="js/id/actions/delete_way.js"></script>
-        <script src='js/id/actions/disconnect.js'></script>
-        <script src='js/id/actions/join.js'></script>
-        <script src='js/id/actions/merge.js'></script>
-        <script src='js/id/actions/move_node.js'></script>
-        <script src='js/id/actions/move.js'></script>
-        <script src='js/id/actions/rotate_way.js'></script>
-        <script src='js/id/actions/circularize.js'></script>
-        <script src='js/id/actions/orthogonalize.js'></script>
-        <script src='js/id/actions/noop.js'></script>
-        <script src='js/id/actions/reverse.js'></script>
-        <script src='js/id/actions/split.js'></script>
-
-        <script src='js/id/behavior.js'></script>
-        <script src='js/id/behavior/add_way.js'></script>
-        <script src='js/id/behavior/accept.js'></script>
-        <script src='js/id/behavior/drag.js'></script>
-        <script src='js/id/behavior/drag_node.js'></script>
-        <script src='js/id/behavior/draw.js'></script>
-        <script src='js/id/behavior/lasso.js'></script>
-        <script src='js/id/behavior/draw_way.js'></script>
-        <script src='js/id/behavior/hash.js'></script>
-        <script src='js/id/behavior/hover.js'></script>
-        <script src='js/id/behavior/select.js'></script>
-
-        <script src='js/id/modes.js'></script>
-        <script src='js/id/modes/add_area.js'></script>
-        <script src='js/id/modes/add_point.js'></script>
-        <script src='js/id/modes/add_line.js'></script>
-        <script src='js/id/modes/browse.js'></script>
-        <script src='js/id/modes/draw_area.js'></script>
-        <script src='js/id/modes/draw_line.js'></script>
-        <script src='js/id/modes/move.js'></script>
-        <script src='js/id/modes/rotate_way.js'></script>
-        <script src='js/id/modes/select.js'></script>
-
-        <script src='js/id/operations.js'></script>
-        <script src='js/id/operations/circularize.js'></script>
-        <script src='js/id/operations/orthogonalize.js'></script>
-        <script src='js/id/operations/delete.js'></script>
-        <script src='js/id/operations/disconnect.js'></script>
-        <script src='js/id/operations/merge.js'></script>
-        <script src='js/id/operations/move.js'></script>
-        <script src='js/id/operations/rotate.js'></script>
-        <script src='js/id/operations/reverse.js'></script>
-        <script src='js/id/operations/split.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/core/tree.js'></script>
-
-        <script src='js/id/presets.js'></script>
-        <script src='js/id/presets/preset.js'></script>
-        <script src='js/id/presets/category.js'></script>
-        <script src='js/id/presets/collection.js'></script>
-
-        <script src='js/id/connection.js'></script>
-        <script src='js/id/validate.js'></script>
-
-        <script src='js/lib/locale.js'></script>
-        <script src='locale/da.js'></script>
-        <script src='locale/de.js'></script>
-        <script src='locale/en.js'></script>
-        <script src='locale/es.js'></script>
-        <script src='locale/fr.js'></script>
-        <script src='locale/it.js'></script>
-        <script src='locale/ja.js'></script>
-        <script src='locale/lv.js'></script>
-        <script src='locale/nl.js'></script>
-        <script src='locale/pl.js'></script>
-        <script src='locale/ru.js'></script>
-        <script src='locale/tr.js'></script>
-        <script src='locale/uk.js'></script>
-        <script src='locale/vi.js'></script>
+        <script>
+            Raven.config('https://af8ce79129b24fa28d91ede59302369c@app.getsentry.com/6009').install();
+        </script>
 
+        <script src='iD.js'></script>
     </head>
     <body>
         <div id='iD'></div>
         <script>
-            iD.data.load(function() {
-                var id = iD();
-                d3.select("#iD")
-                    .call(id.ui());
-            });
+            // google analytics
+            var _gaq = _gaq || [];
+            _gaq.push(['_setAccount', 'UA-38039653-2']);
+            _gaq.push(['_trackPageview']);
+            (function() {
+              var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+              ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+              var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+            })();
+
+            // crazyegg
+            setTimeout(function(){var a=document.createElement("script");
+            var b=document.getElementsByTagName("script")[0];
+            a.src=document.location.protocol+"//dnn506yrbagrg.cloudfront.net/pages/scripts/0013/6714.js?"+Math.floor(new Date().getTime()/3600000);
+            a.async=true;a.type="text/javascript";b.parentNode.insertBefore(a,b)}, 1);
+
+            var id = iD();
+            d3.select('#iD')
+                .call(id.ui());
         </script>
-
-<!-- google analytics -->
-<script type='text/javascript'>
-var _gaq = _gaq || [];
-_gaq.push(['_setAccount', 'UA-38039653-2']);
-_gaq.push(['_trackPageview']);
-(function() {
-  var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-  ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-  var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-})();
-</script>
-
-<!-- crazyegg -->
-<script type="text/javascript">
-setTimeout(function(){var a=document.createElement("script");
-var b=document.getElementsByTagName("script")[0];
-a.src=document.location.protocol+"//dnn506yrbagrg.cloudfront.net/pages/scripts/0013/6714.js?"+Math.floor(new Date().getTime()/3600000);
-a.async=true;a.type="text/javascript";b.parentNode.insertBefore(a,b)}, 1);
-</script>
-
-<!-- sentry error reporting -->
-<script src="//d3nslu0hdya83q.cloudfront.net/dist/1.0/raven.min.js"></script>
-<script>
-Raven.config('https://af8ce79129b24fa28d91ede59302369c@app.getsentry.com/6009').install();
-</script>
-</body>
+    </body>
 </html>
diff --git a/index_dev.html b/index_dev.html
new file mode 100644
index 000000000..0ec4e89db
--- /dev/null
+++ b/index_dev.html
@@ -0,0 +1,200 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <meta charset='utf-8'>
+        <title>iD</title>
+        <link rel='stylesheet' href='css/reset.css'>
+        <link rel='stylesheet' href='css/map.css'>
+        <link rel='stylesheet' href='css/app.css'>
+        <link rel='stylesheet' href='css/preset-icons.css'>
+
+        <!-- mobile devices -->
+        <meta name='viewport' content='initial-scale=1.0 maximum-scale=1.0'>
+        <meta name='apple-mobile-web-app-capable' content='yes' />
+        <meta name='apple-mobile-web-app-status-bar-style' content='black-translucent' />
+
+        <script src='//d3nslu0hdya83q.cloudfront.net/dist/1.0/raven.min.js'></script>
+
+        <script>
+            Raven.config('https://af8ce79129b24fa28d91ede59302369c@app.getsentry.com/6009').install();
+        </script>
+
+        <script src='js/lib/lodash.js'></script>
+        <script src='js/lib/d3.v3.js'></script>
+        <script src='js/lib/sha.js'></script>
+        <script src='js/lib/ohauth.js'></script>
+        <script src='js/lib/jxon.js'></script>
+        <script src='js/lib/d3.typeahead.js'></script>
+        <script src='js/lib/d3.combobox.js'></script>
+        <script src='js/lib/d3.rowselect.js'></script>
+        <script src='js/lib/d3.checkselect.js'></script>
+        <script src='js/lib/d3.geo.tile.js'></script>
+        <script src='js/lib/d3.size.js'></script>
+        <script src='js/lib/d3.trigger.js'></script>
+        <script src='js/lib/d3.keybinding.js'></script>
+        <script src='js/lib/d3.one.js'></script>
+        <script src='js/lib/d3-compat.js'></script>
+        <script src='js/lib/bootstrap-tooltip.js'></script>
+        <script src='js/lib/rtree.js'></script>
+
+        <script src='js/id/id.js'></script>
+        <script src='js/id/util.js'></script>
+        <script src='js/id/oauth.js'></script>
+        <script src='js/id/services/taginfo.js'></script>
+
+        <script src='data/data_dev.js'></script>
+
+        <script src="js/id/geo.js"></script>
+        <script src="js/id/geo/extent.js"></script>
+
+        <script src='js/id/renderer/background.js'></script>
+        <script src='js/id/renderer/background_source.js'></script>
+        <script src='js/id/renderer/map.js'></script>
+
+        <script src="js/id/svg.js"></script>
+        <script src="js/id/svg/areas.js"></script>
+        <script src="js/id/svg/lines.js"></script>
+        <script src="js/id/svg/member_classes.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>
+        <script src="js/id/svg/tag_classes.js"></script>
+        <script src="js/id/svg/vertices.js"></script>
+        <script src="js/id/svg/labels.js"></script>
+
+        <script src="js/id/ui.js"></script>
+        <script src='js/id/ui/attribution.js'></script>
+        <script src='js/id/ui/radial_menu.js'></script>
+        <script src='js/id/ui/inspector.js'></script>
+        <script src='js/id/ui/modal.js'></script>
+        <script src='js/id/ui/cmd.js'></script>
+        <script src='js/id/ui/confirm.js'></script>
+        <script src='js/id/ui/commit.js'></script>
+        <script src='js/id/ui/success.js'></script>
+        <script src='js/id/ui/loading.js'></script>
+        <script src='js/id/ui/account.js'></script>
+        <script src='js/id/ui/background.js'></script>
+        <script src='js/id/ui/modes.js'></script>
+        <script src='js/id/ui/contributors.js'></script>
+        <script src='js/id/ui/geocoder.js'></script>
+        <script src='js/id/ui/geolocate.js'></script>
+        <script src='js/id/ui/notice.js'></script>
+        <script src='js/id/ui/flash.js'></script>
+        <script src='js/id/ui/save.js'></script>
+        <script src='js/id/ui/splash.js'></script>
+        <script src='js/id/ui/spinner.js'></script>
+        <script src='js/id/ui/restore.js'></script>
+        <script src='js/id/ui/tag_reference.js'></script>
+        <script src='js/id/ui/key_reference.js'></script>
+        <script src='js/id/ui/preset.js'></script>
+        <script src='js/id/ui/lasso.js'></script>
+        <script src='js/id/ui/source_switch.js'></script>
+        <script src='js/id/ui/toggle.js'></script>
+        <script src='js/id/ui/undo_redo.js'></script>
+        <script src='js/id/ui/zoom.js'></script>
+        <script src='js/id/ui/taglist.js'></script>
+        <script src='js/id/ui/preset_grid.js'></script>
+        <script src='js/id/ui/tag_editor.js'></script>
+        <script src='js/id/ui/tail.js'></script>
+        <script src='js/id/ui/preset/address.js'></script>
+
+        <script src='js/id/actions.js'></script>
+        <script src="js/id/actions/add_midpoint.js"></script>
+        <script src='js/id/actions/add_entity.js'></script>
+        <script src='js/id/actions/add_vertex.js'></script>
+        <script src='js/id/actions/change_tags.js'></script>
+        <script src='js/id/actions/connect.js'></script>
+        <script src='js/id/actions/delete_multiple.js'></script>
+        <script src='js/id/actions/delete_node.js'></script>
+        <script src="js/id/actions/delete_relation.js"></script>
+        <script src="js/id/actions/delete_way.js"></script>
+        <script src='js/id/actions/disconnect.js'></script>
+        <script src='js/id/actions/join.js'></script>
+        <script src='js/id/actions/merge.js'></script>
+        <script src='js/id/actions/move_node.js'></script>
+        <script src='js/id/actions/move.js'></script>
+        <script src='js/id/actions/rotate_way.js'></script>
+        <script src='js/id/actions/circularize.js'></script>
+        <script src='js/id/actions/orthogonalize.js'></script>
+        <script src='js/id/actions/noop.js'></script>
+        <script src='js/id/actions/reverse.js'></script>
+        <script src='js/id/actions/split.js'></script>
+
+        <script src='js/id/behavior.js'></script>
+        <script src='js/id/behavior/add_way.js'></script>
+        <script src='js/id/behavior/accept.js'></script>
+        <script src='js/id/behavior/drag.js'></script>
+        <script src='js/id/behavior/drag_node.js'></script>
+        <script src='js/id/behavior/draw.js'></script>
+        <script src='js/id/behavior/lasso.js'></script>
+        <script src='js/id/behavior/draw_way.js'></script>
+        <script src='js/id/behavior/hash.js'></script>
+        <script src='js/id/behavior/hover.js'></script>
+        <script src='js/id/behavior/select.js'></script>
+
+        <script src='js/id/modes.js'></script>
+        <script src='js/id/modes/add_area.js'></script>
+        <script src='js/id/modes/add_point.js'></script>
+        <script src='js/id/modes/add_line.js'></script>
+        <script src='js/id/modes/browse.js'></script>
+        <script src='js/id/modes/draw_area.js'></script>
+        <script src='js/id/modes/draw_line.js'></script>
+        <script src='js/id/modes/move.js'></script>
+        <script src='js/id/modes/rotate_way.js'></script>
+        <script src='js/id/modes/select.js'></script>
+
+        <script src='js/id/operations.js'></script>
+        <script src='js/id/operations/circularize.js'></script>
+        <script src='js/id/operations/orthogonalize.js'></script>
+        <script src='js/id/operations/delete.js'></script>
+        <script src='js/id/operations/disconnect.js'></script>
+        <script src='js/id/operations/merge.js'></script>
+        <script src='js/id/operations/move.js'></script>
+        <script src='js/id/operations/rotate.js'></script>
+        <script src='js/id/operations/reverse.js'></script>
+        <script src='js/id/operations/split.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/core/tree.js'></script>
+
+        <script src='js/id/presets.js'></script>
+        <script src='js/id/presets/preset.js'></script>
+        <script src='js/id/presets/category.js'></script>
+        <script src='js/id/presets/collection.js'></script>
+
+        <script src='js/id/connection.js'></script>
+        <script src='js/id/validate.js'></script>
+
+        <script src='js/lib/locale.js'></script>
+        <script src='locale/da.js'></script>
+        <script src='locale/de.js'></script>
+        <script src='locale/en.js'></script>
+        <script src='locale/es.js'></script>
+        <script src='locale/fr.js'></script>
+        <script src='locale/it.js'></script>
+        <script src='locale/ja.js'></script>
+        <script src='locale/lv.js'></script>
+        <script src='locale/nl.js'></script>
+        <script src='locale/pl.js'></script>
+        <script src='locale/ru.js'></script>
+        <script src='locale/tr.js'></script>
+        <script src='locale/uk.js'></script>
+        <script src='locale/vi.js'></script>
+    </head>
+    <body>
+        <div id='iD'></div>
+        <script>
+            iD.data.load(function() {
+                var id = iD();
+                d3.select('#iD')
+                    .call(id.ui());
+            })
+        </script>
+    </body>
+</html>
diff --git a/index_packaged.html b/index_packaged.html
deleted file mode 100644
index 5d3b11ae6..000000000
--- a/index_packaged.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<!DOCTYPE html>
-<html>
-    <head>
-        <meta charset='utf-8'>
-        <title>iD</title>
-        <link rel='stylesheet' href='css/reset.css'>
-        <link rel='stylesheet' href='css/map.css'>
-        <link rel='stylesheet' href='css/app.css'>
-        <link rel='stylesheet' href='css/preset-icons.css'>
-
-        <!-- mobile devices -->
-        <meta name='viewport' content='initial-scale=1.0 maximum-scale=1.0'>
-        <meta name='apple-mobile-web-app-capable' content='yes' />
-        <meta name='apple-mobile-web-app-status-bar-style' content='black-translucent' />
-
-        <script src='iD.min.js'></script>
-    </head>
-    <body>
-        <div id='iD'></div>
-        <script>
-            var id = iD();
-            d3.select('#iD')
-                .call(id.ui());
-        </script>
-    </body>
-</html>
diff --git a/js/lib/locale.js b/js/lib/locale.js
index ae56d26c6..704a45d4c 100644
--- a/js/lib/locale.js
+++ b/js/lib/locale.js
@@ -1,4 +1,4 @@
-var locale = { _current: 'en' };
+window.locale = { _current: 'en' };
 
 locale.current = function(_) {
     if (!arguments.length) return locale._current;