diff --git a/.gitmodules b/.gitmodules
index bddcb0c..634ab4c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
-[submodule "play-services-api"]
-	path = play-services-api
+[submodule "GmsApi"]
+	path = extern/GmsApi
 	url = https://github.com/microg/android_external_GmsApi.git
diff --git a/SafeParcel b/SafeParcel
deleted file mode 120000
index 18f7aa7..0000000
--- a/SafeParcel
+++ /dev/null
@@ -1 +0,0 @@
-play-services-api/SafeParcel/
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 135b35a..4cb7b45 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,5 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 subprojects {
-    group = 'org.microg.gms'
+    group = 'org.microg'
     version = '1.0-SNAPSHOT'
-}
\ No newline at end of file
+}
diff --git a/extern/GmsApi b/extern/GmsApi
new file mode 160000
index 0000000..c0c4a78
--- /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 dbae4ad..0000000
--- 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 0000000..ce1f09c
--- /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 0000000..5c222c0
--- /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 c87b199..9ec62cf 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,4 +1,5 @@
-include ':SafeParcel'
+include ':safe-parcel'
+
 include ':play-services-api'
 
 include ':play-services-base'