diff --git a/lib/functions/bsp/utils-bsp.sh b/lib/functions/bsp/utils-bsp.sh
new file mode 100644
index 000000000..1d8466649
--- /dev/null
+++ b/lib/functions/bsp/utils-bsp.sh
@@ -0,0 +1,15 @@
+# copy_all_packages_files_for <folder> to package
+#
+copy_all_packages_files_for()
+{
+	local package_name="${1}"
+	for package_src_dir in ${PACKAGES_SEARCH_ROOT_ABSOLUTE_DIRS};
+	do
+		local package_dirpath="${package_src_dir}/${package_name}"
+		if [ -d "${package_dirpath}" ];
+		then
+			cp -r "${package_dirpath}/"* "${destination}/" 2> /dev/null
+			display_alert "Adding files from" "${package_dirpath}"
+		fi
+	done
+}
diff --git a/lib/functions/general/chroot-helper.sh b/lib/functions/general/chroot-helper.sh
new file mode 100644
index 000000000..dedf35a67
--- /dev/null
+++ b/lib/functions/general/chroot-helper.sh
@@ -0,0 +1,35 @@
+# mount_chroot <target>
+#
+# helper to reduce code duplication
+#
+mount_chroot()
+{
+
+	local target=$1
+	mount -t tmpfs tmpfs "${target}/tmp"
+	mount -t proc chproc "${target}"/proc
+	mount -t sysfs chsys "${target}"/sys
+	mount -t devtmpfs chdev "${target}"/dev || mount --bind /dev "${target}"/dev
+	mount -t devpts chpts "${target}"/dev/pts
+
+}
+
+# umount_chroot <target>
+#
+# helper to reduce code duplication
+#
+umount_chroot()
+{
+
+	local target=$1
+	display_alert "Unmounting" "$target" "info"
+	while grep -Eq "${target}/*(dev|proc|sys|tmp)" /proc/mounts
+	do
+		umount -l --recursive "${target}"/dev >/dev/null 2>&1
+		umount -l "${target}"/proc >/dev/null 2>&1
+		umount -l "${target}"/sys >/dev/null 2>&1
+		umount -l "${target}"/tmp >/dev/null 2>&1
+		sleep 5
+	done
+
+}
diff --git a/lib/functions/image/loop.sh b/lib/functions/image/loop.sh
new file mode 100644
index 000000000..7aa2b634a
--- /dev/null
+++ b/lib/functions/image/loop.sh
@@ -0,0 +1,41 @@
+# check_loop_device <device_node>
+#
+check_loop_device()
+{
+
+	local device=$1
+	if [[ ! -b $device ]]; then
+		if [[ $CONTAINER_COMPAT == yes && -b /tmp/$device ]]; then
+			display_alert "Creating device node" "$device"
+			mknod -m0660 "${device}" b "0x$(stat -c '%t' "/tmp/$device")" "0x$(stat -c '%T' "/tmp/$device")"
+		else
+			exit_with_error "Device node $device does not exist"
+		fi
+	fi
+
+}
+
+# write_uboot <loopdev>
+#
+write_uboot()
+{
+
+	local loop=$1 revision
+	display_alert "Writing U-boot bootloader" "$loop" "info"
+	TEMP_DIR=$(mktemp -d || exit 1)
+	chmod 700 ${TEMP_DIR}
+	revision=${REVISION}
+	if [[ -n $UPSTREM_VER ]]; then
+		revision=${UPSTREM_VER}
+		dpkg -x "${DEB_STORAGE}/linux-u-boot-${BOARD}-${BRANCH}_${revision}_${ARCH}.deb" ${TEMP_DIR}/
+	else
+		dpkg -x "${DEB_STORAGE}/${CHOSEN_UBOOT}_${revision}_${ARCH}.deb" ${TEMP_DIR}/
+	fi
+
+	# source platform install to read $DIR
+	source ${TEMP_DIR}/usr/lib/u-boot/platform_install.sh
+	write_uboot_platform "${TEMP_DIR}${DIR}" "$loop"
+	[[ $? -ne 0 ]] && exit_with_error "U-boot bootloader failed to install" "@host"
+	rm -rf ${TEMP_DIR}
+
+}
diff --git a/lib/functions/logging/runners.sh b/lib/functions/logging/runners.sh
new file mode 100644
index 000000000..02551258e
--- /dev/null
+++ b/lib/functions/logging/runners.sh
@@ -0,0 +1,7 @@
+run_on_sdcard()
+{
+
+	# Lack of quotes allows for redirections and pipes easily.
+	chroot "${SDCARD}" /bin/bash -c "${@}" >> "${DEST}"/${LOG_SUBPATH}/install.log
+
+}
diff --git a/lib/functions/main/rootfs-image.sh b/lib/functions/main/rootfs-image.sh
index 34f6b6dd3..6b0f3c26b 100644
--- a/lib/functions/main/rootfs-image.sh
+++ b/lib/functions/main/rootfs-image.sh
@@ -1,3 +1,33 @@
+# unmount_on_exit
+#
+unmount_on_exit()
+{
+
+	trap - INT TERM EXIT
+	local stacktrace="$(get_extension_hook_stracktrace "${BASH_SOURCE[*]}" "${BASH_LINENO[*]}")"
+	display_alert "unmount_on_exit() called!" "$stacktrace" "err"
+	if [[ "${ERROR_DEBUG_SHELL}" == "yes" ]]; then
+		ERROR_DEBUG_SHELL=no # dont do it twice
+		display_alert "MOUNT" "${MOUNT}" "err"
+		display_alert "SDCARD" "${SDCARD}" "err"
+		display_alert "ERROR_DEBUG_SHELL=yes, starting a shell." "ERROR_DEBUG_SHELL" "err"
+		bash < /dev/tty || true
+	fi
+
+	umount_chroot "${SDCARD}/"
+	mountpoint -q "${SRC}"/cache/toolchain && umount -l "${SRC}"/cache/toolchain
+	mountpoint -q "${SRC}"/cache/rootfs && umount -l "${SRC}"/cache/rootfs
+	umount -l "${SDCARD}"/tmp >/dev/null 2>&1
+	umount -l "${SDCARD}" >/dev/null 2>&1
+	umount -l "${MOUNT}"/boot >/dev/null 2>&1
+	umount -l "${MOUNT}" >/dev/null 2>&1
+	[[ $CRYPTROOT_ENABLE == yes ]] && cryptsetup luksClose "${ROOT_MAPPER}"
+	losetup -d "${LOOP}" >/dev/null 2>&1
+	rm -rf --one-file-system "${SDCARD}"
+	exit_with_error "debootstrap-ng was interrupted" || true # don't trigger again
+
+}
+
 # debootstrap_ng
 #
 debootstrap_ng()
diff --git a/lib/functions/rootfs/apt-install.sh b/lib/functions/rootfs/apt-install.sh
new file mode 100644
index 000000000..7a0b5dab1
--- /dev/null
+++ b/lib/functions/rootfs/apt-install.sh
@@ -0,0 +1,25 @@
+install_deb_chroot()
+{
+
+	local package=$1
+	local variant=$2
+	local transfer=$3
+	local name
+	local desc
+	if [[ ${variant} != remote ]]; then
+		name="/root/"$(basename "${package}")
+		[[ ! -f "${SDCARD}${name}" ]] && cp "${package}" "${SDCARD}${name}"
+		desc=""
+	else
+		name=$1
+		desc=" from repository"
+	fi
+
+	display_alert "Installing${desc}" "${name/\/root\//}"
+	[[ $NO_APT_CACHER != yes ]] && local apt_extra="-o Acquire::http::Proxy=\"http://${APT_PROXY_ADDR:-localhost:3142}\" -o Acquire::http::Proxy::localhost=\"DIRECT\""
+	# when building in bulk from remote, lets make sure we have up2date index
+	chroot "${SDCARD}" /bin/bash -c "DEBIAN_FRONTEND=noninteractive apt-get -yqq $apt_extra --no-install-recommends install $name" >> "${DEST}"/${LOG_SUBPATH}/install.log 2>&1
+	[[ $? -ne 0 ]] && exit_with_error "Installation of $name failed" "${BOARD} ${RELEASE} ${BUILD_DESKTOP} ${LINUXFAMILY}"
+	[[ ${variant} == remote && ${transfer} == yes ]] && rsync -rq "${SDCARD}"/var/cache/apt/archives/*.deb ${DEB_STORAGE}/
+
+}
diff --git a/lib/functions/rootfs/customize.sh b/lib/functions/rootfs/customize.sh
new file mode 100644
index 000000000..c007e4aa4
--- /dev/null
+++ b/lib/functions/rootfs/customize.sh
@@ -0,0 +1,31 @@
+customize_image()
+{
+
+	# for users that need to prepare files at host
+	[[ -f $USERPATCHES_PATH/customize-image-host.sh ]] && source "$USERPATCHES_PATH"/customize-image-host.sh
+
+	call_extension_method "pre_customize_image" "image_tweaks_pre_customize" << 'PRE_CUSTOMIZE_IMAGE'
+*run before customize-image.sh*
+This hook is called after `customize-image-host.sh` is called, but before the overlay is mounted.
+It thus can be used for the same purposes as `customize-image-host.sh`.
+PRE_CUSTOMIZE_IMAGE
+
+	cp "$USERPATCHES_PATH"/customize-image.sh "${SDCARD}"/tmp/customize-image.sh
+	chmod +x "${SDCARD}"/tmp/customize-image.sh
+	mkdir -p "${SDCARD}"/tmp/overlay
+	# util-linux >= 2.27 required
+	mount -o bind,ro "$USERPATCHES_PATH"/overlay "${SDCARD}"/tmp/overlay
+	display_alert "Calling image customization script" "customize-image.sh" "info"
+	chroot "${SDCARD}" /bin/bash -c "/tmp/customize-image.sh $RELEASE $LINUXFAMILY $BOARD $BUILD_DESKTOP $ARCH"
+	CUSTOMIZE_IMAGE_RC=$?
+	umount -i "${SDCARD}"/tmp/overlay >/dev/null 2>&1
+	mountpoint -q "${SDCARD}"/tmp/overlay || rm -r "${SDCARD}"/tmp/overlay
+	if [[ $CUSTOMIZE_IMAGE_RC != 0 ]]; then
+		exit_with_error "customize-image.sh exited with error (rc: $CUSTOMIZE_IMAGE_RC)"
+	fi
+
+	call_extension_method "post_customize_image" "image_tweaks_post_customize" << 'POST_CUSTOMIZE_IMAGE'
+*post customize-image.sh hook*
+Run after the customize-image.sh script is run, and the overlay is unmounted.
+POST_CUSTOMIZE_IMAGE
+}
diff --git a/lib/image-helpers.sh b/lib/image-helpers.sh
deleted file mode 100644
index 0619621c8..000000000
--- a/lib/image-helpers.sh
+++ /dev/null
@@ -1,238 +0,0 @@
-#!/bin/bash
-#
-# Copyright (c) 2013-2021 Igor Pecovnik, igor.pecovnik@gma**.com
-#
-# This file is licensed under the terms of the GNU General Public
-# License version 2. This program is licensed "as is" without any
-# warranty of any kind, whether express or implied.
-#
-# This file is a part of the Armbian build script
-# https://github.com/armbian/build/
-
-# Functions:
-
-# mount_chroot
-# umount_chroot
-# unmount_on_exit
-# check_loop_device
-# install_external_applications
-# write_uboot
-# copy_all_packages_files_for
-# customize_image
-# install_deb_chroot
-# run_on_sdcard
-
-
-
-
-# mount_chroot <target>
-#
-# helper to reduce code duplication
-#
-mount_chroot()
-{
-
-	local target=$1
-	mount -t tmpfs tmpfs "${target}/tmp"
-	mount -t proc chproc "${target}"/proc
-	mount -t sysfs chsys "${target}"/sys
-	mount -t devtmpfs chdev "${target}"/dev || mount --bind /dev "${target}"/dev
-	mount -t devpts chpts "${target}"/dev/pts
-
-}
-
-
-
-
-# umount_chroot <target>
-#
-# helper to reduce code duplication
-#
-umount_chroot()
-{
-
-	local target=$1
-	display_alert "Unmounting" "$target" "info"
-	while grep -Eq "${target}/*(dev|proc|sys|tmp)" /proc/mounts
-	do
-		umount -l --recursive "${target}"/dev >/dev/null 2>&1
-		umount -l "${target}"/proc >/dev/null 2>&1
-		umount -l "${target}"/sys >/dev/null 2>&1
-		umount -l "${target}"/tmp >/dev/null 2>&1
-		sleep 5
-	done
-
-}
-
-
-
-
-# unmount_on_exit
-#
-unmount_on_exit()
-{
-
-	trap - INT TERM EXIT
-	local stacktrace="$(get_extension_hook_stracktrace "${BASH_SOURCE[*]}" "${BASH_LINENO[*]}")"
-	display_alert "unmount_on_exit() called!" "$stacktrace" "err"
-	if [[ "${ERROR_DEBUG_SHELL}" == "yes" ]]; then
-		ERROR_DEBUG_SHELL=no # dont do it twice
-		display_alert "MOUNT" "${MOUNT}" "err"
-		display_alert "SDCARD" "${SDCARD}" "err"
-		display_alert "ERROR_DEBUG_SHELL=yes, starting a shell." "ERROR_DEBUG_SHELL" "err"
-		bash < /dev/tty || true
-	fi
-
-	umount_chroot "${SDCARD}/"
-	mountpoint -q "${SRC}"/cache/toolchain && umount -l "${SRC}"/cache/toolchain
-	mountpoint -q "${SRC}"/cache/rootfs && umount -l "${SRC}"/cache/rootfs
-	umount -l "${SDCARD}"/tmp >/dev/null 2>&1
-	umount -l "${SDCARD}" >/dev/null 2>&1
-	umount -l "${MOUNT}"/boot >/dev/null 2>&1
-	umount -l "${MOUNT}" >/dev/null 2>&1
-	[[ $CRYPTROOT_ENABLE == yes ]] && cryptsetup luksClose "${ROOT_MAPPER}"
-	losetup -d "${LOOP}" >/dev/null 2>&1
-	rm -rf --one-file-system "${SDCARD}"
-	exit_with_error "debootstrap-ng was interrupted" || true # don't trigger again
-
-}
-
-
-
-
-# check_loop_device <device_node>
-#
-check_loop_device()
-{
-
-	local device=$1
-	if [[ ! -b $device ]]; then
-		if [[ $CONTAINER_COMPAT == yes && -b /tmp/$device ]]; then
-			display_alert "Creating device node" "$device"
-			mknod -m0660 "${device}" b "0x$(stat -c '%t' "/tmp/$device")" "0x$(stat -c '%T' "/tmp/$device")"
-		else
-			exit_with_error "Device node $device does not exist"
-		fi
-	fi
-
-}
-
-
-
-
-# write_uboot <loopdev>
-#
-write_uboot()
-{
-
-	local loop=$1 revision
-	display_alert "Writing U-boot bootloader" "$loop" "info"
-	TEMP_DIR=$(mktemp -d || exit 1)
-	chmod 700 ${TEMP_DIR}
-	revision=${REVISION}
-	if [[ -n $UPSTREM_VER ]]; then
-		revision=${UPSTREM_VER}
-		dpkg -x "${DEB_STORAGE}/linux-u-boot-${BOARD}-${BRANCH}_${revision}_${ARCH}.deb" ${TEMP_DIR}/
-	else
-		dpkg -x "${DEB_STORAGE}/${CHOSEN_UBOOT}_${revision}_${ARCH}.deb" ${TEMP_DIR}/
-	fi
-
-	# source platform install to read $DIR
-	source ${TEMP_DIR}/usr/lib/u-boot/platform_install.sh
-	write_uboot_platform "${TEMP_DIR}${DIR}" "$loop"
-	[[ $? -ne 0 ]] && exit_with_error "U-boot bootloader failed to install" "@host"
-	rm -rf ${TEMP_DIR}
-
-}
-
-
-
-
-# copy_all_packages_files_for <folder> to package
-#
-copy_all_packages_files_for()
-{
-	local package_name="${1}"
-	for package_src_dir in ${PACKAGES_SEARCH_ROOT_ABSOLUTE_DIRS};
-	do
-		local package_dirpath="${package_src_dir}/${package_name}"
-		if [ -d "${package_dirpath}" ];
-		then
-			cp -r "${package_dirpath}/"* "${destination}/" 2> /dev/null
-			display_alert "Adding files from" "${package_dirpath}"
-		fi
-	done
-}
-
-
-
-
-customize_image()
-{
-
-	# for users that need to prepare files at host
-	[[ -f $USERPATCHES_PATH/customize-image-host.sh ]] && source "$USERPATCHES_PATH"/customize-image-host.sh
-
-	call_extension_method "pre_customize_image" "image_tweaks_pre_customize" << 'PRE_CUSTOMIZE_IMAGE'
-*run before customize-image.sh*
-This hook is called after `customize-image-host.sh` is called, but before the overlay is mounted.
-It thus can be used for the same purposes as `customize-image-host.sh`.
-PRE_CUSTOMIZE_IMAGE
-
-	cp "$USERPATCHES_PATH"/customize-image.sh "${SDCARD}"/tmp/customize-image.sh
-	chmod +x "${SDCARD}"/tmp/customize-image.sh
-	mkdir -p "${SDCARD}"/tmp/overlay
-	# util-linux >= 2.27 required
-	mount -o bind,ro "$USERPATCHES_PATH"/overlay "${SDCARD}"/tmp/overlay
-	display_alert "Calling image customization script" "customize-image.sh" "info"
-	chroot "${SDCARD}" /bin/bash -c "/tmp/customize-image.sh $RELEASE $LINUXFAMILY $BOARD $BUILD_DESKTOP $ARCH"
-	CUSTOMIZE_IMAGE_RC=$?
-	umount -i "${SDCARD}"/tmp/overlay >/dev/null 2>&1
-	mountpoint -q "${SDCARD}"/tmp/overlay || rm -r "${SDCARD}"/tmp/overlay
-	if [[ $CUSTOMIZE_IMAGE_RC != 0 ]]; then
-		exit_with_error "customize-image.sh exited with error (rc: $CUSTOMIZE_IMAGE_RC)"
-	fi
-
-	call_extension_method "post_customize_image" "image_tweaks_post_customize" << 'POST_CUSTOMIZE_IMAGE'
-*post customize-image.sh hook*
-Run after the customize-image.sh script is run, and the overlay is unmounted.
-POST_CUSTOMIZE_IMAGE
-}
-
-
-
-
-install_deb_chroot()
-{
-
-	local package=$1
-	local variant=$2
-	local transfer=$3
-	local name
-	local desc
-	if [[ ${variant} != remote ]]; then
-		name="/root/"$(basename "${package}")
-		[[ ! -f "${SDCARD}${name}" ]] && cp "${package}" "${SDCARD}${name}"
-		desc=""
-	else
-		name=$1
-		desc=" from repository"
-	fi
-
-	display_alert "Installing${desc}" "${name/\/root\//}"
-	[[ $NO_APT_CACHER != yes ]] && local apt_extra="-o Acquire::http::Proxy=\"http://${APT_PROXY_ADDR:-localhost:3142}\" -o Acquire::http::Proxy::localhost=\"DIRECT\""
-	# when building in bulk from remote, lets make sure we have up2date index
-	chroot "${SDCARD}" /bin/bash -c "DEBIAN_FRONTEND=noninteractive apt-get -yqq $apt_extra --no-install-recommends install $name" >> "${DEST}"/${LOG_SUBPATH}/install.log 2>&1
-	[[ $? -ne 0 ]] && exit_with_error "Installation of $name failed" "${BOARD} ${RELEASE} ${BUILD_DESKTOP} ${LINUXFAMILY}"
-	[[ ${variant} == remote && ${transfer} == yes ]] && rsync -rq "${SDCARD}"/var/cache/apt/archives/*.deb ${DEB_STORAGE}/
-
-}
-
-
-run_on_sdcard()
-{
-
-	# Lack of quotes allows for redirections and pipes easily.
-	chroot "${SDCARD}" /bin/bash -c "${@}" >> "${DEST}"/${LOG_SUBPATH}/install.log
-
-}
diff --git a/lib/main.sh b/lib/main.sh
index 45312756b..af1619dba 100644
--- a/lib/main.sh
+++ b/lib/main.sh
@@ -64,8 +64,6 @@ backtitle="Armbian building script, https://www.armbian.com | https://docs.armbi
 # shellcheck source=import-functions.sh
 source "${SRC}/lib/import-functions.sh"
 
-# shellcheck source=image-helpers.sh
-source "${SRC}"/lib/image-helpers.sh                        # helpers for OS image building
 # shellcheck source=distributions.sh
 source "${SRC}"/lib/distributions.sh                        # system specific install
 # shellcheck source=desktop.sh