diff --git a/.gitmodules b/.gitmodules
index bf2f0190..53ff74d8 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -10,9 +10,6 @@
 [submodule "extern/GmsLib"]
 	path = extern/GmsLib
 	url = https://github.com/microg/android_external_GmsLib.git
-[submodule "extern/vtm"]
-	path = extern/vtm
-	url = https://github.com/microg/android_external_vtm.git
 [submodule "extern/RemoteDroidGuard"]
 	path = extern/RemoteDroidGuard
 	url = https://github.com/microg/android_packages_apps_RemoteDroidGuard.git
diff --git a/build.gradle b/build.gradle
index c2e1817c..76056a02 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2017 microG Project Team
+ * Copyright 2013-2019 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,29 +15,31 @@
  */
 
 buildscript {
+    ext.kotlin_version = '1.3.21'
     repositories {
         jcenter()
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.3'
+        classpath 'com.android.tools.build:gradle:3.3.2'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }
 
 allprojects {
     apply plugin: 'idea'
-    ext.androidBuildVersionTools = "27.0.3"
-    ext.supportLibraryVersion = "27.1.0"
+    ext.androidBuildVersionTools = "28.0.3"
+    ext.supportLibraryVersion = "28.0.0"
     ext.isReleaseVersion = false
     ext.slf4jVersion = "1.7.25"
 }
 
-def androidCompileSdk() { return 27 }
+def androidCompileSdk() { return 28 }
 
-def androidTargetSdk() { return 27 }
+def androidTargetSdk() { return 28 }
 
-def androidMinSdk() { return 9 }
+def androidMinSdk() { return 14 }
 
 def versionCode() {
     def stdout = new ByteArrayOutputStream()
diff --git a/extern/vtm b/extern/vtm
deleted file mode 160000
index a47215d9..00000000
--- a/extern/vtm
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit a47215d9848d5f0ebd1be7e281b48e531026a47f
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 9ec837b2..7919ae6e 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.8-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-all.zip
diff --git a/play-services-core/build.gradle b/play-services-core/build.gradle
index 939d8e2d..33ba7e75 100644
--- a/play-services-core/build.gradle
+++ b/play-services-core/build.gradle
@@ -19,9 +19,18 @@ apply plugin: 'com.android.application'
 dependencies {
     implementation "com.android.support:support-v4:$supportLibraryVersion"
     implementation "com.android.support:appcompat-v7:$supportLibraryVersion"
+    implementation "com.squareup.wire:wire-runtime:1.6.1"
     implementation "com.takisoft.fix:preference-v7:$supportLibraryVersion.0"
     implementation "de.hdodenhof:circleimageview:1.3.0"
-    implementation "com.squareup.wire:wire-runtime:1.6.1"
+    implementation "org.conscrypt:conscrypt-android:2.0.0"
+    implementation "org.microg:vtm-android:0.9.1-mod"
+    implementation 'org.microg:vtm-android:0.9.1-mod:natives-armeabi'
+    implementation 'org.microg:vtm-android:0.9.1-mod:natives-armeabi-v7a'
+    implementation 'org.microg:vtm-android:0.9.1-mod:natives-arm64-v8a'
+    implementation 'org.microg:vtm-android:0.9.1-mod:natives-x86'
+    implementation 'org.microg:vtm-android:0.9.1-mod:natives-x86_64'
+    implementation "org.microg:vtm-extras:0.9.1-mod"
+    implementation "org.microg:vtm-jts:0.9.1-mod"
 
     implementation project(':microg-ui-tools')
     implementation project(':play-services-api')
@@ -30,13 +39,7 @@ dependencies {
     implementation project(':wearable-lib')
 
     implementation project(':remote-droid-guard-lib')
-
-    implementation project(':vtm-android')
-    implementation project(':vtm-extras')
-    implementation project(':vtm-jts')
-    implementation project(':vtm-microg-theme')
-
-    compile 'org.conscrypt:conscrypt-android:2.0.0'
+    implementation project(':play-services-maps-core-vtm')
 }
 
 def execResult(...args) {
@@ -79,14 +82,11 @@ android {
     sourceSets {
         main {
             java.srcDirs += 'src/main/protos-java'
-            file("${rootDir}/vtm-android/natives").eachDir() { dir ->
-                jniLibs.srcDirs += "${dir.path}/lib"
-            }
         }
     }
 
     lintOptions {
-        disable 'MissingTranslation', 'InvalidPackage', 'BatteryLife', 'ImpliedQuantity', 'MissingQuantity'
+        disable 'MissingTranslation', 'InvalidPackage', 'BatteryLife', 'ImpliedQuantity', 'MissingQuantity', 'InvalidWakeLockTag'
     }
 
     buildTypes {
diff --git a/play-services-core/src/main/AndroidManifest.xml b/play-services-core/src/main/AndroidManifest.xml
index 9d84c20b..0f0e3887 100644
--- a/play-services-core/src/main/AndroidManifest.xml
+++ b/play-services-core/src/main/AndroidManifest.xml
@@ -259,13 +259,6 @@
             </intent-filter>
         </receiver>
 
-        <!-- Map -->
-        <provider
-            android:name="org.microg.gms.maps.data.SharedTileProvider"
-            android:authorities="org.microg.gms.map.tile"
-            android:enabled="true"
-            android:exported="true"/>
-
         <!-- DroidGuard -->
 
         <service android:name="org.microg.gms.droidguard.DroidGuardService">
diff --git a/play-services-core/src/main/java/org/microg/gms/ui/PlacePickerActivity.java b/play-services-core/src/main/java/org/microg/gms/ui/PlacePickerActivity.java
index b79f94f4..cbcdfe59 100644
--- a/play-services-core/src/main/java/org/microg/gms/ui/PlacePickerActivity.java
+++ b/play-services-core/src/main/java/org/microg/gms/ui/PlacePickerActivity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2017 microG Project Team
+ * Copyright (C) 2013-2019 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -46,8 +46,8 @@ import com.google.android.gms.maps.model.LatLng;
 import com.google.android.gms.maps.model.LatLngBounds;
 
 import org.microg.gms.location.LocationConstants;
-import org.microg.gms.maps.BackendMapView;
-import org.microg.gms.maps.GmsMapsTypeHelper;
+import org.microg.gms.maps.vtm.BackendMapView;
+import org.microg.gms.maps.vtm.GmsMapsTypeHelper;
 import org.microg.safeparcel.SafeParcelUtil;
 import org.oscim.core.MapPosition;
 import org.oscim.event.Event;
@@ -61,7 +61,7 @@ import static android.Manifest.permission.ACCESS_FINE_LOCATION;
 import static android.content.pm.PackageManager.PERMISSION_GRANTED;
 import static org.microg.gms.location.LocationConstants.EXTRA_PRIMARY_COLOR;
 import static org.microg.gms.location.LocationConstants.EXTRA_PRIMARY_COLOR_DARK;
-import static org.microg.gms.maps.GmsMapsTypeHelper.fromLatLngBounds;
+import static org.microg.gms.maps.vtm.GmsMapsTypeHelper.fromLatLngBounds;
 
 public class PlacePickerActivity extends AppCompatActivity implements Map.UpdateListener {
     private static final String TAG = "GmsPlacePicker";
diff --git a/play-services-core/src/main/res/layout/list_no_item.xml b/play-services-core/src/main/res/layout/list_no_item.xml
index 66cde2f5..de02cfeb 100644
--- a/play-services-core/src/main/res/layout/list_no_item.xml
+++ b/play-services-core/src/main/res/layout/list_no_item.xml
@@ -37,7 +37,7 @@
         android:layout_marginLeft="15dip"
         android:layout_marginRight="6dip">
 
-        <TextView android:id="@+android:id/title"
+        <TextView android:id="@android:id/title"
                   android:gravity="center"
                   android:layout_width="match_parent"
                   android:layout_height="wrap_content"
diff --git a/play-services-core/src/main/res/layout/pick_place.xml b/play-services-core/src/main/res/layout/pick_place.xml
index 56549b4b..ec6bee5b 100644
--- a/play-services-core/src/main/res/layout/pick_place.xml
+++ b/play-services-core/src/main/res/layout/pick_place.xml
@@ -27,7 +27,7 @@
         android:layout_height="0dip"
         android:layout_weight="1">
 
-        <org.microg.gms.maps.BackendMapView
+        <org.microg.gms.maps.vtm.BackendMapView
             android:id="@+id/map"
             android:layout_width="match_parent"
             android:layout_height="match_parent"/>
@@ -130,4 +130,4 @@
         </RelativeLayout>
     </LinearLayout>
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/play-services-maps-core-vtm/build.gradle b/play-services-maps-core-vtm/build.gradle
new file mode 100644
index 00000000..217e1106
--- /dev/null
+++ b/play-services-maps-core-vtm/build.gradle
@@ -0,0 +1,73 @@
+/*
+ * Copyright 2013-2019 microG Project Team
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+apply plugin: 'com.android.library'
+
+dependencies {
+    implementation project(':microg-ui-tools')
+    implementation project(':play-services-api')
+
+    api "org.microg:vtm-android:0.9.1-mod"
+    api "org.microg:vtm-extras:0.9.1-mod"
+    api "org.microg:vtm-jts:0.9.1-mod"
+    implementation project(':vtm-microg-theme')
+}
+
+def execResult(...args) {
+    def stdout = new ByteArrayOutputStream()
+    exec {
+        commandLine args
+        standardOutput = stdout
+    }
+    return stdout.toString().trim()
+}
+
+android {
+    compileSdkVersion androidCompileSdk()
+    buildToolsVersion "$androidBuildVersionTools"
+
+    defaultConfig {
+        versionName "temp"
+        versionCode 1
+
+        minSdkVersion androidMinSdk()
+        targetSdkVersion androidTargetSdk()
+
+        ndk {
+            abiFilters "armeabi", "armeabi-v7a", "arm64-v8a", "x86", "x86_64"
+        }
+    }
+
+    lintOptions {
+        disable 'MissingTranslation', 'InvalidPackage', 'BatteryLife', 'ImpliedQuantity', 'MissingQuantity'
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled true
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+}
+
+if (file('user.gradle').exists()) {
+    apply from: 'user.gradle'
+}
diff --git a/play-services-maps-core-vtm/src/main/AndroidManifest.xml b/play-services-maps-core-vtm/src/main/AndroidManifest.xml
new file mode 100644
index 00000000..31b554e4
--- /dev/null
+++ b/play-services-maps-core-vtm/src/main/AndroidManifest.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2013-2019 microG Project Team
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<manifest package="org.microg.gms.maps.vtm"
+          xmlns:android="http://schemas.android.com/apk/res/android"
+          xmlns:tools="http://schemas.android.com/tools">
+
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
+    <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
+    <uses-permission android:name="android.permission.WAKE_LOCK"/>
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS"/>
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
+
+    <application>
+        <provider
+            android:name=".data.SharedTileProvider"
+            android:authorities="org.microg.gms.maps.vtm.tile"
+            android:enabled="true"
+            android:exported="true"/>
+    </application>
+
+</manifest>
diff --git a/play-services-core/src/main/java/com/google/android/gms/maps/internal/CreatorImpl.java b/play-services-maps-core-vtm/src/main/java/com/google/android/gms/maps/internal/CreatorImpl.java
similarity index 88%
rename from play-services-core/src/main/java/com/google/android/gms/maps/internal/CreatorImpl.java
rename to play-services-maps-core-vtm/src/main/java/com/google/android/gms/maps/internal/CreatorImpl.java
index dabe6a9d..e6471dfe 100644
--- a/play-services-core/src/main/java/com/google/android/gms/maps/internal/CreatorImpl.java
+++ b/play-services-maps-core-vtm/src/main/java/com/google/android/gms/maps/internal/CreatorImpl.java
@@ -21,6 +21,7 @@ import android.content.Context;
 import android.content.res.Resources;
 import android.os.Parcel;
 import android.os.RemoteException;
+import android.support.annotation.Keep;
 import android.util.Log;
 
 import com.google.android.gms.dynamic.IObjectWrapper;
@@ -28,12 +29,13 @@ import com.google.android.gms.dynamic.ObjectWrapper;
 import com.google.android.gms.maps.GoogleMapOptions;
 import com.google.android.gms.maps.model.internal.IBitmapDescriptorFactoryDelegate;
 
-import org.microg.gms.maps.MapFragmentImpl;
-import org.microg.gms.maps.MapViewImpl;
-import org.microg.gms.maps.ResourcesContainer;
-import org.microg.gms.maps.bitmap.BitmapDescriptorFactoryImpl;
-import org.microg.gms.maps.camera.CameraUpdateFactoryImpl;
+import org.microg.gms.maps.vtm.MapFragmentImpl;
+import org.microg.gms.maps.vtm.MapViewImpl;
+import org.microg.gms.maps.vtm.ResourcesContainer;
+import org.microg.gms.maps.vtm.bitmap.BitmapDescriptorFactoryImpl;
+import org.microg.gms.maps.vtm.camera.CameraUpdateFactoryImpl;
 
+@Keep
 public class CreatorImpl extends ICreator.Stub {
     private static final String TAG = "GmsMapCreator";
 
diff --git a/play-services-core/src/main/java/org/microg/gms/maps/ApplicationContextWrapper.java b/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/ApplicationContextWrapper.java
similarity index 95%
rename from play-services-core/src/main/java/org/microg/gms/maps/ApplicationContextWrapper.java
rename to play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/ApplicationContextWrapper.java
index a00e4649..ebb6caa6 100644
--- a/play-services-core/src/main/java/org/microg/gms/maps/ApplicationContextWrapper.java
+++ b/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/ApplicationContextWrapper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2017 microG Project Team
+ * Copyright (C) 2019 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.microg.gms.maps;
+package org.microg.gms.maps.vtm;
 
 import android.content.Context;
 import android.content.ContextWrapper;
diff --git a/play-services-core/src/main/java/org/microg/gms/maps/BackendMap.java b/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/BackendMap.java
similarity index 97%
rename from play-services-core/src/main/java/org/microg/gms/maps/BackendMap.java
rename to play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/BackendMap.java
index fa60f85d..2a94e5fb 100644
--- a/play-services-core/src/main/java/org/microg/gms/maps/BackendMap.java
+++ b/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/BackendMap.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2017 microG Project Team
+ * Copyright (C) 2019 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.microg.gms.maps;
+package org.microg.gms.maps.vtm;
 
 import android.content.Context;
 import android.graphics.Bitmap;
@@ -27,10 +27,10 @@ import android.view.View;
 import com.google.android.gms.maps.internal.ISnapshotReadyCallback;
 import com.google.android.gms.maps.model.CameraPosition;
 
-import org.microg.gms.maps.camera.CameraUpdate;
-import org.microg.gms.maps.markup.DrawableMarkup;
-import org.microg.gms.maps.markup.MarkerItemMarkup;
-import org.microg.gms.maps.markup.Markup;
+import org.microg.gms.maps.vtm.camera.CameraUpdate;
+import org.microg.gms.maps.vtm.markup.DrawableMarkup;
+import org.microg.gms.maps.vtm.markup.MarkerItemMarkup;
+import org.microg.gms.maps.vtm.markup.Markup;
 import org.oscim.backend.GL;
 import org.oscim.backend.GLAdapter;
 import org.oscim.core.MapPosition;
diff --git a/play-services-core/src/main/java/org/microg/gms/maps/BackendMapView.java b/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/BackendMapView.java
similarity index 95%
rename from play-services-core/src/main/java/org/microg/gms/maps/BackendMapView.java
rename to play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/BackendMapView.java
index 45c31e1f..05cf4157 100644
--- a/play-services-core/src/main/java/org/microg/gms/maps/BackendMapView.java
+++ b/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/BackendMapView.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2017 microG Project Team
+ * Copyright (C) 2019 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.microg.gms.maps;
+package org.microg.gms.maps.vtm;
 
 import android.content.Context;
 import android.content.ContextWrapper;
@@ -23,14 +23,12 @@ import android.graphics.BitmapFactory;
 import android.util.AttributeSet;
 import android.util.Log;
 
-import com.google.android.gms.R;
-
-import org.microg.gms.maps.data.SharedTileCache;
-import org.microg.gms.maps.markup.ClearableVectorLayer;
+import org.microg.gms.maps.vtm.data.SharedTileCache;
+import org.microg.gms.maps.vtm.markup.ClearableVectorLayer;
+import org.microg.gms.maps.vtm.R;
 import org.oscim.android.AndroidAssets;
 import org.oscim.android.MapView;
 import org.oscim.android.canvas.AndroidBitmap;
-import org.oscim.backend.AssetAdapter;
 import org.oscim.layers.marker.ItemizedLayer;
 import org.oscim.layers.marker.MarkerItem;
 import org.oscim.layers.marker.MarkerSymbol;
diff --git a/play-services-core/src/main/java/org/microg/gms/maps/ContainerLayout.java b/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/ContainerLayout.java
similarity index 92%
rename from play-services-core/src/main/java/org/microg/gms/maps/ContainerLayout.java
rename to play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/ContainerLayout.java
index 42bc1ede..468d38b4 100644
--- a/play-services-core/src/main/java/org/microg/gms/maps/ContainerLayout.java
+++ b/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/ContainerLayout.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2017 microG Project Team
+ * Copyright (C) 2019 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.microg.gms.maps;
+package org.microg.gms.maps.vtm;
 
 import android.content.Context;
 import android.widget.FrameLayout;
diff --git a/play-services-core/src/main/java/org/microg/gms/maps/GmsMapsTypeHelper.java b/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/GmsMapsTypeHelper.java
similarity index 97%
rename from play-services-core/src/main/java/org/microg/gms/maps/GmsMapsTypeHelper.java
rename to play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/GmsMapsTypeHelper.java
index ea5293b4..c68b9460 100644
--- a/play-services-core/src/main/java/org/microg/gms/maps/GmsMapsTypeHelper.java
+++ b/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/GmsMapsTypeHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2017 microG Project Team
+ * Copyright (C) 2019 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.microg.gms.maps;
+package org.microg.gms.maps.vtm;
 
 import com.google.android.gms.maps.model.CameraPosition;
 import com.google.android.gms.maps.model.LatLng;
diff --git a/play-services-core/src/main/java/org/microg/gms/maps/GoogleMapImpl.java b/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/GoogleMapImpl.java
similarity index 97%
rename from play-services-core/src/main/java/org/microg/gms/maps/GoogleMapImpl.java
rename to play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/GoogleMapImpl.java
index 6bd46bf0..6b342e70 100644
--- a/play-services-core/src/main/java/org/microg/gms/maps/GoogleMapImpl.java
+++ b/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/GoogleMapImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2017 microG Project Team
+ * Copyright (C) 2019 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.microg.gms.maps;
+package org.microg.gms.maps.vtm;
 
 import android.content.Context;
 import android.graphics.Bitmap;
@@ -68,15 +68,15 @@ import com.google.android.gms.maps.model.internal.IPolygonDelegate;
 import com.google.android.gms.maps.model.internal.IPolylineDelegate;
 import com.google.android.gms.maps.model.internal.ITileOverlayDelegate;
 
-import org.microg.gms.maps.camera.CameraUpdate;
-import org.microg.gms.maps.camera.MapPositionCameraUpdate;
-import org.microg.gms.maps.markup.CircleImpl;
-import org.microg.gms.maps.markup.GroundOverlayImpl;
-import org.microg.gms.maps.markup.MarkerImpl;
-import org.microg.gms.maps.markup.Markup;
-import org.microg.gms.maps.markup.PolygonImpl;
-import org.microg.gms.maps.markup.PolylineImpl;
-import org.microg.gms.maps.markup.TileOverlayImpl;
+import org.microg.gms.maps.vtm.camera.CameraUpdate;
+import org.microg.gms.maps.vtm.camera.MapPositionCameraUpdate;
+import org.microg.gms.maps.vtm.markup.CircleImpl;
+import org.microg.gms.maps.vtm.markup.GroundOverlayImpl;
+import org.microg.gms.maps.vtm.markup.MarkerImpl;
+import org.microg.gms.maps.vtm.markup.Markup;
+import org.microg.gms.maps.vtm.markup.PolygonImpl;
+import org.microg.gms.maps.vtm.markup.PolylineImpl;
+import org.microg.gms.maps.vtm.markup.TileOverlayImpl;
 
 import static android.Manifest.permission.ACCESS_COARSE_LOCATION;
 import static android.Manifest.permission.ACCESS_FINE_LOCATION;
diff --git a/play-services-core/src/main/java/org/microg/gms/maps/MapFragmentImpl.java b/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/MapFragmentImpl.java
similarity index 98%
rename from play-services-core/src/main/java/org/microg/gms/maps/MapFragmentImpl.java
rename to play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/MapFragmentImpl.java
index 552a32a1..403d3157 100644
--- a/play-services-core/src/main/java/org/microg/gms/maps/MapFragmentImpl.java
+++ b/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/MapFragmentImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2017 microG Project Team
+ * Copyright (C) 2019 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,13 +14,12 @@
  * limitations under the License.
  */
 
-package org.microg.gms.maps;
+package org.microg.gms.maps.vtm;
 
 import android.app.Activity;
 import android.content.Context;
 import android.os.Bundle;
 import android.os.Handler;
-import android.os.Looper;
 import android.os.Parcel;
 import android.os.RemoteException;
 import android.util.Log;
diff --git a/play-services-core/src/main/java/org/microg/gms/maps/MapViewImpl.java b/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/MapViewImpl.java
similarity index 98%
rename from play-services-core/src/main/java/org/microg/gms/maps/MapViewImpl.java
rename to play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/MapViewImpl.java
index ba6388a5..6f713a90 100644
--- a/play-services-core/src/main/java/org/microg/gms/maps/MapViewImpl.java
+++ b/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/MapViewImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2017 microG Project Team
+ * Copyright (C) 2019 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.microg.gms.maps;
+package org.microg.gms.maps.vtm;
 
 import android.content.Context;
 import android.os.Bundle;
diff --git a/play-services-core/src/main/java/org/microg/gms/maps/ProjectionImpl.java b/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/ProjectionImpl.java
similarity index 96%
rename from play-services-core/src/main/java/org/microg/gms/maps/ProjectionImpl.java
rename to play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/ProjectionImpl.java
index 5ad86376..f6fa1954 100644
--- a/play-services-core/src/main/java/org/microg/gms/maps/ProjectionImpl.java
+++ b/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/ProjectionImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2017 microG Project Team
+ * Copyright (C) 2019 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.microg.gms.maps;
+package org.microg.gms.maps.vtm;
 
 import android.os.RemoteException;
 
diff --git a/play-services-core/src/main/java/org/microg/gms/maps/ResourcesContainer.java b/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/ResourcesContainer.java
similarity index 92%
rename from play-services-core/src/main/java/org/microg/gms/maps/ResourcesContainer.java
rename to play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/ResourcesContainer.java
index 23acdd6d..ab53e7e5 100644
--- a/play-services-core/src/main/java/org/microg/gms/maps/ResourcesContainer.java
+++ b/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/ResourcesContainer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2017 microG Project Team
+ * Copyright (C) 2019 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.microg.gms.maps;
+package org.microg.gms.maps.vtm;
 
 import android.content.res.Resources;
 
diff --git a/play-services-core/src/main/java/org/microg/gms/maps/UiSettingsImpl.java b/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/UiSettingsImpl.java
similarity index 98%
rename from play-services-core/src/main/java/org/microg/gms/maps/UiSettingsImpl.java
rename to play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/UiSettingsImpl.java
index 39f366ee..1bc296fd 100644
--- a/play-services-core/src/main/java/org/microg/gms/maps/UiSettingsImpl.java
+++ b/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/UiSettingsImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2017 microG Project Team
+ * Copyright (C) 2019 microG Project Team
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.microg.gms.maps;
+package org.microg.gms.maps.vtm;
 
 import android.os.RemoteException;
 import com.google.android.gms.maps.internal.IUiSettingsDelegate;
diff --git a/play-services-core/src/main/java/org/microg/gms/maps/bitmap/AbstractBitmapDescriptor.java b/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/bitmap/AbstractBitmapDescriptor.java
similarity index 96%
rename from play-services-core/src/main/java/org/microg/gms/maps/bitmap/AbstractBitmapDescriptor.java
rename to play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/bitmap/AbstractBitmapDescriptor.java
index 5be12759..92cee1c1 100644
--- a/play-services-core/src/main/java/org/microg/gms/maps/bitmap/AbstractBitmapDescriptor.java
+++ b/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/bitmap/AbstractBitmapDescriptor.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.microg.gms.maps.bitmap;
+package org.microg.gms.maps.vtm.bitmap;
 
 import android.content.Context;
 import android.graphics.Bitmap;
diff --git a/play-services-core/src/main/java/org/microg/gms/maps/bitmap/AssetBitmapDescriptor.java b/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/bitmap/AssetBitmapDescriptor.java
similarity index 96%
rename from play-services-core/src/main/java/org/microg/gms/maps/bitmap/AssetBitmapDescriptor.java
rename to play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/bitmap/AssetBitmapDescriptor.java
index 426a3d8e..80070321 100644
--- a/play-services-core/src/main/java/org/microg/gms/maps/bitmap/AssetBitmapDescriptor.java
+++ b/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/bitmap/AssetBitmapDescriptor.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.microg.gms.maps.bitmap;
+package org.microg.gms.maps.vtm.bitmap;
 
 import android.content.Context;
 import android.graphics.Bitmap;
diff --git a/play-services-core/src/main/java/org/microg/gms/maps/bitmap/BitmapBitmapDescriptor.java b/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/bitmap/BitmapBitmapDescriptor.java
similarity index 96%
rename from play-services-core/src/main/java/org/microg/gms/maps/bitmap/BitmapBitmapDescriptor.java
rename to play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/bitmap/BitmapBitmapDescriptor.java
index 0569840a..6ccce321 100644
--- a/play-services-core/src/main/java/org/microg/gms/maps/bitmap/BitmapBitmapDescriptor.java
+++ b/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/bitmap/BitmapBitmapDescriptor.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.microg.gms.maps.bitmap;
+package org.microg.gms.maps.vtm.bitmap;
 
 import android.content.Context;
 import android.graphics.Bitmap;
diff --git a/play-services-core/src/main/java/org/microg/gms/maps/bitmap/BitmapDescriptorFactoryImpl.java b/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/bitmap/BitmapDescriptorFactoryImpl.java
similarity index 98%
rename from play-services-core/src/main/java/org/microg/gms/maps/bitmap/BitmapDescriptorFactoryImpl.java
rename to play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/bitmap/BitmapDescriptorFactoryImpl.java
index 7ea17439..e5374a62 100644
--- a/play-services-core/src/main/java/org/microg/gms/maps/bitmap/BitmapDescriptorFactoryImpl.java
+++ b/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/bitmap/BitmapDescriptorFactoryImpl.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.microg.gms.maps.bitmap;
+package org.microg.gms.maps.vtm.bitmap;
 
 import android.graphics.Bitmap;
 import android.os.Parcel;
diff --git a/play-services-core/src/main/java/org/microg/gms/maps/bitmap/BitmapDescriptorImpl.java b/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/bitmap/BitmapDescriptorImpl.java
similarity index 98%
rename from play-services-core/src/main/java/org/microg/gms/maps/bitmap/BitmapDescriptorImpl.java
rename to play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/bitmap/BitmapDescriptorImpl.java
index 177017d4..dc12072d 100644
--- a/play-services-core/src/main/java/org/microg/gms/maps/bitmap/BitmapDescriptorImpl.java
+++ b/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/bitmap/BitmapDescriptorImpl.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.microg.gms.maps.bitmap;
+package org.microg.gms.maps.vtm.bitmap;
 
 import android.content.Context;
 import android.graphics.Bitmap;
diff --git a/play-services-core/src/main/java/org/microg/gms/maps/bitmap/DefaultBitmapDescriptor.java b/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/bitmap/DefaultBitmapDescriptor.java
similarity index 96%
rename from play-services-core/src/main/java/org/microg/gms/maps/bitmap/DefaultBitmapDescriptor.java
rename to play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/bitmap/DefaultBitmapDescriptor.java
index 4cd8bcd0..340548c5 100644
--- a/play-services-core/src/main/java/org/microg/gms/maps/bitmap/DefaultBitmapDescriptor.java
+++ b/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/bitmap/DefaultBitmapDescriptor.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.microg.gms.maps.bitmap;
+package org.microg.gms.maps.vtm.bitmap;
 
 import android.content.Context;
 import android.graphics.Bitmap;
@@ -25,10 +25,10 @@ import android.graphics.ColorMatrix;
 import android.graphics.ColorMatrixColorFilter;
 import android.graphics.Paint;
 
-import com.google.android.gms.R;
 import com.google.android.gms.dynamic.ObjectWrapper;
 
-import org.microg.gms.maps.ResourcesContainer;
+import org.microg.gms.maps.vtm.ResourcesContainer;
+import org.microg.gms.maps.vtm.R;
 
 public class DefaultBitmapDescriptor extends AbstractBitmapDescriptor {
     public static final DefaultBitmapDescriptor DEFAULT_DESCRIPTOR = new DefaultBitmapDescriptor(0);
diff --git a/play-services-core/src/main/java/org/microg/gms/maps/bitmap/FileBitmapDescriptor.java b/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/bitmap/FileBitmapDescriptor.java
similarity index 96%
rename from play-services-core/src/main/java/org/microg/gms/maps/bitmap/FileBitmapDescriptor.java
rename to play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/bitmap/FileBitmapDescriptor.java
index b7019e03..6b109b50 100644
--- a/play-services-core/src/main/java/org/microg/gms/maps/bitmap/FileBitmapDescriptor.java
+++ b/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/bitmap/FileBitmapDescriptor.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.microg.gms.maps.bitmap;
+package org.microg.gms.maps.vtm.bitmap;
 
 import android.content.Context;
 import android.graphics.Bitmap;
diff --git a/play-services-core/src/main/java/org/microg/gms/maps/bitmap/PathBitmapDescriptor.java b/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/bitmap/PathBitmapDescriptor.java
similarity index 94%
rename from play-services-core/src/main/java/org/microg/gms/maps/bitmap/PathBitmapDescriptor.java
rename to play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/bitmap/PathBitmapDescriptor.java
index 9c0ccfbf..46ad1aa0 100644
--- a/play-services-core/src/main/java/org/microg/gms/maps/bitmap/PathBitmapDescriptor.java
+++ b/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/bitmap/PathBitmapDescriptor.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.microg.gms.maps.bitmap;
+package org.microg.gms.maps.vtm.bitmap;
 
 public class PathBitmapDescriptor {
     public PathBitmapDescriptor(String absolutePath) {
diff --git a/play-services-core/src/main/java/org/microg/gms/maps/bitmap/ResourceBitmapDescriptor.java b/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/bitmap/ResourceBitmapDescriptor.java
similarity index 97%
rename from play-services-core/src/main/java/org/microg/gms/maps/bitmap/ResourceBitmapDescriptor.java
rename to play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/bitmap/ResourceBitmapDescriptor.java
index f33fda5d..9a31d284 100644
--- a/play-services-core/src/main/java/org/microg/gms/maps/bitmap/ResourceBitmapDescriptor.java
+++ b/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/bitmap/ResourceBitmapDescriptor.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.microg.gms.maps.bitmap;
+package org.microg.gms.maps.vtm.bitmap;
 
 import android.content.Context;
 import android.graphics.Bitmap;
diff --git a/play-services-core/src/main/java/org/microg/gms/maps/camera/CameraUpdate.java b/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/camera/CameraUpdate.java
similarity index 94%
rename from play-services-core/src/main/java/org/microg/gms/maps/camera/CameraUpdate.java
rename to play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/camera/CameraUpdate.java
index 70cd3d68..69639bcc 100644
--- a/play-services-core/src/main/java/org/microg/gms/maps/camera/CameraUpdate.java
+++ b/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/camera/CameraUpdate.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.microg.gms.maps.camera;
+package org.microg.gms.maps.vtm.camera;
 
 import org.oscim.map.Map;
 
diff --git a/play-services-core/src/main/java/org/microg/gms/maps/camera/CameraUpdateFactoryImpl.java b/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/camera/CameraUpdateFactoryImpl.java
similarity index 98%
rename from play-services-core/src/main/java/org/microg/gms/maps/camera/CameraUpdateFactoryImpl.java
rename to play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/camera/CameraUpdateFactoryImpl.java
index 4b00dffd..17020a86 100644
--- a/play-services-core/src/main/java/org/microg/gms/maps/camera/CameraUpdateFactoryImpl.java
+++ b/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/camera/CameraUpdateFactoryImpl.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.microg.gms.maps.camera;
+package org.microg.gms.maps.vtm.camera;
 
 import android.os.RemoteException;
 import android.util.Log;
@@ -26,7 +26,7 @@ import com.google.android.gms.maps.model.CameraPosition;
 import com.google.android.gms.maps.model.LatLng;
 import com.google.android.gms.maps.model.LatLngBounds;
 
-import org.microg.gms.maps.GmsMapsTypeHelper;
+import org.microg.gms.maps.vtm.GmsMapsTypeHelper;
 import org.oscim.core.MapPosition;
 import org.oscim.map.Map;
 
diff --git a/play-services-core/src/main/java/org/microg/gms/maps/camera/MapPositionCameraUpdate.java b/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/camera/MapPositionCameraUpdate.java
similarity index 97%
rename from play-services-core/src/main/java/org/microg/gms/maps/camera/MapPositionCameraUpdate.java
rename to play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/camera/MapPositionCameraUpdate.java
index 57fa464a..fa5ebce2 100644
--- a/play-services-core/src/main/java/org/microg/gms/maps/camera/MapPositionCameraUpdate.java
+++ b/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/camera/MapPositionCameraUpdate.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.microg.gms.maps.camera;
+package org.microg.gms.maps.vtm.camera;
 
 import org.oscim.core.MapPosition;
 import org.oscim.map.Map;
diff --git a/play-services-core/src/main/java/org/microg/gms/maps/camera/NoCameraUpdate.java b/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/camera/NoCameraUpdate.java
similarity index 95%
rename from play-services-core/src/main/java/org/microg/gms/maps/camera/NoCameraUpdate.java
rename to play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/camera/NoCameraUpdate.java
index 17cb73eb..a24a6d22 100644
--- a/play-services-core/src/main/java/org/microg/gms/maps/camera/NoCameraUpdate.java
+++ b/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/camera/NoCameraUpdate.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.microg.gms.maps.camera;
+package org.microg.gms.maps.vtm.camera;
 
 import org.oscim.map.Map;
 
diff --git a/play-services-core/src/main/java/org/microg/gms/maps/data/SharedTileCache.java b/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/data/SharedTileCache.java
similarity index 98%
rename from play-services-core/src/main/java/org/microg/gms/maps/data/SharedTileCache.java
rename to play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/data/SharedTileCache.java
index b5ccff98..3cdd61eb 100644
--- a/play-services-core/src/main/java/org/microg/gms/maps/data/SharedTileCache.java
+++ b/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/data/SharedTileCache.java
@@ -14,12 +14,11 @@
  * limitations under the License.
  */
 
-package org.microg.gms.maps.data;
+package org.microg.gms.maps.vtm.data;
 
 import android.content.ContentValues;
 import android.content.Context;
 import android.database.Cursor;
-import android.net.Uri;
 
 import org.oscim.core.Tile;
 import org.oscim.tiling.ITileCache;
diff --git a/play-services-core/src/main/java/org/microg/gms/maps/data/SharedTileProvider.java b/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/data/SharedTileProvider.java
similarity index 98%
rename from play-services-core/src/main/java/org/microg/gms/maps/data/SharedTileProvider.java
rename to play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/data/SharedTileProvider.java
index d519dea9..ddec2077 100644
--- a/play-services-core/src/main/java/org/microg/gms/maps/data/SharedTileProvider.java
+++ b/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/data/SharedTileProvider.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.microg.gms.maps.data;
+package org.microg.gms.maps.vtm.data;
 
 import android.content.ContentProvider;
 import android.content.ContentValues;
@@ -29,7 +29,7 @@ import android.net.Uri;
  */
 public class SharedTileProvider extends ContentProvider {
     private static final String DB_NAME = "tilecache.db";
-    public static final String PROVIDER_NAME = "org.microg.gms.map.tile";
+    public static final String PROVIDER_NAME = "org.microg.gms.maps.vtm.tile";
     public static final Uri PROVIDER_URI = Uri.parse("content://" + PROVIDER_NAME);
 
     private SQLiteHelper sqLiteHelper;
diff --git a/play-services-core/src/main/java/org/microg/gms/maps/markup/CircleImpl.java b/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/markup/CircleImpl.java
similarity index 98%
rename from play-services-core/src/main/java/org/microg/gms/maps/markup/CircleImpl.java
rename to play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/markup/CircleImpl.java
index 5d376f3a..18b4a999 100644
--- a/play-services-core/src/main/java/org/microg/gms/maps/markup/CircleImpl.java
+++ b/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/markup/CircleImpl.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.microg.gms.maps.markup;
+package org.microg.gms.maps.vtm.markup;
 
 import android.os.RemoteException;
 
@@ -22,7 +22,7 @@ import com.google.android.gms.maps.model.CircleOptions;
 import com.google.android.gms.maps.model.LatLng;
 import com.google.android.gms.maps.model.internal.ICircleDelegate;
 
-import org.microg.gms.maps.GmsMapsTypeHelper;
+import org.microg.gms.maps.vtm.GmsMapsTypeHelper;
 import org.oscim.layers.vector.geometries.CircleDrawable;
 import org.oscim.layers.vector.geometries.Drawable;
 import org.oscim.layers.vector.geometries.Style;
diff --git a/play-services-core/src/main/java/org/microg/gms/maps/markup/ClearableVectorLayer.java b/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/markup/ClearableVectorLayer.java
similarity index 95%
rename from play-services-core/src/main/java/org/microg/gms/maps/markup/ClearableVectorLayer.java
rename to play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/markup/ClearableVectorLayer.java
index aed3b183..4dedd470 100644
--- a/play-services-core/src/main/java/org/microg/gms/maps/markup/ClearableVectorLayer.java
+++ b/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/markup/ClearableVectorLayer.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.microg.gms.maps.markup;
+package org.microg.gms.maps.vtm.markup;
 
 import org.oscim.layers.vector.VectorLayer;
 import org.oscim.map.Map;
diff --git a/play-services-core/src/main/java/org/microg/gms/maps/markup/DrawableMarkup.java b/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/markup/DrawableMarkup.java
similarity index 95%
rename from play-services-core/src/main/java/org/microg/gms/maps/markup/DrawableMarkup.java
rename to play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/markup/DrawableMarkup.java
index 5397f1db..c91dd8d6 100644
--- a/play-services-core/src/main/java/org/microg/gms/maps/markup/DrawableMarkup.java
+++ b/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/markup/DrawableMarkup.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.microg.gms.maps.markup;
+package org.microg.gms.maps.vtm.markup;
 
 import org.oscim.layers.vector.geometries.Drawable;
 import org.oscim.map.Map;
diff --git a/play-services-core/src/main/java/org/microg/gms/maps/markup/GroundOverlayImpl.java b/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/markup/GroundOverlayImpl.java
similarity index 98%
rename from play-services-core/src/main/java/org/microg/gms/maps/markup/GroundOverlayImpl.java
rename to play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/markup/GroundOverlayImpl.java
index 1d01834e..a577bd2e 100644
--- a/play-services-core/src/main/java/org/microg/gms/maps/markup/GroundOverlayImpl.java
+++ b/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/markup/GroundOverlayImpl.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.microg.gms.maps.markup;
+package org.microg.gms.maps.vtm.markup;
 
 import android.os.RemoteException;
 import com.google.android.gms.dynamic.IObjectWrapper;
diff --git a/play-services-core/src/main/java/org/microg/gms/maps/markup/InfoWindow.java b/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/markup/InfoWindow.java
similarity index 96%
rename from play-services-core/src/main/java/org/microg/gms/maps/markup/InfoWindow.java
rename to play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/markup/InfoWindow.java
index c719ef9f..95a72ae0 100644
--- a/play-services-core/src/main/java/org/microg/gms/maps/markup/InfoWindow.java
+++ b/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/markup/InfoWindow.java
@@ -14,18 +14,17 @@
  * limitations under the License.
  */
 
-package org.microg.gms.maps.markup;
+package org.microg.gms.maps.vtm.markup;
 
 import android.content.Context;
-import android.os.Build;
 import android.view.View;
 import android.widget.FrameLayout;
 import android.widget.LinearLayout;
 import android.widget.TextView;
-import com.google.android.gms.R;
 import com.google.android.gms.maps.model.internal.IMarkerDelegate;
-import org.microg.gms.maps.GoogleMapImpl;
-import org.microg.gms.maps.ResourcesContainer;
+import org.microg.gms.maps.vtm.GoogleMapImpl;
+import org.microg.gms.maps.vtm.ResourcesContainer;
+import org.microg.gms.maps.vtm.R;
 
 import static android.os.Build.VERSION.SDK_INT;
 import static android.os.Build.VERSION_CODES.ICE_CREAM_SANDWICH_MR1;
diff --git a/play-services-core/src/main/java/org/microg/gms/maps/markup/MarkerImpl.java b/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/markup/MarkerImpl.java
similarity index 97%
rename from play-services-core/src/main/java/org/microg/gms/maps/markup/MarkerImpl.java
rename to play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/markup/MarkerImpl.java
index 0e797667..83688e2e 100644
--- a/play-services-core/src/main/java/org/microg/gms/maps/markup/MarkerImpl.java
+++ b/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/markup/MarkerImpl.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.microg.gms.maps.markup;
+package org.microg.gms.maps.vtm.markup;
 
 import android.content.Context;
 import android.graphics.Bitmap;
@@ -27,9 +27,9 @@ import com.google.android.gms.maps.model.LatLng;
 import com.google.android.gms.maps.model.MarkerOptions;
 import com.google.android.gms.maps.model.internal.IMarkerDelegate;
 
-import org.microg.gms.maps.GmsMapsTypeHelper;
-import org.microg.gms.maps.bitmap.BitmapDescriptorImpl;
-import org.microg.gms.maps.bitmap.DefaultBitmapDescriptor;
+import org.microg.gms.maps.vtm.GmsMapsTypeHelper;
+import org.microg.gms.maps.vtm.bitmap.BitmapDescriptorImpl;
+import org.microg.gms.maps.vtm.bitmap.DefaultBitmapDescriptor;
 import org.oscim.android.canvas.AndroidBitmap;
 import org.oscim.layers.marker.MarkerItem;
 import org.oscim.layers.marker.MarkerSymbol;
diff --git a/play-services-core/src/main/java/org/microg/gms/maps/markup/MarkerItemMarkup.java b/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/markup/MarkerItemMarkup.java
similarity index 95%
rename from play-services-core/src/main/java/org/microg/gms/maps/markup/MarkerItemMarkup.java
rename to play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/markup/MarkerItemMarkup.java
index 29df161e..e243d88d 100644
--- a/play-services-core/src/main/java/org/microg/gms/maps/markup/MarkerItemMarkup.java
+++ b/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/markup/MarkerItemMarkup.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.microg.gms.maps.markup;
+package org.microg.gms.maps.vtm.markup;
 
 import android.content.Context;
 
diff --git a/play-services-core/src/main/java/org/microg/gms/maps/markup/Markup.java b/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/markup/Markup.java
similarity index 96%
rename from play-services-core/src/main/java/org/microg/gms/maps/markup/Markup.java
rename to play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/markup/Markup.java
index b7958fa9..583343d8 100644
--- a/play-services-core/src/main/java/org/microg/gms/maps/markup/Markup.java
+++ b/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/markup/Markup.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.microg.gms.maps.markup;
+package org.microg.gms.maps.vtm.markup;
 
 public interface Markup {
     String getId();
diff --git a/play-services-core/src/main/java/org/microg/gms/maps/markup/PolygonImpl.java b/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/markup/PolygonImpl.java
similarity index 98%
rename from play-services-core/src/main/java/org/microg/gms/maps/markup/PolygonImpl.java
rename to play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/markup/PolygonImpl.java
index 35009fb5..d17f647b 100644
--- a/play-services-core/src/main/java/org/microg/gms/maps/markup/PolygonImpl.java
+++ b/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/markup/PolygonImpl.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.microg.gms.maps.markup;
+package org.microg.gms.maps.vtm.markup;
 
 import android.os.RemoteException;
 
@@ -22,7 +22,7 @@ import com.google.android.gms.maps.model.LatLng;
 import com.google.android.gms.maps.model.PolygonOptions;
 import com.google.android.gms.maps.model.internal.IPolygonDelegate;
 
-import org.microg.gms.maps.GmsMapsTypeHelper;
+import org.microg.gms.maps.vtm.GmsMapsTypeHelper;
 import org.oscim.core.GeoPoint;
 import org.oscim.layers.vector.geometries.Drawable;
 import org.oscim.layers.vector.geometries.PolygonDrawable;
diff --git a/play-services-core/src/main/java/org/microg/gms/maps/markup/PolylineImpl.java b/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/markup/PolylineImpl.java
similarity index 97%
rename from play-services-core/src/main/java/org/microg/gms/maps/markup/PolylineImpl.java
rename to play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/markup/PolylineImpl.java
index 756bb1c5..b2ff4c2f 100644
--- a/play-services-core/src/main/java/org/microg/gms/maps/markup/PolylineImpl.java
+++ b/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/markup/PolylineImpl.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.microg.gms.maps.markup;
+package org.microg.gms.maps.vtm.markup;
 
 import android.os.RemoteException;
 import android.util.Log;
@@ -23,7 +23,7 @@ import com.google.android.gms.maps.model.LatLng;
 import com.google.android.gms.maps.model.PolylineOptions;
 import com.google.android.gms.maps.model.internal.IPolylineDelegate;
 
-import org.microg.gms.maps.GmsMapsTypeHelper;
+import org.microg.gms.maps.vtm.GmsMapsTypeHelper;
 import org.oscim.core.GeoPoint;
 import org.oscim.layers.vector.geometries.Drawable;
 import org.oscim.layers.vector.geometries.LineDrawable;
diff --git a/play-services-core/src/main/java/org/microg/gms/maps/markup/TileOverlayImpl.java b/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/markup/TileOverlayImpl.java
similarity index 94%
rename from play-services-core/src/main/java/org/microg/gms/maps/markup/TileOverlayImpl.java
rename to play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/markup/TileOverlayImpl.java
index ebaaa86c..c13c0f6d 100644
--- a/play-services-core/src/main/java/org/microg/gms/maps/markup/TileOverlayImpl.java
+++ b/play-services-maps-core-vtm/src/main/java/org/microg/gms/maps/vtm/markup/TileOverlayImpl.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.microg.gms.maps.markup;
+package org.microg.gms.maps.vtm.markup;
 
 import com.google.android.gms.maps.model.internal.ITileOverlayDelegate;
 
diff --git a/play-services-core/src/main/res/drawable-xhdpi/maps_default_marker.png b/play-services-maps-core-vtm/src/main/res/drawable/maps_default_marker.png
similarity index 100%
rename from play-services-core/src/main/res/drawable-xhdpi/maps_default_marker.png
rename to play-services-maps-core-vtm/src/main/res/drawable/maps_default_marker.png
diff --git a/play-services-core/src/main/res/drawable-xhdpi/maps_default_window.9.png b/play-services-maps-core-vtm/src/main/res/drawable/maps_default_window.9.png
similarity index 100%
rename from play-services-core/src/main/res/drawable-xhdpi/maps_default_window.9.png
rename to play-services-maps-core-vtm/src/main/res/drawable/maps_default_window.9.png
diff --git a/play-services-core/src/main/res/drawable-nodpi/nop.png b/play-services-maps-core-vtm/src/main/res/drawable/nop.png
similarity index 100%
rename from play-services-core/src/main/res/drawable-nodpi/nop.png
rename to play-services-maps-core-vtm/src/main/res/drawable/nop.png
diff --git a/settings.gradle b/settings.gradle
index ff311f8f..70e7de8c 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -17,14 +17,11 @@ include ':play-services-base'
 include ':play-services-tasks'
 include ':play-services-wearable'
 
+include ':play-services-maps-core-vtm'
 include ':play-services-core'
 
 include ':microg-ui-tools'
 
-include ':vtm'
-include ':vtm-android'
-include ':vtm-extras'
-include ':vtm-jts'
 include ':vtm-microg-theme'
 
 include ':remote-droid-guard-lib'
diff --git a/vtm b/vtm
deleted file mode 120000
index 6928a9fa..00000000
--- a/vtm
+++ /dev/null
@@ -1 +0,0 @@
-extern/vtm/vtm
\ No newline at end of file
diff --git a/vtm-android b/vtm-android
deleted file mode 120000
index 52bee0f2..00000000
--- a/vtm-android
+++ /dev/null
@@ -1 +0,0 @@
-extern/vtm/vtm-android
\ No newline at end of file
diff --git a/vtm-extras b/vtm-extras
deleted file mode 120000
index fdd085d0..00000000
--- a/vtm-extras
+++ /dev/null
@@ -1 +0,0 @@
-extern/vtm/vtm-extras
\ No newline at end of file
diff --git a/vtm-jts b/vtm-jts
deleted file mode 120000
index 32e34994..00000000
--- a/vtm-jts
+++ /dev/null
@@ -1 +0,0 @@
-extern/vtm/vtm-jts
\ No newline at end of file
diff --git a/vtm-microg-theme/build.gradle b/vtm-microg-theme/build.gradle
index e22d86c4..3304c9a0 100644
--- a/vtm-microg-theme/build.gradle
+++ b/vtm-microg-theme/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'java'
 apply plugin: 'maven'
 
 dependencies {
-    compile project(':vtm')
+    compile "org.microg:vtm:0.9.1-mod"
 }
 
 sourceSets {