diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000..29a743e3f
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+iD.js
+iD.min.js
+*~
+*.swp
+*.swo
diff --git a/docs/coding_standards.txt b/docs/coding_standards.txt
old mode 100755
new mode 100644
diff --git a/icons/bus_stop.png b/icons/bus_stop.png
old mode 100755
new mode 100644
diff --git a/icons/cafe.png b/icons/cafe.png
old mode 100755
new mode 100644
diff --git a/icons/fast_food.png b/icons/fast_food.png
old mode 100755
new mode 100644
diff --git a/icons/fire_station.png b/icons/fire_station.png
old mode 100755
new mode 100644
diff --git a/icons/parking.png b/icons/parking.png
old mode 100755
new mode 100644
diff --git a/icons/post_box.png b/icons/post_box.png
old mode 100755
new mode 100644
diff --git a/icons/recycling.png b/icons/recycling.png
old mode 100755
new mode 100644
diff --git a/icons/restaurant.png b/icons/restaurant.png
old mode 100755
new mode 100644
diff --git a/icons/school.png b/icons/school.png
old mode 100755
new mode 100644
diff --git a/icons/station.png b/icons/station.png
old mode 100755
new mode 100644
diff --git a/icons/telephone.png b/icons/telephone.png
old mode 100755
new mode 100644
diff --git a/index.html b/index.html
old mode 100755
new mode 100644
diff --git a/js/iD/Connection.js b/js/iD/Connection.js
old mode 100755
new mode 100644
diff --git a/js/iD/controller/controller.js b/js/iD/controller/Controller.js
similarity index 100%
rename from js/iD/controller/controller.js
rename to js/iD/controller/Controller.js
diff --git a/js/iD/format/XML.js b/js/iD/format/XML.js
index 24e3938b8..437c5e3ee 100644
--- a/js/iD/format/XML.js
+++ b/js/iD/format/XML.js
@@ -30,7 +30,7 @@ iD.format.XML = {
             ));
         },
         way: function(entity) {
-            return iD.XML.decode(
+            return iD.format.XML.decode(
                 (new XMLSerializer()).serializeToString(
                     JXON.unbuild({
                         way: {
diff --git a/js/iD/renderer/Map.js b/js/iD/renderer/Map.js
old mode 100755
new mode 100644