--- a/bin/update	Fri Feb 27 17:42:35 2015 +0200
+++ b/bin/update	Fri Feb 27 17:47:16 2015 +0200
@@ -7,7 +7,4 @@
 LIB=${LIB:-$SRC/lib}
 VAR=${VAR:-$SRV/var}
 
-MODULE=hosts
-MODULE_MAIN=update
-
-. $LIB/pvl/main.sh
+. $LIB/pvl/hosts/update.sh

--- a/lib/pvl/hosts/update.sh	Fri Feb 27 17:42:35 2015 +0200
+++ b/lib/pvl/hosts/update.sh	Fri Feb 27 17:47:16 2015 +0200
@@ -1,4 +1,3 @@
-update_MODULES='log commit apply service test'
 update_GETOPTS='sSrR'
 
 UPDATE_SERIAL=
@@ -148,3 +147,10 @@
     ## Reload output
     update_reload
 }
+
+# entry point
+MODULES=(log commit apply service test)
+MODULE=hosts
+MODULE_MAIN=update
+
+. $LIB/pvl/main.sh && main "$@"

--- a/lib/pvl/main.sh	Fri Feb 27 17:42:35 2015 +0200
+++ b/lib/pvl/main.sh	Fri Feb 27 17:47:16 2015 +0200
@@ -2,12 +2,6 @@
 
 shopt -s globstar nullglob
 
-. $LIB/pvl/$MODULE/$MODULE_MAIN.sh
-
-module_main_modules=${MODULE_MAIN}_MODULES
-
-MODULES=(${!module_main_modules})
-
 for module in ${MODULES[@]}; do
     . $LIB/pvl/$module.sh
 done
@@ -79,5 +73,3 @@
 
     ${MODULE_MAIN}_main
 }
-
-main "$@"