Rearranging helpers scripts in source tree.

82 files changed, 87 insertions, 87 deletions

diff --git a/Makefile b/Makefile
index 87bd3cbf8..28ff8b436 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ SHELL := sh -e
 
 LANGUAGES = de
 
-SCRIPTS = live-helper.sh cgi/* functions/* examples/*/*.sh helpers/* hooks/*
+SCRIPTS = cgi/* functions/* examples/*/*.sh scripts/*.sh scripts/*/*
 
 all: test build
 
@@ -41,11 +41,11 @@ build:
 install:
 	# Installing shared data
 	mkdir -p $(DESTDIR)/usr/share/live-helper
-	cp -r cgi data examples live-helper.sh functions helpers hooks includes lists repositories templates $(DESTDIR)/usr/share/live-helper
+	cp -r cgi data examples functions scripts hooks includes lists repositories templates $(DESTDIR)/usr/share/live-helper
 
 	# Installing executables
 	mkdir -p $(DESTDIR)/usr/bin
-	mv $(DESTDIR)/usr/share/live-helper/helpers/lh $(DESTDIR)/usr/share/live-helper/helpers/live-helper $(DESTDIR)/usr/bin
+	mv $(DESTDIR)/usr/share/live-helper/scripts/build/lh $(DESTDIR)/usr/share/live-helper/scripts/build/live-helper $(DESTDIR)/usr/bin
 
 	# Installing documentation
 	mkdir -p $(DESTDIR)/usr/share/doc/live-helper
diff --git a/live-helper.sh b/scripts/build.sh
index 59d475f5b..59d475f5b 100755
--- a/live-helper.sh
+++ b/scripts/build.sh
diff --git a/helpers/binary b/scripts/build/binary
index 11a1781d5..41199dcec 100755
--- a/helpers/binary
+++ b/scripts/build/binary
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'build binary images')"
diff --git a/helpers/binary_checksums b/scripts/build/binary_checksums
index dd8d369fd..8fec89110 100755
--- a/helpers/binary_checksums
+++ b/scripts/build/binary_checksums
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'create binary checksums')"
diff --git a/helpers/binary_chroot b/scripts/build/binary_chroot
index 16c4ba3a7..88f37732a 100755
--- a/helpers/binary_chroot
+++ b/scripts/build/binary_chroot
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'copy chroot into chroot')"
diff --git a/helpers/binary_debian-installer b/scripts/build/binary_debian-installer
index 32a8278ea..fa7b022a6 100755
--- a/helpers/binary_debian-installer
+++ b/scripts/build/binary_debian-installer
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'install debian-installer into binary')"
diff --git a/helpers/binary_disk b/scripts/build/binary_disk
index 69f2e0bcd..e262c20e7 100755
--- a/helpers/binary_disk
+++ b/scripts/build/binary_disk
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'install disk information into binary')"
diff --git a/helpers/binary_encryption b/scripts/build/binary_encryption
index db322277a..8041986f6 100755
--- a/helpers/binary_encryption
+++ b/scripts/build/binary_encryption
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'encrypts rootfs')"
diff --git a/helpers/binary_grub b/scripts/build/binary_grub
index 651068010..e2f3a589e 100755
--- a/helpers/binary_grub
+++ b/scripts/build/binary_grub
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'installs grub into binary')"
diff --git a/helpers/binary_grub2 b/scripts/build/binary_grub2
index 7fa8f3abe..c17730c71 100755
--- a/helpers/binary_grub2
+++ b/scripts/build/binary_grub2
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'installs grub2 into binary')"
diff --git a/helpers/binary_includes b/scripts/build/binary_includes
index 8483f72c1..d9b82b5b2 100755
--- a/helpers/binary_includes
+++ b/scripts/build/binary_includes
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'copy files into binary')"
diff --git a/helpers/binary_iso b/scripts/build/binary_iso
index 88a042d08..56de7eb5c 100755
--- a/helpers/binary_iso
+++ b/scripts/build/binary_iso
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'build iso binary image')"
diff --git a/helpers/binary_linux-image b/scripts/build/binary_linux-image
index c383a22e7..1915e8fc0 100755
--- a/helpers/binary_linux-image
+++ b/scripts/build/binary_linux-image
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'install linux-image into binary')"
diff --git a/helpers/binary_local-hooks b/scripts/build/binary_local-hooks
index ff24d081f..070c36fc9 100755
--- a/helpers/binary_local-hooks
+++ b/scripts/build/binary_local-hooks
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'execute local hooks in binary')"
diff --git a/helpers/binary_local-includes b/scripts/build/binary_local-includes
index 8c54466e8..e23ae8993 100755
--- a/helpers/binary_local-includes
+++ b/scripts/build/binary_local-includes
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'copy files into binary')"
diff --git a/helpers/binary_local-packageslists b/scripts/build/binary_local-packageslists
index c5381f4dc..e7c8a507c 100755
--- a/helpers/binary_local-packageslists
+++ b/scripts/build/binary_local-packageslists
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'install local packages into binary')"
diff --git a/helpers/binary_manifest b/scripts/build/binary_manifest
index 2777adaf1..d3e0f8ad3 100755
--- a/helpers/binary_manifest
+++ b/scripts/build/binary_manifest
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'create manifest')"
diff --git a/helpers/binary_memtest b/scripts/build/binary_memtest
index 8afcb9f82..c739c3a73 100755
--- a/helpers/binary_memtest
+++ b/scripts/build/binary_memtest
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'installs a memtest into binary')"
diff --git a/helpers/binary_net b/scripts/build/binary_net
index 273c383ac..56464551c 100755
--- a/helpers/binary_net
+++ b/scripts/build/binary_net
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'build netboot binary image')"
diff --git a/helpers/binary_rootfs b/scripts/build/binary_rootfs
index 7aa4fb7b3..58284fdba 100755
--- a/helpers/binary_rootfs
+++ b/scripts/build/binary_rootfs
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'build rootfs image')"
diff --git a/helpers/binary_silo b/scripts/build/binary_silo
index c3f8b06f9..e527c7fc1 100755
--- a/helpers/binary_silo
+++ b/scripts/build/binary_silo
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'installs silo into binary')"
diff --git a/helpers/binary_syslinux b/scripts/build/binary_syslinux
index 25531956c..43c0b5457 100755
--- a/helpers/binary_syslinux
+++ b/scripts/build/binary_syslinux
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'installs syslinux into binary')"
diff --git a/helpers/binary_tar b/scripts/build/binary_tar
index 082f969fb..df3f306f3 100755
--- a/helpers/binary_tar
+++ b/scripts/build/binary_tar
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'build harddisk binary image')"
diff --git a/helpers/binary_usb b/scripts/build/binary_usb
index 7d84305ae..13aa76c81 100755
--- a/helpers/binary_usb
+++ b/scripts/build/binary_usb
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'build binary image')"
diff --git a/helpers/binary_virtual-hdd b/scripts/build/binary_virtual-hdd
index 1cb97553c..ac864b9c9 100755
--- a/helpers/binary_virtual-hdd
+++ b/scripts/build/binary_virtual-hdd
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'build binary image')"
diff --git a/helpers/binary_win32-loader b/scripts/build/binary_win32-loader
index 934e33cf9..1edbc1a30 100755
--- a/helpers/binary_win32-loader
+++ b/scripts/build/binary_win32-loader
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'copy win32-loader into binary')"
diff --git a/helpers/binary_yaboot b/scripts/build/binary_yaboot
index b660f5f19..cf84e2c75 100755
--- a/helpers/binary_yaboot
+++ b/scripts/build/binary_yaboot
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'installs yaboot into binary')"
diff --git a/helpers/bootstrap b/scripts/build/bootstrap
index fb890c4b9..4c4c3b77c 100755
--- a/helpers/bootstrap
+++ b/scripts/build/bootstrap
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'bootstrap a Debian system')"
diff --git a/helpers/bootstrap_cache b/scripts/build/bootstrap_cache
index 26ef90826..381276a4b 100755
--- a/helpers/bootstrap_cache
+++ b/scripts/build/bootstrap_cache
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'cache bootstrap stage')"
diff --git a/helpers/bootstrap_cdebootstrap b/scripts/build/bootstrap_cdebootstrap
index 11f77d3b3..7925ebd97 100755
--- a/helpers/bootstrap_cdebootstrap
+++ b/scripts/build/bootstrap_cdebootstrap
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'bootstrap a Debian system with cdebootstrap(1)')"
diff --git a/helpers/bootstrap_copy b/scripts/build/bootstrap_copy
index 93734446c..d5e0cc5f7 100755
--- a/helpers/bootstrap_copy
+++ b/scripts/build/bootstrap_copy
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'bootstrap by copying the host system')"
diff --git a/helpers/bootstrap_debootstrap b/scripts/build/bootstrap_debootstrap
index d7662fa39..677817bad 100755
--- a/helpers/bootstrap_debootstrap
+++ b/scripts/build/bootstrap_debootstrap
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'bootstrap a Debian system with debootstrap(8)')"
diff --git a/helpers/build b/scripts/build/build
index a4b88027f..dcd0cb254 100755
--- a/helpers/build
+++ b/scripts/build/build
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
 
 # Automatically populating config tree
 if [ -x auto/config ] && [ ! -e .stage/config ]
diff --git a/helpers/chroot b/scripts/build/chroot
index 123da379d..99f03db2e 100755
--- a/helpers/chroot
+++ b/scripts/build/chroot
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'customize the Debian system')"
diff --git a/helpers/chroot_apt b/scripts/build/chroot_apt
index 06ac8ac4d..c95d6497f 100755
--- a/helpers/chroot_apt
+++ b/scripts/build/chroot_apt
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'manage /etc/apt/apt.conf')"
diff --git a/helpers/chroot_cache b/scripts/build/chroot_cache
index 7c6733684..49cc5901d 100755
--- a/helpers/chroot_cache
+++ b/scripts/build/chroot_cache
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'cache chroot stage')"
diff --git a/helpers/chroot_debianchroot b/scripts/build/chroot_debianchroot
index 0e794ed15..ae37953de 100755
--- a/helpers/chroot_debianchroot
+++ b/scripts/build/chroot_debianchroot
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'manage /etc/debian_chroot')"
diff --git a/helpers/chroot_devpts b/scripts/build/chroot_devpts
index b8a4bb2cb..d738d5c56 100755
--- a/helpers/chroot_devpts
+++ b/scripts/build/chroot_devpts
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'mount /dev/pts')"
diff --git a/helpers/chroot_dpkg b/scripts/build/chroot_dpkg
index 98ca282a6..69f87a478 100755
--- a/helpers/chroot_dpkg
+++ b/scripts/build/chroot_dpkg
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'manage /sbin/dpkg')"
diff --git a/helpers/chroot_hacks b/scripts/build/chroot_hacks
index abfda7c3d..5a3f9ae98 100755
--- a/helpers/chroot_hacks
+++ b/scripts/build/chroot_hacks
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'execute hacks in chroot')"
diff --git a/helpers/chroot_hooks b/scripts/build/chroot_hooks
index b8105ff77..f5864d864 100755
--- a/helpers/chroot_hooks
+++ b/scripts/build/chroot_hooks
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'execute hooks in chroot')"
diff --git a/helpers/chroot_hostname b/scripts/build/chroot_hostname
index 3d409c3e5..6046f65ca 100755
--- a/helpers/chroot_hostname
+++ b/scripts/build/chroot_hostname
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'manage /bin/hostname')"
diff --git a/helpers/chroot_hosts b/scripts/build/chroot_hosts
index d06cb2c29..ce418dd61 100755
--- a/helpers/chroot_hosts
+++ b/scripts/build/chroot_hosts
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'manage /etc/hosts')"
diff --git a/helpers/chroot_install-packages b/scripts/build/chroot_install-packages
index 60b13f42e..3b491ad53 100755
--- a/helpers/chroot_install-packages
+++ b/scripts/build/chroot_install-packages
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'install queued packages into chroot')"
diff --git a/helpers/chroot_interactive b/scripts/build/chroot_interactive
index 114d85bad..dc5461df7 100755
--- a/helpers/chroot_interactive
+++ b/scripts/build/chroot_interactive
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'make build interactive')"
diff --git a/helpers/chroot_linux-image b/scripts/build/chroot_linux-image
index c7e6abdcf..5f197759e 100755
--- a/helpers/chroot_linux-image
+++ b/scripts/build/chroot_linux-image
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'manage /etc/kernel-img.conf')"
diff --git a/helpers/chroot_local-hooks b/scripts/build/chroot_local-hooks
index b8716251d..1cca5e4cc 100755
--- a/helpers/chroot_local-hooks
+++ b/scripts/build/chroot_local-hooks
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'execute local hooks in chroot')"
diff --git a/helpers/chroot_local-includes b/scripts/build/chroot_local-includes
index a90ffe74d..5a4052f6f 100755
--- a/helpers/chroot_local-includes
+++ b/scripts/build/chroot_local-includes
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'copy local files into chroot')"
diff --git a/helpers/chroot_local-packages b/scripts/build/chroot_local-packages
index 2814d0309..a9d39bd7f 100755
--- a/helpers/chroot_local-packages
+++ b/scripts/build/chroot_local-packages
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'queue install of local packages into chroot')"
diff --git a/helpers/chroot_local-packageslists b/scripts/build/chroot_local-packageslists
index 3ad2b3d99..cee46e6d3 100755
--- a/helpers/chroot_local-packageslists
+++ b/scripts/build/chroot_local-packageslists
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'queue install of local packages lists into chroot')"
diff --git a/helpers/chroot_local-patches b/scripts/build/chroot_local-patches
index db66019a4..6c5e8b492 100755
--- a/helpers/chroot_local-patches
+++ b/scripts/build/chroot_local-patches
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'apply local patches against chroot')"
diff --git a/helpers/chroot_local-preseed b/scripts/build/chroot_local-preseed
index d642f76a6..82eaa17fe 100755
--- a/helpers/chroot_local-preseed
+++ b/scripts/build/chroot_local-preseed
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'execute local preseed in chroot')"
diff --git a/helpers/chroot_localization b/scripts/build/chroot_localization
index c637aac02..eebfd6d41 100755
--- a/helpers/chroot_localization
+++ b/scripts/build/chroot_localization
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'install localization packages into chroot')"
diff --git a/helpers/chroot_packages b/scripts/build/chroot_packages
index 745b13249..b612cf9d2 100755
--- a/helpers/chroot_packages
+++ b/scripts/build/chroot_packages
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'queue install of packages into chroot')"
diff --git a/helpers/chroot_packageslists b/scripts/build/chroot_packageslists
index d1744e5c8..00699d764 100755
--- a/helpers/chroot_packageslists
+++ b/scripts/build/chroot_packageslists
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'queue install of packages lists into chroot')"
diff --git a/helpers/chroot_preseed b/scripts/build/chroot_preseed
index 47c390501..4ec7b2fcd 100755
--- a/helpers/chroot_preseed
+++ b/scripts/build/chroot_preseed
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'execute preseed in chroot')"
diff --git a/helpers/chroot_proc b/scripts/build/chroot_proc
index 8cbf11fa6..6992ad684 100755
--- a/helpers/chroot_proc
+++ b/scripts/build/chroot_proc
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'mount /proc')"
diff --git a/helpers/chroot_resolv b/scripts/build/chroot_resolv
index 318bb1a6e..d8b553c24 100755
--- a/helpers/chroot_resolv
+++ b/scripts/build/chroot_resolv
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'manage /etc/resolv.conf')"
diff --git a/helpers/chroot_selinuxfs b/scripts/build/chroot_selinuxfs
index 64ce659d6..23523d25e 100755
--- a/helpers/chroot_selinuxfs
+++ b/scripts/build/chroot_selinuxfs
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'mount /selinux')"
diff --git a/helpers/chroot_sources b/scripts/build/chroot_sources
index 413d2f520..f18cb6bfd 100755
--- a/helpers/chroot_sources
+++ b/scripts/build/chroot_sources
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'manage /etc/apt/sources.list')"
diff --git a/helpers/chroot_symlinks b/scripts/build/chroot_symlinks
index 76a023ce0..c2567806a 100755
--- a/helpers/chroot_symlinks
+++ b/scripts/build/chroot_symlinks
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'convert symlinks')"
diff --git a/helpers/chroot_sysfs b/scripts/build/chroot_sysfs
index 7b629b7be..857884168 100755
--- a/helpers/chroot_sysfs
+++ b/scripts/build/chroot_sysfs
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'mount /sys')"
diff --git a/helpers/chroot_sysv-rc b/scripts/build/chroot_sysv-rc
index 0ec92285a..2154ff4da 100755
--- a/helpers/chroot_sysv-rc
+++ b/scripts/build/chroot_sysv-rc
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'manage /usr/sbin/policy-rc.d')"
diff --git a/helpers/chroot_sysvinit b/scripts/build/chroot_sysvinit
index 2557f2d43..7178ce97f 100755
--- a/helpers/chroot_sysvinit
+++ b/scripts/build/chroot_sysvinit
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'configure sysvinit')"
diff --git a/helpers/chroot_tasks b/scripts/build/chroot_tasks
index b819165db..6c7d274e7 100755
--- a/helpers/chroot_tasks
+++ b/scripts/build/chroot_tasks
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'install tasks into chroot')"
diff --git a/helpers/chroot_upstart b/scripts/build/chroot_upstart
index 32ca18c21..c80bf8612 100755
--- a/helpers/chroot_upstart
+++ b/scripts/build/chroot_upstart
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'manage /usr/sbin/initctl')"
diff --git a/helpers/clean b/scripts/build/clean
index 6cafc6d49..2df040c82 100755
--- a/helpers/clean
+++ b/scripts/build/clean
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
 
 # Read meta config
 if [ "${1}" != "noauto" ] && [ -x auto/clean ]
diff --git a/helpers/config b/scripts/build/config
index 6ca0afd51..f4fe415cd 100755
--- a/helpers/config
+++ b/scripts/build/config
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
 
 # Read meta config
 if [ "${1}" != "noauto" ] && [ -x auto/config ]
diff --git a/helpers/lh b/scripts/build/lh
index f44634b5e..e55feba78 100755
--- a/helpers/lh
+++ b/scripts/build/lh
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'utility to build Debian Live systems')"
@@ -41,17 +41,17 @@ case "${1}" in
 		COMMAND="${1}"
 		shift
 
-		if [ -x "${LH_BASE}/helpers/${COMMAND}" ]
+		if [ -x "${LH_BASE}/scripts/build/${COMMAND}" ]
 		then
-			LH=1 exec "${LH_BASE}/helpers/${COMMAND}" "${@}"
-		elif [ -x /usr/share/live-helper/helpers/${COMMAND} ]
+			LH=1 exec "${LH_BASE}/scripts/build/${COMMAND}" "${@}"
+		elif [ -x /usr/share/live-helper/scripts/build/${COMMAND} ]
 		then
-			LH=1 exec /usr/share/live-helper/helpers/"${COMMAND}" "${@}"
+			LH=1 exec /usr/share/live-helper/scripts/build/"${COMMAND}" "${@}"
 		elif [ -x "$(which ${COMMAND} 2>/dev/null)" ]
 		then
 			LH=1 exec "${COMMAND}" "${@}"
 		else
-			Echo_error "no such helper"
+			Echo_error "no such script"
 			exit 1
 		fi
 		;;
diff --git a/helpers/live-helper b/scripts/build/live-helper
index a10550046..77d867b89 100755
--- a/helpers/live-helper
+++ b/scripts/build/live-helper
@@ -22,7 +22,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
 
 if [ -x "$(which man 2>/dev/null)" ]
 then
diff --git a/helpers/local b/scripts/build/local
index 39ba6a7fd..39ba6a7fd 100755
--- a/helpers/local
+++ b/scripts/build/local
diff --git a/helpers/source b/scripts/build/source
index 8ba066b46..0d049570b 100755
--- a/helpers/source
+++ b/scripts/build/source
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'build source images')"
diff --git a/helpers/source_checksums b/scripts/build/source_checksums
index 6fcee76b5..e610c240a 100755
--- a/helpers/source_checksums
+++ b/scripts/build/source_checksums
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'create source checksums')"
diff --git a/helpers/source_debian b/scripts/build/source_debian
index cffca68ed..df7e51ebd 100755
--- a/helpers/source_debian
+++ b/scripts/build/source_debian
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'debian sources')"
diff --git a/helpers/source_debian-live b/scripts/build/source_debian-live
index b3626ecd4..e9bcb2f91 100755
--- a/helpers/source_debian-live
+++ b/scripts/build/source_debian-live
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'copy debian-live config into source')"
diff --git a/helpers/source_disk b/scripts/build/source_disk
index 69512761f..60aff28cd 100755
--- a/helpers/source_disk
+++ b/scripts/build/source_disk
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'install disk information into source')"
diff --git a/helpers/source_iso b/scripts/build/source_iso
index c833b0bef..3b32fbe1c 100755
--- a/helpers/source_iso
+++ b/scripts/build/source_iso
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'build iso source image')"
diff --git a/helpers/source_net b/scripts/build/source_net
index bf65fed71..5cc35c81d 100755
--- a/helpers/source_net
+++ b/scripts/build/source_net
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'build source net image')"
diff --git a/helpers/source_tar b/scripts/build/source_tar
index 207e3b409..9da705c0f 100755
--- a/helpers/source_tar
+++ b/scripts/build/source_tar
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'build source tarball')"
diff --git a/helpers/source_usb b/scripts/build/source_usb
index dc5bb22fc..894129a23 100755
--- a/helpers/source_usb
+++ b/scripts/build/source_usb
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'build source image')"
diff --git a/helpers/source_virtual-hdd b/scripts/build/source_virtual-hdd
index b67ee3f02..607ad735a 100755
--- a/helpers/source_virtual-hdd
+++ b/scripts/build/source_virtual-hdd
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'build source image')"
diff --git a/helpers/testroot b/scripts/build/testroot
index 952c4b26f..a4149c4ae 100755
--- a/helpers/testroot
+++ b/scripts/build/testroot
@@ -10,7 +10,7 @@
 set -e
 
 # Including common functions
-. "${LH_BASE:-/usr/share/live-helper}"/live-helper.sh
+. "${LH_BASE:-/usr/share/live-helper}"/scripts/build.sh
 
 # Setting static variables
 DESCRIPTION="$(Echo 'ensure that a system is built as root')"