diff --git a/libexec/sourcezap/commands/sourcezap-checkout b/libexec/sourcezap/commands/sourcezap-checkout
index 893a477..399a54f 100755
--- a/libexec/sourcezap/commands/sourcezap-checkout
+++ b/libexec/sourcezap/commands/sourcezap-checkout
@@ -5,7 +5,7 @@ set -e
 # variables
 localbase=${LOCALBASE:-$(realpath "$(dirname "$0")"/../../..)}
 libexec="${localbase}"/libexec/sourcezap
-git="${libexec}"/utils/git/run
+git="${libexec}"/scripts/git
 repodir=$1
 branch=$2
 
@@ -21,7 +21,7 @@ if [ "$(id -u)" = "0" ]; then
     exit 1
 fi
 
-if ! "${libexec}"/utils/issourcezap-member; then
+if ! "${libexec}"/scripts/is-sourcezap-member; then
     printerr "$(id -un) is not a member of _sourcezap"
     exit 1
 fi
diff --git a/libexec/sourcezap/commands/sourcezap-clone b/libexec/sourcezap/commands/sourcezap-clone
index 34b3b0a..01678d1 100755
--- a/libexec/sourcezap/commands/sourcezap-clone
+++ b/libexec/sourcezap/commands/sourcezap-clone
@@ -5,7 +5,7 @@ set -e
 # variables
 localbase=${LOCALBASE:-$(realpath "$(dirname "$0")"/../../..)}
 libexec="${localbase}"/libexec/sourcezap
-git="${libexec}"/utils/git/run
+git="${libexec}"/scripts/git
 repourl=$1
 repodir=$2
 branch=$3
@@ -22,7 +22,7 @@ if [ "$(id -u)" = "0" ]; then
     exit 1
 fi
 
-if ! "${libexec}"/utils/issourcezap-member; then
+if ! "${libexec}"/scripts/is-sourcezap-member; then
     printerr "$(id -un) is not a member of _sourcezap"
     exit 1
 fi
diff --git a/libexec/sourcezap/commands/sourcezap-install b/libexec/sourcezap/commands/sourcezap-install
index ef42861..4eefade 100755
--- a/libexec/sourcezap/commands/sourcezap-install
+++ b/libexec/sourcezap/commands/sourcezap-install
@@ -5,8 +5,8 @@ set -e
 # variables
 localbase=${LOCALBASE:-$(realpath "$(dirname "$0")"/../../..)}
 libexec="${localbase}"/libexec/sourcezap
-git="${libexec}"/utils/git/run
-mask=$("${libexec}"/utils/get-umask)
+git="${libexec}"/scripts/git
+mask=$("${libexec}"/scripts/get-default-umask)
 repodir=$1
 installdir=$2
 commitfile=$3
@@ -28,14 +28,14 @@ if [ -e "${commitfile}" ]; then
     ##
     # install update
     commit=$(cat "${commitfile}")
-    "${libexec}"/utils/install/run -d "${installdir}"
-    "${libexec}"/utils/install/update-deleted-files "${repodir}" "${installdir}" "${commit}"
-    "${libexec}"/utils/install/update-changed-files "${repodir}" "${installdir}" "${commit}"
+    "${libexec}"/scripts/install -d "${installdir}"
+    "${libexec}"/scripts/update-deleted-files "${repodir}" "${installdir}" "${commit}"
+    "${libexec}"/scripts/update-changed-files "${repodir}" "${installdir}" "${commit}"
 else
     ##
     # install from scratch
     umask "${mask}"
-    "${libexec}"/utils/install/run -d "${installdir}"
+    "${libexec}"/scripts/install -d "${installdir}"
     find -s . \
          -maxdepth 1 \
          ! -name "." \
diff --git a/libexec/sourcezap/commands/sourcezap-pull b/libexec/sourcezap/commands/sourcezap-pull
index e0ff64c..494f69f 100755
--- a/libexec/sourcezap/commands/sourcezap-pull
+++ b/libexec/sourcezap/commands/sourcezap-pull
@@ -5,7 +5,7 @@ set -e
 # variables
 localbase=${LOCALBASE:-$(realpath "$(dirname "$0")"/../../..)}
 libexec="${localbase}"/libexec/sourcezap
-git="${libexec}"/utils/git/run
+git="${libexec}"/scripts/git
 repodir=$1
 
 ##
@@ -20,7 +20,7 @@ if [ "$(id -u)" = "0" ]; then
     exit 1
 fi
 
-if ! "${libexec}"/utils/issourcezap-member; then
+if ! "${libexec}"/scripts/is-sourcezap-member; then
     printerr "$(id -un) is not a member of _sourcezap"
     exit 1
 fi
diff --git a/libexec/sourcezap/commands/sourcezap-setup b/libexec/sourcezap/commands/sourcezap-setup
index bed1c31..3ca5c69 100755
--- a/libexec/sourcezap/commands/sourcezap-setup
+++ b/libexec/sourcezap/commands/sourcezap-setup
@@ -14,8 +14,8 @@ libexec="${localbase}"/libexec/sourcezap
 ##
 # main
 if [ "$(id -u)" = "0" ]; then
-    "${libexec}"/setup/setup-user
-    "${libexec}"/setup/setup-doas
+    "${libexec}"/scripts/setup-user
+    "${libexec}"/scripts/setup-doas
     printok "setup complete"
 else
     printerr "you must be root"
diff --git a/libexec/sourcezap/commands/sourcezap-sh b/libexec/sourcezap/commands/sourcezap-sh
index d102379..63eef1f 100755
--- a/libexec/sourcezap/commands/sourcezap-sh
+++ b/libexec/sourcezap/commands/sourcezap-sh
@@ -20,7 +20,7 @@ if [ "$(id -u)" = "0" ]; then
     exit 1
 fi
 
-if ! "${libexec}"/utils/issourcezap-member; then
+if ! "${libexec}"/scripts/is-sourcezap-member; then
    printerr "$(id -un) is not a member of _sourcezap"
    exit 1
 fi
diff --git a/libexec/sourcezap/functions/print.sh b/libexec/sourcezap/functions/print.sh
old mode 100644
new mode 100755
diff --git a/libexec/sourcezap/utils/get-umask b/libexec/sourcezap/scripts/get-default-umask
old mode 100644
new mode 100755
similarity index 100%
rename from libexec/sourcezap/utils/get-umask
rename to libexec/sourcezap/scripts/get-default-umask
diff --git a/libexec/sourcezap/utils/git/run b/libexec/sourcezap/scripts/git
similarity index 61%
rename from libexec/sourcezap/utils/git/run
rename to libexec/sourcezap/scripts/git
index 6770e9f..fb853f0 100755
--- a/libexec/sourcezap/utils/git/run
+++ b/libexec/sourcezap/scripts/git
@@ -3,10 +3,10 @@ set -e
 
 ##
 # variables
-localbase=${LOCALBASE:-$(realpath "$(dirname "$0")"/../../../..)}
+localbase=${LOCALBASE:-$(realpath "$(dirname "$0")"/../../..)}
 libexec="${localbase}"/libexec/sourcezap
 git=$(which git)
-mask=$("${libexec}"/utils/get-umask)
+mask=$("${libexec}"/scripts/get-default-umask)
 
 ##
 # main
diff --git a/libexec/sourcezap/utils/git/get-changed-files b/libexec/sourcezap/scripts/git-get-changed-files
similarity index 72%
rename from libexec/sourcezap/utils/git/get-changed-files
rename to libexec/sourcezap/scripts/git-get-changed-files
index 45a46fd..7b8d0a6 100755
--- a/libexec/sourcezap/utils/git/get-changed-files
+++ b/libexec/sourcezap/scripts/git-get-changed-files
@@ -3,9 +3,9 @@ set -e
 
 ##
 # variables
-localbase=${LOCALBASE:-$(realpath "$(dirname "$0")"/../../../..)}
+localbase=${LOCALBASE:-$(realpath "$(dirname "$0")"/../../..)}
 libexec="${localbase}"/libexec/sourcezap
-git="${libexec}"/utils/git/run
+git="${libexec}"/scripts/git
 repodir=$1
 commit=$2
 
diff --git a/libexec/sourcezap/utils/git/get-removed-files b/libexec/sourcezap/scripts/git-get-removed-files
similarity index 65%
rename from libexec/sourcezap/utils/git/get-removed-files
rename to libexec/sourcezap/scripts/git-get-removed-files
index 1496528..146b634 100755
--- a/libexec/sourcezap/utils/git/get-removed-files
+++ b/libexec/sourcezap/scripts/git-get-removed-files
@@ -3,9 +3,9 @@ set -e
 
 ##
 # variables
-localbase=${LOCALBASE:-$(realpath "$(dirname "$0")"/../../../..)}
+localbase=${LOCALBASE:-$(realpath "$(dirname "$0")"/../../..)}
 libexec="${localbase}"/libexec/sourcezap
-git="${libexec}"/utils/git/run
+git="${libexec}"/scripts/git
 repodir=$1
 commit=$2
 
diff --git a/libexec/sourcezap/utils/install/run b/libexec/sourcezap/scripts/install
similarity index 61%
rename from libexec/sourcezap/utils/install/run
rename to libexec/sourcezap/scripts/install
index 3c9680e..b641348 100755
--- a/libexec/sourcezap/utils/install/run
+++ b/libexec/sourcezap/scripts/install
@@ -3,9 +3,9 @@ set -e
 
 ##
 # variables
-localbase=${LOCALBASE:-$(realpath "$(dirname "$0")"/../../../..)}
+localbase=${LOCALBASE:-$(realpath "$(dirname "$0")"/../../..)}
 libexec="${localbase}"/libexec/sourcezap
-mask=$("${libexec}"/utils/get-umask)
+mask=$("${libexec}"/scripts/get-default-umask)
 
 ##
 # main
diff --git a/libexec/sourcezap/utils/issourcezap-member b/libexec/sourcezap/scripts/is-sourcezap-member
similarity index 100%
rename from libexec/sourcezap/utils/issourcezap-member
rename to libexec/sourcezap/scripts/is-sourcezap-member
diff --git a/libexec/sourcezap/setup/setup-doas b/libexec/sourcezap/scripts/setup-doas
similarity index 92%
rename from libexec/sourcezap/setup/setup-doas
rename to libexec/sourcezap/scripts/setup-doas
index 87c2994..40bb3ae 100755
--- a/libexec/sourcezap/setup/setup-doas
+++ b/libexec/sourcezap/scripts/setup-doas
@@ -16,7 +16,8 @@ sharedir="${localbase}"/share/sourcezap
 # main
 src="${sharedir}"/doas.conf
 dest="${localbase}"/etc/doas.conf
-while read -r line < "${src}"; do
+cat "${src}" |
+while read -r line; do
     if grep -q "${line}" "${dest}"; then
         continue
     fi
diff --git a/libexec/sourcezap/setup/setup-user b/libexec/sourcezap/scripts/setup-user
similarity index 100%
rename from libexec/sourcezap/setup/setup-user
rename to libexec/sourcezap/scripts/setup-user
diff --git a/libexec/sourcezap/utils/install/update-changed-files b/libexec/sourcezap/scripts/update-changed-files
similarity index 62%
rename from libexec/sourcezap/utils/install/update-changed-files
rename to libexec/sourcezap/scripts/update-changed-files
index 7049b60..5655840 100755
--- a/libexec/sourcezap/utils/install/update-changed-files
+++ b/libexec/sourcezap/scripts/update-changed-files
@@ -3,7 +3,7 @@ set -e
 
 ##
 # variables
-localbase=${LOCALBASE:-$(realpath "$(dirname "$0")"/../../../..)}
+localbase=${LOCALBASE:-$(realpath "$(dirname "$0")"/../../..)}
 libexec="${localbase}"/libexec/sourcezap
 repodir=$1
 installdir=$2
@@ -12,7 +12,7 @@ commit=$3
 ##
 # main
 cd "${repodir}"
-files=$("${libexec}"/utils/git/get-changed-files "${repodir}" "${commit}")
+files=$("${libexec}"/scripts/git-get-changed-files "${repodir}" "${commit}")
 for file in ${files}; do
     target="${installdir}/${file}"
     parent=$(dirname "${target}")
@@ -22,7 +22,7 @@ for file in ${files}; do
         parent=$(dirname "${parent}")
     done
     for dir in ${parents}; do
-        "${libexec}"/utils/install/run -d "${dir}"
+        "${libexec}"/scripts/install -d "${dir}"
     done
-    "${libexec}"/utils/install/run "${file}" "${target}"
+    "${libexec}"/scripts/install "${file}" "${target}"
 done
diff --git a/libexec/sourcezap/utils/install/update-deleted-files b/libexec/sourcezap/scripts/update-deleted-files
similarity index 70%
rename from libexec/sourcezap/utils/install/update-deleted-files
rename to libexec/sourcezap/scripts/update-deleted-files
index 808b0c7..cb5e462 100755
--- a/libexec/sourcezap/utils/install/update-deleted-files
+++ b/libexec/sourcezap/scripts/update-deleted-files
@@ -3,7 +3,7 @@ set -e
 
 ##
 # variables
-localbase=${LOCALBASE:-$(realpath "$(dirname "$0")"/../../../..)}
+localbase=${LOCALBASE:-$(realpath "$(dirname "$0")"/../../..)}
 libexec="${localbase}"/libexec/sourcezap
 repodir=$1
 installdir=$2
@@ -12,7 +12,7 @@ commit=$3
 ##
 # main
 cd "${repodir}"
-files=$("${libexec}"/utils/git/get-removed-files "${repodir}" "${commit}")
+files=$("${libexec}"/scripts/git/get-removed-files "${repodir}" "${commit}")
 for file in ${files}; do
     target="${installdir}/${file}"
     parent=$(dirname "${target}")
diff --git a/share/sourcezap/CHANGELOG b/share/sourcezap/CHANGELOG
index 664241f..c380bee 100644
--- a/share/sourcezap/CHANGELOG
+++ b/share/sourcezap/CHANGELOG
@@ -1,5 +1,21 @@
 # -*- mode: org -*-
 
+* vNEXT
+
+**** Address ~libexec/sourcezap/scripts/setup-doas~ bug
+This change addresses a bug in ~setup-doas~ that could hang
+the ~sourcezap setup~ command
+
+**** Collapse ~libexec/sourcezap/scripts~
+This change does not try to organize script directories that
+go beyond ~libexec/sourcezap/scripts~
+
+**** Add ~libexec/sourcezap/scripts/setup~
+This new directory replaces what was formerly known as ~libexec/sourcezap/setup~
+
+**** Add ~libexec/sourcezap/scripts~
+This new directory replaces what was formerly known as ~libexec/sourcezap/utils~
+
 * v1.1.0
 
 **** Add 'libexec/sourcezap/utils/get-umask'