diff --git a/play-services-base-core/build.gradle b/play-services-base-core/build.gradle
deleted file mode 100644
index a534bc64..00000000
--- a/play-services-base-core/build.gradle
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2020, microG Project Team
- * SPDX-License-Identifier: Apache-2.0
- */
-
-apply plugin: 'com.android.library'
-
-dependencies {
-    api project(':play-services-basement')
-
-    implementation "androidx.annotation:annotation:$annotationVersion"
-}
-
-android {
-    compileSdkVersion androidCompileSdk
-    buildToolsVersion "$androidBuildVersionTools"
-
-    defaultConfig {
-        versionName version
-        minSdkVersion androidMinSdk
-        targetSdkVersion androidTargetSdk
-    }
-
-    compileOptions {
-        sourceCompatibility = 1.8
-        targetCompatibility = 1.8
-    }
-}
diff --git a/play-services-base-core/src/main/AndroidManifest.xml b/play-services-base-core/src/main/AndroidManifest.xml
deleted file mode 100644
index 13255d7c..00000000
--- a/play-services-base-core/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ SPDX-FileCopyrightText: 2020, microG Project Team
-  ~ SPDX-License-Identifier: Apache-2.0
-  -->
-<manifest package="org.microg.gms.base.core">
-
-    <application />
-</manifest>
diff --git a/play-services-base/build.gradle b/play-services-base/build.gradle
index f26a4e11..67a6c3a9 100644
--- a/play-services-base/build.gradle
+++ b/play-services-base/build.gradle
@@ -38,5 +38,5 @@ dependencies {
     api project(':play-services-base-api')
 
     implementation "androidx.fragment:fragment:$fragmentVersion"
-    implementation "com.google.android.gms:play-services-base:17.3.0"
+    implementation 'com.google.android.gms:play-services-base:17.4.0'
 }
diff --git a/play-services-basement/build.gradle b/play-services-basement/build.gradle
index 474bebb1..42bff19a 100644
--- a/play-services-basement/build.gradle
+++ b/play-services-basement/build.gradle
@@ -22,7 +22,7 @@ dependencies {
     api "org.microg:safe-parcel:$safeParcelVersion"
 
     implementation "androidx.annotation:annotation:$annotationVersion"
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.0"
 }
 
 android {
diff --git a/play-services-core/build.gradle b/play-services-core/build.gradle
index c8cc35b4..aa79268c 100644
--- a/play-services-core/build.gradle
+++ b/play-services-core/build.gradle
@@ -30,7 +30,6 @@ dependencies {
     // Specified manually due to
     // https://github.com/vitalidze/chromecast-java-api-v2/issues/91
 
-    implementation project(':play-services-base-core')
     implementation project(':play-services-core-proto')
     implementation project(':play-services-core:microg-ui-tools') // deprecated
     implementation project(':play-services-api')
@@ -47,7 +46,7 @@ dependencies {
     implementation "androidx.navigation:navigation-ui-ktx:$navigationVersion"
 
     implementation "androidx.lifecycle:lifecycle-service:$lifecycleVersion"
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlinVersion"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.0"
     implementation project(path: ':play-services-basement')
 }
 
diff --git a/play-services-base-core/src/main/java/org/microg/gms/AbstractGmsServiceBroker.java b/play-services-core/src/main/java/org/microg/gms/AbstractGmsServiceBroker.java
similarity index 100%
rename from play-services-base-core/src/main/java/org/microg/gms/AbstractGmsServiceBroker.java
rename to play-services-core/src/main/java/org/microg/gms/AbstractGmsServiceBroker.java
diff --git a/play-services-base-core/src/main/java/org/microg/gms/BaseService.java b/play-services-core/src/main/java/org/microg/gms/BaseService.java
similarity index 100%
rename from play-services-base-core/src/main/java/org/microg/gms/BaseService.java
rename to play-services-core/src/main/java/org/microg/gms/BaseService.java
diff --git a/play-services-base-core/src/main/java/org/microg/gms/ChimeraSpoofProvider.java b/play-services-core/src/main/java/org/microg/gms/ChimeraSpoofProvider.java
similarity index 100%
rename from play-services-base-core/src/main/java/org/microg/gms/ChimeraSpoofProvider.java
rename to play-services-core/src/main/java/org/microg/gms/ChimeraSpoofProvider.java
diff --git a/play-services-base-core/src/main/java/org/microg/gms/DummyService.java b/play-services-core/src/main/java/org/microg/gms/DummyService.java
similarity index 100%
rename from play-services-base-core/src/main/java/org/microg/gms/DummyService.java
rename to play-services-core/src/main/java/org/microg/gms/DummyService.java
diff --git a/play-services-base-core/src/main/java/org/microg/gms/common/Build.java b/play-services-core/src/main/java/org/microg/gms/common/Build.java
similarity index 100%
rename from play-services-base-core/src/main/java/org/microg/gms/common/Build.java
rename to play-services-core/src/main/java/org/microg/gms/common/Build.java
diff --git a/play-services-base-core/src/main/java/org/microg/gms/common/DeviceConfiguration.java b/play-services-core/src/main/java/org/microg/gms/common/DeviceConfiguration.java
similarity index 100%
rename from play-services-base-core/src/main/java/org/microg/gms/common/DeviceConfiguration.java
rename to play-services-core/src/main/java/org/microg/gms/common/DeviceConfiguration.java
diff --git a/play-services-base-core/src/main/java/org/microg/gms/common/DeviceIdentifier.java b/play-services-core/src/main/java/org/microg/gms/common/DeviceIdentifier.java
similarity index 100%
rename from play-services-base-core/src/main/java/org/microg/gms/common/DeviceIdentifier.java
rename to play-services-core/src/main/java/org/microg/gms/common/DeviceIdentifier.java
diff --git a/play-services-base-core/src/main/java/org/microg/gms/common/ForegroundServiceContext.java b/play-services-core/src/main/java/org/microg/gms/common/ForegroundServiceContext.java
similarity index 89%
rename from play-services-base-core/src/main/java/org/microg/gms/common/ForegroundServiceContext.java
rename to play-services-core/src/main/java/org/microg/gms/common/ForegroundServiceContext.java
index 720e0d84..bb97cc2e 100644
--- a/play-services-base-core/src/main/java/org/microg/gms/common/ForegroundServiceContext.java
+++ b/play-services-core/src/main/java/org/microg/gms/common/ForegroundServiceContext.java
@@ -10,6 +10,7 @@ import android.content.ComponentName;
 import android.content.Context;
 import android.content.ContextWrapper;
 import android.content.Intent;
+import android.content.res.Resources;
 import android.os.Build;
 import android.os.PowerManager;
 import android.provider.Settings;
@@ -17,7 +18,7 @@ import android.util.Log;
 
 import androidx.annotation.RequiresApi;
 
-import org.microg.gms.base.core.R;
+import com.mgoogle.android.gms.R;
 
 import java.util.List;
 
@@ -69,7 +70,7 @@ public class ForegroundServiceContext extends ContextWrapper {
 
     @RequiresApi(api = Build.VERSION_CODES.O)
     private static Notification buildForegroundNotification(Context context) {
-        NotificationChannel channel = new NotificationChannel("foreground-service", "Foreground Service", NotificationManager.IMPORTANCE_MIN);
+        NotificationChannel channel = new NotificationChannel("foreground-service", context.getResources().getString(R.string.notification_service_name), NotificationManager.IMPORTANCE_MIN);
         channel.setShowBadge(false);
         channel.setLockscreenVisibility(0);
         channel.setVibrationPattern(new long[0]);
@@ -81,8 +82,8 @@ public class ForegroundServiceContext extends ContextWrapper {
         return new Notification.Builder(context, channel.getId())
                 .setOngoing(true)
                 .setContentIntent(pendingIntent)
-                .setContentTitle("Running in background")
-                .setContentText("Tap me to disable battery optimisations for microG")
+                .setContentTitle(context.getResources().getString(R.string.notification_service_title))
+                .setContentText(context.getResources().getString(R.string.notification_service_content))
                 .setSmallIcon(R.drawable.ic_foreground_notification)
                 .build();
     }
diff --git a/play-services-base-core/src/main/java/org/microg/gms/common/HttpFormClient.java b/play-services-core/src/main/java/org/microg/gms/common/HttpFormClient.java
similarity index 100%
rename from play-services-base-core/src/main/java/org/microg/gms/common/HttpFormClient.java
rename to play-services-core/src/main/java/org/microg/gms/common/HttpFormClient.java
diff --git a/play-services-base-core/src/main/java/org/microg/gms/common/MultiListenerProxy.java b/play-services-core/src/main/java/org/microg/gms/common/MultiListenerProxy.java
similarity index 100%
rename from play-services-base-core/src/main/java/org/microg/gms/common/MultiListenerProxy.java
rename to play-services-core/src/main/java/org/microg/gms/common/MultiListenerProxy.java
diff --git a/play-services-base-core/src/main/java/org/microg/gms/common/NonCancelToken.java b/play-services-core/src/main/java/org/microg/gms/common/NonCancelToken.java
similarity index 100%
rename from play-services-base-core/src/main/java/org/microg/gms/common/NonCancelToken.java
rename to play-services-core/src/main/java/org/microg/gms/common/NonCancelToken.java
diff --git a/play-services-base-core/src/main/java/org/microg/gms/common/PackageUtils.java b/play-services-core/src/main/java/org/microg/gms/common/PackageUtils.java
similarity index 100%
rename from play-services-base-core/src/main/java/org/microg/gms/common/PackageUtils.java
rename to play-services-core/src/main/java/org/microg/gms/common/PackageUtils.java
diff --git a/play-services-base-core/src/main/java/org/microg/gms/common/PhoneInfo.java b/play-services-core/src/main/java/org/microg/gms/common/PhoneInfo.java
similarity index 100%
rename from play-services-base-core/src/main/java/org/microg/gms/common/PhoneInfo.java
rename to play-services-core/src/main/java/org/microg/gms/common/PhoneInfo.java
diff --git a/play-services-base-core/src/main/java/org/microg/gms/common/RemoteListenerProxy.java b/play-services-core/src/main/java/org/microg/gms/common/RemoteListenerProxy.java
similarity index 100%
rename from play-services-base-core/src/main/java/org/microg/gms/common/RemoteListenerProxy.java
rename to play-services-core/src/main/java/org/microg/gms/common/RemoteListenerProxy.java
diff --git a/play-services-base-core/src/main/java/org/microg/gms/common/Utils.java b/play-services-core/src/main/java/org/microg/gms/common/Utils.java
similarity index 100%
rename from play-services-base-core/src/main/java/org/microg/gms/common/Utils.java
rename to play-services-core/src/main/java/org/microg/gms/common/Utils.java
diff --git a/play-services-core/src/main/java/org/microg/gms/gcm/McsService.java b/play-services-core/src/main/java/org/microg/gms/gcm/McsService.java
index 238c1c55..c18a3e56 100644
--- a/play-services-core/src/main/java/org/microg/gms/gcm/McsService.java
+++ b/play-services-core/src/main/java/org/microg/gms/gcm/McsService.java
@@ -43,6 +43,7 @@ import android.util.Log;
 import androidx.annotation.RequiresApi;
 import androidx.legacy.content.WakefulBroadcastReceiver;
 
+import com.mgoogle.android.gms.R;
 import com.squareup.wire.Message;
 
 import org.microg.gms.checkin.LastCheckinInfo;
@@ -320,13 +321,13 @@ public class McsService extends Service implements Handler.Callback {
 
     @RequiresApi(api = Build.VERSION_CODES.O)
     private Notification buildForegroundNotification() {
-        NotificationChannel channel = new NotificationChannel("foreground-service", "Foreground Service", NotificationManager.IMPORTANCE_LOW);
+        NotificationChannel channel = new NotificationChannel("foreground-service", getString(R.string.notification_service_name), NotificationManager.IMPORTANCE_LOW);
         channel.setLockscreenVisibility(Notification.VISIBILITY_SECRET);
         channel.setShowBadge(false);
         getSystemService(NotificationManager.class).createNotificationChannel(channel);
         return new Notification.Builder(this, channel.getId())
                 .setOngoing(true)
-                .setContentTitle("Running in background")
+                .setContentTitle(this.getResources().getString(R.string.notification_service_title))
                 .setSmallIcon(android.R.drawable.stat_notify_sync)
                 .build();
     }
diff --git a/play-services-base-core/src/main/res/drawable/ic_foreground_notification.xml b/play-services-core/src/main/res/drawable/ic_foreground_notification.xml
similarity index 100%
rename from play-services-base-core/src/main/res/drawable/ic_foreground_notification.xml
rename to play-services-core/src/main/res/drawable/ic_foreground_notification.xml
diff --git a/play-services-core/src/main/res/values-it/strings.xml b/play-services-core/src/main/res/values-it/strings.xml
index ab264d5c..e6acb930 100755
--- a/play-services-core/src/main/res/values-it/strings.xml
+++ b/play-services-core/src/main/res/values-it/strings.xml
@@ -16,6 +16,11 @@
 
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="gms_settings_name">Impostazioni di Vanced microG</string>
+    <string name="gms_settings_summary">Configura Vanced microG.</string>
+
+    <string name="notification_service_name">Servizio in Primo Piano</string>
+    <string name="notification_service_title">Esecuzione in secondo piano</string>
+    <string name="notification_service_content">Tocca per disattivare il risparmio energetico per microG</string>
 
     <string name="just_a_sec">Giusto un secondo…</string>
     <string name="ask_permission_tos">Continuando autorizzi questa applicazione e Google ad usare le tue informazioni in accordo con i rispettivi termini di servizio e politiche di riservatezza.</string>
diff --git a/play-services-core/src/main/res/values/strings.xml b/play-services-core/src/main/res/values/strings.xml
index 644cdf88..9c99e8a2 100755
--- a/play-services-core/src/main/res/values/strings.xml
+++ b/play-services-core/src/main/res/values/strings.xml
@@ -18,6 +18,10 @@
     <string name="gms_settings_name">Vanced microG Settings</string>
     <string name="gms_settings_summary">Setup Vanced microG.</string>
 
+    <string name="notification_service_name">Foreground Service</string>
+    <string name="notification_service_title">Running in background</string>
+    <string name="notification_service_content">Tap me to disable battery saving for microG</string>
+
     <string name="just_a_sec">Just a sec…</string>
     <string name="ask_permission_tos">By continuing, you allow this app and Google to use your information in accordance with their respective terms of service and privacy policies.</string>
     <string name="ask_scope_permission_title"><xliff:g example="F-Droid">%1$s</xliff:g> would like to:</string>
diff --git a/settings.gradle b/settings.gradle
index 81aefbb8..cf6f6fa8 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -11,8 +11,6 @@ include ':play-services-base-api'
 include ':play-services-tasks'
 include ':play-services-core-proto'
 
-include ':play-services-base-core'
-
 include ':play-services-core'
 include ':play-services-core:microg-ui-tools'