diff --git a/make/environment-build.mk b/make/environment-build.mk
index 3e504947..e16c25f4 100644
--- a/make/environment-build.mk
+++ b/make/environment-build.mk
@@ -55,7 +55,7 @@ SKEL-ROOT     = $(BASE_DIR)/skel-root/$(BOXSERIES)
 ifeq ($(BOXMODEL), $(filter $(BOXMODEL), vusolo4k vuduo4k vuultimo4k vuzero4k vuuno4k vuuno4kse))
   SKEL-ROOT   = $(BASE_DIR)/skel-root/vuplus
 endif
-IMAGEFILES    = $(BASE_DIR)/skel-root/general
+TARGET_FILES  = $(BASE_DIR)/skel-root/general
 
 BUILD        ?= $(shell /usr/share/libtool/config.guess 2>/dev/null || /usr/share/libtool/config/config.guess 2>/dev/null || /usr/share/misc/config.guess)
 
diff --git a/make/image-updates.mk b/make/image-updates.mk
index 96751fd8..9d185aeb 100644
--- a/make/image-updates.mk
+++ b/make/image-updates.mk
@@ -112,10 +112,10 @@ matze-192 \
 matze-192-130 \
 pathauf-192:
 	$(MAKE) u-init
-	$(INSTALL_EXEC) $(IMAGEFILES)/channellists/update-ctrl/preinstall.sh $(PREINSTALL_SH)
-	$(INSTALL_EXEC) $(IMAGEFILES)/channellists/update-ctrl/postinstall.sh $(POSTINSTALL_SH)
+	$(INSTALL_EXEC) $(TARGET_FILES)/channellists/update-ctrl/preinstall.sh $(PREINSTALL_SH)
+	$(INSTALL_EXEC) $(TARGET_FILES)/channellists/update-ctrl/postinstall.sh $(POSTINSTALL_SH)
 	mkdir -pv $(UPDATE_INST_DIR)/var/tuxbox/config/zapit && \
-	cp -f $(IMAGEFILES)/channellists/$(@)/* $(UPDATE_INST_DIR)/var/tuxbox/config/zapit/
+	cp -f $(TARGET_FILES)/channellists/$(@)/* $(UPDATE_INST_DIR)/var/tuxbox/config/zapit/
 	# remove non-printable chars and re-format xml-files
 	$(CD) $(UPDATE_INST_DIR)/var/tuxbox/config/zapit/; \
 	for file in *.xml; do \
diff --git a/make/images.mk b/make/images.mk
index d873fc8a..db6c64b8 100644
--- a/make/images.mk
+++ b/make/images.mk
@@ -207,7 +207,7 @@ flash-image-hd51-multi: | $(IMAGE_DIR)
 	# Create final USB-image
 	mkdir -p $(IMAGE_BUILD_TMP)/$(IMAGE_SUBDIR)
 	cp $(EMMC_IMAGE) $(IMAGE_BUILD_TMP)/$(IMAGE_SUBDIR)
-	cp $(IMAGEFILES)/splash-images/ni-splash.bmp $(IMAGE_BUILD_TMP)/$(IMAGE_SUBDIR)/splash.bin
+	cp $(TARGET_FILES)/splash-images/ni-splash.bmp $(IMAGE_BUILD_TMP)/$(IMAGE_SUBDIR)/splash.bin
 	cp $(KERNEL_ZIMAGE_DTB) $(IMAGE_BUILD_TMP)/$(IMAGE_SUBDIR)/kernel.bin
 	$(CD) $(ROOTFS); \
 		tar -cvf $(IMAGE_BUILD_TMP)/$(IMAGE_SUBDIR)/rootfs.tar -C $(ROOTFS) . >/dev/null 2>&1; \
@@ -242,7 +242,7 @@ flash-image-vuplus-multi: vmlinuz-initrd
 flash-image-vuplus-multi: | $(IMAGE_DIR)
 	rm -rf $(IMAGE_BUILD_TMP)
 	mkdir -p $(IMAGE_BUILD_TMP)/$(IMAGE_SUBDIR)
-	cp $(IMAGEFILES)/splash-images/ni-splash.bmp $(IMAGE_BUILD_TMP)/$(IMAGE_SUBDIR)/splash_auto.bin
+	cp $(TARGET_FILES)/splash-images/ni-splash.bmp $(IMAGE_BUILD_TMP)/$(IMAGE_SUBDIR)/splash_auto.bin
 	cp $(BUILD_TMP)/$(VMLINUZ-INITRD) $(IMAGE_BUILD_TMP)/$(IMAGE_SUBDIR)/initrd_auto.bin
 	echo Dummy for update. > $(IMAGE_BUILD_TMP)/$(IMAGE_SUBDIR)/kernel_auto.bin
 	cp $(KERNEL_ZIMAGE) $(IMAGE_BUILD_TMP)/$(IMAGE_SUBDIR)/kernel1_auto.bin
diff --git a/make/neutrino-plugins.mk b/make/neutrino-plugins.mk
index 8bf0396d..80808168 100644
--- a/make/neutrino-plugins.mk
+++ b/make/neutrino-plugins.mk
@@ -126,8 +126,8 @@ logo-addon: $(SOURCE_DIR)/$(NI-LOGO-STUFF) $(SHAREPLUGINS)
 # -----------------------------------------------------------------------------
 
 doscam-webif-skin:
-	$(INSTALL_DATA) -D $(IMAGEFILES)/doscam-webif-skin/doscam_ni-dark.css $(TARGET_SHARE_DIR)/doscam/skin/doscam_ni-dark.css
-	$(INSTALL_DATA) -D $(IMAGEFILES)/doscam-webif-skin/IC_doscam_ni.tpl $(TARGET_SHARE_DIR)/doscam/tpl/IC_doscam_ni.tpl
+	$(INSTALL_DATA) -D $(TARGET_FILES)/doscam-webif-skin/doscam_ni-dark.css $(TARGET_SHARE_DIR)/doscam/skin/doscam_ni-dark.css
+	$(INSTALL_DATA) -D $(TARGET_FILES)/doscam-webif-skin/IC_doscam_ni.tpl $(TARGET_SHARE_DIR)/doscam/tpl/IC_doscam_ni.tpl
 	$(TOUCH)
 
 # -----------------------------------------------------------------------------
@@ -193,7 +193,7 @@ links: $(LINKS_DEPS) $(ARCHIVE)/$(LINKS_SOURCE) $(SHAREPLUGINS) | $(TARGET_DIR)
 		$(MAKE); \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
 	mv -f $(TARGET_BIN_DIR)/links $(SHAREPLUGINS)/links.so
-	cp -a $(IMAGEFILES)/links/* $(TARGET_DIR)/
+	cp -a $(TARGET_FILES)/links/* $(TARGET_DIR)/
 	$(REMOVE)/$(LINKS_TMP)
 	$(TOUCH)
 
diff --git a/make/neutrino.mk b/make/neutrino.mk
index 97c787dc..04764ec5 100644
--- a/make/neutrino.mk
+++ b/make/neutrino.mk
@@ -177,7 +177,7 @@ neutrino: $(N_OBJ_DIR)/config.status
 # -----------------------------------------------------------------------------
 
 $(TARGET_DIR)/etc/init.d/start_neutrino:
-	$(INSTALL_EXEC) -D $(IMAGEFILES)/scripts/start_neutrino.$(BOXTYPE) $(@)
+	$(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/start_neutrino.$(BOXTYPE) $(@)
 
 # -----------------------------------------------------------------------------
 
diff --git a/make/target-libs.mk b/make/target-libs.mk
index abcad824..56eef6b7 100644
--- a/make/target-libs.mk
+++ b/make/target-libs.mk
@@ -828,7 +828,7 @@ libaacs: $(LIBAACS_DEPS) $(ARCHIVE)/$(LIBAACS_SOURCE) | $(TARGET_DIR)
 	$(REWRITE_LIBTOOL)/libaacs.la
 	$(CD) $(TARGET_DIR); \
 		mkdir -p .config/aacs .cache/aacs/vuk
-	cp $(IMAGEFILES)/libaacs/KEYDB.cfg $(TARGET_DIR)/.config/aacs
+	cp $(TARGET_FILES)/libaacs/KEYDB.cfg $(TARGET_DIR)/.config/aacs
 	$(REMOVE)/$(LIBAACS_TMP)
 	$(TOUCH)
 
@@ -862,7 +862,7 @@ libbdplus: $(LIBBDPLUS_DEPS) $(ARCHIVE)/$(LIBBDPLUS_SOURCE) | $(TARGET_DIR)
 	$(REWRITE_LIBTOOL)/libbdplus.la
 	$(CD) $(TARGET_DIR); \
 		mkdir -p .config/bdplus/vm0
-	cp -f $(IMAGEFILES)/libbdplus/* $(TARGET_DIR)/.config/bdplus/vm0
+	cp -f $(TARGET_FILES)/libbdplus/* $(TARGET_DIR)/.config/bdplus/vm0
 	$(REMOVE)/$(LIBBDPLUS_TMP)
 	$(TOUCH)
 
diff --git a/make/target-scripts.mk b/make/target-scripts.mk
index fc35bffe..4c859d41 100644
--- a/make/target-scripts.mk
+++ b/make/target-scripts.mk
@@ -23,77 +23,77 @@ init-scripts: \
 	$(TARGET_DIR)/etc/init.d/vuplus-platform-util
 
 $(TARGET_DIR)/etc/init.d/globals:
-	$(INSTALL_DATA) -D $(IMAGEFILES)/scripts/init.globals $(@)
+	$(INSTALL_DATA) -D $(TARGET_FILES)/scripts/init.globals $(@)
 
 $(TARGET_DIR)/etc/init.d/functions:
-	$(INSTALL_DATA) -D $(IMAGEFILES)/scripts/init.functions $(@)
+	$(INSTALL_DATA) -D $(TARGET_FILES)/scripts/init.functions $(@)
 
 $(TARGET_DIR)/etc/init.d/camd:
-	$(INSTALL_EXEC) -D $(IMAGEFILES)/scripts/camd.init $(@)
+	$(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/camd.init $(@)
 	ln -sf camd $(TARGET_DIR)/etc/init.d/S99camd
 	ln -sf camd $(TARGET_DIR)/etc/init.d/K01camd
 
 $(TARGET_DIR)/etc/init.d/camd_datefix:
-	$(INSTALL_EXEC) -D $(IMAGEFILES)/scripts/camd_datefix.init $(@)
+	$(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/camd_datefix.init $(@)
 
 $(TARGET_DIR)/etc/init.d/coredump:
 ifneq ($(BOXMODEL), nevis)
-	$(INSTALL_EXEC) -D $(IMAGEFILES)/scripts/coredump.init $(@)
+	$(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/coredump.init $(@)
 endif
 
 $(TARGET_DIR)/etc/init.d/crond:
-	$(INSTALL_EXEC) -D $(IMAGEFILES)/scripts/crond.init $(@)
+	$(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/crond.init $(@)
 	ln -sf crond $(TARGET_DIR)/etc/init.d/S55crond
 	ln -sf crond $(TARGET_DIR)/etc/init.d/K55crond
 
 $(TARGET_DIR)/etc/init.d/custom-poweroff:
 ifeq ($(BOXTYPE), coolstream)
-	$(INSTALL_EXEC) -D $(IMAGEFILES)/scripts/custom-poweroff.init $(@)
+	$(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/custom-poweroff.init $(@)
 endif
 
 $(TARGET_DIR)/etc/init.d/fstab:
-	$(INSTALL_EXEC) -D $(IMAGEFILES)/scripts/fstab.init $(@)
+	$(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/fstab.init $(@)
 	ln -sf fstab $(TARGET_DIR)/etc/init.d/S01fstab
 	ln -sf fstab $(TARGET_DIR)/etc/init.d/K99fstab
 
 $(TARGET_DIR)/etc/init.d/hostname:
-	$(INSTALL_EXEC) -D $(IMAGEFILES)/scripts/hostname.init $(@)
+	$(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/hostname.init $(@)
 
 $(TARGET_DIR)/etc/init.d/inetd:
-	$(INSTALL_EXEC) -D $(IMAGEFILES)/scripts/inetd.init $(@)
+	$(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/inetd.init $(@)
 	ln -sf inetd $(TARGET_DIR)/etc/init.d/S53inetd
 	ln -sf inetd $(TARGET_DIR)/etc/init.d/K80inetd
 
 $(TARGET_DIR)/etc/init.d/networking:
-	$(INSTALL_EXEC) -D $(IMAGEFILES)/scripts/networking.init $(@)
+	$(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/networking.init $(@)
 	ln -sf networking $(TARGET_DIR)/etc/init.d/K99networking
 
 $(TARGET_DIR)/etc/init.d/partitions-by-name:
 ifeq ($(BOXMODEL), $(filter $(BOXMODEL), hd51 bre2ze4k h7))
-	$(INSTALL_EXEC) -D $(IMAGEFILES)/scripts/partitions-by-name.init $(@)
+	$(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/partitions-by-name.init $(@)
 endif
 
 $(TARGET_DIR)/etc/init.d/resizerootfs:
 ifeq ($(BOXMODEL), $(filter $(BOXMODEL), hd51 bre2ze4k h7))
-	$(INSTALL_EXEC) -D $(IMAGEFILES)/scripts/resizerootfs.init $(@)
+	$(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/resizerootfs.init $(@)
 endif
 
 $(TARGET_DIR)/etc/init.d/swap:
 ifeq ($(BOXMODEL), $(filter $(BOXMODEL), hd51 bre2ze4k h7 vusolo4k vuduo4k vuultimo4k vuzero4k vuuno4k vuuno4kse vuduo))
-	$(INSTALL_EXEC) -D $(IMAGEFILES)/scripts/swap.init $(@)
+	$(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/swap.init $(@)
 	ln -sf swap $(TARGET_DIR)/etc/init.d/K99swap
 endif
 
 $(TARGET_DIR)/etc/init.d/sys_update.sh:
-	$(INSTALL_EXEC) -D $(IMAGEFILES)/scripts/sys_update.sh $(@)
+	$(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/sys_update.sh $(@)
 
 $(TARGET_DIR)/etc/init.d/syslogd:
-	$(INSTALL_EXEC) -D $(IMAGEFILES)/scripts/syslogd.init $(@)
+	$(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/syslogd.init $(@)
 	ln -sf syslogd $(TARGET_DIR)/etc/init.d/K98syslogd
 
 $(TARGET_DIR)/etc/init.d/vuplus-platform-util:
 ifeq ($(BOXMODEL), $(filter $(BOXMODEL), vusolo4k vuduo4k vuultimo4k vuzero4k vuuno4k vuuno4kse))
-	$(INSTALL_EXEC) -D $(IMAGEFILES)/scripts/$(BOXMODEL)-platform-util.init $(@)
+	$(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/$(BOXMODEL)-platform-util.init $(@)
 endif
 
 # -----------------------------------------------------------------------------
@@ -106,16 +106,16 @@ scripts: \
 
 $(TARGET_DIR)/bin/bp3flash.sh:
 ifeq ($(BOXMODEL), $(filter $(BOXMODEL), vuduo4k))
-	$(INSTALL_EXEC) -D $(IMAGEFILES)/scripts/bp3flash.sh $(@)
+	$(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/bp3flash.sh $(@)
 endif
 
 $(TARGET_DIR)/sbin/service:
-	$(INSTALL_EXEC) -D $(IMAGEFILES)/scripts/service $(@)
+	$(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/service $(@)
 
 $(TARGET_DIR)/sbin/flash_eraseall:
 ifeq ($(BOXTYPE), coolstream)
-	$(INSTALL_EXEC) -D $(IMAGEFILES)/scripts/flash_eraseall $(@)
+	$(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/flash_eraseall $(@)
 endif
 
 $(TARGET_SHARE_DIR)/udhcpc/default.script:
-	$(INSTALL_EXEC) -D $(IMAGEFILES)/scripts/udhcpc-default.script $(@)
+	$(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/udhcpc-default.script $(@)
diff --git a/make/target-tools.mk b/make/target-tools.mk
index b5d9b06f..e3f8a037 100644
--- a/make/target-tools.mk
+++ b/make/target-tools.mk
@@ -231,7 +231,7 @@ tzdata: $(TZDATA_DEPS) $(ARCHIVE)/$(TZDATA_SOURCE) | $(TARGET_DIR)
 		unset ${!LC_*}; LANG=POSIX; LC_ALL=POSIX; export LANG LC_ALL; \
 		$(HOST_ZIC) -d zoneinfo.tmp $(TZDATA_ZONELIST); \
 		mkdir zoneinfo; \
-		sed -n '/zone=/{s/.*zone="\(.*\)".*$$/\1/; p}' $(IMAGEFILES)/tzdata/timezone.xml | sort -u | \
+		sed -n '/zone=/{s/.*zone="\(.*\)".*$$/\1/; p}' $(TARGET_FILES)/tzdata/timezone.xml | sort -u | \
 		while read x; do \
 			find zoneinfo.tmp -type f -name $$x | sort | \
 			while read y; do \
@@ -242,7 +242,7 @@ tzdata: $(TZDATA_DEPS) $(ARCHIVE)/$(TZDATA_SOURCE) | $(TARGET_DIR)
 		mkdir -p $(TARGET_SHARE_DIR); \
 		rm -rf $(TARGET_SHARE_DIR)/zoneinfo; \
 		mv zoneinfo/ $(TARGET_SHARE_DIR)/
-	$(INSTALL_DATA) -D $(IMAGEFILES)/tzdata/timezone.xml $(TARGET_DIR)/etc/timezone.xml
+	$(INSTALL_DATA) -D $(TARGET_FILES)/tzdata/timezone.xml $(TARGET_DIR)/etc/timezone.xml
 	$(INSTALL_DATA) $(TARGET_SHARE_DIR)/zoneinfo/CET $(TARGET_DIR)$(ETC_LOCALTIME)
 	$(REMOVE)/$(TZDATA_TMP)
 	$(TOUCH)
@@ -493,7 +493,7 @@ ntp: $(NTP_DEPS) $(ARCHIVE)/$(NTP_SOURCE) | $(TARGET_DIR)
 			; \
 		$(MAKE); \
 		$(INSTALL_EXEC) -D ntpdate/ntpdate $(TARGET_DIR)/sbin/ntpdate
-	$(INSTALL_EXEC) -D $(IMAGEFILES)/scripts/ntpdate.init $(TARGET_DIR)/etc/init.d/ntpdate
+	$(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/ntpdate.init $(TARGET_DIR)/etc/init.d/ntpdate
 	$(REMOVE)/$(NTP_TMP)
 	$(TOUCH)
 
@@ -530,7 +530,7 @@ djmount: $(DJMOUNT_DEPS) $(ARCHIVE)/$(DJMOUNT_SOURCE) | $(TARGET_DIR)
 			; \
 		make; \
 		make install DESTDIR=$(TARGET_DIR)
-	$(INSTALL_EXEC) -D $(IMAGEFILES)/scripts/djmount.init $(TARGET_DIR)/etc/init.d/djmount
+	$(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/djmount.init $(TARGET_DIR)/etc/init.d/djmount
 	ln -sf djmount $(TARGET_DIR)/etc/init.d/S99djmount
 	ln -sf djmount $(TARGET_DIR)/etc/init.d/K01djmount
 	$(REMOVE)/$(DJMOUNT_TMP)
@@ -570,9 +570,9 @@ ushare: $(USHARE_DEPS) $(ARCHIVE)/$(USHARE_SOURCE)| $(TARGET_DIR)
 		ln -sf ../config.h src/; \
 		$(MAKE); \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
-	$(INSTALL_DATA) -D $(IMAGEFILES)/configs/ushare.conf $(TARGET_DIR)/etc/ushare.conf
+	$(INSTALL_DATA) -D $(TARGET_FILES)/configs/ushare.conf $(TARGET_DIR)/etc/ushare.conf
 	sed -i 's|%(BOXTYPE)|$(BOXTYPE)|; s|%(BOXMODEL)|$(BOXMODEL)|' $(TARGET_DIR)/etc/ushare.conf
-	$(INSTALL_EXEC) -D $(IMAGEFILES)/scripts/ushare.init $(TARGET_DIR)/etc/init.d/ushare
+	$(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/ushare.init $(TARGET_DIR)/etc/init.d/ushare
 	ln -sf ushare $(TARGET_DIR)/etc/init.d/S99ushare
 	ln -sf ushare $(TARGET_DIR)/etc/init.d/K01ushare
 	$(REMOVE)/$(USHARE_TMP)
@@ -628,9 +628,9 @@ inadyn: $(INADYN_DEPS) $(ARCHIVE)/$(INADYN_SOURCE) | $(TARGET_DIR)
 			; \
 		$(MAKE); \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
-	$(INSTALL_DATA) -D $(IMAGEFILES)/scripts/inadyn.conf $(TARGET_DIR)/var/etc/inadyn.conf
+	$(INSTALL_DATA) -D $(TARGET_FILES)/scripts/inadyn.conf $(TARGET_DIR)/var/etc/inadyn.conf
 	ln -sf /var/etc/inadyn.conf $(TARGET_DIR)/etc/inadyn.conf
-	$(INSTALL_EXEC) -D $(IMAGEFILES)/scripts/inadyn.init $(TARGET_DIR)/etc/init.d/inadyn
+	$(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/inadyn.init $(TARGET_DIR)/etc/init.d/inadyn
 	ln -sf inadyn $(TARGET_DIR)/etc/init.d/S80inadyn
 	ln -sf inadyn $(TARGET_DIR)/etc/init.d/K60inadyn
 	$(REMOVE)/$(INADYN_TMP)
@@ -664,9 +664,9 @@ vsftpd: $(VSFTPD_DEPS) $(ARCHIVE)/$(VSFTPD_SOURCE) | $(TARGET_DIR)
 		$(MAKE) $(BUILD_ENV) LIBS="-lcrypt -lcrypto -lssl"; \
 		$(INSTALL_EXEC) -D vsftpd $(TARGET_DIR)/sbin/vsftpd
 	mkdir -p $(TARGET_SHARE_DIR)/empty
-	$(INSTALL_DATA) -D $(IMAGEFILES)/configs/vsftpd.conf $(TARGET_DIR)/etc/vsftpd.conf
-	$(INSTALL_DATA) -D $(IMAGEFILES)/configs/vsftpd.chroot_list $(TARGET_DIR)/etc/vsftpd.chroot_list
-	$(INSTALL_EXEC) -D $(IMAGEFILES)/scripts/vsftpd.init $(TARGET_DIR)/etc/init.d/vsftpd
+	$(INSTALL_DATA) -D $(TARGET_FILES)/configs/vsftpd.conf $(TARGET_DIR)/etc/vsftpd.conf
+	$(INSTALL_DATA) -D $(TARGET_FILES)/configs/vsftpd.chroot_list $(TARGET_DIR)/etc/vsftpd.chroot_list
+	$(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/vsftpd.init $(TARGET_DIR)/etc/init.d/vsftpd
 	ln -sf vsftpd $(TARGET_DIR)/etc/init.d/S53vsftpd
 	ln -sf vsftpd $(TARGET_DIR)/etc/init.d/K80vsftpd
 	$(REMOVE)/$(VSFTPD_TMP)
@@ -942,7 +942,7 @@ autofs: $(AUTOFS_DEPS) $(ARCHIVE)/$(AUTOFS_SOURCE) | $(TARGET_DIR)
 			; \
 		$(MAKE) SUBDIRS="lib daemon modules" DONTSTRIP=1; \
 		$(MAKE) SUBDIRS="lib daemon modules" install DESTDIR=$(TARGET_DIR)
-	cp -a $(IMAGEFILES)/autofs/* $(TARGET_DIR)/
+	cp -a $(TARGET_FILES)/autofs/* $(TARGET_DIR)/
 	ln -sf autofs $(TARGET_DIR)/etc/init.d/S60autofs
 	ln -sf autofs $(TARGET_DIR)/etc/init.d/K40autofs
 	$(REMOVE)/$(AUTOFS_TMP)
@@ -1017,8 +1017,8 @@ samba33: $(SAMBA33_DEPS) $(ARCHIVE)/$(SAMBA33_SOURCE) | $(TARGET_DIR)
 		$(MAKE) all; \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
 	mkdir -p $(TARGET_DIR)/var/samba/locks
-	$(INSTALL_DATA) $(IMAGEFILES)/configs/smb3.conf $(TARGET_DIR)/etc/samba/smb.conf
-	$(INSTALL_EXEC) $(IMAGEFILES)/scripts/samba3.init $(TARGET_DIR)/etc/init.d/samba
+	$(INSTALL_DATA) $(TARGET_FILES)/configs/smb3.conf $(TARGET_DIR)/etc/samba/smb.conf
+	$(INSTALL_EXEC) $(TARGET_FILES)/scripts/samba3.init $(TARGET_DIR)/etc/init.d/samba
 	ln -sf samba $(TARGET_DIR)/etc/init.d/S99samba
 	ln -sf samba $(TARGET_DIR)/etc/init.d/K01samba
 	rm -rf $(TARGET_DIR)/bin/testparm
@@ -1099,8 +1099,8 @@ samba36: $(SAMBA36_DEPS) $(ARCHIVE)/$(SAMBA36_SOURCE) | $(TARGET_DIR)
 		$(MAKE) all; \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
 	mkdir -p $(TARGET_DIR)/var/samba/locks
-	$(INSTALL_DATA) $(IMAGEFILES)/configs/smb3.conf $(TARGET_DIR)/etc/samba/smb.conf
-	$(INSTALL_EXEC) $(IMAGEFILES)/scripts/samba3.init $(TARGET_DIR)/etc/init.d/samba
+	$(INSTALL_DATA) $(TARGET_FILES)/configs/smb3.conf $(TARGET_DIR)/etc/samba/smb.conf
+	$(INSTALL_EXEC) $(TARGET_FILES)/scripts/samba3.init $(TARGET_DIR)/etc/init.d/samba
 	ln -sf samba $(TARGET_DIR)/etc/init.d/S99samba
 	ln -sf samba $(TARGET_DIR)/etc/init.d/K01samba
 	rm -rf $(TARGET_DIR)/bin/testparm
@@ -1152,7 +1152,7 @@ dropbear: $(DROPBEAR_DEPS) $(ARCHIVE)/$(DROPBEAR_SOURCE) | $(TARGET_DIR)
 		$(MAKE) PROGRAMS="dropbear dbclient dropbearkey scp" SCPPROGRESS=1; \
 		$(MAKE) PROGRAMS="dropbear dbclient dropbearkey scp" install DESTDIR=$(TARGET_DIR)
 	mkdir -p $(TARGET_DIR)/etc/dropbear
-	$(INSTALL_EXEC) -D $(IMAGEFILES)/scripts/dropbear.init $(TARGET_DIR)/etc/init.d/dropbear
+	$(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/dropbear.init $(TARGET_DIR)/etc/init.d/dropbear
 	ln -sf dropbear $(TARGET_DIR)/etc/init.d/S60dropbear
 	ln -sf dropbear $(TARGET_DIR)/etc/init.d/K60dropbear
 	$(REMOVE)/$(DROPBEAR_TMP)
@@ -1186,7 +1186,7 @@ sg3_utils: $(ARCHIVE)/$(SG3_UTILS_SOURCE) | $(TARGET_DIR)
 		$(INSTALL_EXEC) $(TARGET_DIR)/bin.$(@F)/$$bin $(TARGET_DIR)/bin/$$bin; \
 	done
 	$(REWRITE_LIBTOOL)/libsgutils2.la
-	$(INSTALL_EXEC) -D $(IMAGEFILES)/scripts/sdX.init $(TARGET_DIR)/etc/init.d/sdX
+	$(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/sdX.init $(TARGET_DIR)/etc/init.d/sdX
 	ln -sf sdX $(TARGET_DIR)/etc/init.d/K97sdX
 	$(REMOVE)/$(SG3_UTILS_TMP) \
 		$(TARGET_DIR)/bin.$(@F)
@@ -1249,7 +1249,7 @@ lcd4linux: $(LCD4LINUX_DEPS) | $(TARGET_DIR)
 		$(MAKE) vcs_version; \
 		$(MAKE) all; \
 		$(MAKE) install
-	cp -a $(IMAGEFILES)/lcd4linux/* $(TARGET_DIR)/
+	cp -a $(TARGET_FILES)/lcd4linux/* $(TARGET_DIR)/
 	#make samsunglcd4linux
 	$(REMOVE)/$(LCD4LINUX_TMP)
 	$(TOUCH)
@@ -1291,8 +1291,8 @@ wpa_supplicant: $(WPA_SUPPLICANT_DEPS) $(ARCHIVE)/$(WPA_SUPPLICANT_SOURCE) | $(T
 		$(BUILD_ENV) \
 		$(MAKE); \
 		$(MAKE) install DESTDIR=$(TARGET_DIR) BINDIR=/sbin
-	$(INSTALL_EXEC) -D $(IMAGEFILES)/scripts/pre-wlan0.sh $(TARGET_DIR)/etc/network/pre-wlan0.sh
-	$(INSTALL_EXEC) -D $(IMAGEFILES)/scripts/post-wlan0.sh $(TARGET_DIR)/etc/network/post-wlan0.sh
+	$(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/pre-wlan0.sh $(TARGET_DIR)/etc/network/pre-wlan0.sh
+	$(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/post-wlan0.sh $(TARGET_DIR)/etc/network/post-wlan0.sh
 	$(REMOVE)/$(WPA_SUPPLICANT_TMP)
 	$(TOUCH)
 
@@ -1328,10 +1328,10 @@ xupnpd: $(XUPNPD_DEPS) | $(TARGET_DIR)
 	$(INSTALL_DATA) -D $(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS)/scripts-lua/xupnpd/xupnpd_youtube.lua $(TARGET_SHARE_DIR)/xupnpd/plugins/
 	$(INSTALL_DATA) -D $(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS)/scripts-lua/xupnpd/xupnpd_coolstream.lua $(TARGET_SHARE_DIR)/xupnpd/plugins/
 	$(INSTALL_DATA) -D $(SOURCE_DIR)/$(NI-NEUTRINO-PLUGINS)/scripts-lua/xupnpd/xupnpd_cczwei.lua $(TARGET_SHARE_DIR)/xupnpd/plugins/
-	$(INSTALL_EXEC) -D $(IMAGEFILES)/scripts/xupnpd.init $(TARGET_DIR)/etc/init.d/xupnpd
+	$(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/xupnpd.init $(TARGET_DIR)/etc/init.d/xupnpd
 	ln -sf xupnpd $(TARGET_DIR)/etc/init.d/S99xupnpd
 	ln -sf xupnpd $(TARGET_DIR)/etc/init.d/K01xupnpd
-	cp -a $(IMAGEFILES)/xupnpd/* $(TARGET_DIR)/
+	cp -a $(TARGET_FILES)/xupnpd/* $(TARGET_DIR)/
 	$(REMOVE)/$(XUPNPD_TMP)
 	$(TOUCH)
 
@@ -1422,7 +1422,7 @@ nfs-utils: $(NFS-UTILS_DEPS) $(ARCHIVE)/$(NFS-UTILS_SOURCE) | $(TARGET_DIR)
 	rm -rf $(TARGET_DIR)/sbin/umount.nfs*
 	rm -rf $(TARGET_DIR)/sbin/showmount
 	rm -rf $(TARGET_DIR)/sbin/rpcdebug
-	$(INSTALL_EXEC) -D $(IMAGEFILES)/scripts/nfsd.init $(TARGET_DIR)/etc/init.d/nfsd
+	$(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/nfsd.init $(TARGET_DIR)/etc/init.d/nfsd
 	ln -s nfsd $(TARGET_DIR)/etc/init.d/S60nfsd
 	ln -s nfsd $(TARGET_DIR)/etc/init.d/K01nfsd
 	$(REMOVE)/$(NFS-UTILS_TMP)
@@ -1538,7 +1538,7 @@ streamripper: $(STREAMRIPPER_DEPS) | $(TARGET_DIR)
 			; \
 		$(MAKE); \
 		$(MAKE) install DESTDIR=$(TARGET_DIR)
-	$(INSTALL_EXEC) $(IMAGEFILES)/scripts/streamripper.sh $(TARGET_DIR)/bin/
+	$(INSTALL_EXEC) $(TARGET_FILES)/scripts/streamripper.sh $(TARGET_DIR)/bin/
 	$(REMOVE)/$(NI-STREAMRIPPER)
 	$(TOUCH)