diff --git a/TODO.md b/TODO.md
index b4d50d0..1c32c32 100644
--- a/TODO.md
+++ b/TODO.md
@@ -13,3 +13,4 @@
   - also interactive?
 - allow arbitrary flags for launch & build?
 - make install script set kernel params for rootless?
+- use containers user?
diff --git a/install.sh b/install.sh
index dca393d..0975359 100755
--- a/install.sh
+++ b/install.sh
@@ -8,9 +8,8 @@ distro=$(lsb_release -is)
 release=$(lsb_release -rs)
 if [[ $distro == "Debian" ]]; then
     echo "Detected distro: Debian"
-    if [[ $release == "10" ]]; then
-	echo "Detected release: 10"
-	release=10
+    if [[ $release =~ '^[0-9]+$' ]]; then
+	echo "Detected release: $release"
     elif [[ $release == "testing" ]]; then
 	echo "Detected release: testing"
 	release=Testing
@@ -32,13 +31,13 @@ fi
 
 echo "Copying scripts to /usr/local/bin ..."
 # copy bin files to /usr/local/bin
-sudo cp bin/* /usr/local/bin/
+sudo cp install/bin/* /usr/local/bin/
 # copy shflags to /usr/local/bin as well
-sudo cp lib/shflags /usr/local/bin/
+sudo cp install/shflags /usr/local/bin/
 
 echo "Installing containers startup service ..."
 # install systemd startup service
-sudo cp lib/containers-startup.service /etc/systemd/system/
+sudo cp install/containers-startup.service /etc/systemd/system/
 sudo systemctl enable containers-startup.service
 # create startup.sh if it doesn't exist
 if [[ ! -f /etc/containers/startup.sh ]]; then
diff --git a/bin/pdm-build b/install/bin/pdm-build
similarity index 100%
rename from bin/pdm-build
rename to install/bin/pdm-build
diff --git a/bin/pdm-launch b/install/bin/pdm-launch
similarity index 100%
rename from bin/pdm-launch
rename to install/bin/pdm-launch
diff --git a/bin/pdm-shell b/install/bin/pdm-shell
similarity index 100%
rename from bin/pdm-shell
rename to install/bin/pdm-shell
diff --git a/lib/containers-startup.service b/install/containers-startup.service
similarity index 100%
rename from lib/containers-startup.service
rename to install/containers-startup.service
diff --git a/lib/shflags b/install/shflags
similarity index 100%
rename from lib/shflags
rename to install/shflags