diff --git a/battery/Makefile b/battery/Makefile
new file mode 100644
index 0000000..2478775
--- /dev/null
+++ b/battery/Makefile
@@ -0,0 +1,20 @@
+all: ;
+clean: ;
+sane: ;
+
+dist: ../dist/battery.tar.gz
+
+../dist/battery: battery
+	mkdir -p ../dist/battery.tmp/bin/
+	cp battery* ../dist/battery.tmp/bin/
+	mv ../dist/battery.tmp ../dist/battery
+
+../dist/battery.tar: ../dist/battery
+	cd ../dist/battery && pax -w -x ustar . >../battery.tar.tmp
+	mv ../dist/battery.tar.tmp ../dist/battery.tar
+
+../dist/battery.tar.gz: ../dist/battery.tar
+	gzip -c <../dist/battery.tar >../dist/battery.tar.gz.tmp
+	mv ../dist/battery.tar.gz.tmp ../dist/battery.tar.gz
+	
+.PHONY: all clean sane
diff --git a/bin/battery b/battery/battery
similarity index 100%
rename from bin/battery
rename to battery/battery
diff --git a/bin/battery.linux b/battery/battery.linux
similarity index 100%
rename from bin/battery.linux
rename to battery/battery.linux
diff --git a/bin/battery.netbsd b/battery/battery.netbsd
similarity index 100%
rename from bin/battery.netbsd
rename to battery/battery.netbsd
diff --git a/bin/batterymonitor b/battery/batterymonitor
similarity index 96%
rename from bin/batterymonitor
rename to battery/batterymonitor
index b598764..a77dd99 100755
--- a/bin/batterymonitor
+++ b/battery/batterymonitor
@@ -10,7 +10,7 @@ emit() {
 	echo "$@"
 }
 
-! battery >/dev/null \
+! battery >/dev/null 2>&1 \
 	&& printf "Unable to get battery status on this system.\n" 1>&2 \
 	&& exit 1 \
 	|| true
diff --git a/dist/doas-sudo/PKGBUILD b/doas-sudo/PKGBUILD
similarity index 100%
rename from dist/doas-sudo/PKGBUILD
rename to doas-sudo/PKGBUILD
diff --git a/bin/volume b/volume/volume
similarity index 100%
rename from bin/volume
rename to volume/volume
diff --git a/bin/volume.netbsd b/volume/volume.netbsd
similarity index 100%
rename from bin/volume.netbsd
rename to volume/volume.netbsd
diff --git a/bin/volume.pulseaudio b/volume/volume.pulseaudio
similarity index 100%
rename from bin/volume.pulseaudio
rename to volume/volume.pulseaudio