diff --git a/src/org/oscim/database/MapDatabaseFactory.java b/src/org/oscim/database/MapDatabaseFactory.java
index d081c5a7..ccb57ec7 100644
--- a/src/org/oscim/database/MapDatabaseFactory.java
+++ b/src/org/oscim/database/MapDatabaseFactory.java
@@ -40,15 +40,19 @@ public final class MapDatabaseFactory {
 	 */
 	public static IMapDatabase createMapDatabase(MapDatabases mapDatabase) {
 		switch (mapDatabase) {
-			case MAP_READER:
+			case MAPSFORGE_FILE:
 				return new org.oscim.database.mapfile.MapDatabase();
 			case TEST_READER:
 				return new org.oscim.database.test.MapDatabase();
 			case PBMAP_READER:
-				//return new org.oscim.database.pbmap.MapDatabase();
-				return new org.oscim.database.mapnik.MapDatabase();
+				return new org.oscim.database.pbmap.MapDatabase();
 			case OSCIMAP_READER:
-				return new org.oscim.database.oscimap.MapDatabase();
+				return new org.oscim.database.oscimap2.MapDatabase();
+			case OPENSCIENCEMAP4:
+				return new org.oscim.database.oscimap4.MapDatabase();
+			case MAPNIK_VECTOR:
+				return new org.oscim.database.mapnik.MapDatabase();
+
 			default:
 				break;
 
diff --git a/src/org/oscim/database/oscimap/LwHttp.java b/src/org/oscim/database/oscimap2/LwHttp.java
similarity index 99%
rename from src/org/oscim/database/oscimap/LwHttp.java
rename to src/org/oscim/database/oscimap2/LwHttp.java
index 219b46e4..7dd31dde 100644
--- a/src/org/oscim/database/oscimap/LwHttp.java
+++ b/src/org/oscim/database/oscimap2/LwHttp.java
@@ -12,7 +12,7 @@
  * You should have received a copy of the GNU Lesser General Public License along with
  * this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.oscim.database.oscimap;
+package org.oscim.database.oscimap2;
 
 import java.io.File;
 import java.io.FileInputStream;
diff --git a/src/org/oscim/database/oscimap/MapDatabase.java b/src/org/oscim/database/oscimap2/MapDatabase.java
similarity index 98%
rename from src/org/oscim/database/oscimap/MapDatabase.java
rename to src/org/oscim/database/oscimap2/MapDatabase.java
index c6032d73..b8d3569e 100644
--- a/src/org/oscim/database/oscimap/MapDatabase.java
+++ b/src/org/oscim/database/oscimap2/MapDatabase.java
@@ -12,7 +12,7 @@
  * You should have received a copy of the GNU Lesser General Public License along with
  * this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.oscim.database.oscimap;
+package org.oscim.database.oscimap2;
 
 import java.io.File;
 import java.io.IOException;
@@ -28,7 +28,7 @@ import org.oscim.core.MapElement;
 import org.oscim.core.Tag;
 import org.oscim.core.Tile;
 import org.oscim.database.IMapDatabase;
-import org.oscim.database.IMapDatabaseCallback;
+import org.oscim.database.IMapDataSink;
 import org.oscim.database.MapInfo;
 import org.oscim.database.MapOptions;
 import org.oscim.layers.tile.MapTile;
@@ -65,7 +65,7 @@ public class MapDatabase implements IMapDatabase {
 	private Tag[] curTags = new Tag[MAX_TILE_TAGS];
 	private int mCurTagCnt;
 
-	private IMapDatabaseCallback mMapGenerator;
+	private IMapDataSink mMapGenerator;
 	private float mScaleFactor;
 	private MapTile mTile;
 
@@ -81,12 +81,12 @@ public class MapDatabase implements IMapDatabase {
 	}
 
 	@Override
-	public QueryResult executeQuery(MapTile tile, IMapDatabaseCallback mapDatabaseCallback) {
+	public QueryResult executeQuery(MapTile tile, IMapDataSink mapDataSink) {
 		QueryResult result = QueryResult.SUCCESS;
 
 		mTile = tile;
 
-		mMapGenerator = mapDatabaseCallback;
+		mMapGenerator = mapDataSink;
 
 		// scale coordinates to tile size
 		mScaleFactor = REF_TILE_SIZE / Tile.SIZE;
@@ -418,7 +418,7 @@ public class MapDatabase implements IMapDatabase {
 				break;
 		}
 
-		mMapGenerator.renderElement(mElem);
+		mMapGenerator.process(mElem);
 
 		return true;
 	}
diff --git a/src/org/oscim/database/oscimap/Tags.java b/src/org/oscim/database/oscimap2/Tags.java
similarity index 99%
rename from src/org/oscim/database/oscimap/Tags.java
rename to src/org/oscim/database/oscimap2/Tags.java
index 1882582b..eaad4e37 100644
--- a/src/org/oscim/database/oscimap/Tags.java
+++ b/src/org/oscim/database/oscimap2/Tags.java
@@ -12,7 +12,7 @@
  * You should have received a copy of the GNU Lesser General Public License along with
  * this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.oscim.database.oscimap;
+package org.oscim.database.oscimap2;
 
 import org.oscim.core.Tag;
 
diff --git a/src/org/oscim/database/oscimap/TileData.proto b/src/org/oscim/database/oscimap2/TileData.proto
similarity index 100%
rename from src/org/oscim/database/oscimap/TileData.proto
rename to src/org/oscim/database/oscimap2/TileData.proto