diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 04a63b7494..6285929436 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -94,7 +94,7 @@ define Build/Compile
 endef
 
 define Package/base-files$(TARGET)/install
-	$(CP) ./default/* $(1)/
+	$(CP) ./files/* $(1)/
 	if [ -d $(PLATFORM_DIR)/base-files/. ]; then \
 		$(CP) $(PLATFORM_DIR)/base-files/* $(1)/; \
 	fi
diff --git a/package/base-files/default/bin/ipcalc b/package/base-files/files/bin/ipcalc
similarity index 100%
rename from package/base-files/default/bin/ipcalc
rename to package/base-files/files/bin/ipcalc
diff --git a/package/base-files/default/bin/login b/package/base-files/files/bin/login
similarity index 100%
rename from package/base-files/default/bin/login
rename to package/base-files/files/bin/login
diff --git a/package/base-files/default/bin/uci b/package/base-files/files/bin/uci
similarity index 100%
rename from package/base-files/default/bin/uci
rename to package/base-files/files/bin/uci
diff --git a/package/base-files/default/etc/banner b/package/base-files/files/etc/banner
similarity index 100%
rename from package/base-files/default/etc/banner
rename to package/base-files/files/etc/banner
diff --git a/package/base-files/default/etc/config/network b/package/base-files/files/etc/config/network
similarity index 100%
rename from package/base-files/default/etc/config/network
rename to package/base-files/files/etc/config/network
diff --git a/package/base-files/default/etc/functions.sh b/package/base-files/files/etc/functions.sh
similarity index 100%
rename from package/base-files/default/etc/functions.sh
rename to package/base-files/files/etc/functions.sh
diff --git a/package/base-files/default/etc/group b/package/base-files/files/etc/group
similarity index 100%
rename from package/base-files/default/etc/group
rename to package/base-files/files/etc/group
diff --git a/package/base-files/default/etc/hosts b/package/base-files/files/etc/hosts
similarity index 100%
rename from package/base-files/default/etc/hosts
rename to package/base-files/files/etc/hosts
diff --git a/package/base-files/default/etc/hotplug.d/block/01-mount b/package/base-files/files/etc/hotplug.d/block/01-mount
similarity index 100%
rename from package/base-files/default/etc/hotplug.d/block/01-mount
rename to package/base-files/files/etc/hotplug.d/block/01-mount
diff --git a/package/base-files/default/etc/hotplug.d/net/10-net b/package/base-files/files/etc/hotplug.d/net/10-net
similarity index 100%
rename from package/base-files/default/etc/hotplug.d/net/10-net
rename to package/base-files/files/etc/hotplug.d/net/10-net
diff --git a/package/base-files/default/etc/hotplug.d/usb/01-ln b/package/base-files/files/etc/hotplug.d/usb/01-ln
similarity index 100%
rename from package/base-files/default/etc/hotplug.d/usb/01-ln
rename to package/base-files/files/etc/hotplug.d/usb/01-ln
diff --git a/package/base-files/default/etc/init.d/boot b/package/base-files/files/etc/init.d/boot
similarity index 100%
rename from package/base-files/default/etc/init.d/boot
rename to package/base-files/files/etc/init.d/boot
diff --git a/package/base-files/default/etc/init.d/network b/package/base-files/files/etc/init.d/network
similarity index 100%
rename from package/base-files/default/etc/init.d/network
rename to package/base-files/files/etc/init.d/network
diff --git a/package/base-files/default/etc/init.d/rcS b/package/base-files/files/etc/init.d/rcS
similarity index 100%
rename from package/base-files/default/etc/init.d/rcS
rename to package/base-files/files/etc/init.d/rcS
diff --git a/package/base-files/default/etc/inittab b/package/base-files/files/etc/inittab
similarity index 100%
rename from package/base-files/default/etc/inittab
rename to package/base-files/files/etc/inittab
diff --git a/package/base-files/default/etc/ipkg.conf b/package/base-files/files/etc/ipkg.conf
similarity index 100%
rename from package/base-files/default/etc/ipkg.conf
rename to package/base-files/files/etc/ipkg.conf
diff --git a/package/base-files/default/etc/passwd b/package/base-files/files/etc/passwd
similarity index 100%
rename from package/base-files/default/etc/passwd
rename to package/base-files/files/etc/passwd
diff --git a/package/base-files/default/etc/profile b/package/base-files/files/etc/profile
similarity index 100%
rename from package/base-files/default/etc/profile
rename to package/base-files/files/etc/profile
diff --git a/package/base-files/default/etc/protocols b/package/base-files/files/etc/protocols
similarity index 100%
rename from package/base-files/default/etc/protocols
rename to package/base-files/files/etc/protocols
diff --git a/package/base-files/default/etc/rc.common b/package/base-files/files/etc/rc.common
similarity index 100%
rename from package/base-files/default/etc/rc.common
rename to package/base-files/files/etc/rc.common
diff --git a/package/base-files/default/etc/resolv.conf b/package/base-files/files/etc/resolv.conf
similarity index 100%
rename from package/base-files/default/etc/resolv.conf
rename to package/base-files/files/etc/resolv.conf
diff --git a/package/base-files/default/etc/shells b/package/base-files/files/etc/shells
similarity index 100%
rename from package/base-files/default/etc/shells
rename to package/base-files/files/etc/shells
diff --git a/package/base-files/default/etc/sysctl.conf b/package/base-files/files/etc/sysctl.conf
similarity index 100%
rename from package/base-files/default/etc/sysctl.conf
rename to package/base-files/files/etc/sysctl.conf
diff --git a/package/base-files/default/lib/config/template.awk b/package/base-files/files/lib/config/template.awk
similarity index 100%
rename from package/base-files/default/lib/config/template.awk
rename to package/base-files/files/lib/config/template.awk
diff --git a/package/base-files/default/lib/config/uci-update.awk b/package/base-files/files/lib/config/uci-update.awk
similarity index 100%
rename from package/base-files/default/lib/config/uci-update.awk
rename to package/base-files/files/lib/config/uci-update.awk
diff --git a/package/base-files/default/lib/config/uci.sh b/package/base-files/files/lib/config/uci.sh
similarity index 100%
rename from package/base-files/default/lib/config/uci.sh
rename to package/base-files/files/lib/config/uci.sh
diff --git a/package/base-files/default/lib/network/config.sh b/package/base-files/files/lib/network/config.sh
similarity index 100%
rename from package/base-files/default/lib/network/config.sh
rename to package/base-files/files/lib/network/config.sh
diff --git a/package/base-files/default/rom/note b/package/base-files/files/rom/note
similarity index 100%
rename from package/base-files/default/rom/note
rename to package/base-files/files/rom/note
diff --git a/package/base-files/default/sbin/hotplug b/package/base-files/files/sbin/hotplug
similarity index 100%
rename from package/base-files/default/sbin/hotplug
rename to package/base-files/files/sbin/hotplug
diff --git a/package/base-files/default/sbin/ifdown b/package/base-files/files/sbin/ifdown
similarity index 100%
rename from package/base-files/default/sbin/ifdown
rename to package/base-files/files/sbin/ifdown
diff --git a/package/base-files/default/sbin/ifup b/package/base-files/files/sbin/ifup
similarity index 100%
rename from package/base-files/default/sbin/ifup
rename to package/base-files/files/sbin/ifup
diff --git a/package/base-files/default/sbin/mount_root b/package/base-files/files/sbin/mount_root
similarity index 100%
rename from package/base-files/default/sbin/mount_root
rename to package/base-files/files/sbin/mount_root
diff --git a/package/base-files/default/sbin/wifi b/package/base-files/files/sbin/wifi
similarity index 100%
rename from package/base-files/default/sbin/wifi
rename to package/base-files/files/sbin/wifi
diff --git a/package/base-files/default/usr/lib/common.awk b/package/base-files/files/usr/lib/common.awk
similarity index 100%
rename from package/base-files/default/usr/lib/common.awk
rename to package/base-files/files/usr/lib/common.awk
diff --git a/package/base-files/default/usr/share/udhcpc/default.script b/package/base-files/files/usr/share/udhcpc/default.script
similarity index 100%
rename from package/base-files/default/usr/share/udhcpc/default.script
rename to package/base-files/files/usr/share/udhcpc/default.script