diff --git a/debug/css/mobile.css b/debug/css/mobile.css
new file mode 100644
index 00000000..d8f46f32
--- /dev/null
+++ b/debug/css/mobile.css
@@ -0,0 +1,6 @@
+html, body, #map {
+	margin: 0;
+	padding: 0;
+	width: 100%;
+	height: 100%;
+}
\ No newline at end of file
diff --git a/debug/css/screen.css b/debug/css/screen.css
new file mode 100644
index 00000000..f9886987
--- /dev/null
+++ b/debug/css/screen.css
@@ -0,0 +1,5 @@
+#map {
+	width: 800px; 
+	height: 600px; 
+	border: 1px solid #ccc;
+	}
\ No newline at end of file
diff --git a/debug/include.js b/debug/include.js
index 90c70b5a..c955d605 100644
--- a/debug/include.js
+++ b/debug/include.js
@@ -56,6 +56,6 @@
 	];
 	
 	for (var i = 0; i < scripts.length; i++) {
-		document.writeln("<script type='text/javascript' src='../src/" + scripts[i] + "'></script>");
+		document.writeln("<script type='text/javascript' src='../../src/" + scripts[i] + "'></script>");
 	}
 })();
\ No newline at end of file
diff --git a/debug/map-mobile.html b/debug/map/map-mobile.html
similarity index 72%
rename from debug/map-mobile.html
rename to debug/map/map-mobile.html
index db902e45..6954ebdf 100644
--- a/debug/map-mobile.html
+++ b/debug/map/map-mobile.html
@@ -5,19 +5,12 @@
 
 	<meta name="viewport" content="initial-scale=1.0, user-scalable=no" />
 	
-	<link rel="stylesheet" type="text/css" href="../dist/leaflet.css" />
-	<!--[if lte IE 8]><link rel="stylesheet" href="../dist/leaflet.ie.css" /><![endif]-->
-
-	<script type="text/javascript" src="include.js"></script>
+	<link rel="stylesheet" href="../../dist/leaflet.css" />
+	<!--[if lte IE 8]><link rel="stylesheet" href="../../dist/leaflet.ie.css" /><![endif]-->
+	
+	<link rel="stylesheet" href="../css/mobile.css" />
 	
-	<style type="text/css">
-		html, body, #map {
-			margin: 0;
-			padding: 0;
-			width: 100%;
-			height: 100%;
-		}
-	</style>
+	<script src="../include.js"></script>
 </head>
 <body>
 
diff --git a/debug/map.html b/debug/map/map.html
similarity index 83%
rename from debug/map.html
rename to debug/map/map.html
index d4b16706..778c49da 100644
--- a/debug/map.html
+++ b/debug/map/map.html
@@ -3,10 +3,12 @@
 <head>
 	<title>Leaflet debug page</title>
 
-	<link rel="stylesheet" href="../dist/leaflet.css" />
-	<!--[if lte IE 8]><link rel="stylesheet" href="../dist/leaflet.ie.css" /><![endif]-->
+	<link rel="stylesheet" href="../../dist/leaflet.css" />
+	<!--[if lte IE 8]><link rel="stylesheet" href="../../dist/leaflet.ie.css" /><![endif]-->
 	
-	<script type="text/javascript" src="include.js"></script>
+	<link rel="stylesheet" href="../css/screen.css" />
+	
+	<script src="../include.js"></script>
 </head>
 <body>
 
diff --git a/debug/route.js b/debug/vector/route.js
similarity index 100%
rename from debug/route.js
rename to debug/vector/route.js
diff --git a/debug/vector/vector-mobile.html b/debug/vector/vector-mobile.html
new file mode 100644
index 00000000..ad2bac1a
--- /dev/null
+++ b/debug/vector/vector-mobile.html
@@ -0,0 +1,38 @@
+<!DOCTYPE html>
+<html>
+<head>
+	<title>Leaflet debug page</title>
+
+	<meta name="viewport" content="initial-scale=1.0, user-scalable=no" />
+
+	<link rel="stylesheet" href="../../dist/leaflet.css" />
+	<!--[if lte IE 8]><link rel="stylesheet" href="../../dist/leaflet.ie.css" /><![endif]-->
+	
+	<link rel="stylesheet" href="../css/mobile.css" />
+	
+	<script src="../include.js"></script>
+</head>
+<body>
+	<div id="map"></div>
+
+	<script src="route.js"></script>
+	<script>
+		var cloudmadeUrl = 'http://{s}.tile.cloudmade.com/BC9A493B41014CAABB98F0471D759707/997/256/{z}/{x}/{y}.png',
+			cloudmade = new L.TileLayer(cloudmadeUrl, {maxZoom: 18});
+	
+		for (var i = 0, latlngs = [], len = route.length; i < len; i++) {
+			latlngs.push(new L.LatLng(route[i][0], route[i][1]));
+		}
+		var path = new L.Polyline(latlngs, {smoothFactor: 1});
+
+		var map = new L.Map('map', {layers: [cloudmade]});
+
+		map.fitBounds(new L.LatLngBounds(latlngs));
+		
+		map.addLayer(new L.Marker(latlngs[0]));
+		map.addLayer(new L.Marker(latlngs[latlngs.length - 1]));
+		
+		map.addLayer(path);
+	</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/debug/vector.html b/debug/vector/vector.html
similarity index 74%
rename from debug/vector.html
rename to debug/vector/vector.html
index cee4536f..0c87df1c 100644
--- a/debug/vector.html
+++ b/debug/vector/vector.html
@@ -3,10 +3,12 @@
 <head>
 	<title>Leaflet debug page</title>
 
-	<link rel="stylesheet" href="../dist/leaflet.css" />
-	<!--[if lte IE 8]><link rel="stylesheet" href="../dist/leaflet.ie.css" /><![endif]-->
-
-	<script src="include.js"></script>
+	<link rel="stylesheet" href="../../dist/leaflet.css" />
+	<!--[if lte IE 8]><link rel="stylesheet" href="../../dist/leaflet.ie.css" /><![endif]-->
+	
+	<link rel="stylesheet" href="../css/screen.css" />
+	
+	<script src="../include.js"></script>
 </head>
 <body>
 	<div id="map" style="width: 800px; height: 600px; border: 1px solid #ccc"></div>
diff --git a/src/Leaflet.js b/src/Leaflet.js
index 8ea27cc0..c773496a 100644
--- a/src/Leaflet.js
+++ b/src/Leaflet.js
@@ -14,7 +14,7 @@ var L = {
 				res = src && src.match(/^(.*\/)leaflet-*\w*\.js.*$/);
 			if (res && res[1]) { return res[1]; }
 		}
-		return '../dist/';
+		return '../../dist/';
 	})(),
 	
 	noConflict: function() {
