diff --git a/package/apex/Makefile b/package/boot/apex/Makefile
similarity index 100%
rename from package/apex/Makefile
rename to package/boot/apex/Makefile
diff --git a/package/apex/patches/001-compile_fix.patch b/package/boot/apex/patches/001-compile_fix.patch
similarity index 100%
rename from package/apex/patches/001-compile_fix.patch
rename to package/boot/apex/patches/001-compile_fix.patch
diff --git a/package/apex/patches/100-openwrt_nslu2_armeb_config.patch b/package/boot/apex/patches/100-openwrt_nslu2_armeb_config.patch
similarity index 100%
rename from package/apex/patches/100-openwrt_nslu2_armeb_config.patch
rename to package/boot/apex/patches/100-openwrt_nslu2_armeb_config.patch
diff --git a/package/apex/patches/120-openwrt_nslu2_16mb_armeb_config.patch b/package/boot/apex/patches/120-openwrt_nslu2_16mb_armeb_config.patch
similarity index 100%
rename from package/apex/patches/120-openwrt_nslu2_16mb_armeb_config.patch
rename to package/boot/apex/patches/120-openwrt_nslu2_16mb_armeb_config.patch
diff --git a/package/apex/patches/140-openwrt_fsg3_armeb_config.patch b/package/boot/apex/patches/140-openwrt_fsg3_armeb_config.patch
similarity index 100%
rename from package/apex/patches/140-openwrt_fsg3_armeb_config.patch
rename to package/boot/apex/patches/140-openwrt_fsg3_armeb_config.patch
diff --git a/package/apex/patches/150-limit_ram_to_64mb.patch b/package/boot/apex/patches/150-limit_ram_to_64mb.patch
similarity index 100%
rename from package/apex/patches/150-limit_ram_to_64mb.patch
rename to package/boot/apex/patches/150-limit_ram_to_64mb.patch
diff --git a/package/apex/patches/160-openwrt_nas100d_armeb_config.patch b/package/boot/apex/patches/160-openwrt_nas100d_armeb_config.patch
similarity index 100%
rename from package/apex/patches/160-openwrt_nas100d_armeb_config.patch
rename to package/boot/apex/patches/160-openwrt_nas100d_armeb_config.patch
diff --git a/package/busybox/Config.in b/package/busybox/Config.in
deleted file mode 100644
index 5fd7e9ec09..0000000000
--- a/package/busybox/Config.in
+++ /dev/null
@@ -1,6 +0,0 @@
-
-if PACKAGE_busybox
-
-source "package/busybox/config/Config.in"
-
-endif
diff --git a/package/acx-mac80211/Makefile b/package/kernel/acx-mac80211/Makefile
similarity index 100%
rename from package/acx-mac80211/Makefile
rename to package/kernel/acx-mac80211/Makefile
diff --git a/package/acx-mac80211/patches/001-make-compatible-with-recent-mac80211.patch b/package/kernel/acx-mac80211/patches/001-make-compatible-with-recent-mac80211.patch
similarity index 100%
rename from package/acx-mac80211/patches/001-make-compatible-with-recent-mac80211.patch
rename to package/kernel/acx-mac80211/patches/001-make-compatible-with-recent-mac80211.patch
diff --git a/package/acx-mac80211/patches/002-remove-usage-of__dev.patch b/package/kernel/acx-mac80211/patches/002-remove-usage-of__dev.patch
similarity index 100%
rename from package/acx-mac80211/patches/002-remove-usage-of__dev.patch
rename to package/kernel/acx-mac80211/patches/002-remove-usage-of__dev.patch
diff --git a/package/acx-mac80211/patches/003-add-changes-for-3-10.patch b/package/kernel/acx-mac80211/patches/003-add-changes-for-3-10.patch
similarity index 100%
rename from package/acx-mac80211/patches/003-add-changes-for-3-10.patch
rename to package/kernel/acx-mac80211/patches/003-add-changes-for-3-10.patch
diff --git a/package/acx-mac80211/patches/100-hw-queue-check-fix.patch b/package/kernel/acx-mac80211/patches/100-hw-queue-check-fix.patch
similarity index 100%
rename from package/acx-mac80211/patches/100-hw-queue-check-fix.patch
rename to package/kernel/acx-mac80211/patches/100-hw-queue-check-fix.patch
diff --git a/package/acx-mac80211/patches/200-initial-macaddr.patch b/package/kernel/acx-mac80211/patches/200-initial-macaddr.patch
similarity index 100%
rename from package/acx-mac80211/patches/200-initial-macaddr.patch
rename to package/kernel/acx-mac80211/patches/200-initial-macaddr.patch
diff --git a/package/system/ar7-atm/Config.in b/package/kernel/ar7-atm/Config.in
similarity index 100%
rename from package/system/ar7-atm/Config.in
rename to package/kernel/ar7-atm/Config.in
diff --git a/package/system/ar7-atm/Makefile b/package/kernel/ar7-atm/Makefile
similarity index 100%
rename from package/system/ar7-atm/Makefile
rename to package/kernel/ar7-atm/Makefile
diff --git a/package/system/ar7-atm/patches-D7.04.03.00/100-compile_fix.patch b/package/kernel/ar7-atm/patches-D7.04.03.00/100-compile_fix.patch
similarity index 100%
rename from package/system/ar7-atm/patches-D7.04.03.00/100-compile_fix.patch
rename to package/kernel/ar7-atm/patches-D7.04.03.00/100-compile_fix.patch
diff --git a/package/system/ar7-atm/patches-D7.04.03.00/110-interrupt_fix.patch b/package/kernel/ar7-atm/patches-D7.04.03.00/110-interrupt_fix.patch
similarity index 100%
rename from package/system/ar7-atm/patches-D7.04.03.00/110-interrupt_fix.patch
rename to package/kernel/ar7-atm/patches-D7.04.03.00/110-interrupt_fix.patch
diff --git a/package/system/ar7-atm/patches-D7.04.03.00/120-no_dumb_inline.patch b/package/kernel/ar7-atm/patches-D7.04.03.00/120-no_dumb_inline.patch
similarity index 100%
rename from package/system/ar7-atm/patches-D7.04.03.00/120-no_dumb_inline.patch
rename to package/kernel/ar7-atm/patches-D7.04.03.00/120-no_dumb_inline.patch
diff --git a/package/system/ar7-atm/patches-D7.04.03.00/130-powercutback.patch b/package/kernel/ar7-atm/patches-D7.04.03.00/130-powercutback.patch
similarity index 100%
rename from package/system/ar7-atm/patches-D7.04.03.00/130-powercutback.patch
rename to package/kernel/ar7-atm/patches-D7.04.03.00/130-powercutback.patch
diff --git a/package/system/ar7-atm/patches-D7.04.03.00/140-debug_mode.patch b/package/kernel/ar7-atm/patches-D7.04.03.00/140-debug_mode.patch
similarity index 100%
rename from package/system/ar7-atm/patches-D7.04.03.00/140-debug_mode.patch
rename to package/kernel/ar7-atm/patches-D7.04.03.00/140-debug_mode.patch
diff --git a/package/system/ar7-atm/patches-D7.04.03.00/150-tasklet_mode.patch b/package/kernel/ar7-atm/patches-D7.04.03.00/150-tasklet_mode.patch
similarity index 100%
rename from package/system/ar7-atm/patches-D7.04.03.00/150-tasklet_mode.patch
rename to package/kernel/ar7-atm/patches-D7.04.03.00/150-tasklet_mode.patch
diff --git a/package/system/ar7-atm/patches-D7.04.03.00/160-module-params.patch b/package/kernel/ar7-atm/patches-D7.04.03.00/160-module-params.patch
similarity index 100%
rename from package/system/ar7-atm/patches-D7.04.03.00/160-module-params.patch
rename to package/kernel/ar7-atm/patches-D7.04.03.00/160-module-params.patch
diff --git a/package/system/ar7-atm/patches-D7.04.03.00/170-bus_id_removal.patch b/package/kernel/ar7-atm/patches-D7.04.03.00/170-bus_id_removal.patch
similarity index 100%
rename from package/system/ar7-atm/patches-D7.04.03.00/170-bus_id_removal.patch
rename to package/kernel/ar7-atm/patches-D7.04.03.00/170-bus_id_removal.patch
diff --git a/package/system/ar7-atm/patches-D7.04.03.00/180-git_headers_include.patch b/package/kernel/ar7-atm/patches-D7.04.03.00/180-git_headers_include.patch
similarity index 100%
rename from package/system/ar7-atm/patches-D7.04.03.00/180-git_headers_include.patch
rename to package/kernel/ar7-atm/patches-D7.04.03.00/180-git_headers_include.patch
diff --git a/package/system/ar7-atm/patches-D7.04.03.00/190-2.6.32_proc_fixes.patch b/package/kernel/ar7-atm/patches-D7.04.03.00/190-2.6.32_proc_fixes.patch
similarity index 100%
rename from package/system/ar7-atm/patches-D7.04.03.00/190-2.6.32_proc_fixes.patch
rename to package/kernel/ar7-atm/patches-D7.04.03.00/190-2.6.32_proc_fixes.patch
diff --git a/package/system/ar7-atm/patches-D7.04.03.00/200-2.6.37_args.patch b/package/kernel/ar7-atm/patches-D7.04.03.00/200-2.6.37_args.patch
similarity index 100%
rename from package/system/ar7-atm/patches-D7.04.03.00/200-2.6.37_args.patch
rename to package/kernel/ar7-atm/patches-D7.04.03.00/200-2.6.37_args.patch
diff --git a/package/system/ar7-atm/patches-D7.04.03.00/210-3.3-remove-smp_lock.h.patch b/package/kernel/ar7-atm/patches-D7.04.03.00/210-3.3-remove-smp_lock.h.patch
similarity index 100%
rename from package/system/ar7-atm/patches-D7.04.03.00/210-3.3-remove-smp_lock.h.patch
rename to package/kernel/ar7-atm/patches-D7.04.03.00/210-3.3-remove-smp_lock.h.patch
diff --git a/package/system/ar7-atm/patches-D7.05.01.00/100-compile_fix.patch b/package/kernel/ar7-atm/patches-D7.05.01.00/100-compile_fix.patch
similarity index 100%
rename from package/system/ar7-atm/patches-D7.05.01.00/100-compile_fix.patch
rename to package/kernel/ar7-atm/patches-D7.05.01.00/100-compile_fix.patch
diff --git a/package/system/ar7-atm/patches-D7.05.01.00/110-interrupt_fix.patch b/package/kernel/ar7-atm/patches-D7.05.01.00/110-interrupt_fix.patch
similarity index 100%
rename from package/system/ar7-atm/patches-D7.05.01.00/110-interrupt_fix.patch
rename to package/kernel/ar7-atm/patches-D7.05.01.00/110-interrupt_fix.patch
diff --git a/package/system/ar7-atm/patches-D7.05.01.00/120-no_dumb_inline.patch b/package/kernel/ar7-atm/patches-D7.05.01.00/120-no_dumb_inline.patch
similarity index 100%
rename from package/system/ar7-atm/patches-D7.05.01.00/120-no_dumb_inline.patch
rename to package/kernel/ar7-atm/patches-D7.05.01.00/120-no_dumb_inline.patch
diff --git a/package/system/ar7-atm/patches-D7.05.01.00/130-powercutback.patch b/package/kernel/ar7-atm/patches-D7.05.01.00/130-powercutback.patch
similarity index 100%
rename from package/system/ar7-atm/patches-D7.05.01.00/130-powercutback.patch
rename to package/kernel/ar7-atm/patches-D7.05.01.00/130-powercutback.patch
diff --git a/package/system/ar7-atm/patches-D7.05.01.00/140-debug_mode.patch b/package/kernel/ar7-atm/patches-D7.05.01.00/140-debug_mode.patch
similarity index 100%
rename from package/system/ar7-atm/patches-D7.05.01.00/140-debug_mode.patch
rename to package/kernel/ar7-atm/patches-D7.05.01.00/140-debug_mode.patch
diff --git a/package/system/ar7-atm/patches-D7.05.01.00/150-tasklet_mode.patch b/package/kernel/ar7-atm/patches-D7.05.01.00/150-tasklet_mode.patch
similarity index 100%
rename from package/system/ar7-atm/patches-D7.05.01.00/150-tasklet_mode.patch
rename to package/kernel/ar7-atm/patches-D7.05.01.00/150-tasklet_mode.patch
diff --git a/package/system/ar7-atm/patches-D7.05.01.00/160-module-params.patch b/package/kernel/ar7-atm/patches-D7.05.01.00/160-module-params.patch
similarity index 100%
rename from package/system/ar7-atm/patches-D7.05.01.00/160-module-params.patch
rename to package/kernel/ar7-atm/patches-D7.05.01.00/160-module-params.patch
diff --git a/package/system/ar7-atm/patches-D7.05.01.00/170-bus_id_removal.patch b/package/kernel/ar7-atm/patches-D7.05.01.00/170-bus_id_removal.patch
similarity index 100%
rename from package/system/ar7-atm/patches-D7.05.01.00/170-bus_id_removal.patch
rename to package/kernel/ar7-atm/patches-D7.05.01.00/170-bus_id_removal.patch
diff --git a/package/system/ar7-atm/patches-D7.05.01.00/180-git_headers_include.patch b/package/kernel/ar7-atm/patches-D7.05.01.00/180-git_headers_include.patch
similarity index 100%
rename from package/system/ar7-atm/patches-D7.05.01.00/180-git_headers_include.patch
rename to package/kernel/ar7-atm/patches-D7.05.01.00/180-git_headers_include.patch
diff --git a/package/system/ar7-atm/patches-D7.05.01.00/190-2.6.32_proc_fixes.patch b/package/kernel/ar7-atm/patches-D7.05.01.00/190-2.6.32_proc_fixes.patch
similarity index 100%
rename from package/system/ar7-atm/patches-D7.05.01.00/190-2.6.32_proc_fixes.patch
rename to package/kernel/ar7-atm/patches-D7.05.01.00/190-2.6.32_proc_fixes.patch
diff --git a/package/system/ar7-atm/patches-D7.05.01.00/200-2.6.37_args.patch b/package/kernel/ar7-atm/patches-D7.05.01.00/200-2.6.37_args.patch
similarity index 100%
rename from package/system/ar7-atm/patches-D7.05.01.00/200-2.6.37_args.patch
rename to package/kernel/ar7-atm/patches-D7.05.01.00/200-2.6.37_args.patch
diff --git a/package/system/ar7-atm/patches-D7.05.01.00/210-3.3-remove-smp_lock.h.patch b/package/kernel/ar7-atm/patches-D7.05.01.00/210-3.3-remove-smp_lock.h.patch
similarity index 100%
rename from package/system/ar7-atm/patches-D7.05.01.00/210-3.3-remove-smp_lock.h.patch
rename to package/kernel/ar7-atm/patches-D7.05.01.00/210-3.3-remove-smp_lock.h.patch
diff --git a/package/system/avila-wdt/Makefile b/package/kernel/avila-wdt/Makefile
similarity index 100%
rename from package/system/avila-wdt/Makefile
rename to package/kernel/avila-wdt/Makefile
diff --git a/package/system/avila-wdt/src/Makefile b/package/kernel/avila-wdt/src/Makefile
similarity index 100%
rename from package/system/avila-wdt/src/Makefile
rename to package/kernel/avila-wdt/src/Makefile
diff --git a/package/system/avila-wdt/src/avila-wdt.c b/package/kernel/avila-wdt/src/avila-wdt.c
similarity index 100%
rename from package/system/avila-wdt/src/avila-wdt.c
rename to package/kernel/avila-wdt/src/avila-wdt.c
diff --git a/package/system/brcm2708-gpu-fw/Makefile b/package/kernel/brcm2708-gpu-fw/Makefile
similarity index 100%
rename from package/system/brcm2708-gpu-fw/Makefile
rename to package/kernel/brcm2708-gpu-fw/Makefile
diff --git a/package/broadcom-diag/Makefile b/package/kernel/broadcom-diag/Makefile
similarity index 100%
rename from package/broadcom-diag/Makefile
rename to package/kernel/broadcom-diag/Makefile
diff --git a/package/broadcom-diag/src/Makefile b/package/kernel/broadcom-diag/src/Makefile
similarity index 100%
rename from package/broadcom-diag/src/Makefile
rename to package/kernel/broadcom-diag/src/Makefile
diff --git a/package/broadcom-diag/src/diag.c b/package/kernel/broadcom-diag/src/diag.c
similarity index 100%
rename from package/broadcom-diag/src/diag.c
rename to package/kernel/broadcom-diag/src/diag.c
diff --git a/package/broadcom-diag/src/diag.h b/package/kernel/broadcom-diag/src/diag.h
similarity index 100%
rename from package/broadcom-diag/src/diag.h
rename to package/kernel/broadcom-diag/src/diag.h
diff --git a/package/broadcom-diag/src/gpio.h b/package/kernel/broadcom-diag/src/gpio.h
similarity index 100%
rename from package/broadcom-diag/src/gpio.h
rename to package/kernel/broadcom-diag/src/gpio.h
diff --git a/package/broadcom-wl/Makefile b/package/kernel/broadcom-wl/Makefile
similarity index 100%
rename from package/broadcom-wl/Makefile
rename to package/kernel/broadcom-wl/Makefile
diff --git a/package/broadcom-wl/files/etc/hotplug.d/net/20-broadcom_wds b/package/kernel/broadcom-wl/files/etc/hotplug.d/net/20-broadcom_wds
similarity index 100%
rename from package/broadcom-wl/files/etc/hotplug.d/net/20-broadcom_wds
rename to package/kernel/broadcom-wl/files/etc/hotplug.d/net/20-broadcom_wds
diff --git a/package/broadcom-wl/files/etc/init.d/wlunbind b/package/kernel/broadcom-wl/files/etc/init.d/wlunbind
similarity index 100%
rename from package/broadcom-wl/files/etc/init.d/wlunbind
rename to package/kernel/broadcom-wl/files/etc/init.d/wlunbind
diff --git a/package/broadcom-wl/files/lib/wifi/broadcom.sh b/package/kernel/broadcom-wl/files/lib/wifi/broadcom.sh
similarity index 100%
rename from package/broadcom-wl/files/lib/wifi/broadcom.sh
rename to package/kernel/broadcom-wl/files/lib/wifi/broadcom.sh
diff --git a/package/broadcom-wl/patches/003-compat-2.6.35.patch b/package/kernel/broadcom-wl/patches/003-compat-2.6.35.patch
similarity index 100%
rename from package/broadcom-wl/patches/003-compat-2.6.35.patch
rename to package/kernel/broadcom-wl/patches/003-compat-2.6.35.patch
diff --git a/package/broadcom-wl/patches/004-remove-pcmcia.patch b/package/kernel/broadcom-wl/patches/004-remove-pcmcia.patch
similarity index 100%
rename from package/broadcom-wl/patches/004-remove-pcmcia.patch
rename to package/kernel/broadcom-wl/patches/004-remove-pcmcia.patch
diff --git a/package/broadcom-wl/patches/005-fix-mem-leak-on-unload.patch b/package/kernel/broadcom-wl/patches/005-fix-mem-leak-on-unload.patch
similarity index 100%
rename from package/broadcom-wl/patches/005-fix-mem-leak-on-unload.patch
rename to package/kernel/broadcom-wl/patches/005-fix-mem-leak-on-unload.patch
diff --git a/package/broadcom-wl/patches/006-generic-dma-api.patch b/package/kernel/broadcom-wl/patches/006-generic-dma-api.patch
similarity index 100%
rename from package/broadcom-wl/patches/006-generic-dma-api.patch
rename to package/kernel/broadcom-wl/patches/006-generic-dma-api.patch
diff --git a/package/broadcom-wl/patches/007-use-glue-driver.patch b/package/kernel/broadcom-wl/patches/007-use-glue-driver.patch
similarity index 100%
rename from package/broadcom-wl/patches/007-use-glue-driver.patch
rename to package/kernel/broadcom-wl/patches/007-use-glue-driver.patch
diff --git a/package/broadcom-wl/patches/008-fix_virtual_interfaces.patch b/package/kernel/broadcom-wl/patches/008-fix_virtual_interfaces.patch
similarity index 100%
rename from package/broadcom-wl/patches/008-fix_virtual_interfaces.patch
rename to package/kernel/broadcom-wl/patches/008-fix_virtual_interfaces.patch
diff --git a/package/broadcom-wl/patches/009-fix_compile_3_2.patch b/package/kernel/broadcom-wl/patches/009-fix_compile_3_2.patch
similarity index 100%
rename from package/broadcom-wl/patches/009-fix_compile_3_2.patch
rename to package/kernel/broadcom-wl/patches/009-fix_compile_3_2.patch
diff --git a/package/broadcom-wl/patches/010-remove_irqf_samble_random.patch b/package/kernel/broadcom-wl/patches/010-remove_irqf_samble_random.patch
similarity index 100%
rename from package/broadcom-wl/patches/010-remove_irqf_samble_random.patch
rename to package/kernel/broadcom-wl/patches/010-remove_irqf_samble_random.patch
diff --git a/package/broadcom-wl/patches/011-fix_compile_3_4.patch b/package/kernel/broadcom-wl/patches/011-fix_compile_3_4.patch
similarity index 100%
rename from package/broadcom-wl/patches/011-fix_compile_3_4.patch
rename to package/kernel/broadcom-wl/patches/011-fix_compile_3_4.patch
diff --git a/package/broadcom-wl/patches/100-fix_nvram_two_devices.patch b/package/kernel/broadcom-wl/patches/100-fix_nvram_two_devices.patch
similarity index 100%
rename from package/broadcom-wl/patches/100-fix_nvram_two_devices.patch
rename to package/kernel/broadcom-wl/patches/100-fix_nvram_two_devices.patch
diff --git a/package/broadcom-wl/patches/110-add_number_to_dev_name.patch b/package/kernel/broadcom-wl/patches/110-add_number_to_dev_name.patch
similarity index 100%
rename from package/broadcom-wl/patches/110-add_number_to_dev_name.patch
rename to package/kernel/broadcom-wl/patches/110-add_number_to_dev_name.patch
diff --git a/package/broadcom-wl/patches/910-fallback-sprom.patch b/package/kernel/broadcom-wl/patches/910-fallback-sprom.patch
similarity index 100%
rename from package/broadcom-wl/patches/910-fallback-sprom.patch
rename to package/kernel/broadcom-wl/patches/910-fallback-sprom.patch
diff --git a/package/broadcom-wl/patches/912-pci-bus-nvram-hack.patch b/package/kernel/broadcom-wl/patches/912-pci-bus-nvram-hack.patch
similarity index 100%
rename from package/broadcom-wl/patches/912-pci-bus-nvram-hack.patch
rename to package/kernel/broadcom-wl/patches/912-pci-bus-nvram-hack.patch
diff --git a/package/broadcom-wl/patches/913-avoid-dbe-on-ifs_ctl-readw-hack.patch b/package/kernel/broadcom-wl/patches/913-avoid-dbe-on-ifs_ctl-readw-hack.patch
similarity index 100%
rename from package/broadcom-wl/patches/913-avoid-dbe-on-ifs_ctl-readw-hack.patch
rename to package/kernel/broadcom-wl/patches/913-avoid-dbe-on-ifs_ctl-readw-hack.patch
diff --git a/package/broadcom-wl/src/glue/Makefile b/package/kernel/broadcom-wl/src/glue/Makefile
similarity index 100%
rename from package/broadcom-wl/src/glue/Makefile
rename to package/kernel/broadcom-wl/src/glue/Makefile
diff --git a/package/broadcom-wl/src/glue/wl_glue.c b/package/kernel/broadcom-wl/src/glue/wl_glue.c
similarity index 100%
rename from package/broadcom-wl/src/glue/wl_glue.c
rename to package/kernel/broadcom-wl/src/glue/wl_glue.c
diff --git a/package/broadcom-wl/src/glue/wl_glue.h b/package/kernel/broadcom-wl/src/glue/wl_glue.h
similarity index 100%
rename from package/broadcom-wl/src/glue/wl_glue.h
rename to package/kernel/broadcom-wl/src/glue/wl_glue.h
diff --git a/package/broadcom-wl/src/wlc.c b/package/kernel/broadcom-wl/src/wlc.c
similarity index 100%
rename from package/broadcom-wl/src/wlc.c
rename to package/kernel/broadcom-wl/src/wlc.c
diff --git a/package/system/button-hotplug/Makefile b/package/kernel/button-hotplug/Makefile
similarity index 100%
rename from package/system/button-hotplug/Makefile
rename to package/kernel/button-hotplug/Makefile
diff --git a/package/system/button-hotplug/src/Kconfig b/package/kernel/button-hotplug/src/Kconfig
similarity index 100%
rename from package/system/button-hotplug/src/Kconfig
rename to package/kernel/button-hotplug/src/Kconfig
diff --git a/package/system/button-hotplug/src/Makefile b/package/kernel/button-hotplug/src/Makefile
similarity index 100%
rename from package/system/button-hotplug/src/Makefile
rename to package/kernel/button-hotplug/src/Makefile
diff --git a/package/system/button-hotplug/src/button-hotplug.c b/package/kernel/button-hotplug/src/button-hotplug.c
similarity index 100%
rename from package/system/button-hotplug/src/button-hotplug.c
rename to package/kernel/button-hotplug/src/button-hotplug.c
diff --git a/package/system/ep80579-drivers/Makefile b/package/kernel/ep80579-drivers/Makefile
similarity index 100%
rename from package/system/ep80579-drivers/Makefile
rename to package/kernel/ep80579-drivers/Makefile
diff --git a/package/system/ep80579-drivers/patches/001-igbe_update.patch b/package/kernel/ep80579-drivers/patches/001-igbe_update.patch
similarity index 100%
rename from package/system/ep80579-drivers/patches/001-igbe_update.patch
rename to package/kernel/ep80579-drivers/patches/001-igbe_update.patch
diff --git a/package/system/ep80579-drivers/patches/002-cflags_cleanup.patch b/package/kernel/ep80579-drivers/patches/002-cflags_cleanup.patch
similarity index 100%
rename from package/system/ep80579-drivers/patches/002-cflags_cleanup.patch
rename to package/kernel/ep80579-drivers/patches/002-cflags_cleanup.patch
diff --git a/package/system/ep80579-drivers/patches/003-new_irqf_constants.patch b/package/kernel/ep80579-drivers/patches/003-new_irqf_constants.patch
similarity index 100%
rename from package/system/ep80579-drivers/patches/003-new_irqf_constants.patch
rename to package/kernel/ep80579-drivers/patches/003-new_irqf_constants.patch
diff --git a/package/system/ep80579-drivers/patches/100-iegbe_netdev_ops.patch b/package/kernel/ep80579-drivers/patches/100-iegbe_netdev_ops.patch
similarity index 100%
rename from package/system/ep80579-drivers/patches/100-iegbe_netdev_ops.patch
rename to package/kernel/ep80579-drivers/patches/100-iegbe_netdev_ops.patch
diff --git a/package/system/ep80579-drivers/patches/101-iegbe_fix_napi_interface.patch b/package/kernel/ep80579-drivers/patches/101-iegbe_fix_napi_interface.patch
similarity index 100%
rename from package/system/ep80579-drivers/patches/101-iegbe_fix_napi_interface.patch
rename to package/kernel/ep80579-drivers/patches/101-iegbe_fix_napi_interface.patch
diff --git a/package/system/ep80579-drivers/patches/102-iegbe_nuke_polling_netdev.patch b/package/kernel/ep80579-drivers/patches/102-iegbe_nuke_polling_netdev.patch
similarity index 100%
rename from package/system/ep80579-drivers/patches/102-iegbe_nuke_polling_netdev.patch
rename to package/kernel/ep80579-drivers/patches/102-iegbe_nuke_polling_netdev.patch
diff --git a/package/system/ep80579-drivers/patches/103-iegbe_convert_unicast_addr_list.patch b/package/kernel/ep80579-drivers/patches/103-iegbe_convert_unicast_addr_list.patch
similarity index 100%
rename from package/system/ep80579-drivers/patches/103-iegbe_convert_unicast_addr_list.patch
rename to package/kernel/ep80579-drivers/patches/103-iegbe_convert_unicast_addr_list.patch
diff --git a/package/system/ep80579-drivers/patches/104-iegbe_group_address_list_and_its_count.patch b/package/kernel/ep80579-drivers/patches/104-iegbe_group_address_list_and_its_count.patch
similarity index 100%
rename from package/system/ep80579-drivers/patches/104-iegbe_group_address_list_and_its_count.patch
rename to package/kernel/ep80579-drivers/patches/104-iegbe_group_address_list_and_its_count.patch
diff --git a/package/system/ep80579-drivers/patches/105-iegbe_new_dma_masks.patch b/package/kernel/ep80579-drivers/patches/105-iegbe_new_dma_masks.patch
similarity index 100%
rename from package/system/ep80579-drivers/patches/105-iegbe_new_dma_masks.patch
rename to package/kernel/ep80579-drivers/patches/105-iegbe_new_dma_masks.patch
diff --git a/package/system/ep80579-drivers/patches/106-iegbe_new_irqf_constant.patch b/package/kernel/ep80579-drivers/patches/106-iegbe_new_irqf_constant.patch
similarity index 100%
rename from package/system/ep80579-drivers/patches/106-iegbe_new_irqf_constant.patch
rename to package/kernel/ep80579-drivers/patches/106-iegbe_new_irqf_constant.patch
diff --git a/package/system/ep80579-drivers/patches/150-ocracoke_island.patch b/package/kernel/ep80579-drivers/patches/150-ocracoke_island.patch
similarity index 100%
rename from package/system/ep80579-drivers/patches/150-ocracoke_island.patch
rename to package/kernel/ep80579-drivers/patches/150-ocracoke_island.patch
diff --git a/package/system/ep80579-drivers/patches/200-can_fix_ioctl_numbers.patch b/package/kernel/ep80579-drivers/patches/200-can_fix_ioctl_numbers.patch
similarity index 100%
rename from package/system/ep80579-drivers/patches/200-can_fix_ioctl_numbers.patch
rename to package/kernel/ep80579-drivers/patches/200-can_fix_ioctl_numbers.patch
diff --git a/package/system/ep80579-drivers/patches/210-can_include_linux_fs_h.patch b/package/kernel/ep80579-drivers/patches/210-can_include_linux_fs_h.patch
similarity index 100%
rename from package/system/ep80579-drivers/patches/210-can_include_linux_fs_h.patch
rename to package/kernel/ep80579-drivers/patches/210-can_include_linux_fs_h.patch
diff --git a/package/system/ep80579-drivers/patches/220-can_fix_irq_request.patch b/package/kernel/ep80579-drivers/patches/220-can_fix_irq_request.patch
similarity index 100%
rename from package/system/ep80579-drivers/patches/220-can_fix_irq_request.patch
rename to package/kernel/ep80579-drivers/patches/220-can_fix_irq_request.patch
diff --git a/package/system/ep80579-drivers/patches/230-can_remove_driver_data_direct_access.patch b/package/kernel/ep80579-drivers/patches/230-can_remove_driver_data_direct_access.patch
similarity index 100%
rename from package/system/ep80579-drivers/patches/230-can_remove_driver_data_direct_access.patch
rename to package/kernel/ep80579-drivers/patches/230-can_remove_driver_data_direct_access.patch
diff --git a/package/system/ep80579-drivers/patches/300-wdt_compile_fix.patch b/package/kernel/ep80579-drivers/patches/300-wdt_compile_fix.patch
similarity index 100%
rename from package/system/ep80579-drivers/patches/300-wdt_compile_fix.patch
rename to package/kernel/ep80579-drivers/patches/300-wdt_compile_fix.patch
diff --git a/package/system/ep80579-drivers/patches/400-edma_fix_irq_request_warning.patch b/package/kernel/ep80579-drivers/patches/400-edma_fix_irq_request_warning.patch
similarity index 100%
rename from package/system/ep80579-drivers/patches/400-edma_fix_irq_request_warning.patch
rename to package/kernel/ep80579-drivers/patches/400-edma_fix_irq_request_warning.patch
diff --git a/package/system/ep80579-drivers/patches/500-1588_fix_irq_request_warning.patch b/package/kernel/ep80579-drivers/patches/500-1588_fix_irq_request_warning.patch
similarity index 100%
rename from package/system/ep80579-drivers/patches/500-1588_fix_irq_request_warning.patch
rename to package/kernel/ep80579-drivers/patches/500-1588_fix_irq_request_warning.patch
diff --git a/package/system/ep80579-drivers/patches/600-2.6.27_includes.patch b/package/kernel/ep80579-drivers/patches/600-2.6.27_includes.patch
similarity index 100%
rename from package/system/ep80579-drivers/patches/600-2.6.27_includes.patch
rename to package/kernel/ep80579-drivers/patches/600-2.6.27_includes.patch
diff --git a/package/system/ep80579-drivers/patches/601-2.6.32_includes.patch b/package/kernel/ep80579-drivers/patches/601-2.6.32_includes.patch
similarity index 100%
rename from package/system/ep80579-drivers/patches/601-2.6.32_includes.patch
rename to package/kernel/ep80579-drivers/patches/601-2.6.32_includes.patch
diff --git a/package/system/ep80579-drivers/patches/700-iegbe_kcompat_2.6.30.patch b/package/kernel/ep80579-drivers/patches/700-iegbe_kcompat_2.6.30.patch
similarity index 100%
rename from package/system/ep80579-drivers/patches/700-iegbe_kcompat_2.6.30.patch
rename to package/kernel/ep80579-drivers/patches/700-iegbe_kcompat_2.6.30.patch
diff --git a/package/system/ep80579-drivers/patches/701-iegbe_poll_dev.patch b/package/kernel/ep80579-drivers/patches/701-iegbe_poll_dev.patch
similarity index 100%
rename from package/system/ep80579-drivers/patches/701-iegbe_poll_dev.patch
rename to package/kernel/ep80579-drivers/patches/701-iegbe_poll_dev.patch
diff --git a/package/system/ep80579-drivers/patches/710-3.3-fix-generated-header-locations.patch b/package/kernel/ep80579-drivers/patches/710-3.3-fix-generated-header-locations.patch
similarity index 100%
rename from package/system/ep80579-drivers/patches/710-3.3-fix-generated-header-locations.patch
rename to package/kernel/ep80579-drivers/patches/710-3.3-fix-generated-header-locations.patch
diff --git a/package/system/ep80579-drivers/patches/711-3.3-gbe-fixes.patch b/package/kernel/ep80579-drivers/patches/711-3.3-gbe-fixes.patch
similarity index 100%
rename from package/system/ep80579-drivers/patches/711-3.3-gbe-fixes.patch
rename to package/kernel/ep80579-drivers/patches/711-3.3-gbe-fixes.patch
diff --git a/package/system/ep80579-drivers/patches/712-3.3-can-fixes.patch b/package/kernel/ep80579-drivers/patches/712-3.3-can-fixes.patch
similarity index 100%
rename from package/system/ep80579-drivers/patches/712-3.3-can-fixes.patch
rename to package/kernel/ep80579-drivers/patches/712-3.3-can-fixes.patch
diff --git a/package/system/ep80579-drivers/patches/713-3.3-gpio-fixes.patch b/package/kernel/ep80579-drivers/patches/713-3.3-gpio-fixes.patch
similarity index 100%
rename from package/system/ep80579-drivers/patches/713-3.3-gpio-fixes.patch
rename to package/kernel/ep80579-drivers/patches/713-3.3-gpio-fixes.patch
diff --git a/package/system/ep80579-drivers/patches/714-3.3-wdt-fixes.patch b/package/kernel/ep80579-drivers/patches/714-3.3-wdt-fixes.patch
similarity index 100%
rename from package/system/ep80579-drivers/patches/714-3.3-wdt-fixes.patch
rename to package/kernel/ep80579-drivers/patches/714-3.3-wdt-fixes.patch
diff --git a/package/system/ep80579-drivers/patches/715-3.3-1588-fixes.patch b/package/kernel/ep80579-drivers/patches/715-3.3-1588-fixes.patch
similarity index 100%
rename from package/system/ep80579-drivers/patches/715-3.3-1588-fixes.patch
rename to package/kernel/ep80579-drivers/patches/715-3.3-1588-fixes.patch
diff --git a/package/system/gpio-button-hotplug/Makefile b/package/kernel/gpio-button-hotplug/Makefile
similarity index 100%
rename from package/system/gpio-button-hotplug/Makefile
rename to package/kernel/gpio-button-hotplug/Makefile
diff --git a/package/system/gpio-button-hotplug/src/Makefile b/package/kernel/gpio-button-hotplug/src/Makefile
similarity index 100%
rename from package/system/gpio-button-hotplug/src/Makefile
rename to package/kernel/gpio-button-hotplug/src/Makefile
diff --git a/package/system/gpio-button-hotplug/src/gpio-button-hotplug.c b/package/kernel/gpio-button-hotplug/src/gpio-button-hotplug.c
similarity index 100%
rename from package/system/gpio-button-hotplug/src/gpio-button-hotplug.c
rename to package/kernel/gpio-button-hotplug/src/gpio-button-hotplug.c
diff --git a/package/system/hostap-driver/Makefile b/package/kernel/hostap-driver/Makefile
similarity index 100%
rename from package/system/hostap-driver/Makefile
rename to package/kernel/hostap-driver/Makefile
diff --git a/package/system/hostap-driver/files/lib/wifi/hostap.sh b/package/kernel/hostap-driver/files/lib/wifi/hostap.sh
similarity index 100%
rename from package/system/hostap-driver/files/lib/wifi/hostap.sh
rename to package/kernel/hostap-driver/files/lib/wifi/hostap.sh
diff --git a/package/system/hostap-driver/patches/001-fix-txpower.patch b/package/kernel/hostap-driver/patches/001-fix-txpower.patch
similarity index 100%
rename from package/system/hostap-driver/patches/001-fix-txpower.patch
rename to package/kernel/hostap-driver/patches/001-fix-txpower.patch
diff --git a/package/system/i2c-gpio-custom/Makefile b/package/kernel/i2c-gpio-custom/Makefile
similarity index 100%
rename from package/system/i2c-gpio-custom/Makefile
rename to package/kernel/i2c-gpio-custom/Makefile
diff --git a/package/system/i2c-gpio-custom/src/Kconfig b/package/kernel/i2c-gpio-custom/src/Kconfig
similarity index 100%
rename from package/system/i2c-gpio-custom/src/Kconfig
rename to package/kernel/i2c-gpio-custom/src/Kconfig
diff --git a/package/system/i2c-gpio-custom/src/Makefile b/package/kernel/i2c-gpio-custom/src/Makefile
similarity index 100%
rename from package/system/i2c-gpio-custom/src/Makefile
rename to package/kernel/i2c-gpio-custom/src/Makefile
diff --git a/package/system/i2c-gpio-custom/src/i2c-gpio-custom.c b/package/kernel/i2c-gpio-custom/src/i2c-gpio-custom.c
similarity index 100%
rename from package/system/i2c-gpio-custom/src/i2c-gpio-custom.c
rename to package/kernel/i2c-gpio-custom/src/i2c-gpio-custom.c
diff --git a/package/platform/lantiq/ltq-adsl-app/Config.in b/package/kernel/lantiq/ltq-adsl-app/Config.in
similarity index 100%
rename from package/platform/lantiq/ltq-adsl-app/Config.in
rename to package/kernel/lantiq/ltq-adsl-app/Config.in
diff --git a/package/platform/lantiq/ltq-adsl-app/Makefile b/package/kernel/lantiq/ltq-adsl-app/Makefile
similarity index 100%
rename from package/platform/lantiq/ltq-adsl-app/Makefile
rename to package/kernel/lantiq/ltq-adsl-app/Makefile
diff --git a/package/platform/lantiq/ltq-adsl-app/files/dsl_control b/package/kernel/lantiq/ltq-adsl-app/files/dsl_control
similarity index 100%
rename from package/platform/lantiq/ltq-adsl-app/files/dsl_control
rename to package/kernel/lantiq/ltq-adsl-app/files/dsl_control
diff --git a/package/platform/lantiq/ltq-adsl-app/files/dsl_notify.sh b/package/kernel/lantiq/ltq-adsl-app/files/dsl_notify.sh
similarity index 100%
rename from package/platform/lantiq/ltq-adsl-app/files/dsl_notify.sh
rename to package/kernel/lantiq/ltq-adsl-app/files/dsl_notify.sh
diff --git a/package/platform/lantiq/ltq-adsl-fw/Makefile b/package/kernel/lantiq/ltq-adsl-fw/Makefile
similarity index 100%
rename from package/platform/lantiq/ltq-adsl-fw/Makefile
rename to package/kernel/lantiq/ltq-adsl-fw/Makefile
diff --git a/package/platform/lantiq/ltq-adsl-mei/Makefile b/package/kernel/lantiq/ltq-adsl-mei/Makefile
similarity index 100%
rename from package/platform/lantiq/ltq-adsl-mei/Makefile
rename to package/kernel/lantiq/ltq-adsl-mei/Makefile
diff --git a/package/platform/lantiq/ltq-adsl-mei/src/Makefile b/package/kernel/lantiq/ltq-adsl-mei/src/Makefile
similarity index 100%
rename from package/platform/lantiq/ltq-adsl-mei/src/Makefile
rename to package/kernel/lantiq/ltq-adsl-mei/src/Makefile
diff --git a/package/platform/lantiq/ltq-adsl-mei/src/ifxmips_mei_interface.h b/package/kernel/lantiq/ltq-adsl-mei/src/ifxmips_mei_interface.h
similarity index 100%
rename from package/platform/lantiq/ltq-adsl-mei/src/ifxmips_mei_interface.h
rename to package/kernel/lantiq/ltq-adsl-mei/src/ifxmips_mei_interface.h
diff --git a/package/platform/lantiq/ltq-adsl-mei/src/lantiq_mei.c b/package/kernel/lantiq/ltq-adsl-mei/src/lantiq_mei.c
similarity index 100%
rename from package/platform/lantiq/ltq-adsl-mei/src/lantiq_mei.c
rename to package/kernel/lantiq/ltq-adsl-mei/src/lantiq_mei.c
diff --git a/package/platform/lantiq/ltq-adsl/Config.in b/package/kernel/lantiq/ltq-adsl/Config.in
similarity index 100%
rename from package/platform/lantiq/ltq-adsl/Config.in
rename to package/kernel/lantiq/ltq-adsl/Config.in
diff --git a/package/platform/lantiq/ltq-adsl/Makefile b/package/kernel/lantiq/ltq-adsl/Makefile
similarity index 100%
rename from package/platform/lantiq/ltq-adsl/Makefile
rename to package/kernel/lantiq/ltq-adsl/Makefile
diff --git a/package/platform/lantiq/ltq-adsl/patches/100-dsl_compat.patch b/package/kernel/lantiq/ltq-adsl/patches/100-dsl_compat.patch
similarity index 100%
rename from package/platform/lantiq/ltq-adsl/patches/100-dsl_compat.patch
rename to package/kernel/lantiq/ltq-adsl/patches/100-dsl_compat.patch
diff --git a/package/platform/lantiq/ltq-adsl/patches/110-fix_status_polling_loop.patch b/package/kernel/lantiq/ltq-adsl/patches/110-fix_status_polling_loop.patch
similarity index 100%
rename from package/platform/lantiq/ltq-adsl/patches/110-fix_status_polling_loop.patch
rename to package/kernel/lantiq/ltq-adsl/patches/110-fix_status_polling_loop.patch
diff --git a/package/platform/lantiq/ltq-adsl/patches/120-platform.patch b/package/kernel/lantiq/ltq-adsl/patches/120-platform.patch
similarity index 100%
rename from package/platform/lantiq/ltq-adsl/patches/120-platform.patch
rename to package/kernel/lantiq/ltq-adsl/patches/120-platform.patch
diff --git a/package/platform/lantiq/ltq-adsl/patches/130-linux3.8.patch b/package/kernel/lantiq/ltq-adsl/patches/130-linux3.8.patch
similarity index 100%
rename from package/platform/lantiq/ltq-adsl/patches/130-linux3.8.patch
rename to package/kernel/lantiq/ltq-adsl/patches/130-linux3.8.patch
diff --git a/package/platform/lantiq/ltq-atm/Makefile b/package/kernel/lantiq/ltq-atm/Makefile
similarity index 100%
rename from package/platform/lantiq/ltq-atm/Makefile
rename to package/kernel/lantiq/ltq-atm/Makefile
diff --git a/package/platform/lantiq/ltq-atm/src/Makefile b/package/kernel/lantiq/ltq-atm/src/Makefile
similarity index 100%
rename from package/platform/lantiq/ltq-atm/src/Makefile
rename to package/kernel/lantiq/ltq-atm/src/Makefile
diff --git a/package/platform/lantiq/ltq-atm/src/ifxmips_atm_amazon_se.c b/package/kernel/lantiq/ltq-atm/src/ifxmips_atm_amazon_se.c
similarity index 100%
rename from package/platform/lantiq/ltq-atm/src/ifxmips_atm_amazon_se.c
rename to package/kernel/lantiq/ltq-atm/src/ifxmips_atm_amazon_se.c
diff --git a/package/platform/lantiq/ltq-atm/src/ifxmips_atm_ar9.c b/package/kernel/lantiq/ltq-atm/src/ifxmips_atm_ar9.c
similarity index 100%
rename from package/platform/lantiq/ltq-atm/src/ifxmips_atm_ar9.c
rename to package/kernel/lantiq/ltq-atm/src/ifxmips_atm_ar9.c
diff --git a/package/platform/lantiq/ltq-atm/src/ifxmips_atm_core.h b/package/kernel/lantiq/ltq-atm/src/ifxmips_atm_core.h
similarity index 100%
rename from package/platform/lantiq/ltq-atm/src/ifxmips_atm_core.h
rename to package/kernel/lantiq/ltq-atm/src/ifxmips_atm_core.h
diff --git a/package/platform/lantiq/ltq-atm/src/ifxmips_atm_danube.c b/package/kernel/lantiq/ltq-atm/src/ifxmips_atm_danube.c
similarity index 100%
rename from package/platform/lantiq/ltq-atm/src/ifxmips_atm_danube.c
rename to package/kernel/lantiq/ltq-atm/src/ifxmips_atm_danube.c
diff --git a/package/platform/lantiq/ltq-atm/src/ifxmips_atm_fw_amazon_se.h b/package/kernel/lantiq/ltq-atm/src/ifxmips_atm_fw_amazon_se.h
similarity index 100%
rename from package/platform/lantiq/ltq-atm/src/ifxmips_atm_fw_amazon_se.h
rename to package/kernel/lantiq/ltq-atm/src/ifxmips_atm_fw_amazon_se.h
diff --git a/package/platform/lantiq/ltq-atm/src/ifxmips_atm_fw_ar9.h b/package/kernel/lantiq/ltq-atm/src/ifxmips_atm_fw_ar9.h
similarity index 100%
rename from package/platform/lantiq/ltq-atm/src/ifxmips_atm_fw_ar9.h
rename to package/kernel/lantiq/ltq-atm/src/ifxmips_atm_fw_ar9.h
diff --git a/package/platform/lantiq/ltq-atm/src/ifxmips_atm_fw_ar9_retx.h b/package/kernel/lantiq/ltq-atm/src/ifxmips_atm_fw_ar9_retx.h
similarity index 100%
rename from package/platform/lantiq/ltq-atm/src/ifxmips_atm_fw_ar9_retx.h
rename to package/kernel/lantiq/ltq-atm/src/ifxmips_atm_fw_ar9_retx.h
diff --git a/package/platform/lantiq/ltq-atm/src/ifxmips_atm_fw_danube.h b/package/kernel/lantiq/ltq-atm/src/ifxmips_atm_fw_danube.h
similarity index 100%
rename from package/platform/lantiq/ltq-atm/src/ifxmips_atm_fw_danube.h
rename to package/kernel/lantiq/ltq-atm/src/ifxmips_atm_fw_danube.h
diff --git a/package/platform/lantiq/ltq-atm/src/ifxmips_atm_fw_danube_retx.h b/package/kernel/lantiq/ltq-atm/src/ifxmips_atm_fw_danube_retx.h
similarity index 100%
rename from package/platform/lantiq/ltq-atm/src/ifxmips_atm_fw_danube_retx.h
rename to package/kernel/lantiq/ltq-atm/src/ifxmips_atm_fw_danube_retx.h
diff --git a/package/platform/lantiq/ltq-atm/src/ifxmips_atm_fw_regs_amazon_se.h b/package/kernel/lantiq/ltq-atm/src/ifxmips_atm_fw_regs_amazon_se.h
similarity index 100%
rename from package/platform/lantiq/ltq-atm/src/ifxmips_atm_fw_regs_amazon_se.h
rename to package/kernel/lantiq/ltq-atm/src/ifxmips_atm_fw_regs_amazon_se.h
diff --git a/package/platform/lantiq/ltq-atm/src/ifxmips_atm_fw_regs_ar9.h b/package/kernel/lantiq/ltq-atm/src/ifxmips_atm_fw_regs_ar9.h
similarity index 100%
rename from package/platform/lantiq/ltq-atm/src/ifxmips_atm_fw_regs_ar9.h
rename to package/kernel/lantiq/ltq-atm/src/ifxmips_atm_fw_regs_ar9.h
diff --git a/package/platform/lantiq/ltq-atm/src/ifxmips_atm_fw_regs_common.h b/package/kernel/lantiq/ltq-atm/src/ifxmips_atm_fw_regs_common.h
similarity index 100%
rename from package/platform/lantiq/ltq-atm/src/ifxmips_atm_fw_regs_common.h
rename to package/kernel/lantiq/ltq-atm/src/ifxmips_atm_fw_regs_common.h
diff --git a/package/platform/lantiq/ltq-atm/src/ifxmips_atm_fw_regs_danube.h b/package/kernel/lantiq/ltq-atm/src/ifxmips_atm_fw_regs_danube.h
similarity index 100%
rename from package/platform/lantiq/ltq-atm/src/ifxmips_atm_fw_regs_danube.h
rename to package/kernel/lantiq/ltq-atm/src/ifxmips_atm_fw_regs_danube.h
diff --git a/package/platform/lantiq/ltq-atm/src/ifxmips_atm_fw_regs_vr9.h b/package/kernel/lantiq/ltq-atm/src/ifxmips_atm_fw_regs_vr9.h
similarity index 100%
rename from package/platform/lantiq/ltq-atm/src/ifxmips_atm_fw_regs_vr9.h
rename to package/kernel/lantiq/ltq-atm/src/ifxmips_atm_fw_regs_vr9.h
diff --git a/package/platform/lantiq/ltq-atm/src/ifxmips_atm_fw_vr9.h b/package/kernel/lantiq/ltq-atm/src/ifxmips_atm_fw_vr9.h
similarity index 100%
rename from package/platform/lantiq/ltq-atm/src/ifxmips_atm_fw_vr9.h
rename to package/kernel/lantiq/ltq-atm/src/ifxmips_atm_fw_vr9.h
diff --git a/package/platform/lantiq/ltq-atm/src/ifxmips_atm_ppe_amazon_se.h b/package/kernel/lantiq/ltq-atm/src/ifxmips_atm_ppe_amazon_se.h
similarity index 100%
rename from package/platform/lantiq/ltq-atm/src/ifxmips_atm_ppe_amazon_se.h
rename to package/kernel/lantiq/ltq-atm/src/ifxmips_atm_ppe_amazon_se.h
diff --git a/package/platform/lantiq/ltq-atm/src/ifxmips_atm_ppe_ar9.h b/package/kernel/lantiq/ltq-atm/src/ifxmips_atm_ppe_ar9.h
similarity index 100%
rename from package/platform/lantiq/ltq-atm/src/ifxmips_atm_ppe_ar9.h
rename to package/kernel/lantiq/ltq-atm/src/ifxmips_atm_ppe_ar9.h
diff --git a/package/platform/lantiq/ltq-atm/src/ifxmips_atm_ppe_common.h b/package/kernel/lantiq/ltq-atm/src/ifxmips_atm_ppe_common.h
similarity index 100%
rename from package/platform/lantiq/ltq-atm/src/ifxmips_atm_ppe_common.h
rename to package/kernel/lantiq/ltq-atm/src/ifxmips_atm_ppe_common.h
diff --git a/package/platform/lantiq/ltq-atm/src/ifxmips_atm_ppe_danube.h b/package/kernel/lantiq/ltq-atm/src/ifxmips_atm_ppe_danube.h
similarity index 100%
rename from package/platform/lantiq/ltq-atm/src/ifxmips_atm_ppe_danube.h
rename to package/kernel/lantiq/ltq-atm/src/ifxmips_atm_ppe_danube.h
diff --git a/package/platform/lantiq/ltq-atm/src/ifxmips_atm_ppe_vr9.h b/package/kernel/lantiq/ltq-atm/src/ifxmips_atm_ppe_vr9.h
similarity index 100%
rename from package/platform/lantiq/ltq-atm/src/ifxmips_atm_ppe_vr9.h
rename to package/kernel/lantiq/ltq-atm/src/ifxmips_atm_ppe_vr9.h
diff --git a/package/platform/lantiq/ltq-atm/src/ifxmips_atm_vr9.c b/package/kernel/lantiq/ltq-atm/src/ifxmips_atm_vr9.c
similarity index 100%
rename from package/platform/lantiq/ltq-atm/src/ifxmips_atm_vr9.c
rename to package/kernel/lantiq/ltq-atm/src/ifxmips_atm_vr9.c
diff --git a/package/platform/lantiq/ltq-atm/src/ltq_atm.c b/package/kernel/lantiq/ltq-atm/src/ltq_atm.c
similarity index 100%
rename from package/platform/lantiq/ltq-atm/src/ltq_atm.c
rename to package/kernel/lantiq/ltq-atm/src/ltq_atm.c
diff --git a/package/platform/lantiq/ltq-deu/Makefile b/package/kernel/lantiq/ltq-deu/Makefile
similarity index 100%
rename from package/platform/lantiq/ltq-deu/Makefile
rename to package/kernel/lantiq/ltq-deu/Makefile
diff --git a/package/platform/lantiq/ltq-deu/src/Makefile b/package/kernel/lantiq/ltq-deu/src/Makefile
similarity index 100%
rename from package/platform/lantiq/ltq-deu/src/Makefile
rename to package/kernel/lantiq/ltq-deu/src/Makefile
diff --git a/package/platform/lantiq/ltq-deu/src/ifxmips_aes.c b/package/kernel/lantiq/ltq-deu/src/ifxmips_aes.c
similarity index 100%
rename from package/platform/lantiq/ltq-deu/src/ifxmips_aes.c
rename to package/kernel/lantiq/ltq-deu/src/ifxmips_aes.c
diff --git a/package/platform/lantiq/ltq-deu/src/ifxmips_arc4.c b/package/kernel/lantiq/ltq-deu/src/ifxmips_arc4.c
similarity index 100%
rename from package/platform/lantiq/ltq-deu/src/ifxmips_arc4.c
rename to package/kernel/lantiq/ltq-deu/src/ifxmips_arc4.c
diff --git a/package/platform/lantiq/ltq-deu/src/ifxmips_async_aes.c b/package/kernel/lantiq/ltq-deu/src/ifxmips_async_aes.c
similarity index 100%
rename from package/platform/lantiq/ltq-deu/src/ifxmips_async_aes.c
rename to package/kernel/lantiq/ltq-deu/src/ifxmips_async_aes.c
diff --git a/package/platform/lantiq/ltq-deu/src/ifxmips_async_des.c b/package/kernel/lantiq/ltq-deu/src/ifxmips_async_des.c
similarity index 100%
rename from package/platform/lantiq/ltq-deu/src/ifxmips_async_des.c
rename to package/kernel/lantiq/ltq-deu/src/ifxmips_async_des.c
diff --git a/package/platform/lantiq/ltq-deu/src/ifxmips_des.c b/package/kernel/lantiq/ltq-deu/src/ifxmips_des.c
similarity index 100%
rename from package/platform/lantiq/ltq-deu/src/ifxmips_des.c
rename to package/kernel/lantiq/ltq-deu/src/ifxmips_des.c
diff --git a/package/platform/lantiq/ltq-deu/src/ifxmips_deu.c b/package/kernel/lantiq/ltq-deu/src/ifxmips_deu.c
similarity index 100%
rename from package/platform/lantiq/ltq-deu/src/ifxmips_deu.c
rename to package/kernel/lantiq/ltq-deu/src/ifxmips_deu.c
diff --git a/package/platform/lantiq/ltq-deu/src/ifxmips_deu.h b/package/kernel/lantiq/ltq-deu/src/ifxmips_deu.h
similarity index 100%
rename from package/platform/lantiq/ltq-deu/src/ifxmips_deu.h
rename to package/kernel/lantiq/ltq-deu/src/ifxmips_deu.h
diff --git a/package/platform/lantiq/ltq-deu/src/ifxmips_deu_ar9.c b/package/kernel/lantiq/ltq-deu/src/ifxmips_deu_ar9.c
similarity index 100%
rename from package/platform/lantiq/ltq-deu/src/ifxmips_deu_ar9.c
rename to package/kernel/lantiq/ltq-deu/src/ifxmips_deu_ar9.c
diff --git a/package/platform/lantiq/ltq-deu/src/ifxmips_deu_ar9.h b/package/kernel/lantiq/ltq-deu/src/ifxmips_deu_ar9.h
similarity index 100%
rename from package/platform/lantiq/ltq-deu/src/ifxmips_deu_ar9.h
rename to package/kernel/lantiq/ltq-deu/src/ifxmips_deu_ar9.h
diff --git a/package/platform/lantiq/ltq-deu/src/ifxmips_deu_danube.c b/package/kernel/lantiq/ltq-deu/src/ifxmips_deu_danube.c
similarity index 100%
rename from package/platform/lantiq/ltq-deu/src/ifxmips_deu_danube.c
rename to package/kernel/lantiq/ltq-deu/src/ifxmips_deu_danube.c
diff --git a/package/platform/lantiq/ltq-deu/src/ifxmips_deu_danube.h b/package/kernel/lantiq/ltq-deu/src/ifxmips_deu_danube.h
similarity index 100%
rename from package/platform/lantiq/ltq-deu/src/ifxmips_deu_danube.h
rename to package/kernel/lantiq/ltq-deu/src/ifxmips_deu_danube.h
diff --git a/package/platform/lantiq/ltq-deu/src/ifxmips_deu_dma.c b/package/kernel/lantiq/ltq-deu/src/ifxmips_deu_dma.c
similarity index 100%
rename from package/platform/lantiq/ltq-deu/src/ifxmips_deu_dma.c
rename to package/kernel/lantiq/ltq-deu/src/ifxmips_deu_dma.c
diff --git a/package/platform/lantiq/ltq-deu/src/ifxmips_deu_dma.h b/package/kernel/lantiq/ltq-deu/src/ifxmips_deu_dma.h
similarity index 100%
rename from package/platform/lantiq/ltq-deu/src/ifxmips_deu_dma.h
rename to package/kernel/lantiq/ltq-deu/src/ifxmips_deu_dma.h
diff --git a/package/platform/lantiq/ltq-deu/src/ifxmips_deu_vr9.c b/package/kernel/lantiq/ltq-deu/src/ifxmips_deu_vr9.c
similarity index 100%
rename from package/platform/lantiq/ltq-deu/src/ifxmips_deu_vr9.c
rename to package/kernel/lantiq/ltq-deu/src/ifxmips_deu_vr9.c
diff --git a/package/platform/lantiq/ltq-deu/src/ifxmips_deu_vr9.h b/package/kernel/lantiq/ltq-deu/src/ifxmips_deu_vr9.h
similarity index 100%
rename from package/platform/lantiq/ltq-deu/src/ifxmips_deu_vr9.h
rename to package/kernel/lantiq/ltq-deu/src/ifxmips_deu_vr9.h
diff --git a/package/platform/lantiq/ltq-deu/src/ifxmips_md5.c b/package/kernel/lantiq/ltq-deu/src/ifxmips_md5.c
similarity index 100%
rename from package/platform/lantiq/ltq-deu/src/ifxmips_md5.c
rename to package/kernel/lantiq/ltq-deu/src/ifxmips_md5.c
diff --git a/package/platform/lantiq/ltq-deu/src/ifxmips_md5_hmac.c b/package/kernel/lantiq/ltq-deu/src/ifxmips_md5_hmac.c
similarity index 100%
rename from package/platform/lantiq/ltq-deu/src/ifxmips_md5_hmac.c
rename to package/kernel/lantiq/ltq-deu/src/ifxmips_md5_hmac.c
diff --git a/package/platform/lantiq/ltq-deu/src/ifxmips_sha1.c b/package/kernel/lantiq/ltq-deu/src/ifxmips_sha1.c
similarity index 100%
rename from package/platform/lantiq/ltq-deu/src/ifxmips_sha1.c
rename to package/kernel/lantiq/ltq-deu/src/ifxmips_sha1.c
diff --git a/package/platform/lantiq/ltq-deu/src/ifxmips_sha1_hmac.c b/package/kernel/lantiq/ltq-deu/src/ifxmips_sha1_hmac.c
similarity index 100%
rename from package/platform/lantiq/ltq-deu/src/ifxmips_sha1_hmac.c
rename to package/kernel/lantiq/ltq-deu/src/ifxmips_sha1_hmac.c
diff --git a/package/platform/lantiq/ltq-deu/src/ifxmips_tcrypt.h b/package/kernel/lantiq/ltq-deu/src/ifxmips_tcrypt.h
similarity index 100%
rename from package/platform/lantiq/ltq-deu/src/ifxmips_tcrypt.h
rename to package/kernel/lantiq/ltq-deu/src/ifxmips_tcrypt.h
diff --git a/package/platform/lantiq/ltq-deu/src/ifxmips_testmgr.h b/package/kernel/lantiq/ltq-deu/src/ifxmips_testmgr.h
similarity index 100%
rename from package/platform/lantiq/ltq-deu/src/ifxmips_testmgr.h
rename to package/kernel/lantiq/ltq-deu/src/ifxmips_testmgr.h
diff --git a/package/platform/lantiq/ltq-deu/src/internal.h b/package/kernel/lantiq/ltq-deu/src/internal.h
similarity index 100%
rename from package/platform/lantiq/ltq-deu/src/internal.h
rename to package/kernel/lantiq/ltq-deu/src/internal.h
diff --git a/package/platform/lantiq/ltq-deu/src/ltq_deu_testmgr.c b/package/kernel/lantiq/ltq-deu/src/ltq_deu_testmgr.c
similarity index 100%
rename from package/platform/lantiq/ltq-deu/src/ltq_deu_testmgr.c
rename to package/kernel/lantiq/ltq-deu/src/ltq_deu_testmgr.c
diff --git a/package/platform/lantiq/ltq-hcd/Makefile b/package/kernel/lantiq/ltq-hcd/Makefile
similarity index 100%
rename from package/platform/lantiq/ltq-hcd/Makefile
rename to package/kernel/lantiq/ltq-hcd/Makefile
diff --git a/package/platform/lantiq/ltq-hcd/src/Kconfig b/package/kernel/lantiq/ltq-hcd/src/Kconfig
similarity index 100%
rename from package/platform/lantiq/ltq-hcd/src/Kconfig
rename to package/kernel/lantiq/ltq-hcd/src/Kconfig
diff --git a/package/platform/lantiq/ltq-hcd/src/Makefile b/package/kernel/lantiq/ltq-hcd/src/Makefile
similarity index 100%
rename from package/platform/lantiq/ltq-hcd/src/Makefile
rename to package/kernel/lantiq/ltq-hcd/src/Makefile
diff --git a/package/platform/lantiq/ltq-hcd/src/ifxhcd.c b/package/kernel/lantiq/ltq-hcd/src/ifxhcd.c
similarity index 100%
rename from package/platform/lantiq/ltq-hcd/src/ifxhcd.c
rename to package/kernel/lantiq/ltq-hcd/src/ifxhcd.c
diff --git a/package/platform/lantiq/ltq-hcd/src/ifxhcd.h b/package/kernel/lantiq/ltq-hcd/src/ifxhcd.h
similarity index 100%
rename from package/platform/lantiq/ltq-hcd/src/ifxhcd.h
rename to package/kernel/lantiq/ltq-hcd/src/ifxhcd.h
diff --git a/package/platform/lantiq/ltq-hcd/src/ifxhcd_es.c b/package/kernel/lantiq/ltq-hcd/src/ifxhcd_es.c
similarity index 100%
rename from package/platform/lantiq/ltq-hcd/src/ifxhcd_es.c
rename to package/kernel/lantiq/ltq-hcd/src/ifxhcd_es.c
diff --git a/package/platform/lantiq/ltq-hcd/src/ifxhcd_intr.c b/package/kernel/lantiq/ltq-hcd/src/ifxhcd_intr.c
similarity index 100%
rename from package/platform/lantiq/ltq-hcd/src/ifxhcd_intr.c
rename to package/kernel/lantiq/ltq-hcd/src/ifxhcd_intr.c
diff --git a/package/platform/lantiq/ltq-hcd/src/ifxhcd_queue.c b/package/kernel/lantiq/ltq-hcd/src/ifxhcd_queue.c
similarity index 100%
rename from package/platform/lantiq/ltq-hcd/src/ifxhcd_queue.c
rename to package/kernel/lantiq/ltq-hcd/src/ifxhcd_queue.c
diff --git a/package/platform/lantiq/ltq-hcd/src/ifxusb_cif.c b/package/kernel/lantiq/ltq-hcd/src/ifxusb_cif.c
similarity index 100%
rename from package/platform/lantiq/ltq-hcd/src/ifxusb_cif.c
rename to package/kernel/lantiq/ltq-hcd/src/ifxusb_cif.c
diff --git a/package/platform/lantiq/ltq-hcd/src/ifxusb_cif.h b/package/kernel/lantiq/ltq-hcd/src/ifxusb_cif.h
similarity index 100%
rename from package/platform/lantiq/ltq-hcd/src/ifxusb_cif.h
rename to package/kernel/lantiq/ltq-hcd/src/ifxusb_cif.h
diff --git a/package/platform/lantiq/ltq-hcd/src/ifxusb_cif_d.c b/package/kernel/lantiq/ltq-hcd/src/ifxusb_cif_d.c
similarity index 100%
rename from package/platform/lantiq/ltq-hcd/src/ifxusb_cif_d.c
rename to package/kernel/lantiq/ltq-hcd/src/ifxusb_cif_d.c
diff --git a/package/platform/lantiq/ltq-hcd/src/ifxusb_cif_h.c b/package/kernel/lantiq/ltq-hcd/src/ifxusb_cif_h.c
similarity index 100%
rename from package/platform/lantiq/ltq-hcd/src/ifxusb_cif_h.c
rename to package/kernel/lantiq/ltq-hcd/src/ifxusb_cif_h.c
diff --git a/package/platform/lantiq/ltq-hcd/src/ifxusb_ctl.c b/package/kernel/lantiq/ltq-hcd/src/ifxusb_ctl.c
similarity index 100%
rename from package/platform/lantiq/ltq-hcd/src/ifxusb_ctl.c
rename to package/kernel/lantiq/ltq-hcd/src/ifxusb_ctl.c
diff --git a/package/platform/lantiq/ltq-hcd/src/ifxusb_driver.c b/package/kernel/lantiq/ltq-hcd/src/ifxusb_driver.c
similarity index 100%
rename from package/platform/lantiq/ltq-hcd/src/ifxusb_driver.c
rename to package/kernel/lantiq/ltq-hcd/src/ifxusb_driver.c
diff --git a/package/platform/lantiq/ltq-hcd/src/ifxusb_host.ko b/package/kernel/lantiq/ltq-hcd/src/ifxusb_host.ko
similarity index 100%
rename from package/platform/lantiq/ltq-hcd/src/ifxusb_host.ko
rename to package/kernel/lantiq/ltq-hcd/src/ifxusb_host.ko
diff --git a/package/platform/lantiq/ltq-hcd/src/ifxusb_plat.h b/package/kernel/lantiq/ltq-hcd/src/ifxusb_plat.h
similarity index 100%
rename from package/platform/lantiq/ltq-hcd/src/ifxusb_plat.h
rename to package/kernel/lantiq/ltq-hcd/src/ifxusb_plat.h
diff --git a/package/platform/lantiq/ltq-hcd/src/ifxusb_regs.h b/package/kernel/lantiq/ltq-hcd/src/ifxusb_regs.h
similarity index 100%
rename from package/platform/lantiq/ltq-hcd/src/ifxusb_regs.h
rename to package/kernel/lantiq/ltq-hcd/src/ifxusb_regs.h
diff --git a/package/platform/lantiq/ltq-hcd/src/ifxusb_version.h b/package/kernel/lantiq/ltq-hcd/src/ifxusb_version.h
similarity index 100%
rename from package/platform/lantiq/ltq-hcd/src/ifxusb_version.h
rename to package/kernel/lantiq/ltq-hcd/src/ifxusb_version.h
diff --git a/package/platform/lantiq/ltq-ifxos/Makefile b/package/kernel/lantiq/ltq-ifxos/Makefile
similarity index 100%
rename from package/platform/lantiq/ltq-ifxos/Makefile
rename to package/kernel/lantiq/ltq-ifxos/Makefile
diff --git a/package/platform/lantiq/ltq-ifxos/patches/100-compat.patch b/package/kernel/lantiq/ltq-ifxos/patches/100-compat.patch
similarity index 100%
rename from package/platform/lantiq/ltq-ifxos/patches/100-compat.patch
rename to package/kernel/lantiq/ltq-ifxos/patches/100-compat.patch
diff --git a/package/platform/lantiq/ltq-ptm/Makefile b/package/kernel/lantiq/ltq-ptm/Makefile
similarity index 100%
rename from package/platform/lantiq/ltq-ptm/Makefile
rename to package/kernel/lantiq/ltq-ptm/Makefile
diff --git a/package/platform/lantiq/ltq-ptm/src/Makefile b/package/kernel/lantiq/ltq-ptm/src/Makefile
similarity index 100%
rename from package/platform/lantiq/ltq-ptm/src/Makefile
rename to package/kernel/lantiq/ltq-ptm/src/Makefile
diff --git a/package/platform/lantiq/ltq-ptm/src/ifxmips_ptm_adsl.c b/package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_adsl.c
similarity index 100%
rename from package/platform/lantiq/ltq-ptm/src/ifxmips_ptm_adsl.c
rename to package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_adsl.c
diff --git a/package/platform/lantiq/ltq-ptm/src/ifxmips_ptm_adsl.h b/package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_adsl.h
similarity index 100%
rename from package/platform/lantiq/ltq-ptm/src/ifxmips_ptm_adsl.h
rename to package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_adsl.h
diff --git a/package/platform/lantiq/ltq-ptm/src/ifxmips_ptm_amazon_se.c b/package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_amazon_se.c
similarity index 100%
rename from package/platform/lantiq/ltq-ptm/src/ifxmips_ptm_amazon_se.c
rename to package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_amazon_se.c
diff --git a/package/platform/lantiq/ltq-ptm/src/ifxmips_ptm_ar9.c b/package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_ar9.c
similarity index 100%
rename from package/platform/lantiq/ltq-ptm/src/ifxmips_ptm_ar9.c
rename to package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_ar9.c
diff --git a/package/platform/lantiq/ltq-ptm/src/ifxmips_ptm_common.h b/package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_common.h
similarity index 100%
rename from package/platform/lantiq/ltq-ptm/src/ifxmips_ptm_common.h
rename to package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_common.h
diff --git a/package/platform/lantiq/ltq-ptm/src/ifxmips_ptm_danube.c b/package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_danube.c
similarity index 100%
rename from package/platform/lantiq/ltq-ptm/src/ifxmips_ptm_danube.c
rename to package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_danube.c
diff --git a/package/platform/lantiq/ltq-ptm/src/ifxmips_ptm_fw_amazon_se.h b/package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_fw_amazon_se.h
similarity index 100%
rename from package/platform/lantiq/ltq-ptm/src/ifxmips_ptm_fw_amazon_se.h
rename to package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_fw_amazon_se.h
diff --git a/package/platform/lantiq/ltq-ptm/src/ifxmips_ptm_fw_ar9.h b/package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_fw_ar9.h
similarity index 100%
rename from package/platform/lantiq/ltq-ptm/src/ifxmips_ptm_fw_ar9.h
rename to package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_fw_ar9.h
diff --git a/package/platform/lantiq/ltq-ptm/src/ifxmips_ptm_fw_danube.h b/package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_fw_danube.h
similarity index 100%
rename from package/platform/lantiq/ltq-ptm/src/ifxmips_ptm_fw_danube.h
rename to package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_fw_danube.h
diff --git a/package/platform/lantiq/ltq-ptm/src/ifxmips_ptm_fw_regs_adsl.h b/package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_fw_regs_adsl.h
similarity index 100%
rename from package/platform/lantiq/ltq-ptm/src/ifxmips_ptm_fw_regs_adsl.h
rename to package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_fw_regs_adsl.h
diff --git a/package/platform/lantiq/ltq-ptm/src/ifxmips_ptm_fw_regs_amazon_se.h b/package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_fw_regs_amazon_se.h
similarity index 100%
rename from package/platform/lantiq/ltq-ptm/src/ifxmips_ptm_fw_regs_amazon_se.h
rename to package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_fw_regs_amazon_se.h
diff --git a/package/platform/lantiq/ltq-ptm/src/ifxmips_ptm_fw_regs_ar9.h b/package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_fw_regs_ar9.h
similarity index 100%
rename from package/platform/lantiq/ltq-ptm/src/ifxmips_ptm_fw_regs_ar9.h
rename to package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_fw_regs_ar9.h
diff --git a/package/platform/lantiq/ltq-ptm/src/ifxmips_ptm_fw_regs_danube.h b/package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_fw_regs_danube.h
similarity index 100%
rename from package/platform/lantiq/ltq-ptm/src/ifxmips_ptm_fw_regs_danube.h
rename to package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_fw_regs_danube.h
diff --git a/package/platform/lantiq/ltq-ptm/src/ifxmips_ptm_fw_regs_vdsl.h b/package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_fw_regs_vdsl.h
similarity index 100%
rename from package/platform/lantiq/ltq-ptm/src/ifxmips_ptm_fw_regs_vdsl.h
rename to package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_fw_regs_vdsl.h
diff --git a/package/platform/lantiq/ltq-ptm/src/ifxmips_ptm_fw_regs_vr9.h b/package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_fw_regs_vr9.h
similarity index 100%
rename from package/platform/lantiq/ltq-ptm/src/ifxmips_ptm_fw_regs_vr9.h
rename to package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_fw_regs_vr9.h
diff --git a/package/platform/lantiq/ltq-ptm/src/ifxmips_ptm_fw_vr9.h b/package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_fw_vr9.h
similarity index 100%
rename from package/platform/lantiq/ltq-ptm/src/ifxmips_ptm_fw_vr9.h
rename to package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_fw_vr9.h
diff --git a/package/platform/lantiq/ltq-ptm/src/ifxmips_ptm_ppe_amazon_se.h b/package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_ppe_amazon_se.h
similarity index 100%
rename from package/platform/lantiq/ltq-ptm/src/ifxmips_ptm_ppe_amazon_se.h
rename to package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_ppe_amazon_se.h
diff --git a/package/platform/lantiq/ltq-ptm/src/ifxmips_ptm_ppe_ar9.h b/package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_ppe_ar9.h
similarity index 100%
rename from package/platform/lantiq/ltq-ptm/src/ifxmips_ptm_ppe_ar9.h
rename to package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_ppe_ar9.h
diff --git a/package/platform/lantiq/ltq-ptm/src/ifxmips_ptm_ppe_common.h b/package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_ppe_common.h
similarity index 100%
rename from package/platform/lantiq/ltq-ptm/src/ifxmips_ptm_ppe_common.h
rename to package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_ppe_common.h
diff --git a/package/platform/lantiq/ltq-ptm/src/ifxmips_ptm_ppe_danube.h b/package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_ppe_danube.h
similarity index 100%
rename from package/platform/lantiq/ltq-ptm/src/ifxmips_ptm_ppe_danube.h
rename to package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_ppe_danube.h
diff --git a/package/platform/lantiq/ltq-ptm/src/ifxmips_ptm_ppe_vr9.h b/package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_ppe_vr9.h
similarity index 100%
rename from package/platform/lantiq/ltq-ptm/src/ifxmips_ptm_ppe_vr9.h
rename to package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_ppe_vr9.h
diff --git a/package/platform/lantiq/ltq-ptm/src/ifxmips_ptm_test.c b/package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_test.c
similarity index 100%
rename from package/platform/lantiq/ltq-ptm/src/ifxmips_ptm_test.c
rename to package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_test.c
diff --git a/package/platform/lantiq/ltq-ptm/src/ifxmips_ptm_vdsl.c b/package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_vdsl.c
similarity index 100%
rename from package/platform/lantiq/ltq-ptm/src/ifxmips_ptm_vdsl.c
rename to package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_vdsl.c
diff --git a/package/platform/lantiq/ltq-ptm/src/ifxmips_ptm_vdsl.h b/package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_vdsl.h
similarity index 100%
rename from package/platform/lantiq/ltq-ptm/src/ifxmips_ptm_vdsl.h
rename to package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_vdsl.h
diff --git a/package/platform/lantiq/ltq-ptm/src/ifxmips_ptm_vr9.c b/package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_vr9.c
similarity index 100%
rename from package/platform/lantiq/ltq-ptm/src/ifxmips_ptm_vr9.c
rename to package/kernel/lantiq/ltq-ptm/src/ifxmips_ptm_vr9.c
diff --git a/package/platform/lantiq/ltq-tapi/Config.in b/package/kernel/lantiq/ltq-tapi/Config.in
similarity index 100%
rename from package/platform/lantiq/ltq-tapi/Config.in
rename to package/kernel/lantiq/ltq-tapi/Config.in
diff --git a/package/platform/lantiq/ltq-tapi/Makefile b/package/kernel/lantiq/ltq-tapi/Makefile
similarity index 100%
rename from package/platform/lantiq/ltq-tapi/Makefile
rename to package/kernel/lantiq/ltq-tapi/Makefile
diff --git a/package/platform/lantiq/ltq-tapi/patches/000-portability.patch b/package/kernel/lantiq/ltq-tapi/patches/000-portability.patch
similarity index 100%
rename from package/platform/lantiq/ltq-tapi/patches/000-portability.patch
rename to package/kernel/lantiq/ltq-tapi/patches/000-portability.patch
diff --git a/package/platform/lantiq/ltq-tapi/patches/100-ifxmips.patch b/package/kernel/lantiq/ltq-tapi/patches/100-ifxmips.patch
similarity index 100%
rename from package/platform/lantiq/ltq-tapi/patches/100-ifxmips.patch
rename to package/kernel/lantiq/ltq-tapi/patches/100-ifxmips.patch
diff --git a/package/platform/lantiq/ltq-tapi/patches/200-linux-37.patch b/package/kernel/lantiq/ltq-tapi/patches/200-linux-37.patch
similarity index 100%
rename from package/platform/lantiq/ltq-tapi/patches/200-linux-37.patch
rename to package/kernel/lantiq/ltq-tapi/patches/200-linux-37.patch
diff --git a/package/platform/lantiq/ltq-vdsl-app/Makefile b/package/kernel/lantiq/ltq-vdsl-app/Makefile
similarity index 100%
rename from package/platform/lantiq/ltq-vdsl-app/Makefile
rename to package/kernel/lantiq/ltq-vdsl-app/Makefile
diff --git a/package/platform/lantiq/ltq-vdsl-app/files/dsl_control b/package/kernel/lantiq/ltq-vdsl-app/files/dsl_control
similarity index 100%
rename from package/platform/lantiq/ltq-vdsl-app/files/dsl_control
rename to package/kernel/lantiq/ltq-vdsl-app/files/dsl_control
diff --git a/package/platform/lantiq/ltq-vdsl-app/files/dsl_notify.sh b/package/kernel/lantiq/ltq-vdsl-app/files/dsl_notify.sh
similarity index 100%
rename from package/platform/lantiq/ltq-vdsl-app/files/dsl_notify.sh
rename to package/kernel/lantiq/ltq-vdsl-app/files/dsl_notify.sh
diff --git a/package/platform/lantiq/ltq-vdsl-app/patches/100-compat.patch b/package/kernel/lantiq/ltq-vdsl-app/patches/100-compat.patch
similarity index 100%
rename from package/platform/lantiq/ltq-vdsl-app/patches/100-compat.patch
rename to package/kernel/lantiq/ltq-vdsl-app/patches/100-compat.patch
diff --git a/package/platform/lantiq/ltq-vdsl-fw/Makefile b/package/kernel/lantiq/ltq-vdsl-fw/Makefile
similarity index 100%
rename from package/platform/lantiq/ltq-vdsl-fw/Makefile
rename to package/kernel/lantiq/ltq-vdsl-fw/Makefile
diff --git a/package/platform/lantiq/ltq-vdsl-fw/src/LzmaDecode.c b/package/kernel/lantiq/ltq-vdsl-fw/src/LzmaDecode.c
similarity index 100%
rename from package/platform/lantiq/ltq-vdsl-fw/src/LzmaDecode.c
rename to package/kernel/lantiq/ltq-vdsl-fw/src/LzmaDecode.c
diff --git a/package/platform/lantiq/ltq-vdsl-fw/src/LzmaDecode.h b/package/kernel/lantiq/ltq-vdsl-fw/src/LzmaDecode.h
similarity index 100%
rename from package/platform/lantiq/ltq-vdsl-fw/src/LzmaDecode.h
rename to package/kernel/lantiq/ltq-vdsl-fw/src/LzmaDecode.h
diff --git a/package/platform/lantiq/ltq-vdsl-fw/src/LzmaTypes.h b/package/kernel/lantiq/ltq-vdsl-fw/src/LzmaTypes.h
similarity index 100%
rename from package/platform/lantiq/ltq-vdsl-fw/src/LzmaTypes.h
rename to package/kernel/lantiq/ltq-vdsl-fw/src/LzmaTypes.h
diff --git a/package/platform/lantiq/ltq-vdsl-fw/src/LzmaWrapper.c b/package/kernel/lantiq/ltq-vdsl-fw/src/LzmaWrapper.c
similarity index 100%
rename from package/platform/lantiq/ltq-vdsl-fw/src/LzmaWrapper.c
rename to package/kernel/lantiq/ltq-vdsl-fw/src/LzmaWrapper.c
diff --git a/package/platform/lantiq/ltq-vdsl-fw/src/LzmaWrapper.h b/package/kernel/lantiq/ltq-vdsl-fw/src/LzmaWrapper.h
similarity index 100%
rename from package/platform/lantiq/ltq-vdsl-fw/src/LzmaWrapper.h
rename to package/kernel/lantiq/ltq-vdsl-fw/src/LzmaWrapper.h
diff --git a/package/platform/lantiq/ltq-vdsl-fw/src/Makefile b/package/kernel/lantiq/ltq-vdsl-fw/src/Makefile
similarity index 100%
rename from package/platform/lantiq/ltq-vdsl-fw/src/Makefile
rename to package/kernel/lantiq/ltq-vdsl-fw/src/Makefile
diff --git a/package/platform/lantiq/ltq-vdsl-fw/src/vdsl_fw_install.sh b/package/kernel/lantiq/ltq-vdsl-fw/src/vdsl_fw_install.sh
similarity index 100%
rename from package/platform/lantiq/ltq-vdsl-fw/src/vdsl_fw_install.sh
rename to package/kernel/lantiq/ltq-vdsl-fw/src/vdsl_fw_install.sh
diff --git a/package/platform/lantiq/ltq-vdsl-fw/src/w921v_fw_cutter.c b/package/kernel/lantiq/ltq-vdsl-fw/src/w921v_fw_cutter.c
similarity index 100%
rename from package/platform/lantiq/ltq-vdsl-fw/src/w921v_fw_cutter.c
rename to package/kernel/lantiq/ltq-vdsl-fw/src/w921v_fw_cutter.c
diff --git a/package/platform/lantiq/ltq-vdsl-mei/Makefile b/package/kernel/lantiq/ltq-vdsl-mei/Makefile
similarity index 100%
rename from package/platform/lantiq/ltq-vdsl-mei/Makefile
rename to package/kernel/lantiq/ltq-vdsl-mei/Makefile
diff --git a/package/platform/lantiq/ltq-vdsl-mei/patches/100-compat.patch b/package/kernel/lantiq/ltq-vdsl-mei/patches/100-compat.patch
similarity index 100%
rename from package/platform/lantiq/ltq-vdsl-mei/patches/100-compat.patch
rename to package/kernel/lantiq/ltq-vdsl-mei/patches/100-compat.patch
diff --git a/package/platform/lantiq/ltq-vdsl/Makefile b/package/kernel/lantiq/ltq-vdsl/Makefile
similarity index 100%
rename from package/platform/lantiq/ltq-vdsl/Makefile
rename to package/kernel/lantiq/ltq-vdsl/Makefile
diff --git a/package/platform/lantiq/ltq-vdsl/patches/100-compat.patch b/package/kernel/lantiq/ltq-vdsl/patches/100-compat.patch
similarity index 100%
rename from package/platform/lantiq/ltq-vdsl/patches/100-compat.patch
rename to package/kernel/lantiq/ltq-vdsl/patches/100-compat.patch
diff --git a/package/platform/lantiq/ltq-vmmc/Config.in b/package/kernel/lantiq/ltq-vmmc/Config.in
similarity index 100%
rename from package/platform/lantiq/ltq-vmmc/Config.in
rename to package/kernel/lantiq/ltq-vmmc/Config.in
diff --git a/package/platform/lantiq/ltq-vmmc/Makefile b/package/kernel/lantiq/ltq-vmmc/Makefile
similarity index 100%
rename from package/platform/lantiq/ltq-vmmc/Makefile
rename to package/kernel/lantiq/ltq-vmmc/Makefile
diff --git a/package/platform/lantiq/ltq-vmmc/files/vmmc.init b/package/kernel/lantiq/ltq-vmmc/files/vmmc.init
similarity index 100%
rename from package/platform/lantiq/ltq-vmmc/files/vmmc.init
rename to package/kernel/lantiq/ltq-vmmc/files/vmmc.init
diff --git a/package/platform/lantiq/ltq-vmmc/patches/000-portability.patch b/package/kernel/lantiq/ltq-vmmc/patches/000-portability.patch
similarity index 100%
rename from package/platform/lantiq/ltq-vmmc/patches/000-portability.patch
rename to package/kernel/lantiq/ltq-vmmc/patches/000-portability.patch
diff --git a/package/platform/lantiq/ltq-vmmc/patches/100-target.patch b/package/kernel/lantiq/ltq-vmmc/patches/100-target.patch
similarity index 100%
rename from package/platform/lantiq/ltq-vmmc/patches/100-target.patch
rename to package/kernel/lantiq/ltq-vmmc/patches/100-target.patch
diff --git a/package/platform/lantiq/ltq-vmmc/patches/400-falcon.patch b/package/kernel/lantiq/ltq-vmmc/patches/400-falcon.patch
similarity index 100%
rename from package/platform/lantiq/ltq-vmmc/patches/400-falcon.patch
rename to package/kernel/lantiq/ltq-vmmc/patches/400-falcon.patch
diff --git a/package/kernel/Makefile b/package/kernel/linux/Makefile
similarity index 100%
rename from package/kernel/Makefile
rename to package/kernel/linux/Makefile
diff --git a/package/kernel/modules/001-depends.mk b/package/kernel/linux/modules/001-depends.mk
similarity index 100%
rename from package/kernel/modules/001-depends.mk
rename to package/kernel/linux/modules/001-depends.mk
diff --git a/package/kernel/modules/block.mk b/package/kernel/linux/modules/block.mk
similarity index 100%
rename from package/kernel/modules/block.mk
rename to package/kernel/linux/modules/block.mk
diff --git a/package/kernel/modules/crypto.mk b/package/kernel/linux/modules/crypto.mk
similarity index 100%
rename from package/kernel/modules/crypto.mk
rename to package/kernel/linux/modules/crypto.mk
diff --git a/package/kernel/modules/firewire.mk b/package/kernel/linux/modules/firewire.mk
similarity index 100%
rename from package/kernel/modules/firewire.mk
rename to package/kernel/linux/modules/firewire.mk
diff --git a/package/kernel/modules/fs.mk b/package/kernel/linux/modules/fs.mk
similarity index 100%
rename from package/kernel/modules/fs.mk
rename to package/kernel/linux/modules/fs.mk
diff --git a/package/kernel/modules/hwmon.mk b/package/kernel/linux/modules/hwmon.mk
similarity index 100%
rename from package/kernel/modules/hwmon.mk
rename to package/kernel/linux/modules/hwmon.mk
diff --git a/package/kernel/modules/i2c.mk b/package/kernel/linux/modules/i2c.mk
similarity index 100%
rename from package/kernel/modules/i2c.mk
rename to package/kernel/linux/modules/i2c.mk
diff --git a/package/kernel/modules/input.mk b/package/kernel/linux/modules/input.mk
similarity index 100%
rename from package/kernel/modules/input.mk
rename to package/kernel/linux/modules/input.mk
diff --git a/package/kernel/modules/leds.mk b/package/kernel/linux/modules/leds.mk
similarity index 100%
rename from package/kernel/modules/leds.mk
rename to package/kernel/linux/modules/leds.mk
diff --git a/package/kernel/modules/lib.mk b/package/kernel/linux/modules/lib.mk
similarity index 100%
rename from package/kernel/modules/lib.mk
rename to package/kernel/linux/modules/lib.mk
diff --git a/package/kernel/modules/netdevices.mk b/package/kernel/linux/modules/netdevices.mk
similarity index 100%
rename from package/kernel/modules/netdevices.mk
rename to package/kernel/linux/modules/netdevices.mk
diff --git a/package/kernel/modules/netfilter.mk b/package/kernel/linux/modules/netfilter.mk
similarity index 100%
rename from package/kernel/modules/netfilter.mk
rename to package/kernel/linux/modules/netfilter.mk
diff --git a/package/kernel/modules/netsupport.mk b/package/kernel/linux/modules/netsupport.mk
similarity index 100%
rename from package/kernel/modules/netsupport.mk
rename to package/kernel/linux/modules/netsupport.mk
diff --git a/package/kernel/modules/nls.mk b/package/kernel/linux/modules/nls.mk
similarity index 100%
rename from package/kernel/modules/nls.mk
rename to package/kernel/linux/modules/nls.mk
diff --git a/package/kernel/modules/other.mk b/package/kernel/linux/modules/other.mk
similarity index 100%
rename from package/kernel/modules/other.mk
rename to package/kernel/linux/modules/other.mk
diff --git a/package/kernel/modules/pcmcia.mk b/package/kernel/linux/modules/pcmcia.mk
similarity index 100%
rename from package/kernel/modules/pcmcia.mk
rename to package/kernel/linux/modules/pcmcia.mk
diff --git a/package/kernel/modules/sound.mk b/package/kernel/linux/modules/sound.mk
similarity index 100%
rename from package/kernel/modules/sound.mk
rename to package/kernel/linux/modules/sound.mk
diff --git a/package/kernel/modules/spi.mk b/package/kernel/linux/modules/spi.mk
similarity index 100%
rename from package/kernel/modules/spi.mk
rename to package/kernel/linux/modules/spi.mk
diff --git a/package/kernel/modules/usb.mk b/package/kernel/linux/modules/usb.mk
similarity index 100%
rename from package/kernel/modules/usb.mk
rename to package/kernel/linux/modules/usb.mk
diff --git a/package/kernel/modules/video.mk b/package/kernel/linux/modules/video.mk
similarity index 100%
rename from package/kernel/modules/video.mk
rename to package/kernel/linux/modules/video.mk
diff --git a/package/kernel/modules/virtual.mk b/package/kernel/linux/modules/virtual.mk
similarity index 100%
rename from package/kernel/modules/virtual.mk
rename to package/kernel/linux/modules/virtual.mk
diff --git a/package/kernel/modules/w1.mk b/package/kernel/linux/modules/w1.mk
similarity index 100%
rename from package/kernel/modules/w1.mk
rename to package/kernel/linux/modules/w1.mk
diff --git a/package/kernel/modules/wireless.mk b/package/kernel/linux/modules/wireless.mk
similarity index 100%
rename from package/kernel/modules/wireless.mk
rename to package/kernel/linux/modules/wireless.mk
diff --git a/package/mac80211/Makefile b/package/kernel/mac80211/Makefile
similarity index 100%
rename from package/mac80211/Makefile
rename to package/kernel/mac80211/Makefile
diff --git a/package/mac80211/files/lib/wifi/mac80211.sh b/package/kernel/mac80211/files/lib/wifi/mac80211.sh
similarity index 100%
rename from package/mac80211/files/lib/wifi/mac80211.sh
rename to package/kernel/mac80211/files/lib/wifi/mac80211.sh
diff --git a/package/mac80211/files/regdb.txt b/package/kernel/mac80211/files/regdb.txt
similarity index 100%
rename from package/mac80211/files/regdb.txt
rename to package/kernel/mac80211/files/regdb.txt
diff --git a/package/mac80211/patches/000-fix_kconfig.patch b/package/kernel/mac80211/patches/000-fix_kconfig.patch
similarity index 100%
rename from package/mac80211/patches/000-fix_kconfig.patch
rename to package/kernel/mac80211/patches/000-fix_kconfig.patch
diff --git a/package/mac80211/patches/001-fix_build.patch b/package/kernel/mac80211/patches/001-fix_build.patch
similarity index 100%
rename from package/mac80211/patches/001-fix_build.patch
rename to package/kernel/mac80211/patches/001-fix_build.patch
diff --git a/package/mac80211/patches/002-change_allconfig.patch b/package/kernel/mac80211/patches/002-change_allconfig.patch
similarity index 100%
rename from package/mac80211/patches/002-change_allconfig.patch
rename to package/kernel/mac80211/patches/002-change_allconfig.patch
diff --git a/package/mac80211/patches/010-disable_rfkill.patch b/package/kernel/mac80211/patches/010-disable_rfkill.patch
similarity index 100%
rename from package/mac80211/patches/010-disable_rfkill.patch
rename to package/kernel/mac80211/patches/010-disable_rfkill.patch
diff --git a/package/mac80211/patches/020-disable_tty_set_termios.patch b/package/kernel/mac80211/patches/020-disable_tty_set_termios.patch
similarity index 100%
rename from package/mac80211/patches/020-disable_tty_set_termios.patch
rename to package/kernel/mac80211/patches/020-disable_tty_set_termios.patch
diff --git a/package/mac80211/patches/030-rt2x00_options.patch b/package/kernel/mac80211/patches/030-rt2x00_options.patch
similarity index 100%
rename from package/mac80211/patches/030-rt2x00_options.patch
rename to package/kernel/mac80211/patches/030-rt2x00_options.patch
diff --git a/package/mac80211/patches/040-brcmutil_option.patch b/package/kernel/mac80211/patches/040-brcmutil_option.patch
similarity index 100%
rename from package/mac80211/patches/040-brcmutil_option.patch
rename to package/kernel/mac80211/patches/040-brcmutil_option.patch
diff --git a/package/mac80211/patches/050-lib80211_option.patch b/package/kernel/mac80211/patches/050-lib80211_option.patch
similarity index 100%
rename from package/mac80211/patches/050-lib80211_option.patch
rename to package/kernel/mac80211/patches/050-lib80211_option.patch
diff --git a/package/mac80211/patches/060-no_local_ssb_bcma.patch b/package/kernel/mac80211/patches/060-no_local_ssb_bcma.patch
similarity index 100%
rename from package/mac80211/patches/060-no_local_ssb_bcma.patch
rename to package/kernel/mac80211/patches/060-no_local_ssb_bcma.patch
diff --git a/package/mac80211/patches/150-disable_addr_notifier.patch b/package/kernel/mac80211/patches/150-disable_addr_notifier.patch
similarity index 100%
rename from package/mac80211/patches/150-disable_addr_notifier.patch
rename to package/kernel/mac80211/patches/150-disable_addr_notifier.patch
diff --git a/package/mac80211/patches/201-ath5k-WAR-for-AR71xx-PCI-bug.patch b/package/kernel/mac80211/patches/201-ath5k-WAR-for-AR71xx-PCI-bug.patch
similarity index 100%
rename from package/mac80211/patches/201-ath5k-WAR-for-AR71xx-PCI-bug.patch
rename to package/kernel/mac80211/patches/201-ath5k-WAR-for-AR71xx-PCI-bug.patch
diff --git a/package/mac80211/patches/300-pending_work.patch b/package/kernel/mac80211/patches/300-pending_work.patch
similarity index 100%
rename from package/mac80211/patches/300-pending_work.patch
rename to package/kernel/mac80211/patches/300-pending_work.patch
diff --git a/package/mac80211/patches/310-ap_scan.patch b/package/kernel/mac80211/patches/310-ap_scan.patch
similarity index 100%
rename from package/mac80211/patches/310-ap_scan.patch
rename to package/kernel/mac80211/patches/310-ap_scan.patch
diff --git a/package/mac80211/patches/400-ath_move_debug_code.patch b/package/kernel/mac80211/patches/400-ath_move_debug_code.patch
similarity index 100%
rename from package/mac80211/patches/400-ath_move_debug_code.patch
rename to package/kernel/mac80211/patches/400-ath_move_debug_code.patch
diff --git a/package/mac80211/patches/401-ath9k_blink_default.patch b/package/kernel/mac80211/patches/401-ath9k_blink_default.patch
similarity index 100%
rename from package/mac80211/patches/401-ath9k_blink_default.patch
rename to package/kernel/mac80211/patches/401-ath9k_blink_default.patch
diff --git a/package/mac80211/patches/402-ath9k-fix-invalid-mac-address-handling.patch b/package/kernel/mac80211/patches/402-ath9k-fix-invalid-mac-address-handling.patch
similarity index 100%
rename from package/mac80211/patches/402-ath9k-fix-invalid-mac-address-handling.patch
rename to package/kernel/mac80211/patches/402-ath9k-fix-invalid-mac-address-handling.patch
diff --git a/package/mac80211/patches/403-ath_regd_optional.patch b/package/kernel/mac80211/patches/403-ath_regd_optional.patch
similarity index 100%
rename from package/mac80211/patches/403-ath_regd_optional.patch
rename to package/kernel/mac80211/patches/403-ath_regd_optional.patch
diff --git a/package/mac80211/patches/404-world_regd_fixup.patch b/package/kernel/mac80211/patches/404-world_regd_fixup.patch
similarity index 100%
rename from package/mac80211/patches/404-world_regd_fixup.patch
rename to package/kernel/mac80211/patches/404-world_regd_fixup.patch
diff --git a/package/mac80211/patches/405-regd_no_assoc_hints.patch b/package/kernel/mac80211/patches/405-regd_no_assoc_hints.patch
similarity index 100%
rename from package/mac80211/patches/405-regd_no_assoc_hints.patch
rename to package/kernel/mac80211/patches/405-regd_no_assoc_hints.patch
diff --git a/package/mac80211/patches/406-ath_regd_us.patch b/package/kernel/mac80211/patches/406-ath_regd_us.patch
similarity index 100%
rename from package/mac80211/patches/406-ath_regd_us.patch
rename to package/kernel/mac80211/patches/406-ath_regd_us.patch
diff --git a/package/mac80211/patches/410-ath9k_allow_adhoc_and_ap.patch b/package/kernel/mac80211/patches/410-ath9k_allow_adhoc_and_ap.patch
similarity index 100%
rename from package/mac80211/patches/410-ath9k_allow_adhoc_and_ap.patch
rename to package/kernel/mac80211/patches/410-ath9k_allow_adhoc_and_ap.patch
diff --git a/package/mac80211/patches/411-ath5k_allow_adhoc_and_ap.patch b/package/kernel/mac80211/patches/411-ath5k_allow_adhoc_and_ap.patch
similarity index 100%
rename from package/mac80211/patches/411-ath5k_allow_adhoc_and_ap.patch
rename to package/kernel/mac80211/patches/411-ath5k_allow_adhoc_and_ap.patch
diff --git a/package/mac80211/patches/420-ath5k_disable_fast_cc.patch b/package/kernel/mac80211/patches/420-ath5k_disable_fast_cc.patch
similarity index 100%
rename from package/mac80211/patches/420-ath5k_disable_fast_cc.patch
rename to package/kernel/mac80211/patches/420-ath5k_disable_fast_cc.patch
diff --git a/package/mac80211/patches/430-add_ath5k_platform.patch b/package/kernel/mac80211/patches/430-add_ath5k_platform.patch
similarity index 100%
rename from package/mac80211/patches/430-add_ath5k_platform.patch
rename to package/kernel/mac80211/patches/430-add_ath5k_platform.patch
diff --git a/package/mac80211/patches/431-add_platform_eeprom_support_to_ath5k.patch b/package/kernel/mac80211/patches/431-add_platform_eeprom_support_to_ath5k.patch
similarity index 100%
rename from package/mac80211/patches/431-add_platform_eeprom_support_to_ath5k.patch
rename to package/kernel/mac80211/patches/431-add_platform_eeprom_support_to_ath5k.patch
diff --git a/package/mac80211/patches/432-ath5k_add_pciids.patch b/package/kernel/mac80211/patches/432-ath5k_add_pciids.patch
similarity index 100%
rename from package/mac80211/patches/432-ath5k_add_pciids.patch
rename to package/kernel/mac80211/patches/432-ath5k_add_pciids.patch
diff --git a/package/mac80211/patches/440-ath5k_channel_bw_debugfs.patch b/package/kernel/mac80211/patches/440-ath5k_channel_bw_debugfs.patch
similarity index 100%
rename from package/mac80211/patches/440-ath5k_channel_bw_debugfs.patch
rename to package/kernel/mac80211/patches/440-ath5k_channel_bw_debugfs.patch
diff --git a/package/mac80211/patches/500-ath9k_eeprom_debugfs.patch b/package/kernel/mac80211/patches/500-ath9k_eeprom_debugfs.patch
similarity index 100%
rename from package/mac80211/patches/500-ath9k_eeprom_debugfs.patch
rename to package/kernel/mac80211/patches/500-ath9k_eeprom_debugfs.patch
diff --git a/package/mac80211/patches/501-ath9k-eeprom_endianess.patch b/package/kernel/mac80211/patches/501-ath9k-eeprom_endianess.patch
similarity index 100%
rename from package/mac80211/patches/501-ath9k-eeprom_endianess.patch
rename to package/kernel/mac80211/patches/501-ath9k-eeprom_endianess.patch
diff --git a/package/mac80211/patches/502-ath9k_ahb_init.patch b/package/kernel/mac80211/patches/502-ath9k_ahb_init.patch
similarity index 100%
rename from package/mac80211/patches/502-ath9k_ahb_init.patch
rename to package/kernel/mac80211/patches/502-ath9k_ahb_init.patch
diff --git a/package/mac80211/patches/510-ath9k_intr_mitigation_tweak.patch b/package/kernel/mac80211/patches/510-ath9k_intr_mitigation_tweak.patch
similarity index 100%
rename from package/mac80211/patches/510-ath9k_intr_mitigation_tweak.patch
rename to package/kernel/mac80211/patches/510-ath9k_intr_mitigation_tweak.patch
diff --git a/package/mac80211/patches/511-ath9k_reduce_rxbuf.patch b/package/kernel/mac80211/patches/511-ath9k_reduce_rxbuf.patch
similarity index 100%
rename from package/mac80211/patches/511-ath9k_reduce_rxbuf.patch
rename to package/kernel/mac80211/patches/511-ath9k_reduce_rxbuf.patch
diff --git a/package/mac80211/patches/512-ath9k_channelbw_debugfs.patch b/package/kernel/mac80211/patches/512-ath9k_channelbw_debugfs.patch
similarity index 100%
rename from package/mac80211/patches/512-ath9k_channelbw_debugfs.patch
rename to package/kernel/mac80211/patches/512-ath9k_channelbw_debugfs.patch
diff --git a/package/mac80211/patches/520-mac80211_cur_txpower.patch b/package/kernel/mac80211/patches/520-mac80211_cur_txpower.patch
similarity index 100%
rename from package/mac80211/patches/520-mac80211_cur_txpower.patch
rename to package/kernel/mac80211/patches/520-mac80211_cur_txpower.patch
diff --git a/package/mac80211/patches/521-ath9k_cur_txpower.patch b/package/kernel/mac80211/patches/521-ath9k_cur_txpower.patch
similarity index 100%
rename from package/mac80211/patches/521-ath9k_cur_txpower.patch
rename to package/kernel/mac80211/patches/521-ath9k_cur_txpower.patch
diff --git a/package/mac80211/patches/522-ath9k_per_chain_signal_strength.patch b/package/kernel/mac80211/patches/522-ath9k_per_chain_signal_strength.patch
similarity index 100%
rename from package/mac80211/patches/522-ath9k_per_chain_signal_strength.patch
rename to package/kernel/mac80211/patches/522-ath9k_per_chain_signal_strength.patch
diff --git a/package/mac80211/patches/523-mac80211_configure_antenna_gain.patch b/package/kernel/mac80211/patches/523-mac80211_configure_antenna_gain.patch
similarity index 100%
rename from package/mac80211/patches/523-mac80211_configure_antenna_gain.patch
rename to package/kernel/mac80211/patches/523-mac80211_configure_antenna_gain.patch
diff --git a/package/mac80211/patches/524-ath9k_use_configured_antenna_gain.patch b/package/kernel/mac80211/patches/524-ath9k_use_configured_antenna_gain.patch
similarity index 100%
rename from package/mac80211/patches/524-ath9k_use_configured_antenna_gain.patch
rename to package/kernel/mac80211/patches/524-ath9k_use_configured_antenna_gain.patch
diff --git a/package/mac80211/patches/530-ath9k_extra_leds.patch b/package/kernel/mac80211/patches/530-ath9k_extra_leds.patch
similarity index 100%
rename from package/mac80211/patches/530-ath9k_extra_leds.patch
rename to package/kernel/mac80211/patches/530-ath9k_extra_leds.patch
diff --git a/package/mac80211/patches/531-ath9k_extra_platform_leds.patch b/package/kernel/mac80211/patches/531-ath9k_extra_platform_leds.patch
similarity index 100%
rename from package/mac80211/patches/531-ath9k_extra_platform_leds.patch
rename to package/kernel/mac80211/patches/531-ath9k_extra_platform_leds.patch
diff --git a/package/mac80211/patches/541-ath9k_optimize_interrupt_mitigation.patch b/package/kernel/mac80211/patches/541-ath9k_optimize_interrupt_mitigation.patch
similarity index 100%
rename from package/mac80211/patches/541-ath9k_optimize_interrupt_mitigation.patch
rename to package/kernel/mac80211/patches/541-ath9k_optimize_interrupt_mitigation.patch
diff --git a/package/mac80211/patches/550-ath9k_reduce_ani_interval.patch b/package/kernel/mac80211/patches/550-ath9k_reduce_ani_interval.patch
similarity index 100%
rename from package/mac80211/patches/550-ath9k_reduce_ani_interval.patch
rename to package/kernel/mac80211/patches/550-ath9k_reduce_ani_interval.patch
diff --git a/package/mac80211/patches/552-ath9k_rx_dma_stop_check.patch b/package/kernel/mac80211/patches/552-ath9k_rx_dma_stop_check.patch
similarity index 100%
rename from package/mac80211/patches/552-ath9k_rx_dma_stop_check.patch
rename to package/kernel/mac80211/patches/552-ath9k_rx_dma_stop_check.patch
diff --git a/package/mac80211/patches/553-ath9k_debugfs_diag.patch b/package/kernel/mac80211/patches/553-ath9k_debugfs_diag.patch
similarity index 100%
rename from package/mac80211/patches/553-ath9k_debugfs_diag.patch
rename to package/kernel/mac80211/patches/553-ath9k_debugfs_diag.patch
diff --git a/package/mac80211/patches/554-ath9k_ani_mrc_fix.patch b/package/kernel/mac80211/patches/554-ath9k_ani_mrc_fix.patch
similarity index 100%
rename from package/mac80211/patches/554-ath9k_ani_mrc_fix.patch
rename to package/kernel/mac80211/patches/554-ath9k_ani_mrc_fix.patch
diff --git a/package/mac80211/patches/555-ath9k-allow-to-disable-bands-via-platform-data.patch b/package/kernel/mac80211/patches/555-ath9k-allow-to-disable-bands-via-platform-data.patch
similarity index 100%
rename from package/mac80211/patches/555-ath9k-allow-to-disable-bands-via-platform-data.patch
rename to package/kernel/mac80211/patches/555-ath9k-allow-to-disable-bands-via-platform-data.patch
diff --git a/package/mac80211/patches/556-ath9k_ani_revert.patch b/package/kernel/mac80211/patches/556-ath9k_ani_revert.patch
similarity index 100%
rename from package/mac80211/patches/556-ath9k_ani_revert.patch
rename to package/kernel/mac80211/patches/556-ath9k_ani_revert.patch
diff --git a/package/mac80211/patches/601-rt2x00-set_pci_mwi.patch b/package/kernel/mac80211/patches/601-rt2x00-set_pci_mwi.patch
similarity index 100%
rename from package/mac80211/patches/601-rt2x00-set_pci_mwi.patch
rename to package/kernel/mac80211/patches/601-rt2x00-set_pci_mwi.patch
diff --git a/package/mac80211/patches/602-rt2x00-introduce-rt2x00_platform_h.patch b/package/kernel/mac80211/patches/602-rt2x00-introduce-rt2x00_platform_h.patch
similarity index 100%
rename from package/mac80211/patches/602-rt2x00-introduce-rt2x00_platform_h.patch
rename to package/kernel/mac80211/patches/602-rt2x00-introduce-rt2x00_platform_h.patch
diff --git a/package/mac80211/patches/603-rt2x00-introduce-rt2x00eeprom.patch b/package/kernel/mac80211/patches/603-rt2x00-introduce-rt2x00eeprom.patch
similarity index 100%
rename from package/mac80211/patches/603-rt2x00-introduce-rt2x00eeprom.patch
rename to package/kernel/mac80211/patches/603-rt2x00-introduce-rt2x00eeprom.patch
diff --git a/package/mac80211/patches/605-rt2x00-pci-eeprom.patch b/package/kernel/mac80211/patches/605-rt2x00-pci-eeprom.patch
similarity index 100%
rename from package/mac80211/patches/605-rt2x00-pci-eeprom.patch
rename to package/kernel/mac80211/patches/605-rt2x00-pci-eeprom.patch
diff --git a/package/mac80211/patches/606-rt2x00_no_realign.patch b/package/kernel/mac80211/patches/606-rt2x00_no_realign.patch
similarity index 100%
rename from package/mac80211/patches/606-rt2x00_no_realign.patch
rename to package/kernel/mac80211/patches/606-rt2x00_no_realign.patch
diff --git a/package/mac80211/patches/607-rt2x00-allow_disabling_bands_through_platform_data.patch b/package/kernel/mac80211/patches/607-rt2x00-allow_disabling_bands_through_platform_data.patch
similarity index 100%
rename from package/mac80211/patches/607-rt2x00-allow_disabling_bands_through_platform_data.patch
rename to package/kernel/mac80211/patches/607-rt2x00-allow_disabling_bands_through_platform_data.patch
diff --git a/package/mac80211/patches/608-add_platform_data_mac_addr.patch b/package/kernel/mac80211/patches/608-add_platform_data_mac_addr.patch
similarity index 100%
rename from package/mac80211/patches/608-add_platform_data_mac_addr.patch
rename to package/kernel/mac80211/patches/608-add_platform_data_mac_addr.patch
diff --git a/package/mac80211/patches/610-rt2x00-fix-rt3352-ext-pa.patch b/package/kernel/mac80211/patches/610-rt2x00-fix-rt3352-ext-pa.patch
similarity index 100%
rename from package/mac80211/patches/610-rt2x00-fix-rt3352-ext-pa.patch
rename to package/kernel/mac80211/patches/610-rt2x00-fix-rt3352-ext-pa.patch
diff --git a/package/mac80211/patches/611-rt2x00-rf_vals-rt3352-xtal20.patch b/package/kernel/mac80211/patches/611-rt2x00-rf_vals-rt3352-xtal20.patch
similarity index 100%
rename from package/mac80211/patches/611-rt2x00-rf_vals-rt3352-xtal20.patch
rename to package/kernel/mac80211/patches/611-rt2x00-rf_vals-rt3352-xtal20.patch
diff --git a/package/mac80211/patches/612-rt2x00-make-wmac-loadable-via-OF-on-rt288x-305x-SoC.patch b/package/kernel/mac80211/patches/612-rt2x00-make-wmac-loadable-via-OF-on-rt288x-305x-SoC.patch
similarity index 100%
rename from package/mac80211/patches/612-rt2x00-make-wmac-loadable-via-OF-on-rt288x-305x-SoC.patch
rename to package/kernel/mac80211/patches/612-rt2x00-make-wmac-loadable-via-OF-on-rt288x-305x-SoC.patch
diff --git a/package/mac80211/patches/614-rt2x00-of_load_eeprom_filename.patch b/package/kernel/mac80211/patches/614-rt2x00-of_load_eeprom_filename.patch
similarity index 100%
rename from package/mac80211/patches/614-rt2x00-of_load_eeprom_filename.patch
rename to package/kernel/mac80211/patches/614-rt2x00-of_load_eeprom_filename.patch
diff --git a/package/mac80211/patches/615-rt2x00-fix_20mhz_clk.patch b/package/kernel/mac80211/patches/615-rt2x00-fix_20mhz_clk.patch
similarity index 100%
rename from package/mac80211/patches/615-rt2x00-fix_20mhz_clk.patch
rename to package/kernel/mac80211/patches/615-rt2x00-fix_20mhz_clk.patch
diff --git a/package/mac80211/patches/616-rt2x00-support-rt5350.patch b/package/kernel/mac80211/patches/616-rt2x00-support-rt5350.patch
similarity index 100%
rename from package/mac80211/patches/616-rt2x00-support-rt5350.patch
rename to package/kernel/mac80211/patches/616-rt2x00-support-rt5350.patch
diff --git a/package/mac80211/patches/617-rt2x00-load-eeprom-on-SoC-from-a-mtd-device-defines-.patch b/package/kernel/mac80211/patches/617-rt2x00-load-eeprom-on-SoC-from-a-mtd-device-defines-.patch
similarity index 100%
rename from package/mac80211/patches/617-rt2x00-load-eeprom-on-SoC-from-a-mtd-device-defines-.patch
rename to package/kernel/mac80211/patches/617-rt2x00-load-eeprom-on-SoC-from-a-mtd-device-defines-.patch
diff --git a/package/mac80211/patches/700-mwl8k-missing-pci-id-for-WNR854T.patch b/package/kernel/mac80211/patches/700-mwl8k-missing-pci-id-for-WNR854T.patch
similarity index 100%
rename from package/mac80211/patches/700-mwl8k-missing-pci-id-for-WNR854T.patch
rename to package/kernel/mac80211/patches/700-mwl8k-missing-pci-id-for-WNR854T.patch
diff --git a/package/mac80211/patches/800-b43-gpio-mask-module-option.patch b/package/kernel/mac80211/patches/800-b43-gpio-mask-module-option.patch
similarity index 100%
rename from package/mac80211/patches/800-b43-gpio-mask-module-option.patch
rename to package/kernel/mac80211/patches/800-b43-gpio-mask-module-option.patch
diff --git a/package/mac80211/patches/810-b43_no_pio.patch b/package/kernel/mac80211/patches/810-b43_no_pio.patch
similarity index 100%
rename from package/mac80211/patches/810-b43_no_pio.patch
rename to package/kernel/mac80211/patches/810-b43_no_pio.patch
diff --git a/package/mac80211/patches/820-b43-add-antenna-control.patch b/package/kernel/mac80211/patches/820-b43-add-antenna-control.patch
similarity index 100%
rename from package/mac80211/patches/820-b43-add-antenna-control.patch
rename to package/kernel/mac80211/patches/820-b43-add-antenna-control.patch
diff --git a/package/mac80211/patches/830-b43-workaround-pcie-bcm4716.patch b/package/kernel/mac80211/patches/830-b43-workaround-pcie-bcm4716.patch
similarity index 100%
rename from package/mac80211/patches/830-b43-workaround-pcie-bcm4716.patch
rename to package/kernel/mac80211/patches/830-b43-workaround-pcie-bcm4716.patch
diff --git a/package/mac80211/patches/841-b43-reduce-number-of-RX-slots.patch b/package/kernel/mac80211/patches/841-b43-reduce-number-of-RX-slots.patch
similarity index 100%
rename from package/mac80211/patches/841-b43-reduce-number-of-RX-slots.patch
rename to package/kernel/mac80211/patches/841-b43-reduce-number-of-RX-slots.patch
diff --git a/package/mac80211/patches/845-b43-only-use-gpio-0-1-for-led.patch b/package/kernel/mac80211/patches/845-b43-only-use-gpio-0-1-for-led.patch
similarity index 100%
rename from package/mac80211/patches/845-b43-only-use-gpio-0-1-for-led.patch
rename to package/kernel/mac80211/patches/845-b43-only-use-gpio-0-1-for-led.patch
diff --git a/package/mac80211/patches/851-brcmsmac-remove-extra-regulation-restriction.patch b/package/kernel/mac80211/patches/851-brcmsmac-remove-extra-regulation-restriction.patch
similarity index 100%
rename from package/mac80211/patches/851-brcmsmac-remove-extra-regulation-restriction.patch
rename to package/kernel/mac80211/patches/851-brcmsmac-remove-extra-regulation-restriction.patch
diff --git a/package/system/mmc_over_gpio/Makefile b/package/kernel/mmc_over_gpio/Makefile
similarity index 100%
rename from package/system/mmc_over_gpio/Makefile
rename to package/kernel/mmc_over_gpio/Makefile
diff --git a/package/system/mmc_over_gpio/files/mmc_over_gpio.config b/package/kernel/mmc_over_gpio/files/mmc_over_gpio.config
similarity index 100%
rename from package/system/mmc_over_gpio/files/mmc_over_gpio.config
rename to package/kernel/mmc_over_gpio/files/mmc_over_gpio.config
diff --git a/package/system/mmc_over_gpio/files/mmc_over_gpio.init b/package/kernel/mmc_over_gpio/files/mmc_over_gpio.init
similarity index 100%
rename from package/system/mmc_over_gpio/files/mmc_over_gpio.init
rename to package/kernel/mmc_over_gpio/files/mmc_over_gpio.init
diff --git a/package/system/om-watchdog/Makefile b/package/kernel/om-watchdog/Makefile
similarity index 100%
rename from package/system/om-watchdog/Makefile
rename to package/kernel/om-watchdog/Makefile
diff --git a/package/system/om-watchdog/files/om-watchdog b/package/kernel/om-watchdog/files/om-watchdog
similarity index 100%
rename from package/system/om-watchdog/files/om-watchdog
rename to package/kernel/om-watchdog/files/om-watchdog
diff --git a/package/system/om-watchdog/files/om-watchdog.init b/package/kernel/om-watchdog/files/om-watchdog.init
similarity index 100%
rename from package/system/om-watchdog/files/om-watchdog.init
rename to package/kernel/om-watchdog/files/om-watchdog.init
diff --git a/package/system/rotary-gpio-custom/Makefile b/package/kernel/rotary-gpio-custom/Makefile
similarity index 100%
rename from package/system/rotary-gpio-custom/Makefile
rename to package/kernel/rotary-gpio-custom/Makefile
diff --git a/package/system/rotary-gpio-custom/src/Kconfig b/package/kernel/rotary-gpio-custom/src/Kconfig
similarity index 100%
rename from package/system/rotary-gpio-custom/src/Kconfig
rename to package/kernel/rotary-gpio-custom/src/Kconfig
diff --git a/package/system/rotary-gpio-custom/src/Makefile b/package/kernel/rotary-gpio-custom/src/Makefile
similarity index 100%
rename from package/system/rotary-gpio-custom/src/Makefile
rename to package/kernel/rotary-gpio-custom/src/Makefile
diff --git a/package/system/rotary-gpio-custom/src/rotary-gpio-custom.c b/package/kernel/rotary-gpio-custom/src/rotary-gpio-custom.c
similarity index 100%
rename from package/system/rotary-gpio-custom/src/rotary-gpio-custom.c
rename to package/kernel/rotary-gpio-custom/src/rotary-gpio-custom.c
diff --git a/package/system/rtc-rv5c386a/Makefile b/package/kernel/rtc-rv5c386a/Makefile
similarity index 100%
rename from package/system/rtc-rv5c386a/Makefile
rename to package/kernel/rtc-rv5c386a/Makefile
diff --git a/package/system/rtc-rv5c386a/src/Makefile b/package/kernel/rtc-rv5c386a/src/Makefile
similarity index 100%
rename from package/system/rtc-rv5c386a/src/Makefile
rename to package/kernel/rtc-rv5c386a/src/Makefile
diff --git a/package/system/rtc-rv5c386a/src/rtc.c b/package/kernel/rtc-rv5c386a/src/rtc.c
similarity index 100%
rename from package/system/rtc-rv5c386a/src/rtc.c
rename to package/kernel/rtc-rv5c386a/src/rtc.c
diff --git a/package/system/spi-ks8995/Makefile b/package/kernel/spi-ks8995/Makefile
similarity index 100%
rename from package/system/spi-ks8995/Makefile
rename to package/kernel/spi-ks8995/Makefile
diff --git a/package/system/spi-ks8995/src/Kconfig b/package/kernel/spi-ks8995/src/Kconfig
similarity index 100%
rename from package/system/spi-ks8995/src/Kconfig
rename to package/kernel/spi-ks8995/src/Kconfig
diff --git a/package/system/spi-ks8995/src/Makefile b/package/kernel/spi-ks8995/src/Makefile
similarity index 100%
rename from package/system/spi-ks8995/src/Makefile
rename to package/kernel/spi-ks8995/src/Makefile
diff --git a/package/system/spi-ks8995/src/spi_ks8995.c b/package/kernel/spi-ks8995/src/spi_ks8995.c
similarity index 100%
rename from package/system/spi-ks8995/src/spi_ks8995.c
rename to package/kernel/spi-ks8995/src/spi_ks8995.c
diff --git a/package/switch/Makefile b/package/kernel/switch/Makefile
similarity index 100%
rename from package/switch/Makefile
rename to package/kernel/switch/Makefile
diff --git a/package/switch/files/switch.sh b/package/kernel/switch/files/switch.sh
similarity index 100%
rename from package/switch/files/switch.sh
rename to package/kernel/switch/files/switch.sh
diff --git a/package/switch/src/Makefile b/package/kernel/switch/src/Makefile
similarity index 100%
rename from package/switch/src/Makefile
rename to package/kernel/switch/src/Makefile
diff --git a/package/switch/src/etc53xx.h b/package/kernel/switch/src/etc53xx.h
similarity index 100%
rename from package/switch/src/etc53xx.h
rename to package/kernel/switch/src/etc53xx.h
diff --git a/package/switch/src/gpio.h b/package/kernel/switch/src/gpio.h
similarity index 100%
rename from package/switch/src/gpio.h
rename to package/kernel/switch/src/gpio.h
diff --git a/package/switch/src/switch-adm.c b/package/kernel/switch/src/switch-adm.c
similarity index 100%
rename from package/switch/src/switch-adm.c
rename to package/kernel/switch/src/switch-adm.c
diff --git a/package/switch/src/switch-core.c b/package/kernel/switch/src/switch-core.c
similarity index 100%
rename from package/switch/src/switch-core.c
rename to package/kernel/switch/src/switch-core.c
diff --git a/package/switch/src/switch-core.h b/package/kernel/switch/src/switch-core.h
similarity index 100%
rename from package/switch/src/switch-core.h
rename to package/kernel/switch/src/switch-core.h
diff --git a/package/switch/src/switch-robo.c b/package/kernel/switch/src/switch-robo.c
similarity index 100%
rename from package/switch/src/switch-robo.c
rename to package/kernel/switch/src/switch-robo.c
diff --git a/package/trelay/Makefile b/package/kernel/trelay/Makefile
similarity index 100%
rename from package/trelay/Makefile
rename to package/kernel/trelay/Makefile
diff --git a/package/trelay/files/trelay.config b/package/kernel/trelay/files/trelay.config
similarity index 100%
rename from package/trelay/files/trelay.config
rename to package/kernel/trelay/files/trelay.config
diff --git a/package/trelay/files/trelay.hotplug b/package/kernel/trelay/files/trelay.hotplug
similarity index 100%
rename from package/trelay/files/trelay.hotplug
rename to package/kernel/trelay/files/trelay.hotplug
diff --git a/package/trelay/files/trelay.init b/package/kernel/trelay/files/trelay.init
similarity index 100%
rename from package/trelay/files/trelay.init
rename to package/kernel/trelay/files/trelay.init
diff --git a/package/trelay/src/Makefile b/package/kernel/trelay/src/Makefile
similarity index 100%
rename from package/trelay/src/Makefile
rename to package/kernel/trelay/src/Makefile
diff --git a/package/trelay/src/trelay.c b/package/kernel/trelay/src/trelay.c
similarity index 100%
rename from package/trelay/src/trelay.c
rename to package/kernel/trelay/src/trelay.c
diff --git a/package/system/w1-gpio-custom/Makefile b/package/kernel/w1-gpio-custom/Makefile
similarity index 100%
rename from package/system/w1-gpio-custom/Makefile
rename to package/kernel/w1-gpio-custom/Makefile
diff --git a/package/system/w1-gpio-custom/src/Kconfig b/package/kernel/w1-gpio-custom/src/Kconfig
similarity index 100%
rename from package/system/w1-gpio-custom/src/Kconfig
rename to package/kernel/w1-gpio-custom/src/Kconfig
diff --git a/package/system/w1-gpio-custom/src/Makefile b/package/kernel/w1-gpio-custom/src/Makefile
similarity index 100%
rename from package/system/w1-gpio-custom/src/Makefile
rename to package/kernel/w1-gpio-custom/src/Makefile
diff --git a/package/system/w1-gpio-custom/src/w1-gpio-custom.c b/package/kernel/w1-gpio-custom/src/w1-gpio-custom.c
similarity index 100%
rename from package/system/w1-gpio-custom/src/w1-gpio-custom.c
rename to package/kernel/w1-gpio-custom/src/w1-gpio-custom.c
diff --git a/package/system/wrt55agv2-spidevs/Makefile b/package/kernel/wrt55agv2-spidevs/Makefile
similarity index 100%
rename from package/system/wrt55agv2-spidevs/Makefile
rename to package/kernel/wrt55agv2-spidevs/Makefile
diff --git a/package/system/wrt55agv2-spidevs/src/Kconfig b/package/kernel/wrt55agv2-spidevs/src/Kconfig
similarity index 100%
rename from package/system/wrt55agv2-spidevs/src/Kconfig
rename to package/kernel/wrt55agv2-spidevs/src/Kconfig
diff --git a/package/system/wrt55agv2-spidevs/src/Makefile b/package/kernel/wrt55agv2-spidevs/src/Makefile
similarity index 100%
rename from package/system/wrt55agv2-spidevs/src/Makefile
rename to package/kernel/wrt55agv2-spidevs/src/Makefile
diff --git a/package/system/wrt55agv2-spidevs/src/wrt55agv2_spidevs.c b/package/kernel/wrt55agv2-spidevs/src/wrt55agv2_spidevs.c
similarity index 100%
rename from package/system/wrt55agv2-spidevs/src/wrt55agv2_spidevs.c
rename to package/kernel/wrt55agv2-spidevs/src/wrt55agv2_spidevs.c
diff --git a/package/toolchain/Makefile b/package/libs/toolchain/Makefile
similarity index 100%
rename from package/toolchain/Makefile
rename to package/libs/toolchain/Makefile
diff --git a/package/toolchain/eglibc-files/etc/nsswitch.conf b/package/libs/toolchain/eglibc-files/etc/nsswitch.conf
similarity index 100%
rename from package/toolchain/eglibc-files/etc/nsswitch.conf
rename to package/libs/toolchain/eglibc-files/etc/nsswitch.conf
diff --git a/package/linux-atm/Makefile b/package/network/utils/linux-atm/Makefile
similarity index 100%
rename from package/linux-atm/Makefile
rename to package/network/utils/linux-atm/Makefile
diff --git a/package/linux-atm/files/br2684ctl b/package/network/utils/linux-atm/files/br2684ctl
similarity index 100%
rename from package/linux-atm/files/br2684ctl
rename to package/network/utils/linux-atm/files/br2684ctl
diff --git a/package/linux-atm/patches/000-debian_16.patch b/package/network/utils/linux-atm/patches/000-debian_16.patch
similarity index 100%
rename from package/linux-atm/patches/000-debian_16.patch
rename to package/network/utils/linux-atm/patches/000-debian_16.patch
diff --git a/package/linux-atm/patches/200-no_libfl.patch b/package/network/utils/linux-atm/patches/200-no_libfl.patch
similarity index 100%
rename from package/linux-atm/patches/200-no_libfl.patch
rename to package/network/utils/linux-atm/patches/200-no_libfl.patch
diff --git a/package/linux-atm/patches/300-objcopy_path.patch b/package/network/utils/linux-atm/patches/300-objcopy_path.patch
similarity index 100%
rename from package/linux-atm/patches/300-objcopy_path.patch
rename to package/network/utils/linux-atm/patches/300-objcopy_path.patch
diff --git a/package/linux-atm/patches/400-portability_fixes.patch b/package/network/utils/linux-atm/patches/400-portability_fixes.patch
similarity index 100%
rename from package/linux-atm/patches/400-portability_fixes.patch
rename to package/network/utils/linux-atm/patches/400-portability_fixes.patch
diff --git a/package/mountd/Makefile b/package/system/mountd/Makefile
similarity index 100%
rename from package/mountd/Makefile
rename to package/system/mountd/Makefile
diff --git a/package/mountd/files/mountd.config b/package/system/mountd/files/mountd.config
similarity index 100%
rename from package/mountd/files/mountd.config
rename to package/system/mountd/files/mountd.config
diff --git a/package/mountd/files/mountd.init b/package/system/mountd/files/mountd.init
similarity index 100%
rename from package/mountd/files/mountd.init
rename to package/system/mountd/files/mountd.init
diff --git a/package/mountd/patches/010-uci_rename_history_to_delta.patch b/package/system/mountd/patches/010-uci_rename_history_to_delta.patch
similarity index 100%
rename from package/mountd/patches/010-uci_rename_history_to_delta.patch
rename to package/system/mountd/patches/010-uci_rename_history_to_delta.patch
diff --git a/package/mountd/patches/020-handle_timeout.patch b/package/system/mountd/patches/020-handle_timeout.patch
similarity index 100%
rename from package/mountd/patches/020-handle_timeout.patch
rename to package/system/mountd/patches/020-handle_timeout.patch
diff --git a/package/mountd/patches/030-ext4_support.patch b/package/system/mountd/patches/030-ext4_support.patch
similarity index 100%
rename from package/mountd/patches/030-ext4_support.patch
rename to package/system/mountd/patches/030-ext4_support.patch
diff --git a/package/mountd/patches/040-optional-daemonize.patch b/package/system/mountd/patches/040-optional-daemonize.patch
similarity index 100%
rename from package/mountd/patches/040-optional-daemonize.patch
rename to package/system/mountd/patches/040-optional-daemonize.patch
diff --git a/package/mtd/Makefile b/package/system/mtd/Makefile
similarity index 100%
rename from package/mtd/Makefile
rename to package/system/mtd/Makefile
diff --git a/package/mtd/src/Makefile b/package/system/mtd/src/Makefile
similarity index 100%
rename from package/mtd/src/Makefile
rename to package/system/mtd/src/Makefile
diff --git a/package/mtd/src/crc32.c b/package/system/mtd/src/crc32.c
similarity index 100%
rename from package/mtd/src/crc32.c
rename to package/system/mtd/src/crc32.c
diff --git a/package/mtd/src/crc32.h b/package/system/mtd/src/crc32.h
similarity index 100%
rename from package/mtd/src/crc32.h
rename to package/system/mtd/src/crc32.h
diff --git a/package/mtd/src/fis.c b/package/system/mtd/src/fis.c
similarity index 100%
rename from package/mtd/src/fis.c
rename to package/system/mtd/src/fis.c
diff --git a/package/mtd/src/fis.h b/package/system/mtd/src/fis.h
similarity index 100%
rename from package/mtd/src/fis.h
rename to package/system/mtd/src/fis.h
diff --git a/package/mtd/src/imagetag.c b/package/system/mtd/src/imagetag.c
similarity index 100%
rename from package/mtd/src/imagetag.c
rename to package/system/mtd/src/imagetag.c
diff --git a/package/mtd/src/jffs2.c b/package/system/mtd/src/jffs2.c
similarity index 100%
rename from package/mtd/src/jffs2.c
rename to package/system/mtd/src/jffs2.c
diff --git a/package/mtd/src/jffs2.h b/package/system/mtd/src/jffs2.h
similarity index 100%
rename from package/mtd/src/jffs2.h
rename to package/system/mtd/src/jffs2.h
diff --git a/package/mtd/src/md5.c b/package/system/mtd/src/md5.c
similarity index 100%
rename from package/mtd/src/md5.c
rename to package/system/mtd/src/md5.c
diff --git a/package/mtd/src/md5.h b/package/system/mtd/src/md5.h
similarity index 100%
rename from package/mtd/src/md5.h
rename to package/system/mtd/src/md5.h
diff --git a/package/mtd/src/mtd.c b/package/system/mtd/src/mtd.c
similarity index 100%
rename from package/mtd/src/mtd.c
rename to package/system/mtd/src/mtd.c
diff --git a/package/mtd/src/mtd.h b/package/system/mtd/src/mtd.h
similarity index 100%
rename from package/mtd/src/mtd.h
rename to package/system/mtd/src/mtd.h
diff --git a/package/mtd/src/seama.c b/package/system/mtd/src/seama.c
similarity index 100%
rename from package/mtd/src/seama.c
rename to package/system/mtd/src/seama.c
diff --git a/package/mtd/src/seama.h b/package/system/mtd/src/seama.h
similarity index 100%
rename from package/mtd/src/seama.h
rename to package/system/mtd/src/seama.h
diff --git a/package/mtd/src/trx.c b/package/system/mtd/src/trx.c
similarity index 100%
rename from package/mtd/src/trx.c
rename to package/system/mtd/src/trx.c
diff --git a/package/opkg/Makefile b/package/system/opkg/Makefile
similarity index 100%
rename from package/opkg/Makefile
rename to package/system/opkg/Makefile
diff --git a/package/opkg/files/opkg.conf b/package/system/opkg/files/opkg.conf
similarity index 100%
rename from package/opkg/files/opkg.conf
rename to package/system/opkg/files/opkg.conf
diff --git a/package/opkg/patches/001-ship-pkg-m4.patch b/package/system/opkg/patches/001-ship-pkg-m4.patch
similarity index 100%
rename from package/opkg/patches/001-ship-pkg-m4.patch
rename to package/system/opkg/patches/001-ship-pkg-m4.patch
diff --git a/package/opkg/patches/002-no-shave.patch b/package/system/opkg/patches/002-no-shave.patch
similarity index 100%
rename from package/opkg/patches/002-no-shave.patch
rename to package/system/opkg/patches/002-no-shave.patch
diff --git a/package/opkg/patches/004-host_cpu.patch b/package/system/opkg/patches/004-host_cpu.patch
similarity index 100%
rename from package/opkg/patches/004-host_cpu.patch
rename to package/system/opkg/patches/004-host_cpu.patch
diff --git a/package/opkg/patches/007-force_static.patch b/package/system/opkg/patches/007-force_static.patch
similarity index 100%
rename from package/opkg/patches/007-force_static.patch
rename to package/system/opkg/patches/007-force_static.patch
diff --git a/package/opkg/patches/009-remove-upgrade-all.patch b/package/system/opkg/patches/009-remove-upgrade-all.patch
similarity index 100%
rename from package/opkg/patches/009-remove-upgrade-all.patch
rename to package/system/opkg/patches/009-remove-upgrade-all.patch
diff --git a/package/opkg/patches/011-old-config-location.patch b/package/system/opkg/patches/011-old-config-location.patch
similarity index 100%
rename from package/opkg/patches/011-old-config-location.patch
rename to package/system/opkg/patches/011-old-config-location.patch
diff --git a/package/opkg/patches/012-strip-trailing-conffiles-whitespace.patch b/package/system/opkg/patches/012-strip-trailing-conffiles-whitespace.patch
similarity index 100%
rename from package/opkg/patches/012-strip-trailing-conffiles-whitespace.patch
rename to package/system/opkg/patches/012-strip-trailing-conffiles-whitespace.patch
diff --git a/package/opkg/patches/014-errors-to-stderr.patch b/package/system/opkg/patches/014-errors-to-stderr.patch
similarity index 100%
rename from package/opkg/patches/014-errors-to-stderr.patch
rename to package/system/opkg/patches/014-errors-to-stderr.patch
diff --git a/package/opkg/patches/020-avoid_getline.patch b/package/system/opkg/patches/020-avoid_getline.patch
similarity index 100%
rename from package/opkg/patches/020-avoid_getline.patch
rename to package/system/opkg/patches/020-avoid_getline.patch
diff --git a/package/opkg/patches/030-fix-double-free.patch b/package/system/opkg/patches/030-fix-double-free.patch
similarity index 100%
rename from package/opkg/patches/030-fix-double-free.patch
rename to package/system/opkg/patches/030-fix-double-free.patch
diff --git a/package/opkg/patches/040-wrap-descriptions-only-on-ttys.patch b/package/system/opkg/patches/040-wrap-descriptions-only-on-ttys.patch
similarity index 100%
rename from package/opkg/patches/040-wrap-descriptions-only-on-ttys.patch
rename to package/system/opkg/patches/040-wrap-descriptions-only-on-ttys.patch
diff --git a/package/opkg/patches/050-add-case-insensitive-flag.patch b/package/system/opkg/patches/050-add-case-insensitive-flag.patch
similarity index 100%
rename from package/opkg/patches/050-add-case-insensitive-flag.patch
rename to package/system/opkg/patches/050-add-case-insensitive-flag.patch
diff --git a/package/opkg/patches/060-add-find-command.patch b/package/system/opkg/patches/060-add-find-command.patch
similarity index 100%
rename from package/opkg/patches/060-add-find-command.patch
rename to package/system/opkg/patches/060-add-find-command.patch
diff --git a/package/opkg/patches/070-use_gzipped_pkg_list.patch b/package/system/opkg/patches/070-use_gzipped_pkg_list.patch
similarity index 100%
rename from package/opkg/patches/070-use_gzipped_pkg_list.patch
rename to package/system/opkg/patches/070-use_gzipped_pkg_list.patch
diff --git a/package/procd/Makefile b/package/system/procd/Makefile
similarity index 100%
rename from package/procd/Makefile
rename to package/system/procd/Makefile
diff --git a/package/procd/files/hotplug-preinit.json b/package/system/procd/files/hotplug-preinit.json
similarity index 100%
rename from package/procd/files/hotplug-preinit.json
rename to package/system/procd/files/hotplug-preinit.json
diff --git a/package/procd/files/hotplug.json b/package/system/procd/files/hotplug.json
similarity index 100%
rename from package/procd/files/hotplug.json
rename to package/system/procd/files/hotplug.json
diff --git a/package/procd/files/procd.init b/package/system/procd/files/procd.init
similarity index 100%
rename from package/procd/files/procd.init
rename to package/system/procd/files/procd.init
diff --git a/package/procd/files/procd.sh b/package/system/procd/files/procd.sh
similarity index 100%
rename from package/procd/files/procd.sh
rename to package/system/procd/files/procd.sh
diff --git a/package/ubox/Makefile b/package/system/ubox/Makefile
similarity index 100%
rename from package/ubox/Makefile
rename to package/system/ubox/Makefile
diff --git a/package/ubox/files/mount.hotplug b/package/system/ubox/files/mount.hotplug
similarity index 100%
rename from package/ubox/files/mount.hotplug
rename to package/system/ubox/files/mount.hotplug
diff --git a/package/ubus/Makefile b/package/system/ubus/Makefile
similarity index 100%
rename from package/ubus/Makefile
rename to package/system/ubus/Makefile
diff --git a/package/ubus/files/ubus.init b/package/system/ubus/files/ubus.init
similarity index 100%
rename from package/ubus/files/ubus.init
rename to package/system/ubus/files/ubus.init
diff --git a/package/uci/Makefile b/package/system/uci/Makefile
similarity index 100%
rename from package/uci/Makefile
rename to package/system/uci/Makefile
diff --git a/package/uci/files/lib/config/uci.sh b/package/system/uci/files/lib/config/uci.sh
similarity index 100%
rename from package/uci/files/lib/config/uci.sh
rename to package/system/uci/files/lib/config/uci.sh
diff --git a/package/udev/Config.in b/package/system/udev/Config.in
similarity index 100%
rename from package/udev/Config.in
rename to package/system/udev/Config.in
diff --git a/package/udev/Makefile b/package/system/udev/Makefile
similarity index 100%
rename from package/udev/Makefile
rename to package/system/udev/Makefile
diff --git a/package/udev/patches/0001-build-don-t-use-gc-sections.patch b/package/system/udev/patches/0001-build-don-t-use-gc-sections.patch
similarity index 100%
rename from package/udev/patches/0001-build-don-t-use-gc-sections.patch
rename to package/system/udev/patches/0001-build-don-t-use-gc-sections.patch
diff --git a/package/udev/patches/0002-udevd-add-lrt-for-message-queue-symbols.patch b/package/system/udev/patches/0002-udevd-add-lrt-for-message-queue-symbols.patch
similarity index 100%
rename from package/udev/patches/0002-udevd-add-lrt-for-message-queue-symbols.patch
rename to package/system/udev/patches/0002-udevd-add-lrt-for-message-queue-symbols.patch
diff --git a/package/udev/patches/0003-add_btn_trigger_happy_define.patch b/package/system/udev/patches/0003-add_btn_trigger_happy_define.patch
similarity index 100%
rename from package/udev/patches/0003-add_btn_trigger_happy_define.patch
rename to package/system/udev/patches/0003-add_btn_trigger_happy_define.patch
diff --git a/package/zram-swap/Makefile b/package/system/zram-swap/Makefile
similarity index 100%
rename from package/zram-swap/Makefile
rename to package/system/zram-swap/Makefile
diff --git a/package/zram-swap/files/zram.init b/package/system/zram-swap/files/zram.init
similarity index 100%
rename from package/zram-swap/files/zram.init
rename to package/system/zram-swap/files/zram.init
diff --git a/package/admswconfig/Makefile b/package/utils/admswconfig/Makefile
similarity index 100%
rename from package/admswconfig/Makefile
rename to package/utils/admswconfig/Makefile
diff --git a/package/admswconfig/files/admswconfig b/package/utils/admswconfig/files/admswconfig
similarity index 100%
rename from package/admswconfig/files/admswconfig
rename to package/utils/admswconfig/files/admswconfig
diff --git a/package/admswconfig/files/admswswitch.sh b/package/utils/admswconfig/files/admswswitch.sh
similarity index 100%
rename from package/admswconfig/files/admswswitch.sh
rename to package/utils/admswconfig/files/admswswitch.sh
diff --git a/package/admswconfig/patches/001-matrix.patch b/package/utils/admswconfig/patches/001-matrix.patch
similarity index 100%
rename from package/admswconfig/patches/001-matrix.patch
rename to package/utils/admswconfig/patches/001-matrix.patch
diff --git a/package/utils/busybox/Config.in b/package/utils/busybox/Config.in
new file mode 100644
index 0000000000..5e3a8406be
--- /dev/null
+++ b/package/utils/busybox/Config.in
@@ -0,0 +1,6 @@
+
+if PACKAGE_busybox
+
+source "package/utils/busybox/config/Config.in"
+
+endif
diff --git a/package/busybox/Makefile b/package/utils/busybox/Makefile
similarity index 100%
rename from package/busybox/Makefile
rename to package/utils/busybox/Makefile
diff --git a/package/busybox/config/Config.in b/package/utils/busybox/config/Config.in
similarity index 95%
rename from package/busybox/config/Config.in
rename to package/utils/busybox/config/Config.in
index 00450364fb..f9521de320 100644
--- a/package/busybox/config/Config.in
+++ b/package/utils/busybox/config/Config.in
@@ -750,29 +750,29 @@ config BUSYBOX_CONFIG_PREFIX
 
 endmenu
 
-source package/busybox/config/libbb/Config.in
+source package/utils/busybox/config/libbb/Config.in
 
 endmenu
 
 comment "Applets"
 
-source package/busybox/config/archival/Config.in
-source package/busybox/config/coreutils/Config.in
-source package/busybox/config/console-tools/Config.in
-source package/busybox/config/debianutils/Config.in
-source package/busybox/config/editors/Config.in
-source package/busybox/config/findutils/Config.in
-source package/busybox/config/init/Config.in
-source package/busybox/config/loginutils/Config.in
-source package/busybox/config/e2fsprogs/Config.in
-source package/busybox/config/modutils/Config.in
-source package/busybox/config/util-linux/Config.in
-source package/busybox/config/miscutils/Config.in
-source package/busybox/config/networking/Config.in
-source package/busybox/config/printutils/Config.in
-source package/busybox/config/mailutils/Config.in
-source package/busybox/config/procps/Config.in
-source package/busybox/config/runit/Config.in
-source package/busybox/config/selinux/Config.in
-source package/busybox/config/shell/Config.in
-source package/busybox/config/sysklogd/Config.in
+source package/utils/busybox/config/archival/Config.in
+source package/utils/busybox/config/coreutils/Config.in
+source package/utils/busybox/config/console-tools/Config.in
+source package/utils/busybox/config/debianutils/Config.in
+source package/utils/busybox/config/editors/Config.in
+source package/utils/busybox/config/findutils/Config.in
+source package/utils/busybox/config/init/Config.in
+source package/utils/busybox/config/loginutils/Config.in
+source package/utils/busybox/config/e2fsprogs/Config.in
+source package/utils/busybox/config/modutils/Config.in
+source package/utils/busybox/config/util-linux/Config.in
+source package/utils/busybox/config/miscutils/Config.in
+source package/utils/busybox/config/networking/Config.in
+source package/utils/busybox/config/printutils/Config.in
+source package/utils/busybox/config/mailutils/Config.in
+source package/utils/busybox/config/procps/Config.in
+source package/utils/busybox/config/runit/Config.in
+source package/utils/busybox/config/selinux/Config.in
+source package/utils/busybox/config/shell/Config.in
+source package/utils/busybox/config/sysklogd/Config.in
diff --git a/package/busybox/config/archival/Config.in b/package/utils/busybox/config/archival/Config.in
similarity index 100%
rename from package/busybox/config/archival/Config.in
rename to package/utils/busybox/config/archival/Config.in
diff --git a/package/busybox/config/console-tools/Config.in b/package/utils/busybox/config/console-tools/Config.in
similarity index 100%
rename from package/busybox/config/console-tools/Config.in
rename to package/utils/busybox/config/console-tools/Config.in
diff --git a/package/busybox/config/coreutils/Config.in b/package/utils/busybox/config/coreutils/Config.in
similarity index 100%
rename from package/busybox/config/coreutils/Config.in
rename to package/utils/busybox/config/coreutils/Config.in
diff --git a/package/busybox/config/debianutils/Config.in b/package/utils/busybox/config/debianutils/Config.in
similarity index 100%
rename from package/busybox/config/debianutils/Config.in
rename to package/utils/busybox/config/debianutils/Config.in
diff --git a/package/busybox/config/e2fsprogs/Config.in b/package/utils/busybox/config/e2fsprogs/Config.in
similarity index 100%
rename from package/busybox/config/e2fsprogs/Config.in
rename to package/utils/busybox/config/e2fsprogs/Config.in
diff --git a/package/busybox/config/e2fsprogs/old_e2fsprogs/Config.in b/package/utils/busybox/config/e2fsprogs/old_e2fsprogs/Config.in
similarity index 100%
rename from package/busybox/config/e2fsprogs/old_e2fsprogs/Config.in
rename to package/utils/busybox/config/e2fsprogs/old_e2fsprogs/Config.in
diff --git a/package/busybox/config/editors/Config.in b/package/utils/busybox/config/editors/Config.in
similarity index 100%
rename from package/busybox/config/editors/Config.in
rename to package/utils/busybox/config/editors/Config.in
diff --git a/package/busybox/config/findutils/Config.in b/package/utils/busybox/config/findutils/Config.in
similarity index 100%
rename from package/busybox/config/findutils/Config.in
rename to package/utils/busybox/config/findutils/Config.in
diff --git a/package/busybox/config/init/Config.in b/package/utils/busybox/config/init/Config.in
similarity index 100%
rename from package/busybox/config/init/Config.in
rename to package/utils/busybox/config/init/Config.in
diff --git a/package/busybox/config/libbb/Config.in b/package/utils/busybox/config/libbb/Config.in
similarity index 100%
rename from package/busybox/config/libbb/Config.in
rename to package/utils/busybox/config/libbb/Config.in
diff --git a/package/busybox/config/loginutils/Config.in b/package/utils/busybox/config/loginutils/Config.in
similarity index 100%
rename from package/busybox/config/loginutils/Config.in
rename to package/utils/busybox/config/loginutils/Config.in
diff --git a/package/busybox/config/mailutils/Config.in b/package/utils/busybox/config/mailutils/Config.in
similarity index 100%
rename from package/busybox/config/mailutils/Config.in
rename to package/utils/busybox/config/mailutils/Config.in
diff --git a/package/busybox/config/miscutils/Config.in b/package/utils/busybox/config/miscutils/Config.in
similarity index 100%
rename from package/busybox/config/miscutils/Config.in
rename to package/utils/busybox/config/miscutils/Config.in
diff --git a/package/busybox/config/modutils/Config.in b/package/utils/busybox/config/modutils/Config.in
similarity index 100%
rename from package/busybox/config/modutils/Config.in
rename to package/utils/busybox/config/modutils/Config.in
diff --git a/package/busybox/config/networking/Config.in b/package/utils/busybox/config/networking/Config.in
similarity index 99%
rename from package/busybox/config/networking/Config.in
rename to package/utils/busybox/config/networking/Config.in
index 3df7b1f129..442eb03428 100644
--- a/package/busybox/config/networking/Config.in
+++ b/package/utils/busybox/config/networking/Config.in
@@ -1007,7 +1007,7 @@ config BUSYBOX_CONFIG_FEATURE_TUNCTL_UG
 	  Allow to specify owner and group of newly created interface.
 	  340 bytes of pure bloat. Say no here.
 
-source package/busybox/config/networking/udhcp/Config.in
+source package/utils/busybox/config/networking/udhcp/Config.in
 
 config BUSYBOX_CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS
 	string "ifup udhcpc command line options"
diff --git a/package/busybox/config/networking/udhcp/Config.in b/package/utils/busybox/config/networking/udhcp/Config.in
similarity index 100%
rename from package/busybox/config/networking/udhcp/Config.in
rename to package/utils/busybox/config/networking/udhcp/Config.in
diff --git a/package/busybox/config/printutils/Config.in b/package/utils/busybox/config/printutils/Config.in
similarity index 100%
rename from package/busybox/config/printutils/Config.in
rename to package/utils/busybox/config/printutils/Config.in
diff --git a/package/busybox/config/procps/Config.in b/package/utils/busybox/config/procps/Config.in
similarity index 100%
rename from package/busybox/config/procps/Config.in
rename to package/utils/busybox/config/procps/Config.in
diff --git a/package/busybox/config/runit/Config.in b/package/utils/busybox/config/runit/Config.in
similarity index 100%
rename from package/busybox/config/runit/Config.in
rename to package/utils/busybox/config/runit/Config.in
diff --git a/package/busybox/config/selinux/Config.in b/package/utils/busybox/config/selinux/Config.in
similarity index 100%
rename from package/busybox/config/selinux/Config.in
rename to package/utils/busybox/config/selinux/Config.in
diff --git a/package/busybox/config/shell/Config.in b/package/utils/busybox/config/shell/Config.in
similarity index 100%
rename from package/busybox/config/shell/Config.in
rename to package/utils/busybox/config/shell/Config.in
diff --git a/package/busybox/config/sysklogd/Config.in b/package/utils/busybox/config/sysklogd/Config.in
similarity index 100%
rename from package/busybox/config/sysklogd/Config.in
rename to package/utils/busybox/config/sysklogd/Config.in
diff --git a/package/busybox/config/util-linux/Config.in b/package/utils/busybox/config/util-linux/Config.in
similarity index 100%
rename from package/busybox/config/util-linux/Config.in
rename to package/utils/busybox/config/util-linux/Config.in
diff --git a/package/busybox/convert_menuconfig.pl b/package/utils/busybox/convert_menuconfig.pl
similarity index 100%
rename from package/busybox/convert_menuconfig.pl
rename to package/utils/busybox/convert_menuconfig.pl
diff --git a/package/busybox/files/cron b/package/utils/busybox/files/cron
similarity index 100%
rename from package/busybox/files/cron
rename to package/utils/busybox/files/cron
diff --git a/package/busybox/files/telnet b/package/utils/busybox/files/telnet
similarity index 100%
rename from package/busybox/files/telnet
rename to package/utils/busybox/files/telnet
diff --git a/package/busybox/patches/001-init_avoid_loop_opening_tty.patch b/package/utils/busybox/patches/001-init_avoid_loop_opening_tty.patch
similarity index 100%
rename from package/busybox/patches/001-init_avoid_loop_opening_tty.patch
rename to package/utils/busybox/patches/001-init_avoid_loop_opening_tty.patch
diff --git a/package/busybox/patches/002-passwd_use_md5_hash_by_default_like_it_used_to_be.patch b/package/utils/busybox/patches/002-passwd_use_md5_hash_by_default_like_it_used_to_be.patch
similarity index 100%
rename from package/busybox/patches/002-passwd_use_md5_hash_by_default_like_it_used_to_be.patch
rename to package/utils/busybox/patches/002-passwd_use_md5_hash_by_default_like_it_used_to_be.patch
diff --git a/package/busybox/patches/003-brctl_show_fix.patch b/package/utils/busybox/patches/003-brctl_show_fix.patch
similarity index 100%
rename from package/busybox/patches/003-brctl_show_fix.patch
rename to package/utils/busybox/patches/003-brctl_show_fix.patch
diff --git a/package/busybox/patches/004-upstream-percent_decode_in_place.patch b/package/utils/busybox/patches/004-upstream-percent_decode_in_place.patch
similarity index 100%
rename from package/busybox/patches/004-upstream-percent_decode_in_place.patch
rename to package/utils/busybox/patches/004-upstream-percent_decode_in_place.patch
diff --git a/package/busybox/patches/005-resource_h_include.patch b/package/utils/busybox/patches/005-resource_h_include.patch
similarity index 100%
rename from package/busybox/patches/005-resource_h_include.patch
rename to package/utils/busybox/patches/005-resource_h_include.patch
diff --git a/package/busybox/patches/006-upstream_CVE-2011-2716_fixes.patch b/package/utils/busybox/patches/006-upstream_CVE-2011-2716_fixes.patch
similarity index 100%
rename from package/busybox/patches/006-upstream_CVE-2011-2716_fixes.patch
rename to package/utils/busybox/patches/006-upstream_CVE-2011-2716_fixes.patch
diff --git a/package/busybox/patches/007-upstream_mkfs_ext2_fixes.patch b/package/utils/busybox/patches/007-upstream_mkfs_ext2_fixes.patch
similarity index 100%
rename from package/busybox/patches/007-upstream_mkfs_ext2_fixes.patch
rename to package/utils/busybox/patches/007-upstream_mkfs_ext2_fixes.patch
diff --git a/package/busybox/patches/110-wget_getopt_fix.patch b/package/utils/busybox/patches/110-wget_getopt_fix.patch
similarity index 100%
rename from package/busybox/patches/110-wget_getopt_fix.patch
rename to package/utils/busybox/patches/110-wget_getopt_fix.patch
diff --git a/package/busybox/patches/140-trylink_bash.patch b/package/utils/busybox/patches/140-trylink_bash.patch
similarity index 100%
rename from package/busybox/patches/140-trylink_bash.patch
rename to package/utils/busybox/patches/140-trylink_bash.patch
diff --git a/package/busybox/patches/141-gen_build_files_bash.patch b/package/utils/busybox/patches/141-gen_build_files_bash.patch
similarity index 100%
rename from package/busybox/patches/141-gen_build_files_bash.patch
rename to package/utils/busybox/patches/141-gen_build_files_bash.patch
diff --git a/package/busybox/patches/150-no_static_libgcc.patch b/package/utils/busybox/patches/150-no_static_libgcc.patch
similarity index 100%
rename from package/busybox/patches/150-no_static_libgcc.patch
rename to package/utils/busybox/patches/150-no_static_libgcc.patch
diff --git a/package/busybox/patches/200-etc_crontabs.patch b/package/utils/busybox/patches/200-etc_crontabs.patch
similarity index 100%
rename from package/busybox/patches/200-etc_crontabs.patch
rename to package/utils/busybox/patches/200-etc_crontabs.patch
diff --git a/package/busybox/patches/240-udhcpc_retries.patch b/package/utils/busybox/patches/240-udhcpc_retries.patch
similarity index 100%
rename from package/busybox/patches/240-udhcpc_retries.patch
rename to package/utils/busybox/patches/240-udhcpc_retries.patch
diff --git a/package/busybox/patches/241-udhcpc-oversized_packets.patch b/package/utils/busybox/patches/241-udhcpc-oversized_packets.patch
similarity index 100%
rename from package/busybox/patches/241-udhcpc-oversized_packets.patch
rename to package/utils/busybox/patches/241-udhcpc-oversized_packets.patch
diff --git a/package/busybox/patches/242-udhcpc_msgs.patch b/package/utils/busybox/patches/242-udhcpc_msgs.patch
similarity index 100%
rename from package/busybox/patches/242-udhcpc_msgs.patch
rename to package/utils/busybox/patches/242-udhcpc_msgs.patch
diff --git a/package/busybox/patches/243-udhcpc_changed_ifindex.patch b/package/utils/busybox/patches/243-udhcpc_changed_ifindex.patch
similarity index 100%
rename from package/busybox/patches/243-udhcpc_changed_ifindex.patch
rename to package/utils/busybox/patches/243-udhcpc_changed_ifindex.patch
diff --git a/package/busybox/patches/244-udhcpc_add_6rd_option.patch b/package/utils/busybox/patches/244-udhcpc_add_6rd_option.patch
similarity index 100%
rename from package/busybox/patches/244-udhcpc_add_6rd_option.patch
rename to package/utils/busybox/patches/244-udhcpc_add_6rd_option.patch
diff --git a/package/busybox/patches/250-ash_export-n.patch b/package/utils/busybox/patches/250-ash_export-n.patch
similarity index 100%
rename from package/busybox/patches/250-ash_export-n.patch
rename to package/utils/busybox/patches/250-ash_export-n.patch
diff --git a/package/busybox/patches/251-ash_fix-redir-substitution.patch b/package/utils/busybox/patches/251-ash_fix-redir-substitution.patch
similarity index 100%
rename from package/busybox/patches/251-ash_fix-redir-substitution.patch
rename to package/utils/busybox/patches/251-ash_fix-redir-substitution.patch
diff --git a/package/busybox/patches/260-vconfig_proc.patch b/package/utils/busybox/patches/260-vconfig_proc.patch
similarity index 100%
rename from package/busybox/patches/260-vconfig_proc.patch
rename to package/utils/busybox/patches/260-vconfig_proc.patch
diff --git a/package/busybox/patches/300-netmsg.patch b/package/utils/busybox/patches/300-netmsg.patch
similarity index 100%
rename from package/busybox/patches/300-netmsg.patch
rename to package/utils/busybox/patches/300-netmsg.patch
diff --git a/package/busybox/patches/310-passwd_access.patch b/package/utils/busybox/patches/310-passwd_access.patch
similarity index 100%
rename from package/busybox/patches/310-passwd_access.patch
rename to package/utils/busybox/patches/310-passwd_access.patch
diff --git a/package/busybox/patches/340-lock_util.patch b/package/utils/busybox/patches/340-lock_util.patch
similarity index 100%
rename from package/busybox/patches/340-lock_util.patch
rename to package/utils/busybox/patches/340-lock_util.patch
diff --git a/package/busybox/patches/350-httpd_redir.patch b/package/utils/busybox/patches/350-httpd_redir.patch
similarity index 100%
rename from package/busybox/patches/350-httpd_redir.patch
rename to package/utils/busybox/patches/350-httpd_redir.patch
diff --git a/package/busybox/patches/410-httpd_cgi_headers.patch b/package/utils/busybox/patches/410-httpd_cgi_headers.patch
similarity index 100%
rename from package/busybox/patches/410-httpd_cgi_headers.patch
rename to package/utils/busybox/patches/410-httpd_cgi_headers.patch
diff --git a/package/busybox/patches/440-httpd_chdir.patch b/package/utils/busybox/patches/440-httpd_chdir.patch
similarity index 100%
rename from package/busybox/patches/440-httpd_chdir.patch
rename to package/utils/busybox/patches/440-httpd_chdir.patch
diff --git a/package/busybox/patches/470-insmod_search.patch b/package/utils/busybox/patches/470-insmod_search.patch
similarity index 100%
rename from package/busybox/patches/470-insmod_search.patch
rename to package/utils/busybox/patches/470-insmod_search.patch
diff --git a/package/busybox/patches/490-mount_disable_check.patch b/package/utils/busybox/patches/490-mount_disable_check.patch
similarity index 100%
rename from package/busybox/patches/490-mount_disable_check.patch
rename to package/utils/busybox/patches/490-mount_disable_check.patch
diff --git a/package/busybox/patches/510-awk_include.patch b/package/utils/busybox/patches/510-awk_include.patch
similarity index 100%
rename from package/busybox/patches/510-awk_include.patch
rename to package/utils/busybox/patches/510-awk_include.patch
diff --git a/package/busybox/patches/524-udhcpc_renew.patch b/package/utils/busybox/patches/524-udhcpc_renew.patch
similarity index 100%
rename from package/busybox/patches/524-udhcpc_renew.patch
rename to package/utils/busybox/patches/524-udhcpc_renew.patch
diff --git a/package/busybox/patches/610-ntpd_delayed_resolve.patch b/package/utils/busybox/patches/610-ntpd_delayed_resolve.patch
similarity index 100%
rename from package/busybox/patches/610-ntpd_delayed_resolve.patch
rename to package/utils/busybox/patches/610-ntpd_delayed_resolve.patch
diff --git a/package/busybox/patches/611-upstream_ntpd_version_fix.patch b/package/utils/busybox/patches/611-upstream_ntpd_version_fix.patch
similarity index 100%
rename from package/busybox/patches/611-upstream_ntpd_version_fix.patch
rename to package/utils/busybox/patches/611-upstream_ntpd_version_fix.patch
diff --git a/package/busybox/patches/700-hexdump_segfault_fix.patch b/package/utils/busybox/patches/700-hexdump_segfault_fix.patch
similarity index 100%
rename from package/busybox/patches/700-hexdump_segfault_fix.patch
rename to package/utils/busybox/patches/700-hexdump_segfault_fix.patch
diff --git a/package/busybox/patches/802-brctl_linux24.patch b/package/utils/busybox/patches/802-brctl_linux24.patch
similarity index 100%
rename from package/busybox/patches/802-brctl_linux24.patch
rename to package/utils/busybox/patches/802-brctl_linux24.patch
diff --git a/package/busybox/patches/902-telnetd_intr.patch b/package/utils/busybox/patches/902-telnetd_intr.patch
similarity index 100%
rename from package/busybox/patches/902-telnetd_intr.patch
rename to package/utils/busybox/patches/902-telnetd_intr.patch
diff --git a/package/busybox/patches/910-insmod-q-flag.patch b/package/utils/busybox/patches/910-insmod-q-flag.patch
similarity index 100%
rename from package/busybox/patches/910-insmod-q-flag.patch
rename to package/utils/busybox/patches/910-insmod-q-flag.patch
diff --git a/package/busybox/patches/911-date-k-flag.patch b/package/utils/busybox/patches/911-date-k-flag.patch
similarity index 100%
rename from package/busybox/patches/911-date-k-flag.patch
rename to package/utils/busybox/patches/911-date-k-flag.patch
diff --git a/package/busybox/patches/920-portability.patch b/package/utils/busybox/patches/920-portability.patch
similarity index 100%
rename from package/busybox/patches/920-portability.patch
rename to package/utils/busybox/patches/920-portability.patch
diff --git a/package/busybox/patches/950-partial-checksum.patch b/package/utils/busybox/patches/950-partial-checksum.patch
similarity index 100%
rename from package/busybox/patches/950-partial-checksum.patch
rename to package/utils/busybox/patches/950-partial-checksum.patch
diff --git a/package/busybox/patches/998-arping_missing_includes.patch b/package/utils/busybox/patches/998-arping_missing_includes.patch
similarity index 100%
rename from package/busybox/patches/998-arping_missing_includes.patch
rename to package/utils/busybox/patches/998-arping_missing_includes.patch
diff --git a/package/busybox/patches/999-musl-fixes.patch b/package/utils/busybox/patches/999-musl-fixes.patch
similarity index 100%
rename from package/busybox/patches/999-musl-fixes.patch
rename to package/utils/busybox/patches/999-musl-fixes.patch
diff --git a/package/system/utils/e2fsprogs/Makefile b/package/utils/e2fsprogs/Makefile
similarity index 100%
rename from package/system/utils/e2fsprogs/Makefile
rename to package/utils/e2fsprogs/Makefile
diff --git a/package/system/utils/e2fsprogs/files/e2fsck.conf b/package/utils/e2fsprogs/files/e2fsck.conf
similarity index 100%
rename from package/system/utils/e2fsprogs/files/e2fsck.conf
rename to package/utils/e2fsprogs/files/e2fsck.conf
diff --git a/package/system/utils/e2fsprogs/files/e2fsck.sh b/package/utils/e2fsprogs/files/e2fsck.sh
similarity index 100%
rename from package/system/utils/e2fsprogs/files/e2fsck.sh
rename to package/utils/e2fsprogs/files/e2fsck.sh
diff --git a/package/system/utils/e2fsprogs/patches/001-link-against-libuuid.patch b/package/utils/e2fsprogs/patches/001-link-against-libuuid.patch
similarity index 100%
rename from package/system/utils/e2fsprogs/patches/001-link-against-libuuid.patch
rename to package/utils/e2fsprogs/patches/001-link-against-libuuid.patch
diff --git a/package/system/utils/e2fsprogs/patches/002-no_malloc_h.patch b/package/utils/e2fsprogs/patches/002-no_malloc_h.patch
similarity index 100%
rename from package/system/utils/e2fsprogs/patches/002-no_malloc_h.patch
rename to package/utils/e2fsprogs/patches/002-no_malloc_h.patch
diff --git a/package/system/utils/fbtest/Makefile b/package/utils/fbtest/Makefile
similarity index 100%
rename from package/system/utils/fbtest/Makefile
rename to package/utils/fbtest/Makefile
diff --git a/package/system/utils/fbtest/src/Makefile b/package/utils/fbtest/src/Makefile
similarity index 100%
rename from package/system/utils/fbtest/src/Makefile
rename to package/utils/fbtest/src/Makefile
diff --git a/package/system/utils/fbtest/src/fbtest.c b/package/utils/fbtest/src/fbtest.c
similarity index 100%
rename from package/system/utils/fbtest/src/fbtest.c
rename to package/utils/fbtest/src/fbtest.c
diff --git a/package/fuse/Makefile b/package/utils/fuse/Makefile
similarity index 100%
rename from package/fuse/Makefile
rename to package/utils/fuse/Makefile
diff --git a/package/fuse/patches/112-no_break_on_mknod.patch b/package/utils/fuse/patches/112-no_break_on_mknod.patch
similarity index 100%
rename from package/fuse/patches/112-no_break_on_mknod.patch
rename to package/utils/fuse/patches/112-no_break_on_mknod.patch
diff --git a/package/system/utils/hostap-utils/Makefile b/package/utils/hostap-utils/Makefile
similarity index 100%
rename from package/system/utils/hostap-utils/Makefile
rename to package/utils/hostap-utils/Makefile
diff --git a/package/lua/Makefile b/package/utils/lua/Makefile
similarity index 100%
rename from package/lua/Makefile
rename to package/utils/lua/Makefile
diff --git a/package/lua/patches-host/010-lua-5.1.3-lnum-full-260308.patch b/package/utils/lua/patches-host/010-lua-5.1.3-lnum-full-260308.patch
similarity index 100%
rename from package/lua/patches-host/010-lua-5.1.3-lnum-full-260308.patch
rename to package/utils/lua/patches-host/010-lua-5.1.3-lnum-full-260308.patch
diff --git a/package/lua/patches-host/011-lnum-use-double.patch b/package/utils/lua/patches-host/011-lnum-use-double.patch
similarity index 100%
rename from package/lua/patches-host/011-lnum-use-double.patch
rename to package/utils/lua/patches-host/011-lnum-use-double.patch
diff --git a/package/lua/patches-host/015-lnum-ppc-compat.patch b/package/utils/lua/patches-host/015-lnum-ppc-compat.patch
similarity index 100%
rename from package/lua/patches-host/015-lnum-ppc-compat.patch
rename to package/utils/lua/patches-host/015-lnum-ppc-compat.patch
diff --git a/package/lua/patches-host/030-archindependent-bytecode.patch b/package/utils/lua/patches-host/030-archindependent-bytecode.patch
similarity index 100%
rename from package/lua/patches-host/030-archindependent-bytecode.patch
rename to package/utils/lua/patches-host/030-archindependent-bytecode.patch
diff --git a/package/lua/patches-host/100-no_readline.patch b/package/utils/lua/patches-host/100-no_readline.patch
similarity index 100%
rename from package/lua/patches-host/100-no_readline.patch
rename to package/utils/lua/patches-host/100-no_readline.patch
diff --git a/package/lua/patches/010-lua-5.1.3-lnum-full-260308.patch b/package/utils/lua/patches/010-lua-5.1.3-lnum-full-260308.patch
similarity index 100%
rename from package/lua/patches/010-lua-5.1.3-lnum-full-260308.patch
rename to package/utils/lua/patches/010-lua-5.1.3-lnum-full-260308.patch
diff --git a/package/lua/patches/011-lnum-use-double.patch b/package/utils/lua/patches/011-lnum-use-double.patch
similarity index 100%
rename from package/lua/patches/011-lnum-use-double.patch
rename to package/utils/lua/patches/011-lnum-use-double.patch
diff --git a/package/lua/patches/015-lnum-ppc-compat.patch b/package/utils/lua/patches/015-lnum-ppc-compat.patch
similarity index 100%
rename from package/lua/patches/015-lnum-ppc-compat.patch
rename to package/utils/lua/patches/015-lnum-ppc-compat.patch
diff --git a/package/lua/patches/020-shared_liblua.patch b/package/utils/lua/patches/020-shared_liblua.patch
similarity index 100%
rename from package/lua/patches/020-shared_liblua.patch
rename to package/utils/lua/patches/020-shared_liblua.patch
diff --git a/package/lua/patches/030-archindependent-bytecode.patch b/package/utils/lua/patches/030-archindependent-bytecode.patch
similarity index 100%
rename from package/lua/patches/030-archindependent-bytecode.patch
rename to package/utils/lua/patches/030-archindependent-bytecode.patch
diff --git a/package/lua/patches/100-no_readline.patch b/package/utils/lua/patches/100-no_readline.patch
similarity index 100%
rename from package/lua/patches/100-no_readline.patch
rename to package/utils/lua/patches/100-no_readline.patch
diff --git a/package/lua/patches/200-lua-path.patch b/package/utils/lua/patches/200-lua-path.patch
similarity index 100%
rename from package/lua/patches/200-lua-path.patch
rename to package/utils/lua/patches/200-lua-path.patch
diff --git a/package/lua/patches/300-opcode_performance.patch b/package/utils/lua/patches/300-opcode_performance.patch
similarity index 100%
rename from package/lua/patches/300-opcode_performance.patch
rename to package/utils/lua/patches/300-opcode_performance.patch
diff --git a/package/mkelfimage/Makefile b/package/utils/mkelfimage/Makefile
similarity index 100%
rename from package/mkelfimage/Makefile
rename to package/utils/mkelfimage/Makefile
diff --git a/package/mkelfimage/patches/no-stack-protector.patch b/package/utils/mkelfimage/patches/no-stack-protector.patch
similarity index 100%
rename from package/mkelfimage/patches/no-stack-protector.patch
rename to package/utils/mkelfimage/patches/no-stack-protector.patch
diff --git a/package/system/utils/nvram/Makefile b/package/utils/nvram/Makefile
similarity index 100%
rename from package/system/utils/nvram/Makefile
rename to package/utils/nvram/Makefile
diff --git a/package/system/utils/nvram/files/nvram.init b/package/utils/nvram/files/nvram.init
similarity index 100%
rename from package/system/utils/nvram/files/nvram.init
rename to package/utils/nvram/files/nvram.init
diff --git a/package/system/utils/nvram/src/Makefile b/package/utils/nvram/src/Makefile
similarity index 100%
rename from package/system/utils/nvram/src/Makefile
rename to package/utils/nvram/src/Makefile
diff --git a/package/system/utils/nvram/src/cli.c b/package/utils/nvram/src/cli.c
similarity index 100%
rename from package/system/utils/nvram/src/cli.c
rename to package/utils/nvram/src/cli.c
diff --git a/package/system/utils/nvram/src/crc.c b/package/utils/nvram/src/crc.c
similarity index 100%
rename from package/system/utils/nvram/src/crc.c
rename to package/utils/nvram/src/crc.c
diff --git a/package/system/utils/nvram/src/nvram.c b/package/utils/nvram/src/nvram.c
similarity index 100%
rename from package/system/utils/nvram/src/nvram.c
rename to package/utils/nvram/src/nvram.c
diff --git a/package/system/utils/nvram/src/nvram.h b/package/utils/nvram/src/nvram.h
similarity index 100%
rename from package/system/utils/nvram/src/nvram.h
rename to package/utils/nvram/src/nvram.h
diff --git a/package/system/utils/nvram/src/sdinitvals.h b/package/utils/nvram/src/sdinitvals.h
similarity index 100%
rename from package/system/utils/nvram/src/sdinitvals.h
rename to package/utils/nvram/src/sdinitvals.h
diff --git a/package/px5g/Makefile b/package/utils/px5g/Makefile
similarity index 100%
rename from package/px5g/Makefile
rename to package/utils/px5g/Makefile
diff --git a/package/px5g/src/Makefile b/package/utils/px5g/src/Makefile
similarity index 100%
rename from package/px5g/src/Makefile
rename to package/utils/px5g/src/Makefile
diff --git a/package/px5g/src/library/base64.c b/package/utils/px5g/src/library/base64.c
similarity index 100%
rename from package/px5g/src/library/base64.c
rename to package/utils/px5g/src/library/base64.c
diff --git a/package/px5g/src/library/bignum.c b/package/utils/px5g/src/library/bignum.c
similarity index 100%
rename from package/px5g/src/library/bignum.c
rename to package/utils/px5g/src/library/bignum.c
diff --git a/package/px5g/src/library/havege.c b/package/utils/px5g/src/library/havege.c
similarity index 100%
rename from package/px5g/src/library/havege.c
rename to package/utils/px5g/src/library/havege.c
diff --git a/package/px5g/src/library/rsa.c b/package/utils/px5g/src/library/rsa.c
similarity index 100%
rename from package/px5g/src/library/rsa.c
rename to package/utils/px5g/src/library/rsa.c
diff --git a/package/px5g/src/library/sha1.c b/package/utils/px5g/src/library/sha1.c
similarity index 100%
rename from package/px5g/src/library/sha1.c
rename to package/utils/px5g/src/library/sha1.c
diff --git a/package/px5g/src/library/timing.c b/package/utils/px5g/src/library/timing.c
similarity index 100%
rename from package/px5g/src/library/timing.c
rename to package/utils/px5g/src/library/timing.c
diff --git a/package/px5g/src/library/x509write.c b/package/utils/px5g/src/library/x509write.c
similarity index 100%
rename from package/px5g/src/library/x509write.c
rename to package/utils/px5g/src/library/x509write.c
diff --git a/package/px5g/src/polarssl/base64.h b/package/utils/px5g/src/polarssl/base64.h
similarity index 100%
rename from package/px5g/src/polarssl/base64.h
rename to package/utils/px5g/src/polarssl/base64.h
diff --git a/package/px5g/src/polarssl/bignum.h b/package/utils/px5g/src/polarssl/bignum.h
similarity index 100%
rename from package/px5g/src/polarssl/bignum.h
rename to package/utils/px5g/src/polarssl/bignum.h
diff --git a/package/px5g/src/polarssl/bn_mul.h b/package/utils/px5g/src/polarssl/bn_mul.h
similarity index 100%
rename from package/px5g/src/polarssl/bn_mul.h
rename to package/utils/px5g/src/polarssl/bn_mul.h
diff --git a/package/px5g/src/polarssl/config.h b/package/utils/px5g/src/polarssl/config.h
similarity index 100%
rename from package/px5g/src/polarssl/config.h
rename to package/utils/px5g/src/polarssl/config.h
diff --git a/package/px5g/src/polarssl/havege.h b/package/utils/px5g/src/polarssl/havege.h
similarity index 100%
rename from package/px5g/src/polarssl/havege.h
rename to package/utils/px5g/src/polarssl/havege.h
diff --git a/package/px5g/src/polarssl/rsa.h b/package/utils/px5g/src/polarssl/rsa.h
similarity index 100%
rename from package/px5g/src/polarssl/rsa.h
rename to package/utils/px5g/src/polarssl/rsa.h
diff --git a/package/px5g/src/polarssl/sha1.h b/package/utils/px5g/src/polarssl/sha1.h
similarity index 100%
rename from package/px5g/src/polarssl/sha1.h
rename to package/utils/px5g/src/polarssl/sha1.h
diff --git a/package/px5g/src/polarssl/timing.h b/package/utils/px5g/src/polarssl/timing.h
similarity index 100%
rename from package/px5g/src/polarssl/timing.h
rename to package/utils/px5g/src/polarssl/timing.h
diff --git a/package/px5g/src/polarssl/x509.h b/package/utils/px5g/src/polarssl/x509.h
similarity index 100%
rename from package/px5g/src/polarssl/x509.h
rename to package/utils/px5g/src/polarssl/x509.h
diff --git a/package/px5g/src/px5g.c b/package/utils/px5g/src/px5g.c
similarity index 100%
rename from package/px5g/src/px5g.c
rename to package/utils/px5g/src/px5g.c
diff --git a/package/system/utils/robocfg/Makefile b/package/utils/robocfg/Makefile
similarity index 100%
rename from package/system/utils/robocfg/Makefile
rename to package/utils/robocfg/Makefile
diff --git a/package/system/utils/robocfg/src/Makefile b/package/utils/robocfg/src/Makefile
similarity index 100%
rename from package/system/utils/robocfg/src/Makefile
rename to package/utils/robocfg/src/Makefile
diff --git a/package/system/utils/robocfg/src/etc53xx.h b/package/utils/robocfg/src/etc53xx.h
similarity index 100%
rename from package/system/utils/robocfg/src/etc53xx.h
rename to package/utils/robocfg/src/etc53xx.h
diff --git a/package/system/utils/robocfg/src/robocfg.c b/package/utils/robocfg/src/robocfg.c
similarity index 100%
rename from package/system/utils/robocfg/src/robocfg.c
rename to package/utils/robocfg/src/robocfg.c
diff --git a/package/system/spidev_test/Makefile b/package/utils/spidev_test/Makefile
similarity index 100%
rename from package/system/spidev_test/Makefile
rename to package/utils/spidev_test/Makefile
diff --git a/package/system/utils/usbmode/Makefile b/package/utils/usbmode/Makefile
similarity index 100%
rename from package/system/utils/usbmode/Makefile
rename to package/utils/usbmode/Makefile
diff --git a/package/system/utils/usbmode/files/usbmode.hotplug b/package/utils/usbmode/files/usbmode.hotplug
similarity index 100%
rename from package/system/utils/usbmode/files/usbmode.hotplug
rename to package/utils/usbmode/files/usbmode.hotplug
diff --git a/package/system/utils/usbreset/Makefile b/package/utils/usbreset/Makefile
similarity index 100%
rename from package/system/utils/usbreset/Makefile
rename to package/utils/usbreset/Makefile
diff --git a/package/system/utils/usbreset/src/usbreset.c b/package/utils/usbreset/src/usbreset.c
similarity index 100%
rename from package/system/utils/usbreset/src/usbreset.c
rename to package/utils/usbreset/src/usbreset.c
diff --git a/package/system/utils/usbutils/Makefile b/package/utils/usbutils/Makefile
similarity index 100%
rename from package/system/utils/usbutils/Makefile
rename to package/utils/usbutils/Makefile
diff --git a/package/system/utils/util-linux/Makefile b/package/utils/util-linux/Makefile
similarity index 100%
rename from package/system/utils/util-linux/Makefile
rename to package/utils/util-linux/Makefile
diff --git a/package/system/utils/util-linux/patches/000-compile.patch b/package/utils/util-linux/patches/000-compile.patch
similarity index 100%
rename from package/system/utils/util-linux/patches/000-compile.patch
rename to package/utils/util-linux/patches/000-compile.patch
diff --git a/package/system/utils/util-linux/patches/001-no-printf-alloc.patch b/package/utils/util-linux/patches/001-no-printf-alloc.patch
similarity index 100%
rename from package/system/utils/util-linux/patches/001-no-printf-alloc.patch
rename to package/utils/util-linux/patches/001-no-printf-alloc.patch
diff --git a/package/system/utils/util-linux/patches/002-fix-endianess.patch b/package/utils/util-linux/patches/002-fix-endianess.patch
similarity index 100%
rename from package/system/utils/util-linux/patches/002-fix-endianess.patch
rename to package/utils/util-linux/patches/002-fix-endianess.patch
diff --git a/package/system/utils/xfsprogs/Makefile b/package/utils/xfsprogs/Makefile
similarity index 100%
rename from package/system/utils/xfsprogs/Makefile
rename to package/utils/xfsprogs/Makefile
diff --git a/package/system/utils/xfsprogs/patches/001-automake-compat.patch b/package/utils/xfsprogs/patches/001-automake-compat.patch
similarity index 100%
rename from package/system/utils/xfsprogs/patches/001-automake-compat.patch
rename to package/utils/xfsprogs/patches/001-automake-compat.patch
diff --git a/package/system/utils/xfsprogs/patches/100-no_aio.patch b/package/utils/xfsprogs/patches/100-no_aio.patch
similarity index 100%
rename from package/system/utils/xfsprogs/patches/100-no_aio.patch
rename to package/utils/xfsprogs/patches/100-no_aio.patch
diff --git a/package/system/utils/xfsprogs/patches/110-uclibc_no_ustat.patch b/package/utils/xfsprogs/patches/110-uclibc_no_ustat.patch
similarity index 100%
rename from package/system/utils/xfsprogs/patches/110-uclibc_no_ustat.patch
rename to package/utils/xfsprogs/patches/110-uclibc_no_ustat.patch
diff --git a/package/system/utils/xfsprogs/patches/120-portability.patch b/package/utils/xfsprogs/patches/120-portability.patch
similarity index 100%
rename from package/system/utils/xfsprogs/patches/120-portability.patch
rename to package/utils/xfsprogs/patches/120-portability.patch
diff --git a/package/system/utils/xfsprogs/patches/130-uclibc_no_xattr.patch b/package/utils/xfsprogs/patches/130-uclibc_no_xattr.patch
similarity index 100%
rename from package/system/utils/xfsprogs/patches/130-uclibc_no_xattr.patch
rename to package/utils/xfsprogs/patches/130-uclibc_no_xattr.patch
diff --git a/package/system/utils/xfsprogs/patches/140-no_po.patch b/package/utils/xfsprogs/patches/140-no_po.patch
similarity index 100%
rename from package/system/utils/xfsprogs/patches/140-no_po.patch
rename to package/utils/xfsprogs/patches/140-no_po.patch