diff --git a/pkgkit b/pkgkit
index 327c0ec37b8e14705866eec99aa91bf104e16130..6b9c00497386b86f31eef6802557edfe9262af41 100755
--- a/pkgkit
+++ b/pkgkit
@@ -225,7 +225,7 @@ 	arch="$(uname -m)"
 	aver="$(get_aver)"
 
 	set -x
-	path="$remote_path/$aver/$repo/$arch"
+	path="$remote_path/$aver/$arch"
 	ssh "$remote" mkdir -p "$path"
 
 	url=$(echo "$remote" | cut -d@ -f2)
diff --git a/pkgs/gallery-dl/APKBUILD b/apks/gallery-dl/APKBUILD
rename from pkgs/gallery-dl/APKBUILD
rename to apks/gallery-dl/APKBUILD
diff --git a/pkgs/genpass/APKBUILD b/apks/genpass/APKBUILD
rename from pkgs/genpass/APKBUILD
rename to apks/genpass/APKBUILD
diff --git a/pkgs/genpass/genpass.nginx.conf b/apks/genpass/genpass.nginx.conf
rename from pkgs/genpass/genpass.nginx.conf
rename to apks/genpass/genpass.nginx.conf
diff --git a/pkgs/jsonpickle/APKBUILD b/apks/jsonpickle/APKBUILD
rename from pkgs/jsonpickle/APKBUILD
rename to apks/jsonpickle/APKBUILD
diff --git a/pkgs/jsonpickle/tests.patch b/apks/jsonpickle/tests.patch
rename from pkgs/jsonpickle/tests.patch
rename to apks/jsonpickle/tests.patch
diff --git a/pkgs/midr/APKBUILD b/apks/midr/APKBUILD
rename from pkgs/midr/APKBUILD
rename to apks/midr/APKBUILD
diff --git a/pkgs/midr/midr.confd b/apks/midr/midr.confd
rename from pkgs/midr/midr.confd
rename to apks/midr/midr.confd
diff --git a/pkgs/midr/midr.initd b/apks/midr/midr.initd
rename from pkgs/midr/midr.initd
rename to apks/midr/midr.initd
diff --git a/pkgs/midr/midr.pre-install b/apks/midr/midr.pre-install
rename from pkgs/midr/midr.pre-install
rename to apks/midr/midr.pre-install
diff --git a/pkgs/nextcloud-api-wrapper/APKBUILD b/apks/nextcloud-api-wrapper/APKBUILD
rename from pkgs/nextcloud-api-wrapper/APKBUILD
rename to apks/nextcloud-api-wrapper/APKBUILD
diff --git a/pkgs/reddit-nextcloud-importer/APKBUILD b/apks/reddit-nextcloud-importer/APKBUILD
rename from pkgs/reddit-nextcloud-importer/APKBUILD
rename to apks/reddit-nextcloud-importer/APKBUILD
diff --git a/pkgs/reddit-nextcloud-importer/reddit-nextcloud-importer.confd b/apks/reddit-nextcloud-importer/reddit-nextcloud-importer.confd
rename from pkgs/reddit-nextcloud-importer/reddit-nextcloud-importer.confd
rename to apks/reddit-nextcloud-importer/reddit-nextcloud-importer.confd
diff --git a/pkgs/reddit-nextcloud-importer/reddit-nextcloud-importer.initd b/apks/reddit-nextcloud-importer/reddit-nextcloud-importer.initd
rename from pkgs/reddit-nextcloud-importer/reddit-nextcloud-importer.initd
rename to apks/reddit-nextcloud-importer/reddit-nextcloud-importer.initd
diff --git a/pkgs/reddit-nextcloud-importer/reddit-nextcloud-importer.pre-install b/apks/reddit-nextcloud-importer/reddit-nextcloud-importer.pre-install
rename from pkgs/reddit-nextcloud-importer/reddit-nextcloud-importer.pre-install
rename to apks/reddit-nextcloud-importer/reddit-nextcloud-importer.pre-install