diff --git a/py.pypi.sh b/py.pypi.sh
index e3214d1..5cfdc72 100755
--- a/py.pypi.sh
+++ b/py.pypi.sh
@@ -47,13 +47,18 @@ for version in "os" "3.12" "3.11" "3.10" "pypy3.10"; do
 	export OLD_PATH="${PATH}"
 	export PATH="${VIRTUAL_ENV}/bin:${PATH}"
 
-	sub="${root}/${version}"
+	sub="${root}"
+	# sub="${root}/${version}"
 
 	python3 -m pip \
 		download \
 		--dest "${sub}" \
 		"${@}"
 
+	export PATH="${OLD_PATH}"
+	unset OLD_PATH VIRTUAL_ENV
+done
+
 	prefix="Name: "
 	for wheel in "${sub}/"*; do
 		rm --force --recursive "${tmp}"
@@ -94,11 +99,7 @@ for version in "os" "3.12" "3.11" "3.10" "pypy3.10"; do
 		echo "${name}"
 		simple="${sub}/simple/${name}"
 		mkdir --parents "${simple}"
-		mv -i "${sub}/${file_name}-"* "${simple}/"
+		mv -i "${wheel}" "${simple}/"
 	done
 
-	export PATH="${OLD_PATH}"
-	unset OLD_PATH VIRTUAL_ENV
-done
-
 rm --force --recursive "${tmp}"