diff --git a/base-files/Makefile b/package/base-files/Makefile
similarity index 100%
rename from base-files/Makefile
rename to package/base-files/Makefile
diff --git a/base-files/files/bin/board_detect b/package/base-files/files/bin/board_detect
similarity index 100%
rename from base-files/files/bin/board_detect
rename to package/base-files/files/bin/board_detect
diff --git a/base-files/files/bin/config_generate b/package/base-files/files/bin/config_generate
similarity index 100%
rename from base-files/files/bin/config_generate
rename to package/base-files/files/bin/config_generate
diff --git a/base-files/files/bin/ipcalc.sh b/package/base-files/files/bin/ipcalc.sh
similarity index 100%
rename from base-files/files/bin/ipcalc.sh
rename to package/base-files/files/bin/ipcalc.sh
diff --git a/base-files/files/etc/banner b/package/base-files/files/etc/banner
similarity index 100%
rename from base-files/files/etc/banner
rename to package/base-files/files/etc/banner
diff --git a/base-files/files/etc/banner.failsafe b/package/base-files/files/etc/banner.failsafe
similarity index 100%
rename from base-files/files/etc/banner.failsafe
rename to package/base-files/files/etc/banner.failsafe
diff --git a/base-files/files/etc/board.d/99-default_network b/package/base-files/files/etc/board.d/99-default_network
similarity index 100%
rename from base-files/files/etc/board.d/99-default_network
rename to package/base-files/files/etc/board.d/99-default_network
diff --git a/base-files/files/etc/device_info b/package/base-files/files/etc/device_info
similarity index 100%
rename from base-files/files/etc/device_info
rename to package/base-files/files/etc/device_info
diff --git a/base-files/files/etc/diag.sh b/package/base-files/files/etc/diag.sh
similarity index 100%
rename from base-files/files/etc/diag.sh
rename to package/base-files/files/etc/diag.sh
diff --git a/base-files/files/etc/ethers b/package/base-files/files/etc/ethers
similarity index 100%
rename from base-files/files/etc/ethers
rename to package/base-files/files/etc/ethers
diff --git a/base-files/files/etc/fstab b/package/base-files/files/etc/fstab
similarity index 100%
rename from base-files/files/etc/fstab
rename to package/base-files/files/etc/fstab
diff --git a/base-files/files/etc/group b/package/base-files/files/etc/group
similarity index 100%
rename from base-files/files/etc/group
rename to package/base-files/files/etc/group
diff --git a/base-files/files/etc/hosts b/package/base-files/files/etc/hosts
similarity index 100%
rename from base-files/files/etc/hosts
rename to package/base-files/files/etc/hosts
diff --git a/base-files/files/etc/hotplug.d/net/00-sysctl b/package/base-files/files/etc/hotplug.d/net/00-sysctl
similarity index 100%
rename from base-files/files/etc/hotplug.d/net/00-sysctl
rename to package/base-files/files/etc/hotplug.d/net/00-sysctl
diff --git a/base-files/files/etc/init.d/boot b/package/base-files/files/etc/init.d/boot
similarity index 100%
rename from base-files/files/etc/init.d/boot
rename to package/base-files/files/etc/init.d/boot
diff --git a/base-files/files/etc/init.d/done b/package/base-files/files/etc/init.d/done
similarity index 100%
rename from base-files/files/etc/init.d/done
rename to package/base-files/files/etc/init.d/done
diff --git a/base-files/files/etc/init.d/gpio_switch b/package/base-files/files/etc/init.d/gpio_switch
similarity index 100%
rename from base-files/files/etc/init.d/gpio_switch
rename to package/base-files/files/etc/init.d/gpio_switch
diff --git a/base-files/files/etc/init.d/led b/package/base-files/files/etc/init.d/led
similarity index 100%
rename from base-files/files/etc/init.d/led
rename to package/base-files/files/etc/init.d/led
diff --git a/base-files/files/etc/init.d/sysctl b/package/base-files/files/etc/init.d/sysctl
similarity index 100%
rename from base-files/files/etc/init.d/sysctl
rename to package/base-files/files/etc/init.d/sysctl
diff --git a/base-files/files/etc/init.d/sysfixtime b/package/base-files/files/etc/init.d/sysfixtime
similarity index 100%
rename from base-files/files/etc/init.d/sysfixtime
rename to package/base-files/files/etc/init.d/sysfixtime
diff --git a/base-files/files/etc/init.d/system b/package/base-files/files/etc/init.d/system
similarity index 100%
rename from base-files/files/etc/init.d/system
rename to package/base-files/files/etc/init.d/system
diff --git a/base-files/files/etc/init.d/umount b/package/base-files/files/etc/init.d/umount
similarity index 100%
rename from base-files/files/etc/init.d/umount
rename to package/base-files/files/etc/init.d/umount
diff --git a/base-files/files/etc/inittab b/package/base-files/files/etc/inittab
similarity index 100%
rename from base-files/files/etc/inittab
rename to package/base-files/files/etc/inittab
diff --git a/base-files/files/etc/iproute2/ematch_map b/package/base-files/files/etc/iproute2/ematch_map
similarity index 100%
rename from base-files/files/etc/iproute2/ematch_map
rename to package/base-files/files/etc/iproute2/ematch_map
diff --git a/base-files/files/etc/iproute2/rt_protos b/package/base-files/files/etc/iproute2/rt_protos
similarity index 100%
rename from base-files/files/etc/iproute2/rt_protos
rename to package/base-files/files/etc/iproute2/rt_protos
diff --git a/base-files/files/etc/iproute2/rt_tables b/package/base-files/files/etc/iproute2/rt_tables
similarity index 100%
rename from base-files/files/etc/iproute2/rt_tables
rename to package/base-files/files/etc/iproute2/rt_tables
diff --git a/base-files/files/etc/openwrt_release b/package/base-files/files/etc/openwrt_release
similarity index 100%
rename from base-files/files/etc/openwrt_release
rename to package/base-files/files/etc/openwrt_release
diff --git a/base-files/files/etc/openwrt_version b/package/base-files/files/etc/openwrt_version
similarity index 100%
rename from base-files/files/etc/openwrt_version
rename to package/base-files/files/etc/openwrt_version
diff --git a/base-files/files/etc/os-release b/package/base-files/files/etc/os-release
similarity index 100%
rename from base-files/files/etc/os-release
rename to package/base-files/files/etc/os-release
diff --git a/base-files/files/etc/passwd b/package/base-files/files/etc/passwd
similarity index 100%
rename from base-files/files/etc/passwd
rename to package/base-files/files/etc/passwd
diff --git a/base-files/files/etc/preinit b/package/base-files/files/etc/preinit
similarity index 100%
rename from base-files/files/etc/preinit
rename to package/base-files/files/etc/preinit
diff --git a/base-files/files/etc/profile b/package/base-files/files/etc/profile
similarity index 100%
rename from base-files/files/etc/profile
rename to package/base-files/files/etc/profile
diff --git a/base-files/files/etc/protocols b/package/base-files/files/etc/protocols
similarity index 100%
rename from base-files/files/etc/protocols
rename to package/base-files/files/etc/protocols
diff --git a/base-files/files/etc/rc.button/failsafe b/package/base-files/files/etc/rc.button/failsafe
similarity index 100%
rename from base-files/files/etc/rc.button/failsafe
rename to package/base-files/files/etc/rc.button/failsafe
diff --git a/base-files/files/etc/rc.button/power b/package/base-files/files/etc/rc.button/power
similarity index 100%
rename from base-files/files/etc/rc.button/power
rename to package/base-files/files/etc/rc.button/power
diff --git a/base-files/files/etc/rc.button/reboot b/package/base-files/files/etc/rc.button/reboot
similarity index 100%
rename from base-files/files/etc/rc.button/reboot
rename to package/base-files/files/etc/rc.button/reboot
diff --git a/base-files/files/etc/rc.button/reset b/package/base-files/files/etc/rc.button/reset
similarity index 100%
rename from base-files/files/etc/rc.button/reset
rename to package/base-files/files/etc/rc.button/reset
diff --git a/base-files/files/etc/rc.button/rfkill b/package/base-files/files/etc/rc.button/rfkill
similarity index 100%
rename from base-files/files/etc/rc.button/rfkill
rename to package/base-files/files/etc/rc.button/rfkill
diff --git a/base-files/files/etc/rc.common b/package/base-files/files/etc/rc.common
similarity index 100%
rename from base-files/files/etc/rc.common
rename to package/base-files/files/etc/rc.common
diff --git a/base-files/files/etc/rc.local b/package/base-files/files/etc/rc.local
similarity index 100%
rename from base-files/files/etc/rc.local
rename to package/base-files/files/etc/rc.local
diff --git a/base-files/files/etc/services b/package/base-files/files/etc/services
similarity index 100%
rename from base-files/files/etc/services
rename to package/base-files/files/etc/services
diff --git a/base-files/files/etc/shadow b/package/base-files/files/etc/shadow
similarity index 100%
rename from base-files/files/etc/shadow
rename to package/base-files/files/etc/shadow
diff --git a/base-files/files/etc/shells b/package/base-files/files/etc/shells
similarity index 100%
rename from base-files/files/etc/shells
rename to package/base-files/files/etc/shells
diff --git a/base-files/files/etc/sysctl.conf b/package/base-files/files/etc/sysctl.conf
similarity index 100%
rename from base-files/files/etc/sysctl.conf
rename to package/base-files/files/etc/sysctl.conf
diff --git a/base-files/files/etc/sysctl.d/10-default.conf b/package/base-files/files/etc/sysctl.d/10-default.conf
similarity index 100%
rename from base-files/files/etc/sysctl.d/10-default.conf
rename to package/base-files/files/etc/sysctl.d/10-default.conf
diff --git a/base-files/files/etc/sysupgrade.conf b/package/base-files/files/etc/sysupgrade.conf
similarity index 100%
rename from base-files/files/etc/sysupgrade.conf
rename to package/base-files/files/etc/sysupgrade.conf
diff --git a/base-files/files/etc/uci-defaults/10_migrate-shadow b/package/base-files/files/etc/uci-defaults/10_migrate-shadow
similarity index 100%
rename from base-files/files/etc/uci-defaults/10_migrate-shadow
rename to package/base-files/files/etc/uci-defaults/10_migrate-shadow
diff --git a/base-files/files/etc/uci-defaults/12_network-generate-ula b/package/base-files/files/etc/uci-defaults/12_network-generate-ula
similarity index 100%
rename from base-files/files/etc/uci-defaults/12_network-generate-ula
rename to package/base-files/files/etc/uci-defaults/12_network-generate-ula
diff --git a/base-files/files/etc/uci-defaults/13_fix_group_user b/package/base-files/files/etc/uci-defaults/13_fix_group_user
similarity index 100%
rename from base-files/files/etc/uci-defaults/13_fix_group_user
rename to package/base-files/files/etc/uci-defaults/13_fix_group_user
diff --git a/base-files/files/lib/functions.sh b/package/base-files/files/lib/functions.sh
similarity index 100%
rename from base-files/files/lib/functions.sh
rename to package/base-files/files/lib/functions.sh
diff --git a/base-files/files/lib/functions/leds.sh b/package/base-files/files/lib/functions/leds.sh
similarity index 100%
rename from base-files/files/lib/functions/leds.sh
rename to package/base-files/files/lib/functions/leds.sh
diff --git a/base-files/files/lib/functions/migrations.sh b/package/base-files/files/lib/functions/migrations.sh
similarity index 100%
rename from base-files/files/lib/functions/migrations.sh
rename to package/base-files/files/lib/functions/migrations.sh
diff --git a/base-files/files/lib/functions/network.sh b/package/base-files/files/lib/functions/network.sh
similarity index 100%
rename from base-files/files/lib/functions/network.sh
rename to package/base-files/files/lib/functions/network.sh
diff --git a/base-files/files/lib/functions/preinit.sh b/package/base-files/files/lib/functions/preinit.sh
similarity index 100%
rename from base-files/files/lib/functions/preinit.sh
rename to package/base-files/files/lib/functions/preinit.sh
diff --git a/base-files/files/lib/functions/service.sh b/package/base-files/files/lib/functions/service.sh
similarity index 100%
rename from base-files/files/lib/functions/service.sh
rename to package/base-files/files/lib/functions/service.sh
diff --git a/base-files/files/lib/functions/system.sh b/package/base-files/files/lib/functions/system.sh
similarity index 100%
rename from base-files/files/lib/functions/system.sh
rename to package/base-files/files/lib/functions/system.sh
diff --git a/base-files/files/lib/functions/uci-defaults.sh b/package/base-files/files/lib/functions/uci-defaults.sh
similarity index 100%
rename from base-files/files/lib/functions/uci-defaults.sh
rename to package/base-files/files/lib/functions/uci-defaults.sh
diff --git a/base-files/files/lib/preinit/02_default_set_state b/package/base-files/files/lib/preinit/02_default_set_state
similarity index 100%
rename from base-files/files/lib/preinit/02_default_set_state
rename to package/base-files/files/lib/preinit/02_default_set_state
diff --git a/base-files/files/lib/preinit/02_sysinfo b/package/base-files/files/lib/preinit/02_sysinfo
similarity index 100%
rename from base-files/files/lib/preinit/02_sysinfo
rename to package/base-files/files/lib/preinit/02_sysinfo
diff --git a/base-files/files/lib/preinit/10_indicate_failsafe b/package/base-files/files/lib/preinit/10_indicate_failsafe
similarity index 100%
rename from base-files/files/lib/preinit/10_indicate_failsafe
rename to package/base-files/files/lib/preinit/10_indicate_failsafe
diff --git a/base-files/files/lib/preinit/10_indicate_preinit b/package/base-files/files/lib/preinit/10_indicate_preinit
similarity index 100%
rename from base-files/files/lib/preinit/10_indicate_preinit
rename to package/base-files/files/lib/preinit/10_indicate_preinit
diff --git a/base-files/files/lib/preinit/30_failsafe_wait b/package/base-files/files/lib/preinit/30_failsafe_wait
similarity index 100%
rename from base-files/files/lib/preinit/30_failsafe_wait
rename to package/base-files/files/lib/preinit/30_failsafe_wait
diff --git a/base-files/files/lib/preinit/40_run_failsafe_hook b/package/base-files/files/lib/preinit/40_run_failsafe_hook
similarity index 100%
rename from base-files/files/lib/preinit/40_run_failsafe_hook
rename to package/base-files/files/lib/preinit/40_run_failsafe_hook
diff --git a/base-files/files/lib/preinit/50_indicate_regular_preinit b/package/base-files/files/lib/preinit/50_indicate_regular_preinit
similarity index 100%
rename from base-files/files/lib/preinit/50_indicate_regular_preinit
rename to package/base-files/files/lib/preinit/50_indicate_regular_preinit
diff --git a/base-files/files/lib/preinit/70_initramfs_test b/package/base-files/files/lib/preinit/70_initramfs_test
similarity index 100%
rename from base-files/files/lib/preinit/70_initramfs_test
rename to package/base-files/files/lib/preinit/70_initramfs_test
diff --git a/base-files/files/lib/preinit/80_mount_root b/package/base-files/files/lib/preinit/80_mount_root
similarity index 100%
rename from base-files/files/lib/preinit/80_mount_root
rename to package/base-files/files/lib/preinit/80_mount_root
diff --git a/base-files/files/lib/preinit/99_10_failsafe_login b/package/base-files/files/lib/preinit/99_10_failsafe_login
similarity index 100%
rename from base-files/files/lib/preinit/99_10_failsafe_login
rename to package/base-files/files/lib/preinit/99_10_failsafe_login
diff --git a/base-files/files/lib/preinit/99_10_run_init b/package/base-files/files/lib/preinit/99_10_run_init
similarity index 100%
rename from base-files/files/lib/preinit/99_10_run_init
rename to package/base-files/files/lib/preinit/99_10_run_init
diff --git a/base-files/files/lib/upgrade/common.sh b/package/base-files/files/lib/upgrade/common.sh
similarity index 100%
rename from base-files/files/lib/upgrade/common.sh
rename to package/base-files/files/lib/upgrade/common.sh
diff --git a/base-files/files/lib/upgrade/do_stage2 b/package/base-files/files/lib/upgrade/do_stage2
similarity index 100%
rename from base-files/files/lib/upgrade/do_stage2
rename to package/base-files/files/lib/upgrade/do_stage2
diff --git a/base-files/files/lib/upgrade/fwtool.sh b/package/base-files/files/lib/upgrade/fwtool.sh
similarity index 100%
rename from base-files/files/lib/upgrade/fwtool.sh
rename to package/base-files/files/lib/upgrade/fwtool.sh
diff --git a/base-files/files/lib/upgrade/keep.d/base-files-essential b/package/base-files/files/lib/upgrade/keep.d/base-files-essential
similarity index 100%
rename from base-files/files/lib/upgrade/keep.d/base-files-essential
rename to package/base-files/files/lib/upgrade/keep.d/base-files-essential
diff --git a/base-files/files/lib/upgrade/nand.sh b/package/base-files/files/lib/upgrade/nand.sh
similarity index 100%
rename from base-files/files/lib/upgrade/nand.sh
rename to package/base-files/files/lib/upgrade/nand.sh
diff --git a/base-files/files/lib/upgrade/stage2 b/package/base-files/files/lib/upgrade/stage2
similarity index 100%
rename from base-files/files/lib/upgrade/stage2
rename to package/base-files/files/lib/upgrade/stage2
diff --git a/base-files/files/rom/note b/package/base-files/files/rom/note
similarity index 100%
rename from base-files/files/rom/note
rename to package/base-files/files/rom/note
diff --git a/base-files/files/sbin/firstboot b/package/base-files/files/sbin/firstboot
similarity index 100%
rename from base-files/files/sbin/firstboot
rename to package/base-files/files/sbin/firstboot
diff --git a/base-files/files/sbin/hotplug-call b/package/base-files/files/sbin/hotplug-call
similarity index 100%
rename from base-files/files/sbin/hotplug-call
rename to package/base-files/files/sbin/hotplug-call
diff --git a/base-files/files/sbin/led.sh b/package/base-files/files/sbin/led.sh
similarity index 100%
rename from base-files/files/sbin/led.sh
rename to package/base-files/files/sbin/led.sh
diff --git a/base-files/files/sbin/pkg_check b/package/base-files/files/sbin/pkg_check
similarity index 100%
rename from base-files/files/sbin/pkg_check
rename to package/base-files/files/sbin/pkg_check
diff --git a/base-files/files/sbin/sysupgrade b/package/base-files/files/sbin/sysupgrade
similarity index 100%
rename from base-files/files/sbin/sysupgrade
rename to package/base-files/files/sbin/sysupgrade
diff --git a/base-files/files/sbin/wifi b/package/base-files/files/sbin/wifi
similarity index 100%
rename from base-files/files/sbin/wifi
rename to package/base-files/files/sbin/wifi
diff --git a/base-files/files/usr/lib/os-release b/package/base-files/files/usr/lib/os-release
similarity index 100%
rename from base-files/files/usr/lib/os-release
rename to package/base-files/files/usr/lib/os-release
diff --git a/base-files/files/usr/libexec/login.sh b/package/base-files/files/usr/libexec/login.sh
similarity index 100%
rename from base-files/files/usr/libexec/login.sh
rename to package/base-files/files/usr/libexec/login.sh
diff --git a/base-files/files/usr/libexec/validate_firmware_image b/package/base-files/files/usr/libexec/validate_firmware_image
similarity index 100%
rename from base-files/files/usr/libexec/validate_firmware_image
rename to package/base-files/files/usr/libexec/validate_firmware_image
diff --git a/base-files/image-config.in b/package/base-files/image-config.in
similarity index 100%
rename from base-files/image-config.in
rename to package/base-files/image-config.in
diff --git a/base-files/iop-files/etc/banner b/package/base-files/iop-files/etc/banner
similarity index 100%
rename from base-files/iop-files/etc/banner
rename to package/base-files/iop-files/etc/banner
diff --git a/base-files/iop-files/etc/board.d/45-iopsys-network b/package/base-files/iop-files/etc/board.d/45-iopsys-network
similarity index 100%
rename from base-files/iop-files/etc/board.d/45-iopsys-network
rename to package/base-files/iop-files/etc/board.d/45-iopsys-network
diff --git a/base-files/iop-files/etc/config/system b/package/base-files/iop-files/etc/config/system
similarity index 100%
rename from base-files/iop-files/etc/config/system
rename to package/base-files/iop-files/etc/config/system
diff --git a/base-files/iop-files/etc/config/users b/package/base-files/iop-files/etc/config/users
similarity index 100%
rename from base-files/iop-files/etc/config/users
rename to package/base-files/iop-files/etc/config/users
diff --git a/base-files/iop-files/etc/hotplug.d/block/40-mount b/package/base-files/iop-files/etc/hotplug.d/block/40-mount
similarity index 100%
rename from base-files/iop-files/etc/hotplug.d/block/40-mount
rename to package/base-files/iop-files/etc/hotplug.d/block/40-mount
diff --git a/base-files/iop-files/etc/hotplug.d/button/00-reset b/package/base-files/iop-files/etc/hotplug.d/button/00-reset
similarity index 100%
rename from base-files/iop-files/etc/hotplug.d/button/00-reset
rename to package/base-files/iop-files/etc/hotplug.d/button/00-reset
diff --git a/base-files/iop-files/etc/init.d/conf_snapshot b/package/base-files/iop-files/etc/init.d/conf_snapshot
similarity index 100%
rename from base-files/iop-files/etc/init.d/conf_snapshot
rename to package/base-files/iop-files/etc/init.d/conf_snapshot
diff --git a/base-files/iop-files/etc/init.d/config_tarball b/package/base-files/iop-files/etc/init.d/config_tarball
similarity index 100%
rename from base-files/iop-files/etc/init.d/config_tarball
rename to package/base-files/iop-files/etc/init.d/config_tarball
diff --git a/base-files/iop-files/etc/init.d/console_log b/package/base-files/iop-files/etc/init.d/console_log
similarity index 100%
rename from base-files/iop-files/etc/init.d/console_log
rename to package/base-files/iop-files/etc/init.d/console_log
diff --git a/base-files/iop-files/etc/init.d/extra_mounts b/package/base-files/iop-files/etc/init.d/extra_mounts
similarity index 100%
rename from base-files/iop-files/etc/init.d/extra_mounts
rename to package/base-files/iop-files/etc/init.d/extra_mounts
diff --git a/base-files/iop-files/etc/init.d/idone b/package/base-files/iop-files/etc/init.d/idone
similarity index 100%
rename from base-files/iop-files/etc/init.d/idone
rename to package/base-files/iop-files/etc/init.d/idone
diff --git a/base-files/iop-files/etc/init.d/iopsys_db b/package/base-files/iop-files/etc/init.d/iopsys_db
similarity index 100%
rename from base-files/iop-files/etc/init.d/iopsys_db
rename to package/base-files/iop-files/etc/init.d/iopsys_db
diff --git a/base-files/iop-files/etc/init.d/led b/package/base-files/iop-files/etc/init.d/led
similarity index 100%
rename from base-files/iop-files/etc/init.d/led
rename to package/base-files/iop-files/etc/init.d/led
diff --git a/base-files/iop-files/etc/init.d/sysctl b/package/base-files/iop-files/etc/init.d/sysctl
similarity index 100%
rename from base-files/iop-files/etc/init.d/sysctl
rename to package/base-files/iop-files/etc/init.d/sysctl
diff --git a/base-files/iop-files/etc/init.d/users b/package/base-files/iop-files/etc/init.d/users
similarity index 100%
rename from base-files/iop-files/etc/init.d/users
rename to package/base-files/iop-files/etc/init.d/users
diff --git a/base-files/iop-files/etc/inittab b/package/base-files/iop-files/etc/inittab
similarity index 100%
rename from base-files/iop-files/etc/inittab
rename to package/base-files/iop-files/etc/inittab
diff --git a/base-files/iop-files/etc/passwd b/package/base-files/iop-files/etc/passwd
similarity index 100%
rename from base-files/iop-files/etc/passwd
rename to package/base-files/iop-files/etc/passwd
diff --git a/base-files/iop-files/etc/rc.common b/package/base-files/iop-files/etc/rc.common
similarity index 100%
rename from base-files/iop-files/etc/rc.common
rename to package/base-files/iop-files/etc/rc.common
diff --git a/base-files/iop-files/etc/shadow b/package/base-files/iop-files/etc/shadow
similarity index 100%
rename from base-files/iop-files/etc/shadow
rename to package/base-files/iop-files/etc/shadow
diff --git a/base-files/iop-files/etc/uci-defaults/04-db-hw-board-versions b/package/base-files/iop-files/etc/uci-defaults/04-db-hw-board-versions
similarity index 100%
rename from base-files/iop-files/etc/uci-defaults/04-db-hw-board-versions
rename to package/base-files/iop-files/etc/uci-defaults/04-db-hw-board-versions
diff --git a/base-files/iop-files/etc/uci-defaults/05-db-deviceinfo b/package/base-files/iop-files/etc/uci-defaults/05-db-deviceinfo
similarity index 100%
rename from base-files/iop-files/etc/uci-defaults/05-db-deviceinfo
rename to package/base-files/iop-files/etc/uci-defaults/05-db-deviceinfo
diff --git a/base-files/iop-files/etc/uci-defaults/08-net-factory-to-user b/package/base-files/iop-files/etc/uci-defaults/08-net-factory-to-user
similarity index 100%
rename from base-files/iop-files/etc/uci-defaults/08-net-factory-to-user
rename to package/base-files/iop-files/etc/uci-defaults/08-net-factory-to-user
diff --git a/base-files/iop-files/lib/config/snapshots b/package/base-files/iop-files/lib/config/snapshots
similarity index 100%
rename from base-files/iop-files/lib/config/snapshots
rename to package/base-files/iop-files/lib/config/snapshots
diff --git a/base-files/iop-files/lib/functions/iopsys-backup.sh b/package/base-files/iop-files/lib/functions/iopsys-backup.sh
similarity index 100%
rename from base-files/iop-files/lib/functions/iopsys-backup.sh
rename to package/base-files/iop-files/lib/functions/iopsys-backup.sh
diff --git a/base-files/iop-files/lib/functions/iopsys-deviceinfo.sh b/package/base-files/iop-files/lib/functions/iopsys-deviceinfo.sh
similarity index 100%
rename from base-files/iop-files/lib/functions/iopsys-deviceinfo.sh
rename to package/base-files/iop-files/lib/functions/iopsys-deviceinfo.sh
diff --git a/base-files/iop-files/lib/functions/iopsys-encrypt.sh b/package/base-files/iop-files/lib/functions/iopsys-encrypt.sh
similarity index 100%
rename from base-files/iop-files/lib/functions/iopsys-encrypt.sh
rename to package/base-files/iop-files/lib/functions/iopsys-encrypt.sh
diff --git a/base-files/iop-files/lib/functions/iopsys-fwbank.sh b/package/base-files/iop-files/lib/functions/iopsys-fwbank.sh
similarity index 100%
rename from base-files/iop-files/lib/functions/iopsys-fwbank.sh
rename to package/base-files/iop-files/lib/functions/iopsys-fwbank.sh
diff --git a/base-files/iop-files/lib/functions/iopsys-system-layout.sh b/package/base-files/iop-files/lib/functions/iopsys-system-layout.sh
similarity index 100%
rename from base-files/iop-files/lib/functions/iopsys-system-layout.sh
rename to package/base-files/iop-files/lib/functions/iopsys-system-layout.sh
diff --git a/base-files/iop-files/lib/network/utils.sh b/package/base-files/iop-files/lib/network/utils.sh
similarity index 100%
rename from base-files/iop-files/lib/network/utils.sh
rename to package/base-files/iop-files/lib/network/utils.sh
diff --git a/base-files/iop-files/lib/preinit/31_failsafe_wait_disable b/package/base-files/iop-files/lib/preinit/31_failsafe_wait_disable
similarity index 100%
rename from base-files/iop-files/lib/preinit/31_failsafe_wait_disable
rename to package/base-files/iop-files/lib/preinit/31_failsafe_wait_disable
diff --git a/base-files/iop-files/lib/preinit/71_iopsys_overlay b/package/base-files/iop-files/lib/preinit/71_iopsys_overlay
similarity index 100%
rename from base-files/iop-files/lib/preinit/71_iopsys_overlay
rename to package/base-files/iop-files/lib/preinit/71_iopsys_overlay
diff --git a/base-files/iop-files/lib/preinit/99_10_failsafe_login b/package/base-files/iop-files/lib/preinit/99_10_failsafe_login
similarity index 100%
rename from base-files/iop-files/lib/preinit/99_10_failsafe_login
rename to package/base-files/iop-files/lib/preinit/99_10_failsafe_login
diff --git a/base-files/iop-files/lib/upgrade/common.sh b/package/base-files/iop-files/lib/upgrade/common.sh
similarity index 100%
rename from base-files/iop-files/lib/upgrade/common.sh
rename to package/base-files/iop-files/lib/upgrade/common.sh
diff --git a/base-files/iop-files/lib/upgrade/iopsys-uci-diff.sh b/package/base-files/iop-files/lib/upgrade/iopsys-uci-diff.sh
similarity index 100%
rename from base-files/iop-files/lib/upgrade/iopsys-uci-diff.sh
rename to package/base-files/iop-files/lib/upgrade/iopsys-uci-diff.sh
diff --git a/base-files/iop-files/lib/upgrade/iopsys.sh b/package/base-files/iop-files/lib/upgrade/iopsys.sh
similarity index 100%
rename from base-files/iop-files/lib/upgrade/iopsys.sh
rename to package/base-files/iop-files/lib/upgrade/iopsys.sh
diff --git a/base-files/iop-files/lib/upgrade/post-rootfs-fixup b/package/base-files/iop-files/lib/upgrade/post-rootfs-fixup
similarity index 100%
rename from base-files/iop-files/lib/upgrade/post-rootfs-fixup
rename to package/base-files/iop-files/lib/upgrade/post-rootfs-fixup
diff --git a/base-files/iop-files/lib/upgrade/post-rootfs-fixup.d/010-syslog-notice b/package/base-files/iop-files/lib/upgrade/post-rootfs-fixup.d/010-syslog-notice
similarity index 100%
rename from base-files/iop-files/lib/upgrade/post-rootfs-fixup.d/010-syslog-notice
rename to package/base-files/iop-files/lib/upgrade/post-rootfs-fixup.d/010-syslog-notice
diff --git a/base-files/iop-files/lib/upgrade/post-rootfs-fixup.d/080-openwrt-opkg-conffiles b/package/base-files/iop-files/lib/upgrade/post-rootfs-fixup.d/080-openwrt-opkg-conffiles
similarity index 100%
rename from base-files/iop-files/lib/upgrade/post-rootfs-fixup.d/080-openwrt-opkg-conffiles
rename to package/base-files/iop-files/lib/upgrade/post-rootfs-fixup.d/080-openwrt-opkg-conffiles
diff --git a/base-files/iop-files/lib/upgrade/post-rootfs-fixup.d/081-openwrt-sysupgrade-conf b/package/base-files/iop-files/lib/upgrade/post-rootfs-fixup.d/081-openwrt-sysupgrade-conf
similarity index 100%
rename from base-files/iop-files/lib/upgrade/post-rootfs-fixup.d/081-openwrt-sysupgrade-conf
rename to package/base-files/iop-files/lib/upgrade/post-rootfs-fixup.d/081-openwrt-sysupgrade-conf
diff --git a/base-files/iop-files/lib/upgrade/post-rootfs-fixup.d/111-sys-passwords b/package/base-files/iop-files/lib/upgrade/post-rootfs-fixup.d/111-sys-passwords
similarity index 100%
rename from base-files/iop-files/lib/upgrade/post-rootfs-fixup.d/111-sys-passwords
rename to package/base-files/iop-files/lib/upgrade/post-rootfs-fixup.d/111-sys-passwords
diff --git a/base-files/iop-files/lib/upgrade/post-rootfs-fixup.d/115-sys-ssh b/package/base-files/iop-files/lib/upgrade/post-rootfs-fixup.d/115-sys-ssh
similarity index 100%
rename from base-files/iop-files/lib/upgrade/post-rootfs-fixup.d/115-sys-ssh
rename to package/base-files/iop-files/lib/upgrade/post-rootfs-fixup.d/115-sys-ssh
diff --git a/base-files/iop-files/lib/upgrade/post-rootfs-fixup.d/200-uci-snapshots b/package/base-files/iop-files/lib/upgrade/post-rootfs-fixup.d/200-uci-snapshots
similarity index 100%
rename from base-files/iop-files/lib/upgrade/post-rootfs-fixup.d/200-uci-snapshots
rename to package/base-files/iop-files/lib/upgrade/post-rootfs-fixup.d/200-uci-snapshots
diff --git a/base-files/iop-files/lib/upgrade/post-rootfs-fixup.d/205-uci-network b/package/base-files/iop-files/lib/upgrade/post-rootfs-fixup.d/205-uci-network
similarity index 100%
rename from base-files/iop-files/lib/upgrade/post-rootfs-fixup.d/205-uci-network
rename to package/base-files/iop-files/lib/upgrade/post-rootfs-fixup.d/205-uci-network
diff --git a/base-files/iop-files/lib/upgrade/post-rootfs-fixup.d/208-uci-system b/package/base-files/iop-files/lib/upgrade/post-rootfs-fixup.d/208-uci-system
similarity index 100%
rename from base-files/iop-files/lib/upgrade/post-rootfs-fixup.d/208-uci-system
rename to package/base-files/iop-files/lib/upgrade/post-rootfs-fixup.d/208-uci-system
diff --git a/base-files/iop-files/lib/upgrade/post-rootfs-fixup.d/211-uci-users b/package/base-files/iop-files/lib/upgrade/post-rootfs-fixup.d/211-uci-users
similarity index 100%
rename from base-files/iop-files/lib/upgrade/post-rootfs-fixup.d/211-uci-users
rename to package/base-files/iop-files/lib/upgrade/post-rootfs-fixup.d/211-uci-users
diff --git a/base-files/iop-files/lib/upgrade/post-rootfs-fixup.d/298-uci-retrogression b/package/base-files/iop-files/lib/upgrade/post-rootfs-fixup.d/298-uci-retrogression
similarity index 100%
rename from base-files/iop-files/lib/upgrade/post-rootfs-fixup.d/298-uci-retrogression
rename to package/base-files/iop-files/lib/upgrade/post-rootfs-fixup.d/298-uci-retrogression
diff --git a/base-files/iop-files/lib/upgrade/post-rootfs-fixup.d/Readme b/package/base-files/iop-files/lib/upgrade/post-rootfs-fixup.d/Readme
similarity index 100%
rename from base-files/iop-files/lib/upgrade/post-rootfs-fixup.d/Readme
rename to package/base-files/iop-files/lib/upgrade/post-rootfs-fixup.d/Readme
diff --git a/base-files/iop-files/overlay/etc/upper/.placeholder b/package/base-files/iop-files/overlay/etc/upper/.placeholder
similarity index 100%
rename from base-files/iop-files/overlay/etc/upper/.placeholder
rename to package/base-files/iop-files/overlay/etc/upper/.placeholder
diff --git a/base-files/iop-files/overlay/etc/work/.placeholder b/package/base-files/iop-files/overlay/etc/work/.placeholder
similarity index 100%
rename from base-files/iop-files/overlay/etc/work/.placeholder
rename to package/base-files/iop-files/overlay/etc/work/.placeholder
diff --git a/base-files/iop-files/overlay/rom/upper/.placeholder b/package/base-files/iop-files/overlay/rom/upper/.placeholder
similarity index 100%
rename from base-files/iop-files/overlay/rom/upper/.placeholder
rename to package/base-files/iop-files/overlay/rom/upper/.placeholder
diff --git a/base-files/iop-files/overlay/rom/work/.placeholder b/package/base-files/iop-files/overlay/rom/work/.placeholder
similarity index 100%
rename from base-files/iop-files/overlay/rom/work/.placeholder
rename to package/base-files/iop-files/overlay/rom/work/.placeholder
diff --git a/base-files/iop-files/overlay/rootfs/upper/.placeholder b/package/base-files/iop-files/overlay/rootfs/upper/.placeholder
similarity index 100%
rename from base-files/iop-files/overlay/rootfs/upper/.placeholder
rename to package/base-files/iop-files/overlay/rootfs/upper/.placeholder
diff --git a/base-files/iop-files/overlay/rootfs/work/.placeholder b/package/base-files/iop-files/overlay/rootfs/work/.placeholder
similarity index 100%
rename from base-files/iop-files/overlay/rootfs/work/.placeholder
rename to package/base-files/iop-files/overlay/rootfs/work/.placeholder
diff --git a/base-files/iop-files/overlay/var/upper/.placeholder b/package/base-files/iop-files/overlay/var/upper/.placeholder
similarity index 100%
rename from base-files/iop-files/overlay/var/upper/.placeholder
rename to package/base-files/iop-files/overlay/var/upper/.placeholder
diff --git a/base-files/iop-files/overlay/var/work/.placeholder b/package/base-files/iop-files/overlay/var/work/.placeholder
similarity index 100%
rename from base-files/iop-files/overlay/var/work/.placeholder
rename to package/base-files/iop-files/overlay/var/work/.placeholder
diff --git a/base-files/iop-files/sbin/db b/package/base-files/iop-files/sbin/db
similarity index 100%
rename from base-files/iop-files/sbin/db
rename to package/base-files/iop-files/sbin/db
diff --git a/base-files/iop-files/sbin/defaultreset b/package/base-files/iop-files/sbin/defaultreset
similarity index 100%
rename from base-files/iop-files/sbin/defaultreset
rename to package/base-files/iop-files/sbin/defaultreset
diff --git a/base-files/iop-files/sbin/mount_root b/package/base-files/iop-files/sbin/mount_root
similarity index 100%
rename from base-files/iop-files/sbin/mount_root
rename to package/base-files/iop-files/sbin/mount_root
diff --git a/base-files/iop-files/sbin/other_bank b/package/base-files/iop-files/sbin/other_bank
similarity index 100%
rename from base-files/iop-files/sbin/other_bank
rename to package/base-files/iop-files/sbin/other_bank
diff --git a/base-files/iop-files/sbin/other_bank_clone b/package/base-files/iop-files/sbin/other_bank_clone
similarity index 100%
rename from base-files/iop-files/sbin/other_bank_clone
rename to package/base-files/iop-files/sbin/other_bank_clone
diff --git a/base-files/iop-files/sbin/reboot b/package/base-files/iop-files/sbin/reboot
similarity index 100%
rename from base-files/iop-files/sbin/reboot
rename to package/base-files/iop-files/sbin/reboot
diff --git a/base-files/iop-files/sbin/sysbackup b/package/base-files/iop-files/sbin/sysbackup
similarity index 100%
rename from base-files/iop-files/sbin/sysbackup
rename to package/base-files/iop-files/sbin/sysbackup
diff --git a/base-files/iop-files/sbin/sysrestore b/package/base-files/iop-files/sbin/sysrestore
similarity index 100%
rename from base-files/iop-files/sbin/sysrestore
rename to package/base-files/iop-files/sbin/sysrestore
diff --git a/base-files/iop-files/sbin/sysupgrade b/package/base-files/iop-files/sbin/sysupgrade
similarity index 100%
rename from base-files/iop-files/sbin/sysupgrade
rename to package/base-files/iop-files/sbin/sysupgrade
diff --git a/base-files/iop-files/usr/libexec/login.sh b/package/base-files/iop-files/usr/libexec/login.sh
similarity index 100%
rename from base-files/iop-files/usr/libexec/login.sh
rename to package/base-files/iop-files/usr/libexec/login.sh
diff --git a/base-files/iop-files/usr/libexec/rpcd/fwbank b/package/base-files/iop-files/usr/libexec/rpcd/fwbank
similarity index 100%
rename from base-files/iop-files/usr/libexec/rpcd/fwbank
rename to package/base-files/iop-files/usr/libexec/rpcd/fwbank
diff --git a/base-files/iop-files/usr/libexec/validate_firmware_image b/package/base-files/iop-files/usr/libexec/validate_firmware_image
similarity index 100%
rename from base-files/iop-files/usr/libexec/validate_firmware_image
rename to package/base-files/iop-files/usr/libexec/validate_firmware_image
diff --git a/mt76/Makefile b/package/kernel/mt76/Makefile
similarity index 100%
rename from mt76/Makefile
rename to package/kernel/mt76/Makefile
diff --git a/mt76/patches/0001-mt76-mt7615-update-beacon-contents-on-BSS_CHANGED_BE.patch b/package/kernel/mt76/patches/0001-mt76-mt7615-update-beacon-contents-on-BSS_CHANGED_BE.patch
similarity index 100%
rename from mt76/patches/0001-mt76-mt7615-update-beacon-contents-on-BSS_CHANGED_BE.patch
rename to package/kernel/mt76/patches/0001-mt76-mt7615-update-beacon-contents-on-BSS_CHANGED_BE.patch
diff --git a/mt76/patches/0002-mt76-allow-sta-to-connect-DFS-without-CAC.patch b/package/kernel/mt76/patches/0002-mt76-allow-sta-to-connect-DFS-without-CAC.patch
similarity index 100%
rename from mt76/patches/0002-mt76-allow-sta-to-connect-DFS-without-CAC.patch
rename to package/kernel/mt76/patches/0002-mt76-allow-sta-to-connect-DFS-without-CAC.patch
diff --git a/firewall/Makefile b/package/network/config/firewall/Makefile
similarity index 100%
rename from firewall/Makefile
rename to package/network/config/firewall/Makefile
diff --git a/firewall/files/firewall.config b/package/network/config/firewall/files/firewall.config
similarity index 100%
rename from firewall/files/firewall.config
rename to package/network/config/firewall/files/firewall.config
diff --git a/firewall/files/firewall.ddos b/package/network/config/firewall/files/firewall.ddos
similarity index 100%
rename from firewall/files/firewall.ddos
rename to package/network/config/firewall/files/firewall.ddos
diff --git a/firewall/files/firewall.dmz b/package/network/config/firewall/files/firewall.dmz
similarity index 100%
rename from firewall/files/firewall.dmz
rename to package/network/config/firewall/files/firewall.dmz
diff --git a/firewall/files/firewall.hotplug b/package/network/config/firewall/files/firewall.hotplug
similarity index 100%
rename from firewall/files/firewall.hotplug
rename to package/network/config/firewall/files/firewall.hotplug
diff --git a/firewall/files/firewall.init b/package/network/config/firewall/files/firewall.init
similarity index 100%
rename from firewall/files/firewall.init
rename to package/network/config/firewall/files/firewall.init
diff --git a/firewall/files/firewall.ntp.hotplug b/package/network/config/firewall/files/firewall.ntp.hotplug
similarity index 100%
rename from firewall/files/firewall.ntp.hotplug
rename to package/network/config/firewall/files/firewall.ntp.hotplug
diff --git a/firewall/files/firewall.ucidefault b/package/network/config/firewall/files/firewall.ucidefault
similarity index 100%
rename from firewall/files/firewall.ucidefault
rename to package/network/config/firewall/files/firewall.ucidefault
diff --git a/firewall/files/firewall.url b/package/network/config/firewall/files/firewall.url
similarity index 100%
rename from firewall/files/firewall.url
rename to package/network/config/firewall/files/firewall.url
diff --git a/firewall/files/firewall.user b/package/network/config/firewall/files/firewall.user
similarity index 100%
rename from firewall/files/firewall.user
rename to package/network/config/firewall/files/firewall.user
diff --git a/firewall/patches/0001-restrict-path-directories.patch b/package/network/config/firewall/patches/0001-restrict-path-directories.patch
similarity index 100%
rename from firewall/patches/0001-restrict-path-directories.patch
rename to package/network/config/firewall/patches/0001-restrict-path-directories.patch
diff --git a/firewall/patches/0001-zones-apply-tcp-mss-clamping-also-on-ingress-path.patch b/package/network/config/firewall/patches/0001-zones-apply-tcp-mss-clamping-also-on-ingress-path.patch
similarity index 100%
rename from firewall/patches/0001-zones-apply-tcp-mss-clamping-also-on-ingress-path.patch
rename to package/network/config/firewall/patches/0001-zones-apply-tcp-mss-clamping-also-on-ingress-path.patch
diff --git a/firewall/patches/0002-options-fix-parsing-of-boolean-attributes.patch b/package/network/config/firewall/patches/0002-options-fix-parsing-of-boolean-attributes.patch
similarity index 100%
rename from firewall/patches/0002-options-fix-parsing-of-boolean-attributes.patch
rename to package/network/config/firewall/patches/0002-options-fix-parsing-of-boolean-attributes.patch
diff --git a/firewall/patches/0003-rules-allow-logging-per-rule.patch b/package/network/config/firewall/patches/0003-rules-allow-logging-per-rule.patch
similarity index 100%
rename from firewall/patches/0003-rules-allow-logging-per-rule.patch
rename to package/network/config/firewall/patches/0003-rules-allow-logging-per-rule.patch
diff --git a/netifd/Makefile b/package/network/config/netifd/Makefile
similarity index 100%
rename from netifd/Makefile
rename to package/network/config/netifd/Makefile
diff --git a/netifd/files/etc/hotplug.d/iface/00-netstate b/package/network/config/netifd/files/etc/hotplug.d/iface/00-netstate
similarity index 100%
rename from netifd/files/etc/hotplug.d/iface/00-netstate
rename to package/network/config/netifd/files/etc/hotplug.d/iface/00-netstate
diff --git a/netifd/files/etc/hotplug.d/net/20-smp-tune b/package/network/config/netifd/files/etc/hotplug.d/net/20-smp-tune
similarity index 100%
rename from netifd/files/etc/hotplug.d/net/20-smp-tune
rename to package/network/config/netifd/files/etc/hotplug.d/net/20-smp-tune
diff --git a/netifd/files/etc/init.d/network b/package/network/config/netifd/files/etc/init.d/network
similarity index 100%
rename from netifd/files/etc/init.d/network
rename to package/network/config/netifd/files/etc/init.d/network
diff --git a/netifd/files/lib/netifd/dhcp.script b/package/network/config/netifd/files/lib/netifd/dhcp.script
similarity index 100%
rename from netifd/files/lib/netifd/dhcp.script
rename to package/network/config/netifd/files/lib/netifd/dhcp.script
diff --git a/netifd/files/lib/netifd/post-reload/ula-handler.sh b/package/network/config/netifd/files/lib/netifd/post-reload/ula-handler.sh
similarity index 100%
rename from netifd/files/lib/netifd/post-reload/ula-handler.sh
rename to package/network/config/netifd/files/lib/netifd/post-reload/ula-handler.sh
diff --git a/netifd/files/lib/netifd/pre-reload/ula-handler.sh b/package/network/config/netifd/files/lib/netifd/pre-reload/ula-handler.sh
similarity index 100%
rename from netifd/files/lib/netifd/pre-reload/ula-handler.sh
rename to package/network/config/netifd/files/lib/netifd/pre-reload/ula-handler.sh
diff --git a/netifd/files/lib/netifd/proto/dhcp.sh b/package/network/config/netifd/files/lib/netifd/proto/dhcp.sh
similarity index 100%
rename from netifd/files/lib/netifd/proto/dhcp.sh
rename to package/network/config/netifd/files/lib/netifd/proto/dhcp.sh
diff --git a/netifd/files/lib/network/config.sh b/package/network/config/netifd/files/lib/network/config.sh
similarity index 100%
rename from netifd/files/lib/network/config.sh
rename to package/network/config/netifd/files/lib/network/config.sh
diff --git a/netifd/files/sbin/devstatus b/package/network/config/netifd/files/sbin/devstatus
similarity index 100%
rename from netifd/files/sbin/devstatus
rename to package/network/config/netifd/files/sbin/devstatus
diff --git a/netifd/files/sbin/ifdown b/package/network/config/netifd/files/sbin/ifdown
similarity index 100%
rename from netifd/files/sbin/ifdown
rename to package/network/config/netifd/files/sbin/ifdown
diff --git a/netifd/files/sbin/ifstatus b/package/network/config/netifd/files/sbin/ifstatus
similarity index 100%
rename from netifd/files/sbin/ifstatus
rename to package/network/config/netifd/files/sbin/ifstatus
diff --git a/netifd/files/sbin/ifup b/package/network/config/netifd/files/sbin/ifup
similarity index 100%
rename from netifd/files/sbin/ifup
rename to package/network/config/netifd/files/sbin/ifup
diff --git a/netifd/files/usr/share/udhcpc/default.script b/package/network/config/netifd/files/usr/share/udhcpc/default.script
similarity index 100%
rename from netifd/files/usr/share/udhcpc/default.script
rename to package/network/config/netifd/files/usr/share/udhcpc/default.script
diff --git a/dnsmasq/Makefile b/package/network/services/dnsmasq/Makefile
similarity index 100%
rename from dnsmasq/Makefile
rename to package/network/services/dnsmasq/Makefile
diff --git a/dnsmasq/files/dhcp-script.sh b/package/network/services/dnsmasq/files/dhcp-script.sh
similarity index 100%
rename from dnsmasq/files/dhcp-script.sh
rename to package/network/services/dnsmasq/files/dhcp-script.sh
diff --git a/dnsmasq/files/dhcp.conf b/package/network/services/dnsmasq/files/dhcp.conf
similarity index 100%
rename from dnsmasq/files/dhcp.conf
rename to package/network/services/dnsmasq/files/dhcp.conf
diff --git a/dnsmasq/files/dhcpbogushostname.conf b/package/network/services/dnsmasq/files/dhcpbogushostname.conf
similarity index 100%
rename from dnsmasq/files/dhcpbogushostname.conf
rename to package/network/services/dnsmasq/files/dhcpbogushostname.conf
diff --git a/dnsmasq/files/dnsmasq.conf b/package/network/services/dnsmasq/files/dnsmasq.conf
similarity index 100%
rename from dnsmasq/files/dnsmasq.conf
rename to package/network/services/dnsmasq/files/dnsmasq.conf
diff --git a/dnsmasq/files/dnsmasq.init b/package/network/services/dnsmasq/files/dnsmasq.init
similarity index 100%
rename from dnsmasq/files/dnsmasq.init
rename to package/network/services/dnsmasq/files/dnsmasq.init
diff --git a/dnsmasq/files/dnsmasq_acl.json b/package/network/services/dnsmasq/files/dnsmasq_acl.json
similarity index 100%
rename from dnsmasq/files/dnsmasq_acl.json
rename to package/network/services/dnsmasq/files/dnsmasq_acl.json
diff --git a/dnsmasq/files/dnsmasqsec.hotplug b/package/network/services/dnsmasq/files/dnsmasqsec.hotplug
similarity index 100%
rename from dnsmasq/files/dnsmasqsec.hotplug
rename to package/network/services/dnsmasq/files/dnsmasqsec.hotplug
diff --git a/dnsmasq/files/rfc6761.conf b/package/network/services/dnsmasq/files/rfc6761.conf
similarity index 100%
rename from dnsmasq/files/rfc6761.conf
rename to package/network/services/dnsmasq/files/rfc6761.conf
diff --git a/dnsmasq/files/user-dhcp-script.sh b/package/network/services/dnsmasq/files/user-dhcp-script.sh
similarity index 100%
rename from dnsmasq/files/user-dhcp-script.sh
rename to package/network/services/dnsmasq/files/user-dhcp-script.sh
diff --git a/dnsmasq/patches/0001-Impove-cache-behaviour-for-TCP-connections.patch b/package/network/services/dnsmasq/patches/0001-Impove-cache-behaviour-for-TCP-connections.patch
similarity index 100%
rename from dnsmasq/patches/0001-Impove-cache-behaviour-for-TCP-connections.patch
rename to package/network/services/dnsmasq/patches/0001-Impove-cache-behaviour-for-TCP-connections.patch
diff --git a/dnsmasq/patches/0002-Ensure-that-AD-bit-is-reset-on-answers-from-address-.patch b/package/network/services/dnsmasq/patches/0002-Ensure-that-AD-bit-is-reset-on-answers-from-address-.patch
similarity index 100%
rename from dnsmasq/patches/0002-Ensure-that-AD-bit-is-reset-on-answers-from-address-.patch
rename to package/network/services/dnsmasq/patches/0002-Ensure-that-AD-bit-is-reset-on-answers-from-address-.patch
diff --git a/dnsmasq/patches/0003-Remove-ability-to-compile-without-IPv6-support.patch b/package/network/services/dnsmasq/patches/0003-Remove-ability-to-compile-without-IPv6-support.patch
similarity index 100%
rename from dnsmasq/patches/0003-Remove-ability-to-compile-without-IPv6-support.patch
rename to package/network/services/dnsmasq/patches/0003-Remove-ability-to-compile-without-IPv6-support.patch
diff --git a/dnsmasq/patches/0004-Don-t-forward-.bind-.server-queries-upstream.patch b/package/network/services/dnsmasq/patches/0004-Don-t-forward-.bind-.server-queries-upstream.patch
similarity index 100%
rename from dnsmasq/patches/0004-Don-t-forward-.bind-.server-queries-upstream.patch
rename to package/network/services/dnsmasq/patches/0004-Don-t-forward-.bind-.server-queries-upstream.patch
diff --git a/dnsmasq/patches/0005-Fix-logging-in-cf5984367bc6a949e3803a576512c5a7bc48e.patch b/package/network/services/dnsmasq/patches/0005-Fix-logging-in-cf5984367bc6a949e3803a576512c5a7bc48e.patch
similarity index 100%
rename from dnsmasq/patches/0005-Fix-logging-in-cf5984367bc6a949e3803a576512c5a7bc48e.patch
rename to package/network/services/dnsmasq/patches/0005-Fix-logging-in-cf5984367bc6a949e3803a576512c5a7bc48e.patch
diff --git a/dnsmasq/patches/0006-Fix-spurious-AD-flags-in-some-DNS-replies-from-local.patch b/package/network/services/dnsmasq/patches/0006-Fix-spurious-AD-flags-in-some-DNS-replies-from-local.patch
similarity index 100%
rename from dnsmasq/patches/0006-Fix-spurious-AD-flags-in-some-DNS-replies-from-local.patch
rename to package/network/services/dnsmasq/patches/0006-Fix-spurious-AD-flags-in-some-DNS-replies-from-local.patch
diff --git a/dnsmasq/patches/0007-Do-not-rely-on-dead-code-elimination-use-array-inste.patch b/package/network/services/dnsmasq/patches/0007-Do-not-rely-on-dead-code-elimination-use-array-inste.patch
similarity index 100%
rename from dnsmasq/patches/0007-Do-not-rely-on-dead-code-elimination-use-array-inste.patch
rename to package/network/services/dnsmasq/patches/0007-Do-not-rely-on-dead-code-elimination-use-array-inste.patch
diff --git a/dnsmasq/patches/0008-Fix-Makefile-lines-generating-UBUS-linker-config.patch b/package/network/services/dnsmasq/patches/0008-Fix-Makefile-lines-generating-UBUS-linker-config.patch
similarity index 100%
rename from dnsmasq/patches/0008-Fix-Makefile-lines-generating-UBUS-linker-config.patch
rename to package/network/services/dnsmasq/patches/0008-Fix-Makefile-lines-generating-UBUS-linker-config.patch
diff --git a/dnsmasq/patches/0009-Revert-68f6312d4bae30b78daafcd6f51dc441b8685b1e.patch b/package/network/services/dnsmasq/patches/0009-Revert-68f6312d4bae30b78daafcd6f51dc441b8685b1e.patch
similarity index 100%
rename from dnsmasq/patches/0009-Revert-68f6312d4bae30b78daafcd6f51dc441b8685b1e.patch
rename to package/network/services/dnsmasq/patches/0009-Revert-68f6312d4bae30b78daafcd6f51dc441b8685b1e.patch
diff --git a/dnsmasq/patches/0010-Remove-the-NO_FORK-compile-time-option-and-support-f.patch b/package/network/services/dnsmasq/patches/0010-Remove-the-NO_FORK-compile-time-option-and-support-f.patch
similarity index 100%
rename from dnsmasq/patches/0010-Remove-the-NO_FORK-compile-time-option-and-support-f.patch
rename to package/network/services/dnsmasq/patches/0010-Remove-the-NO_FORK-compile-time-option-and-support-f.patch
diff --git a/dnsmasq/patches/0011-Free-config-file-values-on-parsing-errors.patch b/package/network/services/dnsmasq/patches/0011-Free-config-file-values-on-parsing-errors.patch
similarity index 100%
rename from dnsmasq/patches/0011-Free-config-file-values-on-parsing-errors.patch
rename to package/network/services/dnsmasq/patches/0011-Free-config-file-values-on-parsing-errors.patch
diff --git a/dnsmasq/patches/0013-Treat-DS-and-DNSKEY-queries-being-forwarded-the-same.patch b/package/network/services/dnsmasq/patches/0013-Treat-DS-and-DNSKEY-queries-being-forwarded-the-same.patch
similarity index 100%
rename from dnsmasq/patches/0013-Treat-DS-and-DNSKEY-queries-being-forwarded-the-same.patch
rename to package/network/services/dnsmasq/patches/0013-Treat-DS-and-DNSKEY-queries-being-forwarded-the-same.patch
diff --git a/dnsmasq/patches/0014-Fix-option-parsing-errors-introduced-in-59e470381f84.patch b/package/network/services/dnsmasq/patches/0014-Fix-option-parsing-errors-introduced-in-59e470381f84.patch
similarity index 100%
rename from dnsmasq/patches/0014-Fix-option-parsing-errors-introduced-in-59e470381f84.patch
rename to package/network/services/dnsmasq/patches/0014-Fix-option-parsing-errors-introduced-in-59e470381f84.patch
diff --git a/dnsmasq/patches/0015-fix-ipv6-ipset-bug-in-master.patch b/package/network/services/dnsmasq/patches/0015-fix-ipv6-ipset-bug-in-master.patch
similarity index 100%
rename from dnsmasq/patches/0015-fix-ipv6-ipset-bug-in-master.patch
rename to package/network/services/dnsmasq/patches/0015-fix-ipv6-ipset-bug-in-master.patch
diff --git a/dnsmasq/patches/0016-build-failure-on-master-with-NO_DHCPv6-and-fix.patch b/package/network/services/dnsmasq/patches/0016-build-failure-on-master-with-NO_DHCPv6-and-fix.patch
similarity index 100%
rename from dnsmasq/patches/0016-build-failure-on-master-with-NO_DHCPv6-and-fix.patch
rename to package/network/services/dnsmasq/patches/0016-build-failure-on-master-with-NO_DHCPv6-and-fix.patch
diff --git a/dnsmasq/patches/0017-Alter-DHCP-address-selection-after-DECLINE-in-consec.patch b/package/network/services/dnsmasq/patches/0017-Alter-DHCP-address-selection-after-DECLINE-in-consec.patch
similarity index 100%
rename from dnsmasq/patches/0017-Alter-DHCP-address-selection-after-DECLINE-in-consec.patch
rename to package/network/services/dnsmasq/patches/0017-Alter-DHCP-address-selection-after-DECLINE-in-consec.patch
diff --git a/dnsmasq/patches/0018-Tidy-all_addr-union-merge-log-and-rcode-fields.patch b/package/network/services/dnsmasq/patches/0018-Tidy-all_addr-union-merge-log-and-rcode-fields.patch
similarity index 100%
rename from dnsmasq/patches/0018-Tidy-all_addr-union-merge-log-and-rcode-fields.patch
rename to package/network/services/dnsmasq/patches/0018-Tidy-all_addr-union-merge-log-and-rcode-fields.patch
diff --git a/dnsmasq/patches/0019-Tidy-address-union-handling-move-class-into-explicit.patch b/package/network/services/dnsmasq/patches/0019-Tidy-address-union-handling-move-class-into-explicit.patch
similarity index 100%
rename from dnsmasq/patches/0019-Tidy-address-union-handling-move-class-into-explicit.patch
rename to package/network/services/dnsmasq/patches/0019-Tidy-address-union-handling-move-class-into-explicit.patch
diff --git a/dnsmasq/patches/0020-Futher-address-union-tidying.patch b/package/network/services/dnsmasq/patches/0020-Futher-address-union-tidying.patch
similarity index 100%
rename from dnsmasq/patches/0020-Futher-address-union-tidying.patch
rename to package/network/services/dnsmasq/patches/0020-Futher-address-union-tidying.patch
diff --git a/dnsmasq/patches/0021-Remove-nested-struct-union-in-cache-records-and-all_.patch b/package/network/services/dnsmasq/patches/0021-Remove-nested-struct-union-in-cache-records-and-all_.patch
similarity index 100%
rename from dnsmasq/patches/0021-Remove-nested-struct-union-in-cache-records-and-all_.patch
rename to package/network/services/dnsmasq/patches/0021-Remove-nested-struct-union-in-cache-records-and-all_.patch
diff --git a/dnsmasq/patches/0022-File-logic-bug-in-cache-marshalling-code.-Introduced.patch b/package/network/services/dnsmasq/patches/0022-File-logic-bug-in-cache-marshalling-code.-Introduced.patch
similarity index 100%
rename from dnsmasq/patches/0022-File-logic-bug-in-cache-marshalling-code.-Introduced.patch
rename to package/network/services/dnsmasq/patches/0022-File-logic-bug-in-cache-marshalling-code.-Introduced.patch
diff --git a/dnsmasq/patches/0023-Fix-typo-in-ra-param-man-page-section.patch b/package/network/services/dnsmasq/patches/0023-Fix-typo-in-ra-param-man-page-section.patch
similarity index 100%
rename from dnsmasq/patches/0023-Fix-typo-in-ra-param-man-page-section.patch
rename to package/network/services/dnsmasq/patches/0023-Fix-typo-in-ra-param-man-page-section.patch
diff --git a/dnsmasq/patches/0024-Cache-SRV-records.patch b/package/network/services/dnsmasq/patches/0024-Cache-SRV-records.patch
similarity index 100%
rename from dnsmasq/patches/0024-Cache-SRV-records.patch
rename to package/network/services/dnsmasq/patches/0024-Cache-SRV-records.patch
diff --git a/dnsmasq/patches/0025-Fix-crash-freeing-negative-SRV-cache-entries.patch b/package/network/services/dnsmasq/patches/0025-Fix-crash-freeing-negative-SRV-cache-entries.patch
similarity index 100%
rename from dnsmasq/patches/0025-Fix-crash-freeing-negative-SRV-cache-entries.patch
rename to package/network/services/dnsmasq/patches/0025-Fix-crash-freeing-negative-SRV-cache-entries.patch
diff --git a/dnsmasq/patches/0026-Check-for-not-DS-or-DNSKEY-in-is_outdated_cname_poin.patch b/package/network/services/dnsmasq/patches/0026-Check-for-not-DS-or-DNSKEY-in-is_outdated_cname_poin.patch
similarity index 100%
rename from dnsmasq/patches/0026-Check-for-not-DS-or-DNSKEY-in-is_outdated_cname_poin.patch
rename to package/network/services/dnsmasq/patches/0026-Check-for-not-DS-or-DNSKEY-in-is_outdated_cname_poin.patch
diff --git a/dnsmasq/patches/0027-Fix-e7bfd556c079c8b5e7425aed44abc35925b24043-to-actu.patch b/package/network/services/dnsmasq/patches/0027-Fix-e7bfd556c079c8b5e7425aed44abc35925b24043-to-actu.patch
similarity index 100%
rename from dnsmasq/patches/0027-Fix-e7bfd556c079c8b5e7425aed44abc35925b24043-to-actu.patch
rename to package/network/services/dnsmasq/patches/0027-Fix-e7bfd556c079c8b5e7425aed44abc35925b24043-to-actu.patch
diff --git a/dnsmasq/patches/0028-Tidy-cache_blockdata_free.patch b/package/network/services/dnsmasq/patches/0028-Tidy-cache_blockdata_free.patch
similarity index 100%
rename from dnsmasq/patches/0028-Tidy-cache_blockdata_free.patch
rename to package/network/services/dnsmasq/patches/0028-Tidy-cache_blockdata_free.patch
diff --git a/dnsmasq/patches/0029-Fix-removal-of-DHCP_CLIENT_MAC-options-from-DHCPv6-r.patch b/package/network/services/dnsmasq/patches/0029-Fix-removal-of-DHCP_CLIENT_MAC-options-from-DHCPv6-r.patch
similarity index 100%
rename from dnsmasq/patches/0029-Fix-removal-of-DHCP_CLIENT_MAC-options-from-DHCPv6-r.patch
rename to package/network/services/dnsmasq/patches/0029-Fix-removal-of-DHCP_CLIENT_MAC-options-from-DHCPv6-r.patch
diff --git a/dnsmasq/patches/0030-Fix-entries-in-etc-hosts-disabling-static-leases.patch b/package/network/services/dnsmasq/patches/0030-Fix-entries-in-etc-hosts-disabling-static-leases.patch
similarity index 100%
rename from dnsmasq/patches/0030-Fix-entries-in-etc-hosts-disabling-static-leases.patch
rename to package/network/services/dnsmasq/patches/0030-Fix-entries-in-etc-hosts-disabling-static-leases.patch
diff --git a/dnsmasq/patches/0031-Fix-missing-braces-in-8eac67c0a15b673c8d27002c248651.patch b/package/network/services/dnsmasq/patches/0031-Fix-missing-braces-in-8eac67c0a15b673c8d27002c248651.patch
similarity index 100%
rename from dnsmasq/patches/0031-Fix-missing-braces-in-8eac67c0a15b673c8d27002c248651.patch
rename to package/network/services/dnsmasq/patches/0031-Fix-missing-braces-in-8eac67c0a15b673c8d27002c248651.patch
diff --git a/dnsmasq/patches/0032-Change-read_leases-to-skip-invalid-entries.patch b/package/network/services/dnsmasq/patches/0032-Change-read_leases-to-skip-invalid-entries.patch
similarity index 100%
rename from dnsmasq/patches/0032-Change-read_leases-to-skip-invalid-entries.patch
rename to package/network/services/dnsmasq/patches/0032-Change-read_leases-to-skip-invalid-entries.patch
diff --git a/dnsmasq/patches/0040-Fix-crash-when-negative-SRV-response-over-TCP-gets-s.patch b/package/network/services/dnsmasq/patches/0040-Fix-crash-when-negative-SRV-response-over-TCP-gets-s.patch
similarity index 100%
rename from dnsmasq/patches/0040-Fix-crash-when-negative-SRV-response-over-TCP-gets-s.patch
rename to package/network/services/dnsmasq/patches/0040-Fix-crash-when-negative-SRV-response-over-TCP-gets-s.patch
diff --git a/dnsmasq/patches/0102-Fix-remote-buffer-overflow-CERT-VU-434904.patch b/package/network/services/dnsmasq/patches/0102-Fix-remote-buffer-overflow-CERT-VU-434904.patch
similarity index 100%
rename from dnsmasq/patches/0102-Fix-remote-buffer-overflow-CERT-VU-434904.patch
rename to package/network/services/dnsmasq/patches/0102-Fix-remote-buffer-overflow-CERT-VU-434904.patch
diff --git a/dnsmasq/patches/0103-Check-destination-of-DNS-UDP-query-replies.patch b/package/network/services/dnsmasq/patches/0103-Check-destination-of-DNS-UDP-query-replies.patch
similarity index 100%
rename from dnsmasq/patches/0103-Check-destination-of-DNS-UDP-query-replies.patch
rename to package/network/services/dnsmasq/patches/0103-Check-destination-of-DNS-UDP-query-replies.patch
diff --git a/dnsmasq/patches/0104-Use-SHA-256-to-provide-security-against-DNS-cache-po.patch b/package/network/services/dnsmasq/patches/0104-Use-SHA-256-to-provide-security-against-DNS-cache-po.patch
similarity index 100%
rename from dnsmasq/patches/0104-Use-SHA-256-to-provide-security-against-DNS-cache-po.patch
rename to package/network/services/dnsmasq/patches/0104-Use-SHA-256-to-provide-security-against-DNS-cache-po.patch
diff --git a/dnsmasq/patches/0105-Optimse-RR-digest-calculation-in-DNSSEC.patch b/package/network/services/dnsmasq/patches/0105-Optimse-RR-digest-calculation-in-DNSSEC.patch
similarity index 100%
rename from dnsmasq/patches/0105-Optimse-RR-digest-calculation-in-DNSSEC.patch
rename to package/network/services/dnsmasq/patches/0105-Optimse-RR-digest-calculation-in-DNSSEC.patch
diff --git a/dnsmasq/patches/0107-Add-missing-check-for-NULL-return-from-allocate_rfd.patch b/package/network/services/dnsmasq/patches/0107-Add-missing-check-for-NULL-return-from-allocate_rfd.patch
similarity index 100%
rename from dnsmasq/patches/0107-Add-missing-check-for-NULL-return-from-allocate_rfd.patch
rename to package/network/services/dnsmasq/patches/0107-Add-missing-check-for-NULL-return-from-allocate_rfd.patch
diff --git a/dnsmasq/patches/0108-Handle-multiple-identical-near-simultaneous-DNS-quer.patch b/package/network/services/dnsmasq/patches/0108-Handle-multiple-identical-near-simultaneous-DNS-quer.patch
similarity index 100%
rename from dnsmasq/patches/0108-Handle-multiple-identical-near-simultaneous-DNS-quer.patch
rename to package/network/services/dnsmasq/patches/0108-Handle-multiple-identical-near-simultaneous-DNS-quer.patch
diff --git a/dnsmasq/patches/0109-Handle-caching-with-EDNS-options-better.patch b/package/network/services/dnsmasq/patches/0109-Handle-caching-with-EDNS-options-better.patch
similarity index 100%
rename from dnsmasq/patches/0109-Handle-caching-with-EDNS-options-better.patch
rename to package/network/services/dnsmasq/patches/0109-Handle-caching-with-EDNS-options-better.patch
diff --git a/dnsmasq/patches/0110-Support-hash-function-from-nettle-only.patch b/package/network/services/dnsmasq/patches/0110-Support-hash-function-from-nettle-only.patch
similarity index 100%
rename from dnsmasq/patches/0110-Support-hash-function-from-nettle-only.patch
rename to package/network/services/dnsmasq/patches/0110-Support-hash-function-from-nettle-only.patch
diff --git a/dnsmasq/patches/0111-Small-cleanups-in-frec_src-datastucture-handling.patch b/package/network/services/dnsmasq/patches/0111-Small-cleanups-in-frec_src-datastucture-handling.patch
similarity index 100%
rename from dnsmasq/patches/0111-Small-cleanups-in-frec_src-datastucture-handling.patch
rename to package/network/services/dnsmasq/patches/0111-Small-cleanups-in-frec_src-datastucture-handling.patch
diff --git a/dnsmasq/patches/0112-Add-CVE-numbers-to-security-update-descriptions-in-C.patch b/package/network/services/dnsmasq/patches/0112-Add-CVE-numbers-to-security-update-descriptions-in-C.patch
similarity index 100%
rename from dnsmasq/patches/0112-Add-CVE-numbers-to-security-update-descriptions-in-C.patch
rename to package/network/services/dnsmasq/patches/0112-Add-CVE-numbers-to-security-update-descriptions-in-C.patch
diff --git a/dnsmasq/patches/0113-Fix-warning-message-logic.patch b/package/network/services/dnsmasq/patches/0113-Fix-warning-message-logic.patch
similarity index 100%
rename from dnsmasq/patches/0113-Fix-warning-message-logic.patch
rename to package/network/services/dnsmasq/patches/0113-Fix-warning-message-logic.patch
diff --git a/dnsmasq/patches/0115-Update-to-new-struct-frec-fields-in-conntrack-code.patch b/package/network/services/dnsmasq/patches/0115-Update-to-new-struct-frec-fields-in-conntrack-code.patch
similarity index 100%
rename from dnsmasq/patches/0115-Update-to-new-struct-frec-fields-in-conntrack-code.patch
rename to package/network/services/dnsmasq/patches/0115-Update-to-new-struct-frec-fields-in-conntrack-code.patch
diff --git a/dnsmasq/patches/0120-Move-fd-into-frec_src-fixes-15b60ddf935a531269bb8c68.patch b/package/network/services/dnsmasq/patches/0120-Move-fd-into-frec_src-fixes-15b60ddf935a531269bb8c68.patch
similarity index 100%
rename from dnsmasq/patches/0120-Move-fd-into-frec_src-fixes-15b60ddf935a531269bb8c68.patch
rename to package/network/services/dnsmasq/patches/0120-Move-fd-into-frec_src-fixes-15b60ddf935a531269bb8c68.patch
diff --git a/dnsmasq/patches/0121-Fix-to-75e2f0aec33e58ef5b8d4d107d821c215a52827c.patch b/package/network/services/dnsmasq/patches/0121-Fix-to-75e2f0aec33e58ef5b8d4d107d821c215a52827c.patch
similarity index 100%
rename from dnsmasq/patches/0121-Fix-to-75e2f0aec33e58ef5b8d4d107d821c215a52827c.patch
rename to package/network/services/dnsmasq/patches/0121-Fix-to-75e2f0aec33e58ef5b8d4d107d821c215a52827c.patch
diff --git a/dnsmasq/patches/0123-Fix-for-12af2b171de0d678d98583e2190789e544440e02.patch b/package/network/services/dnsmasq/patches/0123-Fix-for-12af2b171de0d678d98583e2190789e544440e02.patch
similarity index 100%
rename from dnsmasq/patches/0123-Fix-for-12af2b171de0d678d98583e2190789e544440e02.patch
rename to package/network/services/dnsmasq/patches/0123-Fix-for-12af2b171de0d678d98583e2190789e544440e02.patch
diff --git a/dnsmasq/patches/050-crypto-use-nettle-ecc_curve-access-functions.patch b/package/network/services/dnsmasq/patches/050-crypto-use-nettle-ecc_curve-access-functions.patch
similarity index 100%
rename from dnsmasq/patches/050-crypto-use-nettle-ecc_curve-access-functions.patch
rename to package/network/services/dnsmasq/patches/050-crypto-use-nettle-ecc_curve-access-functions.patch
diff --git a/dnsmasq/patches/110-ipset-remove-old-kernel-support.patch b/package/network/services/dnsmasq/patches/110-ipset-remove-old-kernel-support.patch
similarity index 100%
rename from dnsmasq/patches/110-ipset-remove-old-kernel-support.patch
rename to package/network/services/dnsmasq/patches/110-ipset-remove-old-kernel-support.patch
diff --git a/dnsmasq/patches/230-fix-poll-h-include-warning-on-musl.patch b/package/network/services/dnsmasq/patches/230-fix-poll-h-include-warning-on-musl.patch
similarity index 100%
rename from dnsmasq/patches/230-fix-poll-h-include-warning-on-musl.patch
rename to package/network/services/dnsmasq/patches/230-fix-poll-h-include-warning-on-musl.patch
diff --git a/hostapd/Config.in b/package/network/services/hostapd/Config.in
similarity index 100%
rename from hostapd/Config.in
rename to package/network/services/hostapd/Config.in
diff --git a/hostapd/Makefile b/package/network/services/hostapd/Makefile
similarity index 100%
rename from hostapd/Makefile
rename to package/network/services/hostapd/Makefile
diff --git a/hostapd/files/hostapd-basic.config b/package/network/services/hostapd/files/hostapd-basic.config
similarity index 100%
rename from hostapd/files/hostapd-basic.config
rename to package/network/services/hostapd/files/hostapd-basic.config
diff --git a/hostapd/files/hostapd-full.config b/package/network/services/hostapd/files/hostapd-full.config
similarity index 100%
rename from hostapd/files/hostapd-full.config
rename to package/network/services/hostapd/files/hostapd-full.config
diff --git a/hostapd/files/hostapd-mini.config b/package/network/services/hostapd/files/hostapd-mini.config
similarity index 100%
rename from hostapd/files/hostapd-mini.config
rename to package/network/services/hostapd/files/hostapd-mini.config
diff --git a/hostapd/files/hostapd.sh b/package/network/services/hostapd/files/hostapd.sh
similarity index 100%
rename from hostapd/files/hostapd.sh
rename to package/network/services/hostapd/files/hostapd.sh
diff --git a/hostapd/files/multicall.c b/package/network/services/hostapd/files/multicall.c
similarity index 100%
rename from hostapd/files/multicall.c
rename to package/network/services/hostapd/files/multicall.c
diff --git a/hostapd/files/wpa_supplicant-basic.config b/package/network/services/hostapd/files/wpa_supplicant-basic.config
similarity index 100%
rename from hostapd/files/wpa_supplicant-basic.config
rename to package/network/services/hostapd/files/wpa_supplicant-basic.config
diff --git a/hostapd/files/wpa_supplicant-full.config b/package/network/services/hostapd/files/wpa_supplicant-full.config
similarity index 100%
rename from hostapd/files/wpa_supplicant-full.config
rename to package/network/services/hostapd/files/wpa_supplicant-full.config
diff --git a/hostapd/files/wpa_supplicant-mini.config b/package/network/services/hostapd/files/wpa_supplicant-mini.config
similarity index 100%
rename from hostapd/files/wpa_supplicant-mini.config
rename to package/network/services/hostapd/files/wpa_supplicant-mini.config
diff --git a/hostapd/files/wpa_supplicant-p2p.config b/package/network/services/hostapd/files/wpa_supplicant-p2p.config
similarity index 100%
rename from hostapd/files/wpa_supplicant-p2p.config
rename to package/network/services/hostapd/files/wpa_supplicant-p2p.config
diff --git a/hostapd/files/wpad.init b/package/network/services/hostapd/files/wpad.init
similarity index 100%
rename from hostapd/files/wpad.init
rename to package/network/services/hostapd/files/wpad.init
diff --git a/hostapd/files/wps-hotplug.sh b/package/network/services/hostapd/files/wps-hotplug.sh
similarity index 100%
rename from hostapd/files/wps-hotplug.sh
rename to package/network/services/hostapd/files/wps-hotplug.sh
diff --git a/hostapd/patches/001-HE-VHT-fix-frequency-setup-with-HE-enabled.patch b/package/network/services/hostapd/patches/001-HE-VHT-fix-frequency-setup-with-HE-enabled.patch
similarity index 100%
rename from hostapd/patches/001-HE-VHT-fix-frequency-setup-with-HE-enabled.patch
rename to package/network/services/hostapd/patches/001-HE-VHT-fix-frequency-setup-with-HE-enabled.patch
diff --git a/hostapd/patches/002-mesh-fix-channel-init-order-disable-pri-sec-channel-.patch b/package/network/services/hostapd/patches/002-mesh-fix-channel-init-order-disable-pri-sec-channel-.patch
similarity index 100%
rename from hostapd/patches/002-mesh-fix-channel-init-order-disable-pri-sec-channel-.patch
rename to package/network/services/hostapd/patches/002-mesh-fix-channel-init-order-disable-pri-sec-channel-.patch
diff --git a/hostapd/patches/003-wpa_supplicant-handle-HT40-and-mode-downgrade-in-AP-.patch b/package/network/services/hostapd/patches/003-wpa_supplicant-handle-HT40-and-mode-downgrade-in-AP-.patch
similarity index 100%
rename from hostapd/patches/003-wpa_supplicant-handle-HT40-and-mode-downgrade-in-AP-.patch
rename to package/network/services/hostapd/patches/003-wpa_supplicant-handle-HT40-and-mode-downgrade-in-AP-.patch
diff --git a/hostapd/patches/004-wpa_supplicant-fix-frequency-config-for-non-p2p-vht-.patch b/package/network/services/hostapd/patches/004-wpa_supplicant-fix-frequency-config-for-non-p2p-vht-.patch
similarity index 100%
rename from hostapd/patches/004-wpa_supplicant-fix-frequency-config-for-non-p2p-vht-.patch
rename to package/network/services/hostapd/patches/004-wpa_supplicant-fix-frequency-config-for-non-p2p-vht-.patch
diff --git a/hostapd/patches/005-wpa_supplicant-enable-vht-and-he-in-default-config-p.patch b/package/network/services/hostapd/patches/005-wpa_supplicant-enable-vht-and-he-in-default-config-p.patch
similarity index 100%
rename from hostapd/patches/005-wpa_supplicant-enable-vht-and-he-in-default-config-p.patch
rename to package/network/services/hostapd/patches/005-wpa_supplicant-enable-vht-and-he-in-default-config-p.patch
diff --git a/hostapd/patches/006-hw_features-better-debug-messages-for-some-error-cas.patch b/package/network/services/hostapd/patches/006-hw_features-better-debug-messages-for-some-error-cas.patch
similarity index 100%
rename from hostapd/patches/006-hw_features-better-debug-messages-for-some-error-cas.patch
rename to package/network/services/hostapd/patches/006-hw_features-better-debug-messages-for-some-error-cas.patch
diff --git a/hostapd/patches/007-dfs-use-helper-functions-for-vht-he-parameters.patch b/package/network/services/hostapd/patches/007-dfs-use-helper-functions-for-vht-he-parameters.patch
similarity index 100%
rename from hostapd/patches/007-dfs-use-helper-functions-for-vht-he-parameters.patch
rename to package/network/services/hostapd/patches/007-dfs-use-helper-functions-for-vht-he-parameters.patch
diff --git a/hostapd/patches/008-mesh-use-setup-completion-callback-to-complete-mesh-.patch b/package/network/services/hostapd/patches/008-mesh-use-setup-completion-callback-to-complete-mesh-.patch
similarity index 100%
rename from hostapd/patches/008-mesh-use-setup-completion-callback-to-complete-mesh-.patch
rename to package/network/services/hostapd/patches/008-mesh-use-setup-completion-callback-to-complete-mesh-.patch
diff --git a/hostapd/patches/009-mesh-update-ssid-frequency-as-pri-sec-channel-switch.patch b/package/network/services/hostapd/patches/009-mesh-update-ssid-frequency-as-pri-sec-channel-switch.patch
similarity index 100%
rename from hostapd/patches/009-mesh-update-ssid-frequency-as-pri-sec-channel-switch.patch
rename to package/network/services/hostapd/patches/009-mesh-update-ssid-frequency-as-pri-sec-channel-switch.patch
diff --git a/hostapd/patches/010-mesh-Allow-DFS-channels-to-be-selected-if-dfs-is-ena.patch b/package/network/services/hostapd/patches/010-mesh-Allow-DFS-channels-to-be-selected-if-dfs-is-ena.patch
similarity index 100%
rename from hostapd/patches/010-mesh-Allow-DFS-channels-to-be-selected-if-dfs-is-ena.patch
rename to package/network/services/hostapd/patches/010-mesh-Allow-DFS-channels-to-be-selected-if-dfs-is-ena.patch
diff --git a/hostapd/patches/011-mesh-do-not-set-offchanok-on-DFS-channels-in-non-ETS.patch b/package/network/services/hostapd/patches/011-mesh-do-not-set-offchanok-on-DFS-channels-in-non-ETS.patch
similarity index 100%
rename from hostapd/patches/011-mesh-do-not-set-offchanok-on-DFS-channels-in-non-ETS.patch
rename to package/network/services/hostapd/patches/011-mesh-do-not-set-offchanok-on-DFS-channels-in-non-ETS.patch
diff --git a/hostapd/patches/012-mesh-fix-channel-switch-error-during-CAC.patch b/package/network/services/hostapd/patches/012-mesh-fix-channel-switch-error-during-CAC.patch
similarity index 100%
rename from hostapd/patches/012-mesh-fix-channel-switch-error-during-CAC.patch
rename to package/network/services/hostapd/patches/012-mesh-fix-channel-switch-error-during-CAC.patch
diff --git a/hostapd/patches/013-mesh-inform-kernel-driver-DFS-handler-in-userspace.patch b/package/network/services/hostapd/patches/013-mesh-inform-kernel-driver-DFS-handler-in-userspace.patch
similarity index 100%
rename from hostapd/patches/013-mesh-inform-kernel-driver-DFS-handler-in-userspace.patch
rename to package/network/services/hostapd/patches/013-mesh-inform-kernel-driver-DFS-handler-in-userspace.patch
diff --git a/hostapd/patches/014-mesh-fixes-for-mesh-init-deinit.patch b/package/network/services/hostapd/patches/014-mesh-fixes-for-mesh-init-deinit.patch
similarity index 100%
rename from hostapd/patches/014-mesh-fixes-for-mesh-init-deinit.patch
rename to package/network/services/hostapd/patches/014-mesh-fixes-for-mesh-init-deinit.patch
diff --git a/hostapd/patches/015-mesh-fix-DFS-deinit-init.patch b/package/network/services/hostapd/patches/015-mesh-fix-DFS-deinit-init.patch
similarity index 100%
rename from hostapd/patches/015-mesh-fix-DFS-deinit-init.patch
rename to package/network/services/hostapd/patches/015-mesh-fix-DFS-deinit-init.patch
diff --git a/hostapd/patches/016-tests-DFS-test-for-wpa_supplicant-mesh.patch b/package/network/services/hostapd/patches/016-tests-DFS-test-for-wpa_supplicant-mesh.patch
similarity index 100%
rename from hostapd/patches/016-tests-DFS-test-for-wpa_supplicant-mesh.patch
rename to package/network/services/hostapd/patches/016-tests-DFS-test-for-wpa_supplicant-mesh.patch
diff --git a/hostapd/patches/017-mesh-fix-mesh_oom-test.patch b/package/network/services/hostapd/patches/017-mesh-fix-mesh_oom-test.patch
similarity index 100%
rename from hostapd/patches/017-mesh-fix-mesh_oom-test.patch
rename to package/network/services/hostapd/patches/017-mesh-fix-mesh_oom-test.patch
diff --git a/hostapd/patches/018-mesh-move-mesh-freq-setting-to-own-function.patch b/package/network/services/hostapd/patches/018-mesh-move-mesh-freq-setting-to-own-function.patch
similarity index 100%
rename from hostapd/patches/018-mesh-move-mesh-freq-setting-to-own-function.patch
rename to package/network/services/hostapd/patches/018-mesh-move-mesh-freq-setting-to-own-function.patch
diff --git a/hostapd/patches/019-mesh-use-deterministic-channel-on-channel-switch.patch b/package/network/services/hostapd/patches/019-mesh-use-deterministic-channel-on-channel-switch.patch
similarity index 100%
rename from hostapd/patches/019-mesh-use-deterministic-channel-on-channel-switch.patch
rename to package/network/services/hostapd/patches/019-mesh-use-deterministic-channel-on-channel-switch.patch
diff --git a/hostapd/patches/050-mesh-make-forwarding-configurable.patch b/package/network/services/hostapd/patches/050-mesh-make-forwarding-configurable.patch
similarity index 100%
rename from hostapd/patches/050-mesh-make-forwarding-configurable.patch
rename to package/network/services/hostapd/patches/050-mesh-make-forwarding-configurable.patch
diff --git a/hostapd/patches/100-daemonize_fix.patch b/package/network/services/hostapd/patches/100-daemonize_fix.patch
similarity index 100%
rename from hostapd/patches/100-daemonize_fix.patch
rename to package/network/services/hostapd/patches/100-daemonize_fix.patch
diff --git a/hostapd/patches/110-wolfssl-compile-fix.patch b/package/network/services/hostapd/patches/110-wolfssl-compile-fix.patch
similarity index 100%
rename from hostapd/patches/110-wolfssl-compile-fix.patch
rename to package/network/services/hostapd/patches/110-wolfssl-compile-fix.patch
diff --git a/hostapd/patches/200-multicall.patch b/package/network/services/hostapd/patches/200-multicall.patch
similarity index 100%
rename from hostapd/patches/200-multicall.patch
rename to package/network/services/hostapd/patches/200-multicall.patch
diff --git a/hostapd/patches/300-noscan.patch b/package/network/services/hostapd/patches/300-noscan.patch
similarity index 100%
rename from hostapd/patches/300-noscan.patch
rename to package/network/services/hostapd/patches/300-noscan.patch
diff --git a/hostapd/patches/301-mesh-noscan.patch b/package/network/services/hostapd/patches/301-mesh-noscan.patch
similarity index 100%
rename from hostapd/patches/301-mesh-noscan.patch
rename to package/network/services/hostapd/patches/301-mesh-noscan.patch
diff --git a/hostapd/patches/310-rescan_immediately.patch b/package/network/services/hostapd/patches/310-rescan_immediately.patch
similarity index 100%
rename from hostapd/patches/310-rescan_immediately.patch
rename to package/network/services/hostapd/patches/310-rescan_immediately.patch
diff --git a/hostapd/patches/320-optional_rfkill.patch b/package/network/services/hostapd/patches/320-optional_rfkill.patch
similarity index 100%
rename from hostapd/patches/320-optional_rfkill.patch
rename to package/network/services/hostapd/patches/320-optional_rfkill.patch
diff --git a/hostapd/patches/330-nl80211_fix_set_freq.patch b/package/network/services/hostapd/patches/330-nl80211_fix_set_freq.patch
similarity index 100%
rename from hostapd/patches/330-nl80211_fix_set_freq.patch
rename to package/network/services/hostapd/patches/330-nl80211_fix_set_freq.patch
diff --git a/hostapd/patches/340-reload_freq_change.patch b/package/network/services/hostapd/patches/340-reload_freq_change.patch
similarity index 100%
rename from hostapd/patches/340-reload_freq_change.patch
rename to package/network/services/hostapd/patches/340-reload_freq_change.patch
diff --git a/hostapd/patches/341-mesh-ctrl-iface-channel-switch.patch b/package/network/services/hostapd/patches/341-mesh-ctrl-iface-channel-switch.patch
similarity index 100%
rename from hostapd/patches/341-mesh-ctrl-iface-channel-switch.patch
rename to package/network/services/hostapd/patches/341-mesh-ctrl-iface-channel-switch.patch
diff --git a/hostapd/patches/350-nl80211_del_beacon_bss.patch b/package/network/services/hostapd/patches/350-nl80211_del_beacon_bss.patch
similarity index 100%
rename from hostapd/patches/350-nl80211_del_beacon_bss.patch
rename to package/network/services/hostapd/patches/350-nl80211_del_beacon_bss.patch
diff --git a/hostapd/patches/360-ctrl_iface_reload.patch b/package/network/services/hostapd/patches/360-ctrl_iface_reload.patch
similarity index 100%
rename from hostapd/patches/360-ctrl_iface_reload.patch
rename to package/network/services/hostapd/patches/360-ctrl_iface_reload.patch
diff --git a/hostapd/patches/370-ap_sta_support.patch b/package/network/services/hostapd/patches/370-ap_sta_support.patch
similarity index 100%
rename from hostapd/patches/370-ap_sta_support.patch
rename to package/network/services/hostapd/patches/370-ap_sta_support.patch
diff --git a/hostapd/patches/380-disable_ctrl_iface_mib.patch b/package/network/services/hostapd/patches/380-disable_ctrl_iface_mib.patch
similarity index 100%
rename from hostapd/patches/380-disable_ctrl_iface_mib.patch
rename to package/network/services/hostapd/patches/380-disable_ctrl_iface_mib.patch
diff --git a/hostapd/patches/381-hostapd_cli_UNKNOWN-COMMAND.patch b/package/network/services/hostapd/patches/381-hostapd_cli_UNKNOWN-COMMAND.patch
similarity index 100%
rename from hostapd/patches/381-hostapd_cli_UNKNOWN-COMMAND.patch
rename to package/network/services/hostapd/patches/381-hostapd_cli_UNKNOWN-COMMAND.patch
diff --git a/hostapd/patches/390-wpa_ie_cap_workaround.patch b/package/network/services/hostapd/patches/390-wpa_ie_cap_workaround.patch
similarity index 100%
rename from hostapd/patches/390-wpa_ie_cap_workaround.patch
rename to package/network/services/hostapd/patches/390-wpa_ie_cap_workaround.patch
diff --git a/hostapd/patches/400-wps_single_auth_enc_type.patch b/package/network/services/hostapd/patches/400-wps_single_auth_enc_type.patch
similarity index 100%
rename from hostapd/patches/400-wps_single_auth_enc_type.patch
rename to package/network/services/hostapd/patches/400-wps_single_auth_enc_type.patch
diff --git a/hostapd/patches/410-limit_debug_messages.patch b/package/network/services/hostapd/patches/410-limit_debug_messages.patch
similarity index 100%
rename from hostapd/patches/410-limit_debug_messages.patch
rename to package/network/services/hostapd/patches/410-limit_debug_messages.patch
diff --git a/hostapd/patches/420-indicate-features.patch b/package/network/services/hostapd/patches/420-indicate-features.patch
similarity index 100%
rename from hostapd/patches/420-indicate-features.patch
rename to package/network/services/hostapd/patches/420-indicate-features.patch
diff --git a/hostapd/patches/430-hostapd_cli_ifdef.patch b/package/network/services/hostapd/patches/430-hostapd_cli_ifdef.patch
similarity index 100%
rename from hostapd/patches/430-hostapd_cli_ifdef.patch
rename to package/network/services/hostapd/patches/430-hostapd_cli_ifdef.patch
diff --git a/hostapd/patches/431-wpa_cli_ifdef.patch b/package/network/services/hostapd/patches/431-wpa_cli_ifdef.patch
similarity index 100%
rename from hostapd/patches/431-wpa_cli_ifdef.patch
rename to package/network/services/hostapd/patches/431-wpa_cli_ifdef.patch
diff --git a/hostapd/patches/432-missing-typedef.patch b/package/network/services/hostapd/patches/432-missing-typedef.patch
similarity index 100%
rename from hostapd/patches/432-missing-typedef.patch
rename to package/network/services/hostapd/patches/432-missing-typedef.patch
diff --git a/hostapd/patches/450-scan_wait.patch b/package/network/services/hostapd/patches/450-scan_wait.patch
similarity index 100%
rename from hostapd/patches/450-scan_wait.patch
rename to package/network/services/hostapd/patches/450-scan_wait.patch
diff --git a/hostapd/patches/460-wpa_supplicant-add-new-config-params-to-be-used-with.patch b/package/network/services/hostapd/patches/460-wpa_supplicant-add-new-config-params-to-be-used-with.patch
similarity index 100%
rename from hostapd/patches/460-wpa_supplicant-add-new-config-params-to-be-used-with.patch
rename to package/network/services/hostapd/patches/460-wpa_supplicant-add-new-config-params-to-be-used-with.patch
diff --git a/hostapd/patches/461-driver_nl80211-use-new-parameters-during-ibss-join.patch b/package/network/services/hostapd/patches/461-driver_nl80211-use-new-parameters-during-ibss-join.patch
similarity index 100%
rename from hostapd/patches/461-driver_nl80211-use-new-parameters-during-ibss-join.patch
rename to package/network/services/hostapd/patches/461-driver_nl80211-use-new-parameters-during-ibss-join.patch
diff --git a/hostapd/patches/463-add-mcast_rate-to-11s.patch b/package/network/services/hostapd/patches/463-add-mcast_rate-to-11s.patch
similarity index 100%
rename from hostapd/patches/463-add-mcast_rate-to-11s.patch
rename to package/network/services/hostapd/patches/463-add-mcast_rate-to-11s.patch
diff --git a/hostapd/patches/464-fix-mesh-obss-check.patch b/package/network/services/hostapd/patches/464-fix-mesh-obss-check.patch
similarity index 100%
rename from hostapd/patches/464-fix-mesh-obss-check.patch
rename to package/network/services/hostapd/patches/464-fix-mesh-obss-check.patch
diff --git a/hostapd/patches/470-survey_data_fallback.patch b/package/network/services/hostapd/patches/470-survey_data_fallback.patch
similarity index 100%
rename from hostapd/patches/470-survey_data_fallback.patch
rename to package/network/services/hostapd/patches/470-survey_data_fallback.patch
diff --git a/hostapd/patches/500-lto-jobserver-support.patch b/package/network/services/hostapd/patches/500-lto-jobserver-support.patch
similarity index 100%
rename from hostapd/patches/500-lto-jobserver-support.patch
rename to package/network/services/hostapd/patches/500-lto-jobserver-support.patch
diff --git a/hostapd/patches/599-wpa_supplicant-fix-warnings.patch b/package/network/services/hostapd/patches/599-wpa_supplicant-fix-warnings.patch
similarity index 100%
rename from hostapd/patches/599-wpa_supplicant-fix-warnings.patch
rename to package/network/services/hostapd/patches/599-wpa_supplicant-fix-warnings.patch
diff --git a/hostapd/patches/600-ubus_support.patch b/package/network/services/hostapd/patches/600-ubus_support.patch
similarity index 100%
rename from hostapd/patches/600-ubus_support.patch
rename to package/network/services/hostapd/patches/600-ubus_support.patch
diff --git a/hostapd/patches/700-wifi-reload.patch b/package/network/services/hostapd/patches/700-wifi-reload.patch
similarity index 100%
rename from hostapd/patches/700-wifi-reload.patch
rename to package/network/services/hostapd/patches/700-wifi-reload.patch
diff --git a/hostapd/patches/800-dfs-enter-DFS-state-if-no-available-channel-is-found.patch b/package/network/services/hostapd/patches/800-dfs-enter-DFS-state-if-no-available-channel-is-found.patch
similarity index 100%
rename from hostapd/patches/800-dfs-enter-DFS-state-if-no-available-channel-is-found.patch
rename to package/network/services/hostapd/patches/800-dfs-enter-DFS-state-if-no-available-channel-is-found.patch
diff --git a/hostapd/patches/9000-msg-call-allow-more-listeners.patch b/package/network/services/hostapd/patches/9000-msg-call-allow-more-listeners.patch
similarity index 100%
rename from hostapd/patches/9000-msg-call-allow-more-listeners.patch
rename to package/network/services/hostapd/patches/9000-msg-call-allow-more-listeners.patch
diff --git a/hostapd/patches/9010-hostapd-ubus-register-pass-msg.patch b/package/network/services/hostapd/patches/9010-hostapd-ubus-register-pass-msg.patch
similarity index 100%
rename from hostapd/patches/9010-hostapd-ubus-register-pass-msg.patch
rename to package/network/services/hostapd/patches/9010-hostapd-ubus-register-pass-msg.patch
diff --git a/hostapd/patches/9020-add-multiap-sta-info.patch b/package/network/services/hostapd/patches/9020-add-multiap-sta-info.patch
similarity index 100%
rename from hostapd/patches/9020-add-multiap-sta-info.patch
rename to package/network/services/hostapd/patches/9020-add-multiap-sta-info.patch
diff --git a/hostapd/patches/9080-hostapd-Add-get-beacon-cmd.patch b/package/network/services/hostapd/patches/9080-hostapd-Add-get-beacon-cmd.patch
similarity index 100%
rename from hostapd/patches/9080-hostapd-Add-get-beacon-cmd.patch
rename to package/network/services/hostapd/patches/9080-hostapd-Add-get-beacon-cmd.patch
diff --git a/hostapd/patches/9090_wpa_supplicant_add_80211n_field_to_status.patch b/package/network/services/hostapd/patches/9090_wpa_supplicant_add_80211n_field_to_status.patch
similarity index 100%
rename from hostapd/patches/9090_wpa_supplicant_add_80211n_field_to_status.patch
rename to package/network/services/hostapd/patches/9090_wpa_supplicant_add_80211n_field_to_status.patch
diff --git a/hostapd/patches/9100-DFS-Allow-switch-to-an-available-channel.patch b/package/network/services/hostapd/patches/9100-DFS-Allow-switch-to-an-available-channel.patch
similarity index 100%
rename from hostapd/patches/9100-DFS-Allow-switch-to-an-available-channel.patch
rename to package/network/services/hostapd/patches/9100-DFS-Allow-switch-to-an-available-channel.patch
diff --git a/hostapd/src/src/ap/ubus.c b/package/network/services/hostapd/src/src/ap/ubus.c
similarity index 100%
rename from hostapd/src/src/ap/ubus.c
rename to package/network/services/hostapd/src/src/ap/ubus.c
diff --git a/hostapd/src/src/ap/ubus.h b/package/network/services/hostapd/src/src/ap/ubus.h
similarity index 100%
rename from hostapd/src/src/ap/ubus.h
rename to package/network/services/hostapd/src/src/ap/ubus.h
diff --git a/hostapd/src/src/utils/build_features.h b/package/network/services/hostapd/src/src/utils/build_features.h
similarity index 100%
rename from hostapd/src/src/utils/build_features.h
rename to package/network/services/hostapd/src/src/utils/build_features.h
diff --git a/hostapd/src/wpa_supplicant/ubus.c b/package/network/services/hostapd/src/wpa_supplicant/ubus.c
similarity index 100%
rename from hostapd/src/wpa_supplicant/ubus.c
rename to package/network/services/hostapd/src/wpa_supplicant/ubus.c
diff --git a/hostapd/src/wpa_supplicant/ubus.h b/package/network/services/hostapd/src/wpa_supplicant/ubus.h
similarity index 100%
rename from hostapd/src/wpa_supplicant/ubus.h
rename to package/network/services/hostapd/src/wpa_supplicant/ubus.h
diff --git a/rpcd/Makefile b/package/system/rpcd/Makefile
similarity index 100%
rename from rpcd/Makefile
rename to package/system/rpcd/Makefile
diff --git a/rpcd/files/rpcd.config b/package/system/rpcd/files/rpcd.config
similarity index 100%
rename from rpcd/files/rpcd.config
rename to package/system/rpcd/files/rpcd.config
diff --git a/rpcd/files/rpcd.init b/package/system/rpcd/files/rpcd.init
similarity index 100%
rename from rpcd/files/rpcd.init
rename to package/system/rpcd/files/rpcd.init
diff --git a/busybox/Config-defaults.in b/package/utils/busybox/Config-defaults.in
similarity index 100%
rename from busybox/Config-defaults.in
rename to package/utils/busybox/Config-defaults.in
diff --git a/busybox/Config.in b/package/utils/busybox/Config.in
similarity index 100%
rename from busybox/Config.in
rename to package/utils/busybox/Config.in
diff --git a/busybox/Makefile b/package/utils/busybox/Makefile
similarity index 100%
rename from busybox/Makefile
rename to package/utils/busybox/Makefile
diff --git a/busybox/config/Config.in b/package/utils/busybox/config/Config.in
similarity index 100%
rename from busybox/config/Config.in
rename to package/utils/busybox/config/Config.in
diff --git a/busybox/config/archival/Config.in b/package/utils/busybox/config/archival/Config.in
similarity index 100%
rename from busybox/config/archival/Config.in
rename to package/utils/busybox/config/archival/Config.in
diff --git a/busybox/config/console-tools/Config.in b/package/utils/busybox/config/console-tools/Config.in
similarity index 100%
rename from busybox/config/console-tools/Config.in
rename to package/utils/busybox/config/console-tools/Config.in
diff --git a/busybox/config/coreutils/Config.in b/package/utils/busybox/config/coreutils/Config.in
similarity index 100%
rename from busybox/config/coreutils/Config.in
rename to package/utils/busybox/config/coreutils/Config.in
diff --git a/busybox/config/debianutils/Config.in b/package/utils/busybox/config/debianutils/Config.in
similarity index 100%
rename from busybox/config/debianutils/Config.in
rename to package/utils/busybox/config/debianutils/Config.in
diff --git a/busybox/config/e2fsprogs/Config.in b/package/utils/busybox/config/e2fsprogs/Config.in
similarity index 100%
rename from busybox/config/e2fsprogs/Config.in
rename to package/utils/busybox/config/e2fsprogs/Config.in
diff --git a/busybox/config/e2fsprogs/old_e2fsprogs/Config.in b/package/utils/busybox/config/e2fsprogs/old_e2fsprogs/Config.in
similarity index 100%
rename from busybox/config/e2fsprogs/old_e2fsprogs/Config.in
rename to package/utils/busybox/config/e2fsprogs/old_e2fsprogs/Config.in
diff --git a/busybox/config/editors/Config.in b/package/utils/busybox/config/editors/Config.in
similarity index 100%
rename from busybox/config/editors/Config.in
rename to package/utils/busybox/config/editors/Config.in
diff --git a/busybox/config/findutils/Config.in b/package/utils/busybox/config/findutils/Config.in
similarity index 100%
rename from busybox/config/findutils/Config.in
rename to package/utils/busybox/config/findutils/Config.in
diff --git a/busybox/config/init/Config.in b/package/utils/busybox/config/init/Config.in
similarity index 100%
rename from busybox/config/init/Config.in
rename to package/utils/busybox/config/init/Config.in
diff --git a/busybox/config/klibc-utils/Config.in b/package/utils/busybox/config/klibc-utils/Config.in
similarity index 100%
rename from busybox/config/klibc-utils/Config.in
rename to package/utils/busybox/config/klibc-utils/Config.in
diff --git a/busybox/config/libbb/Config.in b/package/utils/busybox/config/libbb/Config.in
similarity index 100%
rename from busybox/config/libbb/Config.in
rename to package/utils/busybox/config/libbb/Config.in
diff --git a/busybox/config/loginutils/Config.in b/package/utils/busybox/config/loginutils/Config.in
similarity index 100%
rename from busybox/config/loginutils/Config.in
rename to package/utils/busybox/config/loginutils/Config.in
diff --git a/busybox/config/mailutils/Config.in b/package/utils/busybox/config/mailutils/Config.in
similarity index 100%
rename from busybox/config/mailutils/Config.in
rename to package/utils/busybox/config/mailutils/Config.in
diff --git a/busybox/config/miscutils/Config.in b/package/utils/busybox/config/miscutils/Config.in
similarity index 100%
rename from busybox/config/miscutils/Config.in
rename to package/utils/busybox/config/miscutils/Config.in
diff --git a/busybox/config/modutils/Config.in b/package/utils/busybox/config/modutils/Config.in
similarity index 100%
rename from busybox/config/modutils/Config.in
rename to package/utils/busybox/config/modutils/Config.in
diff --git a/busybox/config/networking/Config.in b/package/utils/busybox/config/networking/Config.in
similarity index 100%
rename from busybox/config/networking/Config.in
rename to package/utils/busybox/config/networking/Config.in
diff --git a/busybox/config/networking/udhcp/Config.in b/package/utils/busybox/config/networking/udhcp/Config.in
similarity index 100%
rename from busybox/config/networking/udhcp/Config.in
rename to package/utils/busybox/config/networking/udhcp/Config.in
diff --git a/busybox/config/printutils/Config.in b/package/utils/busybox/config/printutils/Config.in
similarity index 100%
rename from busybox/config/printutils/Config.in
rename to package/utils/busybox/config/printutils/Config.in
diff --git a/busybox/config/procps/Config.in b/package/utils/busybox/config/procps/Config.in
similarity index 100%
rename from busybox/config/procps/Config.in
rename to package/utils/busybox/config/procps/Config.in
diff --git a/busybox/config/runit/Config.in b/package/utils/busybox/config/runit/Config.in
similarity index 100%
rename from busybox/config/runit/Config.in
rename to package/utils/busybox/config/runit/Config.in
diff --git a/busybox/config/selinux/Config.in b/package/utils/busybox/config/selinux/Config.in
similarity index 100%
rename from busybox/config/selinux/Config.in
rename to package/utils/busybox/config/selinux/Config.in
diff --git a/busybox/config/shell/Config.in b/package/utils/busybox/config/shell/Config.in
similarity index 100%
rename from busybox/config/shell/Config.in
rename to package/utils/busybox/config/shell/Config.in
diff --git a/busybox/config/sysklogd/Config.in b/package/utils/busybox/config/sysklogd/Config.in
similarity index 100%
rename from busybox/config/sysklogd/Config.in
rename to package/utils/busybox/config/sysklogd/Config.in
diff --git a/busybox/config/util-linux/Config.in b/package/utils/busybox/config/util-linux/Config.in
similarity index 100%
rename from busybox/config/util-linux/Config.in
rename to package/utils/busybox/config/util-linux/Config.in
diff --git a/busybox/config/util-linux/volume_id/Config.in b/package/utils/busybox/config/util-linux/volume_id/Config.in
similarity index 100%
rename from busybox/config/util-linux/volume_id/Config.in
rename to package/utils/busybox/config/util-linux/volume_id/Config.in
diff --git a/busybox/convert_defaults.pl b/package/utils/busybox/convert_defaults.pl
similarity index 100%
rename from busybox/convert_defaults.pl
rename to package/utils/busybox/convert_defaults.pl
diff --git a/busybox/convert_menuconfig.pl b/package/utils/busybox/convert_menuconfig.pl
similarity index 100%
rename from busybox/convert_menuconfig.pl
rename to package/utils/busybox/convert_menuconfig.pl
diff --git a/busybox/files/cron b/package/utils/busybox/files/cron
similarity index 100%
rename from busybox/files/cron
rename to package/utils/busybox/files/cron
diff --git a/busybox/files/ntpd-hotplug b/package/utils/busybox/files/ntpd-hotplug
similarity index 100%
rename from busybox/files/ntpd-hotplug
rename to package/utils/busybox/files/ntpd-hotplug
diff --git a/busybox/files/sysntpd b/package/utils/busybox/files/sysntpd
similarity index 100%
rename from busybox/files/sysntpd
rename to package/utils/busybox/files/sysntpd
diff --git a/busybox/patches/100-trylink_bash.patch b/package/utils/busybox/patches/100-trylink_bash.patch
similarity index 100%
rename from busybox/patches/100-trylink_bash.patch
rename to package/utils/busybox/patches/100-trylink_bash.patch
diff --git a/busybox/patches/101-gen_build_files_bash.patch b/package/utils/busybox/patches/101-gen_build_files_bash.patch
similarity index 100%
rename from busybox/patches/101-gen_build_files_bash.patch
rename to package/utils/busybox/patches/101-gen_build_files_bash.patch
diff --git a/busybox/patches/110-no_static_libgcc.patch b/package/utils/busybox/patches/110-no_static_libgcc.patch
similarity index 100%
rename from busybox/patches/110-no_static_libgcc.patch
rename to package/utils/busybox/patches/110-no_static_libgcc.patch
diff --git a/busybox/patches/120-lto-jobserver.patch b/package/utils/busybox/patches/120-lto-jobserver.patch
similarity index 100%
rename from busybox/patches/120-lto-jobserver.patch
rename to package/utils/busybox/patches/120-lto-jobserver.patch
diff --git a/busybox/patches/200-udhcpc_reduce_msgs.patch b/package/utils/busybox/patches/200-udhcpc_reduce_msgs.patch
similarity index 100%
rename from busybox/patches/200-udhcpc_reduce_msgs.patch
rename to package/utils/busybox/patches/200-udhcpc_reduce_msgs.patch
diff --git a/busybox/patches/201-udhcpc_changed_ifindex.patch b/package/utils/busybox/patches/201-udhcpc_changed_ifindex.patch
similarity index 100%
rename from busybox/patches/201-udhcpc_changed_ifindex.patch
rename to package/utils/busybox/patches/201-udhcpc_changed_ifindex.patch
diff --git a/busybox/patches/203-udhcpc_renew_no_deconfig.patch b/package/utils/busybox/patches/203-udhcpc_renew_no_deconfig.patch
similarity index 100%
rename from busybox/patches/203-udhcpc_renew_no_deconfig.patch
rename to package/utils/busybox/patches/203-udhcpc_renew_no_deconfig.patch
diff --git a/busybox/patches/210-add_netmsg_util.patch b/package/utils/busybox/patches/210-add_netmsg_util.patch
similarity index 100%
rename from busybox/patches/210-add_netmsg_util.patch
rename to package/utils/busybox/patches/210-add_netmsg_util.patch
diff --git a/busybox/patches/220-add_lock_util.patch b/package/utils/busybox/patches/220-add_lock_util.patch
similarity index 100%
rename from busybox/patches/220-add_lock_util.patch
rename to package/utils/busybox/patches/220-add_lock_util.patch
diff --git a/busybox/patches/230-add_nslookup_lede.patch b/package/utils/busybox/patches/230-add_nslookup_lede.patch
similarity index 100%
rename from busybox/patches/230-add_nslookup_lede.patch
rename to package/utils/busybox/patches/230-add_nslookup_lede.patch
diff --git a/busybox/patches/240-telnetd_intr.patch b/package/utils/busybox/patches/240-telnetd_intr.patch
similarity index 100%
rename from busybox/patches/240-telnetd_intr.patch
rename to package/utils/busybox/patches/240-telnetd_intr.patch
diff --git a/busybox/patches/250-date-k-flag.patch b/package/utils/busybox/patches/250-date-k-flag.patch
similarity index 100%
rename from busybox/patches/250-date-k-flag.patch
rename to package/utils/busybox/patches/250-date-k-flag.patch
diff --git a/busybox/patches/270-libbb_make_unicode_printable.patch b/package/utils/busybox/patches/270-libbb_make_unicode_printable.patch
similarity index 100%
rename from busybox/patches/270-libbb_make_unicode_printable.patch
rename to package/utils/busybox/patches/270-libbb_make_unicode_printable.patch
diff --git a/busybox/patches/301-ip-link-fix-netlink-msg-size.patch b/package/utils/busybox/patches/301-ip-link-fix-netlink-msg-size.patch
similarity index 100%
rename from busybox/patches/301-ip-link-fix-netlink-msg-size.patch
rename to package/utils/busybox/patches/301-ip-link-fix-netlink-msg-size.patch
diff --git a/busybox/patches/500-move-traceroute-applets-to-bin.patch b/package/utils/busybox/patches/500-move-traceroute-applets-to-bin.patch
similarity index 100%
rename from busybox/patches/500-move-traceroute-applets-to-bin.patch
rename to package/utils/busybox/patches/500-move-traceroute-applets-to-bin.patch
diff --git a/busybox/patches/510-move-passwd-applet-to-bin.patch b/package/utils/busybox/patches/510-move-passwd-applet-to-bin.patch
similarity index 100%
rename from busybox/patches/510-move-passwd-applet-to-bin.patch
rename to package/utils/busybox/patches/510-move-passwd-applet-to-bin.patch
diff --git a/busybox/patches/520-loginutils-handle-crypt-failures.patch b/package/utils/busybox/patches/520-loginutils-handle-crypt-failures.patch
similarity index 100%
rename from busybox/patches/520-loginutils-handle-crypt-failures.patch
rename to package/utils/busybox/patches/520-loginutils-handle-crypt-failures.patch
diff --git a/busybox/patches/530-ip-use-rtnl_send_check-on-flush-commands.patch b/package/utils/busybox/patches/530-ip-use-rtnl_send_check-on-flush-commands.patch
similarity index 100%
rename from busybox/patches/530-ip-use-rtnl_send_check-on-flush-commands.patch
rename to package/utils/busybox/patches/530-ip-use-rtnl_send_check-on-flush-commands.patch
diff --git a/busybox/patches/900-sed-fsync-before-closing-the-file.patch b/package/utils/busybox/patches/900-sed-fsync-before-closing-the-file.patch
similarity index 100%
rename from busybox/patches/900-sed-fsync-before-closing-the-file.patch
rename to package/utils/busybox/patches/900-sed-fsync-before-closing-the-file.patch
diff --git a/busybox/patches/905-udhcpc_option_43_vendorspecificinf.patch b/package/utils/busybox/patches/905-udhcpc_option_43_vendorspecificinf.patch
similarity index 100%
rename from busybox/patches/905-udhcpc_option_43_vendorspecificinf.patch
rename to package/utils/busybox/patches/905-udhcpc_option_43_vendorspecificinf.patch
diff --git a/busybox/patches/906-udhcpc_enable_option_4_timeserver.patch b/package/utils/busybox/patches/906-udhcpc_enable_option_4_timeserver.patch
similarity index 100%
rename from busybox/patches/906-udhcpc_enable_option_4_timeserver.patch
rename to package/utils/busybox/patches/906-udhcpc_enable_option_4_timeserver.patch