diff --git a/tools/mapmerge/Location.java b/tools/mapmerge/Source/Location.java
similarity index 100%
rename from tools/mapmerge/Location.java
rename to tools/mapmerge/Source/Location.java
diff --git a/tools/mapmerge/META-INF/MANIFEST.MF b/tools/mapmerge/Source/META-INF/MANIFEST.MF
similarity index 95%
rename from tools/mapmerge/META-INF/MANIFEST.MF
rename to tools/mapmerge/Source/META-INF/MANIFEST.MF
index d66a7b3b698..5aa53c2fa28 100644
--- a/tools/mapmerge/META-INF/MANIFEST.MF
+++ b/tools/mapmerge/Source/META-INF/MANIFEST.MF
@@ -1,4 +1,4 @@
-Manifest-Version: 1.0
-Created-By: 1.6.0_31 (Sun Microsystems Inc.)
-Main-Class: MapPatcher
-
+Manifest-Version: 1.0
+Created-By: 1.6.0_31 (Sun Microsystems Inc.)
+Main-Class: MapPatcher
+
diff --git a/tools/mapmerge/Map.java b/tools/mapmerge/Source/Map.java
similarity index 100%
rename from tools/mapmerge/Map.java
rename to tools/mapmerge/Source/Map.java
diff --git a/tools/mapmerge/MapPatcher.java b/tools/mapmerge/Source/MapPatcher.java
similarity index 100%
rename from tools/mapmerge/MapPatcher.java
rename to tools/mapmerge/Source/MapPatcher.java
diff --git a/tools/mapmerge/SavingThread.java b/tools/mapmerge/Source/SavingThread.java
similarity index 100%
rename from tools/mapmerge/SavingThread.java
rename to tools/mapmerge/Source/SavingThread.java