diff --git a/make/ni.mk b/make/ni.mk
index c13860d8..8dd691d5 100644
--- a/make/ni.mk
+++ b/make/ni.mk
@@ -90,7 +90,6 @@ endif
 	make autofs
 	make files-etc
 	make files-var-etc
-	make scripts
 	make init-scripts
 ifeq ($(PERSONALIZE),yes)
 	make personalize
diff --git a/make/target-files.mk b/make/target-files.mk
index 3ec12731..df611fb2 100644
--- a/make/target-files.mk
+++ b/make/target-files.mk
@@ -12,7 +12,6 @@ files-etc: \
 	$(TARGET_sysconfdir)/fstab \
 	$(TARGET_sysconfdir)/group \
 	$(TARGET_sysconfdir)/hosts \
-	$(TARGET_sysconfdir)/inetd.conf \
 	$(TARGET_sysconfdir)/issue.net \
 	$(TARGET_sysconfdir)/nsswitch.conf \
 	$(TARGET_sysconfdir)/passwd \
@@ -58,9 +57,6 @@ $(TARGET_sysconfdir)/group:
 $(TARGET_sysconfdir)/hosts:
 	$(INSTALL_DATA) -D $(TARGET_FILES)/files-etc/hosts $(@)
 
-$(TARGET_sysconfdir)/inetd.conf:
-	$(INSTALL_DATA) -D $(TARGET_FILES)/files-etc/inetd.conf $(@)
-
 $(TARGET_sysconfdir)/issue.net:
 	$(INSTALL_DATA) -D $(TARGET_FILES)/files-etc/issue.net $(@)
 
diff --git a/make/target-scripts.mk b/make/target-scripts.mk
index fca84c72..2fa95fb6 100644
--- a/make/target-scripts.mk
+++ b/make/target-scripts.mk
@@ -10,19 +10,15 @@ init-scripts: \
 	$(TARGET_sysconfdir)/init.d/camd \
 	$(TARGET_sysconfdir)/init.d/camd_datefix \
 	$(TARGET_sysconfdir)/init.d/coredump \
-	$(TARGET_sysconfdir)/init.d/crond \
 	$(TARGET_sysconfdir)/init.d/custom-poweroff \
 	$(TARGET_sysconfdir)/init.d/fstab \
 	$(TARGET_sysconfdir)/init.d/hostname \
-	$(TARGET_sysconfdir)/init.d/inetd \
-	$(TARGET_sysconfdir)/init.d/mdev \
 	$(TARGET_sysconfdir)/init.d/networking \
 	$(TARGET_sysconfdir)/init.d/partitions-by-name \
 	$(TARGET_sysconfdir)/init.d/proc \
 	$(TARGET_sysconfdir)/init.d/rc.local \
 	$(TARGET_sysconfdir)/init.d/resizerootfs \
 	$(TARGET_sysconfdir)/init.d/sys_update.sh \
-	$(TARGET_sysconfdir)/init.d/syslogd \
 	$(TARGET_sysconfdir)/init.d/sendsigs \
 	$(TARGET_sysconfdir)/init.d/umountfs \
 	$(TARGET_sysconfdir)/init.d/suspend \
@@ -50,10 +46,6 @@ $(TARGET_sysconfdir)/init.d/coredump:
 	$(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/coredump.init $(@)
 	$(UPDATE-RC.D) $(@F) start 40 S .
 
-$(TARGET_sysconfdir)/init.d/crond:
-	$(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/crond.init $(@)
-	$(UPDATE-RC.D) $(@F) defaults 50
-
 $(TARGET_sysconfdir)/init.d/custom-poweroff:
 ifeq ($(BOXTYPE),coolstream)
 	$(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/custom-poweroff.init $(@)
@@ -67,13 +59,6 @@ $(TARGET_sysconfdir)/init.d/fstab:
 $(TARGET_sysconfdir)/init.d/hostname:
 	$(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/hostname.init $(@)
 
-$(TARGET_sysconfdir)/init.d/inetd:
-	$(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/inetd.init $(@)
-	$(UPDATE-RC.D) $(@F) defaults 50
-
-$(TARGET_sysconfdir)/init.d/mdev:
-	$(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/mdev.init $(@)
-
 $(TARGET_sysconfdir)/init.d/networking:
 	$(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/networking.init $(@)
 	$(UPDATE-RC.D) $(@F) stop 98 0 6 .
@@ -102,10 +87,6 @@ endif
 $(TARGET_sysconfdir)/init.d/sys_update.sh:
 	$(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/sys_update.sh $(@)
 
-$(TARGET_sysconfdir)/init.d/syslogd:
-	$(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/syslogd.init $(@)
-	$(UPDATE-RC.D) $(@F) stop 98 0 6 .
-
 $(TARGET_sysconfdir)/init.d/sendsigs:
 ifeq ($(BOXMODEL),$(filter $(BOXMODEL),hd60 hd61))
 	$(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/sendsigs.init $(@)
@@ -142,11 +123,3 @@ $(TARGET_sysconfdir)/init.d/var_update.sh:
 ifeq ($(PERSISTENT_VAR_PARTITION),yes)
 	$(INSTALL_EXEC) -D $(TARGET_FILES)/scripts/var_update.sh $(@)
 endif
-
-# -----------------------------------------------------------------------------
-
-scripts: \
-	$(TARGET_datadir)/udhcpc/default.script
-
-$(TARGET_datadir)/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 41d12765..dbfa11f6 100644
--- a/make/target-tools.mk
+++ b/make/target-tools.mk
@@ -126,6 +126,15 @@ endef
 define BUSYBOX_INSTALL_FILES
 	$(BUSYBOX_INSTALL_SWAP)
 	$(BUSYBOX_INSTALL_FBSET)
+	$(INSTALL_EXEC) -D $(PKG_FILES_DIR)/udhcpc-default.script $(TARGET_datadir)/udhcpc/default.script
+	$(INSTALL_EXEC) -D $(PKG_FILES_DIR)/crond.init $(TARGET_sysconfdir)/init.d/crond
+	$(UPDATE-RC.D) crond defaults 50
+	$(INSTALL_EXEC) -D $(PKG_FILES_DIR)/inetd.init $(TARGET_sysconfdir)/init.d/inetd
+	$(UPDATE-RC.D) inetd defaults 50
+	$(INSTALL_DATA) -D $(PKG_FILES_DIR)/inetd.conf $(TARGET_sysconfdir)/inetd.conf
+	$(INSTALL_EXEC) -D $(PKG_FILES_DIR)/mdev.init $(TARGET_sysconfdir)/init.d/mdev
+	$(INSTALL_EXEC) -D $(PKG_FILES_DIR)/syslogd.init $(TARGET_sysconfdir)/init.d/syslogd
+	$(UPDATE-RC.D) syslogd stop 98 0 6 .
 endef
 
 busybox: $(BUSYBOX_DEPS) $(DL_DIR)/$(BUSYBOX_SOURCE) | $(TARGET_DIR)
diff --git a/skel-root/general/scripts/crond.init b/package/busybox/files/crond.init
similarity index 100%
rename from skel-root/general/scripts/crond.init
rename to package/busybox/files/crond.init
diff --git a/skel-root/general/files-etc/inetd.conf b/package/busybox/files/inetd.conf
similarity index 100%
rename from skel-root/general/files-etc/inetd.conf
rename to package/busybox/files/inetd.conf
diff --git a/skel-root/general/scripts/inetd.init b/package/busybox/files/inetd.init
similarity index 100%
rename from skel-root/general/scripts/inetd.init
rename to package/busybox/files/inetd.init
diff --git a/skel-root/general/scripts/mdev.init b/package/busybox/files/mdev.init
similarity index 100%
rename from skel-root/general/scripts/mdev.init
rename to package/busybox/files/mdev.init
diff --git a/skel-root/general/scripts/syslogd.init b/package/busybox/files/syslogd.init
similarity index 100%
rename from skel-root/general/scripts/syslogd.init
rename to package/busybox/files/syslogd.init
diff --git a/skel-root/general/scripts/udhcpc-default.script b/package/busybox/files/udhcpc-default.script
similarity index 100%
rename from skel-root/general/scripts/udhcpc-default.script
rename to package/busybox/files/udhcpc-default.script