diff --git a/vtm/src/org/oscim/tiling/source/mapnik/MapnikVectorTileSource.java b/vtm-extras/src/org/oscim/tiling/source/mapnik/MapnikVectorTileSource.java
similarity index 100%
rename from vtm/src/org/oscim/tiling/source/mapnik/MapnikVectorTileSource.java
rename to vtm-extras/src/org/oscim/tiling/source/mapnik/MapnikVectorTileSource.java
diff --git a/vtm/src/org/oscim/tiling/source/mapnik/TileDecoder.java b/vtm-extras/src/org/oscim/tiling/source/mapnik/TileDecoder.java
similarity index 100%
rename from vtm/src/org/oscim/tiling/source/mapnik/TileDecoder.java
rename to vtm-extras/src/org/oscim/tiling/source/mapnik/TileDecoder.java
diff --git a/vtm/src/org/oscim/tiling/source/oscimap/OSciMap1TileSource.java b/vtm-extras/src/org/oscim/tiling/source/oscimap/OSciMap1TileSource.java
similarity index 100%
rename from vtm/src/org/oscim/tiling/source/oscimap/OSciMap1TileSource.java
rename to vtm-extras/src/org/oscim/tiling/source/oscimap/OSciMap1TileSource.java
diff --git a/vtm/src/org/oscim/tiling/source/oscimap/Tags.java b/vtm-extras/src/org/oscim/tiling/source/oscimap/Tags.java
similarity index 100%
rename from vtm/src/org/oscim/tiling/source/oscimap/Tags.java
rename to vtm-extras/src/org/oscim/tiling/source/oscimap/Tags.java
diff --git a/vtm/src/org/oscim/tiling/source/oscimap/TileDecoder.java b/vtm-extras/src/org/oscim/tiling/source/oscimap/TileDecoder.java
similarity index 100%
rename from vtm/src/org/oscim/tiling/source/oscimap/TileDecoder.java
rename to vtm-extras/src/org/oscim/tiling/source/oscimap/TileDecoder.java
diff --git a/vtm/src/org/oscim/tiling/source/oscimap2/OSciMap2TileSource.java b/vtm-extras/src/org/oscim/tiling/source/oscimap2/OSciMap2TileSource.java
similarity index 100%
rename from vtm/src/org/oscim/tiling/source/oscimap2/OSciMap2TileSource.java
rename to vtm-extras/src/org/oscim/tiling/source/oscimap2/OSciMap2TileSource.java
diff --git a/vtm/src/org/oscim/tiling/source/oscimap2/Tags.java b/vtm-extras/src/org/oscim/tiling/source/oscimap2/Tags.java
similarity index 100%
rename from vtm/src/org/oscim/tiling/source/oscimap2/Tags.java
rename to vtm-extras/src/org/oscim/tiling/source/oscimap2/Tags.java
diff --git a/vtm/src/org/oscim/tiling/source/oscimap2/TileData.proto b/vtm-extras/src/org/oscim/tiling/source/oscimap2/TileData.proto
similarity index 100%
rename from vtm/src/org/oscim/tiling/source/oscimap2/TileData.proto
rename to vtm-extras/src/org/oscim/tiling/source/oscimap2/TileData.proto
diff --git a/vtm-gdx-html/src/org/oscim/gdx/client/GwtGdxMap.java b/vtm-gdx-html/src/org/oscim/gdx/client/GwtGdxMap.java
index f087ac49..b47933b6 100644
--- a/vtm-gdx-html/src/org/oscim/gdx/client/GwtGdxMap.java
+++ b/vtm-gdx-html/src/org/oscim/gdx/client/GwtGdxMap.java
@@ -26,7 +26,6 @@ import org.oscim.layers.tile.BitmapTileLayer;
 import org.oscim.renderer.MapRenderer;
 import org.oscim.tiling.source.TileSource;
 import org.oscim.tiling.source.bitmap.DefaultSources.NaturalEarth;
-import org.oscim.tiling.source.oscimap2.OSciMap2TileSource;
 import org.oscim.tiling.source.oscimap4.OSciMap4TileSource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -107,11 +106,7 @@ class GwtGdxMap extends GdxMap {
 		String sourceName = c.getTileSource();
 
 		TileSource tileSource;
-		if ("oscimap4".equals(sourceName))
-			tileSource = new OSciMap4TileSource(url);
-		else
-			//if ("oscimap2".equals(source))
-			tileSource = new OSciMap2TileSource(url);
+		tileSource = new OSciMap4TileSource(url);
 
 		initDefaultLayers(tileSource, false, true, true);
 
diff --git a/vtm/src/org/oscim/tiling/source/oscimap4/OSciMap4TileSource.java b/vtm/src/org/oscim/tiling/source/oscimap4/OSciMap4TileSource.java
index 289b4aae..8144ab20 100644
--- a/vtm/src/org/oscim/tiling/source/oscimap4/OSciMap4TileSource.java
+++ b/vtm/src/org/oscim/tiling/source/oscimap4/OSciMap4TileSource.java
@@ -30,9 +30,6 @@ public class OSciMap4TileSource extends UrlTileSource {
 	public OSciMap4TileSource(String url) {
 		super(url);
 		setExtension(".vtm");
-		// ignored for now
-		//setMimeType("image/png");
-		//setMimeType("application/x-protobuf");
 	}
 
 	@Override