diff --git a/products/gms.mk b/gms.mk
similarity index 100%
rename from products/gms.mk
rename to gms.mk
diff --git a/vendorsetup.sh b/vendorsetup.sh
index d79127e..9565cb1 100755
--- a/vendorsetup.sh
+++ b/vendorsetup.sh
@@ -10,7 +10,7 @@ download_apk() {
     local component_name=$2
     local destination_apk
 
-    destination_apk="$component_name"/"$component_name".apk
+    destination_apk="apps/$component_name"/"$component_name".apk
     if [ -f "$destination_apk" ]; then
         echo "$destination_apk exists: not downloading"
         ## To Do
@@ -28,7 +28,7 @@ get-fdroid-components() {
 
     # F-Droid client app
     name="FDroid"
-    versioncode=$(cat "$name"/.version_code)
+    versioncode=$(cat "apps/$name"/.version_code)
     id="org.fdroid.fdroid"
     apk_to_download="$fdroid_repo"/"$id"_"$versioncode".apk
 
@@ -37,7 +37,7 @@ get-fdroid-components() {
 
     # FDroid Privileged Extension
     name="FDroidPrivilegedExtension"
-    versioncode=$(cat "$name"/.version_code)
+    versioncode=$(cat "apps/$name"/.version_code)
     id="org.fdroid.fdroid.privileged"
     apk_to_download="$fdroid_repo"/"$id"_"$versioncode".apk
 
@@ -52,7 +52,7 @@ get-microg-components() {
 
     # GmsCore
     name="GmsCore"
-    versioncode=$(cat "$name"/.version_code)
+    versioncode=$(cat "apps/$name"/.version_code)
     id="com.google.android.gms"
     apk_to_download="$microg_repo_base"/GMSCore/releases/download/"$microg_release"/"$id"-"$versioncode".apk
     # echo "$name apk_to_download: $apk_to_download"
@@ -60,7 +60,7 @@ get-microg-components() {
 
     # FakeStore
     name="FakeStore"
-    versioncode=$(cat "$name"/.version_code)
+    versioncode=$(cat "apps/$name"/.version_code)
     id="com.android.vending"
     apk_to_download="$microg_repo_base"/GMSCore/releases/download/"$microg_release"/"$id"-"$versioncode".apk
     # echo "$name apk_to_download: $apk_to_download"
@@ -69,13 +69,13 @@ get-microg-components() {
     # GsfProxy the file we want is
     #`https://github.com/microg/android_packages_apps_GsfProxy/releases/download/v0.1.0/GsfProxy.apk`
     name="GsfProxy"
-    versioncode=$(cat "$name"/.version_code)
+    versioncode=$(cat "apps/$name"/.version_code)
     apk_to_download="$microg_repo_base"/android_packages_apps_GsfProxy/releases/download/"$versioncode"/"$name".apk
     # echo "$name apk_to_download: $apk_to_download"
     download_apk "$apk_to_download" "$name"
 }
 
-# This script is called from the root dierctory, so we need to cd
+# This script is called from the root directory, so we need to cd
 cd vendor/partner_gms
 get-fdroid-components
 get-microg-components