diff --git a/src/bin/base_setup.sh b/src/bin/base_setup.sh
index 25a48ec..530fbc9 100755
--- a/src/bin/base_setup.sh
+++ b/src/bin/base_setup.sh
@@ -44,11 +44,19 @@ if [ $error -eq 1 ]; then
 fi;
 
 # Define base folders
+# folder where all the repositories are located
 CLONE_BASE="clone-base/"
+# log folder for all log files
 LOG_FOLDER="log/"
-SCRIPT_FOLDER="scripts/"
+# sync/lone/etc scripts
+CLONE_SCRIPTS_FOLDER="scripts/"
+# any scripts that have to be run before deploy
+DEPLOY_SCRIPTS="deploy-scripts/";
+# any secrets that might be needed after clone
 SECRETS_FOLDER="secrets/"
+# overall config file
 CONFIG_FOLDER="config/"
+# admin/webhook web interface
 WWW_BASE="www/"
 WWW_WEBHOOK_INCOMING="${WWW_BASE}webhook-incoming";
 WWW_ADMIN="${WWW_BASE}admin";
@@ -68,7 +76,7 @@ if [ -d "${GIT_WEBHOOK_BASE_FOLDER}" ]; then
 	# copy scripts & default config
 	echo "~ Copy basic script and config files";
 	# git_sync.sh, init.sh, new_clone.sh, webhook.default.cfg
-	cp "${BASE_FOLDER}new_clone.sh" "${BASE_FOLDER}init.sh" "${BASE_FOLDER}git_sync.sh" "${GIT_WEBHOOK_BASE_FOLDER}${SCRIPT_FOLDER}";
+	cp "${BASE_FOLDER}new_clone.sh" "${BASE_FOLDER}init.sh" "${BASE_FOLDER}git_sync.sh" "${GIT_WEBHOOK_BASE_FOLDER}${CLONE_SCRIPTS_FOLDER}";
 	cp "${CONFIG_BASE}/webhook.default.cfg" "${GIT_WEBHOOK_BASE_FOLDER}${CONFIG_FOLDER}";
 	# and make sure they are all owned by the correct user
 	chown "${SUDO_USER}" \
@@ -119,12 +127,13 @@ EOF
 		fi;
 	fi;
 	# All other FOLDER
-	echo "+ Other folders for clone base: ${CLONE_BASE}, ${LOG_FOLDER}, ${SCRIPT_FOLDER}, ${CONFIG_FOLDER}, ${WWW_WEBHOOK_INCOMING}, ${WWW_ADMIN}"
+	echo "+ Other folders for clone base: ${CLONE_BASE}, ${LOG_FOLDER}, ${CLONE_SCRIPTS_FOLDER}, ${CONFIG_FOLDER}, ${WWW_WEBHOOK_INCOMING}, ${WWW_ADMIN}"
 	sudo -u "${SUDO_USER}" \
 		mkdir -p \
 		"${GIT_WEBHOOK_BASE_FOLDER}${CLONE_BASE}" \
 		"${GIT_WEBHOOK_BASE_FOLDER}${LOG_FOLDER}" \
-		"${GIT_WEBHOOK_BASE_FOLDER}${SCRIPT_FOLDER}" \
+		"${GIT_WEBHOOK_BASE_FOLDER}${CLONE_SCRIPTS_FOLDER}" \
+		"${GIT_WEBHOOK_BASE_FOLDER}${DEPLOY_SCRIPTS}" \
 		"${GIT_WEBHOOK_BASE_FOLDER}${CONFIG_FOLDER}" \
 		"${GIT_WEBHOOK_BASE_FOLDER}${SECRETS_FOLDER}" \
 		"${GIT_WEBHOOK_BASE_FOLDER}${WWW_WEBHOOK_INCOMING}" \
@@ -132,7 +141,8 @@ EOF
 	# set basic folder rights, clone folder is excluded
 	sudo -u "${SUDO_USER}" chmod 700 \
 		"${GIT_WEBHOOK_BASE_FOLDER}${LOG_FOLDER}" \
-		"${GIT_WEBHOOK_BASE_FOLDER}${SCRIPT_FOLDER}" \
+		"${GIT_WEBHOOK_BASE_FOLDER}${CLONE_SCRIPTS_FOLDER}" \
+		"${GIT_WEBHOOK_BASE_FOLDER}${DEPLOY_SCRIPTS}" \
 		"${GIT_WEBHOOK_BASE_FOLDER}${CONFIG_FOLDER}" \
 		"${GIT_WEBHOOK_BASE_FOLDER}${SECRETS_FOLDER}" \
 		"${GIT_WEBHOOK_BASE_FOLDER}${WWW_WEBHOOK_INCOMING}" \
@@ -149,7 +159,7 @@ EOF
 	# Copy files
 	echo "+ Copy basic script and config files";
 	# git_sync.sh, init.sh, new_clone.sh, webhook.default.cfg
-	cp "${BASE_FOLDER}new_clone.sh" "${BASE_FOLDER}init.sh" "${BASE_FOLDER}git_sync.sh" "${GIT_WEBHOOK_BASE_FOLDER}${SCRIPT_FOLDER}";
+	cp "${BASE_FOLDER}new_clone.sh" "${BASE_FOLDER}init.sh" "${BASE_FOLDER}git_sync.sh" "${GIT_WEBHOOK_BASE_FOLDER}${CLONE_SCRIPTS_FOLDER}";
 	cp "${CONFIG_BASE}/webhook.cfg" "${CONFIG_BASE}/webhook.default.cfg" "${GIT_WEBHOOK_BASE_FOLDER}${CONFIG_FOLDER}";
 	# and make sure they are all owned by the correct user
 	chown "${SUDO_USER}" \