diff --git a/build/build.bat b/build/build.bat
index e238c22f..e9e1e613 100644
--- a/build/build.bat
+++ b/build/build.bat
@@ -11,7 +11,6 @@ java -jar ../lib/closure-compiler/compiler.jar ^
 --js ../src/dom/DomEvent.js ^
 --js ../src/dom/DomUtil.js ^
 --js ../src/dom/Draggable.js ^
---js ../src/dom/Icon.js ^
 --js ../src/dom/transition/Transition.js ^
 --js ../src/dom/transition/Transition.Native.js ^
 --js ../src/dom/transition/Transition.Timer.js ^
@@ -20,17 +19,18 @@ java -jar ../lib/closure-compiler/compiler.jar ^
 --js ../src/geo/Projection.js ^
 --js ../src/layer/TileLayer.js ^
 --js ../src/layer/ImageOverlay.js ^
---js ../src/layer/Marker.js ^
 --js ../src/layer/Popup.js ^
---js ../src/layer/Marker.Popup.js ^
+--js ../src/layer/marker/Icon.js ^
+--js ../src/layer/marker/Marker.js ^
+--js ../src/layer/marker/Marker.Popup.js ^
 --js ../src/handler/Handler.js ^
 --js ../src/handler/MapDrag.js ^
 --js ../src/handler/TouchZoom.js ^
 --js ../src/handler/ScrollWheelZoom.js ^
 --js ../src/handler/DoubleClickZoom.js ^
 --js ../src/map/Map.js ^
---js ../src/map/Map.Geolocation.js ^
---js ../src/map/Map.Popup.js ^
---js ../src/map/Map.PanAnimation.js ^
---js ../src/map/Map.ZoomAnimation.js ^
+--js ../src/map/ext/Map.Geolocation.js ^
+--js ../src/map/ext/Map.Popup.js ^
+--js ../src/map/ext/Map.PanAnimation.js ^
+--js ../src/map/ext/Map.ZoomAnimation.js ^
 --js_output_file ../dist/leaflet.js
\ No newline at end of file
diff --git a/build/deps.js b/build/deps.js
index c31e8278..358039be 100644
--- a/build/deps.js
+++ b/build/deps.js
@@ -28,12 +28,12 @@ var deps = {
 	},
 	
 	Marker: {
-		src: ['dom/Icon.js', 'layer/Marker.js'],
+		src: ['layer/marker/Icon.js', 'layer/marker/Marker.js'],
 		desc: 'Markers to put on the map.'
 	},
 	
 	Popup: {
-		src: ['layer/Popup.js', 'layer/Marker.Popup.js', 'map/Map.Popup.js'],
+		src: ['layer/Popup.js', 'layer/marker/Marker.Popup.js', 'map/ext/Map.Popup.js'],
 		deps: ['Marker'],
 		desc: 'Used to display the map popup (used mostly for binding HTML data to markers on click).'
 	},
@@ -83,20 +83,20 @@ var deps = {
 	},
 	
 	MapAnimationPan: {
-		src: ['map/Map.PanAnimation.js'],
+		src: ['map/ext/Map.PanAnimation.js'],
 		deps: ['MapAnimationNative'],
 		desc: 'Panning animation. Can use both native and timer-based animation.'
 	},
 	
 	MapAnimationZoom: {
-		src: ['map/Map.ZoomAnimation.js'],
+		src: ['map/ext/Map.ZoomAnimation.js'],
 		deps: ['MapAnimationPan', 'MapAnimationNative'],
 		desc: 'Smooth zooming animation. So far it works only on browsers that support CSS3 Transitions.'
 	},
 	
 	
 	MapGeolocation: {
-		src: ['map/Map.Geolocation.js'],
+		src: ['map/ext/Map.Geolocation.js'],
 		desc: 'Adds Map#locate method and related events to make geolocation easier.',
 		heading: 'Misc'
 	}
diff --git a/debug/include.js b/debug/include.js
index 886f5987..b5d4c2ad 100644
--- a/debug/include.js
+++ b/debug/include.js
@@ -15,7 +15,6 @@
 		'dom/DomEvent.js',
 		'dom/DomUtil.js',
 		'dom/Draggable.js',
-		'dom/Icon.js',
 		
 		'dom/transition/Transition.js',
 		'dom/transition/Transition.Native.js',
@@ -27,9 +26,10 @@
 		
 		'layer/TileLayer.js',
 		'layer/ImageOverlay.js',
-		'layer/Marker.js',
 		'layer/Popup.js',
-		'layer/Marker.Popup.js',
+		'layer/marker/Icon.js',
+		'layer/marker/Marker.js',
+		'layer/marker/Marker.Popup.js',
 		
 		'handler/Handler.js',
 		'handler/MapDrag.js',
@@ -38,10 +38,10 @@
 		'handler/ScrollWheelZoom.js',
 		
 		'map/Map.js',
-		'map/Map.Geolocation.js',
-		'map/Map.Popup.js',
-		'map/Map.PanAnimation.js',
-		'map/Map.ZoomAnimation.js'
+		'map/ext/Map.Geolocation.js',
+		'map/ext/Map.Popup.js',
+		'map/ext/Map.PanAnimation.js',
+		'map/ext/Map.ZoomAnimation.js'
 	];
 	
 	for (var i = 0; i < scripts.length; i++) {
diff --git a/src/dom/Icon.js b/src/layer/marker/Icon.js
similarity index 100%
rename from src/dom/Icon.js
rename to src/layer/marker/Icon.js
diff --git a/src/layer/Marker.Popup.js b/src/layer/marker/Marker.Popup.js
similarity index 100%
rename from src/layer/Marker.Popup.js
rename to src/layer/marker/Marker.Popup.js
diff --git a/src/layer/Marker.js b/src/layer/marker/Marker.js
similarity index 100%
rename from src/layer/Marker.js
rename to src/layer/marker/Marker.js
diff --git a/src/map/Map.Geolocation.js b/src/map/ext/Map.Geolocation.js
similarity index 100%
rename from src/map/Map.Geolocation.js
rename to src/map/ext/Map.Geolocation.js
diff --git a/src/map/Map.PanAnimation.js b/src/map/ext/Map.PanAnimation.js
similarity index 100%
rename from src/map/Map.PanAnimation.js
rename to src/map/ext/Map.PanAnimation.js
diff --git a/src/map/Map.Popup.js b/src/map/ext/Map.Popup.js
similarity index 100%
rename from src/map/Map.Popup.js
rename to src/map/ext/Map.Popup.js
diff --git a/src/map/Map.ZoomAnimation.js b/src/map/ext/Map.ZoomAnimation.js
similarity index 100%
rename from src/map/Map.ZoomAnimation.js
rename to src/map/ext/Map.ZoomAnimation.js