diff --git a/package/fconfig/Makefile b/package/boot/fconfig/Makefile
similarity index 100%
rename from package/fconfig/Makefile
rename to package/boot/fconfig/Makefile
diff --git a/package/grub2/Makefile b/package/boot/grub2/Makefile
similarity index 100%
rename from package/grub2/Makefile
rename to package/boot/grub2/Makefile
diff --git a/package/grub2/patches/100-grub_setup_root.patch b/package/boot/grub2/patches/100-grub_setup_root.patch
similarity index 100%
rename from package/grub2/patches/100-grub_setup_root.patch
rename to package/boot/grub2/patches/100-grub_setup_root.patch
diff --git a/package/kexec-tools/Config.in b/package/boot/kexec-tools/Config.in
similarity index 100%
rename from package/kexec-tools/Config.in
rename to package/boot/kexec-tools/Config.in
diff --git a/package/kexec-tools/Makefile b/package/boot/kexec-tools/Makefile
similarity index 100%
rename from package/kexec-tools/Makefile
rename to package/boot/kexec-tools/Makefile
diff --git a/package/kexec-tools/patches/0004-mips_regdefs.patch b/package/boot/kexec-tools/patches/0004-mips_regdefs.patch
similarity index 100%
rename from package/kexec-tools/patches/0004-mips_regdefs.patch
rename to package/boot/kexec-tools/patches/0004-mips_regdefs.patch
diff --git a/package/uboot-ar71xx/Makefile b/package/boot/uboot-ar71xx/Makefile
similarity index 100%
rename from package/uboot-ar71xx/Makefile
rename to package/boot/uboot-ar71xx/Makefile
diff --git a/package/uboot-ar71xx/files/board/zyxel/nbg460n/Makefile b/package/boot/uboot-ar71xx/files/board/zyxel/nbg460n/Makefile
similarity index 100%
rename from package/uboot-ar71xx/files/board/zyxel/nbg460n/Makefile
rename to package/boot/uboot-ar71xx/files/board/zyxel/nbg460n/Makefile
diff --git a/package/uboot-ar71xx/files/board/zyxel/nbg460n/config.mk b/package/boot/uboot-ar71xx/files/board/zyxel/nbg460n/config.mk
similarity index 100%
rename from package/uboot-ar71xx/files/board/zyxel/nbg460n/config.mk
rename to package/boot/uboot-ar71xx/files/board/zyxel/nbg460n/config.mk
diff --git a/package/uboot-ar71xx/files/board/zyxel/nbg460n/lowlevel_init.S b/package/boot/uboot-ar71xx/files/board/zyxel/nbg460n/lowlevel_init.S
similarity index 100%
rename from package/uboot-ar71xx/files/board/zyxel/nbg460n/lowlevel_init.S
rename to package/boot/uboot-ar71xx/files/board/zyxel/nbg460n/lowlevel_init.S
diff --git a/package/uboot-ar71xx/files/board/zyxel/nbg460n/nbg460n.c b/package/boot/uboot-ar71xx/files/board/zyxel/nbg460n/nbg460n.c
similarity index 100%
rename from package/uboot-ar71xx/files/board/zyxel/nbg460n/nbg460n.c
rename to package/boot/uboot-ar71xx/files/board/zyxel/nbg460n/nbg460n.c
diff --git a/package/uboot-ar71xx/files/board/zyxel/nbg460n/u-boot.lds b/package/boot/uboot-ar71xx/files/board/zyxel/nbg460n/u-boot.lds
similarity index 100%
rename from package/uboot-ar71xx/files/board/zyxel/nbg460n/u-boot.lds
rename to package/boot/uboot-ar71xx/files/board/zyxel/nbg460n/u-boot.lds
diff --git a/package/uboot-ar71xx/files/cpu/mips/ar71xx_serial.c b/package/boot/uboot-ar71xx/files/cpu/mips/ar71xx_serial.c
similarity index 100%
rename from package/uboot-ar71xx/files/cpu/mips/ar71xx_serial.c
rename to package/boot/uboot-ar71xx/files/cpu/mips/ar71xx_serial.c
diff --git a/package/uboot-ar71xx/files/drivers/net/ag71xx.c b/package/boot/uboot-ar71xx/files/drivers/net/ag71xx.c
similarity index 100%
rename from package/uboot-ar71xx/files/drivers/net/ag71xx.c
rename to package/boot/uboot-ar71xx/files/drivers/net/ag71xx.c
diff --git a/package/uboot-ar71xx/files/drivers/net/ag71xx.h b/package/boot/uboot-ar71xx/files/drivers/net/ag71xx.h
similarity index 100%
rename from package/uboot-ar71xx/files/drivers/net/ag71xx.h
rename to package/boot/uboot-ar71xx/files/drivers/net/ag71xx.h
diff --git a/package/uboot-ar71xx/files/drivers/net/phy/rtl8366.h b/package/boot/uboot-ar71xx/files/drivers/net/phy/rtl8366.h
similarity index 100%
rename from package/uboot-ar71xx/files/drivers/net/phy/rtl8366.h
rename to package/boot/uboot-ar71xx/files/drivers/net/phy/rtl8366.h
diff --git a/package/uboot-ar71xx/files/drivers/net/phy/rtl8366_mii.c b/package/boot/uboot-ar71xx/files/drivers/net/phy/rtl8366_mii.c
similarity index 100%
rename from package/uboot-ar71xx/files/drivers/net/phy/rtl8366_mii.c
rename to package/boot/uboot-ar71xx/files/drivers/net/phy/rtl8366_mii.c
diff --git a/package/uboot-ar71xx/files/drivers/spi/ar71xx_spi.c b/package/boot/uboot-ar71xx/files/drivers/spi/ar71xx_spi.c
similarity index 100%
rename from package/uboot-ar71xx/files/drivers/spi/ar71xx_spi.c
rename to package/boot/uboot-ar71xx/files/drivers/spi/ar71xx_spi.c
diff --git a/package/uboot-ar71xx/files/include/asm-mips/ar71xx.h b/package/boot/uboot-ar71xx/files/include/asm-mips/ar71xx.h
similarity index 100%
rename from package/uboot-ar71xx/files/include/asm-mips/ar71xx.h
rename to package/boot/uboot-ar71xx/files/include/asm-mips/ar71xx.h
diff --git a/package/uboot-ar71xx/files/include/asm-mips/ar71xx_gpio.h b/package/boot/uboot-ar71xx/files/include/asm-mips/ar71xx_gpio.h
similarity index 100%
rename from package/uboot-ar71xx/files/include/asm-mips/ar71xx_gpio.h
rename to package/boot/uboot-ar71xx/files/include/asm-mips/ar71xx_gpio.h
diff --git a/package/uboot-ar71xx/files/include/configs/nbg460n.h b/package/boot/uboot-ar71xx/files/include/configs/nbg460n.h
similarity index 100%
rename from package/uboot-ar71xx/files/include/configs/nbg460n.h
rename to package/boot/uboot-ar71xx/files/include/configs/nbg460n.h
diff --git a/package/uboot-ar71xx/patches/001-ar71xx.patch b/package/boot/uboot-ar71xx/patches/001-ar71xx.patch
similarity index 100%
rename from package/uboot-ar71xx/patches/001-ar71xx.patch
rename to package/boot/uboot-ar71xx/patches/001-ar71xx.patch
diff --git a/package/uboot-ar71xx/patches/002-ar71xx-spi.patch b/package/boot/uboot-ar71xx/patches/002-ar71xx-spi.patch
similarity index 100%
rename from package/uboot-ar71xx/patches/002-ar71xx-spi.patch
rename to package/boot/uboot-ar71xx/patches/002-ar71xx-spi.patch
diff --git a/package/uboot-ar71xx/patches/010-enet-ag71xx.patch b/package/boot/uboot-ar71xx/patches/010-enet-ag71xx.patch
similarity index 100%
rename from package/uboot-ar71xx/patches/010-enet-ag71xx.patch
rename to package/boot/uboot-ar71xx/patches/010-enet-ag71xx.patch
diff --git a/package/uboot-ar71xx/patches/011-switch-rtl8366sr.patch b/package/boot/uboot-ar71xx/patches/011-switch-rtl8366sr.patch
similarity index 100%
rename from package/uboot-ar71xx/patches/011-switch-rtl8366sr.patch
rename to package/boot/uboot-ar71xx/patches/011-switch-rtl8366sr.patch
diff --git a/package/uboot-ar71xx/patches/020-freebsd-compat.patch b/package/boot/uboot-ar71xx/patches/020-freebsd-compat.patch
similarity index 100%
rename from package/uboot-ar71xx/patches/020-freebsd-compat.patch
rename to package/boot/uboot-ar71xx/patches/020-freebsd-compat.patch
diff --git a/package/uboot-ar71xx/patches/021-darwin_compat.patch b/package/boot/uboot-ar71xx/patches/021-darwin_compat.patch
similarity index 100%
rename from package/uboot-ar71xx/patches/021-darwin_compat.patch
rename to package/boot/uboot-ar71xx/patches/021-darwin_compat.patch
diff --git a/package/uboot-ar71xx/patches/022-getline_backport.patch b/package/boot/uboot-ar71xx/patches/022-getline_backport.patch
similarity index 100%
rename from package/uboot-ar71xx/patches/022-getline_backport.patch
rename to package/boot/uboot-ar71xx/patches/022-getline_backport.patch
diff --git a/package/uboot-envtools/Makefile b/package/boot/uboot-envtools/Makefile
similarity index 100%
rename from package/uboot-envtools/Makefile
rename to package/boot/uboot-envtools/Makefile
diff --git a/package/uboot-envtools/files/ar71xx b/package/boot/uboot-envtools/files/ar71xx
similarity index 100%
rename from package/uboot-envtools/files/ar71xx
rename to package/boot/uboot-envtools/files/ar71xx
diff --git a/package/uboot-envtools/files/kirkwood b/package/boot/uboot-envtools/files/kirkwood
similarity index 100%
rename from package/uboot-envtools/files/kirkwood
rename to package/boot/uboot-envtools/files/kirkwood
diff --git a/package/uboot-envtools/files/lantiq b/package/boot/uboot-envtools/files/lantiq
similarity index 100%
rename from package/uboot-envtools/files/lantiq
rename to package/boot/uboot-envtools/files/lantiq
diff --git a/package/uboot-envtools/files/ramips b/package/boot/uboot-envtools/files/ramips
similarity index 100%
rename from package/uboot-envtools/files/ramips
rename to package/boot/uboot-envtools/files/ramips
diff --git a/package/uboot-envtools/files/uboot-envtools.sh b/package/boot/uboot-envtools/files/uboot-envtools.sh
similarity index 100%
rename from package/uboot-envtools/files/uboot-envtools.sh
rename to package/boot/uboot-envtools/files/uboot-envtools.sh
diff --git a/package/uboot-envtools/patches/001-crc32_func_signature.patch b/package/boot/uboot-envtools/patches/001-crc32_func_signature.patch
similarity index 100%
rename from package/uboot-envtools/patches/001-crc32_func_signature.patch
rename to package/boot/uboot-envtools/patches/001-crc32_func_signature.patch
diff --git a/package/uboot-envtools/patches/002-makefile.patch b/package/boot/uboot-envtools/patches/002-makefile.patch
similarity index 100%
rename from package/uboot-envtools/patches/002-makefile.patch
rename to package/boot/uboot-envtools/patches/002-makefile.patch
diff --git a/package/uboot-envtools/patches/003-nor-eraselen.patch b/package/boot/uboot-envtools/patches/003-nor-eraselen.patch
similarity index 100%
rename from package/uboot-envtools/patches/003-nor-eraselen.patch
rename to package/boot/uboot-envtools/patches/003-nor-eraselen.patch
diff --git a/package/uboot-envtools/patches/004-allow_mac_change.patch b/package/boot/uboot-envtools/patches/004-allow_mac_change.patch
similarity index 100%
rename from package/uboot-envtools/patches/004-allow_mac_change.patch
rename to package/boot/uboot-envtools/patches/004-allow_mac_change.patch
diff --git a/package/uboot-kirkwood/Makefile b/package/boot/uboot-kirkwood/Makefile
similarity index 100%
rename from package/uboot-kirkwood/Makefile
rename to package/boot/uboot-kirkwood/Makefile
diff --git a/package/uboot-kirkwood/files/board/iomega/iconnect/Makefile b/package/boot/uboot-kirkwood/files/board/iomega/iconnect/Makefile
similarity index 100%
rename from package/uboot-kirkwood/files/board/iomega/iconnect/Makefile
rename to package/boot/uboot-kirkwood/files/board/iomega/iconnect/Makefile
diff --git a/package/uboot-kirkwood/files/board/iomega/iconnect/iconnect.c b/package/boot/uboot-kirkwood/files/board/iomega/iconnect/iconnect.c
similarity index 100%
rename from package/uboot-kirkwood/files/board/iomega/iconnect/iconnect.c
rename to package/boot/uboot-kirkwood/files/board/iomega/iconnect/iconnect.c
diff --git a/package/uboot-kirkwood/files/board/iomega/iconnect/iconnect.h b/package/boot/uboot-kirkwood/files/board/iomega/iconnect/iconnect.h
similarity index 100%
rename from package/uboot-kirkwood/files/board/iomega/iconnect/iconnect.h
rename to package/boot/uboot-kirkwood/files/board/iomega/iconnect/iconnect.h
diff --git a/package/uboot-kirkwood/files/board/iomega/iconnect/kwbimage.cfg b/package/boot/uboot-kirkwood/files/board/iomega/iconnect/kwbimage.cfg
similarity index 100%
rename from package/uboot-kirkwood/files/board/iomega/iconnect/kwbimage.cfg
rename to package/boot/uboot-kirkwood/files/board/iomega/iconnect/kwbimage.cfg
diff --git a/package/uboot-kirkwood/files/include/configs/iconnect.h b/package/boot/uboot-kirkwood/files/include/configs/iconnect.h
similarity index 100%
rename from package/uboot-kirkwood/files/include/configs/iconnect.h
rename to package/boot/uboot-kirkwood/files/include/configs/iconnect.h
diff --git a/package/uboot-kirkwood/patches/0001-ib62x0.patch b/package/boot/uboot-kirkwood/patches/0001-ib62x0.patch
similarity index 100%
rename from package/uboot-kirkwood/patches/0001-ib62x0.patch
rename to package/boot/uboot-kirkwood/patches/0001-ib62x0.patch
diff --git a/package/uboot-kirkwood/patches/0002-kwboot.patch b/package/boot/uboot-kirkwood/patches/0002-kwboot.patch
similarity index 100%
rename from package/uboot-kirkwood/patches/0002-kwboot.patch
rename to package/boot/uboot-kirkwood/patches/0002-kwboot.patch
diff --git a/package/uboot-kirkwood/patches/0003-ide_bus.patch b/package/boot/uboot-kirkwood/patches/0003-ide_bus.patch
similarity index 100%
rename from package/uboot-kirkwood/patches/0003-ide_bus.patch
rename to package/boot/uboot-kirkwood/patches/0003-ide_bus.patch
diff --git a/package/uboot-kirkwood/patches/100-iconnect.patch b/package/boot/uboot-kirkwood/patches/100-iconnect.patch
similarity index 100%
rename from package/uboot-kirkwood/patches/100-iconnect.patch
rename to package/boot/uboot-kirkwood/patches/100-iconnect.patch
diff --git a/package/uboot-kirkwood/patches/110-dockstar.patch b/package/boot/uboot-kirkwood/patches/110-dockstar.patch
similarity index 100%
rename from package/uboot-kirkwood/patches/110-dockstar.patch
rename to package/boot/uboot-kirkwood/patches/110-dockstar.patch
diff --git a/package/uboot-omap35xx/Makefile b/package/boot/uboot-omap35xx/Makefile
similarity index 100%
rename from package/uboot-omap35xx/Makefile
rename to package/boot/uboot-omap35xx/Makefile
diff --git a/package/uboot-omap35xx/files/include/configs/omap3_overo.h b/package/boot/uboot-omap35xx/files/include/configs/omap3_overo.h
similarity index 100%
rename from package/uboot-omap35xx/files/include/configs/omap3_overo.h
rename to package/boot/uboot-omap35xx/files/include/configs/omap3_overo.h
diff --git a/package/uboot-omap4/Makefile b/package/boot/uboot-omap4/Makefile
similarity index 100%
rename from package/uboot-omap4/Makefile
rename to package/boot/uboot-omap4/Makefile
diff --git a/package/uboot-pxa/Makefile b/package/boot/uboot-pxa/Makefile
similarity index 100%
rename from package/uboot-pxa/Makefile
rename to package/boot/uboot-pxa/Makefile
diff --git a/package/uboot-pxa/patches/001-squashfs_rootfstype_cmdline.patch b/package/boot/uboot-pxa/patches/001-squashfs_rootfstype_cmdline.patch
similarity index 100%
rename from package/uboot-pxa/patches/001-squashfs_rootfstype_cmdline.patch
rename to package/boot/uboot-pxa/patches/001-squashfs_rootfstype_cmdline.patch
diff --git a/package/uboot-xburst/Makefile b/package/boot/uboot-xburst/Makefile
similarity index 100%
rename from package/uboot-xburst/Makefile
rename to package/boot/uboot-xburst/Makefile
diff --git a/package/uboot-xburst/files/board/n516/Makefile b/package/boot/uboot-xburst/files/board/n516/Makefile
similarity index 100%
rename from package/uboot-xburst/files/board/n516/Makefile
rename to package/boot/uboot-xburst/files/board/n516/Makefile
diff --git a/package/uboot-xburst/files/board/n516/config.mk b/package/boot/uboot-xburst/files/board/n516/config.mk
similarity index 100%
rename from package/uboot-xburst/files/board/n516/config.mk
rename to package/boot/uboot-xburst/files/board/n516/config.mk
diff --git a/package/uboot-xburst/files/board/n516/flash.c b/package/boot/uboot-xburst/files/board/n516/flash.c
similarity index 100%
rename from package/uboot-xburst/files/board/n516/flash.c
rename to package/boot/uboot-xburst/files/board/n516/flash.c
diff --git a/package/uboot-xburst/files/board/n516/n516.c b/package/boot/uboot-xburst/files/board/n516/n516.c
similarity index 100%
rename from package/uboot-xburst/files/board/n516/n516.c
rename to package/boot/uboot-xburst/files/board/n516/n516.c
diff --git a/package/uboot-xburst/files/board/n516/u-boot-nand.lds b/package/boot/uboot-xburst/files/board/n516/u-boot-nand.lds
similarity index 100%
rename from package/uboot-xburst/files/board/n516/u-boot-nand.lds
rename to package/boot/uboot-xburst/files/board/n516/u-boot-nand.lds
diff --git a/package/uboot-xburst/files/board/n516/u-boot.lds b/package/boot/uboot-xburst/files/board/n516/u-boot.lds
similarity index 100%
rename from package/uboot-xburst/files/board/n516/u-boot.lds
rename to package/boot/uboot-xburst/files/board/n516/u-boot.lds
diff --git a/package/uboot-xburst/files/board/nanonote/Makefile b/package/boot/uboot-xburst/files/board/nanonote/Makefile
similarity index 100%
rename from package/uboot-xburst/files/board/nanonote/Makefile
rename to package/boot/uboot-xburst/files/board/nanonote/Makefile
diff --git a/package/uboot-xburst/files/board/nanonote/config.mk b/package/boot/uboot-xburst/files/board/nanonote/config.mk
similarity index 100%
rename from package/uboot-xburst/files/board/nanonote/config.mk
rename to package/boot/uboot-xburst/files/board/nanonote/config.mk
diff --git a/package/uboot-xburst/files/board/nanonote/nanonote.c b/package/boot/uboot-xburst/files/board/nanonote/nanonote.c
similarity index 100%
rename from package/uboot-xburst/files/board/nanonote/nanonote.c
rename to package/boot/uboot-xburst/files/board/nanonote/nanonote.c
diff --git a/package/uboot-xburst/files/board/nanonote/u-boot-nand.lds b/package/boot/uboot-xburst/files/board/nanonote/u-boot-nand.lds
similarity index 100%
rename from package/uboot-xburst/files/board/nanonote/u-boot-nand.lds
rename to package/boot/uboot-xburst/files/board/nanonote/u-boot-nand.lds
diff --git a/package/uboot-xburst/files/board/nanonote/u-boot.lds b/package/boot/uboot-xburst/files/board/nanonote/u-boot.lds
similarity index 100%
rename from package/uboot-xburst/files/board/nanonote/u-boot.lds
rename to package/boot/uboot-xburst/files/board/nanonote/u-boot.lds
diff --git a/package/uboot-xburst/files/board/sakc/Makefile b/package/boot/uboot-xburst/files/board/sakc/Makefile
similarity index 100%
rename from package/uboot-xburst/files/board/sakc/Makefile
rename to package/boot/uboot-xburst/files/board/sakc/Makefile
diff --git a/package/uboot-xburst/files/board/sakc/config.mk b/package/boot/uboot-xburst/files/board/sakc/config.mk
similarity index 100%
rename from package/uboot-xburst/files/board/sakc/config.mk
rename to package/boot/uboot-xburst/files/board/sakc/config.mk
diff --git a/package/uboot-xburst/files/board/sakc/sakc.c b/package/boot/uboot-xburst/files/board/sakc/sakc.c
similarity index 100%
rename from package/uboot-xburst/files/board/sakc/sakc.c
rename to package/boot/uboot-xburst/files/board/sakc/sakc.c
diff --git a/package/uboot-xburst/files/board/sakc/u-boot-nand.lds b/package/boot/uboot-xburst/files/board/sakc/u-boot-nand.lds
similarity index 100%
rename from package/uboot-xburst/files/board/sakc/u-boot-nand.lds
rename to package/boot/uboot-xburst/files/board/sakc/u-boot-nand.lds
diff --git a/package/uboot-xburst/files/board/sakc/u-boot.lds b/package/boot/uboot-xburst/files/board/sakc/u-boot.lds
similarity index 100%
rename from package/uboot-xburst/files/board/sakc/u-boot.lds
rename to package/boot/uboot-xburst/files/board/sakc/u-boot.lds
diff --git a/package/uboot-xburst/files/cpu/mips/jz4740.c b/package/boot/uboot-xburst/files/cpu/mips/jz4740.c
similarity index 100%
rename from package/uboot-xburst/files/cpu/mips/jz4740.c
rename to package/boot/uboot-xburst/files/cpu/mips/jz4740.c
diff --git a/package/uboot-xburst/files/cpu/mips/jz4740_nand.c b/package/boot/uboot-xburst/files/cpu/mips/jz4740_nand.c
similarity index 100%
rename from package/uboot-xburst/files/cpu/mips/jz4740_nand.c
rename to package/boot/uboot-xburst/files/cpu/mips/jz4740_nand.c
diff --git a/package/uboot-xburst/files/cpu/mips/jz_lcd.c b/package/boot/uboot-xburst/files/cpu/mips/jz_lcd.c
similarity index 100%
rename from package/uboot-xburst/files/cpu/mips/jz_lcd.c
rename to package/boot/uboot-xburst/files/cpu/mips/jz_lcd.c
diff --git a/package/uboot-xburst/files/cpu/mips/jz_lcd.h b/package/boot/uboot-xburst/files/cpu/mips/jz_lcd.h
similarity index 100%
rename from package/uboot-xburst/files/cpu/mips/jz_lcd.h
rename to package/boot/uboot-xburst/files/cpu/mips/jz_lcd.h
diff --git a/package/uboot-xburst/files/cpu/mips/jz_mmc.c b/package/boot/uboot-xburst/files/cpu/mips/jz_mmc.c
similarity index 100%
rename from package/uboot-xburst/files/cpu/mips/jz_mmc.c
rename to package/boot/uboot-xburst/files/cpu/mips/jz_mmc.c
diff --git a/package/uboot-xburst/files/cpu/mips/jz_mmc.h b/package/boot/uboot-xburst/files/cpu/mips/jz_mmc.h
similarity index 100%
rename from package/uboot-xburst/files/cpu/mips/jz_mmc.h
rename to package/boot/uboot-xburst/files/cpu/mips/jz_mmc.h
diff --git a/package/uboot-xburst/files/cpu/mips/jz_serial.c b/package/boot/uboot-xburst/files/cpu/mips/jz_serial.c
similarity index 100%
rename from package/uboot-xburst/files/cpu/mips/jz_serial.c
rename to package/boot/uboot-xburst/files/cpu/mips/jz_serial.c
diff --git a/package/uboot-xburst/files/cpu/mips/mmc_protocol.h b/package/boot/uboot-xburst/files/cpu/mips/mmc_protocol.h
similarity index 100%
rename from package/uboot-xburst/files/cpu/mips/mmc_protocol.h
rename to package/boot/uboot-xburst/files/cpu/mips/mmc_protocol.h
diff --git a/package/uboot-xburst/files/cpu/mips/nanonote_gpm940b0.c b/package/boot/uboot-xburst/files/cpu/mips/nanonote_gpm940b0.c
similarity index 100%
rename from package/uboot-xburst/files/cpu/mips/nanonote_gpm940b0.c
rename to package/boot/uboot-xburst/files/cpu/mips/nanonote_gpm940b0.c
diff --git a/package/uboot-xburst/files/cpu/mips/nanonote_gpm940b0.h b/package/boot/uboot-xburst/files/cpu/mips/nanonote_gpm940b0.h
similarity index 100%
rename from package/uboot-xburst/files/cpu/mips/nanonote_gpm940b0.h
rename to package/boot/uboot-xburst/files/cpu/mips/nanonote_gpm940b0.h
diff --git a/package/uboot-xburst/files/cpu/mips/usb_boot.S b/package/boot/uboot-xburst/files/cpu/mips/usb_boot.S
similarity index 100%
rename from package/uboot-xburst/files/cpu/mips/usb_boot.S
rename to package/boot/uboot-xburst/files/cpu/mips/usb_boot.S
diff --git a/package/uboot-xburst/files/include/asm-mips/jz4740.h b/package/boot/uboot-xburst/files/include/asm-mips/jz4740.h
similarity index 100%
rename from package/uboot-xburst/files/include/asm-mips/jz4740.h
rename to package/boot/uboot-xburst/files/include/asm-mips/jz4740.h
diff --git a/package/uboot-xburst/files/include/configs/avt2.h b/package/boot/uboot-xburst/files/include/configs/avt2.h
similarity index 100%
rename from package/uboot-xburst/files/include/configs/avt2.h
rename to package/boot/uboot-xburst/files/include/configs/avt2.h
diff --git a/package/uboot-xburst/files/include/configs/n516.h b/package/boot/uboot-xburst/files/include/configs/n516.h
similarity index 100%
rename from package/uboot-xburst/files/include/configs/n516.h
rename to package/boot/uboot-xburst/files/include/configs/n516.h
diff --git a/package/uboot-xburst/files/include/configs/nanonote.h b/package/boot/uboot-xburst/files/include/configs/nanonote.h
similarity index 100%
rename from package/uboot-xburst/files/include/configs/nanonote.h
rename to package/boot/uboot-xburst/files/include/configs/nanonote.h
diff --git a/package/uboot-xburst/files/include/configs/qi_lb60.h b/package/boot/uboot-xburst/files/include/configs/qi_lb60.h
similarity index 100%
rename from package/uboot-xburst/files/include/configs/qi_lb60.h
rename to package/boot/uboot-xburst/files/include/configs/qi_lb60.h
diff --git a/package/uboot-xburst/files/include/configs/sakc.h b/package/boot/uboot-xburst/files/include/configs/sakc.h
similarity index 100%
rename from package/uboot-xburst/files/include/configs/sakc.h
rename to package/boot/uboot-xburst/files/include/configs/sakc.h
diff --git a/package/uboot-xburst/files/nand_spl/board/n516/Makefile b/package/boot/uboot-xburst/files/nand_spl/board/n516/Makefile
similarity index 100%
rename from package/uboot-xburst/files/nand_spl/board/n516/Makefile
rename to package/boot/uboot-xburst/files/nand_spl/board/n516/Makefile
diff --git a/package/uboot-xburst/files/nand_spl/board/n516/config.mk b/package/boot/uboot-xburst/files/nand_spl/board/n516/config.mk
similarity index 100%
rename from package/uboot-xburst/files/nand_spl/board/n516/config.mk
rename to package/boot/uboot-xburst/files/nand_spl/board/n516/config.mk
diff --git a/package/uboot-xburst/files/nand_spl/board/n516/u-boot.lds b/package/boot/uboot-xburst/files/nand_spl/board/n516/u-boot.lds
similarity index 100%
rename from package/uboot-xburst/files/nand_spl/board/n516/u-boot.lds
rename to package/boot/uboot-xburst/files/nand_spl/board/n516/u-boot.lds
diff --git a/package/uboot-xburst/files/nand_spl/board/nanonote/Makefile b/package/boot/uboot-xburst/files/nand_spl/board/nanonote/Makefile
similarity index 100%
rename from package/uboot-xburst/files/nand_spl/board/nanonote/Makefile
rename to package/boot/uboot-xburst/files/nand_spl/board/nanonote/Makefile
diff --git a/package/uboot-xburst/files/nand_spl/board/nanonote/config.mk b/package/boot/uboot-xburst/files/nand_spl/board/nanonote/config.mk
similarity index 100%
rename from package/uboot-xburst/files/nand_spl/board/nanonote/config.mk
rename to package/boot/uboot-xburst/files/nand_spl/board/nanonote/config.mk
diff --git a/package/uboot-xburst/files/nand_spl/board/nanonote/u-boot.lds b/package/boot/uboot-xburst/files/nand_spl/board/nanonote/u-boot.lds
similarity index 100%
rename from package/uboot-xburst/files/nand_spl/board/nanonote/u-boot.lds
rename to package/boot/uboot-xburst/files/nand_spl/board/nanonote/u-boot.lds
diff --git a/package/uboot-xburst/files/nand_spl/board/sakc/Makefile b/package/boot/uboot-xburst/files/nand_spl/board/sakc/Makefile
similarity index 100%
rename from package/uboot-xburst/files/nand_spl/board/sakc/Makefile
rename to package/boot/uboot-xburst/files/nand_spl/board/sakc/Makefile
diff --git a/package/uboot-xburst/files/nand_spl/board/sakc/config.mk b/package/boot/uboot-xburst/files/nand_spl/board/sakc/config.mk
similarity index 100%
rename from package/uboot-xburst/files/nand_spl/board/sakc/config.mk
rename to package/boot/uboot-xburst/files/nand_spl/board/sakc/config.mk
diff --git a/package/uboot-xburst/files/nand_spl/board/sakc/u-boot.lds b/package/boot/uboot-xburst/files/nand_spl/board/sakc/u-boot.lds
similarity index 100%
rename from package/uboot-xburst/files/nand_spl/board/sakc/u-boot.lds
rename to package/boot/uboot-xburst/files/nand_spl/board/sakc/u-boot.lds
diff --git a/package/uboot-xburst/files/nand_spl/nand_boot_jz4740.c b/package/boot/uboot-xburst/files/nand_spl/nand_boot_jz4740.c
similarity index 100%
rename from package/uboot-xburst/files/nand_spl/nand_boot_jz4740.c
rename to package/boot/uboot-xburst/files/nand_spl/nand_boot_jz4740.c
diff --git a/package/uboot-xburst/patches/001-xburst.patch b/package/boot/uboot-xburst/patches/001-xburst.patch
similarity index 100%
rename from package/uboot-xburst/patches/001-xburst.patch
rename to package/boot/uboot-xburst/patches/001-xburst.patch
diff --git a/package/uboot-xburst/patches/005-i2c.patch b/package/boot/uboot-xburst/patches/005-i2c.patch
similarity index 100%
rename from package/uboot-xburst/patches/005-i2c.patch
rename to package/boot/uboot-xburst/patches/005-i2c.patch
diff --git a/package/uboot-xburst/patches/009-n516.patch b/package/boot/uboot-xburst/patches/009-n516.patch
similarity index 100%
rename from package/uboot-xburst/patches/009-n516.patch
rename to package/boot/uboot-xburst/patches/009-n516.patch
diff --git a/package/uboot-xburst/patches/010-sakc.patch b/package/boot/uboot-xburst/patches/010-sakc.patch
similarity index 100%
rename from package/uboot-xburst/patches/010-sakc.patch
rename to package/boot/uboot-xburst/patches/010-sakc.patch
diff --git a/package/yamonenv/Makefile b/package/boot/yamonenv/Makefile
similarity index 100%
rename from package/yamonenv/Makefile
rename to package/boot/yamonenv/Makefile
diff --git a/package/yamonenv/patches/001-yamonenv_mtd_partition.patch b/package/boot/yamonenv/patches/001-yamonenv_mtd_partition.patch
similarity index 100%
rename from package/yamonenv/patches/001-yamonenv_mtd_partition.patch
rename to package/boot/yamonenv/patches/001-yamonenv_mtd_partition.patch