diff --git a/bin/portzap b/bin/portzap
index 1ca0a20..ee117f8 100755
--- a/bin/portzap
+++ b/bin/portzap
@@ -1,5 +1,5 @@
 #!/bin/sh
-
+set -e
 
 # Variables
 base_dir=$(dirname "$0")
@@ -13,13 +13,11 @@ libexec_dir=$(realpath "$base_dir/../libexec/portzap/")
 clone_mask=007
 pull_mask=007
 
-# Commands
-. "$libexec_dir/commands/portzap-install"
-. "$libexec_dir/commands/portzap-pull"
-. "$libexec_dir/commands/portzap-clone"
-
 # Functions
-. "$libexec_dir/functions/requirements.sh"
+. "$libexec_dir/functions/portzap-install"
+. "$libexec_dir/functions/portzap-pull"
+. "$libexec_dir/functions/portzap-clone"
+. "$libexec_dir/functions/requirements"
 
 case $1 in
     "clone")
diff --git a/libexec/portzap/commands/portzap-clone b/libexec/portzap/functions/portzap-clone
similarity index 100%
rename from libexec/portzap/commands/portzap-clone
rename to libexec/portzap/functions/portzap-clone
diff --git a/libexec/portzap/commands/portzap-install b/libexec/portzap/functions/portzap-install
similarity index 100%
rename from libexec/portzap/commands/portzap-install
rename to libexec/portzap/functions/portzap-install
diff --git a/libexec/portzap/commands/portzap-pull b/libexec/portzap/functions/portzap-pull
similarity index 100%
rename from libexec/portzap/commands/portzap-pull
rename to libexec/portzap/functions/portzap-pull
diff --git a/libexec/portzap/functions/requirements.sh b/libexec/portzap/functions/requirements
similarity index 100%
rename from libexec/portzap/functions/requirements.sh
rename to libexec/portzap/functions/requirements
diff --git a/libexec/portzap/install-directory b/libexec/portzap/install-directory
index 0c40769..4e0282b 100755
--- a/libexec/portzap/install-directory
+++ b/libexec/portzap/install-directory
@@ -1,4 +1,6 @@
 #!/bin/sh
+set -e
+
 ports_dir=$1
 libexec_dir=$2
 group=_portzap
diff --git a/libexec/portzap/install-file b/libexec/portzap/install-file
index a1b6e0a..4793257 100755
--- a/libexec/portzap/install-file
+++ b/libexec/portzap/install-file
@@ -1,4 +1,6 @@
 #!/bin/sh
+set -e
+
 dest=$1
 group=_portzap
 mode=u=rw,g=rw,o=