diff --git a/.gitmodules b/.gitmodules
index 692e8a81..b26d31a0 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,6 @@
-[submodule "play-services-api"]
-	path = play-services-api
-	url = https://github.com/microg/android_external_GmsApi.git
 [submodule "extern/UnifiedNlp"]
 	path = extern/UnifiedNlp
 	url = https://github.com/microg/android_packages_apps_UnifiedNlp.git
+[submodule "extern/GmsApi"]
+	path = extern/GmsApi
+	url = https://github.com/microg/android_external_GmsApi.git
diff --git a/SafeParcel b/SafeParcel
deleted file mode 120000
index 18f7aa75..00000000
--- a/SafeParcel
+++ /dev/null
@@ -1 +0,0 @@
-play-services-api/SafeParcel/
\ No newline at end of file
diff --git a/extern/GmsApi b/extern/GmsApi
new file mode 160000
index 00000000..c0c4a78e
--- /dev/null
+++ b/extern/GmsApi
@@ -0,0 +1 @@
+Subproject commit c0c4a78eab3064cdd7545cb7fcdddfe93ca1674d
diff --git a/play-services-api b/play-services-api
deleted file mode 160000
index dbae4add..00000000
--- a/play-services-api
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit dbae4add94505fb0765ca9a18896848df6ae6ae4
diff --git a/play-services-api b/play-services-api
new file mode 120000
index 00000000..ce1f09ca
--- /dev/null
+++ b/play-services-api
@@ -0,0 +1 @@
+extern/GmsApi/play-services-api
\ No newline at end of file
diff --git a/safe-parcel b/safe-parcel
new file mode 120000
index 00000000..5c222c0b
--- /dev/null
+++ b/safe-parcel
@@ -0,0 +1 @@
+extern/GmsApi/safe-parcel
\ No newline at end of file
diff --git a/settings.gradle b/settings.gradle
index 76a74743..d3cec332 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,7 +1,8 @@
+include ':safe-parcel'
+
 include ':unifiednlp-api'
 include ':unifiednlp-base'
 include ':unifiednlp-compat'
 
-include ':SafeParcel'
 include ':play-services-api'
 include ':play-services-core'